Merge branch 'master' into migrate_to_catalyst

author: Edmund von der Burg <evdb@mysociety.org> 2011-02-22 14:25:17 +0000
committer: Edmund von der Burg <evdb@mysociety.org> 2011-02-22 14:25:17 +0000
commit: 7da8f20c36726fd205ae48130f07db49fab745e0 (patch)
tree: 9573ce8c11fd8a067ad74a1aedb452784654b076
parent: 36e118f44144e24e6f1a98ea845b4cc2fed799d8 (diff)
parent: a88db262384d3800c36589bb6d1a933b9319e2df (diff)
48 files changed, 5164 insertions, 2471 deletions
diff --git a/bin/gettext-extract b/bin/gettext-extract
index b354c11f2..24defd014 100755
--- a/bin/gettext-extract
+++ b/bin/gettext-extract
@@ -40,7 +40,7 @@ PO=locale/FixMyStreet.po
 rm -f $PO
 
 # Extract from Perl
-xgettext --add-comments=TRANS --language=Perl --keyword=_ --keyword=nget:1,2 --from-code=utf-8 -o $PO perllib/*.pm perllib/FixMyStreet/*.pm web/*.cgi bin/send-* db/alert_types_eha.pl
+xgettext --add-comments=TRANS --language=Perl --keyword=_ --keyword=nget:1,2 --from-code=utf-8 -o $PO `find perllib -name "*.pm"` web/*.cgi bin/send-* db/*.pl web-admin/*.cgi
 
 # Fix headers
 TEMP=`tempfile`
@@ -76,5 +76,5 @@ do
     fi
 done
 
-fixmystreet/bin/make_emptyhomes_po
+bin/make_emptyhomes_po
 
diff --git a/bin/import-flickr b/bin/import-flickr
index 21ea5822a..f4a838547 100755
--- a/bin/import-flickr
+++ b/bin/import-flickr
@@ -24,7 +24,6 @@ use mySociety::Config;
 use mySociety::DBHandle qw(dbh select_all);
 use mySociety::EmailUtil;
 use mySociety::Email;
-use mySociety::GeoUtil;
 
 BEGIN {
     mySociety::Config::set_file("$FindBin::Bin/../conf/general");
@@ -55,28 +54,28 @@ foreach (@$st) {
 
 # XXX: Hmm... Use format=perl now Cal has added it for me! :)
 while ($result =~ /<photo id="([^"]*)" owner="([^"]*)" secret="([^"]*)" server="([^"]*)" farm="([^"]*)" title="([^"]*)".*?latitude="([^"]*)" longitude="([^"]*)".*?machine_tags="([^"]*)"/g) {
-    my ($id, $owner, $secret, $server, $farm, $title, $lat, $lon, $machine) = ($1, $2, $3, $4, $5, $6, $7, $8, $9);
+    my ($id, $owner, $secret, $server, $farm, $title, $latitude, $longitude, $machine) = ($1, $2, $3, $4, $5, $6, $7, $8, $9);
     next if $ids{$id};
-    if ($machine =~ /geo:/ && !$lat && !$lon) {
+    if ($machine =~ /geo:/ && !$latitude && !$longitude) {
         # Have to fetch raw tags, as otherwise can't tell if it's negative, or how many decimal places
         my $url = 'http://api.flickr.com/services/rest/?method=flickr.tags.getListPhoto&api_key=' . $key . '&photo_id=' . $id;
         my $tags = get($url);
-        ($lon) = $tags =~ /raw="geo:lon=([^"]*)"/i;
-        ($lat) = $tags =~ /raw="geo:lat=([^"]*)"/i;
+        ($longitude) = $tags =~ /raw="geo:lon=([^"]*)"/i;
+        ($latitude) = $tags =~ /raw="geo:lat=([^"]*)"/i;
     }
     my $url = "http://farm$farm.static.flickr.com/$server/".$id.'_'.$secret.'_m.jpg';
     my $image = get($url);
-    problem_create($id, $owner, $title, $lat, $lon, $image);
+    problem_create($id, $owner, $title, $latitude, $longitude, $image);
 }
 
 sub problem_create {
-    my ($photo_id, $owner, $title, $lat, $lon, $image) = @_;
+    my ($photo_id, $owner, $title, $latitude, $longitude, $image) = @_;
     my ($name, $email) = dbh()->selectrow_array("select name, email from partial_user where service='flickr' and nsid=?", {}, $owner);
 
     # set some defaults
     $name ||= '';
-    $lat  ||= 0;
-    $lon  ||= 0;
+    $latitude ||= 0;
+    $longitude ||= 0;
 
     my $id = dbh()->selectrow_array("select nextval('problem_id_seq')");
     Utils::workaround_pg_bytea("insert into problem
diff --git a/bin/send-questionnaires b/bin/send-questionnaires
index eb67cd5d1..d3945bf12 100755
--- a/bin/send-questionnaires
+++ b/bin/send-questionnaires
@@ -17,6 +17,7 @@ use lib "$FindBin::Bin/../perllib";
 use lib "$FindBin::Bin/../commonlib/perllib";
 use File::Slurp;
 use CGI; # XXX Awkward kludge
+use Encode;
 use CronFns;
 
 use Page;
@@ -62,7 +63,7 @@ foreach my $row (@$unsent) {
     my @all_councils = split /,|\|/, $row->{council};
     my $cobrand = $row->{cobrand};
     my $lang = $row->{lang};
-    Cobrand::set_lang_and_domain($cobrand, $lang); 
+    Cobrand::set_lang_and_domain($cobrand, $lang, 1); 
     # Cobranded and non-cobranded messages can share a database. In this case, the conf file 
     # should specify a vhost to send the reports for each cobrand, so that they don't get sent 
     # more than once if there are multiple vhosts running off the same database. The email_host
diff --git a/bin/send-reports b/bin/send-reports
index 6254337c6..84bfb1791 100755
--- a/bin/send-reports
+++ b/bin/send-reports
@@ -23,11 +23,11 @@ use CronFns;
 
 use EastHantsWSDL;
 use Cobrand;
+use Utils;
 use mySociety::Config;
 use mySociety::DBHandle qw(dbh);
 use mySociety::Email;
 use mySociety::EmailUtil;
-use mySociety::GeoUtil;
 use mySociety::Locale;
 use mySociety::MaPit;
 use mySociety::Random qw(random_bytes);
@@ -70,7 +70,7 @@ foreach my $row (@$unsent) {
     # more than once if there are multiple vhosts running off the same database. The email_host
     # call checks if this is the host that sends mail for this cobrand.
     next unless (Cobrand::email_host($cobrand));
-    Cobrand::set_lang_and_domain($cobrand, $row->{lang});
+    Cobrand::set_lang_and_domain($cobrand, $row->{lang}, 1);
     if (dbh()->selectrow_array('select email from abuse where lower(email)=?', {}, lc($row->{email}))) {
         dbh()->do("update problem set state='hidden' where id=?", {}, $row->{id});
         dbh()->commit();
@@ -103,10 +103,7 @@ foreach my $row (@$unsent) {
     $h{easting_northing} = '';
     if ( mySociety::Config::get('COUNTRY') eq 'GB' ) {
 
-        ( $h{easting}, $h{northing} ) =
-          mySociety::GeoUtil::wgs84_to_national_grid(    #
-            $h{latitude}, $h{longitude}, 'G'
-          );
+        ( $h{easting}, $h{northing} ) = Utils::convert_latlon_to_en( $h{latitude}, $h{longitude} );
 
         # email templates don't have conditionals so we need to farmat this here
         $h{easting_northing}                             #
@@ -178,22 +175,22 @@ foreach my $row (@$unsent) {
         $template = File::Slurp::read_file("$FindBin::Bin/../templates/emails/$template");
 
         if ($h{category} eq 'Other') {
-            $h{category_footer} = 'this type of local problem';
+            $h{category_footer} = _('this type of local problem');
             $h{category_line} = '';
         } else {
             $h{category_footer} = "'" . $h{category} . "'";
-            $h{category_line} = "Category: $h{category}\n\n";
+            $h{category_line} = sprintf(_("Category: %s"), $h{category}) . "\n\n";
         }
 
-        $h{councils_name} = join(' and ', @dear);
-        $h{multiple} = @dear>1 ? "[ 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. ]\n\n"
+        $h{councils_name} = join(_(' and '), @dear);
+        $h{multiple} = @dear>1 ? "[ " . _("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.") . " ]\n\n"
             : '';
         $h{missing} = ''; 
         if ($missing) {
             my $name = $areas_info->{$missing}->{name};
-            $h{missing} = '[ We realise this problem might be the responsibility of ' . $name
-                . "; however, we don't currently have any contact details for them.
-If you know of an appropriate contact address, please do get in touch. ]\n\n";
+            $h{missing} = '[ '
+              . sprintf(_('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.'), $name)
+              . " ]\n\n";
         }
 
     }
diff --git a/bin/test-run b/bin/test-run
index b2fea2fb5..9c3142207 100755
--- a/bin/test-run
+++ b/bin/test-run
@@ -27,7 +27,6 @@ use FindBin;
 use mySociety::Config;
 mySociety::Config::set_file('../conf/general');
 use mySociety::DBHandle qw(dbh);
-use mySociety::GeoUtil;
 use mySociety::WebTestHarness;
 use Test::Harness;
 use File::Find;
@@ -392,10 +391,7 @@ sub do_alert {
     my $e = 325066;
     my $n = 673533;
     
-    # get the lat,lon from the postcode so that it matches
-    my ( $lat, $lon ) =
-      map { Utils::truncate_coordinate($_) }
-      FixMyStreet::Geocode::lookup( $postcode, undef );
+    my ( $lat, $lon ) = (55.948967, -3.201478);
     
     my $messages = english_fms_messages();
     submit_postcode('', $postcode, 'Problems in this area');
@@ -438,10 +434,7 @@ sub do_eha_alert {
     my $x = 2015; my $e = 325066;
     my $y = 4175; my $n = 673533;
     
-    # get the lat,lon from the postcode so that it matches
-    my ( $lat, $lon ) =
-      map { Utils::truncate_coordinate($_) }
-      FixMyStreet::Geocode::lookup( $postcode, undef );
+    my ( $lat, $lon ) = (55.948967, -3.201478);
         
     my @texts = ('Eiddo gwag yn yr ardal hon', 
                  'Adrodd am eiddo gwag', 
@@ -540,15 +533,15 @@ sub do_rss {
 
     my %redirects = (
 
-        # should always go to lat lon
+        # should always go to lat lon, except postcode (actually, query string)
         '/rss/n/406886,289126' => '/rss/l/52.499994,-1.899993',
         '/rss/2524/1779'       => '/rss/l/52.480294,-1.896931',
-        '/rss/pc/SW1A1AA'      => '/rss/l/51.50101,-0.141587',
+        '/rss/pc/SW1A1AA'      => '/rss/pc/SW1A1AA',
         '/rss/l/52.5/-1.9'     => '/rss/l/52.5/-1.9',
 
         # go to reports
         '/rss/area/Birmingham'         => '/rss/reports/Birmingham',
-        '/rss/area/Birmingham/Lozells' => '/rss/reports/Birmingham/Lozells',
+        '/rss/area/Birmingham/Lozells' => '/rss/reports/Birmingham/Lozells+and+East+Handsworth',
     );
 
     my $error_count = 0;
diff --git a/commonlib b/commonlib
-Subproject e0ffea0186a31514b0a05efd30fc76e83f68d3d
+Subproject 408dc4eda871e89ab97887c822fb21a869b0f89
diff --git a/conf/httpd.conf b/conf/httpd.conf
index 8bc50645a..1074b799d 100644
--- a/conf/httpd.conf
+++ b/conf/httpd.conf
@@ -66,6 +66,7 @@ RewriteRule ^/rss/l/([0-9.-]+)[,/]([0-9.-]+)$            /rss.cgi?type=local_pro
 RewriteRule ^/rss/([0-9]+)[,/]([0-9]+)/([0-9]+)$         /rss.cgi?type=local_problems;x=$1;y=$2;d=$3 [QSA]
 RewriteRule ^/rss/n/([0-9]+)[,/]([0-9]+)/([0-9]+)$       /rss.cgi?type=local_problems;e=$1;n=$2;d=$3 [QSA]
 RewriteRule ^/rss/l/([0-9.-]+)[,/]([0-9.-]+)/([0-9]+)$   /rss.cgi?type=local_problems;lat=$1;lon=$2;d=$3 [QSA]
+RewriteRule ^/rss/pc/(.*)/([0-9]+)$                      /rss.cgi?type=local_problems;pc=$1;d=$2 [QSA]
 RewriteRule ^/rss/pc/(.*)$                               /rss.cgi?type=local_problems;pc=$1 [QSA]
 RewriteRule ^/rss/problems$                              /rss.cgi?type=new_problems [QSA]
 
diff --git a/db/alert_types.pl b/db/alert_types.pl
new file mode 100644
index 000000000..fd1243982
--- /dev/null
+++ b/db/alert_types.pl
@@ -0,0 +1,44 @@
+# This file is only here so that the strings from alert_types.sql
+# get into the .po translation file.
+
+# New updates on a particular problem report
+    _('Updates on {{title}}'),
+    _('Updates on {{title}}'),
+    _('Update by {{name}}'),
+
+# New problems anywhere on the site
+    _('New problems on FixMyStreet'),
+    _('The latest problems reported by users'),
+
+# New fixed problems anywhere on the site
+    _('Problems recently reported fixed on FixMyStreet'),
+    _('The latest problems reported fixed by users'),
+
+# New problems around a location
+    _('New local problems on FixMyStreet'),
+    _('The latest local problems reported by users'),
+
+# New problems around a location
+    _('New local problems on FixMyStreet'),
+    _('The latest local problems reported by users'),
+
+# New problems around a postcode
+    _('New problems near {{POSTCODE}} on FixMyStreet'),
+    _('The latest local problems reported by users'),
+
+# New problems around a postcode with a particular state
+    _('New problems NEAR {{POSTCODE}} on FixMyStreet'),
+    _('The latest local problems reported by users'),
+
+# New problems sent to a particular council
+    _('New problems to {{COUNCIL}} on FixMyStreet'),
+    _('The latest problems for {{COUNCIL}} reported by users'),
+
+# New problems within a particular ward sent to a particular council
+    _('New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet'
+    _('The latest problems for {{COUNCIL}} within {{WARD}} ward reported by users'),
+
+# New problems within a particular voting area (ward, constituency, whatever)
+    _('New problems within {{NAME}}''s boundary on FixMyStreet'),
+    _('The latest problems within {{NAME}}''s boundary reported by users'),
+
diff --git a/db/alert_types.sql b/db/alert_types.sql
index 82a8c71f8..fb1aac1d0 100644
--- a/db/alert_types.sql
+++ b/db/alert_types.sql
@@ -53,6 +53,28 @@ values ('local_problems_state', '', '',
     'problem_find_nearby(?, ?, ?) as nearby,problem', 'nearby.problem_id = problem.id and problem.state in (?)', 'created desc',
     '{{title}}, {{confirmed}}', '/report/{{id}}', '{{detail}}', 'alert-problem-nearby');
 
+-- New problems around a postcode
+insert into alert_type
+(ref, head_sql_query, head_table,
+    head_title, head_link, head_description,
+    item_table, item_where, item_order,
+    item_title, item_link, item_description, template)
+values ('postcode_local_problems', '', '',
+    'New problems near {{POSTCODE}} on FixMyStreet', '/', 'The latest local problems reported by users',
+    'problem_find_nearby(?, ?, ?) as nearby,problem', 'nearby.problem_id = problem.id and problem.state in (''confirmed'', ''fixed'')', 'created desc',
+    '{{title}}, {{confirmed}}', '/report/{{id}}', '{{detail}}', 'alert-problem-nearby');
+
+-- New problems around a postcode with a particular state
+insert into alert_type
+(ref, head_sql_query, head_table,
+    head_title, head_link, head_description,
+    item_table, item_where, item_order,
+    item_title, item_link, item_description, template)
+values ('postcode_local_problems_state', '', '',
+    'New problems NEAR {{POSTCODE}} on FixMyStreet', '/', 'The latest local problems reported by users',
+    'problem_find_nearby(?, ?, ?) as nearby,problem', 'nearby.problem_id = problem.id and problem.state in (?)', 'created desc',
+    '{{title}}, {{confirmed}}', '/report/{{id}}', '{{detail}}', 'alert-problem-nearby');
+
 -- New problems sent to a particular council
 insert into alert_type
 (ref, head_sql_query, head_table,
diff --git a/db/alert_types_eha.pl b/db/alert_types_eha.pl
index 0e0bdd162..b090522e6 100644
--- a/db/alert_types_eha.pl
+++ b/db/alert_types_eha.pl
@@ -1,14 +1,8 @@
 # This file is only here so that the strings from alert_types_eha.sql
 # get into the .po translation file.
 
-# New updates on a particular problem report
-    _('Updates on {{title}}'),
-    _('Updates on {{title}}'),
-    _('Update by {{name}}'),
-
 # New problems anywhere on the site
     _('New reports on reportemptyhomes.com'),
-    _('The latest empty properties reported by users'),
 
 # New fixed problems anywhere on the site
     _('Properties recently reported as put back to use on reportemptyhomes.com'),
@@ -18,6 +12,9 @@
     _('New local reports on reportemptyhomes.com'),
     _('The latest local reports reported by users'),
 
+# New problems around a postcode
+    _('New reports on reportemptyhomes.com near {{POSTCODE}}'),
+
 # New problems sent to a particular council
     _('New reports to {{COUNCIL}} on reportemptyhomes.com'),
     _('The latest reports for {{COUNCIL}} reported by users'),
diff --git a/db/alert_types_eha.sql b/db/alert_types_eha.sql
index c949ea2f8..17f44fcd9 100644
--- a/db/alert_types_eha.sql
+++ b/db/alert_types_eha.sql
@@ -42,6 +42,17 @@ values ('local_problems', '', '',
     'problem_find_nearby(?, ?, ?) as nearby,problem', 'nearby.problem_id = problem.id and problem.state in (''confirmed'', ''fixed'')', 'created desc',
     '{{title}}, {{confirmed}}', '/report/{{id}}', '{{detail}}', 'alert-problem-nearby');
 
+-- New problems around a postcode
+insert into alert_type
+(ref, head_sql_query, head_table,
+    head_title, head_link, head_description,
+    item_table, item_where, item_order,
+    item_title, item_link, item_description, template)
+values ('postcode_local_problems', '', '',
+    'New reports on reportemptyhomes.com near {{POSTCODE}}', '/', 'The latest local reports reported by users',
+    'problem_find_nearby(?, ?, ?) as nearby,problem', 'nearby.problem_id = problem.id and problem.state in (''confirmed'', ''fixed'')', 'created desc',
+    '{{title}}, {{confirmed}}', '/report/{{id}}', '{{detail}}', 'alert-problem-nearby');
+
 -- New problems sent to a particular council
 insert into alert_type
 (ref, head_sql_query, head_table,
diff --git a/db/migrate_from_osgb36_to_wgs84.pl b/db/migrate_from_osgb36_to_wgs84.pl
index 62eac8296..abd504fb8 100644
--- a/db/migrate_from_osgb36_to_wgs84.pl
+++ b/db/migrate_from_osgb36_to_wgs84.pl
@@ -29,7 +29,7 @@ BEGIN {
     );
 }
 
-my $UPDATE_BATCH_SIZE = 1;    # FIXME - should be ~ 500
+my $UPDATE_BATCH_SIZE = 500;
 
 migrate_problem_table();
 migrate_problem_find_nearby_function();
@@ -142,7 +142,7 @@ sub migrate_problem_find_nearby_function {
                         * cos(radians($2 - longitude)))::numeric, 14)
                     ) < $3
             order by distance desc
-    ' language sql
+' language sql
 SQL_END
 
     $dbh->commit;
diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po
index f7a3b172d..cf5d40b7f 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: 2009-11-24 13:51+0000\n"
+"POT-Creation-Date: 2011-02-22 13:53+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,112 +17,122 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: fixmystreet/perllib/Cobrand.pm:309
-msgid "Enter a nearby GB postcode, or street name and area:"
+#: perllib/Cobrands/Emptyhomes/Util.pm:61 bin/send-questionnaires-eha:93
+msgid "Report Empty Homes"
+msgstr ""
+
+#: perllib/Cobrands/Fiksgatami/Util.pm:27
+msgid "Enter a nearby postcode, or street name and area:"
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:81
+#: perllib/Page.pm:83
 #, perl-format
 msgid ""
 "Please try again later, or <a href=\"mailto:%s\">email us</a> to let us know."
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:82
+#: perllib/Page.pm:84
 msgid "Sorry! Something's gone wrong."
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:83
+#: perllib/Page.pm:85
 msgid "The text of the error was:"
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:187 fixmystreet/web/contact.cgi:100
+#: perllib/Page.pm:192 web/contact.cgi:107
 msgid "FixMyStreet"
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:191 fixmystreet/perllib/Page.pm:357
+#: perllib/Page.pm:195 perllib/Page.pm:317
 msgid "Report a problem"
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:192 fixmystreet/perllib/Page.pm:358
+#: perllib/Page.pm:196 perllib/Page.pm:318
 msgid "All reports"
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:193 fixmystreet/perllib/Page.pm:359
+#: perllib/Page.pm:197 perllib/Page.pm:319
 msgid "Local alerts"
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:194 fixmystreet/perllib/Page.pm:360
+#: perllib/Page.pm:198 perllib/Page.pm:320
 msgid "Help"
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:195 fixmystreet/web/about.cgi:19 fixmystreet/web/about.cgi:21
+#: perllib/Page.pm:199 web/about.cgi:19 web/about.cgi:21
 msgid "About us"
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:212
+#: perllib/Page.pm:220
 msgid "Fix<span id=\"my\">My</span>Street"
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:356
-msgid "Navigation"
+#: perllib/Page.pm:296
+msgid ""
+"This is a developer site; things might break at any time, and the database "
+"will be periodically deleted."
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:361
-msgid "Contact"
+#: perllib/Page.pm:310
+msgid ""
+"Built by <a href=\"http://www.mysociety.org/\">mySociety</a>, using some <a "
+"href=\"http://github.com/mysociety/fixmystreet\">clever</a>&nbsp;<a href="
+"\"https://secure.mysociety.org/cvstrac/dir?d=mysociety/services/TilMa"
+"\">code</a>."
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:362
+#: perllib/Page.pm:312
 msgid ""
-"<a href=\"http://www.mysociety.org/\"><img id=\"logo\" width=\"133\" height="
-"\"26\" src=\"/i/mysociety-dark.png\" alt=\"View mySociety.org\"><span id="
-"\"logoie\"></span></a>"
+"Built by <a href=\"http://www.mysociety.org/\">mySociety</a> and maintained "
+"by <a href=\"http://www.nuug.no/\">NUUG</a>, using some <a href=\"http://"
+"github.com/mysociety/fixmystreet\">clever</a>&nbsp;<a href=\"https://secure."
+"mysociety.org/cvstrac/dir?d=mysociety/services/TilMa\">code</a>."
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:363
-msgid ""
-"Built by <a href=\"http://www.mysociety.org/\">mySociety</a>, using some <a "
-"href=\"http://github.com/mysociety/fixmystreet\">clever</"
-"a>&nbsp;<a href=\"https://secure.mysociety.org/cvstrac/dir?d=mysociety/"
-"services/TilMa\">code</a>."
+#: perllib/Page.pm:316
+msgid "Navigation"
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:396
-msgid "Error"
+#: perllib/Page.pm:321
+msgid "Contact"
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:480
-msgid "Crown copyright. All rights reserved. Ministry of Justice"
+#: perllib/Page.pm:323
+msgid ""
+"<a href=\"http://www.mysociety.org/\"><img id=\"logo\" width=\"133\" height="
+"\"26\" src=\"/i/mysociety-dark.png\" alt=\"View mySociety.org\"><span id="
+"\"logoie\"></span></a>"
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:504
-msgid "Problem"
+#: perllib/Page.pm:381
+msgid "Error"
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:675
+#: perllib/Page.pm:443
 msgid "your problem will not be posted"
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:676
+#: perllib/Page.pm:444
 msgid "we'll hang on to your problem report while you're checking your email."
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:678
+#: perllib/Page.pm:446
 msgid "your update will not be posted"
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:679
+#: perllib/Page.pm:447
 msgid "we'll hang on to your update while you're checking your email."
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:681
+#: perllib/Page.pm:449
 msgid "your alert will not be activated"
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:682
+#: perllib/Page.pm:450
 msgid "we'll hang on to your alert while you're checking your email."
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:689
+#: perllib/Page.pm:457
 #, perl-format
 msgid ""
 "<h1>Nearly Done! Now check your email...</h1>\n"
@@ -136,189 +146,274 @@ msgid ""
 "<p>(Don't worry &mdash; %s)</p>\n"
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:716
+#: perllib/Page.pm:484
 msgid "today"
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:738
+#: perllib/Page.pm:508
 msgid "less than a minute"
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:741
-msgid "week"
+#: perllib/Page.pm:511
+#, perl-format
+msgid "%d week"
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:742
-msgid "day"
+#: perllib/Page.pm:511
+#, perl-format
+msgid "%d weeks"
+msgstr ""
+
+#: perllib/Page.pm:512
+#, perl-format
+msgid "%d day"
+msgstr ""
+
+#: perllib/Page.pm:512
+#, perl-format
+msgid "%d days"
+msgstr ""
+
+#: perllib/Page.pm:513
+#, perl-format
+msgid "%d hour"
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:743
-msgid "hour"
+#: perllib/Page.pm:513
+#, perl-format
+msgid "%d hours"
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:744
-msgid "minute"
+#: perllib/Page.pm:514
+#, perl-format
+msgid "%d minute"
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:764
+#: perllib/Page.pm:514
+#, perl-format
+msgid "%d minutes"
+msgstr ""
+
+#: perllib/Page.pm:534
 #, perl-format
 msgid "%s, reported anonymously at %s"
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:766
+#: perllib/Page.pm:536
 #, perl-format
 msgid "%s, reported by %s at %s"
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:770
+#: perllib/Page.pm:540
 #, perl-format
 msgid "Reported by %s in the %s category anonymously at %s"
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:772
+#: perllib/Page.pm:542
 #, perl-format
 msgid "Reported by %s in the %s category by %s at %s"
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:774
+#: perllib/Page.pm:544
 #, perl-format
 msgid "Reported by %s anonymously at %s"
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:776
+#: perllib/Page.pm:546
 #, perl-format
 msgid "Reported by %s by %s at %s"
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:778
+#: perllib/Page.pm:548
 #, perl-format
 msgid "Reported in the %s category anonymously at %s"
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:780
+#: perllib/Page.pm:550
 #, perl-format
 msgid "Reported in the %s category by %s at %s"
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:782
+#: perllib/Page.pm:552 web/contact.cgi:212
 #, perl-format
 msgid "Reported anonymously at %s"
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:784
+#: perllib/Page.pm:554 web/contact.cgi:213
 #, perl-format
 msgid "Reported by %s at %s"
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:789
+#: perllib/Page.pm:559
 msgid "the map was not used so pin location may be inaccurate"
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:796
+#: perllib/Page.pm:567
 #, perl-format
 msgid "Sent to %s %s later"
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:799
+#: perllib/Page.pm:571
 msgid "Not reported to council"
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:850
+#: perllib/Page.pm:622 web-admin/index.cgi:521 web-admin/index.cgi:645
 msgid "Updates"
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:854
+#: perllib/Page.pm:626
 #, perl-format
 msgid "Posted by %s at %s"
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:856
+#: perllib/Page.pm:628
 #, perl-format
 msgid "Posted anonymously at %s"
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:859
+#: perllib/Page.pm:631
 msgid "marked as fixed"
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:860
+#: perllib/Page.pm:632
 msgid "reopened"
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:877 fixmystreet/web/index.cgi:968
+#: perllib/Page.pm:640 web/index.cgi:1071
 msgid "Offensive? Unsuitable? Tell us"
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:900 fixmystreet/perllib/Page.pm:964
+#: perllib/Page.pm:667
+msgid "That postcode was not recognised, sorry."
+msgstr ""
+
+#: perllib/Page.pm:672
+msgid ""
+"Sorry, that appears to be a Crown dependency postcode, which we don't cover."
+msgstr ""
+
+#: perllib/Page.pm:675 perllib/FixMyStreet/Geocode.pm:133
 msgid ""
 "We do not cover Northern Ireland, I'm afraid, as our licence doesn't include "
 "any maps for the region."
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:913
-msgid "That postcode was not recognised, sorry."
+#: perllib/Page.pm:705
+msgid "Please upload a JPEG image only"
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:951
-msgid "Sorry, we could not parse that location. Please try again."
+#: perllib/FixMyStreet/Alert.pm:147
+msgid "This report is currently marked as fixed."
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:953 fixmystreet/perllib/Page.pm:961
-msgid "Sorry, we could not find that location."
+#: perllib/FixMyStreet/Alert.pm:148
+msgid "This report is currently marked as open."
+msgstr ""
+
+#: perllib/FixMyStreet/Alert.pm:311
+#, perl-format
+msgid "Report on %s"
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:968
+#: perllib/FixMyStreet/Geocode.pm:65
 msgid ""
 "Sorry, that location appears to be too general; please be more specific."
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:982
+#: perllib/FixMyStreet/Geocode.pm:75
 msgid "That location does not appear to be in Britain; please try again."
 msgstr ""
 
-#: fixmystreet/perllib/Page.pm:995
+#: perllib/FixMyStreet/Geocode.pm:113
+msgid "Sorry, we could not parse that location. Please try again."
+msgstr ""
+
+#: perllib/FixMyStreet/Geocode.pm:115 perllib/FixMyStreet/Geocode.pm:130
+msgid "Sorry, we could not find that location."
+msgstr ""
+
+#: perllib/FixMyStreet/Geocode.pm:146
 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 ""
 
-#: fixmystreet/perllib/Page.pm:1027
-msgid "Please upload a JPEG image only"
+#: perllib/FixMyStreet/Geocode.pm:161
+msgid "More than one match"
+msgstr ""
+
+#: perllib/FixMyStreet/Map/Bing.pm:39
+#: perllib/FixMyStreet/Map/OSM/StreetView.pm:38
+#: perllib/FixMyStreet/Map/Google.pm:39
+#: perllib/FixMyStreet/Map/Tilma/OL/StreetView.pm:45
+#: perllib/FixMyStreet/Map/Tilma/Original/StreetView.pm:23
+msgid ""
+"Map contains Ordnance Survey data &copy; Crown copyright and database right "
+"2010."
+msgstr ""
+
+#: perllib/FixMyStreet/Map/OSM.pm:41
+#: perllib/FixMyStreet/Map/OSM/CycleMap.pm:38
+msgid ""
+"Map &copy; <a href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> and "
+"contributors, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-"
+"BY-SA</a>"
+msgstr ""
+
+#: perllib/FixMyStreet/Map/BingOL.pm:39
+msgid ""
+"Map contains Ordnance Survey data &copy; Crown copyright and database right "
+"2010. Microsoft"
+msgstr ""
+
+#: perllib/FixMyStreet/Map/Tilma/OL/1_10k.pm:45
+#: perllib/FixMyStreet/Map/Tilma/Original/1_10k.pm:23
+msgid ""
+"&copy; Crown copyright. All rights reserved. Ministry of Justice "
+"100037819&nbsp;2008."
+msgstr ""
+
+#: perllib/FixMyStreet/Map/Tilma/Original.pm:81
+msgid "Unable to fetch the map tiles from the tile server."
+msgstr ""
+
+#: perllib/FixMyStreet/Map/Tilma/Original.pm:155
+msgid "Problem"
 msgstr ""
 
-#: fixmystreet/perllib/Problems.pm:139
+#: perllib/Problems.pm:147
 #, perl-format
 msgid "<big>%s</big> report in past week"
 msgid_plural "<big>%s</big> reports in past week"
 msgstr[0] ""
 msgstr[1] ""
 
-#: fixmystreet/perllib/Problems.pm:144
+#: perllib/Problems.pm:152
 #, perl-format
 msgid "<big>%s</big> report recently"
 msgid_plural "<big>%s</big> reports recently"
 msgstr[0] ""
 msgstr[1] ""
 
-#: fixmystreet/perllib/Problems.pm:150
+#: perllib/Problems.pm:158
 msgid "FixMyStreet updates"
 msgstr ""
 
-#: fixmystreet/perllib/Problems.pm:153 fixmystreet/perllib/Problems.pm:157
+#: perllib/Problems.pm:161 perllib/Problems.pm:165
 #, perl-format
 msgid "<big>%s</big> fixed in past month"
 msgid_plural "<big>%s</big> fixed in past month"
 msgstr[0] ""
 msgstr[1] ""
 
-#: fixmystreet/perllib/Problems.pm:158
+#: perllib/Problems.pm:166
 #, perl-format
 msgid "<big>%s</big> update on reports"
 msgid_plural "<big>%s</big> updates on reports"
 msgstr[0] ""
 msgstr[1] ""
 
-#: fixmystreet/web/about.cgi:24
+#: web/about.cgi:24
 msgid ""
 "<h2>The Empty Homes Agency</h2>\n"
 "<p>The Empty Homes agency is an independent campaigning charity. We are not\n"
@@ -332,7 +427,7 @@ msgid ""
 "p>\n"
 msgstr ""
 
-#: fixmystreet/web/about.cgi:34
+#: web/about.cgi:34
 msgid ""
 "<h2>Shelter Cymru</h2>\n"
 "Shelter Cymru is Wales&rsquo; people and homes charity and wants everyone in "
@@ -353,16 +448,15 @@ msgid ""
 "empty homes</a>.\n"
 msgstr ""
 
-#: fixmystreet/web/ajax.cgi:55 fixmystreet/web/ajax.cgi:74 fixmystreet/web/index.cgi:849
-#: fixmystreet/web/index.cgi:863
+#: web/ajax.cgi:55 web/ajax.cgi:76 web/index.cgi:902 web/index.cgi:917
 msgid "(fixed)"
 msgstr ""
 
-#: fixmystreet/web/alert.cgi:30 fixmystreet/web/confirm.cgi:46
+#: web/alert.cgi:33 web/confirm.cgi:49
 msgid "Confirmation"
 msgstr ""
 
-#: fixmystreet/web/alert.cgi:40
+#: web/alert.cgi:43
 #, perl-format
 msgid ""
 "Thank you for trying to confirm your alert. We seem to have an error "
@@ -371,36 +465,31 @@ msgid ""
 "into it.\n"
 msgstr ""
 
-#: fixmystreet/web/alert.cgi:52 fixmystreet/web/alert.cgi:55 fixmystreet/web/alert.cgi:212
-#: fixmystreet/web/alert.cgi:287
+#: web/alert.cgi:59 web/alert.cgi:62 web/alert.cgi:65 web/alert.cgi:274
+#: web/alert.cgi:380
 msgid "Local RSS feeds and email alerts"
 msgstr ""
 
-#: fixmystreet/web/alert.cgi:108
+#: web/alert.cgi:121
 msgid ""
 "That location does not appear to be covered by a council, perhaps it is "
 "offshore - please try somewhere more specific."
 msgstr ""
 
-#: fixmystreet/web/alert.cgi:123 fixmystreet/web/alert.cgi:139
+#: web/alert.cgi:140 web/alert.cgi:183 web/alert.cgi:200
 #, perl-format
 msgid "Problems within %s"
 msgstr ""
 
-#: fixmystreet/web/alert.cgi:125
-#, perl-format
-msgid "Problems within %s ward"
-msgstr ""
-
-#: fixmystreet/web/alert.cgi:168
+#: web/alert.cgi:152 web/alert.cgi:233
 msgid "Problems within the boundary of:"
 msgstr ""
 
-#: fixmystreet/web/alert.cgi:180
+#: web/alert.cgi:158 web/alert.cgi:245
 msgid "Or problems reported to:"
 msgstr ""
 
-#: fixmystreet/web/alert.cgi:182
+#: web/alert.cgi:160 web/alert.cgi:247
 msgid ""
 "FixMyStreet sends different categories of problem\n"
 "to the appropriate council, so problems within the boundary of a particular "
@@ -414,80 +503,85 @@ msgid ""
 "for the county council."
 msgstr ""
 
-#: fixmystreet/web/alert.cgi:207
+#: web/alert.cgi:185
+#, perl-format
+msgid "Problems within %s ward"
+msgstr ""
+
+#: web/alert.cgi:269
 msgid "Photos of recent nearby reports"
 msgstr ""
 
-#: fixmystreet/web/alert.cgi:211
+#: web/alert.cgi:272
 #, perl-format
 msgid "Local RSS feeds and email alerts for &lsquo;%s&rsquo;"
 msgstr ""
 
-#: fixmystreet/web/alert.cgi:223
+#: web/alert.cgi:286
 #, perl-format
 msgid "Here are the types of local problem alerts for &lsquo;%s&rsquo;."
 msgstr ""
 
-#: fixmystreet/web/alert.cgi:224
+#: web/alert.cgi:287
 msgid ""
 "Select which type of alert you&rsquo;d like and click the button for an RSS\n"
 "feed, or enter your email address to subscribe to an email alert."
 msgstr ""
 
-#: fixmystreet/web/alert.cgi:227
+#: web/alert.cgi:290
 msgid "The simplest alert is our geographic one:"
 msgstr ""
 
-#: fixmystreet/web/alert.cgi:228
+#: web/alert.cgi:291
 #, perl-format
 msgid "Problems within %skm of this location"
 msgstr ""
 
-#: fixmystreet/web/alert.cgi:235
+#: web/alert.cgi:305
 msgid "(a default distance which covers roughly 200,000 people)"
 msgstr ""
 
-#: fixmystreet/web/alert.cgi:237
+#: web/alert.cgi:308
 msgid "RSS feed of nearby problems"
 msgstr ""
 
-#: fixmystreet/web/alert.cgi:237 fixmystreet/web/alert.cgi:275 fixmystreet/web/index.cgi:878
-#: fixmystreet/web/index.cgi:983 fixmystreet/web/reports.cgi:199
+#: web/alert.cgi:308 web/alert.cgi:367 web/index.cgi:970 web/index.cgi:1082
+#: web/reports.cgi:254
 msgid "RSS feed"
 msgstr ""
 
-#: fixmystreet/web/alert.cgi:238
+#: web/alert.cgi:309
 msgid "(alternatively the RSS feed can be customised, within"
 msgstr ""
 
-#: fixmystreet/web/alert.cgi:248
+#: web/alert.cgi:319
 msgid ""
 "Or you can subscribe to an alert based upon what ward or council you&rsquo;"
 "re in:"
 msgstr ""
 
-#: fixmystreet/web/alert.cgi:250
+#: web/alert.cgi:323
 msgid "Give me an RSS feed"
 msgstr ""
 
-#: fixmystreet/web/alert.cgi:251
+#: web/alert.cgi:324
 msgid "or"
 msgstr ""
 
-#: fixmystreet/web/alert.cgi:252
+#: web/alert.cgi:325
 msgid "Your email:"
 msgstr ""
 
-#: fixmystreet/web/alert.cgi:253
+#: web/alert.cgi:326
 msgid "Subscribe me to an email alert"
 msgstr ""
 
-#: fixmystreet/web/alert.cgi:275
+#: web/alert.cgi:367
 #, perl-format
 msgid "RSS feed of %s"
 msgstr ""
 
-#: fixmystreet/web/alert.cgi:288
+#: web/alert.cgi:381
 msgid ""
 "FixMyStreet has a variety of RSS feeds and email alerts for local problems, "
 "including\n"
@@ -496,217 +590,202 @@ msgid ""
 "within a certain distance of a particular location."
 msgstr ""
 
-#: fixmystreet/web/alert.cgi:293
+#: web/alert.cgi:384
 msgid ""
 "To find out what local alerts we have for you, please enter your GB\n"
 "postcode or street name and area:"
 msgstr ""
 
-#: fixmystreet/web/alert.cgi:295 fixmystreet/web/confirm.cgi:188 fixmystreet/web/index.cgi:156
+#: web/alert.cgi:389 web/confirm.cgi:192 web/index.cgi:166
 msgid "Go"
 msgstr ""
 
-#: fixmystreet/web/alert.cgi:302
+#: web/alert.cgi:415
 msgid "Some photos of recent reports"
 msgstr ""
 
-#: fixmystreet/web/alert.cgi:309
+#: web/alert.cgi:423
 msgid "Please select the feed you want"
 msgstr ""
 
-#: fixmystreet/web/alert.cgi:332
+#: web/alert.cgi:446
 msgid "Illegal feed selection"
 msgstr ""
 
-#: fixmystreet/web/alert.cgi:346
+#: web/alert.cgi:460
 msgid "Receive email when updates are left on this problem."
 msgstr ""
 
-#: fixmystreet/web/alert.cgi:347 fixmystreet/web/index.cgi:726 fixmystreet/web/index.cgi:977
+#: web/alert.cgi:461 web/alert.cgi:488 web/index.cgi:736 web/index.cgi:1076
 msgid "Email:"
 msgstr ""
 
-#: fixmystreet/web/alert.cgi:348 fixmystreet/web/index.cgi:978
+#: web/alert.cgi:462 web/alert.cgi:489 web/index.cgi:1077
 msgid "Subscribe"
 msgstr ""
 
-#: fixmystreet/web/alert.cgi:374
+#: web/alert.cgi:487
+msgid "Receive alerts on new local problems"
+msgstr ""
+
+#: web/alert.cgi:515
 msgid "You have successfully subscribed to that alert."
 msgstr ""
 
-#: fixmystreet/web/alert.cgi:381
+#: web/alert.cgi:522
 msgid "We could not validate that alert."
 msgstr ""
 
-#: fixmystreet/web/alert.cgi:402
+#: web/alert.cgi:544
 msgid "You have successfully confirmed your alert."
 msgstr ""
 
-#: fixmystreet/web/alert.cgi:408
+#: web/alert.cgi:551
 msgid "You have successfully deleted your alert."
 msgstr ""
 
-#: fixmystreet/web/alert.cgi:422
+#: web/alert.cgi:571
 msgid "Please enter a valid email address"
 msgstr ""
 
-#: fixmystreet/web/alert.cgi:423
+#: web/alert.cgi:572
 msgid "Please select the type of alert you want"
 msgstr ""
 
-#: fixmystreet/web/confirm.cgi:40
+#: web/confirm.cgi:39
+#, perl-format
 msgid ""
 "Thank you for trying to confirm your update or problem. We seem to have an\n"
-"error ourselves though, so <a href=\"%s\">please let us know what went "
-"on</a>\n"
+"error ourselves though, so <a href=\"%s\">please let us know what went on</"
+"a>\n"
 "and we'll look into it.\n"
 msgstr ""
 
-#: fixmystreet/web/confirm.cgi:98
+#: web/confirm.cgi:101
 #, perl-format
 msgid ""
 "You have successfully confirmed your update and you can now <a href=\"%s"
 "\">view it on the site</a>."
 msgstr ""
 
-#: fixmystreet/web/confirm.cgi:128
+#: web/confirm.cgi:131
 msgid "Sorry, there has been an error confirming your problem."
 msgstr ""
 
-#: fixmystreet/web/confirm.cgi:136
+#: web/confirm.cgi:139
 msgid ""
 "Thank you for reporting an empty property on\n"
-"ReportEmptyHomes.com. We have emailed the empty property officer in the "
-"council\n"
-"responsible with the details and asked them to do whatever they can to get "
-"the\n"
+"ReportEmptyHomes.com. We have emailed the lead officer for empty homes in "
+"the council\n"
+"responsible with details, and asked them to do whatever they can to get the\n"
 "empty property back into use as soon as possible."
 msgstr ""
 
-#: fixmystreet/web/confirm.cgi:140
+#: web/confirm.cgi:143
 msgid ""
-"Most councils are quite good at bringing empty properties back into use. "
-"Even\n"
-"so the process can sometimes be slow, especially if the property is in very "
-"poor\n"
-"repair or the owner is unwilling to act. In most cases it takes six months\n"
-"before you can expect to see anything change. This doesn&rsquo;t mean the "
-"council\n"
-"isn&rsquo;t doing anything. We encourage councils to update the website so "
-"you can\n"
-"see what is happening."
+"It is worth noting however that the process can sometimes be slow,\n"
+"especially if the property is in very poor repair or the owner is unwilling "
+"to\n"
+"act. In most cases it can take six months or more before you can expect to "
+"see\n"
+"anything change and sometimes there may be considerable barries to a "
+"property\n"
+"being brought back into use. This doesn&rsquo;t mean the council isn&rsquo;"
+"t\n"
+"doing anything. We encourage councils to update the website so you can\n"
+"see what is happening. It may be a long process, but you reporting your\n"
+"concerns about this property to the council is a valuable first step."
 msgstr ""
 
-#: fixmystreet/web/confirm.cgi:146
+#: web/confirm.cgi:151
 msgid ""
-"We will contact you again in a month and again after six months to ask what "
-"has\n"
-"happened. Hopefully the property will be well on the way to being brought "
-"back\n"
-"into use by then, but if not we can offer advice on what you can do next."
+"We may contact you periodically to ask if anything has changed\n"
+"with the property you reported."
 msgstr ""
 
-#: fixmystreet/web/confirm.cgi:149
+#: web/confirm.cgi:153
 msgid ""
 "Thank you for using ReportEmptyHomes.com. Your action is already helping\n"
 "to resolve the UK&rsquo;s empty homes crisis."
 msgstr ""
 
-#: fixmystreet/web/confirm.cgi:151 fixmystreet/web/confirm.cgi:154
+#: web/confirm.cgi:155 web/confirm.cgi:158
 msgid "View your report"
 msgstr ""
 
-#: fixmystreet/web/confirm.cgi:153
+#: web/confirm.cgi:157
 msgid "Thank you for reporting an empty property on ReportEmptyHomes.com."
 msgstr ""
 
-#: fixmystreet/web/confirm.cgi:159
+#: web/confirm.cgi:163
 msgid "You have successfully confirmed your problem"
 msgstr ""
 
-#: fixmystreet/web/confirm.cgi:160
+#: web/confirm.cgi:164
 msgid " and <strong>we will now send it to the council</strong>"
 msgstr ""
 
-#: fixmystreet/web/confirm.cgi:161
+#: web/confirm.cgi:165
 #, perl-format
 msgid ". You can <a href=\"%s\">view the problem on this site</a>."
 msgstr ""
 
-#: fixmystreet/web/confirm.cgi:185
+#: web/confirm.cgi:189
 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 ""
 
-#: fixmystreet/web/confirm.cgi:186 fixmystreet/web/questionnaire.cgi:202
+#: web/confirm.cgi:190 web/questionnaire.cgi:234 web-admin/index.cgi:339
+#: web-admin/index.cgi:340 web-admin/index.cgi:589
 msgid "Yes"
 msgstr ""
 
-#: fixmystreet/web/confirm.cgi:187 fixmystreet/web/questionnaire.cgi:203
+#: web/confirm.cgi:191 web/questionnaire.cgi:235 web-admin/index.cgi:339
+#: web-admin/index.cgi:340 web-admin/index.cgi:589
 msgid "No"
 msgstr ""
 
-#: fixmystreet/web/confirm.cgi:229
+#: web/confirm.cgi:237
 #, perl-format
 msgid ""
 "Thank you &mdash; you can <a href=\"%s\">view your updated problem</a> on "
 "the site."
 msgstr ""
 
-#: fixmystreet/web/contact.cgi:22
+#: web/contact.cgi:22
 msgid "Contact Us"
 msgstr ""
 
-#: fixmystreet/web/contact.cgi:41
+#: web/contact.cgi:41
 msgid "Please give your name"
 msgstr ""
 
-#: fixmystreet/web/contact.cgi:43
+#: web/contact.cgi:43
 msgid "Please give your email"
 msgstr ""
 
-#: fixmystreet/web/contact.cgi:45
+#: web/contact.cgi:45
 msgid "Please give a valid email address"
 msgstr ""
 
-#: fixmystreet/web/contact.cgi:47
+#: web/contact.cgi:47
 msgid "Please give a subject"
 msgstr ""
 
-#: fixmystreet/web/contact.cgi:48
+#: web/contact.cgi:48
 msgid "Please write a message"
 msgstr ""
 
-#: fixmystreet/web/contact.cgi:49
+#: web/contact.cgi:49
 msgid "Illegal ID"
 msgstr ""
 
-#: fixmystreet/web/contact.cgi:86
+#: web/contact.cgi:86
 msgid "Thanks for your feedback.  We'll get back to you as soon as we can!"
 msgstr ""
 
-#: fixmystreet/web/contact.cgi:124 fixmystreet/web/index.cgi:436
-msgid "There were problems with your report. Please see below."
-msgstr ""
-
-#: fixmystreet/web/contact.cgi:129
-msgid "Contact the team"
-msgstr ""
-
-#: fixmystreet/web/contact.cgi:160
-msgid ""
-"You are reporting the following update for being abusive, containing "
-"personal information, or similar:"
-msgstr ""
-
-#: fixmystreet/web/contact.cgi:172
-msgid ""
-"You are reporting the following problem report for being abusive, containing "
-"personal information, or similar:"
-msgstr ""
-
-#: fixmystreet/web/contact.cgi:185
+#: web/contact.cgi:134
 msgid ""
 "We&rsquo;d love to hear what you think about this\n"
 "website. Just fill in the form. Please don&rsquo;t contact us about "
@@ -714,7 +793,7 @@ msgid ""
 "homes; use the box accessed from <a href=\"/\">the front page</a>."
 msgstr ""
 
-#: fixmystreet/web/contact.cgi:191
+#: web/contact.cgi:141
 msgid ""
 "Please do <strong>not</strong> report problems through this form; messages "
 "go to\n"
@@ -722,38 +801,58 @@ msgid ""
 "please <a href=\"/\">go to the front page</a> and follow the instructions."
 msgstr ""
 
-#: fixmystreet/web/contact.cgi:194
+#: web/contact.cgi:144
 #, perl-format
 msgid ""
 "We'd love to hear what you think about this site. Just fill in the form, or "
 "send an email to <a href='mailto:%s'>%s</a>:"
 msgstr ""
 
-#: fixmystreet/web/contact.cgi:204
+#: web/contact.cgi:153 web/index.cgi:447
+msgid "There were problems with your report. Please see below."
+msgstr ""
+
+#: web/contact.cgi:158
+msgid "Contact the team"
+msgstr ""
+
+#: web/contact.cgi:196
+msgid ""
+"You are reporting the following update for being abusive, containing "
+"personal information, or similar:"
+msgstr ""
+
+#: web/contact.cgi:207
+msgid ""
+"You are reporting the following problem report for being abusive, containing "
+"personal information, or similar:"
+msgstr ""
+
+#: web/contact.cgi:234
 msgid "Your name:"
 msgstr ""
 
-#: fixmystreet/web/contact.cgi:205
+#: web/contact.cgi:235
 msgid "Your&nbsp;email:"
 msgstr ""
 
-#: fixmystreet/web/contact.cgi:206 fixmystreet/web/index.cgi:722
+#: web/contact.cgi:236 web/index.cgi:732
 msgid "Subject:"
 msgstr ""
 
-#: fixmystreet/web/contact.cgi:207
+#: web/contact.cgi:237
 msgid "Message:"
 msgstr ""
 
-#: fixmystreet/web/contact.cgi:208 fixmystreet/web/index.cgi:1006
+#: web/contact.cgi:238 web/index.cgi:1092
 msgid "Post"
 msgstr ""
 
-#: fixmystreet/web/faq.cgi:18
+#: web/faq.cgi:18
 msgid "Frequently Asked Questions"
 msgstr ""
 
-#: fixmystreet/web/flickr.cgi:45
+#: web/flickr.cgi:45
 msgid ""
 "Thank you for trying to register for your Flickr photos. We seem to have a\n"
 "problem ourselves though, so <a href=\"/contact\">please let us know what "
@@ -761,198 +860,206 @@ msgid ""
 "and we'll look into it.\n"
 msgstr ""
 
-#: fixmystreet/web/fun.cgi:17 fixmystreet/web/fun.cgi:25
+#: web/fun.cgi:17 web/fun.cgi:25
 msgid "Weird and Wonderful reports"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:73
+#: web/index.cgi:83
 msgid "Submitting your report"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:76
+#: web/index.cgi:86
 msgid "Submitting your update"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:80 fixmystreet/web/index.cgi:632
+#: web/index.cgi:90 web/index.cgi:638
 msgid "Reporting a problem"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:83
+#: web/index.cgi:93
 msgid "Viewing a problem"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:86
+#: web/index.cgi:96
 msgid "Viewing a location"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:125
+#: web/index.cgi:121
+msgid "Enter a nearby GB postcode, or street name and area:"
+msgstr ""
+
+#: web/index.cgi:135
 msgid "Report, view, or discuss local problems"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:126
+#: web/index.cgi:136
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:148
+#: web/index.cgi:158
 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 below&nbsp;:"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:166
+#: web/index.cgi:176
 msgid "How to report a problem"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:169
+#: web/index.cgi:179
 msgid "Locate the problem on a map of the area"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:170
+#: web/index.cgi:180
 msgid "Enter details of the problem"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:171
+#: web/index.cgi:181
 msgid "We send it to the council on your behalf"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:186
+#: web/index.cgi:196
 msgid "Photos of recent reports"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:188
+#: web/index.cgi:198
 msgid "Recently reported problems"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:212
+#: web/index.cgi:222
 msgid "Please enter a message"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:215 fixmystreet/web/index.cgi:296
+#: web/index.cgi:225 web/index.cgi:309
 msgid "Please enter your email"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:217 fixmystreet/web/index.cgi:298
+#: web/index.cgi:227 web/index.cgi:311
 msgid "Please enter a valid email"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:226 fixmystreet/web/index.cgi:366
+#: web/index.cgi:236 web/index.cgi:378
 #, perl-format
 msgid ""
 "That image doesn't appear to have uploaded correctly (%s), please try again."
 msgstr ""
 
-#: fixmystreet/web/index.cgi:248
+#: web/index.cgi:258
 msgid "Anonymous"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:287
+#: web/index.cgi:300
 msgid "No council selected"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:288
+#: web/index.cgi:301
 msgid "Please enter a subject"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:289
+#: web/index.cgi:302
 msgid "Please enter some details"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:291
+#: web/index.cgi:304
 msgid "Please enter your name"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:293
+#: web/index.cgi:306
 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"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:301 fixmystreet/web/index.cgi:342
+#: web/index.cgi:313 web/index.cgi:565
+msgid "-- Pick a category --"
+msgstr ""
+
+#: web/index.cgi:314 web/index.cgi:354
 msgid "Please choose a category"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:303 fixmystreet/web/index.cgi:566
+#: web/index.cgi:316 web/index.cgi:572
 msgid "-- Pick a property type --"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:304
+#: web/index.cgi:317
 msgid "Please choose a property type"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:326
+#: web/index.cgi:338
 msgid "That location is not part of that council"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:346
+#: web/index.cgi:358
 msgid "We have details for that council"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:355
+#: web/index.cgi:367
 msgid "Somehow, you only have one co-ordinate. Please try again."
 msgstr ""
 
-#: fixmystreet/web/index.cgi:357
+#: web/index.cgi:369
 msgid "You haven't specified any sort of co-ordinates. Please try again."
 msgstr ""
 
-#: fixmystreet/web/index.cgi:380 fixmystreet/web/index.cgi:552 fixmystreet/web/index.cgi:559
+#: web/index.cgi:392 web/index.cgi:558 web/index.cgi:565
 msgid "Other"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:397
+#: web/index.cgi:408
 #, perl-format
 msgid ""
 "You have successfully confirmed your report and you can now <a href=\"%s"
 "\">view it on the site</a>."
 msgstr ""
 
-#: fixmystreet/web/index.cgi:538
+#: web/index.cgi:545
 msgid ""
 "That spot does not appear to be covered by a council.\n"
 "If you have tried to report an issue past the shoreline, for example,\n"
 "please specify the closest point on land."
 msgstr ""
 
-#: fixmystreet/web/index.cgi:560
+#: web/index.cgi:566
 msgid "Category:"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:566
+#: web/index.cgi:572
 msgid "Empty house or bungalow"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:567
+#: web/index.cgi:573
 msgid "Empty flat or maisonette"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:567
+#: web/index.cgi:573
 msgid "Whole block of empty flats"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:568
+#: web/index.cgi:574
 msgid "Empty office or other commercial"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:568
+#: web/index.cgi:574
 msgid "Empty pub or bar"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:569
+#: web/index.cgi:575
 msgid "Empty public building - school, hospital, etc."
 msgstr ""
 
-#: fixmystreet/web/index.cgi:570
+#: web/index.cgi:576
 msgid "Property type:"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:629
+#: web/index.cgi:635
 msgid ""
 "You have located the problem at the point marked with a purple pin on the "
 "map.\n"
 "If this is not the correct location, simply click on the map again. "
 msgstr ""
 
-#: fixmystreet/web/index.cgi:637
+#: web/index.cgi:643
 #, perl-format
 msgid ""
 "All the information you provide here will be sent to <strong>%s</strong>.\n"
@@ -960,7 +1067,7 @@ msgid ""
 "name if you give us permission."
 msgstr ""
 
-#: fixmystreet/web/index.cgi:641
+#: web/index.cgi:647
 #, perl-format
 msgid ""
 "All the information you provide here will be sent to <strong>%s</strong>.\n"
@@ -968,21 +1075,64 @@ msgid ""
 "name if you give us permission."
 msgstr ""
 
-#: fixmystreet/web/index.cgi:677
+#: web/index.cgi:660 web/index.cgi:662 web/index.cgi:675
+msgid " or "
+msgstr ""
+
+#: web/index.cgi:661
+msgid "All the information you provide here will be sent to"
+msgstr ""
+
+#: web/index.cgi:664
 msgid ""
-"<p>We do not yet have details for the council that covers\n"
-"this location. If you submit a report here it will be left on the site, but\n"
-"not reported to the council &ndash; please still leave your report, so that\n"
-"we can show to the council the activity in their area."
+"The subject and details of the problem will be public, plus your name if you "
+"give us permission."
 msgstr ""
 
-#: fixmystreet/web/index.cgi:686
+#: web/index.cgi:666
+msgid ""
+"We do <strong>not</strong> yet have details for the other council that "
+"covers this location."
+msgid_plural ""
+"We do <strong>not</strong> yet have details for the other councils that "
+"cover this location."
+msgstr[0] ""
+msgstr[1] ""
+
+#: web/index.cgi:670 web/index.cgi:685
+#, perl-format
+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 ""
+
+#: web/index.cgi:680 web/index.cgi:688
+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] ""
+
+#: web/index.cgi:684
+msgid ""
+"If you submit a problem here the subject and details of the problem will be "
+"public, but the problem will <strong>not</strong> be reported to the council."
+msgstr ""
+
+#: web/index.cgi:690
+msgid ""
+"If you submit a report here it will be left on the site, but not reported to "
+"the council &ndash; please still leave your report, so that we can show to "
+"the council the activity in their area."
+msgstr ""
+
+#: web/index.cgi:696
 msgid ""
 "Please fill in the form below with details of the problem,\n"
 "and describe the location as precisely as possible in the details box."
 msgstr ""
 
-#: fixmystreet/web/index.cgi:695
+#: web/index.cgi:705
 msgid ""
 "Please fill in details of the empty property below, saying what type of\n"
 "property it is e.g. an empty home, block of flats, office etc. Tell us\n"
@@ -995,7 +1145,7 @@ msgid ""
 "to read, as does a lack of punctuation.\n"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:703
+#: web/index.cgi:713
 msgid ""
 "Please fill in details of the problem below. The council won't be able\n"
 "to help unless you leave as much detail as you can, so please describe the "
@@ -1005,218 +1155,262 @@ msgid ""
 "photo of the problem if you have one), etc."
 msgstr ""
 
-#: fixmystreet/web/index.cgi:708
+#: web/index.cgi:718
 msgid "Please fill in details of the problem below."
 msgstr ""
 
-#: fixmystreet/web/index.cgi:721
+#: web/index.cgi:731
 msgid "Empty property details form"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:723
+#: web/index.cgi:733
 msgid "Details:"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:724 fixmystreet/web/index.cgi:1010
+#: web/index.cgi:734 web/index.cgi:1108
 msgid "Photo:"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:725 fixmystreet/web/index.cgi:1003
+#: web/index.cgi:735 web/index.cgi:1089
 msgid "Name:"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:727 fixmystreet/bin/send-reports:81
+#: web/index.cgi:737 bin/send-reports:89
 msgid "Phone:"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:728
+#: web/index.cgi:738 web/index.cgi:1096
 msgid "(optional)"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:730
+#: web/index.cgi:740
 msgid "Can we show your name on the site?"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:732
+#: web/index.cgi:742
 msgid "Can we show your name publicly?"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:734
+#: web/index.cgi:744
 msgid "(we never show your email address or phone number)"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:790
+#: web/index.cgi:771
+msgid "Please note:"
+msgstr ""
+
+#: web/index.cgi:773
+msgid ""
+"We will only use your personal information in accordance with our <a href=\"/"
+"faq#privacy\">privacy policy.</a>"
+msgstr ""
+
+#: web/index.cgi:774
+msgid "Please be polite, concise and to the point."
+msgstr ""
+
+#: web/index.cgi:775
+msgid ""
+"Please do not be abusive &mdash; abusing your council devalues the service "
+"for all users."
+msgstr ""
+
+#: web/index.cgi:776
+msgid ""
+"Writing your message entirely in block capitals makes it hard to read, as "
+"does a lack of punctuation."
+msgstr ""
+
+#: web/index.cgi:777
+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 ""
+
+#: web/index.cgi:779
+msgid ""
+"FixMyStreet and the Guardian are providing this service in partnership in <a "
+"href=\"/faq#privacy\">certain cities</a>. In those cities, both have access "
+"to any information submitted, including names and email addresses, and will "
+"use it only to ensure the smooth running of the service, in accordance with "
+"their privacy policies."
+msgstr ""
+
+#: web/index.cgi:788
 msgid "Submit"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:825
+#: web/index.cgi:883
 msgid "Hide stale reports"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:828
+#: web/index.cgi:886
 msgid "Include stale reports"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:834
-msgid "Show pins"
+#: web/index.cgi:905
+msgid "No problems have been reported yet."
 msgstr ""
 
-#: fixmystreet/web/index.cgi:838
-msgid "Hide pins"
+#: web/index.cgi:921
+msgid "No problems found."
 msgstr ""
 
-#: fixmystreet/web/index.cgi:852
-msgid "No problems have been reported yet."
+#: web/index.cgi:926
+msgid "Show pins"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:866
-msgid "No problems found."
+#: web/index.cgi:930
+msgid "Hide pins"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:877
+#: web/index.cgi:969
 msgid "Email me new local problems"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:879
+#: web/index.cgi:971
 msgid "RSS feed of recent local problems"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:882
+#: web/index.cgi:974
 msgid "Problems in this area"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:883
+#: web/index.cgi:975
 msgid "Reports on and around the map"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:884
+#: web/index.cgi:976
 #, perl-format
 msgid "Closest nearby problems <small>(within&nbsp;%skm)</small>"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:887
+#: web/index.cgi:980
 msgid ""
 "To report a problem, simply\n"
 "        <strong>click on the map</strong> at the correct location."
 msgstr ""
 
-#: fixmystreet/web/index.cgi:889
+#: web/index.cgi:982
 #, perl-format
 msgid ""
 "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this\n"
 "        step</a>.</small>"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:894
+#: web/index.cgi:987
 msgid "Recent local problems, FixMyStreet"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:905
+#: web/index.cgi:1000
 msgid "There were problems with your update. Please see below."
 msgstr ""
 
-#: fixmystreet/web/index.cgi:928 fixmystreet/web/index.cgi:930
+#: web/index.cgi:1021 web/index.cgi:1023
 msgid "Unknown problem ID"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:931
+#: web/index.cgi:1024
 msgid "That report has been removed from FixMyStreet."
 msgstr ""
 
-#: fixmystreet/web/index.cgi:956
+#: web/index.cgi:1044
 msgid "This problem is old and of unknown status."
 msgstr ""
 
-#: fixmystreet/web/index.cgi:959 fixmystreet/web/index.cgi:1002
+#: web/index.cgi:1047 web/index.cgi:1088
 msgid "This problem has been fixed"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:971
+#: web/index.cgi:1072
 msgid "More problems nearby"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:976
+#: web/index.cgi:1075
 msgid "Email me updates"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:979
+#: web/index.cgi:1078
 msgid "Receive email when updates are left on this problem"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:984
+#: web/index.cgi:1083
 msgid "RSS feed of updates to this problem"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:987
+#: web/index.cgi:1084
 msgid "Provide an update"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:988
-msgid ""
-"Please note that updates are not sent to the council. If you leave your name "
-"it will be public. Your information will only be used in accordance with our "
-"<a href=\"/faq#privacy\">privacy policy</a>"
-msgstr ""
-
-#: fixmystreet/web/index.cgi:1004
+#: web/index.cgi:1090
 msgid "Update:"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:1005
+#: web/index.cgi:1091
 msgid "Alert me to future updates"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:1025
+#: web/index.cgi:1099
+msgid ""
+"Please note that updates are not sent to the council. If you leave your name "
+"it will be public. Your information will only be used in accordance with our "
+"<a href=\"/faq#privacy\">privacy policy</a>"
+msgstr ""
+
+#: web/index.cgi:1119
 msgid "Updates to this problem, FixMyStreet"
 msgstr ""
 
-#: fixmystreet/web/questionnaire.cgi:28 fixmystreet/web/questionnaire.cgi:201
+#: web/questionnaire.cgi:29 web/questionnaire.cgi:80 web/questionnaire.cgi:213
+#: web/questionnaire.cgi:233
 msgid "Questionnaire"
 msgstr ""
 
-#: fixmystreet/web/questionnaire.cgi:38
+#: web/questionnaire.cgi:41
 msgid ""
 "I'm afraid we couldn't validate that token. If you've copied the URL from an "
 "email, please check that you copied it exactly.\n"
 msgstr ""
 
-#: fixmystreet/web/questionnaire.cgi:43
+#: web/questionnaire.cgi:48
 #, perl-format
 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 ""
 
-#: fixmystreet/web/questionnaire.cgi:48
+#: web/questionnaire.cgi:53
 msgid "I'm afraid we couldn't locate your problem in the database.\n"
 msgstr ""
 
-#: fixmystreet/web/questionnaire.cgi:79
+#: web/questionnaire.cgi:92
 msgid "Please state whether or not the problem has been fixed"
 msgstr ""
 
-#: fixmystreet/web/questionnaire.cgi:80
+#: web/questionnaire.cgi:95
 msgid ""
 "Please say whether you've ever reported a problem to your council before"
 msgstr ""
 
-#: fixmystreet/web/questionnaire.cgi:81
+#: web/questionnaire.cgi:97
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr ""
 
-#: fixmystreet/web/questionnaire.cgi:83
+#: web/questionnaire.cgi:99
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr ""
 
-#: fixmystreet/web/questionnaire.cgi:99
+#: web/questionnaire.cgi:115
 msgid "Please provide some text as well as a photo"
 msgstr ""
 
-#: fixmystreet/web/questionnaire.cgi:130
+#: web/questionnaire.cgi:146
 msgid "Questionnaire filled in by problem reporter"
 msgstr ""
 
-#: fixmystreet/web/questionnaire.cgi:148
+#: web/questionnaire.cgi:166
 msgid ""
 "<p>Thank you very much for filling in our questionnaire; if you\n"
 "get some more information about the status of your problem, please come back "
@@ -1224,33 +1418,33 @@ msgid ""
 "site and leave an update.</p>\n"
 msgstr ""
 
-#: fixmystreet/web/questionnaire.cgi:154
+#: web/questionnaire.cgi:174
+#, perl-format
 msgid ""
 "<p style=\"font-size:150%%\">We're sorry to hear that. We have two "
 "suggestions: why not try\n"
-"<a href=\"%s\">writing direct to your councillor(s)"
-"</a>\n"
+"<a href=\"%s\">writing direct to your councillor(s)</a>\n"
 "or, if it's a problem that could be fixed by local people working together,\n"
 "why not <a href=\"http://www.pledgebank.com/new\">make and publicise a "
 "pledge</a>?\n"
 "</p>\n"
 msgstr ""
 
-#: fixmystreet/web/questionnaire.cgi:162
+#: web/questionnaire.cgi:183
 msgid ""
 "<p style=\"font-size:150%\">Thank you very much for filling in our "
 "questionnaire; glad to hear it's been fixed.</p>\n"
 msgstr ""
 
-#: fixmystreet/web/questionnaire.cgi:204
+#: web/questionnaire.cgi:236
 msgid "Don&rsquo;t know"
 msgstr ""
 
-#: fixmystreet/web/questionnaire.cgi:205
+#: web/questionnaire.cgi:237
 msgid "Submit questionnaire"
 msgstr ""
 
-#: fixmystreet/web/questionnaire.cgi:220
+#: web/questionnaire.cgi:254
 msgid ""
 "<p>Getting empty homes back into use can be difficult. You shouldn't expect\n"
 "the property to be back into use yet. But a good council will have started "
@@ -1265,7 +1459,7 @@ msgid ""
 "www.emptyhomes.com/getinvolved/campaign.html</a>.</p>\n"
 msgstr ""
 
-#: fixmystreet/web/questionnaire.cgi:230
+#: web/questionnaire.cgi:264
 msgid ""
 "<p>Getting empty homes back into use can be difficult, but by now a good "
 "council\n"
@@ -1283,241 +1477,565 @@ msgid ""
 "emptyhomes.com/getinvolved/campaign.html</a>.</p>\n"
 msgstr ""
 
-#: fixmystreet/web/questionnaire.cgi:243
+#: web/questionnaire.cgi:277
 msgid ""
 "The details of your problem are available on the right hand side of this "
 "page."
 msgstr ""
 
-#: fixmystreet/web/questionnaire.cgi:244
+#: web/questionnaire.cgi:278
 msgid "Please take a look at the updates that have been left."
 msgstr ""
 
-#: fixmystreet/web/questionnaire.cgi:250
+#: web/questionnaire.cgi:284
 msgid "An update marked this problem as fixed."
 msgstr ""
 
-#: fixmystreet/web/questionnaire.cgi:251
+#: web/questionnaire.cgi:285
 msgid "Has this problem been fixed?"
 msgstr ""
 
-#: fixmystreet/web/questionnaire.cgi:258
+#: web/questionnaire.cgi:292
 msgid "Reported before"
 msgstr ""
 
-#: fixmystreet/web/questionnaire.cgi:259
+#: web/questionnaire.cgi:293
 msgid "First time"
 msgstr ""
 
-#: fixmystreet/web/questionnaire.cgi:260
+#: web/questionnaire.cgi:294
 msgid ""
 "Have you ever reported a problem to a council before, or is this your first "
 "time?"
 msgstr ""
 
-#: fixmystreet/web/questionnaire.cgi:270
+#: web/questionnaire.cgi:304
 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). For example, what was\n"
 "your experience of getting the problem fixed?"
 msgstr ""
 
-#: fixmystreet/web/reports.cgi:142 fixmystreet/web/reports.cgi:184
+#: web/reports.cgi:192 web/reports.cgi:239
 msgid "Summary reports"
 msgstr ""
 
-#: fixmystreet/web/reports.cgi:144
+#: web/reports.cgi:194
 msgid ""
 "This is a summary of all reports on this site; select a particular council "
 "to see the reports sent there."
 msgstr ""
 
-#: fixmystreet/web/reports.cgi:145
+#: web/reports.cgi:195
 msgid "Greyed-out lines are councils that no longer exist."
 msgstr ""
 
-#: fixmystreet/web/reports.cgi:149
+#: web/reports.cgi:199
 msgid "Name"
 msgstr ""
 
-#: fixmystreet/web/reports.cgi:149 fixmystreet/web/reports.cgi:219
+#: web/reports.cgi:199 web/reports.cgi:275
 msgid "New problems"
 msgstr ""
 
-#: fixmystreet/web/reports.cgi:149 fixmystreet/web/reports.cgi:227
+#: web/reports.cgi:199 web/reports.cgi:283
 msgid "Older problems"
 msgstr ""
 
-#: fixmystreet/web/reports.cgi:151
+#: web/reports.cgi:201
 msgid "Old problems,<br>state unknown"
 msgstr ""
 
-#: fixmystreet/web/reports.cgi:153 fixmystreet/web/reports.cgi:234
+#: web/reports.cgi:203 web/reports.cgi:290
 msgid "Recently fixed"
 msgstr ""
 
-#: fixmystreet/web/reports.cgi:153
+#: web/reports.cgi:203
 msgid "Older fixed"
 msgstr ""
 
-#: fixmystreet/web/reports.cgi:190
+#: web/reports.cgi:245
 msgid "council"
 msgstr ""
 
-#: fixmystreet/web/reports.cgi:200
+#: web/reports.cgi:255
 #, perl-format
 msgid "RSS feed of problems in this %s"
 msgstr ""
 
-#: fixmystreet/web/reports.cgi:204
+#: web/reports.cgi:259
 #, perl-format
 msgid "This is a summary of all reports for one %s."
 msgstr ""
 
-#: fixmystreet/web/reports.cgi:205
+#: web/reports.cgi:260
 #, perl-format
 msgid "This is a summary of all reports for this %s."
 msgstr ""
 
-#: fixmystreet/web/reports.cgi:209
+#: web/reports.cgi:264
 #, perl-format
 msgid "You can <a href=\"%s\">see less detail</a>."
 msgstr ""
 
-#: fixmystreet/web/reports.cgi:211
+#: web/reports.cgi:266
 #, perl-format
 msgid "You can <a href=\"%s\">see more details</a>."
 msgstr ""
 
-#: fixmystreet/web/reports.cgi:213
+#: web/reports.cgi:268
 #, perl-format
 msgid ""
 "You can <a href=\"%s\">see less detail</a> or go back and <a href=\"/reports"
 "\">show all councils</a>."
 msgstr ""
 
-#: fixmystreet/web/reports.cgi:215
+#: web/reports.cgi:270
 #, perl-format
 msgid ""
 "You can <a href=\"%s\">see more details</a> or go back and <a href=\"/reports"
 "\">show all councils</a>."
 msgstr ""
 
-#: fixmystreet/web/reports.cgi:229
+#: web/reports.cgi:285
 msgid "Old problems, state unknown"
 msgstr ""
 
-#: fixmystreet/web/reports.cgi:235
+#: web/reports.cgi:291
 msgid "Old fixed"
 msgstr ""
 
-#: fixmystreet/web/reports.cgi:239
+#: web/reports.cgi:294
 #, perl-format
 msgid "%s - Summary reports"
 msgstr ""
 
-#: fixmystreet/web/reports.cgi:239
+#: web/reports.cgi:294
 #, perl-format
 msgid "Problems within %s, FixMyStreet"
 msgstr ""
 
-#: fixmystreet/bin/send-questionnaires-eha:94
-msgid "Report Empty Homes"
+#: web/reports.cgi:334
+msgid "(not sent to council)"
 msgstr ""
 
-#: fixmystreet/bin/send-reports:83
+#: bin/send-reports:91
 msgid ""
 "This web page also contains a photo of the problem, provided by the user."
 msgstr ""
 
-#: fixmystreet/bin/send-reports:89
+#: bin/send-reports:97
 msgid "To view a map of the precise location of this issue"
 msgstr ""
 
-#: fixmystreet/bin/send-reports:90
+#: bin/send-reports:98
 msgid ""
 "The user could not locate the problem on a map, but to see the area around "
 "the location they entered"
 msgstr ""
 
-#: fixmystreet/bin/send-reports:94
+#: bin/send-reports:178
+msgid "this type of local problem"
+msgstr ""
+
+#: bin/send-reports:182
 #, perl-format
-msgid ""
-"The closest address, as the crow flies, to the location of this problem, "
-"%.0fm away, is: %s - please note that this is automatically generated, so "
-"ensure that you check it against the details provided by the user and, if "
-"possible, the map."
+msgid "Category: %s"
 msgstr ""
 
-#: fixmystreet/db/alert_types_eha.pl:5 fixmystreet/db/alert_types_eha.pl:6
-#, perl-brace-format
-msgid "Updates on {{title}}"
+#: bin/send-reports:185
+msgid " and "
 msgstr ""
 
-#: fixmystreet/db/alert_types_eha.pl:7
-#, perl-brace-format
-msgid "Update by {{name}}"
+#: bin/send-reports:186
+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 ""
 
-#: fixmystreet/db/alert_types_eha.pl:10
-msgid "New reports on reportemptyhomes.com"
+#: bin/send-reports:192
+#, perl-format
+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 ""
 
-#: fixmystreet/db/alert_types_eha.pl:11
-msgid "The latest empty properties reported by users"
+#: db/alert_types_eha.pl:5
+msgid "New reports on reportemptyhomes.com"
 msgstr ""
 
-#: fixmystreet/db/alert_types_eha.pl:14
+#: db/alert_types_eha.pl:8
 msgid "Properties recently reported as put back to use on reportemptyhomes.com"
 msgstr ""
 
-#: fixmystreet/db/alert_types_eha.pl:15
+#: db/alert_types_eha.pl:9
 msgid "The latest properties reported back to use by users"
 msgstr ""
 
-#: fixmystreet/db/alert_types_eha.pl:18
+#: db/alert_types_eha.pl:12
 msgid "New local reports on reportemptyhomes.com"
 msgstr ""
 
-#: fixmystreet/db/alert_types_eha.pl:19
+#: db/alert_types_eha.pl:13
 msgid "The latest local reports reported by users"
 msgstr ""
 
-#: fixmystreet/db/alert_types_eha.pl:22
+#: db/alert_types_eha.pl:16
+#, perl-brace-format
+msgid "New reports on reportemptyhomes.com near {{POSTCODE}}"
+msgstr ""
+
+#: db/alert_types_eha.pl:19
 #, perl-brace-format
 msgid "New reports to {{COUNCIL}} on reportemptyhomes.com"
 msgstr ""
 
-#: fixmystreet/db/alert_types_eha.pl:23
+#: db/alert_types_eha.pl:20
 #, perl-brace-format
 msgid "The latest reports for {{COUNCIL}} reported by users"
 msgstr ""
 
-#: fixmystreet/db/alert_types_eha.pl:26
+#: db/alert_types_eha.pl:23
 #, perl-brace-format
 msgid ""
 "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com"
 msgstr ""
 
-#: fixmystreet/db/alert_types_eha.pl:27
+#: db/alert_types_eha.pl:24
 #, perl-brace-format
 msgid ""
 "The latest reports for {{COUNCIL}} within {{WARD}} ward reported by users"
 msgstr ""
 
-#: fixmystreet/db/alert_types_eha.pl:30
+#: db/alert_types_eha.pl:27
 #, perl-brace-format
 msgid "New reports within {{NAME}}'s boundary on reportemptyhomes.com"
 msgstr ""
 
-#: fixmystreet/db/alert_types_eha.pl:31
+#: db/alert_types_eha.pl:28
 #, perl-brace-format
 msgid "The latest reports within {{NAME}}'s boundary reported by users"
 msgstr ""
 
+#: db/alert_types.pl:5 db/alert_types.pl:6
+#, perl-brace-format
+msgid "Updates on {{title}}"
+msgstr ""
+
+#: db/alert_types.pl:7
+#, perl-brace-format
+msgid "Update by {{name}}"
+msgstr ""
+
+#: db/alert_types.pl:10
+msgid "New problems on FixMyStreet"
+msgstr ""
+
+#: db/alert_types.pl:11
+msgid "The latest problems reported by users"
+msgstr ""
+
+#: db/alert_types.pl:14
+msgid "Problems recently reported fixed on FixMyStreet"
+msgstr ""
+
+#: db/alert_types.pl:15
+msgid "The latest problems reported fixed by users"
+msgstr ""
+
+#: db/alert_types.pl:18 db/alert_types.pl:22
+msgid "New local problems on FixMyStreet"
+msgstr ""
+
+#: db/alert_types.pl:19 db/alert_types.pl:23 db/alert_types.pl:27
+#: db/alert_types.pl:31
+msgid "The latest local problems reported by users"
+msgstr ""
+
+#: db/alert_types.pl:26
+#, perl-brace-format
+msgid "New problems near {{POSTCODE}} on FixMyStreet"
+msgstr ""
+
+#: db/alert_types.pl:30
+#, perl-brace-format
+msgid "New problems NEAR {{POSTCODE}} on FixMyStreet"
+msgstr ""
+
+#: db/alert_types.pl:34
+#, perl-brace-format
+msgid "New problems to {{COUNCIL}} on FixMyStreet"
+msgstr ""
+
+#: db/alert_types.pl:35
+#, perl-brace-format
+msgid "The latest problems for {{COUNCIL}} reported by users"
+msgstr ""
+
+#: db/alert_types.pl:38
+#, perl-brace-format
+msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet"
+msgstr ""
+
+#: db/alert_types.pl:39
+#, perl-brace-format
+msgid ""
+"The latest problems for {{COUNCIL}} within {{WARD}} ward reported by users"
+msgstr ""
+
+#: db/alert_types.pl:42
+#, perl-brace-format
+msgid "New problems within {{NAME}}"
+msgstr ""
+
+#: db/alert_types.pl:43
+#, perl-brace-format
+msgid "The latest problems within {{NAME}}"
+msgstr ""
+
+#: web-admin/index.cgi:68 web-admin/index.cgi:123 web-admin/index.cgi:124
+msgid "Summary"
+msgstr ""
+
+#: web-admin/index.cgi:69 web-admin/index.cgi:182 web-admin/index.cgi:183
+msgid "Council contacts"
+msgstr ""
+
+#: web-admin/index.cgi:71 web-admin/index.cgi:782 web-admin/index.cgi:783
+msgid "Timeline"
+msgstr ""
+
+#: web-admin/index.cgi:84
+msgid "FixMyStreet administration"
+msgstr ""
+
+#: web-admin/index.cgi:100
+msgid "FixMyStreet admin:"
+msgstr ""
+
+#: web-admin/index.cgi:162
+msgid "Graph of problem creation by status over time"
+msgstr ""
+
+#: web-admin/index.cgi:165
+msgid "Problem breakdown by state"
+msgstr ""
+
+#: web-admin/index.cgi:170
+msgid "Update breakdown by state"
+msgstr ""
+
+#: web-admin/index.cgi:186
+msgid "Diligency prize league table"
+msgstr ""
+
+#: web-admin/index.cgi:193
+msgid "No edits have yet been made."
+msgstr ""
+
+#: web-admin/index.cgi:197
+msgid "Councils"
+msgstr ""
+
+#: web-admin/index.cgi:210 web-admin/index.cgi:585
+msgid "None"
+msgstr ""
+
+#: web-admin/index.cgi:228
+msgid "No info at all"
+msgstr ""
+
+#: web-admin/index.cgi:230
+msgid "Currently has 1+ deleted"
+msgstr ""
+
+#: web-admin/index.cgi:232
+msgid "Some unconfirmeds"
+msgstr ""
+
+#: web-admin/index.cgi:234
+msgid "All confirmed"
+msgstr ""
+
+#: web-admin/index.cgi:264 web-admin/index.cgi:274 web-admin/index.cgi:291
+msgid "*unknown*"
+msgstr ""
+
+#: web-admin/index.cgi:267 web-admin/index.cgi:295
+msgid "Values updated"
+msgstr ""
+
+#: web-admin/index.cgi:277
+msgid "New category contact added"
+msgstr ""
+
+#: web-admin/index.cgi:314 web-admin/index.cgi:397
+#, perl-format
+msgid "Council contacts for %s"
+msgstr ""
+
+#: web-admin/index.cgi:327
+msgid " List all reported problems"
+msgstr ""
+
+#: web-admin/index.cgi:329
+msgid "Text only version"
+msgstr ""
+
+#: web-admin/index.cgi:335
+msgid "Category"
+msgstr ""
+
+#: web-admin/index.cgi:335 web-admin/index.cgi:437
+msgid "Email"
+msgstr ""
+
+#: web-admin/index.cgi:335 web-admin/index.cgi:367 web-admin/index.cgi:420
+#: web-admin/index.cgi:437 web-admin/index.cgi:736
+msgid "Confirmed"
+msgstr ""
+
+#: web-admin/index.cgi:335 web-admin/index.cgi:369 web-admin/index.cgi:422
+#: web-admin/index.cgi:437
+msgid "Deleted"
+msgstr ""
+
+#: web-admin/index.cgi:335
+msgid "Last editor"
+msgstr ""
+
+#: web-admin/index.cgi:335 web-admin/index.cgi:437
+msgid "Note"
+msgstr ""
+
+#: web-admin/index.cgi:335 web-admin/index.cgi:437
+msgid "When edited"
+msgstr ""
+
+#: web-admin/index.cgi:335
+msgid "Confirm"
+msgstr ""
+
+#: web-admin/index.cgi:352
+msgid "Update statuses"
+msgstr ""
+
+#: web-admin/index.cgi:357
+msgid "Add new category"
+msgstr ""
+
+#: web-admin/index.cgi:360 web-admin/index.cgi:414
+msgid "Category: "
+msgstr ""
+
+#: web-admin/index.cgi:363 web-admin/index.cgi:417
+msgid "Email: "
+msgstr ""
+
+#: web-admin/index.cgi:372 web-admin/index.cgi:425
+msgid "Note: "
+msgstr ""
+
+#: web-admin/index.cgi:379
+msgid "Create category"
+msgstr ""
+
+#: web-admin/index.cgi:431
+msgid "Save changes"
+msgstr ""
+
+#: web-admin/index.cgi:435
+msgid "History"
+msgstr ""
+
+#: web-admin/index.cgi:437
+msgid "Editor"
+msgstr ""
+
+#: web-admin/index.cgi:441 web-admin/index.cgi:442
+msgid "yes"
+msgstr ""
+
+#: web-admin/index.cgi:441 web-admin/index.cgi:442
+msgid "no"
+msgstr ""
+
+#: web-admin/index.cgi:469
+msgid "Search:"
+msgstr ""
+
+#: web-admin/index.cgi:541
+msgid "That problem will now be resent."
+msgstr ""
+
+#: web-admin/index.cgi:547
+msgid "I am afraid you cannot confirm unconfirmed reports."
+msgstr ""
+
+#: web-admin/index.cgi:576 web-admin/index.cgi:696
+msgid "Updated!"
+msgstr ""
+
+#: web-admin/index.cgi:580
+#, perl-format
+msgid "Editing problem %d"
+msgstr ""
+
+#: web-admin/index.cgi:608 web-admin/index.cgi:736
+msgid "State:"
+msgstr ""
+
+#: web-admin/index.cgi:608
+msgid "Open"
+msgstr ""
+
+#: web-admin/index.cgi:608
+msgid "Fixed"
+msgstr ""
+
+#: web-admin/index.cgi:608 web-admin/index.cgi:736
+msgid "Hidden"
+msgstr ""
+
+#: web-admin/index.cgi:608 web-admin/index.cgi:736
+msgid "Unconfirmed"
+msgstr ""
+
+#: web-admin/index.cgi:608
+msgid "Partial"
+msgstr ""
+
+#: web-admin/index.cgi:611
+msgid "You really want to resend?"
+msgstr ""
+
+#: web-admin/index.cgi:611
+msgid "Resend report"
+msgstr ""
+
+#: web-admin/index.cgi:642 web-admin/index.cgi:756
+msgid "Submit changes"
+msgstr ""
+
+#: web-admin/index.cgi:674
+msgid "Edit"
+msgstr ""
+
+#: web-admin/index.cgi:701
+msgid "Problem marked as open."
+msgstr ""
+
+#: web-admin/index.cgi:717
+#, perl-format
+msgid "Editing update %d"
+msgstr ""
+
 #. Please leave the first word "Subject:" untranslated
 
-#: fixmystreet/templates/emails/alert-confirm
+#: templates/emails/alert-confirm
 msgid ""
 "Subject: Confirm your alert on FixMyStreet\n"
 "\n"
@@ -1535,7 +2053,7 @@ msgid ""
 "The FixMyStreet team\n"
 msgstr ""
 
-#: fixmystreet/templates/emails/alert-problem
+#: templates/emails/alert-problem
 msgid ""
 "Subject: New problems on FixMyStreet\n"
 "\n"
@@ -1550,7 +2068,7 @@ msgid ""
 "please follow this link: <?=$values['unsubscribe_url']?>\n"
 msgstr ""
 
-#: fixmystreet/templates/emails/alert-problem-area
+#: templates/emails/alert-problem-area
 msgid ""
 "Subject: New problems in <?=$values['area_name']?> on FixMyStreet\n"
 "\n"
@@ -1567,7 +2085,7 @@ msgid ""
 "<?=$values['unsubscribe_url']?>\n"
 msgstr ""
 
-#: fixmystreet/templates/emails/alert-problem-council
+#: templates/emails/alert-problem-council
 msgid ""
 "Subject: New problems reported to <?=$values['area_name']?> on FixMyStreet\n"
 "\n"
@@ -1583,7 +2101,7 @@ msgid ""
 "<?=$values['unsubscribe_url']?>\n"
 msgstr ""
 
-#: fixmystreet/templates/emails/alert-problem-nearby
+#: templates/emails/alert-problem-nearby
 msgid ""
 "Subject: New nearby problems on FixMyStreet\n"
 "\n"
@@ -1598,7 +2116,7 @@ msgid ""
 "please follow this link: <?=$values['unsubscribe_url']?>\n"
 msgstr ""
 
-#: fixmystreet/templates/emails/alert-problem-ward
+#: templates/emails/alert-problem-ward
 msgid ""
 "Subject: New problems reported to <?=$values['area_name']?> within <?=$values['ward_name']?> on FixMyStreet\n"
 "\n"
@@ -1615,7 +2133,7 @@ msgid ""
 "please follow this link: <?=$values['unsubscribe_url']?>\n"
 msgstr ""
 
-#: fixmystreet/templates/emails/alert-update
+#: templates/emails/alert-update
 msgid ""
 "Subject: New updates on problem - '<?=$values['title']?>'\n"
 "\n"
@@ -1623,6 +2141,8 @@ msgid ""
 "\n"
 "<?=$values['data']?>\n"
 "\n"
+"<?=$values['state_message']?>\n"
+"\n"
 "To view or reply to these updates, please visit the following URL:\n"
 "    <?=$values['problem_url']?>\n"
 "\n"
@@ -1635,7 +2155,7 @@ msgid ""
 "please follow this link: <?=$values['unsubscribe_url']?>\n"
 msgstr ""
 
-#: fixmystreet/templates/emails/empty property-confirm
+#: templates/emails/empty property-confirm
 msgid ""
 "Subject: Confirm your empty property report\n"
 "\n"
@@ -1659,7 +2179,7 @@ msgid ""
 "reportemptyhomes.com\n"
 msgstr ""
 
-#: fixmystreet/templates/emails/flickr-confirm
+#: templates/emails/flickr-confirm
 msgid ""
 "Subject: Confirm your email address on FixMyStreet\n"
 "\n"
@@ -1677,7 +2197,7 @@ msgid ""
 "The FixMyStreet team\n"
 msgstr ""
 
-#: fixmystreet/templates/emails/flickr-submit
+#: templates/emails/flickr-submit
 msgid ""
 "Subject: New photo pulled from Flickr to FixMyStreet\n"
 "\n"
@@ -1695,7 +2215,7 @@ msgid ""
 "The FixMyStreet team\n"
 msgstr ""
 
-#: fixmystreet/templates/emails/partial
+#: templates/emails/partial
 msgid ""
 "Subject: Confirm your report on FixMyStreet\n"
 "\n"
@@ -1713,7 +2233,7 @@ msgid ""
 "The FixMyStreet team\n"
 msgstr ""
 
-#: fixmystreet/templates/emails/problem-confirm
+#: templates/emails/problem-confirm
 msgid ""
 "Subject: Confirm your problem on FixMyStreet\n"
 "\n"
@@ -1737,7 +2257,7 @@ msgid ""
 "The FixMyStreet team\n"
 msgstr ""
 
-#: fixmystreet/templates/emails/questionnaire
+#: templates/emails/questionnaire
 msgid ""
 "Subject: Questionnaire about your problem on FixMyStreet\n"
 "\n"
@@ -1765,7 +2285,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fixmystreet/templates/emails/questionnaire-eha-26weeks
+#: templates/emails/questionnaire-eha-26weeks
 msgid ""
 "Subject: Questionnaire about your empty property report\n"
 "\n"
@@ -1794,7 +2314,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fixmystreet/templates/emails/questionnaire-eha-4weeks
+#: templates/emails/questionnaire-eha-4weeks
 msgid ""
 "Subject: Questionnaire about your empty property report\n"
 "\n"
@@ -1823,7 +2343,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fixmystreet/templates/emails/reply-autoresponse
+#: templates/emails/reply-autoresponse
 msgid ""
 "Subject: Automatic reply to your message to FixMyStreet\n"
 "\n"
@@ -1850,7 +2370,7 @@ msgid ""
 "The FixMyStreet team\n"
 msgstr ""
 
-#: fixmystreet/templates/emails/submit-brent
+#: templates/emails/submit-brent
 msgid ""
 "Subject: FMS Problem Report: <?=$values['title']?>\n"
 "\n"
@@ -1875,9 +2395,9 @@ msgid ""
 "\n"
 "Details: <?=$values['detail']?>\n"
 "\n"
-"Easting: <?=$values['easting']?>\n"
+"<?=$values['easting_northing']?>Latitude: <?=$values['latitude']?>\n"
 "\n"
-"Northing: <?=$values['northing']?>\n"
+"Longitude: <?=$values['longitude']?>\n"
 "\n"
 "<?=$values['closest_address_machine']?>----------\n"
 "\n"
@@ -1894,7 +2414,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fixmystreet/templates/emails/submit-council
+#: templates/emails/submit-council
 msgid ""
 "Subject: Problem Report: <?=$values['title']?>\n"
 "\n"
@@ -1919,6 +2439,10 @@ msgid ""
 "\n"
 "Details: <?=$values['detail']?>\n"
 "\n"
+"<?=$values['easting_northing']?>Latitude: <?=$values['latitude']?>\n"
+"\n"
+"Longitude: <?=$values['longitude']?>\n"
+"\n"
 "<?=$values['closest_address']?>----------\n"
 "\n"
 "Replies to this email will go to the user who submitted the problem.\n"
@@ -1934,7 +2458,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fixmystreet/templates/emails/submit-eha
+#: templates/emails/submit-eha
 msgid ""
 "Subject: Empty property report\n"
 "\n"
@@ -1982,7 +2506,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fixmystreet/templates/emails/tms-confirm
+#: templates/emails/tms-confirm
 msgid ""
 "Subject: Confirm your expression of interest in TextMyStreet\n"
 "\n"
@@ -2000,7 +2524,7 @@ msgid ""
 "The FixMyStreet team\n"
 msgstr ""
 
-#: fixmystreet/templates/emails/update-confirm
+#: templates/emails/update-confirm
 msgid ""
 "Subject: Confirm your update on FixMyStreet\n"
 "\n"
@@ -2021,7 +2545,7 @@ msgid ""
 "The FixMyStreet team\n"
 msgstr ""
 
-#: fixmystreet/templates/emails/emptyhomes/alert-problem
+#: templates/emails/emptyhomes/alert-problem
 msgid ""
 "Subject: New empty properties on reportemptyhomes.com\n"
 "\n"
@@ -2036,7 +2560,7 @@ msgid ""
 "please follow this link: <?=$values['unsubscribe_url']?>\n"
 msgstr ""
 
-#: fixmystreet/templates/emails/emptyhomes/alert-problem-area
+#: templates/emails/emptyhomes/alert-problem-area
 msgid ""
 "Subject: New empty properties in <?=$values['area_name']?> on reportemptyhomes.com\n"
 "\n"
@@ -2053,7 +2577,7 @@ msgid ""
 "<?=$values['unsubscribe_url']?>\n"
 msgstr ""
 
-#: fixmystreet/templates/emails/emptyhomes/alert-problem-council
+#: templates/emails/emptyhomes/alert-problem-council
 msgid ""
 "Subject: New empty properties reported to <?=$values['area_name']?> on reportemptyhomes.com\n"
 "\n"
@@ -2069,7 +2593,7 @@ msgid ""
 "<?=$values['unsubscribe_url']?>\n"
 msgstr ""
 
-#: fixmystreet/templates/emails/emptyhomes/alert-problem-nearby
+#: templates/emails/emptyhomes/alert-problem-nearby
 msgid ""
 "Subject: New nearby empty properties on reportemptyhomes.com\n"
 "\n"
@@ -2084,7 +2608,7 @@ msgid ""
 "please follow this link: <?=$values['unsubscribe_url']?>\n"
 msgstr ""
 
-#: fixmystreet/templates/emails/emptyhomes/alert-problem-ward
+#: templates/emails/emptyhomes/alert-problem-ward
 msgid ""
 "Subject: New empty properties reported to <?=$values['area_name']?> within <?=$values['ward_name']?> on reportemptyhomes.com\n"
 "\n"
@@ -2101,7 +2625,7 @@ msgid ""
 "please follow this link: <?=$values['unsubscribe_url']?>\n"
 msgstr ""
 
-#: fixmystreet/templates/emails/emptyhomes/alert-update
+#: templates/emails/emptyhomes/alert-update
 msgid ""
 "Subject: New updates on empty property- '<?=$values['title']?>'\n"
 "\n"
diff --git a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po
index 9c261e149..1bd47967f 100644
--- a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po
+++ b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2009-08-12 12:28+0100\n"
+"POT-Creation-Date: 2011-02-22 13:53+0000\n"
 "PO-Revision-Date: 2009-07-10 14:20-0000\n"
 "Last-Translator: Mark Smith <Mark.Smith@trosol.co.uk>\n"
 "Language-Team: mySociety\n"
@@ -19,907 +19,1180 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: fixmystreet/perllib/Page.pm:78
+#: perllib/Cobrands/Emptyhomes/Util.pm:61 bin/send-questionnaires-eha:93
+msgid "Report Empty Homes"
+msgstr "Adrodd am Eiddo Gwag"
+
+#: perllib/Cobrands/Fiksgatami/Util.pm:27
+#, fuzzy
+msgid "Enter a nearby postcode, or street name and area:"
+msgstr "Cofnodwch god post Prydeinig, neu enw stryd ac ardal gerllaw:"
+
+#: perllib/Page.pm:83
 #, perl-format
-msgid "Please try again later, or <a href=\"mailto:%s\">email us</a> to let us know."
-msgstr "Rhowch gynnig eto'n ddiweddarach, neu <a href=\"mailto:%s\">anfonwch neges e-bost atom</a>i roi gwybod inni."
+msgid ""
+"Please try again later, or <a href=\"mailto:%s\">email us</a> to let us know."
+msgstr ""
+"Rhowch gynnig eto'n ddiweddarach, neu <a href=\"mailto:%s\">anfonwch neges e-"
+"bost atom</a>i roi gwybod inni."
 
-#: fixmystreet/perllib/Page.pm:79
+#: perllib/Page.pm:84
 msgid "Sorry! Something's gone wrong."
 msgstr "Ymddiheuriadau! Mae rhywbeth wedi mynd o'i le."
 
-#: fixmystreet/perllib/Page.pm:80
+#: perllib/Page.pm:85
 msgid "The text of the error was:"
 msgstr "Testun y gwall oedd:"
 
-#: fixmystreet/perllib/Page.pm:167 fixmystreet/perllib/Page.pm:260
+#: perllib/Page.pm:192 web/contact.cgi:107
+msgid "reportemptyhomes.com"
+msgstr "reportemptyhomes.com"
+
+#: perllib/Page.pm:195 perllib/Page.pm:317
 msgid "Report a property"
 msgstr "Rhoi gwybod am eiddo"
 
-#: fixmystreet/perllib/Page.pm:168 fixmystreet/perllib/Page.pm:261
+#: perllib/Page.pm:196 perllib/Page.pm:318
 msgid "Reports"
 msgstr "Adroddiadau"
 
-#: fixmystreet/perllib/Page.pm:169 fixmystreet/perllib/Page.pm:262
+#: perllib/Page.pm:197 perllib/Page.pm:319
 msgid "Get local reports"
 msgstr "Gweld adroddiadau lleol"
 
-#: fixmystreet/perllib/Page.pm:170 fixmystreet/perllib/Page.pm:263
+#: perllib/Page.pm:198 perllib/Page.pm:320
 msgid "FAQs"
 msgstr "Cwestiynau Cyffredin"
 
-#: fixmystreet/perllib/Page.pm:171 fixmystreet/web/about.cgi:19 fixmystreet/web/about.cgi:21
+#: perllib/Page.pm:199 web/about.cgi:19 web/about.cgi:21
 msgid "About us"
 msgstr "Amdanom ni"
 
-#: fixmystreet/perllib/Page.pm:172 fixmystreet/bin/send-questionnaires-eha:93
-msgid "Report Empty Homes"
-msgstr "Adrodd am Eiddo Gwag"
-
-#: fixmystreet/perllib/Page.pm:181 fixmystreet/perllib/Page.pm:551 fixmystreet/web/contact.cgi:64
-msgid "reportemptyhomes.com"
-msgstr "reportemptyhomes.com"
-
-#: fixmystreet/perllib/Page.pm:199
+#: perllib/Page.pm:220
 msgid "Fix<span id=\"my\">My</span>Street"
 msgstr "Trwsio<span id=\"my\">Fy</span>Stryd"
 
-#: fixmystreet/perllib/Page.pm:207
-msgid "This is a developer site; things might break at any time."
+#: perllib/Page.pm:296
+#, fuzzy
+msgid ""
+"This is a developer site; things might break at any time, and the database "
+"will be periodically deleted."
 msgstr "Safle datblygwr yw hwn; gallai pethau dorri unrhyw bryd."
 
-#: fixmystreet/perllib/Page.pm:259
+#: perllib/Page.pm:310
+msgid ""
+"Built by <a href=\"http://www.mysociety.org/\">mySociety</a>, using some <a "
+"href=\"http://github.com/mysociety/fixmystreet\">clever</a>&nbsp;<a href="
+"\"https://secure.mysociety.org/cvstrac/dir?d=mysociety/services/TilMa"
+"\">code</a>."
+msgstr ""
+"Adeiladwyd gan <a href=\"http://www.mysociety.org/\">mySociety</a>, gan "
+"ddefnyddio tipyn o <a href=\"https://secure.mysociety.org/cvstrac/dir?"
+"d=mysociety/services/TilMa\">god</a><a href=\"http://github.com/mysociety/"
+"fixmystreet\">clyfar</a>&nbsp;."
+
+#: perllib/Page.pm:312
+#, fuzzy
+msgid ""
+"Built by <a href=\"http://www.mysociety.org/\">mySociety</a> and maintained "
+"by <a href=\"http://www.nuug.no/\">NUUG</a>, using some <a href=\"http://"
+"github.com/mysociety/fixmystreet\">clever</a>&nbsp;<a href=\"https://secure."
+"mysociety.org/cvstrac/dir?d=mysociety/services/TilMa\">code</a>."
+msgstr ""
+"Adeiladwyd gan <a href=\"http://www.mysociety.org/\">mySociety</a>, gan "
+"ddefnyddio tipyn o <a href=\"https://secure.mysociety.org/cvstrac/dir?"
+"d=mysociety/services/TilMa\">god</a><a href=\"http://github.com/mysociety/"
+"fixmystreet\">clyfar</a>&nbsp;."
+
+#: perllib/Page.pm:316
 msgid "Navigation"
 msgstr "Mordwyo  "
 
-#: fixmystreet/perllib/Page.pm:264
+#: perllib/Page.pm:321
 msgid "Contact"
 msgstr "Cysylltu"
 
-#: fixmystreet/perllib/Page.pm:265
-msgid "<a href=\"http://www.mysociety.org/\"><img id=\"logo\" width=\"133\" height=\"26\" src=\"/i/mysociety-dark.png\" alt=\"View mySociety.org\"><span id=\"logoie\"></span></a>"
-msgstr "<a href=\"http://www.mysociety.org/\"><img id=\"logo\" width=\"133\" height=\"26\" src=\"/i/mysociety-dark.png\" alt=\"View mySociety.org\"><span id=\"logoie\"></span></a>"
-
-#: fixmystreet/perllib/Page.pm:266
-msgid "Built by <a href=\"http://www.mysociety.org/\">mySociety</a>, using some <a href=\"http://github.com/mysociety/fixmystreet\">clever</a>&nbsp;<a href=\"https://secure.mysociety.org/cvstrac/dir?d=mysociety/services/TilMa\">code</a>."
-msgstr "Adeiladwyd gan <a href=\"http://www.mysociety.org/\">mySociety</a>, gan ddefnyddio tipyn o <a href=\"https://secure.mysociety.org/cvstrac/dir?d=mysociety/services/TilMa\">god</a><a href=\"http://github.com/mysociety/fixmystreet\">clyfar</a>&nbsp;."
+#: perllib/Page.pm:323
+msgid ""
+"<a href=\"http://www.mysociety.org/\"><img id=\"logo\" width=\"133\" height="
+"\"26\" src=\"/i/mysociety-dark.png\" alt=\"View mySociety.org\"><span id="
+"\"logoie\"></span></a>"
+msgstr ""
+"<a href=\"http://www.mysociety.org/\"><img id=\"logo\" width=\"133\" height="
+"\"26\" src=\"/i/mysociety-dark.png\" alt=\"View mySociety.org\"><span id="
+"\"logoie\"></span></a>"
 
-#: fixmystreet/perllib/Page.pm:299
+#: perllib/Page.pm:381
 msgid "Error"
 msgstr "Gwall"
 
-#: fixmystreet/perllib/Page.pm:375
-msgid "Crown copyright. All rights reserved. Ministry of Justice"
-msgstr "Hawlfraint y Goron. Cedwir pob hawl. Y Weinyddiaeth Amddiffyn"
-
-#: fixmystreet/perllib/Page.pm:398
-msgid "Empty property"
-msgstr "Eiddo gwag"
-
-#: fixmystreet/perllib/Page.pm:557
+#: perllib/Page.pm:443
 msgid "your empty property will not be posted"
 msgstr "ni fydd eich eiddo gwag yn cael ei bostio"
 
-#: fixmystreet/perllib/Page.pm:558
-msgid "we'll hang on to your empty property report while you're checking your email."
-msgstr "byddwn yn dal gafael ar eich hysbysiad am eiddo gwag wrth i chi wirio eich e-bost."
+#: perllib/Page.pm:444
+msgid ""
+"we'll hang on to your empty property report while you're checking your email."
+msgstr ""
+"byddwn yn dal gafael ar eich hysbysiad am eiddo gwag wrth i chi wirio eich e-"
+"bost."
 
-#: fixmystreet/perllib/Page.pm:560
+#: perllib/Page.pm:446
 msgid "your update will not be posted"
 msgstr "ni fydd eich diweddariad yn cael ei bostio"
 
-#: fixmystreet/perllib/Page.pm:561
+#: perllib/Page.pm:447
 msgid "we'll hang on to your update while you're checking your email."
 msgstr "byddwn yn dal gafael ar eich diweddariad wrth i chi wirio eich e-bost."
 
-#: fixmystreet/perllib/Page.pm:563
+#: perllib/Page.pm:449
 msgid "your alert will not be activated"
 msgstr "ni fydd eich hysbysiad yn cael ei weithredu"
 
-#: fixmystreet/perllib/Page.pm:564
+#: perllib/Page.pm:450
 msgid "we'll hang on to your alert while you're checking your email."
 msgstr "byddwn yn dal gafael ar eich hysbysiad wrth i chi wirio eich e-bost."
 
-#: fixmystreet/perllib/Page.pm:570
+#: perllib/Page.pm:457
 #, perl-format
 msgid ""
 "<h1>Nearly Done! Now check your email...</h1>\n"
-"<p>The confirmation email <strong>may</strong> take a few minutes to arrive &mdash; <em>please</em> be patient.</p>\n"
-"<p>If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way.</p>\n"
+"<p>The confirmation email <strong>may</strong> take a few minutes to arrive "
+"&mdash; <em>please</em> be patient.</p>\n"
+"<p>If you use web-based email or have 'junk mail' filters, you may wish to "
+"check your bulk/spam mail folders: sometimes, our messages are marked that "
+"way.</p>\n"
 "<p>You must now click the link in the email we've just sent you &mdash;\n"
 "if you do not, %s.</p>\n"
 "<p>(Don't worry &mdash; %s)</p>\n"
 msgstr ""
 "<h1>Bron â gorffen! Nawr, gwiriwch eich e-bost...</h1>\n"
-"<p> <strong>Gallai'r</strong> e-bost o gadarnhad gymryd rhai munudau i gyrraedd &mdash; <em>byddwch</em> yn amyneddgar.</p>\n"
-"<p>Os ydych yn defnyddio system e-bost ar y we neu os oes gennych hidlydd 'negeseuon sgrwtsh', efallai y byddwch am wirio eich ffolderi post sbam/swmp: weithiau, caiff ein negeseuon eu marcio fel hynny.</p>\n"
-"<p>Nawr, mae'n rhaid i chi glicio'r ddolen yn yr e-bost yr ydym newydd ei anfon atoch &mdash;\n"
+"<p> <strong>Gallai'r</strong> e-bost o gadarnhad gymryd rhai munudau i "
+"gyrraedd &mdash; <em>byddwch</em> yn amyneddgar.</p>\n"
+"<p>Os ydych yn defnyddio system e-bost ar y we neu os oes gennych hidlydd "
+"'negeseuon sgrwtsh', efallai y byddwch am wirio eich ffolderi post sbam/"
+"swmp: weithiau, caiff ein negeseuon eu marcio fel hynny.</p>\n"
+"<p>Nawr, mae'n rhaid i chi glicio'r ddolen yn yr e-bost yr ydym newydd ei "
+"anfon atoch &mdash;\n"
 "os nad ydych, %s.</p>\n"
 "<p>(Peidiwch â phoeni &mdash; %s)</p>\n"
 
-#: fixmystreet/perllib/Page.pm:586
+#: perllib/Page.pm:484
 msgid "today"
 msgstr "heddiw"
 
-#: fixmystreet/perllib/Page.pm:608
+#: perllib/Page.pm:508
 msgid "less than a minute"
 msgstr "llai na munud"
 
-#: fixmystreet/perllib/Page.pm:611
-msgid "week"
+#: perllib/Page.pm:511
+#, fuzzy, perl-format
+msgid "%d week"
+msgstr "wythnos"
+
+#: perllib/Page.pm:511
+#, fuzzy, perl-format
+msgid "%d weeks"
 msgstr "wythnos"
 
-#: fixmystreet/perllib/Page.pm:612
-msgid "day"
+#: perllib/Page.pm:512
+#, fuzzy, perl-format
+msgid "%d day"
+msgstr "diwrnod"
+
+#: perllib/Page.pm:512
+#, fuzzy, perl-format
+msgid "%d days"
 msgstr "diwrnod"
 
-#: fixmystreet/perllib/Page.pm:613
-msgid "hour"
+#: perllib/Page.pm:513
+#, fuzzy, perl-format
+msgid "%d hour"
 msgstr "awr"
 
-#: fixmystreet/perllib/Page.pm:614
-msgid "minute"
+#: perllib/Page.pm:513
+#, fuzzy, perl-format
+msgid "%d hours"
+msgstr "awr"
+
+#: perllib/Page.pm:514
+#, fuzzy, perl-format
+msgid "%d minute"
 msgstr "munud"
 
-#: fixmystreet/perllib/Page.pm:634
+#: perllib/Page.pm:514
+#, fuzzy, perl-format
+msgid "%d minutes"
+msgstr "munud"
+
+#: perllib/Page.pm:534
 #, perl-format
 msgid "%s, reported anonymously at %s"
 msgstr "Rhoddodd %s wybod yn ddi-enw am %s"
 
-#: fixmystreet/perllib/Page.pm:636
+#: perllib/Page.pm:536
 #, perl-format
 msgid "%s, reported by %s at %s"
 msgstr "Adroddwyd am %s gan %s am %s"
 
-#: fixmystreet/perllib/Page.pm:640
+#: perllib/Page.pm:540
 #, perl-format
 msgid "Reported by %s in the %s category anonymously at %s"
 msgstr "Adroddwyd am hyn gan %s yn y categori %s yn ddi-enw, am %s"
 
-#: fixmystreet/perllib/Page.pm:642
+#: perllib/Page.pm:542
 #, perl-format
 msgid "Reported by %s in the %s category by %s at %s"
 msgstr "Adroddwyd gan %s yn y categori %s trwy %s am %s"
 
-#: fixmystreet/perllib/Page.pm:644
+#: perllib/Page.pm:544
 #, perl-format
 msgid "Reported by %s anonymously at %s"
 msgstr "Adroddwyd gan %s yn ddi-enw am %s"
 
-#: fixmystreet/perllib/Page.pm:646
+#: perllib/Page.pm:546
 #, perl-format
 msgid "Reported by %s by %s at %s"
 msgstr "Adroddwyd gan %s trwy %s am %s"
 
-#: fixmystreet/perllib/Page.pm:648
+#: perllib/Page.pm:548
 #, perl-format
 msgid "Reported in the %s category anonymously at %s"
 msgstr "Adroddiwyd yn y categori %s yn ddi-enw am %s"
 
-#: fixmystreet/perllib/Page.pm:650
+#: perllib/Page.pm:550
 #, perl-format
 msgid "Reported in the %s category by %s at %s"
 msgstr "Adroddwyd yn y categori %s gan %s am %s"
 
-#: fixmystreet/perllib/Page.pm:652
+#: perllib/Page.pm:552 web/contact.cgi:212
 #, perl-format
 msgid "Reported anonymously at %s"
 msgstr "Adroddwyd yn ddi-enw am %s"
 
-#: fixmystreet/perllib/Page.pm:654
+#: perllib/Page.pm:554 web/contact.cgi:213
 #, perl-format
 msgid "Reported by %s at %s"
 msgstr "Adroddwyd gan %s am %s"
 
-#: fixmystreet/perllib/Page.pm:657
+#: perllib/Page.pm:559
 msgid "the map was not used so pin location may be inaccurate"
-msgstr "ni ddefnyddiwyd y map felly mae'n bosibl na fydd lleoliad y pin yn gywir"
+msgstr ""
+"ni ddefnyddiwyd y map felly mae'n bosibl na fydd lleoliad y pin yn gywir"
 
-#: fixmystreet/perllib/Page.pm:664
+#: perllib/Page.pm:567
 #, perl-format
 msgid "Sent to %s %s later"
 msgstr "Anfonwyd at %s %s yn ddiweddarach"
 
-#: fixmystreet/perllib/Page.pm:667
+#: perllib/Page.pm:571
 msgid "Not reported to council"
 msgstr "Ni roddwyd gwybod i'r cyngor am hyn"
 
-#: fixmystreet/perllib/Page.pm:696
+#: perllib/Page.pm:622 web-admin/index.cgi:521 web-admin/index.cgi:645
 msgid "Updates"
 msgstr "Diweddariadau"
 
-#: fixmystreet/perllib/Page.pm:700
+#: perllib/Page.pm:626
 #, perl-format
 msgid "Posted by %s at %s"
 msgstr "Cofnodwyd gan %s am %s"
 
-#: fixmystreet/perllib/Page.pm:702
+#: perllib/Page.pm:628
 #, perl-format
 msgid "Posted anonymously at %s"
 msgstr "Cofnodwyd yn ddi-enw am %s"
 
-#: fixmystreet/perllib/Page.pm:704
+#: perllib/Page.pm:631
 msgid "marked as returned to use"
 msgstr "cofnodwyd bod hyn wedi'i adfer i'w ddefnyddio"
 
-#: fixmystreet/perllib/Page.pm:705
+#: perllib/Page.pm:632
 msgid "reopened"
 msgstr "wedi'i ailagor"
 
-#: fixmystreet/perllib/Page.pm:734 fixmystreet/perllib/Page.pm:796
-msgid "We do not cover Northern Ireland, I'm afraid, as our licence doesn't include any maps for the region."
-msgstr "Nid ydym yn ymdrin â Gogledd Iwerddon, yn anffodus, gan nad yw ein trwydded yn cynnwys unrhyw fapiau ar gyfer y rhanbarth."
+#: perllib/Page.pm:640 web/index.cgi:1071
+msgid "Offensive? Unsuitable? Tell us"
+msgstr "Sarhaus? Anaddas? Rhowch wybod i ni"
 
-#: fixmystreet/perllib/Page.pm:747
+#: perllib/Page.pm:667
 msgid "That postcode was not recognised, sorry."
 msgstr "Ni chafodd y cod post hwnnw ei gydnabod, sori."
 
-#: fixmystreet/perllib/Page.pm:783
+#: perllib/Page.pm:672
+msgid ""
+"Sorry, that appears to be a Crown dependency postcode, which we don't cover."
+msgstr ""
+
+#: perllib/Page.pm:675 perllib/FixMyStreet/Geocode.pm:133
+msgid ""
+"We do not cover Northern Ireland, I'm afraid, as our licence doesn't include "
+"any maps for the region."
+msgstr ""
+"Nid ydym yn ymdrin â Gogledd Iwerddon, yn anffodus, gan nad yw ein trwydded "
+"yn cynnwys unrhyw fapiau ar gyfer y rhanbarth."
+
+#: perllib/Page.pm:705
+msgid "Please upload a JPEG image only"
+msgstr "Dim ond llun JPEG y dylech lwytho i fyny."
+
+#: perllib/FixMyStreet/Alert.pm:147
+#, fuzzy
+msgid "This report is currently marked as returned to use."
+msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio"
+
+#: perllib/FixMyStreet/Alert.pm:148
+msgid "This report is currently marked as open."
+msgstr ""
+
+#: perllib/FixMyStreet/Alert.pm:311
+#, fuzzy, perl-format
+msgid "Report on %s"
+msgstr "Adroddiadau"
+
+#: perllib/FixMyStreet/Geocode.pm:65
+msgid ""
+"Sorry, that location appears to be too general; please be more specific."
+msgstr ""
+"Sori, mae'n ymddangos bod y lleoliad hwnnw'n rhy gyffredinol; rhowch gynnig "
+"arall arni."
+
+#: perllib/FixMyStreet/Geocode.pm:75
+msgid "That location does not appear to be in Britain; please try again."
+msgstr ""
+"Nid yw'n ymddangos bod y lleoliad hwnnw ym Mhrydain; rhowch gynnig arall "
+"arni."
+
+#: perllib/FixMyStreet/Geocode.pm:113
 msgid "Sorry, we could not parse that location. Please try again."
-msgstr "Sori, ni fu modd i ni ddosrannu'r lleoliad hwnnw. Rhowch gynnig arall arni."
+msgstr ""
+"Sori, ni fu modd i ni ddosrannu'r lleoliad hwnnw. Rhowch gynnig arall arni."
 
-#: fixmystreet/perllib/Page.pm:785 fixmystreet/perllib/Page.pm:793
+#: perllib/FixMyStreet/Geocode.pm:115 perllib/FixMyStreet/Geocode.pm:130
 msgid "Sorry, we could not find that location."
 msgstr "Sori, ni fu modd i ni ddod o hyd i'r lleoliad hwnnw."
 
-#: fixmystreet/perllib/Page.pm:800
-msgid "Sorry, that location appears to be too general; please be more specific."
-msgstr "Sori, mae'n ymddangos bod y lleoliad hwnnw'n rhy gyffredinol; rhowch gynnig arall arni."
+#: perllib/FixMyStreet/Geocode.pm:146
+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 ""
+"Darganfuom fwy nag un man sy'n cyfateb i'r lleoliad hwnnw. Rydym yn dangos "
+"hyd at ddeg cyfatebiaeth, rhowch gynnig ar chwiliad gwahanol os nad yw'ch "
+"lleoliad chi yno."
 
-#: fixmystreet/perllib/Page.pm:814
-msgid "That location does not appear to be in Britain; please try again."
-msgstr "Nid yw'n ymddangos bod y lleoliad hwnnw ym Mhrydain; rhowch gynnig arall arni."
+#: perllib/FixMyStreet/Geocode.pm:161
+msgid "More than one match"
+msgstr ""
 
-#: fixmystreet/perllib/Page.pm:826
-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 "Darganfuom fwy nag un man sy'n cyfateb i'r lleoliad hwnnw. Rydym yn dangos hyd at ddeg cyfatebiaeth, rhowch gynnig ar chwiliad gwahanol os nad yw'ch lleoliad chi yno."
+#: perllib/FixMyStreet/Map/Bing.pm:39
+#: perllib/FixMyStreet/Map/OSM/StreetView.pm:38
+#: perllib/FixMyStreet/Map/Google.pm:39
+#: perllib/FixMyStreet/Map/Tilma/OL/StreetView.pm:45
+#: perllib/FixMyStreet/Map/Tilma/Original/StreetView.pm:23
+msgid ""
+"Map contains Ordnance Survey data &copy; Crown copyright and database right "
+"2010."
+msgstr ""
 
-#: fixmystreet/perllib/Page.pm:857
-msgid "Please upload a JPEG image only"
-msgstr "Dim ond llun JPEG y dylech lwytho i fyny."
+#: perllib/FixMyStreet/Map/OSM.pm:41
+#: perllib/FixMyStreet/Map/OSM/CycleMap.pm:38
+msgid ""
+"Map &copy; <a href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> and "
+"contributors, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-"
+"BY-SA</a>"
+msgstr ""
+
+#: perllib/FixMyStreet/Map/BingOL.pm:39
+msgid ""
+"Map contains Ordnance Survey data &copy; Crown copyright and database right "
+"2010. Microsoft"
+msgstr ""
+
+#: perllib/FixMyStreet/Map/Tilma/OL/1_10k.pm:45
+#: perllib/FixMyStreet/Map/Tilma/Original/1_10k.pm:23
+#, fuzzy
+msgid ""
+"&copy; Crown copyright. All rights reserved. Ministry of Justice "
+"100037819&nbsp;2008."
+msgstr "Hawlfraint y Goron. Cedwir pob hawl. Y Weinyddiaeth Amddiffyn"
+
+#: perllib/FixMyStreet/Map/Tilma/Original.pm:81
+msgid "Unable to fetch the map tiles from the tile server."
+msgstr ""
+
+#: perllib/FixMyStreet/Map/Tilma/Original.pm:155
+msgid "Empty property"
+msgstr "Eiddo gwag"
+
+#: perllib/Problems.pm:147
+#, perl-format
+msgid "<big>%s</big> report in past week"
+msgid_plural "<big>%s</big> reports in past week"
+msgstr[0] "<big>%s</big> adroddiad o fewn yr wythnos ddiwethaf"
+msgstr[1] "<big>%s</big> o adroddiadau o fewn yr wythnos ddiwethaf"
+
+#: perllib/Problems.pm:152
+#, perl-format
+msgid "<big>%s</big> report recently"
+msgid_plural "<big>%s</big> reports recently"
+msgstr[0] "<big>%s</big> adroddiad yn ddiweddar"
+msgstr[1] "<big>%s</big> o adroddiadau yn ddiweddar"
+
+#: perllib/Problems.pm:158
+msgid "reportemptyhomes.com updates"
+msgstr "Diweddariadau i reportemptyhomes.com"
+
+#: perllib/Problems.pm:161 perllib/Problems.pm:165
+#, perl-format
+msgid "<big>%s</big> returned to use in past month"
+msgid_plural "<big>%s</big> returned to use in past month"
+msgstr[0] "Dychwelwyd <big>%s</big> i'w ddefnyddio yn y mis diwethaf"
+msgstr[1] "Dychwelwyd <big>%s</big> i'w defnyddio yn y mis diwethaf"
+
+#: perllib/Problems.pm:166
+#, perl-format
+msgid "<big>%s</big> update on reports"
+msgid_plural "<big>%s</big> updates on reports"
+msgstr[0] "<big>%s</big> diweddariad ar adroddiadau"
+msgstr[1] "<big>%s</big> diweddariad ar adroddiadau"
 
-#: fixmystreet/web/about.cgi:24
+#: web/about.cgi:24
 msgid ""
 "<h2>The Empty Homes Agency</h2>\n"
 "<p>The Empty Homes agency is an independent campaigning charity. We are not\n"
-"part of government, and have no formal links with local councils although we\n"
+"part of government, and have no formal links with local councils although "
+"we\n"
 "work in cooperation with both. We exist to highlight the waste of empty\n"
-"property and work with others to devise and promote sustainable solutions to\n"
+"property and work with others to devise and promote sustainable solutions "
+"to\n"
 "bring empty property back into use. We are based in London but work across\n"
-"England. We also work in partnership with other charities across the UK.</p>\n"
+"England. We also work in partnership with other charities across the UK.</"
+"p>\n"
 msgstr ""
 "<h2>Yr Asiantaeth Tai Gwag</h2>\n"
-"<p>Mae'r Asiantaeth Tai Gwag yn elusen ymgyrchu annibynnol. Nid ydym yn rhan o'r\n"
-"llywodraeth, ac nid oes gennym unrhyw gysylltiadau ffurfiol â chynghorau lleol er ein bod\n"
-"yn cydweithio â'r naill a'r llall. Rydym yn bodoli er mwyn amlygu gwastraff yr eiddo gwag ac\n"
-"yn gweithio gyda eraill er mwyn dyfeisio a hyrwyddo atebion cynaliadwy er mwyn adfer \n"
-"eiddo gwag yn eiddo y mae pobl yn byw ynddynt eto. Rydym wedi'n lleoli yn Llundain ond\n"
-"rydym yn gweithio ledled Lloegr. Rydym hefyd yn gweithio mewn partneriaeth ag elusennau eraill ledled y DU.</p>\n"
-
-#: fixmystreet/web/about.cgi:34
+"<p>Mae'r Asiantaeth Tai Gwag yn elusen ymgyrchu annibynnol. Nid ydym yn rhan "
+"o'r\n"
+"llywodraeth, ac nid oes gennym unrhyw gysylltiadau ffurfiol â chynghorau "
+"lleol er ein bod\n"
+"yn cydweithio â'r naill a'r llall. Rydym yn bodoli er mwyn amlygu gwastraff "
+"yr eiddo gwag ac\n"
+"yn gweithio gyda eraill er mwyn dyfeisio a hyrwyddo atebion cynaliadwy er "
+"mwyn adfer \n"
+"eiddo gwag yn eiddo y mae pobl yn byw ynddynt eto. Rydym wedi'n lleoli yn "
+"Llundain ond\n"
+"rydym yn gweithio ledled Lloegr. Rydym hefyd yn gweithio mewn partneriaeth "
+"ag elusennau eraill ledled y DU.</p>\n"
+
+#: web/about.cgi:34
 msgid ""
 "<h2>Shelter Cymru</h2>\n"
-"Shelter Cymru is Wales&rsquo; people and homes charity and wants everyone in Wales to\n"
-"have a decent home. We believe a home is a fundamental right and essential to\n"
+"Shelter Cymru is Wales&rsquo; people and homes charity and wants everyone in "
+"Wales to\n"
+"have a decent home. We believe a home is a fundamental right and essential "
+"to\n"
 "the health and well-being of people and communities.  We work for people in\n"
 "housing need. We have offices all over Wales and prevent people from losing\n"
 "their homes by offering free, confidential and independent advice. When\n"
-"necessary we constructively challenge on behalf of people to ensure they are\n"
+"necessary we constructively challenge on behalf of people to ensure they "
+"are\n"
 "properly assisted and to improve practice and learning. We believe that\n"
-"bringing empty homes back into use can make a significant contribution to the\n"
+"bringing empty homes back into use can make a significant contribution to "
+"the\n"
 "supply of affordable homes in Wales.\n"
-"<a href=\"http://www.sheltercymru.org.uk/shelter/advice/pdetail.asp?cat=20\">Further information about our work on\n"
+"<a href=\"http://www.sheltercymru.org.uk/shelter/advice/pdetail.asp?cat=20"
+"\">Further information about our work on\n"
 "empty homes</a>.\n"
 msgstr ""
 "<h2>Shelter Cymru</h2>\n"
-"Shelter Cymru yw&rsquo;r elusen yng Nghymru ar gyfer pobl a chartrefi ac rydym\n"
+"Shelter Cymru yw&rsquo;r elusen yng Nghymru ar gyfer pobl a chartrefi ac "
+"rydym\n"
 "eisiau i bawb yng Nghymru gael cartref addas. Credwn fod cartref yn hawl\n"
-"sylfaenol a&rsquo;i fod yn hanfodol i iechyd a lles pobl a chymunedau. Rydym yn\n"
-"gweithio dros bobl sydd mewn angen am dai. Mae gennym swyddfeydd ar draws Cymru\n"
+"sylfaenol a&rsquo;i fod yn hanfodol i iechyd a lles pobl a chymunedau. Rydym "
+"yn\n"
+"gweithio dros bobl sydd mewn angen am dai. Mae gennym swyddfeydd ar draws "
+"Cymru\n"
 "ac rydym yn atal pobl rhag colli eu cartrefi drwy gynnig cyngor annibynnol,\n"
-"cyfrinachol, am ddim. Pan fo&rsquo;r angen, rydym yn herio&rsquo;n adeiladol ar ran pobl er\n"
-"mwyn sicrhau eu bod yn cael eu cynorthwyo&rsquo;n gywir ac i wella ymarfer a dysgu.\n"
+"cyfrinachol, am ddim. Pan fo&rsquo;r angen, rydym yn herio&rsquo;n adeiladol "
+"ar ran pobl er\n"
+"mwyn sicrhau eu bod yn cael eu cynorthwyo&rsquo;n gywir ac i wella ymarfer a "
+"dysgu.\n"
 "Mae Shelter Cymru yn credu y gall gwneud gwell defnydd o gartrefi gwag\n"
 "gyfrannu&rsquo;n sylweddol at y ddaprariaeth o dai fforddiadwy yng Nghymru.\n"
-"<a href='http://www.sheltercymru.org.uk/shelter/cymraeg/advice/pdetail.asp?cat=20'>Gwybodaeth\n"
+"<a href='http://www.sheltercymru.org.uk/shelter/cymraeg/advice/pdetail.asp?"
+"cat=20'>Gwybodaeth\n"
 "bellach am ein gwaith ar gartrefi gwag</a>.\n"
 
-#: fixmystreet/web/ajax.cgi:45 fixmystreet/web/ajax.cgi:55 fixmystreet/web/index.cgi:829
-#: fixmystreet/web/index.cgi:841
+#: web/ajax.cgi:55 web/ajax.cgi:76 web/index.cgi:902 web/index.cgi:917
 msgid "(returned to use)"
 msgstr "(wedi'i adfer i'w ddefnyddio)"
 
-#: fixmystreet/web/alert.cgi:29 fixmystreet/web/confirm.cgi:46
+#: web/alert.cgi:33 web/confirm.cgi:49
 msgid "Confirmation"
 msgstr "Cadarnhau"
 
-#: fixmystreet/web/alert.cgi:38
+#: web/alert.cgi:43
+#, perl-format
 msgid ""
 "Thank you for trying to confirm your alert. We seem to have an error "
 "ourselves\n"
 "though, so <a href=\"%s\">please let us know what went on</a> and we'll look "
 "into it.\n"
 msgstr ""
-"Diolch am geisio cadarnhau eich rhybudd. Fodd bynnag, mae'n ymddangos bod gennym wall\n"
-"ein hunain, felly <a href=\"%s\">rhowch wybod i ni beth sydd wedi digwydd</a> ac fe wnawn ni edrych yn fanylach ar hyn.\n"
+"Diolch am geisio cadarnhau eich rhybudd. Fodd bynnag, mae'n ymddangos bod "
+"gennym wall\n"
+"ein hunain, felly <a href=\"%s\">rhowch wybod i ni beth sydd wedi digwydd</"
+"a> ac fe wnawn ni edrych yn fanylach ar hyn.\n"
 
-#: fixmystreet/web/alert.cgi:50 fixmystreet/web/alert.cgi:53 fixmystreet/web/alert.cgi:202
-#: fixmystreet/web/alert.cgi:269
+#: web/alert.cgi:59 web/alert.cgi:62 web/alert.cgi:65 web/alert.cgi:274
+#: web/alert.cgi:380
 msgid "Local RSS feeds and email alerts"
 msgstr "Porthiannau RSS a hysbysiadau e-bost lleol"
 
-#: fixmystreet/web/alert.cgi:99
-msgid "That location does not appear to be covered by a council, perhaps it is offshore - please try somewhere more specific."
-msgstr "Nid yw'n ymddangos bod cyngor yn gyfrifol am y lleoliad hwnnw, efallai ei fod ar y môr - chwiliwch am fan mwy penodol."
+#: web/alert.cgi:121
+msgid ""
+"That location does not appear to be covered by a council, perhaps it is "
+"offshore - please try somewhere more specific."
+msgstr ""
+"Nid yw'n ymddangos bod cyngor yn gyfrifol am y lleoliad hwnnw, efallai ei "
+"fod ar y môr - chwiliwch am fan mwy penodol."
 
-#: fixmystreet/web/alert.cgi:114 fixmystreet/web/alert.cgi:130
+#: web/alert.cgi:140 web/alert.cgi:183 web/alert.cgi:200
 #, perl-format
 msgid "Empty properties within %s"
 msgstr "Eiddo gwag yn %s"
 
-#: fixmystreet/web/alert.cgi:116
-#, perl-format
-msgid "Empty properties within %s ward"
-msgstr "Eiddo gwag yn ward %s"
-
-#: fixmystreet/web/alert.cgi:159
+#: web/alert.cgi:152 web/alert.cgi:233
 msgid "Empty properties within the boundary of:"
 msgstr "Eiddo gwag o fewn ffiniau:"
 
-#: fixmystreet/web/alert.cgi:171
+#: web/alert.cgi:158 web/alert.cgi:245
 msgid "Or empty properties reported to:"
 msgstr "Neu eiddo gwag y rhoddwyd gwybod amdanynt i:"
 
-#: fixmystreet/web/alert.cgi:173
+#: web/alert.cgi:160 web/alert.cgi:247
 msgid ""
 "reportemptyhomes.com sends different categories of empty property\n"
-"to the appropriate council, so empty properties within the boundary of a particular council\n"
-"might not match the empty properties 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"
+"to the appropriate council, so empty properties within the boundary of a "
+"particular council\n"
+"might not match the empty properties 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 ""
 "Mae'r Asiantaeth Tai Gwag yn anfon categorïau o eiddo gwag at y\n"
-"cyngor priodol, felly mae'n bosibl na fydd eiddo gwag o fewn ffin cyngor penodol yn \n"
-"cyfateb i'r eiddo gwag sy'n cael eu hanfon at y cyngor hwnnw. Er enghraifft, bydd adroddiad am\n"
-"graffiti'n cael ei anfon at y cyngor dosbarth, felly bydd yn ymddangos yn hysbysiadau'r\n"
+"cyngor priodol, felly mae'n bosibl na fydd eiddo gwag o fewn ffin cyngor "
+"penodol yn \n"
+"cyfateb i'r eiddo gwag sy'n cael eu hanfon at y cyngor hwnnw. Er enghraifft, "
+"bydd adroddiad am\n"
+"graffiti'n cael ei anfon at y cyngor dosbarth, felly bydd yn ymddangos yn "
+"hysbysiadau'r\n"
 "rhanbarth a'r cyngor, ond dim ond yn yr hysbysiad \"O fewn y ffin\" \n"
 "y bydd yn ymddangos yn achos y cyngor sir."
 
-#: fixmystreet/web/alert.cgi:197
+#: web/alert.cgi:185
+#, perl-format
+msgid "Empty properties within %s ward"
+msgstr "Eiddo gwag yn ward %s"
+
+#: web/alert.cgi:269
 msgid "Photos of recent nearby reports"
 msgstr "Ffotograffau o adroddiadau cyfagos diweddar"
 
-#: fixmystreet/web/alert.cgi:201
+#: web/alert.cgi:272
 #, perl-format
 msgid "Local RSS feeds and email alerts for &lsquo;%s&rsquo;"
 msgstr "Porthiannau RSS lleol a hysbysiadau e-bost ar gyfer &lsquo;%s&rsquo;"
 
-#: fixmystreet/web/alert.cgi:212
+#: web/alert.cgi:286
 #, perl-format
 msgid "Here are the types of local empty property alerts for &lsquo;%s&rsquo;."
-msgstr "Dyma'r mathau o hysbysiadau am eiddo gwag lleol ar gyfer &lsquo;%s&rsquo;."
+msgstr ""
+"Dyma'r mathau o hysbysiadau am eiddo gwag lleol ar gyfer &lsquo;%s&rsquo;."
 
-#: fixmystreet/web/alert.cgi:213
+#: web/alert.cgi:287
 msgid ""
 "Select which type of alert you&rsquo;d like and click the button for an RSS\n"
 "feed, or enter your email address to subscribe to an email alert."
 msgstr ""
-"Dewiswch y math o hysbysiad yr hoffech ei gael a chliciwch y botwm ar gyfer porthiant RSS,\n"
+"Dewiswch y math o hysbysiad yr hoffech ei gael a chliciwch y botwm ar gyfer "
+"porthiant RSS,\n"
 "neu rhowch eich cyfeiriad e-bost i danysgrifio am hysbysiad e-bost."
 
-#: fixmystreet/web/alert.cgi:216
+#: web/alert.cgi:290
 msgid "The simplest alert is our geographic one:"
 msgstr "Yr hysbysiad symlaf yw ein hysbysiad daearyddol:"
 
-#: fixmystreet/web/alert.cgi:217
+#: web/alert.cgi:291
 #, perl-format
 msgid "Empty properties within %skm of this location"
 msgstr "Eiddo gwag o fewn %skm o'r lleoliad hwn"
 
-#: fixmystreet/web/alert.cgi:223
+#: web/alert.cgi:305
 msgid "(a default distance which covers roughly 200,000 people)"
 msgstr "(pellter rhagosodedig sy'n cynnwys tua 200,000 o bobl)"
 
-#: fixmystreet/web/alert.cgi:225
+#: web/alert.cgi:308
 msgid "RSS feed of nearby empty properties"
 msgstr "Porthiant RSS o eiddo gwag sydd gerllaw"
 
-#: fixmystreet/web/alert.cgi:225 fixmystreet/web/alert.cgi:257 fixmystreet/web/index.cgi:805
-#: fixmystreet/web/index.cgi:936 fixmystreet/web/reports.cgi:218
+#: web/alert.cgi:308 web/alert.cgi:367 web/index.cgi:970 web/index.cgi:1082
+#: web/reports.cgi:254
 msgid "RSS feed"
 msgstr "Porthiant RSS"
 
-#: fixmystreet/web/alert.cgi:226
+#: web/alert.cgi:309
 msgid "(alternatively the RSS feed can be customised, within"
 msgstr "(fel arall, gellir addasu'r porthiant RSS yn bersonol, o fewn"
 
-#: fixmystreet/web/alert.cgi:232
-msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
-msgstr "Neu, gallwch danysgrifio am hysbysiad yn ôl pa ward neu gyngor yr ydych yn byw ynddo:"
+#: web/alert.cgi:319
+msgid ""
+"Or you can subscribe to an alert based upon what ward or council you&rsquo;"
+"re in:"
+msgstr ""
+"Neu, gallwch danysgrifio am hysbysiad yn ôl pa ward neu gyngor yr ydych yn "
+"byw ynddo:"
 
-#: fixmystreet/web/alert.cgi:234
+#: web/alert.cgi:323
 msgid "Give me an RSS feed"
 msgstr "Rhowch borthiant RSS i mi"
 
-#: fixmystreet/web/alert.cgi:235
+#: web/alert.cgi:324
 msgid "or"
 msgstr "neu"
 
-#: fixmystreet/web/alert.cgi:236
+#: web/alert.cgi:325
 msgid "Your email:"
 msgstr "Eich cyfeiriad e-bost:"
 
-#: fixmystreet/web/alert.cgi:237
+#: web/alert.cgi:326
 msgid "Subscribe me to an email alert"
 msgstr "Dymunaf danysgrifio i rybuddion drwy e-bost"
 
-#: fixmystreet/web/alert.cgi:257
+#: web/alert.cgi:367
 #, perl-format
 msgid "RSS feed of %s"
 msgstr "Porthiant RSS %s"
 
-#: fixmystreet/web/alert.cgi:270
+#: web/alert.cgi:381
 msgid ""
-"reportemptyhomes.com has a variety of RSS feeds and email alerts for local empty properties, including\n"
-"alerts for all empty properties within a particular ward or council, or all empty properties\n"
+"reportemptyhomes.com has a variety of RSS feeds and email alerts for local "
+"empty properties, including\n"
+"alerts for all empty properties within a particular ward or council, or all "
+"empty properties\n"
 "within a certain distance of a particular location."
 msgstr ""
-"Mae gan reportemptyhomes.com amrywiaeth o borthiannau RSS a hysbysiadau e-bost ar gyfer eiddo gwag lleol,\n"
-"gan gynnwys hysbysiadau am bob eiddo gwag mewn ward neu gyngor penodol, neu bob eiddo gwag\n"
+"Mae gan reportemptyhomes.com amrywiaeth o borthiannau RSS a hysbysiadau e-"
+"bost ar gyfer eiddo gwag lleol,\n"
+"gan gynnwys hysbysiadau am bob eiddo gwag mewn ward neu gyngor penodol, neu "
+"bob eiddo gwag\n"
 "o fewn pellter penodol o leoliad penodol."
 
-#: fixmystreet/web/alert.cgi:274
+#: web/alert.cgi:384
 msgid ""
-"To find out what local alerts we have in your area, council or ward, please enter your GB\n"
+"To find out what local alerts we have in your area, council or ward, please "
+"enter your GB\n"
 "postcode or street name and area:"
 msgstr ""
-"I gael gwybod pa hysbysiadau lleol sydd gennym yn eich ardal, cyngor neu ward chi,\n"
+"I gael gwybod pa hysbysiadau lleol sydd gennym yn eich ardal, cyngor neu "
+"ward chi,\n"
 "cofnodwch eich cod post Prydeinig neu enw stryd ac ardal:"
 
-#: fixmystreet/web/alert.cgi:276 fixmystreet/web/confirm.cgi:172 fixmystreet/web/index.cgi:147
+#: web/alert.cgi:389 web/confirm.cgi:192 web/index.cgi:166
 msgid "Go"
 msgstr "Ewch"
 
-#: fixmystreet/web/alert.cgi:282
+#: web/alert.cgi:415
 msgid "Some photos of recent reports"
 msgstr "Rhai ffotograffau o adroddiadau diweddar"
 
-#: fixmystreet/web/alert.cgi:289
+#: web/alert.cgi:423
 msgid "Please select the feed you want"
 msgstr "Dewiswch y porthiant rydych chi eisiau ei gael"
 
-#: fixmystreet/web/alert.cgi:302
+#: web/alert.cgi:446
 msgid "Illegal feed selection"
 msgstr "Dewis porthiant annilys"
 
-#: fixmystreet/web/alert.cgi:315
+#: web/alert.cgi:460
 msgid "Receive email when updates are left on this empty property."
-msgstr "Derbyn neges e-bost pan fydd diweddariadau'n cael eu rhoi am yr eiddo gwag hwn."
+msgstr ""
+"Derbyn neges e-bost pan fydd diweddariadau'n cael eu rhoi am yr eiddo gwag "
+"hwn."
 
-#: fixmystreet/web/alert.cgi:316 fixmystreet/web/index.cgi:664 fixmystreet/web/index.cgi:923
+#: web/alert.cgi:461 web/alert.cgi:488 web/index.cgi:736 web/index.cgi:1076
 msgid "Email:"
 msgstr "E-bost:"
 
-#: fixmystreet/web/alert.cgi:317 fixmystreet/web/index.cgi:924
+#: web/alert.cgi:462 web/alert.cgi:489 web/index.cgi:1077
 msgid "Subscribe"
 msgstr "Tanysgrifio"
 
-#: fixmystreet/web/alert.cgi:340
+#: web/alert.cgi:487
+#, fuzzy
+msgid "Receive alerts on new local empty properties"
+msgstr "Anfonwch fanylion eiddo gwag lleol newydd ataf i drwy'r e-bost"
+
+#: web/alert.cgi:515
 msgid "You have successfully subscribed to that alert."
 msgstr "Rydych wedi tanysgrifio'n llwyddiannus i'r hysbysiad hwnnw."
 
-#: fixmystreet/web/alert.cgi:343
+#: web/alert.cgi:522
 msgid "We could not validate that alert."
 msgstr "Ni allem ddilysu'r hysbysiad hwnnw."
 
-#: fixmystreet/web/alert.cgi:362
+#: web/alert.cgi:544
 msgid "You have successfully confirmed your alert."
 msgstr "Rydych wedi cadarnhau'ch hysbysiad yn llwyddiannus."
 
-#: fixmystreet/web/alert.cgi:366
+#: web/alert.cgi:551
 msgid "You have successfully deleted your alert."
 msgstr "Rydych wedi dileu'ch hysbysiad yn llwyddiannus."
 
-#: fixmystreet/web/alert.cgi:378
+#: web/alert.cgi:571
 msgid "Please enter a valid email address"
 msgstr "Cofnodwch gyfeiriad e-bost dilys"
 
-#: fixmystreet/web/alert.cgi:379
+#: web/alert.cgi:572
 msgid "Please select the type of alert you want"
 msgstr "Dewiswch y math o hysbysiad rydych chi eisiau ei gael"
 
-#: fixmystreet/web/confirm.cgi:40
+#: web/confirm.cgi:39
+#, perl-format
 msgid ""
-"Thank you for trying to confirm your update or empty property. We seem to have an\n"
-"error ourselves though, so <a href=\"%s\">please let us know what went on</a>\n"
+"Thank you for trying to confirm your update or empty property. We seem to "
+"have an\n"
+"error ourselves though, so <a href=\"%s\">please let us know what went on</"
+"a>\n"
 "and we'll look into it.\n"
 msgstr ""
-"Diolch am geisio cadarnhau eich diweddariad neu eich eiddo gwag. Fodd bynnag, \n"
-"mae'n ymddangos bod gwall gennym ein hunain, felly <a href=\"%s\">rhowch wybod i ni beth ddigwyddodd</a>\n"
+"Diolch am geisio cadarnhau eich diweddariad neu eich eiddo gwag. Fodd "
+"bynnag, \n"
+"mae'n ymddangos bod gwall gennym ein hunain, felly <a href=\"%s\">rhowch "
+"wybod i ni beth ddigwyddodd</a>\n"
 "ac fe wnawn ni edrych yn fanylach i hyn.\n"
 
-#: fixmystreet/web/confirm.cgi:97
+#: web/confirm.cgi:101
 #, perl-format
-msgid "You have successfully confirmed your update and you can now <a href=\"%s\">view it on the site</a>."
-msgstr "Rydych wedi cadarnhau eich diweddariad yn llwyddiannus ac nawr gallwch <a href=\"%s\">weld hwn ar y safle</a>."
+msgid ""
+"You have successfully confirmed your update and you can now <a href=\"%s"
+"\">view it on the site</a>."
+msgstr ""
+"Rydych wedi cadarnhau eich diweddariad yn llwyddiannus ac nawr gallwch <a "
+"href=\"%s\">weld hwn ar y safle</a>."
 
-#: fixmystreet/web/confirm.cgi:118
+#: web/confirm.cgi:131
 msgid "Sorry, there has been an error confirming your empty property."
 msgstr "Sori, bu gwall wrth gadarnhau eich eiddo gwag."
 
-#: fixmystreet/web/confirm.cgi:131
+#: web/confirm.cgi:139
+#, fuzzy
 msgid ""
 "Thank you for reporting an empty property on\n"
-"ReportEmptyHomes.com. We have emailed the empty property officer in the council\n"
-"responsible with the details and asked them to do whatever they can to get the\n"
+"ReportEmptyHomes.com. We have emailed the lead officer for empty homes in "
+"the council\n"
+"responsible with details, and asked them to do whatever they can to get the\n"
 "empty property back into use as soon as possible."
 msgstr ""
 "Diolch am roi gwybod am eiddo gwag ar\n"
-"ReportEmptyHomes.com. Rydym wedi anfon neges e-bost gyda'r manylion at y swyddog eiddo gwag yn \n"
-"y cyngor cyfrifol ac wedi gofyn iddynt wneud beth bynnag y gallant i helpu adfer yr eiddo gwag\n"
+"ReportEmptyHomes.com. Rydym wedi anfon neges e-bost gyda'r manylion at y "
+"swyddog eiddo gwag yn \n"
+"y cyngor cyfrifol ac wedi gofyn iddynt wneud beth bynnag y gallant i helpu "
+"adfer yr eiddo gwag\n"
 "fel ei fod yn cael ei ddefnyddio eto cyn gynted ag y bo modd."
 
-#: fixmystreet/web/confirm.cgi:135
+#: web/confirm.cgi:143
+#, fuzzy
 msgid ""
-"Most councils are quite good at bringing empty properties back into use. Even\n"
-"so the process can sometimes be slow, especially if the property is in very poor\n"
-"repair or the owner is unwilling to act. In most cases it takes six months\n"
-"before you can expect to see anything change. This doesn&rsquo;t mean the council\n"
-"isn&rsquo;t doing anything. We encourage councils to update the website so you can\n"
-"see what is happening."
+"It is worth noting however that the process can sometimes be slow,\n"
+"especially if the property is in very poor repair or the owner is unwilling "
+"to\n"
+"act. In most cases it can take six months or more before you can expect to "
+"see\n"
+"anything change and sometimes there may be considerable barries to a "
+"property\n"
+"being brought back into use. This doesn&rsquo;t mean the council isn&rsquo;"
+"t\n"
+"doing anything. We encourage councils to update the website so you can\n"
+"see what is happening. It may be a long process, but you reporting your\n"
+"concerns about this property to the council is a valuable first step."
 msgstr ""
-"Mae'r rhan fwyaf o gynghorau'n eithaf da wrth adfer eiddo gwag i'w defnydd eto. Er hynny,\n"
-"mae'r broses weithiau'n gallu bod yn araf, yn enwedig os yw cyflwr yr eiddo'n \n"
-"ddrwg iawn neu os nad yw'r perchennog yn barod i weithredu. Gan amlaf, mae'n cymryd tua chwe mis\n"
-"cyn y gallwch ddisgwyl gweld unrhyw beth yn newid. Nid yw hyn yn golygu nad yw'r cyngor\n"
+"Mae'r rhan fwyaf o gynghorau'n eithaf da wrth adfer eiddo gwag i'w defnydd "
+"eto. Er hynny,\n"
+"mae'r broses weithiau'n gallu bod yn araf, yn enwedig os yw cyflwr yr "
+"eiddo'n \n"
+"ddrwg iawn neu os nad yw'r perchennog yn barod i weithredu. Gan amlaf, mae'n "
+"cymryd tua chwe mis\n"
+"cyn y gallwch ddisgwyl gweld unrhyw beth yn newid. Nid yw hyn yn golygu nad "
+"yw'r cyngor\n"
 "yn gwneud unrhyw beth. Rydym yn annog cynghorau i ddiweddaru'r wefan \n"
 "fel y gallwch weld beth sy'n digwydd."
 
-#: fixmystreet/web/confirm.cgi:141
+#: web/confirm.cgi:151
 msgid ""
-"We will contact you again in a month and again after six months to ask what has\n"
-"happened. Hopefully the property will be well on the way to being brought back\n"
-"into use by then, but if not we can offer advice on what you can do next."
+"We may contact you periodically to ask if anything has changed\n"
+"with the property you reported."
 msgstr ""
-"Byddwn yn cysylltu â chi eto ymhen mis ac eto ymhen chwe mis i holi beth sydd wedi digwydd.\n"
-"Ein gobaith yw y bydd yr eiddo wrthi'n cael ei adfer i'w ddefnyddio erbyn hynny,\n"
-"ond os nad ydyw, gallwn gynnig cyngor ar yr beth y gallwch ei wneud nesaf."
 
-#: fixmystreet/web/confirm.cgi:144
+#: web/confirm.cgi:153
 msgid ""
 "Thank you for using ReportEmptyHomes.com. Your action is already helping\n"
 "to resolve the UK&rsquo;s empty homes crisis."
 msgstr ""
-"Diolch am ddefnyddio ReportEmptyHomes.com. Mae eich gweithred eisoes yn helpu i \n"
+"Diolch am ddefnyddio ReportEmptyHomes.com. Mae eich gweithred eisoes yn "
+"helpu i \n"
 "ddatrys argyfwng tai gwag y DU."
 
-#: fixmystreet/web/confirm.cgi:146 fixmystreet/web/confirm.cgi:149
+#: web/confirm.cgi:155 web/confirm.cgi:158
 msgid "View your report"
 msgstr "Gweld eich adroddiad"
 
-#: fixmystreet/web/confirm.cgi:148
+#: web/confirm.cgi:157
 msgid "Thank you for reporting an empty property on ReportEmptyHomes.com."
 msgstr "Diolch am roi gwybod am eiddo gwag ar ReportEmptyHomes.com."
 
-#: fixmystreet/web/confirm.cgi:153
+#: web/confirm.cgi:163
 msgid "You have successfully confirmed your empty property"
 msgstr "Rydych wedi cadarnhau eich eiddo gwag yn llwyddiannus"
 
-#: fixmystreet/web/confirm.cgi:154
+#: web/confirm.cgi:164
 msgid " and <strong>we will now send it to the council</strong>"
 msgstr " a <strong>byddwn nawr yn ei anfon at y cyngor</strong>"
 
-#: fixmystreet/web/confirm.cgi:155
+#: web/confirm.cgi:165
 #, perl-format
 msgid ". You can <a href=\"%s\">view the empty property on this site</a>."
 msgstr ". Gallwch <a href=\"%s\">weld yr eiddo gwag ar y safle hwn</a>."
 
-#: fixmystreet/web/confirm.cgi:169
-msgid "Thanks, glad to hear it's been returned to use! Could we just ask if you have ever reported an empty property to a council before?"
-msgstr "Diolch, falch o glywed ei fod wedi cael ei adfer i'w ddefnyddio! Fyddai modd i ni'ch holi chi, a ydych erioed wedi rhoi gwybod i'r cyngor am eiddo gwag cyn hyn?"
+#: web/confirm.cgi:189
+msgid ""
+"Thanks, glad to hear it's been returned to use! Could we just ask if you "
+"have ever reported an empty property to a council before?"
+msgstr ""
+"Diolch, falch o glywed ei fod wedi cael ei adfer i'w ddefnyddio! Fyddai modd "
+"i ni'ch holi chi, a ydych erioed wedi rhoi gwybod i'r cyngor am eiddo gwag "
+"cyn hyn?"
 
-#: fixmystreet/web/confirm.cgi:170 fixmystreet/web/questionnaire.cgi:246
+#: web/confirm.cgi:190 web/questionnaire.cgi:234 web-admin/index.cgi:339
+#: web-admin/index.cgi:340 web-admin/index.cgi:589
 msgid "Yes"
 msgstr "Ydw"
 
-#: fixmystreet/web/confirm.cgi:171 fixmystreet/web/questionnaire.cgi:247
+#: web/confirm.cgi:191 web/questionnaire.cgi:235 web-admin/index.cgi:339
+#: web-admin/index.cgi:340 web-admin/index.cgi:589
 msgid "No"
 msgstr "Nac ydw"
 
-#: fixmystreet/web/confirm.cgi:209
+#: web/confirm.cgi:237
 #, perl-format
-msgid "Thank you &mdash; you can <a href=\"%s\">view your updated empty property</a> on the site."
-msgstr "Diolch &mdash; gallwch <a href=\"%s\">weld diweddariad eich eiddo gwag</a> ar y safle."
+msgid ""
+"Thank you &mdash; you can <a href=\"%s\">view your updated empty property</"
+"a> on the site."
+msgstr ""
+"Diolch &mdash; gallwch <a href=\"%s\">weld diweddariad eich eiddo gwag</a> "
+"ar y safle."
 
-#: fixmystreet/web/contact.cgi:22
+#: web/contact.cgi:22
 msgid "Contact Us"
 msgstr "Cysylltwch â Ni"
 
-#: fixmystreet/web/contact.cgi:39
+#: web/contact.cgi:41
 msgid "Please give your name"
 msgstr "Rhowch eich enw"
 
-#: fixmystreet/web/contact.cgi:41
+#: web/contact.cgi:43
 msgid "Please give your email"
 msgstr "Rhowch eich cyfeiriad e-bost"
 
-#: fixmystreet/web/contact.cgi:43
+#: web/contact.cgi:45
 msgid "Please give a valid email address"
 msgstr "Rhowch gyfeiriad e-bost dilys"
 
-#: fixmystreet/web/contact.cgi:45
+#: web/contact.cgi:47
 msgid "Please give a subject"
 msgstr "Rhowch destun"
 
-#: fixmystreet/web/contact.cgi:46
+#: web/contact.cgi:48
 msgid "Please write a message"
 msgstr "Ysgrifennwch neges"
 
-#: fixmystreet/web/contact.cgi:47
+#: web/contact.cgi:49
 msgid "Illegal ID"
 msgstr "ID Anghyfreithlon"
 
-#: fixmystreet/web/contact.cgi:70
+#: web/contact.cgi:86
 msgid "Thanks for your feedback.  We'll get back to you as soon as we can!"
 msgstr "Diolch am eich adborth. Byddwn yn eich ateb cyn gynted ag y gallwn!"
 
-#: fixmystreet/web/contact.cgi:84
-msgid "Contact the team"
-msgstr "Cysylltu â'r tîm"
-
-#: fixmystreet/web/contact.cgi:103
-msgid "You are reporting the following empty property report for being abusive, containing personal information, or similar:"
-msgstr "Rydych yn cwyno am yr adroddiad canlynol am eiddo gwag gan ei fod yn sarhaus, neu'n cynnwys gwybodaeth bersonol, neu debyg:"
-
-#: fixmystreet/web/contact.cgi:160
-msgid ""
-"You are reporting the following update for being abusive, containing "
-"personal information, or similar:"
-msgstr ""
-
-#: fixmystreet/web/contact.cgi:115
+#: web/contact.cgi:134
 msgid ""
 "We&rsquo;d love to hear what you think about this\n"
-"website. Just fill in the form. Please don&rsquo;t contact us about individual empty\n"
+"website. Just fill in the form. Please don&rsquo;t contact us about "
+"individual empty\n"
 "homes; use the box accessed from <a href=\"/\">the front page</a>."
 msgstr ""
 "Byddem wrth ein bodd yn clywed eich barn am y wefan hon.\n"
-"Dim ond llenwi'r ffurflen sydd angen i chi ei wneud. Peidiwch â defnyddio hwn i gysylltu â ni am dai gwag unigol;\n"
+"Dim ond llenwi'r ffurflen sydd angen i chi ei wneud. Peidiwch â defnyddio "
+"hwn i gysylltu â ni am dai gwag unigol;\n"
 "defnyddiwch y blwch sydd i'w gael ar y <a href=\"/\">dudalen flaen</a>."
 
-#: fixmystreet/web/contact.cgi:121
+#: web/contact.cgi:141
 msgid ""
-"Please do <strong>not</strong> report empty properties through this form; messages go to\n"
-"the team behind reportemptyhomes.com, not a council. To report an empty property,\n"
+"Please do <strong>not</strong> report empty properties through this form; "
+"messages go to\n"
+"the team behind reportemptyhomes.com, not a council. To report an empty "
+"property,\n"
 "please <a href=\"/\">go to the front page</a> and follow the instructions."
 msgstr ""
-"<strong>Peidiwch</strong> ag adrodd am eiddo gwag drwy gyfrwng y ffurflen hon;\n"
-"bydd y negeseuon yn mynd at y tîm sydd y tu ôl i reportemptyhomes.com, nid at gyngor.\n"
-"I roi gwybod am eiddo gwag <a href=\"/\">ewch i'r dudalen flaen</a> a dilynwch y cyfarwyddiadau."
-
-#: fixmystreet/web/contact.cgi:124
+"<strong>Peidiwch</strong> ag adrodd am eiddo gwag drwy gyfrwng y ffurflen "
+"hon;\n"
+"bydd y negeseuon yn mynd at y tîm sydd y tu ôl i reportemptyhomes.com, nid "
+"at gyngor.\n"
+"I roi gwybod am eiddo gwag <a href=\"/\">ewch i'r dudalen flaen</a> a "
+"dilynwch y cyfarwyddiadau."
+
+#: web/contact.cgi:144
 #, perl-format
-msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:"
-msgstr "Byddai'n dda gennym glywed eich barn am y wefan hon. Llenwch y ffurflen, neu anfonwch neges e-bost at <a href='mailto:%s'>%s</a>:"
+msgid ""
+"We'd love to hear what you think about this site. Just fill in the form, or "
+"send an email to <a href='mailto:%s'>%s</a>:"
+msgstr ""
+"Byddai'n dda gennym glywed eich barn am y wefan hon. Llenwch y ffurflen, neu "
+"anfonwch neges e-bost at <a href='mailto:%s'>%s</a>:"
+
+#: web/contact.cgi:153 web/index.cgi:447
+msgid "There were problems with your report. Please see below."
+msgstr "Cafwyd anhawsterau gyda'ch adroddiad. Gweler isod."
+
+#: web/contact.cgi:158
+msgid "Contact the team"
+msgstr "Cysylltu â'r tîm"
+
+#: web/contact.cgi:196
+msgid ""
+"You are reporting the following update for being abusive, containing "
+"personal information, or similar:"
+msgstr ""
+
+#: web/contact.cgi:207
+msgid ""
+"You are reporting the following empty property report for being abusive, "
+"containing personal information, or similar:"
+msgstr ""
+"Rydych yn cwyno am yr adroddiad canlynol am eiddo gwag gan ei fod yn "
+"sarhaus, neu'n cynnwys gwybodaeth bersonol, neu debyg:"
 
-#: fixmystreet/web/contact.cgi:126
+#: web/contact.cgi:234
 msgid "Your name:"
 msgstr "Eich enw:"
 
-#: fixmystreet/web/contact.cgi:127
+#: web/contact.cgi:235
 msgid "Your&nbsp;email:"
 msgstr "Eich&nbsp;cyfeiriad e-bost:"
 
-#: fixmystreet/web/contact.cgi:128 fixmystreet/web/index.cgi:660
+#: web/contact.cgi:236 web/index.cgi:732
 msgid "Subject:"
 msgstr "Pwnc:"
 
-#: fixmystreet/web/contact.cgi:129
+#: web/contact.cgi:237
 msgid "Message:"
 msgstr "Neges:"
 
-#: fixmystreet/web/contact.cgi:130 fixmystreet/web/index.cgi:958
+#: web/contact.cgi:238 web/index.cgi:1092
 msgid "Post"
 msgstr "Postio"
 
-#: fixmystreet/web/faq.cgi:18
+#: web/faq.cgi:18
 msgid "Frequently Asked Questions"
 msgstr "Cwestiynau Cyffredin"
 
-#: fixmystreet/web/flickr.cgi:45
+#: web/flickr.cgi:45
 msgid ""
 "Thank you for trying to register for your Flickr photos. We seem to have a\n"
-"empty property ourselves though, so <a href=\"/contact\">please let us know what went on</a>\n"
+"empty property ourselves though, so <a href=\"/contact\">please let us know "
+"what went on</a>\n"
 "and we'll look into it.\n"
 msgstr ""
-"Diolch am geisio cofrestru ar gyfer eich ffotograffau Flickr . Mae'n ymddangos bod gennym \n"
-"ein heiddo gwag ein hunain fodd bynnag, felly <a href=\"/contact\">rhowch wybod i ni beth ddigwyddodd</a>\n"
+"Diolch am geisio cofrestru ar gyfer eich ffotograffau Flickr . Mae'n "
+"ymddangos bod gennym \n"
+"ein heiddo gwag ein hunain fodd bynnag, felly <a href=\"/contact\">rhowch "
+"wybod i ni beth ddigwyddodd</a>\n"
 "ac fe wnawn ni edrych iddo.\n"
 
-#: fixmystreet/web/fun.cgi:17 fixmystreet/web/fun.cgi:25
+#: web/fun.cgi:17 web/fun.cgi:25
 msgid "Weird and Wonderful reports"
 msgstr "Adroddiadau rhyfeddol a rhagorol"
 
-#: fixmystreet/web/index.cgi:74
+#: web/index.cgi:83
 msgid "Submitting your report"
 msgstr "Cyflwyno'ch adroddiad"
 
-#: fixmystreet/web/index.cgi:77
+#: web/index.cgi:86
 msgid "Submitting your update"
 msgstr "Cyflwyno'ch diweddariad"
 
-#: fixmystreet/web/index.cgi:81 fixmystreet/web/index.cgi:558 fixmystreet/web/index.cgi:572
+#: web/index.cgi:90 web/index.cgi:638
 msgid "Reporting an empty property"
 msgstr "Adrodd am eiddo gwag"
 
-#: fixmystreet/web/index.cgi:84
+#: web/index.cgi:93
 msgid "Viewing an empty property"
 msgstr "Gweld eiddo gwag"
 
-#: fixmystreet/web/index.cgi:87
+#: web/index.cgi:96
 msgid "Viewing a location"
 msgstr "Gweld lleoliad"
 
-#: fixmystreet/web/index.cgi:103
+#: web/index.cgi:121
+msgid "Enter a nearby GB postcode, or street name and area:"
+msgstr "Cofnodwch god post Prydeinig, neu enw stryd ac ardal gerllaw:"
+
+#: web/index.cgi:135
 msgid "Report and view empty properties"
 msgstr "Adrodd am eiddo gwag a gweld y rhain"
 
-#: fixmystreet/web/index.cgi:104
+#: web/index.cgi:136
 msgid " "
 msgstr " "
 
-#: fixmystreet/web/contact.cgi:124 fixmystreet/web/index.cgi:436
-msgid "There were problems with your report. Please see below."
-msgstr "Cafwyd anhawsterau gyda'ch adroddiad. Gweler isod."
-
-#: fixmystreet/web/index.cgi:125
-#, perl-format
-msgid "<big>%s</big> report in past week"
-msgid_plural "<big>%s</big> reports in past week"
-msgstr[0] "<big>%s</big> adroddiad o fewn yr wythnos ddiwethaf"
-msgstr[1] "<big>%s</big> o adroddiadau o fewn yr wythnos ddiwethaf"
-
-#: fixmystreet/web/index.cgi:130
-#, perl-format
-msgid "<big>%s</big> report recently"
-msgid_plural "<big>%s</big> reports recently"
-msgstr[0] "<big>%s</big> adroddiad yn ddiweddar"
-msgstr[1] "<big>%s</big> o adroddiadau yn ddiweddar"
-
-#: fixmystreet/web/index.cgi:138
-msgid "Thanks for uploading your photo. We now need to locate your empty property, so please enter a nearby street name or postcode in the box below&nbsp;:"
-msgstr "Diolch am lwytho'ch ffotograff i fyny. Nawr mae angen i ni ddod o hyd i leoliad eich eiddo gwag, felly rhowch enw stryd gerllaw neu god post yn y blwch isod&nbsp;:"
-
-#: fixmystreet/web/index.cgi:146
-msgid "Enter a nearby GB postcode, or street name and area:"
-msgstr "Cofnodwch god post Prydeinig, neu enw stryd ac ardal gerllaw:"
+#: web/index.cgi:158
+msgid ""
+"Thanks for uploading your photo. We now need to locate your empty property, "
+"so please enter a nearby street name or postcode in the box below&nbsp;:"
+msgstr ""
+"Diolch am lwytho'ch ffotograff i fyny. Nawr mae angen i ni ddod o hyd i "
+"leoliad eich eiddo gwag, felly rhowch enw stryd gerllaw neu god post yn y "
+"blwch isod&nbsp;:"
 
-#: fixmystreet/web/index.cgi:156
+#: web/index.cgi:176
 msgid "How to report an empty property"
 msgstr "Sut i roi gwybod am eiddo gwag"
 
-#: fixmystreet/web/index.cgi:157
-msgid "The details will be sent directly to the right person in the local council for them to take action"
-msgstr "Caiff y manylion eu hanfon yn uniongyrchol at yr unigolyn cywir yn y cyngor lleol er mwyn iddynt weithredu"
-
-#: fixmystreet/web/index.cgi:161
-msgid "Enter a nearby GB postcode, or street name and area"
-msgstr "Cofnodwch god post Prydeinig, neu enw stryd ac ardal gerllaw"
-
-#: fixmystreet/web/index.cgi:162
+#: web/index.cgi:179
 msgid "Locate the empty property on a map of the area"
 msgstr "Chwiliwch am leoliad yr eiddo gwag ar fap o'r ardal"
 
-#: fixmystreet/web/index.cgi:163
+#: web/index.cgi:180
 msgid "Enter details of the empty property"
 msgstr "Rhowch fanylion yr eiddo gwag"
 
-#: fixmystreet/web/index.cgi:169
-msgid "reportemptyhomes.com updates"
-msgstr "Diweddariadau i reportemptyhomes.com"
-
-#: fixmystreet/web/index.cgi:172
-#, perl-format
-msgid "<big>%s</big> returned to use in past month"
-msgid_plural "<big>%s</big> returned to use in past month"
-msgstr[0] "Dychwelwyd <big>%s</big> i'w ddefnyddio yn y mis diwethaf"
-msgstr[1] "Dychwelwyd <big>%s</big> i'w defnyddio yn y mis diwethaf"
-
-#: fixmystreet/web/index.cgi:174
-#, perl-format
-msgid "<big>%s</big> update on reports"
-msgid_plural "<big>%s</big> updates on reports"
-msgstr[0] "<big>%s</big> diweddariad ar adroddiadau"
-msgstr[1] "<big>%s</big> diweddariad ar adroddiadau"
+#: web/index.cgi:181
+msgid ""
+"The details will be sent directly to the right person in the local council "
+"for them to take action"
+msgstr ""
+"Caiff y manylion eu hanfon yn uniongyrchol at yr unigolyn cywir yn y cyngor "
+"lleol er mwyn iddynt weithredu"
 
-#: fixmystreet/web/index.cgi:185
+#: web/index.cgi:196
 msgid "Photos of recent reports"
 msgstr "Ffotograffau o adroddiadau diweddar"
 
-#: fixmystreet/web/index.cgi:188
+#: web/index.cgi:198
 msgid "Recently reported empty properties"
 msgstr "Eiddo gwag yr adroddwyd amdanynt yn ddiweddar"
 
-#: fixmystreet/web/index.cgi:211
+#: web/index.cgi:222
 msgid "Please enter a message"
 msgstr "Ychwanegwch neges"
 
-#: fixmystreet/web/index.cgi:214 fixmystreet/web/index.cgi:286
+#: web/index.cgi:225 web/index.cgi:309
 msgid "Please enter your email"
 msgstr "Cofnodwch eich cyfeiriad e-bost"
 
-#: fixmystreet/web/index.cgi:216 fixmystreet/web/index.cgi:288
+#: web/index.cgi:227 web/index.cgi:311
 msgid "Please enter a valid email"
 msgstr "Cofnodwch gyfeiriad e-bost dilys"
 
-#: fixmystreet/web/index.cgi:225 fixmystreet/web/index.cgi:356
+#: web/index.cgi:236 web/index.cgi:378
 #, perl-format
-msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
-msgstr "Nid yw'n ymddangos bod y ddelwedd honno wedi llwytho i fyny'n gywir (%s), rhowch gynnig arni eto."
+msgid ""
+"That image doesn't appear to have uploaded correctly (%s), please try again."
+msgstr ""
+"Nid yw'n ymddangos bod y ddelwedd honno wedi llwytho i fyny'n gywir (%s), "
+"rhowch gynnig arni eto."
 
-#: fixmystreet/web/index.cgi:246
+#: web/index.cgi:258
 msgid "Anonymous"
 msgstr "Di-enw"
 
-#: fixmystreet/web/index.cgi:277
+#: web/index.cgi:300
 msgid "No council selected"
 msgstr "Ni ddewiswyd cyngor"
 
-#: fixmystreet/web/index.cgi:278
+#: web/index.cgi:301
 msgid "Please enter a subject"
 msgstr "Rhowch enw'r pwnc"
 
-#: fixmystreet/web/index.cgi:279
+#: web/index.cgi:302
 msgid "Please enter some details"
 msgstr "Cofnodwch fanylion"
 
-#: fixmystreet/web/index.cgi:281
+#: web/index.cgi:304
 msgid "Please enter your name"
 msgstr "Cofnodwch eich enw"
 
-#: fixmystreet/web/index.cgi:283
-msgid "Please enter your full name - if you do not wish your name to be shown on the site, untick the box"
-msgstr "Cofnodwch eich enw llawn - os nad ydych yn dymuno bod eich enw'n cael ei ddangos ar y safle, cliciwch i ddileu'r tic o'r bocs"
+#: web/index.cgi:306
+msgid ""
+"Please enter your full name - if you do not wish your name to be shown on "
+"the site, untick the box"
+msgstr ""
+"Cofnodwch eich enw llawn - os nad ydych yn dymuno bod eich enw'n cael ei "
+"ddangos ar y safle, cliciwch i ddileu'r tic o'r bocs"
+
+#: web/index.cgi:313 web/index.cgi:565
+#, fuzzy
+msgid "-- Pick a category --"
+msgstr "-- Dewiswch fath o eiddo --"
 
-#: fixmystreet/web/index.cgi:291
+#: web/index.cgi:314 web/index.cgi:354
 msgid "Please choose a category"
 msgstr "Dewiswch gategori"
 
-#: fixmystreet/web/index.cgi:293 fixmystreet/web/index.cgi:529
+#: web/index.cgi:316 web/index.cgi:572
 msgid "-- Pick a property type --"
 msgstr "-- Dewiswch fath o eiddo --"
 
-#: fixmystreet/web/index.cgi:294
+#: web/index.cgi:317
 msgid "Please choose a property type"
 msgstr "Dewiswch fath o eiddo"
 
-#: fixmystreet/web/index.cgi:316
+#: web/index.cgi:338
 msgid "That location is not part of that council"
 msgstr "Nid yw'r lleoliad hwnnw'n rhan o'r cyngor hwnnw"
 
-#: fixmystreet/web/index.cgi:336
+#: web/index.cgi:358
 msgid "We have details for that council"
 msgstr "Mae gennym fanylion ar gyfer y cyngor hwnnw"
 
-#: fixmystreet/web/index.cgi:345
+#: web/index.cgi:367
 msgid "Somehow, you only have one co-ordinate. Please try again."
-msgstr "Rhywffordd neu gilydd, dim ond un cyfesuryn sydd gennych. Rhowch gynnig arni eto."
+msgstr ""
+"Rhywffordd neu gilydd, dim ond un cyfesuryn sydd gennych. Rhowch gynnig arni "
+"eto."
 
-#: fixmystreet/web/index.cgi:347
+#: web/index.cgi:369
 msgid "You haven't specified any sort of co-ordinates. Please try again."
-msgstr "Nid ydych wedi pennu unrhyw fath o gyfesurynnau. Rhowch gynnig arni eto."
+msgstr ""
+"Nid ydych wedi pennu unrhyw fath o gyfesurynnau. Rhowch gynnig arni eto."
 
-#: fixmystreet/web/index.cgi:370 fixmystreet/web/index.cgi:515 fixmystreet/web/index.cgi:522
+#: web/index.cgi:392 web/index.cgi:558 web/index.cgi:565
 msgid "Other"
 msgstr "Arall"
 
-#: fixmystreet/web/index.cgi:386
+#: web/index.cgi:408
 #, perl-format
-msgid "You have successfully confirmed your report and you can now <a href=\"%s\">view it on the site</a>."
-msgstr "Rydych wedi cadarnhau eich adroddiad yn llwyddiannus ac nawr gallwch <a href=\"%s\">weld eich adroddiad ar y safle</a>."
+msgid ""
+"You have successfully confirmed your report and you can now <a href=\"%s"
+"\">view it on the site</a>."
+msgstr ""
+"Rydych wedi cadarnhau eich adroddiad yn llwyddiannus ac nawr gallwch <a href="
+"\"%s\">weld eich adroddiad ar y safle</a>."
 
-#: fixmystreet/web/index.cgi:501
+#: web/index.cgi:545
 msgid ""
 "That spot does not appear to be covered by a council.\n"
 "If you have tried to report an issue past the shoreline, for example,\n"
@@ -929,58 +1202,62 @@ msgstr ""
 "Os ydych wedi ceisio adrodd am broblem oddi ar y lân, er enghraifft,\n"
 "dylech nodi'r pwynt agosaf ar y tir."
 
-#: fixmystreet/web/index.cgi:523
+#: web/index.cgi:566
 msgid "Category:"
 msgstr "Categori:"
 
-#: fixmystreet/web/index.cgi:529
+#: web/index.cgi:572
 msgid "Empty house or bungalow"
 msgstr "Tŷ neu fyngalo gwag"
 
-#: fixmystreet/web/index.cgi:530
+#: web/index.cgi:573
 msgid "Empty flat or maisonette"
 msgstr "Fflat neu fflat deulawr gwag"
 
-#: fixmystreet/web/index.cgi:530
+#: web/index.cgi:573
 msgid "Whole block of empty flats"
 msgstr "Bloc cyfan o fflatiau gwag"
 
-#: fixmystreet/web/index.cgi:531
+#: web/index.cgi:574
 msgid "Empty office or other commercial"
 msgstr "Swyddfa wag neu fan masnachol gwag arall"
 
-#: fixmystreet/web/index.cgi:531
+#: web/index.cgi:574
 msgid "Empty pub or bar"
 msgstr "Tafarn neu far gwag"
 
-#: fixmystreet/web/index.cgi:532
+#: web/index.cgi:575
 msgid "Empty public building - school, hospital, etc."
 msgstr "Adeilad cyhoeddus gwag - ysgol, ysbyty, ac ati."
 
-#: fixmystreet/web/index.cgi:533
+#: web/index.cgi:576
 msgid "Property type:"
 msgstr "Math o eiddo:"
 
-#: fixmystreet/web/index.cgi:573
+#: web/index.cgi:635
 msgid ""
-"You have located the empty property at the point marked with a purple pin on the map.\n"
+"You have located the empty property at the point marked with a purple pin on "
+"the map.\n"
 "If this is not the correct location, simply click on the map again. "
 msgstr ""
-"Rydych wedi gosod lleoliad yr eiddo gwag wrth y pwynt sy'n cael ei ddangos gan y pin porffor ar y map.\n"
+"Rydych wedi gosod lleoliad yr eiddo gwag wrth y pwynt sy'n cael ei ddangos "
+"gan y pin porffor ar y map.\n"
 "Os nad dyma'r lleoliad cywir, cliciwch ar y map eto. "
 
-#: fixmystreet/web/index.cgi:578
+#: web/index.cgi:643
 #, perl-format
 msgid ""
 "All the information you provide here will be sent to <strong>%s</strong>.\n"
-"On the site, we will show the subject and details of the empty property, plus your\n"
+"On the site, we will show the subject and details of the empty property, "
+"plus your\n"
 "name if you give us permission."
 msgstr ""
-"Bydd yr holl wybodaeth a ddarperir gennych yma'n cael ei hanfon at <strong>%s</strong>.\n"
+"Bydd yr holl wybodaeth a ddarperir gennych yma'n cael ei hanfon at <strong>%"
+"s</strong>.\n"
 "Ar y safle, byddwn yn dangos pwnc a manylion yr eiddo gwag,\n"
 "ynghyd â'ch enw os ydych yn rhoi caniatâd i ni."
 
-#: fixmystreet/web/index.cgi:641
+#: web/index.cgi:647
 #, perl-format
 msgid ""
 "All the information you provide here will be sent to <strong>%s</strong>.\n"
@@ -988,19 +1265,67 @@ msgid ""
 "name if you give us permission."
 msgstr ""
 
-#: fixmystreet/web/index.cgi:613
+#: web/index.cgi:660 web/index.cgi:662 web/index.cgi:675
+#, fuzzy
+msgid " or "
+msgstr "neu"
+
+#: web/index.cgi:661
+msgid "All the information you provide here will be sent to"
+msgstr ""
+
+#: web/index.cgi:664
+msgid ""
+"The subject and details of the empty property will be public, plus your name "
+"if you give us permission."
+msgstr ""
+
+#: web/index.cgi:666
+msgid ""
+"We do <strong>not</strong> yet have details for the other council that "
+"covers this location."
+msgid_plural ""
+"We do <strong>not</strong> yet have details for the other councils that "
+"cover this location."
+msgstr[0] ""
+msgstr[1] ""
+
+#: web/index.cgi:670 web/index.cgi:685
+#, perl-format
+msgid ""
+"You can help us by finding a contact email address for local empty "
+"properties for %s and emailing it to us at <a href='mailto:%s'>%s</a>."
+msgstr ""
+
+#: web/index.cgi:680 web/index.cgi:688
+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] ""
+
+#: web/index.cgi:684
+msgid ""
+"If you submit an empty property here the subject and details of the empty "
+"property will be public, but the empty property will <strong>not</strong> be "
+"reported to the council."
+msgstr ""
+
+#: web/index.cgi:690
+#, fuzzy
 msgid ""
-"<p>We do not yet have details for the council that covers\n"
-"this location. If you submit a report here it will be left on the site, but\n"
-"not reported to the council &ndash; please still leave your report, so that\n"
-"we can show to the council the activity in their area."
+"If you submit a report here it will be left on the site, but not reported to "
+"the council &ndash; please still leave your report, so that we can show to "
+"the council the activity in their area."
 msgstr ""
 "<p>Nid oes gennym fanylion eto ar gyfer y cyngor sy'n gyfrifol am \n"
-"y lleoliad hwn. Os ydych yn cyflwyno adroddiad yma, bydd yn cael ei adael ar y safle, ond\n"
-"ni fydd yn cael ei adrodd i'r cyngor &ndash; gadewch eich adroddiad o hyd, fel y gallwn\n"
+"y lleoliad hwn. Os ydych yn cyflwyno adroddiad yma, bydd yn cael ei adael ar "
+"y safle, ond\n"
+"ni fydd yn cael ei adrodd i'r cyngor &ndash; gadewch eich adroddiad o hyd, "
+"fel y gallwn\n"
 "ddangos i'r cyngor y gweithgarwch yn ei ardal."
 
-#: fixmystreet/web/index.cgi:622
+#: web/index.cgi:696
 msgid ""
 "Please fill in the form below with details of the empty property,\n"
 "and describe the location as precisely as possible in the details box."
@@ -1008,13 +1333,16 @@ msgstr ""
 "Llenwch y ffurflen isod gyda manylion yr eiddo gwag,\n"
 "a disgrifiwch y lleoliad mor fanwl ag y bo modd yn y blwch manylion."
 
-#: fixmystreet/web/index.cgi:631
+#: web/index.cgi:705
 msgid ""
 "Please fill in details of the empty property below, saying what type of\n"
 "property it is e.g. an empty home, block of flats, office etc. Tell us\n"
-"something about its condition and any other information you feel is relevant.\n"
-"There is no need for you to give the exact address. Please be polite, concise\n"
-"and to the point; writing your message entirely in block capitals makes it hard\n"
+"something about its condition and any other information you feel is "
+"relevant.\n"
+"There is no need for you to give the exact address. Please be polite, "
+"concise\n"
+"and to the point; writing your message entirely in block capitals makes it "
+"hard\n"
 "to read, as does a lack of punctuation.\n"
 msgstr ""
 "Llenwch fanylion yr eiddo gwag isod, gan ddweud pa fath o eiddo ydyw\n"
@@ -1024,89 +1352,150 @@ msgstr ""
 "ac i'r pwynt; mae ysgrifennu eich neges yn gyfan gwbl mewn priflythrennau\n"
 "yn ei gwneud hi'n anodd ei darllen, fel y mae diffyg atalnodi.\n"
 
-#: fixmystreet/web/index.cgi:703
+#: web/index.cgi:713
 msgid ""
-"Please fill in details of the empty property below. The council won't be able\n"
+"Please fill in details of the empty property below. The council won't be "
+"able\n"
 "to help unless you leave as much detail as you can, so please describe the "
 "exact location of\n"
-"the empty property (e.g. on a wall), what it is, how long it has been there, a "
-"description (and a\n"
+"the empty property (e.g. on a wall), what it is, how long it has been there, "
+"a description (and a\n"
 "photo of the empty property if you have one), etc."
 msgstr ""
 
-#: fixmystreet/web/index.cgi:644
+#: web/index.cgi:718
 msgid "Please fill in details of the empty property below."
 msgstr "Llenwch fanylion yr eiddo gwag isod."
 
-#: fixmystreet/web/index.cgi:655
+#: web/index.cgi:731
 msgid "Empty property details form"
 msgstr "Ffurflen manylion eiddo gwag"
 
-#: fixmystreet/web/index.cgi:661
+#: web/index.cgi:733
 msgid "Details:"
 msgstr "Manylion:"
 
-#: fixmystreet/web/index.cgi:662 fixmystreet/web/index.cgi:956
+#: web/index.cgi:734 web/index.cgi:1108
 msgid "Photo:"
 msgstr "Ffotograff:"
 
-#: fixmystreet/web/index.cgi:663 fixmystreet/web/index.cgi:954
+#: web/index.cgi:735 web/index.cgi:1089
 msgid "Name:"
 msgstr "Enw:"
 
-#: fixmystreet/web/index.cgi:665 fixmystreet/bin/send-reports:75
+#: web/index.cgi:737 bin/send-reports:89
 msgid "Phone:"
 msgstr "Rhif ffôn:"
 
-#: fixmystreet/web/index.cgi:666
+#: web/index.cgi:738 web/index.cgi:1096
 msgid "(optional)"
 msgstr "(dewisol)"
 
-#: fixmystreet/web/index.cgi:667
+#: web/index.cgi:740
 msgid "Can we show your name on the site?"
 msgstr "Allwn ni ddangos eich enw chi ar y safle?"
 
-#: fixmystreet/web/index.cgi:732 
+#: web/index.cgi:742
 msgid "Can we show your name publicly?"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:668
+#: web/index.cgi:744
 msgid "(we never show your email address or phone number)"
 msgstr "(nid ydym byth yn dangos eich cyfeiriad e-bost na'ch rhif ffôn)"
 
-#: fixmystreet/web/index.cgi:737
+#: web/index.cgi:771
+msgid "Please note:"
+msgstr ""
+
+#: web/index.cgi:773
+msgid ""
+"We will only use your personal information in accordance with our <a href=\"/"
+"faq#privacy\">privacy policy.</a>"
+msgstr ""
+
+#: web/index.cgi:774
+msgid "Please be polite, concise and to the point."
+msgstr ""
+
+#: web/index.cgi:775
+msgid ""
+"Please do not be abusive &mdash; abusing your council devalues the service "
+"for all users."
+msgstr ""
+
+#: web/index.cgi:776
+msgid ""
+"Writing your message entirely in block capitals makes it hard to read, as "
+"does a lack of punctuation."
+msgstr ""
+
+#: web/index.cgi:777
+msgid ""
+"Remember that reportemptyhomes.com is primarily for reporting physical empty "
+"properties that can be returned to use. If your empty property is not "
+"appropriate for submission via this site remember that you can contact your "
+"council directly using their own website."
+msgstr ""
+
+#: web/index.cgi:779
+msgid ""
+"reportemptyhomes.com and the Guardian are providing this service in "
+"partnership in <a href=\"/faq#privacy\">certain cities</a>. In those cities, "
+"both have access to any information submitted, including names and email "
+"addresses, and will use it only to ensure the smooth running of the service, "
+"in accordance with their privacy policies."
+msgstr ""
+
+#: web/index.cgi:788
 msgid "Submit"
 msgstr "Anfon"
 
-#: fixmystreet/web/index.cgi:784
+#: web/index.cgi:883
 msgid "Hide stale reports"
 msgstr "Cuddio hen adroddiadau "
 
-#: fixmystreet/web/index.cgi:787
+#: web/index.cgi:886
 msgid "Include stale reports"
 msgstr "Cynnwys hen adroddiadau"
 
-#: fixmystreet/web/index.cgi:793
+#: web/index.cgi:905
+msgid "No empty properties have been reported yet."
+msgstr "Ni roddwyd gwybod eto am unrhyw eiddo gwag."
+
+#: web/index.cgi:921
+msgid "No empty properties found."
+msgstr "Ni ddaethpwyd o hyd i unrhyw eiddo gwag."
+
+#: web/index.cgi:926
 msgid "Show pins"
 msgstr "Dangos pinnau"
 
-#: fixmystreet/web/index.cgi:797
+#: web/index.cgi:930
 msgid "Hide pins"
 msgstr "Cuddio pinnau"
 
-#: fixmystreet/web/index.cgi:802
-msgid "Empty properties in this area"
-msgstr "Eiddo gwag yn yr ardal hon"
-
-#: fixmystreet/web/index.cgi:803
+#: web/index.cgi:969
 msgid "Email me new local empty properties"
 msgstr "Anfonwch fanylion eiddo gwag lleol newydd ataf i drwy'r e-bost"
 
-#: fixmystreet/web/index.cgi:804
+#: web/index.cgi:971
 msgid "RSS feed of recent local empty properties"
 msgstr "Porthiant RSS o eiddo gwag lleol diweddar"
 
-#: fixmystreet/web/index.cgi:819
+#: web/index.cgi:974
+msgid "Empty properties in this area"
+msgstr "Eiddo gwag yn yr ardal hon"
+
+#: web/index.cgi:975
+msgid "Reports on and around the map"
+msgstr "Adroddiadau ar ac yng nghyffiniau'r map"
+
+#: web/index.cgi:976
+#, perl-format
+msgid "Closest nearby empty properties <small>(within&nbsp;%skm)</small>"
+msgstr "Yr eiddo gwag cyfagos agosaf <small>(within&nbsp;%skm)</small>"
+
+#: web/index.cgi:980
 msgid ""
 "To report an empty property, simply\n"
 "        <strong>click on the map</strong> at the correct location."
@@ -1114,7 +1503,7 @@ msgstr ""
 "Er mwyn rhoi gwybod am eiddo gwag\n"
 "        <strong>cliciwch ar y map</strong> wrth y lleoliad cywir."
 
-#: fixmystreet/web/index.cgi:821
+#: web/index.cgi:982
 #, perl-format
 msgid ""
 "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this\n"
@@ -1123,425 +1512,876 @@ msgstr ""
 "<small>Os na allwch weld y map, <a href='%s' rel='nofollow'>ewch heibio\n"
 "        i'r cam hwn</a>.</small>"
 
-#: fixmystreet/web/index.cgi:823
-msgid "Reports on and around the map"
-msgstr "Adroddiadau ar ac yng nghyffiniau'r map"
-
-#: fixmystreet/web/index.cgi:832
-msgid "No empty properties have been reported yet."
-msgstr "Ni roddwyd gwybod eto am unrhyw eiddo gwag."
-
-#: fixmystreet/web/index.cgi:835
-#, perl-format
-msgid "Closest nearby empty properties <small>(within&nbsp;%skm)</small>"
-msgstr "Yr eiddo gwag cyfagos agosaf <small>(within&nbsp;%skm)</small>"
-
-#: fixmystreet/web/index.cgi:844
-msgid "No empty properties found."
-msgstr "Ni ddaethpwyd o hyd i unrhyw eiddo gwag."
-
-#: fixmystreet/web/index.cgi:851
+#: web/index.cgi:987
 msgid "Recent local empty properties, reportemptyhomes.com"
 msgstr "Eiddo gwag lleol diweddar, reportemptyhomes.com"
 
-#: fixmystreet/web/index.cgi:881 fixmystreet/web/index.cgi:883
+#: web/index.cgi:1000
+msgid "There were problems with your update. Please see below."
+msgstr "Cafwyd anhawsterau gyda'ch diweddariad. Gweler isod"
+
+#: web/index.cgi:1021 web/index.cgi:1023
 msgid "Unknown empty property ID"
 msgstr "ID eiddo gwag anhysbys"
 
-#: fixmystreet/web/index.cgi:884
+#: web/index.cgi:1024
 msgid "That report has been removed from reportemptyhomes.com."
 msgstr "Mae'r adroddiad hwnnw wedi cael ei dynnu oddi ar reportemptyhomes.com"
 
-#: fixmystreet/web/index.cgi:907
+#: web/index.cgi:1044
 msgid "This empty property is old and of unknown status."
 msgstr "Mae'r eiddo gwag hwn yn hen ac nid yw ei statws yn hysbys."
 
-#: fixmystreet/web/index.cgi:910 fixmystreet/web/index.cgi:952
+#: web/index.cgi:1047 web/index.cgi:1088
 msgid "This empty property has been returned to use"
 msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio"
 
-#: fixmystreet/web/index.cgi:915
-msgid "Offensive? Unsuitable? Tell us"
-msgstr "Sarhaus? Anaddas? Rhowch wybod i ni"
-
-#: fixmystreet/web/index.cgi:920
+#: web/index.cgi:1072
 msgid "More empty properties nearby"
 msgstr "Mwy o eiddo gwag cyfagos"
 
-#: fixmystreet/web/index.cgi:922
+#: web/index.cgi:1075
 msgid "Email me updates"
 msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost"
 
-#: fixmystreet/web/index.cgi:925
+#: web/index.cgi:1078
 msgid "Receive email when updates are left on this empty property"
-msgstr "Hoffwn dderbyn neges e-bost pan gaiff diweddariadau eu rhoi am yr eiddo gwag hwn"
+msgstr ""
+"Hoffwn dderbyn neges e-bost pan gaiff diweddariadau eu rhoi am yr eiddo gwag "
+"hwn"
 
-#: fixmystreet/web/index.cgi:936
+#: web/index.cgi:1083
 msgid "RSS feed of updates to this empty property"
 msgstr "Porthiant RSS o ddiweddariadau i'r eiddo gwag hwn"
 
-#: fixmystreet/web/index.cgi:941
+#: web/index.cgi:1084
 msgid "Provide an update"
 msgstr "Rhowch ddiweddariad"
 
-#: fixmystreet/web/index.cgi:942
-msgid "Please note that updates are not sent to the council."
-msgstr "Sylwer nad yw diweddariadau'n cael eu hanfon at y cyngor."
+#: web/index.cgi:1090
+msgid "Update:"
+msgstr "Diweddariad:"
 
-#: fixmystreet/web/index.cgi:988
+#: web/index.cgi:1091
+msgid "Alert me to future updates"
+msgstr "Rhowch wybod i mi am ddiweddariadau yn y dyfodol"
+
+#: web/index.cgi:1099
 msgid ""
 "Please note that updates are not sent to the council. If you leave your name "
 "it will be public. Your information will only be used in accordance with our "
 "<a href=\"/faq#privacy\">privacy policy</a>"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:955
-msgid "Update:"
-msgstr "Diweddariad:"
-
-#: fixmystreet/web/index.cgi:905
-msgid "There were problems with your update. Please see below."
-msgstr "Cafwyd anhawsterau gyda'ch diweddariad. Gweler isod"
-
-#: fixmystreet/web/index.cgi:957
-msgid "Alert me to future updates"
-msgstr "Rhowch wybod i mi am ddiweddariadau yn y dyfodol"
-
-#: fixmystreet/web/index.cgi:994
+#: web/index.cgi:1119
 msgid "Updates to this empty property, reportemptyhomes.com"
 msgstr "Diweddariadau i'r eiddo gwag hwn, reportemptyhomes.com"
 
-#: fixmystreet/web/questionnaire.cgi:28 fixmystreet/web/questionnaire.cgi:206
+#: web/questionnaire.cgi:29 web/questionnaire.cgi:80 web/questionnaire.cgi:213
+#: web/questionnaire.cgi:233
 msgid "Questionnaire"
 msgstr "Holiadur"
 
-#: fixmystreet/web/questionnaire.cgi:38
-msgid "I'm afraid we couldn't validate that token. If you've copied the URL from an email, please check that you copied it exactly.\n"
-msgstr "Yn anffodus, ni fu modd i ni ddilysu'r dynodiad hwnnw. Os ydych wedi copïo'r URL o neges e-bost, gwnewch yn siwr eich bod wedi'i gopïo'n union.\n"
+#: web/questionnaire.cgi:41
+msgid ""
+"I'm afraid we couldn't validate that token. If you've copied the URL from an "
+"email, please check that you copied it exactly.\n"
+msgstr ""
+"Yn anffodus, ni fu modd i ni ddilysu'r dynodiad hwnnw. Os ydych wedi copïo'r "
+"URL o neges e-bost, gwnewch yn siwr eich bod wedi'i gopïo'n union.\n"
 
-#: fixmystreet/web/questionnaire.cgi:43
+#: web/questionnaire.cgi:48
 #, perl-format
-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 empty property</a>.\n"
-msgstr "Rydych eisoes wedi ateb yr holiadur hwn. Os oes gennych gwestiwn, <a href='%s'>cysylltwch â ni</a>, neu ewch i <a href='%s'>weld eich eiddo gwag</a>.\n"
+msgid ""
+"You have already answered this questionnaire. If you have a question, please "
+"<a href='%s'>get in touch</a>, or <a href='%s'>view your empty property</"
+"a>.\n"
+msgstr ""
+"Rydych eisoes wedi ateb yr holiadur hwn. Os oes gennych gwestiwn, <a href='%"
+"s'>cysylltwch â ni</a>, neu ewch i <a href='%s'>weld eich eiddo gwag</a>.\n"
 
-#: fixmystreet/web/questionnaire.cgi:48
+#: web/questionnaire.cgi:53
 msgid "I'm afraid we couldn't locate your empty property in the database.\n"
-msgstr "Yn anffodus ni fu modd i ni ddod o hyd i'ch eiddo gwag yn y gronfa ddata.\n"
+msgstr ""
+"Yn anffodus ni fu modd i ni ddod o hyd i'ch eiddo gwag yn y gronfa ddata.\n"
 
-#: fixmystreet/web/questionnaire.cgi:79
+#: web/questionnaire.cgi:92
 msgid "Please state whether or not the empty property has been returned to use"
-msgstr "Cofnodwch a yw'r eiddo gwag wedi cael ei adfer i'w ddefnyddio, ai peidio"
+msgstr ""
+"Cofnodwch a yw'r eiddo gwag wedi cael ei adfer i'w ddefnyddio, ai peidio"
 
-#: fixmystreet/web/questionnaire.cgi:80
-msgid "Please say whether you've ever reported an empty property to your council before"
-msgstr "Rhowch wybod a ydych chi wedi rhoi gwybod i'ch cyngor am eiddo gwag erioed o'r blaen"
+#: web/questionnaire.cgi:95
+msgid ""
+"Please say whether you've ever reported an empty property to your council "
+"before"
+msgstr ""
+"Rhowch wybod a ydych chi wedi rhoi gwybod i'ch cyngor am eiddo gwag erioed "
+"o'r blaen"
 
-#: fixmystreet/web/questionnaire.cgi:81
+#: web/questionnaire.cgi:97
 msgid "Please indicate whether you'd like to receive another questionnaire"
 msgstr "Nodwch a fyddech chi'n hoffi derbyn holiadur arall"
 
-#: fixmystreet/web/questionnaire.cgi:83
+#: web/questionnaire.cgi:99
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr "Rhowch ychydig o esboniad pam rydych yn ailagor yr adroddiad hwn"
 
-#: fixmystreet/web/questionnaire.cgi:99
+#: web/questionnaire.cgi:115
 msgid "Please provide some text as well as a photo"
 msgstr "Rhowch rywfaint o destun yn ogystal â ffotograff"
 
-#: fixmystreet/web/questionnaire.cgi:130
+#: web/questionnaire.cgi:146
 msgid "Questionnaire filled in by empty property reporter"
 msgstr "Llenwyd yr holiadur gan yr unigolyn a roddodd wybod am yr eiddo gwag"
 
-#: fixmystreet/web/questionnaire.cgi:148
+#: web/questionnaire.cgi:166
 msgid ""
 "<p>Thank you very much for filling in our questionnaire; if you\n"
-"get some more information about the status of your empty property, please come back to the\n"
+"get some more information about the status of your empty property, please "
+"come back to the\n"
 "site and leave an update.</p>\n"
 msgstr ""
 "<p>Diolch yn fawr am lenwi ein holiadur; os ydych yn cael \n"
 "mwy o wybodaeth am statws eich eiddo gwag, dewch yn ôl i'r safle\n"
 "a rhowch ddiweddariad yno.</p>\n"
 
-#: fixmystreet/web/questionnaire.cgi:154
+#: web/questionnaire.cgi:174
+#, fuzzy, perl-format
 msgid ""
-"<p style=\"font-size:150%%\">We're sorry to hear that. We have two suggestions: why not try\n"
+"<p style=\"font-size:150%%\">We're sorry to hear that. We have two "
+"suggestions: why not try\n"
 "<a href=\"%s\">writing direct to your councillor(s)</a>\n"
-"or, if it's an empty property that could be returned to use by local people working together,\n"
-"why not <a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n"
+"or, if it's an empty property that could be returned to use by local people "
+"working together,\n"
+"why not <a href=\"http://www.pledgebank.com/new\">make and publicise a "
+"pledge</a>?\n"
 "</p>\n"
 msgstr ""
-"<p style=\"font-size:150%\">Mae'n flin gennym glywed hynny. Mae gennym ddau awgrym: beth am roi cynnig ar\n"
-"<a href=\"http://www.writetothem.com/\">ysgrifennu'n uniongyrchol at eich cynghorwr(wyr)</a>\n"
-"neu, os yw'n eiddo gwag y gallai pobl leol gydweithio er mwyn ei adfer i'w ddefnyddio,\n"
-"beth am <a href=\"http://www.pledgebank.com/new\">wneud adduned a'i chyhoeddi</a>?\n"
+"<p style=\"font-size:150%\">Mae'n flin gennym glywed hynny. Mae gennym ddau "
+"awgrym: beth am roi cynnig ar\n"
+"<a href=\"http://www.writetothem.com/\">ysgrifennu'n uniongyrchol at eich "
+"cynghorwr(wyr)</a>\n"
+"neu, os yw'n eiddo gwag y gallai pobl leol gydweithio er mwyn ei adfer i'w "
+"ddefnyddio,\n"
+"beth am <a href=\"http://www.pledgebank.com/new\">wneud adduned a'i "
+"chyhoeddi</a>?\n"
 "</p>\n"
 
-#: fixmystreet/web/questionnaire.cgi:162
-msgid "<p style=\"font-size:150%\">Thank you very much for filling in our questionnaire; glad to hear it's been returned to use.</p>\n"
-msgstr "<p style=\"font-size:150%\">Diolch yn fawr am lenwi'n holiadur; rydym yn falch o glywed ei fod wedi'i adfer i'w ddefnyddio.</p>\n"
+#: web/questionnaire.cgi:183
+msgid ""
+"<p style=\"font-size:150%\">Thank you very much for filling in our "
+"questionnaire; glad to hear it's been returned to use.</p>\n"
+msgstr ""
+"<p style=\"font-size:150%\">Diolch yn fawr am lenwi'n holiadur; rydym yn "
+"falch o glywed ei fod wedi'i adfer i'w ddefnyddio.</p>\n"
+
+#: web/questionnaire.cgi:236
+msgid "Don&rsquo;t know"
+msgstr "Ddim yn gwybod"
 
-#: fixmystreet/web/questionnaire.cgi:214
+#: web/questionnaire.cgi:237
+msgid "Submit questionnaire"
+msgstr "Anfon yr holiadur"
+
+#: web/questionnaire.cgi:254
 msgid ""
 "<p>Getting empty homes back into use can be difficult. You shouldn't expect\n"
-"the property to be back into use yet. But a good council will have started work\n"
+"the property to be back into use yet. But a good council will have started "
+"work\n"
 "and should have reported what they have done on the website. If you are not\n"
-"satisfied with progress or information from the council, now is the right time\n"
-"to say. You may also want to try contacting some other people who may be able\n"
+"satisfied with progress or information from the council, now is the right "
+"time\n"
+"to say. You may also want to try contacting some other people who may be "
+"able\n"
 "to help.  For advice on how to do this and other useful information please\n"
-"go to <a href=\"http://www.emptyhomes.com/getinvolved/campaign.html\">http://www.emptyhomes.com/getinvolved/campaign.html</a>.</p>\n"
+"go to <a href=\"http://www.emptyhomes.com/getinvolved/campaign.html\">http://"
+"www.emptyhomes.com/getinvolved/campaign.html</a>.</p>\n"
 msgstr ""
-"<p>Mae cael eiddo gwag yn ôl mewn defnydd yn gallu bod yn anodd. Ni ddylech ddisgwyl\n"
-"bod yr eiddo yn ôl mewn defnydd eto. Fodd bynnag, bydd cyngor da eisoes wedi dechrau gweithio\n"
-"a dylent fod wedi rhoi gwybod beth maent wedi'i wneud ar y wefan. Os nad ydych yn fodlon\n"
-"â'r cynnydd neu'r wybodaeth gan y cyngor, nawr yw'r amser priodol i ddweud hynny.\n"
-"Efallai hefyd y byddwch eisiau rhoi cynnig ar gysylltu â rhai pobl eraill a all helpu.\n"
+"<p>Mae cael eiddo gwag yn ôl mewn defnydd yn gallu bod yn anodd. Ni ddylech "
+"ddisgwyl\n"
+"bod yr eiddo yn ôl mewn defnydd eto. Fodd bynnag, bydd cyngor da eisoes wedi "
+"dechrau gweithio\n"
+"a dylent fod wedi rhoi gwybod beth maent wedi'i wneud ar y wefan. Os nad "
+"ydych yn fodlon\n"
+"â'r cynnydd neu'r wybodaeth gan y cyngor, nawr yw'r amser priodol i ddweud "
+"hynny.\n"
+"Efallai hefyd y byddwch eisiau rhoi cynnig ar gysylltu â rhai pobl eraill a "
+"all helpu.\n"
 "I gael cyngor ar sut i wneud hyn ac am wybodaeth ddefnyddiol arall, ewch i \n"
-"<a href=\"http://www.emptyhomes.com/getinvolved/campaign.html\">http://www.emptyhomes.com/getinvolved/campaign.html</a>.</p>\n"
+"<a href=\"http://www.emptyhomes.com/getinvolved/campaign.html\">http://www."
+"emptyhomes.com/getinvolved/campaign.html</a>.</p>\n"
 
-#: fixmystreet/web/questionnaire.cgi:224
+#: web/questionnaire.cgi:264
 msgid ""
-"<p>Getting empty homes back into use can be difficult, but by now a good council\n"
+"<p>Getting empty homes back into use can be difficult, but by now a good "
+"council\n"
 "will have made a lot of progress and reported what they have done on the\n"
-"website. Even so properties can remain empty for many months if the owner is\n"
-"unwilling or the property is in very poor repair.  If nothing has happened or\n"
-"you are not satisfied with the progress the council is making, now is the right\n"
+"website. Even so properties can remain empty for many months if the owner "
+"is\n"
+"unwilling or the property is in very poor repair.  If nothing has happened "
+"or\n"
+"you are not satisfied with the progress the council is making, now is the "
+"right\n"
 "time to say so. We think it's a good idea to contact some other people who\n"
 "may be able to help or put pressure on the council  For advice on how to do\n"
 "this and other useful information please go to <a\n"
-"href=\"http://www.emptyhomes.com/getinvolved/campaign.html\">http://www.emptyhomes.com/getinvolved/campaign.html</a>.</p>\n"
-msgstr ""
-"<p>Mae cael eiddo gwag yn ôl mewn defnydd yn gallu bod yn anodd, ond erbyn hyn,\n"
-"bydd cyngor da wedi gwneud eithaf tipyn o gynnydd ac wedi rhoi gwybod beth maent\n"
-"wedi'i wneud ar y wefan. Er hynny, gall eiddo gwag barhau'n wag am fisoedd os yw'r perchennog\n"
-"yn amharod neu os yw cyflwr yr eiddo'n wael.  Os nad oes unrhyw beth wedi digwydd neu\n"
-"os nad ydych yn fodlon â'r cynnydd y mae'r cyngor yn ei wneud, nawr yw'r amser priodol\n"
-"i ddweud hynny. Rydym o'r farn bod cysylltu â phobl eraill a allai helpu neu roi pwysau\n"
+"href=\"http://www.emptyhomes.com/getinvolved/campaign.html\">http://www."
+"emptyhomes.com/getinvolved/campaign.html</a>.</p>\n"
+msgstr ""
+"<p>Mae cael eiddo gwag yn ôl mewn defnydd yn gallu bod yn anodd, ond erbyn "
+"hyn,\n"
+"bydd cyngor da wedi gwneud eithaf tipyn o gynnydd ac wedi rhoi gwybod beth "
+"maent\n"
+"wedi'i wneud ar y wefan. Er hynny, gall eiddo gwag barhau'n wag am fisoedd "
+"os yw'r perchennog\n"
+"yn amharod neu os yw cyflwr yr eiddo'n wael.  Os nad oes unrhyw beth wedi "
+"digwydd neu\n"
+"os nad ydych yn fodlon â'r cynnydd y mae'r cyngor yn ei wneud, nawr yw'r "
+"amser priodol\n"
+"i ddweud hynny. Rydym o'r farn bod cysylltu â phobl eraill a allai helpu neu "
+"roi pwysau\n"
 "ar y cyngor yn syniad da. I gael cyngor ar sut i wneud hyn \n"
 "a gwybodaeth ddefnyddiol arall, ewch i <a\n"
-"href=\"http://www.emptyhomes.com/getinvolved/campaign.html\">http://www.emptyhomes.com/getinvolved/campaign.html</a>.</p>\n"
+"href=\"http://www.emptyhomes.com/getinvolved/campaign.html\">http://www."
+"emptyhomes.com/getinvolved/campaign.html</a>.</p>\n"
 
-#: fixmystreet/web/questionnaire.cgi:237
-msgid "The details of your empty property are available on the right hand side of this page."
+#: web/questionnaire.cgi:277
+msgid ""
+"The details of your empty property are available on the right hand side of "
+"this page."
 msgstr "Mae manylion eich eiddo gwag ar gael ar ochr dde'r dudalen hon."
 
-#: fixmystreet/web/questionnaire.cgi:238
+#: web/questionnaire.cgi:278
 msgid "Please take a look at the updates that have been left."
 msgstr "Ewch i fwrw golwg ar y diweddariadau sydd wedi cael eu gadael."
 
-#: fixmystreet/web/questionnaire.cgi:244
+#: web/questionnaire.cgi:284
 msgid "An update marked this empty property as returned to use."
-msgstr "Fe wnaeth diweddariad gofnodi bod yr eiddo hwn wedi cael ei adfer i'w ddefnyddio."
+msgstr ""
+"Fe wnaeth diweddariad gofnodi bod yr eiddo hwn wedi cael ei adfer i'w "
+"ddefnyddio."
 
-#: fixmystreet/web/questionnaire.cgi:245
+#: web/questionnaire.cgi:285
 msgid "Has this empty property been returned to use?"
 msgstr "A yw'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio?"
 
-#: fixmystreet/web/questionnaire.cgi:248
-msgid "Don&rsquo;t know"
-msgstr "Ddim yn gwybod"
-
-#: fixmystreet/web/questionnaire.cgi:259
-msgid "Have you ever reported an empty property to a council before, or is this your first time?"
-msgstr "Ydych chi wedi rhoi gwybod i gyngor am eiddo gwag erioed o'r blaen, neu ai dyma'ch tro cyntaf?"
-
-#: fixmystreet/web/questionnaire.cgi:261
+#: web/questionnaire.cgi:292
 msgid "Reported before"
 msgstr "Wedi adrodd o'r blaen"
 
-#: fixmystreet/web/questionnaire.cgi:262
+#: web/questionnaire.cgi:293
 msgid "First time"
 msgstr "Y tro cyntaf"
 
-#: fixmystreet/web/questionnaire.cgi:271
+#: web/questionnaire.cgi:294
 msgid ""
-"If you wish to leave a public update on the empty property, please enter it here\n"
+"Have you ever reported an empty property to a council before, or is this "
+"your first time?"
+msgstr ""
+"Ydych chi wedi rhoi gwybod i gyngor am eiddo gwag erioed o'r blaen, neu ai "
+"dyma'ch tro cyntaf?"
+
+#: web/questionnaire.cgi:304
+msgid ""
+"If you wish to leave a public update on the empty property, please enter it "
+"here\n"
 "(please note it will not be sent to the council). For example, what was\n"
 "your experience of getting the empty property returned to use?"
 msgstr ""
-"Os ydych yn dymuno gadael diweddariad cyhoeddus am yr eiddo gwag, cofnodwch hwn yma\n"
-"(sylwer na fydd yn cael ei anfon at y cyngor). Er enghraifft, beth oedd eich profiad\n"
+"Os ydych yn dymuno gadael diweddariad cyhoeddus am yr eiddo gwag, cofnodwch "
+"hwn yma\n"
+"(sylwer na fydd yn cael ei anfon at y cyngor). Er enghraifft, beth oedd eich "
+"profiad\n"
 "o gael yr eiddo gwag yn ôl mewn defnydd?"
 
-#: fixmystreet/web/questionnaire.cgi:299
-msgid "Submit questionnaire"
-msgstr "Anfon yr holiadur"
-
-#: fixmystreet/web/reports.cgi:164 fixmystreet/web/reports.cgi:205
+#: web/reports.cgi:192 web/reports.cgi:239
 msgid "Summary reports"
 msgstr "Adroddiadau cryno"
 
-#: fixmystreet/web/reports.cgi:166
-msgid "This is a summary of all reports on this site; select a particular council to see the reports sent there."
-msgstr "Dyma grynodeb o'r holl adroddiadau ar y safle hwn; dewiswch gyngor penodol i weld yr adroddiadau a anfonwyd ato."
+#: web/reports.cgi:194
+msgid ""
+"This is a summary of all reports on this site; select a particular council "
+"to see the reports sent there."
+msgstr ""
+"Dyma grynodeb o'r holl adroddiadau ar y safle hwn; dewiswch gyngor penodol i "
+"weld yr adroddiadau a anfonwyd ato."
 
-#: fixmystreet/web/reports.cgi:167
+#: web/reports.cgi:195
 msgid "Greyed-out lines are councils that no longer exist."
 msgstr "Mae'r llinellau mewn llwyd yn gynghorau nad ydynt yn bodoli mwyach."
 
-#: fixmystreet/web/reports.cgi:171
+#: web/reports.cgi:199
 msgid "Name"
 msgstr "Enw"
 
-#: fixmystreet/web/reports.cgi:171 fixmystreet/web/reports.cgi:236
+#: web/reports.cgi:199 web/reports.cgi:275
 msgid "New empty property reports"
 msgstr "Adroddiadau newydd am eiddo gwag"
 
-#: fixmystreet/web/reports.cgi:171 fixmystreet/web/reports.cgi:244
+#: web/reports.cgi:199 web/reports.cgi:283
 msgid "Older empty property reports"
 msgstr "Adroddiadau hŷn o eiddo gwag"
 
-#: fixmystreet/web/reports.cgi:173
+#: web/reports.cgi:201
 msgid "Old empty properties,<br>state unknown"
 msgstr "Hen eiddo gwag,<br>cyflwr anhysbys"
 
-#: fixmystreet/web/reports.cgi:175 fixmystreet/web/reports.cgi:252
+#: web/reports.cgi:203 web/reports.cgi:290
 msgid "Recently returned to use"
 msgstr "Wedi'u hadfer i'w defnyddio'n ddiweddar"
 
-#: fixmystreet/web/reports.cgi:175
+#: web/reports.cgi:203
 msgid "Older returned to use"
 msgstr "Wedi'u hadfer i'w defnyddio ers amser"
 
-#: fixmystreet/web/reports.cgi:211
+#: web/reports.cgi:245
 msgid "council"
 msgstr "cyngor"
 
-#: fixmystreet/web/reports.cgi:217
+#: web/reports.cgi:255
 #, perl-format
-msgid "%s - Summary reports"
-msgstr "%s - Adroddiadau cryno"
+msgid "RSS feed of empty properties in this %s"
+msgstr "Porthiant RSS o eiddo gwag yn yr %s hwn"
 
-#: fixmystreet/web/reports.cgi:217
+#: web/reports.cgi:259
 #, perl-format
-msgid "Empty properties within %s, reportemptyhomes.com"
-msgstr "Eiddo gwag o fewn %s, reportemptyhomes.com"
+msgid "This is a summary of all reports for one %s."
+msgstr "Dyma grynodeb o'r holl adroddiadau ar gyfer y %s."
 
-#: fixmystreet/web/reports.cgi:219
+#: web/reports.cgi:260
 #, perl-format
-msgid "RSS feed of empty properties in this %s"
-msgstr "Porthiant RSS o eiddo gwag yn yr %s hwn"
+msgid "This is a summary of all reports for this %s."
+msgstr ""
 
-#: fixmystreet/web/reports.cgi:222
+#: web/reports.cgi:264
 #, perl-format
 msgid "You can <a href=\"%s\">see less detail</a>."
 msgstr "Gallwch <a href=\"%s\">weld llai o fanylion</a>."
 
-#: fixmystreet/web/reports.cgi:224
+#: web/reports.cgi:266
 #, perl-format
 msgid "You can <a href=\"%s\">see more details</a>."
 msgstr "Gallwch <a href=\"%s\">weld mwy o fanylion</a>."
 
-#: fixmystreet/web/reports.cgi:226
-#, perl-format
-msgid "You can <a href=\"%s\">see less detail</a> or go back and <a href=\"/reports\">show all councils</a>."
-msgstr "Gallwch <a href=\"%s\">weld llai o fanylion</a> neu fynd yn ôl a <a href=\"/reports\">dangos pob cyngor</a>."
-
-#: fixmystreet/web/reports.cgi:228
-#, perl-format
-msgid "You can <a href=\"%s\">see more details</a> or go back and <a href=\"/reports\">show all councils</a>."
-msgstr "Gallwch <a href=\"%s\">weld mwy o fanylion</a> neu fynd yn ôl a <a href=\"/reports\">dangos pob cyngor</a>."
-
-#: fixmystreet/web/reports.cgi:232
+#: web/reports.cgi:268
 #, perl-format
-msgid "This is a summary of all reports for one %s."
-msgstr "Dyma grynodeb o'r holl adroddiadau ar gyfer y %s."
+msgid ""
+"You can <a href=\"%s\">see less detail</a> or go back and <a href=\"/reports"
+"\">show all councils</a>."
+msgstr ""
+"Gallwch <a href=\"%s\">weld llai o fanylion</a> neu fynd yn ôl a <a href=\"/"
+"reports\">dangos pob cyngor</a>."
 
-#: fixmystreet/web/reports.cgi:205
+#: web/reports.cgi:270
 #, perl-format
-msgid "This is a summary of all reports for this %s."
+msgid ""
+"You can <a href=\"%s\">see more details</a> or go back and <a href=\"/reports"
+"\">show all councils</a>."
 msgstr ""
+"Gallwch <a href=\"%s\">weld mwy o fanylion</a> neu fynd yn ôl a <a href=\"/"
+"reports\">dangos pob cyngor</a>."
 
-#: fixmystreet/web/reports.cgi:246
+#: web/reports.cgi:285
 msgid "Old empty properties, state unknown"
 msgstr "Eiddo gwag hen, nid yw eu cyflwr yn hysbys"
 
-#: fixmystreet/web/reports.cgi:253
+#: web/reports.cgi:291
 msgid "Old returned to use"
 msgstr "Hen wedi'i adfer i'w ddefnyddio"
 
-#: fixmystreet/bin/send-reports:77
-msgid "This web page also contains a photo of the empty property, provided by the user."
-msgstr "Mae'r dudalen we hon hefyd yn cynnwys ffotograff o'r eiddo gwag, wedi'i ddarparu gan y defnyddiwr."
+#: web/reports.cgi:294
+#, perl-format
+msgid "%s - Summary reports"
+msgstr "%s - Adroddiadau cryno"
 
-#: fixmystreet/bin/send-reports:83
+#: web/reports.cgi:294
+#, perl-format
+msgid "Empty properties within %s, reportemptyhomes.com"
+msgstr "Eiddo gwag o fewn %s, reportemptyhomes.com"
+
+#: web/reports.cgi:334
+#, fuzzy
+msgid "(not sent to council)"
+msgstr "Ni roddwyd gwybod i'r cyngor am hyn"
+
+#: bin/send-reports:91
+msgid ""
+"This web page also contains a photo of the empty property, provided by the "
+"user."
+msgstr ""
+"Mae'r dudalen we hon hefyd yn cynnwys ffotograff o'r eiddo gwag, wedi'i "
+"ddarparu gan y defnyddiwr."
+
+#: bin/send-reports:97
 msgid "To view a map of the precise location of this issue"
 msgstr "Gweld map o union leoliad y broblem hon"
 
-#: fixmystreet/bin/send-reports:84
-msgid "The user could not locate the empty property on a map, but to see the area around the location they entered"
-msgstr "Ni allai'r defnyddiwr leoli'r eiddo gwag ar fap, ond i weld yr ardal o gwmpas y lleoliad a gofnodwyd ganddynt "
+#: bin/send-reports:98
+msgid ""
+"The user could not locate the empty property on a map, but to see the area "
+"around the location they entered"
+msgstr ""
+"Ni allai'r defnyddiwr leoli'r eiddo gwag ar fap, ond i weld yr ardal o "
+"gwmpas y lleoliad a gofnodwyd ganddynt "
 
-#: fixmystreet/bin/send-reports:88
-#, perl-format
-msgid "The closest address, as the crow flies, to the location of this empty property, %.0fm away, is: %s - please note that this is automatically generated, so ensure that you check it against the details provided by the user and, if possible, the map."
-msgstr "Y cyfeiriad agosaf ar draws gwlad, i leoliad yr eiddo gwag hwn, %.0fm i ffwrdd, yw: %s - sylwer bod hwn yn cael ei greu'n awtomatig, felly gwnewch yn siwr eich bod yn ei gadarnhau yn ôl y manylion sy'n cael eu rhoi gan y defnyddiwr ac, os oes modd, ei gadarnhau yn ôl y map."
+#: bin/send-reports:178
+#, fuzzy
+msgid "this type of local empty property"
+msgstr "Anfonwch fanylion eiddo gwag lleol newydd ataf i drwy'r e-bost"
 
-#: fixmystreet/db/alert_types_eha.pl:5 fixmystreet/db/alert_types_eha.pl:6
-#, perl-brace-format
-msgid "Updates on {{title}}"
-msgstr "Diweddariadau am {{title}}"
+#: bin/send-reports:182
+#, fuzzy, perl-format
+msgid "Category: %s"
+msgstr "Categori:"
 
-#: fixmystreet/db/alert_types_eha.pl:7
-#, perl-brace-format
-msgid "Update by {{name}}"
-msgstr "Diweddariadau yn ôl {{name}}"
+#: bin/send-reports:185
+msgid " and "
+msgstr ""
+
+#: bin/send-reports:186
+msgid ""
+"This email has been sent to both councils covering the location of the empty "
+"property, 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 "
+"empty property this is so we can add it to our system."
+msgstr ""
+
+#: bin/send-reports:192
+#, perl-format
+msgid ""
+"We realise this empty property 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 ""
 
-#: fixmystreet/db/alert_types_eha.pl:10
+#: db/alert_types_eha.pl:5
 msgid "New reports on reportemptyhomes.com"
 msgstr "Adroddiadau newydd ar reportemptyhomes.com"
 
-#: fixmystreet/db/alert_types_eha.pl:11
-msgid "The latest empty properties reported by users"
-msgstr "Yr eiddo gwag diweddaraf y mae defnyddwyr wedi rhoi gwybod amdanynt"
-
-#: fixmystreet/db/alert_types_eha.pl:14
+#: db/alert_types_eha.pl:8
 msgid "Properties recently reported as put back to use on reportemptyhomes.com"
-msgstr "Eiddo y cafwyd adroddiadau diweddar ar reportemptyhomes.com eu bod wedi cael eu hadfer i'w defnyddio"
+msgstr ""
+"Eiddo y cafwyd adroddiadau diweddar ar reportemptyhomes.com eu bod wedi cael "
+"eu hadfer i'w defnyddio"
 
-#: fixmystreet/db/alert_types_eha.pl:15
+#: db/alert_types_eha.pl:9
 msgid "The latest properties reported back to use by users"
-msgstr "Yr eiddo diweddaraf y mae defnyddwyr wedi rhoi gwybod eu bod yn ôl mewn defnyd"
+msgstr ""
+"Yr eiddo diweddaraf y mae defnyddwyr wedi rhoi gwybod eu bod yn ôl mewn "
+"defnyd"
 
-#: fixmystreet/db/alert_types_eha.pl:18
+#: db/alert_types_eha.pl:12
 msgid "New local reports on reportemptyhomes.com"
 msgstr "Adroddiadau lleol newydd ar reportemptyhomes.com"
 
-#: fixmystreet/db/alert_types_eha.pl:19
+#: db/alert_types_eha.pl:13
 msgid "The latest local reports reported by users"
-msgstr "Yr adroddiadau lleol diweddaraf y mae defnyddwyr wedi rhoi gwybod amdanynt"
+msgstr ""
+"Yr adroddiadau lleol diweddaraf y mae defnyddwyr wedi rhoi gwybod amdanynt"
+
+#: db/alert_types_eha.pl:16
+#, fuzzy, perl-brace-format
+msgid "New reports on reportemptyhomes.com near {{POSTCODE}}"
+msgstr "Adroddiadau newydd ar reportemptyhomes.com"
 
-#: fixmystreet/db/alert_types_eha.pl:22
+#: db/alert_types_eha.pl:19
 #, perl-brace-format
 msgid "New reports to {{COUNCIL}} on reportemptyhomes.com"
 msgstr "Adroddiadau newydd i gyngor {{COUNCIL}} ar reportemptyhomes.com"
 
-#: fixmystreet/db/alert_types_eha.pl:23
+#: db/alert_types_eha.pl:20
 #, perl-brace-format
 msgid "The latest reports for {{COUNCIL}} reported by users"
-msgstr "Yr adroddiadau diweddaraf ar gyfer cyngor {{COUNCIL}} y mae defnyddwyr wedi rhoi gwybod amdanynt"
+msgstr ""
+"Yr adroddiadau diweddaraf ar gyfer cyngor {{COUNCIL}} y mae defnyddwyr wedi "
+"rhoi gwybod amdanynt"
 
-#: fixmystreet/db/alert_types_eha.pl:26
+#: db/alert_types_eha.pl:23
 #, perl-brace-format
-msgid "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com"
-msgstr "Adroddiadau newydd ar gyfer cyngor {{COUNCIL}}, yn ward {{WARD}} ar reportemptyhomes.com"
+msgid ""
+"New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com"
+msgstr ""
+"Adroddiadau newydd ar gyfer cyngor {{COUNCIL}}, yn ward {{WARD}} ar "
+"reportemptyhomes.com"
 
-#: fixmystreet/db/alert_types_eha.pl:27
+#: db/alert_types_eha.pl:24
 #, perl-brace-format
-msgid "The latest reports for {{COUNCIL}} within {{WARD}} ward reported by users"
-msgstr "Yr adroddiadau diweddaraf ar gyfer cyngor {{COUNCIL}}, yn ward {{WARD}} y mae defnyddwyr wedi rhoi gwybod amdanynt"
+msgid ""
+"The latest reports for {{COUNCIL}} within {{WARD}} ward reported by users"
+msgstr ""
+"Yr adroddiadau diweddaraf ar gyfer cyngor {{COUNCIL}}, yn ward {{WARD}} y "
+"mae defnyddwyr wedi rhoi gwybod amdanynt"
 
-#: fixmystreet/db/alert_types_eha.pl:30
+#: db/alert_types_eha.pl:27
 #, perl-brace-format
 msgid "New reports within {{NAME}}'s boundary on reportemptyhomes.com"
 msgstr "Adroddiadau newydd o fewn ffin {{NAME}} ar reportemptyhomes.com"
 
-#: fixmystreet/db/alert_types_eha.pl:31
+#: db/alert_types_eha.pl:28
 #, perl-brace-format
 msgid "The latest reports within {{NAME}}'s boundary reported by users"
-msgstr "Yr adroddiadau diweddaraf o fewn ffin {{NAME}} y mae defnyddwyr wedi rhoi gwybod amdanynt"
+msgstr ""
+"Yr adroddiadau diweddaraf o fewn ffin {{NAME}} y mae defnyddwyr wedi rhoi "
+"gwybod amdanynt"
+
+#: db/alert_types.pl:5 db/alert_types.pl:6
+#, perl-brace-format
+msgid "Updates on {{title}}"
+msgstr "Diweddariadau am {{title}}"
+
+#: db/alert_types.pl:7
+#, perl-brace-format
+msgid "Update by {{name}}"
+msgstr "Diweddariadau yn ôl {{name}}"
+
+#: db/alert_types.pl:10
+#, fuzzy
+msgid "New empty property reports on reportemptyhomes.com"
+msgstr "Adroddiadau newydd ar reportemptyhomes.com"
+
+#: db/alert_types.pl:11
+msgid "The latest empty properties reported by users"
+msgstr "Yr eiddo gwag diweddaraf y mae defnyddwyr wedi rhoi gwybod amdanynt"
+
+#: db/alert_types.pl:14
+#, fuzzy
+msgid ""
+"Empty properties recently reported returned to use on reportemptyhomes.com"
+msgstr ""
+"Eiddo y cafwyd adroddiadau diweddar ar reportemptyhomes.com eu bod wedi cael "
+"eu hadfer i'w defnyddio"
+
+#: db/alert_types.pl:15
+#, fuzzy
+msgid "The latest empty properties reported returned to use by users"
+msgstr "Yr eiddo gwag diweddaraf y mae defnyddwyr wedi rhoi gwybod amdanynt"
+
+#: db/alert_types.pl:18 db/alert_types.pl:22
+#, fuzzy
+msgid "New local empty properties on reportemptyhomes.com"
+msgstr "Eiddo gwag lleol diweddar, reportemptyhomes.com"
+
+#: db/alert_types.pl:19 db/alert_types.pl:23 db/alert_types.pl:27
+#: db/alert_types.pl:31
+#, fuzzy
+msgid "The latest local empty properties reported by users"
+msgstr "Yr eiddo gwag diweddaraf y mae defnyddwyr wedi rhoi gwybod amdanynt"
+
+#: db/alert_types.pl:26
+#, fuzzy, perl-brace-format
+msgid "New empty property reports near {{POSTCODE}} on reportemptyhomes.com"
+msgstr "Adroddiadau newydd i gyngor {{COUNCIL}} ar reportemptyhomes.com"
+
+#: db/alert_types.pl:30
+#, fuzzy, perl-brace-format
+msgid "New empty property reports NEAR {{POSTCODE}} on reportemptyhomes.com"
+msgstr "Adroddiadau newydd i gyngor {{COUNCIL}} ar reportemptyhomes.com"
+
+#: db/alert_types.pl:34
+#, fuzzy, perl-brace-format
+msgid "New empty property reports to {{COUNCIL}} on reportemptyhomes.com"
+msgstr "Adroddiadau newydd i gyngor {{COUNCIL}} ar reportemptyhomes.com"
+
+#: db/alert_types.pl:35
+#, fuzzy, perl-brace-format
+msgid "The latest empty properties for {{COUNCIL}} reported by users"
+msgstr ""
+"Yr adroddiadau diweddaraf ar gyfer cyngor {{COUNCIL}} y mae defnyddwyr wedi "
+"rhoi gwybod amdanynt"
+
+#: db/alert_types.pl:38
+#, fuzzy, perl-brace-format
+msgid ""
+"New empty property reports for {{COUNCIL}} within {{WARD}} ward on "
+"reportemptyhomes.com"
+msgstr ""
+"Adroddiadau newydd ar gyfer cyngor {{COUNCIL}}, yn ward {{WARD}} ar "
+"reportemptyhomes.com"
+
+#: db/alert_types.pl:39
+#, fuzzy, perl-brace-format
+msgid ""
+"The latest empty properties for {{COUNCIL}} within {{WARD}} ward reported by "
+"users"
+msgstr ""
+"Yr adroddiadau diweddaraf ar gyfer cyngor {{COUNCIL}}, yn ward {{WARD}} y "
+"mae defnyddwyr wedi rhoi gwybod amdanynt"
+
+#: db/alert_types.pl:42
+#, fuzzy, perl-brace-format
+msgid "New empty property reports within {{NAME}}"
+msgstr "Adroddiadau newydd am eiddo gwag"
+
+#: db/alert_types.pl:43
+#, fuzzy, perl-brace-format
+msgid "The latest empty properties within {{NAME}}"
+msgstr "Yr eiddo gwag diweddaraf y mae defnyddwyr wedi rhoi gwybod amdanynt"
+
+#: web-admin/index.cgi:68 web-admin/index.cgi:123 web-admin/index.cgi:124
+#, fuzzy
+msgid "Summary"
+msgstr "Adroddiadau cryno"
+
+#: web-admin/index.cgi:69 web-admin/index.cgi:182 web-admin/index.cgi:183
+#, fuzzy
+msgid "Council contacts"
+msgstr "Cysylltwch â Ni"
+
+#: web-admin/index.cgi:71 web-admin/index.cgi:782 web-admin/index.cgi:783
+msgid "Timeline"
+msgstr ""
+
+#: web-admin/index.cgi:84
+#, fuzzy
+msgid "reportemptyhomes.com administration"
+msgstr "Diweddariadau i reportemptyhomes.com"
+
+#: web-admin/index.cgi:100
+#, fuzzy
+msgid "reportemptyhomes.com admin:"
+msgstr "reportemptyhomes.com"
+
+#: web-admin/index.cgi:162
+msgid "Graph of empty property creation by status over time"
+msgstr ""
+
+#: web-admin/index.cgi:165
+#, fuzzy
+msgid "Empty property breakdown by state"
+msgstr "ni fydd eich eiddo gwag yn cael ei bostio"
+
+#: web-admin/index.cgi:170
+msgid "Update breakdown by state"
+msgstr ""
+
+#: web-admin/index.cgi:186
+msgid "Diligency prize league table"
+msgstr ""
+
+#: web-admin/index.cgi:193
+msgid "No edits have yet been made."
+msgstr ""
+
+#: web-admin/index.cgi:197
+#, fuzzy
+msgid "Councils"
+msgstr "cyngor"
+
+#: web-admin/index.cgi:210 web-admin/index.cgi:585
+#, fuzzy
+msgid "None"
+msgstr "Nac ydw"
+
+#: web-admin/index.cgi:228
+msgid "No info at all"
+msgstr ""
+
+#: web-admin/index.cgi:230
+msgid "Currently has 1+ deleted"
+msgstr ""
+
+#: web-admin/index.cgi:232
+msgid "Some unconfirmeds"
+msgstr ""
+
+#: web-admin/index.cgi:234
+msgid "All confirmed"
+msgstr ""
+
+#: web-admin/index.cgi:264 web-admin/index.cgi:274 web-admin/index.cgi:291
+msgid "*unknown*"
+msgstr ""
+
+#: web-admin/index.cgi:267 web-admin/index.cgi:295
+#, fuzzy
+msgid "Values updated"
+msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost"
+
+#: web-admin/index.cgi:277
+msgid "New category contact added"
+msgstr ""
+
+#: web-admin/index.cgi:314 web-admin/index.cgi:397
+#, perl-format
+msgid "Council contacts for %s"
+msgstr ""
+
+#: web-admin/index.cgi:327
+#, fuzzy
+msgid " List all reported empty properties"
+msgstr "Eiddo gwag yr adroddwyd amdanynt yn ddiweddar"
+
+#: web-admin/index.cgi:329
+msgid "Text only version"
+msgstr ""
+
+#: web-admin/index.cgi:335
+#, fuzzy
+msgid "Category"
+msgstr "Categori:"
+
+#: web-admin/index.cgi:335 web-admin/index.cgi:437
+#, fuzzy
+msgid "Email"
+msgstr "E-bost:"
+
+#: web-admin/index.cgi:335 web-admin/index.cgi:367 web-admin/index.cgi:420
+#: web-admin/index.cgi:437 web-admin/index.cgi:736
+#, fuzzy
+msgid "Confirmed"
+msgstr "Cadarnhau"
+
+#: web-admin/index.cgi:335 web-admin/index.cgi:369 web-admin/index.cgi:422
+#: web-admin/index.cgi:437
+msgid "Deleted"
+msgstr ""
+
+#: web-admin/index.cgi:335
+msgid "Last editor"
+msgstr ""
+
+#: web-admin/index.cgi:335 web-admin/index.cgi:437
+#, fuzzy
+msgid "Note"
+msgstr "Nac ydw"
+
+#: web-admin/index.cgi:335 web-admin/index.cgi:437
+msgid "When edited"
+msgstr ""
+
+#: web-admin/index.cgi:335
+#, fuzzy
+msgid "Confirm"
+msgstr "Cadarnhau"
+
+#: web-admin/index.cgi:352
+#, fuzzy
+msgid "Update statuses"
+msgstr "Diweddariadau"
+
+#: web-admin/index.cgi:357
+msgid "Add new category"
+msgstr ""
+
+#: web-admin/index.cgi:360 web-admin/index.cgi:414
+#, fuzzy
+msgid "Category: "
+msgstr "Categori:"
+
+#: web-admin/index.cgi:363 web-admin/index.cgi:417
+#, fuzzy
+msgid "Email: "
+msgstr "E-bost:"
+
+#: web-admin/index.cgi:372 web-admin/index.cgi:425
+msgid "Note: "
+msgstr ""
+
+#: web-admin/index.cgi:379
+#, fuzzy
+msgid "Create category"
+msgstr "Categori:"
+
+#: web-admin/index.cgi:431
+msgid "Save changes"
+msgstr ""
+
+#: web-admin/index.cgi:435
+msgid "History"
+msgstr ""
+
+#: web-admin/index.cgi:437
+msgid "Editor"
+msgstr ""
+
+#: web-admin/index.cgi:441 web-admin/index.cgi:442
+#, fuzzy
+msgid "yes"
+msgstr "Ydw"
+
+#: web-admin/index.cgi:441 web-admin/index.cgi:442
+msgid "no"
+msgstr ""
+
+#: web-admin/index.cgi:469
+msgid "Search:"
+msgstr ""
+
+#: web-admin/index.cgi:541
+#, fuzzy
+msgid "That empty property will now be resent."
+msgstr "ni fydd eich eiddo gwag yn cael ei bostio"
+
+#: web-admin/index.cgi:547
+msgid "I am afraid you cannot confirm unconfirmed reports."
+msgstr ""
+
+#: web-admin/index.cgi:576 web-admin/index.cgi:696
+#, fuzzy
+msgid "Updated!"
+msgstr "Diweddariadau"
+
+#: web-admin/index.cgi:580
+#, fuzzy, perl-format
+msgid "Editing empty property %d"
+msgstr "Gweld eiddo gwag"
+
+#: web-admin/index.cgi:608 web-admin/index.cgi:736
+#, fuzzy
+msgid "State:"
+msgstr "Diweddariad:"
+
+#: web-admin/index.cgi:608
+msgid "Open"
+msgstr ""
+
+#: web-admin/index.cgi:608
+msgid "Fixed"
+msgstr ""
+
+#: web-admin/index.cgi:608 web-admin/index.cgi:736
+#, fuzzy
+msgid "Hidden"
+msgstr "Cuddio pinnau"
+
+#: web-admin/index.cgi:608 web-admin/index.cgi:736
+msgid "Unconfirmed"
+msgstr ""
+
+#: web-admin/index.cgi:608
+msgid "Partial"
+msgstr ""
+
+#: web-admin/index.cgi:611
+msgid "You really want to resend?"
+msgstr ""
+
+#: web-admin/index.cgi:611
+#, fuzzy
+msgid "Resend report"
+msgstr "Cuddio hen adroddiadau "
+
+#: web-admin/index.cgi:642 web-admin/index.cgi:756
+#, fuzzy
+msgid "Submit changes"
+msgstr "Anfon"
+
+#: web-admin/index.cgi:674
+msgid "Edit"
+msgstr ""
+
+#: web-admin/index.cgi:701
+#, fuzzy
+msgid "Empty property marked as open."
+msgstr "Ffurflen manylion eiddo gwag"
+
+#: web-admin/index.cgi:717
+#, fuzzy, perl-format
+msgid "Editing update %d"
+msgstr "Cyflwyno'ch diweddariad"
 
 #. Please leave the first word "Subject:" untranslated
-#: fixmystreet/templates/emails/alert-confirm
+#: templates/emails/alert-confirm
 msgid ""
 "Subject: Confirm your alert on reportemptyhomes.com\n"
 "\n"
@@ -1573,7 +2413,7 @@ msgstr ""
 "Yn gywir,  \n"
 "Tîm yr Asiantaeth Tai Gwag\n"
 
-#: fixmystreet/templates/emails/alert-problem
+#: templates/emails/alert-problem
 msgid ""
 "Subject: New empty property reports on reportemptyhomes.com\n"
 "\n"
@@ -1588,9 +2428,10 @@ msgid ""
 "please follow this link: <?=$values['unsubscribe_url']?>\n"
 msgstr ""
 
-#: fixmystreet/templates/emails/alert-problem-area
+#: templates/emails/alert-problem-area
 msgid ""
-"Subject: New empty property reports in <?=$values['area_name']?> on reportemptyhomes.com\n"
+"Subject: New empty property reports in <?=$values['area_name']?> on "
+"reportemptyhomes.com\n"
 "\n"
 "The following new empty properties have been added within\n"
 "<?=$values['area_name']?>:\n"
@@ -1605,11 +2446,13 @@ msgid ""
 "<?=$values['unsubscribe_url']?>\n"
 msgstr ""
 
-#: fixmystreet/templates/emails/alert-problem-council
+#: templates/emails/alert-problem-council
 msgid ""
-"Subject: New empty property reports reported to <?=$values['area_name']?> on reportemptyhomes.com\n"
+"Subject: New empty property reports reported to <?=$values['area_name']?> on "
+"reportemptyhomes.com\n"
 "\n"
-"The following new empty properties have been reported to <?=$values['area_name']?>:\n"
+"The following new empty properties have been reported to <?=$values"
+"['area_name']?>:\n"
 "\n"
 "<?=$values['data']?>\n"
 "\n"
@@ -1621,7 +2464,7 @@ msgid ""
 "<?=$values['unsubscribe_url']?>\n"
 msgstr ""
 
-#: fixmystreet/templates/emails/alert-problem-nearby
+#: templates/emails/alert-problem-nearby
 msgid ""
 "Subject: New nearby empty properties on reportemptyhomes.com\n"
 "\n"
@@ -1636,11 +2479,13 @@ msgid ""
 "please follow this link: <?=$values['unsubscribe_url']?>\n"
 msgstr ""
 
-#: fixmystreet/templates/emails/alert-problem-ward
+#: templates/emails/alert-problem-ward
 msgid ""
-"Subject: New empty property reports reported to <?=$values['area_name']?> within <?=$values['ward_name']?> on reportemptyhomes.com\n"
+"Subject: New empty property reports reported to <?=$values['area_name']?> "
+"within <?=$values['ward_name']?> on reportemptyhomes.com\n"
 "\n"
-"The following new empty properties have been reported to <?=$values['area_name']?>\n"
+"The following new empty properties have been reported to <?=$values"
+"['area_name']?>\n"
 "within <?=$values['ward_name']?>:\n"
 "\n"
 "<?=$values['data']?>\n"
@@ -1653,7 +2498,8 @@ msgid ""
 "please follow this link: <?=$values['unsubscribe_url']?>\n"
 msgstr ""
 
-#: fixmystreet/templates/emails/alert-update
+#: templates/emails/alert-update
+#, fuzzy
 msgid ""
 "Subject: New updates on empty property - '<?=$values['title']?>'\n"
 "\n"
@@ -1661,6 +2507,8 @@ msgid ""
 "\n"
 "<?=$values['data']?>\n"
 "\n"
+"<?=$values['state_message']?>\n"
+"\n"
 "To view or reply to these updates, please visit the following URL:\n"
 "    <?=$values['problem_url']?>\n"
 "\n"
@@ -1672,8 +2520,22 @@ msgid ""
 "To stop receiving emails when there are new updates on this empty property,\n"
 "please follow this link: <?=$values['unsubscribe_url']?>\n"
 msgstr ""
+"Subject: Diweddariadau newydd am eiddo gwag - '<?=$values['title']?>'\n"
+"\n"
+"Mae'r diweddariadau canlynol wedi cael eu gadael am yr eiddo gwag hwn:\n"
+"\n"
+"<?=$values['data']?>\n"
+"\n"
+"Gweld y diweddariadau hyn neu eu hateb: <?=$values['problem_url']?>\n"
+"\n"
+"Yn gywir,  \n"
+"reportemptyhomes.com\n"
+"\n"
+"I roi'r gorau i dderbyn negeseuon e-bost pan fydd diweddariadau newydd yn "
+"ymddangos am yr eiddo hwn,\n"
+"dilynwch y ddolen hon: <?=$values['unsubscribe_url']?>\n"
 
-#: fixmystreet/templates/emails/empty property-confirm
+#: templates/emails/empty property-confirm
 msgid ""
 "Subject: Confirm your empty property report\n"
 "\n"
@@ -1717,7 +2579,7 @@ msgstr ""
 "Yn gywir,  \n"
 "reportemptyhomes.com\n"
 
-#: fixmystreet/templates/emails/flickr-confirm
+#: templates/emails/flickr-confirm
 msgid ""
 "Subject: Confirm your email address on reportemptyhomes.com\n"
 "\n"
@@ -1735,7 +2597,7 @@ msgid ""
 "The reportemptyhomes.com team\n"
 msgstr ""
 
-#: fixmystreet/templates/emails/flickr-submit
+#: templates/emails/flickr-submit
 msgid ""
 "Subject: New photo pulled from Flickr to reportemptyhomes.com\n"
 "\n"
@@ -1753,7 +2615,7 @@ msgid ""
 "The reportemptyhomes.com team\n"
 msgstr ""
 
-#: fixmystreet/templates/emails/partial
+#: templates/emails/partial
 #, fuzzy
 msgid ""
 "Subject: Confirm your report on reportemptyhomes.com\n"
@@ -1775,7 +2637,8 @@ msgstr ""
 "\n"
 "Helo<?=$values['name']?>,\n"
 "\n"
-"Rydym wedi storio'r adroddiad y gwnaethoch ei lwytho i'r Asiantaeth Tai Gwag drwy gyfrwng\n"
+"Rydym wedi storio'r adroddiad y gwnaethoch ei lwytho i'r Asiantaeth Tai Gwag "
+"drwy gyfrwng\n"
 "<?=$values['service']?>. I gadarnhau'r manylion sydd gennym,\n"
 "ac i ychwanegu atynt, ewch i'r URL canlynol:\n"
 "\n"
@@ -1786,7 +2649,7 @@ msgstr ""
 "Yn gywir,  \n"
 "Tîm yr Asiantaeth Tai Gwag\n"
 
-#: fixmystreet/templates/emails/problem-confirm
+#: templates/emails/problem-confirm
 msgid ""
 "Subject: Confirm your empty property on reportemptyhomes.com\n"
 "\n"
@@ -1810,13 +2673,14 @@ msgid ""
 "The reportemptyhomes.com team\n"
 msgstr ""
 
-#: fixmystreet/templates/emails/questionnaire
+#: templates/emails/questionnaire
 msgid ""
 "Subject: Questionnaire about your empty property on reportemptyhomes.com\n"
 "\n"
 "Hi <?=$values['name']?>,\n"
 "\n"
-"<?=$values['created']?> ago, you left an empty property on reportemptyhomes.com\n"
+"<?=$values['created']?> ago, you left an empty property on reportemptyhomes."
+"com\n"
 "with the details provided at the end of this email. To keep our\n"
 "site up to date and relevant, we'd appreciate it if you could\n"
 "follow the link below and fill in our short questionnaire\n"
@@ -1838,7 +2702,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fixmystreet/templates/emails/questionnaire-eha-26weeks
+#: templates/emails/questionnaire-eha-26weeks
 msgid ""
 "Subject: Questionnaire about your empty property report\n"
 "\n"
@@ -1846,7 +2710,8 @@ msgid ""
 "\n"
 "Six months ago, you reported an empty home on ReportEmptyHomes.com with the\n"
 "details provided at the end of this email. To keep our site up to date and\n"
-"relevant, I'd be grateful if you could fill in this short questionnaire to tell\n"
+"relevant, I'd be grateful if you could fill in this short questionnaire to "
+"tell\n"
 "us what has happened: \n"
 "\n"
 "    <?=$values['url']?>\n"
@@ -1870,9 +2735,12 @@ msgstr ""
 "\n"
 "Helo <?=$values['name']?>,\n"
 "\n"
-"Chwe mis yn ôl, fe wnaethoch adrodd am eiddo gwag ar ReportEmptyHomes.com gan roi'r\n"
-"manylion sydd wedi'u cynnwys ar ddiwedd y neges e-bost hon. Er mwyn cadw'n safle'n gyfredol\n"
-"ac yn berthnasol, byddwn yn ddiolchgar petaech yn llenwi'r holiadur byr hwn er mwyn\n"
+"Chwe mis yn ôl, fe wnaethoch adrodd am eiddo gwag ar ReportEmptyHomes.com "
+"gan roi'r\n"
+"manylion sydd wedi'u cynnwys ar ddiwedd y neges e-bost hon. Er mwyn cadw'n "
+"safle'n gyfredol\n"
+"ac yn berthnasol, byddwn yn ddiolchgar petaech yn llenwi'r holiadur byr hwn "
+"er mwyn\n"
 "dweud wrthom ni beth sydd wedi digwydd: \n"
 "\n"
 "    <?=$values['url']?>\n"
@@ -1892,7 +2760,7 @@ msgstr ""
 "<?=$values['detail']?>\n"
 "\n"
 
-#: fixmystreet/templates/emails/questionnaire-eha-4weeks
+#: templates/emails/questionnaire-eha-4weeks
 msgid ""
 "Subject: Questionnaire about your empty property report\n"
 "\n"
@@ -1900,7 +2768,8 @@ msgid ""
 "\n"
 "Four weeks ago, you reported an empty home on ReportEmptyHomes.com with the\n"
 "details provided at the end of this email. To keep our site up to date and\n"
-"relevant, I'd be grateful if you could fill in this short questionnaire to tell\n"
+"relevant, I'd be grateful if you could fill in this short questionnaire to "
+"tell\n"
 "us what has happened:\n"
 "\n"
 "    <?=$values['url']?>\n"
@@ -1924,9 +2793,12 @@ msgstr ""
 "\n"
 "Helo <?=$values['name']?>,\n"
 "\n"
-"Bedair wythnos yn ôl, fe wnaethoch adrodd am eiddo gwag ar ReportEmptyHomes.com gan roi'r\n"
-"manylion sydd wedi'u cynnwys ar ddiwedd y neges e-bost hon. Er mwyn cadw'n safle'n gyfredol\n"
-"ac yn berthnasol, byddwn yn ddiolchgar petaech yn gallu llenwi'r holiadur byr hwn \n"
+"Bedair wythnos yn ôl, fe wnaethoch adrodd am eiddo gwag ar ReportEmptyHomes."
+"com gan roi'r\n"
+"manylion sydd wedi'u cynnwys ar ddiwedd y neges e-bost hon. Er mwyn cadw'n "
+"safle'n gyfredol\n"
+"ac yn berthnasol, byddwn yn ddiolchgar petaech yn gallu llenwi'r holiadur "
+"byr hwn \n"
 "i ddweud wrthom beth sydd wedi digwydd:\n"
 "\n"
 "    <?=$values['url']?>\n"
@@ -1946,13 +2818,14 @@ msgstr ""
 "<?=$values['detail']?>\n"
 "\n"
 
-#: fixmystreet/templates/emails/reply-autoresponse
+#: templates/emails/reply-autoresponse
 msgid ""
 "Subject: Automatic reply to your message to reportemptyhomes.com\n"
 "\n"
 "Hi,\n"
 "\n"
-"This is an automatic response to your email; your email has not been delivered.\n"
+"This is an automatic response to your email; your email has not been "
+"delivered.\n"
 "\n"
 "If you're replying to an email about a report update, please visit\n"
 "the URL given in the email in order to leave a reply. You cannot\n"
@@ -1973,7 +2846,7 @@ msgid ""
 "The reportemptyhomes.com team\n"
 msgstr ""
 
-#: fixmystreet/templates/emails/submit-brent
+#: templates/emails/submit-brent
 msgid ""
 "Subject: FMS Empty property Report: <?=$values['title']?>\n"
 "\n"
@@ -1994,13 +2867,14 @@ msgid ""
 "\n"
 "Email: <?=$values['email']?>\n"
 "\n"
-"<?=$values['phone_line']?><?=$values['category_line']?>Subject: <?=$values['title']?>\n"
+"<?=$values['phone_line']?><?=$values['category_line']?>Subject: <?=$values"
+"['title']?>\n"
 "\n"
 "Details: <?=$values['detail']?>\n"
 "\n"
-"Easting: <?=$values['easting']?>\n"
+"<?=$values['easting_northing']?>Latitude: <?=$values['latitude']?>\n"
 "\n"
-"Northing: <?=$values['northing']?>\n"
+"Longitude: <?=$values['longitude']?>\n"
 "\n"
 "<?=$values['closest_address_machine']?>----------\n"
 "\n"
@@ -2009,15 +2883,18 @@ msgid ""
 "Yours,  \n"
 "The reportemptyhomes.com team\n"
 "\n"
-"[ This message was sent via reportemptyhomes.com, a project of UKCOD, registered charity\n"
-"number 1076346. If there is a more appropriate email address for messages about\n"
-"<?=$values['category_footer']?>, please let us know by visiting <http://www.fixmystreet.com/contact>.\n"
+"[ This message was sent via reportemptyhomes.com, a project of UKCOD, "
+"registered charity\n"
+"number 1076346. If there is a more appropriate email address for messages "
+"about\n"
+"<?=$values['category_footer']?>, please let us know by visiting <http://www."
+"fixmystreet.com/contact>.\n"
 "This will help improve the service for local people. We\n"
 "also welcome any other feedback you may have. ]\n"
 "\n"
 msgstr ""
 
-#: fixmystreet/templates/emails/submit-council
+#: templates/emails/submit-council
 msgid ""
 "Subject: Empty property Report: <?=$values['title']?>\n"
 "\n"
@@ -2038,10 +2915,15 @@ msgid ""
 "\n"
 "Email: <?=$values['email']?>\n"
 "\n"
-"<?=$values['phone_line']?><?=$values['category_line']?>Subject: <?=$values['title']?>\n"
+"<?=$values['phone_line']?><?=$values['category_line']?>Subject: <?=$values"
+"['title']?>\n"
 "\n"
 "Details: <?=$values['detail']?>\n"
 "\n"
+"<?=$values['easting_northing']?>Latitude: <?=$values['latitude']?>\n"
+"\n"
+"Longitude: <?=$values['longitude']?>\n"
+"\n"
 "<?=$values['closest_address']?>----------\n"
 "\n"
 "Replies to this email will go to the user who submitted the empty property.\n"
@@ -2049,37 +2931,47 @@ msgid ""
 "Yours,  \n"
 "The reportemptyhomes.com team\n"
 "\n"
-"[ This message was sent via reportemptyhomes.com, a project of UKCOD, registered charity\n"
-"number 1076346. If there is a more appropriate email address for messages about\n"
-"<?=$values['category_footer']?>, please let us know by visiting <http://www.fixmystreet.com/contact>.\n"
+"[ This message was sent via reportemptyhomes.com, a project of UKCOD, "
+"registered charity\n"
+"number 1076346. If there is a more appropriate email address for messages "
+"about\n"
+"<?=$values['category_footer']?>, please let us know by visiting <http://www."
+"fixmystreet.com/contact>.\n"
 "This will help improve the service for local people. We\n"
 "also welcome any other feedback you may have. ]\n"
 "\n"
 msgstr ""
 
-#: fixmystreet/templates/emails/submit-eha
+#: templates/emails/submit-eha
 msgid ""
 "Subject: Empty property report\n"
 "\n"
 "Dear Empty Property Officer,\n"
 "\n"
-"This is a new referral of an empty property in your area made by a user of the\n"
-"website ReportEmptyHomes.com; the website user has been told that the case has\n"
-"been referred to you.  We would be grateful if you could do whatever you can to\n"
-"help get this property back into use. We will contact the user in a month and\n"
+"This is a new referral of an empty property in your area made by a user of "
+"the\n"
+"website ReportEmptyHomes.com; the website user has been told that the case "
+"has\n"
+"been referred to you.  We would be grateful if you could do whatever you can "
+"to\n"
+"help get this property back into use. We will contact the user in a month "
+"and\n"
 "again in six months and ask them what has happened to the property.  \n"
 "\n"
-"We'd encourage you to tell us what you have done, and when the property comes\n"
+"We'd encourage you to tell us what you have done, and when the property "
+"comes\n"
 "back into use, by filling in an update against the property referral on the\n"
 "website:\n"
 "\n"
 "    <?=$values['url']?>\n"
 "\n"
 "This gives useful feedback to website users and helps them understand what\n"
-"action you are taking. We will offer advice to the user on other action they\n"
+"action you are taking. We will offer advice to the user on other action "
+"they\n"
 "might take if the property isn't successfully dealt with.  \n"
 "\n"
-"<?=$values['has_photo']?>If you would like help or advice on getting empty properties back into use\n"
+"<?=$values['has_photo']?>If you would like help or advice on getting empty "
+"properties back into use\n"
 "there is lots of useful information on the Empty Homes Agency's website\n"
 "www.EmptyHomes.com - if you have further questions please give us a call. \n"
 "\n"
@@ -2110,23 +3002,31 @@ msgstr ""
 "\n"
 "Dyma gyfeiriad newydd am eiddo gwag yn eich ardal, a wnaed gan ddefnyddiwr \n"
 "gwefan ReportEmptyHomes.com; dywedwyd wrth ddefnyddiwr y wefan fod yr achos\n"
-"wedi cael ei gyfeirio atoch.  Byddem yn ddiolchgar petaech yn gwneud yr hyn y gallwch i \n"
-"helpu adfer yr eiddo hwn i'w ddefnyddio eto. Byddwn yn cysylltu â'r defnyddiwr ymhen mis\n"
-"ac eto ymhen chwe mis ac yn gofyn iddynt beth sydd wedi digwydd i'r eiddo.  \n"
-"\n"
-"Hoffwn eich annog chi i ddweud wrthom beth rydych chi wedi'i wneud, a phan y daw'r eiddo\n"
+"wedi cael ei gyfeirio atoch.  Byddem yn ddiolchgar petaech yn gwneud yr hyn "
+"y gallwch i \n"
+"helpu adfer yr eiddo hwn i'w ddefnyddio eto. Byddwn yn cysylltu â'r "
+"defnyddiwr ymhen mis\n"
+"ac eto ymhen chwe mis ac yn gofyn iddynt beth sydd wedi digwydd i'r "
+"eiddo.  \n"
+"\n"
+"Hoffwn eich annog chi i ddweud wrthom beth rydych chi wedi'i wneud, a phan y "
+"daw'r eiddo\n"
 "yn ôl mewn defnydd, trwy lenwi diweddariad wrth y cyfeiriad at yr eiddo\n"
 "ar y wefan:\n"
 "\n"
 "    <?=$values['url']?>\n"
 "\n"
-"Mae hyn yn rhoi adborth defnyddiol i ddefnyddwyr y wefan ac yn helpu iddynt ddeall\n"
-"pa gamau yr ydych yn eu cymryd. Byddwn yn cynnig cyngor i'r defnyddiwr ar gamau eraill y \n"
+"Mae hyn yn rhoi adborth defnyddiol i ddefnyddwyr y wefan ac yn helpu iddynt "
+"ddeall\n"
+"pa gamau yr ydych yn eu cymryd. Byddwn yn cynnig cyngor i'r defnyddiwr ar "
+"gamau eraill y \n"
 "gall eu cymryd os nad eir i'r afael â'r eiddo'n llwyddiannus.  \n"
 "\n"
-"<?=$values['has_photo']?>Os hoffech gael help neu gyngor ar gael eiddo gwag yn ôl mewn defnydd\n"
+"<?=$values['has_photo']?>Os hoffech gael help neu gyngor ar gael eiddo gwag "
+"yn ôl mewn defnydd\n"
 "mae llawer o wybodaeth ddefnyddiol ar wefan yr Asiantaeth Tai Gwag \n"
-"www.EmptyHomes.com - os oes gennych unrhyw gwestiynau eraill, rhowch alwad i ni. \n"
+"www.EmptyHomes.com - os oes gennych unrhyw gwestiynau eraill, rhowch alwad i "
+"ni. \n"
 "\n"
 "----------\n"
 "\n"
@@ -2142,14 +3042,15 @@ msgstr ""
 "\n"
 "<?=$values['closest_address']?>----------\n"
 "\n"
-"Bydd ymatebion i'r neges e-bost hon yn mynd at y defnyddiwr a gyflwynodd yr adroddiad,\n"
+"Bydd ymatebion i'r neges e-bost hon yn mynd at y defnyddiwr a gyflwynodd yr "
+"adroddiad,\n"
 "os hoffech ofyn am fwy o wybodaeth.\n"
 "\n"
 "Yn gywir,  \n"
 "reportemptyhomes.com\n"
 "\n"
 
-#: fixmystreet/templates/emails/tms-confirm
+#: templates/emails/tms-confirm
 msgid ""
 "Subject: Confirm your expression of interest in TextMyStreet\n"
 "\n"
@@ -2167,7 +3068,7 @@ msgid ""
 "The reportemptyhomes.com team\n"
 msgstr ""
 
-#: fixmystreet/templates/emails/update-confirm
+#: templates/emails/update-confirm
 msgid ""
 "Subject: Confirm your update on reportemptyhomes.com\n"
 "\n"
@@ -2191,7 +3092,8 @@ msgstr ""
 "\n"
 "Helo <?=$values['name']?>,\n"
 "\n"
-"Cliciwch ar y ddolen isod i gadarnhau'r diweddariad yr ydych newydd ei ysgrifennu:\n"
+"Cliciwch ar y ddolen isod i gadarnhau'r diweddariad yr ydych newydd ei "
+"ysgrifennu:\n"
 "\n"
 "<?=$values['url']?>\n"
 "\n"
@@ -2205,7 +3107,7 @@ msgstr ""
 "Yn gywir,  \n"
 "Tîm yr Asiantaeth Tai Gwag\n"
 
-#: fixmystreet/templates/emails/eha/alert-problem
+#: templates/emails/emptyhomes/alert-problem
 msgid ""
 "Subject: New empty property reports on reportemptyhomes.com\n"
 "\n"
@@ -2228,12 +3130,14 @@ msgstr ""
 "Yn gywir,  \n"
 "reportemptyhomes.com\n"
 "\n"
-"I roi'r gorau i dderbyn negeseuon e-bost pan fydd eiddo newydd yn ymddangos,\n"
+"I roi'r gorau i dderbyn negeseuon e-bost pan fydd eiddo newydd yn "
+"ymddangos,\n"
 "dilynwch y ddolen hon: <?=$values['unsubscribe_url']?>\n"
 
-#: fixmystreet/templates/emails/eha/alert-problem-area
+#: templates/emails/emptyhomes/alert-problem-area
 msgid ""
-"Subject: New empty property reports in <?=$values['area_name']?> on reportemptyhomes.com\n"
+"Subject: New empty property reports in <?=$values['area_name']?> on "
+"reportemptyhomes.com\n"
 "\n"
 "The following empty properties have been added within\n"
 "<?=$values['area_name']?>:\n"
@@ -2247,7 +3151,8 @@ msgid ""
 "<?=$values['area_name']?>, please follow this link: \n"
 "<?=$values['unsubscribe_url']?>\n"
 msgstr ""
-"Subject: Adroddiadau newydd am eiddo gwag yn ardal <?=$values['area_name']?> ar reportemptyhomes.com\n"
+"Subject: Adroddiadau newydd am eiddo gwag yn ardal <?=$values['area_name']?> "
+"ar reportemptyhomes.com\n"
 "\n"
 "Mae'r eiddo gwag canlynol wedi cael eu hychwanegu yn ardal\n"
 "<?=$values['area_name']?>:\n"
@@ -2257,15 +3162,18 @@ msgstr ""
 "Yn gywir,  \n"
 "reportemptyhomes.com\n"
 "\n"
-"I roi'r gorau i dderbyn negeseuon e-bost pan fydd eiddo newydd yn ymddangos yn ardal\n"
+"I roi'r gorau i dderbyn negeseuon e-bost pan fydd eiddo newydd yn ymddangos "
+"yn ardal\n"
 "<?=$values['area_name']?>, dilynwch y ddolen hon: \n"
 "<?=$values['unsubscribe_url']?>\n"
 
-#: fixmystreet/templates/emails/eha/alert-problem-council
+#: templates/emails/emptyhomes/alert-problem-council
 msgid ""
-"Subject: New empty property reports reported to <?=$values['area_name']?> on reportemptyhomes.com\n"
+"Subject: New empty property reports reported to <?=$values['area_name']?> on "
+"reportemptyhomes.com\n"
 "\n"
-"The following empty properties have been reported to <?=$values['area_name']?>:\n"
+"The following empty properties have been reported to <?=$values['area_name']?"
+">:\n"
 "\n"
 "<?=$values['data']?>\n"
 "\n"
@@ -2276,20 +3184,23 @@ msgid ""
 "<?=$values['area_name']?>, please follow this link: \n"
 "<?=$values['unsubscribe_url']?>\n"
 msgstr ""
-"Subject: Adroddiadau newydd am eiddo gwag a hysbyswyd i ardal <?=$values['area_name']?> ar reportemptyhomes.com\n"
+"Subject: Adroddiadau newydd am eiddo gwag a hysbyswyd i ardal <?=$values"
+"['area_name']?> ar reportemptyhomes.com\n"
 "\n"
-"Mae'r eiddo gwag canlynol wedi cael eu hysbysu i ardal<?=$values['area_name']?>:\n"
+"Mae'r eiddo gwag canlynol wedi cael eu hysbysu i ardal<?=$values"
+"['area_name']?>:\n"
 "\n"
 "<?=$values['data']?>\n"
 "\n"
 "Yn gywir,  \n"
 "reportemptyhomes.com\n"
 "\n"
-"I roi'r gorau i dderbyn negeseuon e-bost pan gaiff eiddo gwag newydd eu hysbysu i ardal \n"
+"I roi'r gorau i dderbyn negeseuon e-bost pan gaiff eiddo gwag newydd eu "
+"hysbysu i ardal \n"
 "<?=$values['area_name']?>, dilynwch y ddolen hon: \n"
 "<?=$values['unsubscribe_url']?>\n"
 
-#: fixmystreet/templates/emails/eha/alert-problem-nearby
+#: templates/emails/emptyhomes/alert-problem-nearby
 msgid ""
 "Subject: New nearby empty properties on reportemptyhomes.com\n"
 "\n"
@@ -2315,11 +3226,13 @@ msgstr ""
 "I roi'r gorau i dderbyn negeseuon e-bost pan fydd eiddo gerllaw,\n"
 "dilynwch y ddolen hon: <?=$values['unsubscribe_url']?>\n"
 
-#: fixmystreet/templates/emails/eha/alert-problem-ward
+#: templates/emails/emptyhomes/alert-problem-ward
 msgid ""
-"Subject: New empty property reports reported to <?=$values['area_name']?> within <?=$values['ward_name']?> on reportemptyhomes.com\n"
+"Subject: New empty property reports reported to <?=$values['area_name']?> "
+"within <?=$values['ward_name']?> on reportemptyhomes.com\n"
 "\n"
-"The following empty properties have been reported to <?=$values['area_name']?>\n"
+"The following empty properties have been reported to <?=$values['area_name']?"
+">\n"
 "within <?=$values['ward_name']?>:\n"
 "\n"
 "<?=$values['data']?>\n"
@@ -2331,9 +3244,11 @@ msgid ""
 "<?=$values['area_name']?> within <?=$values['ward_name']?>,\n"
 "please follow this link: <?=$values['unsubscribe_url']?>\n"
 msgstr ""
-"Subject: Adroddiadau newydd am eiddo gwag a hysbyswyd i ardal <?=$values['area_name']?>, yn ward <?=$values['ward_name']?> ar reportemptyhomes.com\n"
+"Subject: Adroddiadau newydd am eiddo gwag a hysbyswyd i ardal <?=$values"
+"['area_name']?>, yn ward <?=$values['ward_name']?> ar reportemptyhomes.com\n"
 "\n"
-"Mae'r eiddo gwag canlynol wedi cael eu hysbysu i ardal <?=$values['area_name']?>,\n"
+"Mae'r eiddo gwag canlynol wedi cael eu hysbysu i ardal <?=$values"
+"['area_name']?>,\n"
 "o fewn ward <?=$values['ward_name']?>:\n"
 "\n"
 "<?=$values['data']?>\n"
@@ -2341,11 +3256,12 @@ msgstr ""
 "Yn gywir,  \n"
 "reportemptyhomes.com\n"
 "\n"
-"I roi'r gorau i dderbyn negeseuon e-bost pan gaiff eiddo newydd eu hysbysu i ardal \n"
+"I roi'r gorau i dderbyn negeseuon e-bost pan gaiff eiddo newydd eu hysbysu i "
+"ardal \n"
 "<?=$values['area_name']?>, o fewn ward <?=$values['ward_name']?>,\n"
 "dilynwch y ddolen hon: <?=$values['unsubscribe_url']?>\n"
 
-#: fixmystreet/templates/emails/eha/alert-update
+#: templates/emails/emptyhomes/alert-update
 msgid ""
 "Subject: New updates on empty property- '<?=$values['title']?>'\n"
 "\n"
@@ -2372,9 +3288,40 @@ msgstr ""
 "Yn gywir,  \n"
 "reportemptyhomes.com\n"
 "\n"
-"I roi'r gorau i dderbyn negeseuon e-bost pan fydd diweddariadau newydd yn ymddangos am yr eiddo hwn,\n"
+"I roi'r gorau i dderbyn negeseuon e-bost pan fydd diweddariadau newydd yn "
+"ymddangos am yr eiddo hwn,\n"
 "dilynwch y ddolen hon: <?=$values['unsubscribe_url']?>\n"
 
+#~ msgid ""
+#~ "We will contact you again in a month and again after six months to ask "
+#~ "what has\n"
+#~ "happened. Hopefully the property will be well on the way to being brought "
+#~ "back\n"
+#~ "into use by then, but if not we can offer advice on what you can do next."
+#~ msgstr ""
+#~ "Byddwn yn cysylltu â chi eto ymhen mis ac eto ymhen chwe mis i holi beth "
+#~ "sydd wedi digwydd.\n"
+#~ "Ein gobaith yw y bydd yr eiddo wrthi'n cael ei adfer i'w ddefnyddio erbyn "
+#~ "hynny,\n"
+#~ "ond os nad ydyw, gallwn gynnig cyngor ar yr beth y gallwch ei wneud nesaf."
+
+#~ msgid "Enter a nearby GB postcode, or street name and area"
+#~ msgstr "Cofnodwch god post Prydeinig, neu enw stryd ac ardal gerllaw"
+
+#~ msgid "Please note that updates are not sent to the council."
+#~ msgstr "Sylwer nad yw diweddariadau'n cael eu hanfon at y cyngor."
+
+#~ msgid ""
+#~ "The closest address, as the crow flies, to the location of this empty "
+#~ "property, %.0fm away, is: %s - please note that this is automatically "
+#~ "generated, so ensure that you check it against the details provided by "
+#~ "the user and, if possible, the map."
+#~ msgstr ""
+#~ "Y cyfeiriad agosaf ar draws gwlad, i leoliad yr eiddo gwag hwn, %.0fm i "
+#~ "ffwrdd, yw: %s - sylwer bod hwn yn cael ei greu'n awtomatig, felly "
+#~ "gwnewch yn siwr eich bod yn ei gadarnhau yn ôl y manylion sy'n cael eu "
+#~ "rhoi gan y defnyddiwr ac, os oes modd, ei gadarnhau yn ôl y map."
+
 #~ msgid "empty property"
 #~ msgstr "eiddo gwag"
 
@@ -2393,5 +3340,9 @@ msgstr ""
 #~ msgid "New!"
 #~ msgstr "Newydd!"
 
-#~ msgid "That empty property has been hidden from public view as it contained inappropriate public details"
-#~ msgstr "Mae'r eiddo gwag hwnnw wedi cael ei guddio o olwg y cyhoedd gan ei fod yn cynnwys manylion cyhoeddus amhriodol"
+#~ msgid ""
+#~ "That empty property has been hidden from public view as it contained "
+#~ "inappropriate public details"
+#~ msgstr ""
+#~ "Mae'r eiddo gwag hwnnw wedi cael ei guddio o olwg y cyhoedd gan ei fod yn "
+#~ "cynnwys manylion cyhoeddus amhriodol"
diff --git a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
index aa20127f4..52e695500 100644
--- a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: FixMyStreet\n"
 "Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2009-08-12 12:28+0100\n"
-"PO-Revision-Date: 2011-02-07 20:28MET\n"
+"POT-Creation-Date: 2011-02-22 13:53+0000\n"
+"PO-Revision-Date: 2011-02-22 07:59MET\n"
 "Last-Translator: Petter Reinholdtsen <pere@hungry.com>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
 "MIME-Version: 1.0\n"
@@ -19,1003 +19,1419 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: KBabel 1.11.4\n"
 
-#: fixmystreet/perllib/Page.pm:78
+#: perllib/Cobrands/Emptyhomes/Util.pm:61 bin/send-questionnaires-eha:93
+msgid "Report Empty Homes"
+msgstr "Rapporter tomme hjem"
+
+#: perllib/Cobrands/Fiksgatami/Util.pm:27
+msgid "Enter a nearby postcode, or street name and area:"
+msgstr "Skriv inn postnummer i nærheten, eller veinavn og sted:"
+
+#: perllib/Page.pm:83
 #, perl-format
-msgid "Please try again later, or <a href=\"mailto:%s\">email us</a> to let us know."
-msgstr "Vær så snill å forsøk igjen senere, eller <a href=\"mailto:%s\">send oss en epost</a> og gi oss beskjed."
+msgid ""
+"Please try again later, or <a href=\"mailto:%s\">email us</a> to let us know."
+msgstr ""
+"Vær så snill å forsøk igjen senere, eller <a href=\"mailto:%s\">send oss en "
+"epost</a> og gi oss beskjed."
 
-#: fixmystreet/perllib/Page.pm:79
+#: perllib/Page.pm:84
 msgid "Sorry! Something's gone wrong."
 msgstr "Beklager! Noe har gått galt."
 
-#: fixmystreet/perllib/Page.pm:80
+#: perllib/Page.pm:85
 msgid "The text of the error was:"
-msgstr ""
+msgstr "Teksten i feilmeldingen var:"
 
-#: fixmystreet/perllib/Page.pm:167 fixmystreet/perllib/Page.pm:260
+#: perllib/Page.pm:192 web/contact.cgi:107
+msgid "FixMyStreet"
+msgstr "FiksGataMi"
+
+#: perllib/Page.pm:195 perllib/Page.pm:317
 msgid "Report a problem"
 msgstr "Rapporter et problem"
 
-#: fixmystreet/perllib/Page.pm:168 fixmystreet/perllib/Page.pm:261
+#: perllib/Page.pm:196 perllib/Page.pm:318
 msgid "All reports"
 msgstr "Alle rapporter"
 
-#: fixmystreet/perllib/Page.pm:169 fixmystreet/perllib/Page.pm:262
+#: perllib/Page.pm:197 perllib/Page.pm:319
 msgid "Local alerts"
 msgstr "Lokale varsler"
 
-#: fixmystreet/perllib/Page.pm:170 fixmystreet/perllib/Page.pm:263
+#: perllib/Page.pm:198 perllib/Page.pm:320
 msgid "Help"
 msgstr "Hjelp"
 
-#: fixmystreet/perllib/Page.pm:171 fixmystreet/web/about.cgi:19 fixmystreet/web/about.cgi:21
+#: perllib/Page.pm:199 web/about.cgi:19 web/about.cgi:21
 msgid "About us"
 msgstr "Om oss"
 
-#: fixmystreet/perllib/Page.pm:172 fixmystreet/bin/send-questionnaires-eha:93
-msgid "Report Empty Homes"
-msgstr ""
-
-#: fixmystreet/perllib/Page.pm:181 fixmystreet/perllib/Page.pm:551 fixmystreet/web/contact.cgi:64
-msgid "FixMyStreet"
-msgstr "Fiksgatami"
-
-#: fixmystreet/perllib/Page.pm:199
+#: perllib/Page.pm:220
 msgid "Fix<span id=\"my\">My</span>Street"
+msgstr "Fiks<span id=\"my\">Gata</span>Mi"
+
+#: perllib/Page.pm:296
+msgid ""
+"This is a developer site; things might break at any time, and the database "
+"will be periodically deleted."
 msgstr ""
+"Dette er et utviklernettsted. Ting kan knekke når som helst og databasen vil "
+"bli periodisk slettet."
 
-#: fixmystreet/perllib/Page.pm:207
-msgid "This is a developer site; things might break at any time."
-msgstr "Dette er et utviklingsnettsted. Ting kan knekke når som helst."
+#: perllib/Page.pm:310
+msgid ""
+"Built by <a href=\"http://www.mysociety.org/\">mySociety</a>, using some <a "
+"href=\"http://github.com/mysociety/fixmystreet\">clever</a>&nbsp;<a href="
+"\"https://secure.mysociety.org/cvstrac/dir?d=mysociety/services/TilMa"
+"\">code</a>."
+msgstr ""
+"Bygget av <a href=\"http://www.mysociety.org/\">mySociety</a>, ved hjelp av "
+"<a href=\"http://github.com/mysociety/fixmystreet\">smart</a>&nbsp;<a href="
+"\"https://secure.mysociety.org/cvstrac/dir?d=mysociety/services/TilMa"
+"\">kode</a>."
 
-#: fixmystreet/perllib/Page.pm:259
+#: perllib/Page.pm:312
+#, fuzzy
+msgid ""
+"Built by <a href=\"http://www.mysociety.org/\">mySociety</a> and maintained "
+"by <a href=\"http://www.nuug.no/\">NUUG</a>, using some <a href=\"http://"
+"github.com/mysociety/fixmystreet\">clever</a>&nbsp;<a href=\"https://secure."
+"mysociety.org/cvstrac/dir?d=mysociety/services/TilMa\">code</a>."
+msgstr ""
+"Bygget av <a href=\"http://www.mysociety.org/\">mySociety</a> og "
+"vedlikeholdt av <a href=\"http://www.nuug.no/\">NUUG</a>, ved hjelp av <a "
+"href=\"http://github.com/mysociety/fixmystreet\">smart</a>&nbsp;<a href="
+"\"https://secure.mysociety.org/cvstrac/dir?d=mysociety/services/TilMa"
+"\">kode</a>."
+
+#: perllib/Page.pm:316
 msgid "Navigation"
 msgstr "Navigasjon"
 
-#: fixmystreet/perllib/Page.pm:264
+#: perllib/Page.pm:321
 msgid "Contact"
 msgstr "Kontakt"
 
-#: fixmystreet/perllib/Page.pm:265
-msgid "<a href=\"http://www.mysociety.org/\"><img id=\"logo\" width=\"133\" height=\"26\" src=\"/i/mysociety-dark.png\" alt=\"View mySociety.org\"><span id=\"logoie\"></span></a>"
-msgstr ""
-
-#: fixmystreet/perllib/Page.pm:266
-msgid "Built by <a href=\"http://www.mysociety.org/\">mySociety</a>, using some <a href=\"http://github.com/mysociety/fixmystreet\">clever</a>&nbsp;<a href=\"https://secure.mysociety.org/cvstrac/dir?d=mysociety/services/TilMa\">code</a>."
+#: perllib/Page.pm:323
+msgid ""
+"<a href=\"http://www.mysociety.org/\"><img id=\"logo\" width=\"133\" height="
+"\"26\" src=\"/i/mysociety-dark.png\" alt=\"View mySociety.org\"><span id="
+"\"logoie\"></span></a>"
 msgstr ""
+"<div id=\"logo\" align=\"center\"><a href=\"http://www.nuug.no/\">Foreningen "
+"NUUG</a><span id=\"logoie\"></span></a></div>"
 
-#: fixmystreet/perllib/Page.pm:299
+#: perllib/Page.pm:381
 msgid "Error"
 msgstr "Feil"
 
-#: fixmystreet/perllib/Page.pm:375
-msgid "Crown copyright. All rights reserved. Ministry of Justice"
-msgstr ""
-
-#: fixmystreet/perllib/Page.pm:398
-msgid "Problem"
-msgstr "Problem"
-
-#: fixmystreet/perllib/Page.pm:557
+#: perllib/Page.pm:443
 msgid "your problem will not be posted"
-msgstr ""
+msgstr "ditt problem vil ikke bli publisert"
 
-#: fixmystreet/perllib/Page.pm:558
+#: perllib/Page.pm:444
 msgid "we'll hang on to your problem report while you're checking your email."
-msgstr ""
+msgstr "vi holder på rapporten din mens du sjekker epost."
 
-#: fixmystreet/perllib/Page.pm:560
+#: perllib/Page.pm:446
 msgid "your update will not be posted"
-msgstr ""
+msgstr "din oppdatering vil ikke bli publisert"
 
-#: fixmystreet/perllib/Page.pm:561
+#: perllib/Page.pm:447
 msgid "we'll hang on to your update while you're checking your email."
-msgstr ""
+msgstr "vi holder på din oppdatering mens du sjekker din epost."
 
-#: fixmystreet/perllib/Page.pm:563
+#: perllib/Page.pm:449
 msgid "your alert will not be activated"
-msgstr ""
+msgstr "ditt varsel vil ikke bli aktivisert"
 
-#: fixmystreet/perllib/Page.pm:564
+#: perllib/Page.pm:450
 msgid "we'll hang on to your alert while you're checking your email."
-msgstr ""
+msgstr "vi holder på ditt varsel mens du sjekker din epost."
 
-#: fixmystreet/perllib/Page.pm:570
+#: perllib/Page.pm:457
 #, perl-format
 msgid ""
 "<h1>Nearly Done! Now check your email...</h1>\n"
-"<p>The confirmation email <strong>may</strong> take a few minutes to arrive &mdash; <em>please</em> be patient.</p>\n"
-"<p>If you use web-based email or have 'junk mail' filters, you may wish to check your bulk/spam mail folders: sometimes, our messages are marked that way.</p>\n"
+"<p>The confirmation email <strong>may</strong> take a few minutes to arrive "
+"&mdash; <em>please</em> be patient.</p>\n"
+"<p>If you use web-based email or have 'junk mail' filters, you may wish to "
+"check your bulk/spam mail folders: sometimes, our messages are marked that "
+"way.</p>\n"
 "<p>You must now click the link in the email we've just sent you &mdash;\n"
 "if you do not, %s.</p>\n"
 "<p>(Don't worry &mdash; %s)</p>\n"
 msgstr ""
-
-#: fixmystreet/perllib/Page.pm:586
+"<h1>Nesten ferdig! Nå må du sjekke eposten din...</h1>\n"
+"<p>Bekreftelseseposten <strong>kan</strong> bruke noen minutter på å nå frem "
+"&mdash; så vær tålmodig.</p>\n"
+"<p>Hvis du bruker webbasert epost eller har søppelepost-filter, så børr du "
+"kanskje a sjekke din bulk/spam-mappe. Noen ganger blir epost fra oss markert "
+"som søppelpost.</p>\n"
+"<p>Du må klikke på lenken i eposten vi nettopp har sendt deg &mdash;\n"
+"hvis du ikke gjør det, %s.</p>\n"
+"<p>(Ingen grunn til bekymring &mdash; %s)</p>\n"
+
+#: perllib/Page.pm:484
 msgid "today"
 msgstr "idag"
 
-#: fixmystreet/perllib/Page.pm:608
+#: perllib/Page.pm:508
 msgid "less than a minute"
 msgstr "mindre enn et minutt"
 
-#: fixmystreet/perllib/Page.pm:611
-msgid "week"
-msgstr "uke"
+#: perllib/Page.pm:511
+#, perl-format
+msgid "%d week"
+msgstr "%d uke"
+
+#: perllib/Page.pm:511
+#, perl-format
+msgid "%d weeks"
+msgstr "%d uker"
+
+#: perllib/Page.pm:512
+#, perl-format
+msgid "%d day"
+msgstr "%d dag"
 
-#: fixmystreet/perllib/Page.pm:612
-msgid "day"
-msgstr "dag"
+#: perllib/Page.pm:512
+#, perl-format
+msgid "%d days"
+msgstr "%d dager"
 
-#: fixmystreet/perllib/Page.pm:613
-msgid "hour"
-msgstr "timer"
+#: perllib/Page.pm:513
+#, perl-format
+msgid "%d hour"
+msgstr "%d time"
 
-#: fixmystreet/perllib/Page.pm:614
-msgid "minute"
-msgstr "minutt"
+#: perllib/Page.pm:513
+#, perl-format
+msgid "%d hours"
+msgstr "%d timer"
 
-#: fixmystreet/perllib/Page.pm:634
-#, fuzzy, perl-format
+#: perllib/Page.pm:514
+#, perl-format
+msgid "%d minute"
+msgstr "%d minutt"
+
+#: perllib/Page.pm:514
+#, perl-format
+msgid "%d minutes"
+msgstr "%d minutter"
+
+#: perllib/Page.pm:534
+#, perl-format
 msgid "%s, reported anonymously at %s"
-msgstr "Publisert av anonym bruker"
+msgstr "%s, rapportert anonymt %s"
 
-#: fixmystreet/perllib/Page.pm:636
+#: perllib/Page.pm:536
 #, perl-format
 msgid "%s, reported by %s at %s"
-msgstr ""
+msgstr "%s, rapportert av %s %s"
 
-#: fixmystreet/perllib/Page.pm:640
+#: perllib/Page.pm:540
 #, perl-format
 msgid "Reported by %s in the %s category anonymously at %s"
-msgstr ""
+msgstr "Rapportert av %s i kategorien %s anonnymt %s"
 
-#: fixmystreet/perllib/Page.pm:642
+#: perllib/Page.pm:542
 #, perl-format
 msgid "Reported by %s in the %s category by %s at %s"
-msgstr ""
+msgstr "Rapportert av %s i kategorien %s av %s %s"
 
-#: fixmystreet/perllib/Page.pm:644
+#: perllib/Page.pm:544
 #, perl-format
 msgid "Reported by %s anonymously at %s"
-msgstr "Publisert av %s anonymt den %s"
+msgstr "Publisert av %s anonymt %s"
 
-#: fixmystreet/perllib/Page.pm:646
+#: perllib/Page.pm:546
 #, perl-format
 msgid "Reported by %s by %s at %s"
-msgstr ""
+msgstr "Rapporter av %s av %s %s"
 
-#: fixmystreet/perllib/Page.pm:648
+#: perllib/Page.pm:548
 #, perl-format
 msgid "Reported in the %s category anonymously at %s"
-msgstr ""
+msgstr "Rapportert i kategorien %s anonymt %s"
 
-#: fixmystreet/perllib/Page.pm:650
+#: perllib/Page.pm:550
 #, perl-format
 msgid "Reported in the %s category by %s at %s"
-msgstr ""
+msgstr "Rapportert i kategorien %s av %s %s"
 
-#: fixmystreet/perllib/Page.pm:652
+#: perllib/Page.pm:552 web/contact.cgi:212
 #, perl-format
 msgid "Reported anonymously at %s"
-msgstr "Rapportert anonymt den %s"
+msgstr "Rapportert anonymt %s"
 
-#: fixmystreet/perllib/Page.pm:654
+#: perllib/Page.pm:554 web/contact.cgi:213
 #, perl-format
 msgid "Reported by %s at %s"
-msgstr "Publisert av %s den %s"
+msgstr "Publisert av %s %s"
 
-#: fixmystreet/perllib/Page.pm:657
+#: perllib/Page.pm:559
 msgid "the map was not used so pin location may be inaccurate"
 msgstr "kartet ble ikke brukt, så nåleposisjon kan være unøyaktig"
 
-#: fixmystreet/perllib/Page.pm:664
+#: perllib/Page.pm:567
 #, perl-format
 msgid "Sent to %s %s later"
-msgstr "Send til %s %s senere"
+msgstr "Sendt til %s %s senere"
 
-#: fixmystreet/perllib/Page.pm:667
+#: perllib/Page.pm:571
 msgid "Not reported to council"
 msgstr "Ikke rapportert til kommunen"
 
-#: fixmystreet/perllib/Page.pm:696
+#: perllib/Page.pm:622 web-admin/index.cgi:521 web-admin/index.cgi:645
 msgid "Updates"
 msgstr "Oppdateringer"
 
-#: fixmystreet/perllib/Page.pm:700
+#: perllib/Page.pm:626
 #, perl-format
 msgid "Posted by %s at %s"
-msgstr "Sendt inn av %s den %s"
+msgstr "Sendt inn av %s %s"
 
-#: fixmystreet/perllib/Page.pm:702
-#, fuzzy, perl-format
+#: perllib/Page.pm:628
+#, perl-format
 msgid "Posted anonymously at %s"
-msgstr "Publisert av anonym bruker"
+msgstr "Publisert anonymt %s"
 
-#: fixmystreet/perllib/Page.pm:704
+#: perllib/Page.pm:631
 msgid "marked as fixed"
 msgstr "markert som fikset"
 
-#: fixmystreet/perllib/Page.pm:705
+#: perllib/Page.pm:632
 msgid "reopened"
-msgstr "Åpnet på nytt"
+msgstr "åpnet på nytt"
 
-#: fixmystreet/perllib/Page.pm:734 fixmystreet/perllib/Page.pm:796
-msgid "We do not cover Northern Ireland, I'm afraid, as our licence doesn't include any maps for the region."
-msgstr ""
+#: perllib/Page.pm:640 web/index.cgi:1071
+msgid "Offensive? Unsuitable? Tell us"
+msgstr "Støtende? Upassende?  Gi oss beskjed"
 
-#: fixmystreet/perllib/Page.pm:747
+#: perllib/Page.pm:667
 msgid "That postcode was not recognised, sorry."
 msgstr "Det postnummeret ble ikke gjenkjent, beklager."
 
-#: fixmystreet/perllib/Page.pm:783
+#: perllib/Page.pm:672
+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."
+
+#: perllib/Page.pm:675 perllib/FixMyStreet/Geocode.pm:133
+msgid ""
+"We do not cover Northern Ireland, I'm afraid, as our licence doesn't include "
+"any maps for the region."
+msgstr ""
+"Vi dekker ikke nordlige Irland, er jeg redd, da vår lisens ikke inkluderer "
+"noen kart for den regionen."
+
+#: perllib/Page.pm:705
+msgid "Please upload a JPEG image only"
+msgstr "Vennligst last kun opp et JPEG-bilde"
+
+#: perllib/FixMyStreet/Alert.pm:147
+msgid "This report is currently marked as fixed."
+msgstr "Denne rapporten er for tiden markert som fikset."
+
+#: perllib/FixMyStreet/Alert.pm:148
+msgid "This report is currently marked as open."
+msgstr "Denne rapporten er for tiden markert som åpen."
+
+#: perllib/FixMyStreet/Alert.pm:311
+#, perl-format
+msgid "Report on %s"
+msgstr "Rapport for %s"
+
+#: perllib/FixMyStreet/Geocode.pm:65
+msgid ""
+"Sorry, that location appears to be too general; please be more specific."
+msgstr ""
+"Beklager, den plasserigen ser ut til å være for generell.  Forsøk å være mer "
+"spesifikk."
+
+#: perllib/FixMyStreet/Geocode.pm:75
+msgid "That location does not appear to be in Britain; please try again."
+msgstr "Det stedet virker ikke å være i storbritannia. Vennligst prøv igjen."
+
+#: perllib/FixMyStreet/Geocode.pm:113
 msgid "Sorry, we could not parse that location. Please try again."
 msgstr "Beklager, vi kunne ikke tolke den posisjonen.  Vennligst prøv på nytt."
 
-#: fixmystreet/perllib/Page.pm:785 fixmystreet/perllib/Page.pm:793
-#, fuzzy
+#: perllib/FixMyStreet/Geocode.pm:115 perllib/FixMyStreet/Geocode.pm:130
 msgid "Sorry, we could not find that location."
-msgstr "Vi kan ikke bekrefte dette varselet??"
+msgstr "Beklager, vi kunne ikke finne det stedet."
 
-#: fixmystreet/perllib/Page.pm:800
-msgid "Sorry, that location appears to be too general; please be more specific."
+#: perllib/FixMyStreet/Geocode.pm:146
+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 ""
+"Vi fant mer en ett treff for den plassen.  Vi viser opp til ti treff, så "
+"forsøk et annet søk hvis din plass ikke er her."
 
-#: fixmystreet/perllib/Page.pm:814
-#, fuzzy
-msgid "That location does not appear to be in Britain; please try again."
-msgstr "Bildet ser ikke ut til å blitt lastet opp riktig (%s), prøv på nytt."
+#: perllib/FixMyStreet/Geocode.pm:161
+msgid "More than one match"
+msgstr "Mer enn ett treff"
 
-#: fixmystreet/perllib/Page.pm:826
-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."
+#: perllib/FixMyStreet/Map/Bing.pm:39
+#: perllib/FixMyStreet/Map/OSM/StreetView.pm:38
+#: perllib/FixMyStreet/Map/Google.pm:39
+#: perllib/FixMyStreet/Map/Tilma/OL/StreetView.pm:45
+#: perllib/FixMyStreet/Map/Tilma/Original/StreetView.pm:23
+msgid ""
+"Map contains Ordnance Survey data &copy; Crown copyright and database right "
+"2010."
 msgstr ""
+"Kartet inneholder data fra Ordnance Survey &copy; Crown copyright og "
+"databaserettigheter 2010."
 
-#: fixmystreet/perllib/Page.pm:857
-msgid "Please upload a JPEG image only"
+#: perllib/FixMyStreet/Map/OSM.pm:41
+#: perllib/FixMyStreet/Map/OSM/CycleMap.pm:38
+msgid ""
+"Map &copy; <a href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> and "
+"contributors, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-"
+"BY-SA</a>"
+msgstr ""
+"Kart &copy; <a href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> og "
+"bidragsytere, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-"
+"BY-SA</a>"
+
+#: perllib/FixMyStreet/Map/BingOL.pm:39
+msgid ""
+"Map contains Ordnance Survey data &copy; Crown copyright and database right "
+"2010. Microsoft"
 msgstr ""
+"Kartet inneholder data fra Ordnance Survey &copy; Crown copyright og "
+"databaserettigheter 2010. Microsoft"
 
-#: fixmystreet/web/about.cgi:24
+#: perllib/FixMyStreet/Map/Tilma/OL/1_10k.pm:45
+#: perllib/FixMyStreet/Map/Tilma/Original/1_10k.pm:23
+msgid ""
+"&copy; Crown copyright. All rights reserved. Ministry of Justice "
+"100037819&nbsp;2008."
+msgstr ""
+"&copy; Crown copyright. Alle rettigheter reservert. Justisdepartementet "
+"100037819&nbsp;2008."
+
+#: perllib/FixMyStreet/Map/Tilma/Original.pm:81
+msgid "Unable to fetch the map tiles from the tile server."
+msgstr "Klarte ikke hente kartfliser fra filtjeneren."
+
+#: perllib/FixMyStreet/Map/Tilma/Original.pm:155
+msgid "Problem"
+msgstr "Problem"
+
+#: perllib/Problems.pm:147
+#, perl-format
+msgid "<big>%s</big> report in past week"
+msgid_plural "<big>%s</big> reports in past week"
+msgstr[0] "<big>%s</big> rapport siste uke"
+msgstr[1] "<big>%s</big> rapporter siste uke"
+
+#: perllib/Problems.pm:152
+#, perl-format
+msgid "<big>%s</big> report recently"
+msgid_plural "<big>%s</big> reports recently"
+msgstr[0] "<big>%s</big> rapportert nylig"
+msgstr[1] "<big>%s</big> rapportert nylig"
+
+#: perllib/Problems.pm:158
+msgid "FixMyStreet updates"
+msgstr "Fiksgatami-oppdateringer"
+
+#: perllib/Problems.pm:161 perllib/Problems.pm:165
+#, 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"
+
+#: perllib/Problems.pm:166
+#, perl-format
+msgid "<big>%s</big> update on reports"
+msgid_plural "<big>%s</big> updates on reports"
+msgstr[0] "<big>%s</big> oppdatering i rapporter"
+msgstr[1] "<big>%s</big> oppdateringer i rapporter"
+
+#: web/about.cgi:24
 msgid ""
 "<h2>The Empty Homes Agency</h2>\n"
 "<p>The Empty Homes agency is an independent campaigning charity. We are not\n"
-"part of government, and have no formal links with local councils although we\n"
+"part of government, and have no formal links with local councils although "
+"we\n"
 "work in cooperation with both. We exist to highlight the waste of empty\n"
-"property and work with others to devise and promote sustainable solutions to\n"
+"property and work with others to devise and promote sustainable solutions "
+"to\n"
 "bring empty property back into use. We are based in London but work across\n"
-"England. We also work in partnership with other charities across the UK.</p>\n"
+"England. We also work in partnership with other charities across the UK.</"
+"p>\n"
 msgstr ""
 
-#: fixmystreet/web/about.cgi:34
+#: web/about.cgi:34
 msgid ""
 "<h2>Shelter Cymru</h2>\n"
-"Shelter Cymru is Wales&rsquo; people and homes charity and wants everyone in Wales to\n"
-"have a decent home. We believe a home is a fundamental right and essential to\n"
+"Shelter Cymru is Wales&rsquo; people and homes charity and wants everyone in "
+"Wales to\n"
+"have a decent home. We believe a home is a fundamental right and essential "
+"to\n"
 "the health and well-being of people and communities.  We work for people in\n"
 "housing need. We have offices all over Wales and prevent people from losing\n"
 "their homes by offering free, confidential and independent advice. When\n"
-"necessary we constructively challenge on behalf of people to ensure they are\n"
+"necessary we constructively challenge on behalf of people to ensure they "
+"are\n"
 "properly assisted and to improve practice and learning. We believe that\n"
-"bringing empty homes back into use can make a significant contribution to the\n"
+"bringing empty homes back into use can make a significant contribution to "
+"the\n"
 "supply of affordable homes in Wales.\n"
-"<a href=\"http://www.sheltercymru.org.uk/shelter/advice/pdetail.asp?cat=20\">Further information about our work on\n"
+"<a href=\"http://www.sheltercymru.org.uk/shelter/advice/pdetail.asp?cat=20"
+"\">Further information about our work on\n"
 "empty homes</a>.\n"
 msgstr ""
 
-#: fixmystreet/web/ajax.cgi:45 fixmystreet/web/ajax.cgi:55 fixmystreet/web/index.cgi:829
-#: fixmystreet/web/index.cgi:841
+#: web/ajax.cgi:55 web/ajax.cgi:76 web/index.cgi:902 web/index.cgi:917
 msgid "(fixed)"
 msgstr "(løst)"
 
-#: fixmystreet/web/alert.cgi:29 fixmystreet/web/confirm.cgi:46
+#: web/alert.cgi:33 web/confirm.cgi:49
 msgid "Confirmation"
 msgstr "Bekreftelse"
 
-#: fixmystreet/web/alert.cgi:38
-#, fuzzy
+#: web/alert.cgi:43
+#, perl-format
 msgid ""
-"Thank you for trying to confirm your alert. We seem to have an error ourselves\n"
-"though, so <a href=\"/contact\">please let us know what went on</a> and we'll look into it.\n"
-msgstr ""
-"Takk for at du prøver å melde en sak. Det kan se ut som det er et problempå selve portalen\n"
-", så <a href=\"/contact\">gi oss gjerne en tilbakemelding</a> så skal vi se på saken så raskt som mulig\n"
-
-#: fixmystreet/web/alert.cgi:50 fixmystreet/web/alert.cgi:53 fixmystreet/web/alert.cgi:202
-#: fixmystreet/web/alert.cgi:269
+"Thank you for trying to confirm your alert. We seem to have an error "
+"ourselves\n"
+"though, so <a href=\"%s\">please let us know what went on</a> and we'll look "
+"into it.\n"
+msgstr ""
+"Takk for at du forsøker å bekrefte ditt varsel. Vi ser ut til a ha en feil "
+"hos oss,\n"
+"så <a href=\"%s\">vær så snill å fortell oss hva som skjedde</a> så skal vi "
+"se på saken.\n"
+
+#: web/alert.cgi:59 web/alert.cgi:62 web/alert.cgi:65 web/alert.cgi:274
+#: web/alert.cgi:380
 msgid "Local RSS feeds and email alerts"
-msgstr "Lokal RSS feed og epostliste"
+msgstr "Lokal RSS-strøm og epostvarsel"
 
-#: fixmystreet/web/alert.cgi:99
-#, fuzzy
-msgid "That location does not appear to be covered by a council, perhaps it is offshore - please try somewhere more specific."
-msgstr "Den lokasjonen dekkes ikke av en kommune, er det offshore? - vennligst marker mer spesifikt."
+#: web/alert.cgi:121
+msgid ""
+"That location does not appear to be covered by a council, perhaps it is "
+"offshore - please try somewhere more specific."
+msgstr ""
+"Det stedet dekkes ikke av noen kommune, kanskje det er til havs - vennligst "
+"forsøk et mer spesifikt sted."
 
-#: fixmystreet/web/alert.cgi:114 fixmystreet/web/alert.cgi:130
+#: web/alert.cgi:140 web/alert.cgi:183 web/alert.cgi:200
 #, perl-format
 msgid "Problems within %s"
 msgstr "Problemer innenfor %s"
 
-#: fixmystreet/web/alert.cgi:116
-#, perl-format
-msgid "Problems within %s ward"
-msgstr "Problemer innenfor %s avdeling/etat"
-
-#: fixmystreet/web/alert.cgi:159
+#: web/alert.cgi:152 web/alert.cgi:233
 msgid "Problems within the boundary of:"
 msgstr "Problemer innenfor grensene av:"
 
-#: fixmystreet/web/alert.cgi:171
+#: web/alert.cgi:158 web/alert.cgi:245
 msgid "Or problems reported to:"
 msgstr "Eller problemer meldt til:"
 
-#: fixmystreet/web/alert.cgi:173
+#: web/alert.cgi:160 web/alert.cgi:247
 msgid ""
 "FixMyStreet 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"
+"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 ""
 "FiksGataMi sender forskjellige kategorier saker\n"
-"til forskjellige kommuner, problemer som gjelder flere kommuner blir sendt til alle de det gjelder "
+"til forskjellige kommuner, problemer som gjelder flere kommuner blir sendt "
+"til alle de det gjelder "
+
+#: web/alert.cgi:185
+#, perl-format
+msgid "Problems within %s ward"
+msgstr "Problemer innenfor %s avdeling/etat"
 
-#: fixmystreet/web/alert.cgi:197
+#: web/alert.cgi:269
 msgid "Photos of recent nearby reports"
 msgstr "Bilder  av nye saker i nærheten"
 
-#: fixmystreet/web/alert.cgi:201
-#, fuzzy, perl-format
+#: web/alert.cgi:272
+#, perl-format
 msgid "Local RSS feeds and email alerts for &lsquo;%s&rsquo;"
-msgstr "Lokal RSS feed og epostliste"
+msgstr "Lokal RSS-strøm og epostvarsel for &lsquo;%s&rsquo;"
 
-#: fixmystreet/web/alert.cgi:212
+#: web/alert.cgi:286
 #, perl-format
 msgid "Here are the types of local problem alerts for &lsquo;%s&rsquo;."
-msgstr ""
+msgstr "Her er typene lokale problemvarsler for &lsquo;%s&rsquo;."
 
-#: fixmystreet/web/alert.cgi:213
+#: web/alert.cgi:287
 msgid ""
 "Select which type of alert you&rsquo;d like and click the button for an RSS\n"
 "feed, or enter your email address to subscribe to an email alert."
 msgstr ""
+"Velg hvilken type varsel du ønsker og klikk på knappen for en RSS-strøm, "
+"eller skriv inn din epostadresse for å abonnere på et epostvarsel."
 
-#: fixmystreet/web/alert.cgi:216
+#: web/alert.cgi:290
 msgid "The simplest alert is our geographic one:"
 msgstr "Den enkleste meldingen er vår geografiske:"
 
-#: fixmystreet/web/alert.cgi:217
+#: web/alert.cgi:291
 #, perl-format
 msgid "Problems within %skm of this location"
 msgstr "Saker innen %skm av dette punktet"
 
-#: fixmystreet/web/alert.cgi:223
+#: web/alert.cgi:305
 msgid "(a default distance which covers roughly 200,000 people)"
 msgstr "??"
 
-#: fixmystreet/web/alert.cgi:225
+#: web/alert.cgi:308
 msgid "RSS feed of nearby problems"
-msgstr "RSS feed med saker i nærheten"
+msgstr "RSS-strøm med problemer i nærheten"
 
-#: fixmystreet/web/alert.cgi:225 fixmystreet/web/alert.cgi:257 fixmystreet/web/index.cgi:805
-#: fixmystreet/web/index.cgi:936 fixmystreet/web/reports.cgi:218
+#: web/alert.cgi:308 web/alert.cgi:367 web/index.cgi:970 web/index.cgi:1082
+#: web/reports.cgi:254
 msgid "RSS feed"
-msgstr "RSS feed"
+msgstr "RSS-strøm"
 
-#: fixmystreet/web/alert.cgi:226
+#: web/alert.cgi:309
 msgid "(alternatively the RSS feed can be customised, within"
-msgstr "(alternativt kan RSS feeden endres innenfor"
+msgstr "(alternativt kan RSS-strømmen tilpasses, innenfor"
 
-#: fixmystreet/web/alert.cgi:232
-msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
-msgstr "Du kan abonnere på varsel basert på avdeling eller kommune du&rsquo; bevinner deg i:"
+#: web/alert.cgi:319
+msgid ""
+"Or you can subscribe to an alert based upon what ward or council you&rsquo;"
+"re in:"
+msgstr ""
+"Du kan abonnere på varsel basert på avdeling eller kommune du&rsquo; "
+"bevinner deg i:"
 
-#: fixmystreet/web/alert.cgi:234
+#: web/alert.cgi:323
 msgid "Give me an RSS feed"
-msgstr "Gi meg en RSS feed"
+msgstr "Gi meg en RSS-strøm"
 
-#: fixmystreet/web/alert.cgi:235
+#: web/alert.cgi:324
 msgid "or"
 msgstr "eller"
 
-#: fixmystreet/web/alert.cgi:236
+#: web/alert.cgi:325
 msgid "Your email:"
 msgstr "Din epost"
 
-#: fixmystreet/web/alert.cgi:237
+#: web/alert.cgi:326
 msgid "Subscribe me to an email alert"
 msgstr "Jeg ønsker å abonnere på epostvarsel"
 
-#: fixmystreet/web/alert.cgi:257
+#: web/alert.cgi:367
 #, perl-format
 msgid "RSS feed of %s"
-msgstr "RSS fedd fra %s"
+msgstr "RSS-strøm fra %s"
 
-#: fixmystreet/web/alert.cgi:270
+#: web/alert.cgi:381
 msgid ""
-"FixMyStreet 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"
+"FixMyStreet 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 ""
-"Fiksgatami har forskjellige RSS feeds og epost lister for lokale problemer, dette inkluderer\n"
-"saker meldt innenfor en kommune eller et område med saker\n"
-"innenfor en angitt distanse fra et punkt."
+"Fiksgatami har ulike RSS-strømmer og epostlister om lokale problemer, dette "
+"inkluderer\n"
+"saker meldt innenfor en kommune eller et område med problemer\n"
+"innen en angitt distanse fra en bestemt posisjon."
 
-#: fixmystreet/web/alert.cgi:274
+#: web/alert.cgi:384
 msgid ""
 "To find out what local alerts we have for you, please enter your GB\n"
 "postcode or street name and area:"
-msgstr "Du finner lokale saker ved å søke på ditt postnummer, gatenavn eller sted:"
+msgstr ""
+"Du finner lokale saker ved å søke på ditt postnummer, veinavn eller sted:"
 
-#: fixmystreet/web/alert.cgi:276 fixmystreet/web/confirm.cgi:172 fixmystreet/web/index.cgi:147
+#: web/alert.cgi:389 web/confirm.cgi:192 web/index.cgi:166
 msgid "Go"
-msgstr ""
+msgstr "Søk"
 
-#: fixmystreet/web/alert.cgi:282
+#: web/alert.cgi:415
 msgid "Some photos of recent reports"
 msgstr "Noen bilder av nylig meldte saker"
 
-#: fixmystreet/web/alert.cgi:289
+#: web/alert.cgi:423
 msgid "Please select the feed you want"
 msgstr "Velg den feed du ønsker"
 
-#: fixmystreet/web/alert.cgi:302
+#: web/alert.cgi:446
 msgid "Illegal feed selection"
 msgstr "Ugyldig valg av feed"
 
-#: fixmystreet/web/alert.cgi:315
+#: web/alert.cgi:460
 msgid "Receive email when updates are left on this problem."
 msgstr "Motta epost når det er uppdateringer på denne saken"
 
-#: fixmystreet/web/alert.cgi:316 fixmystreet/web/index.cgi:664 fixmystreet/web/index.cgi:923
+#: web/alert.cgi:461 web/alert.cgi:488 web/index.cgi:736 web/index.cgi:1076
 msgid "Email:"
-msgstr "Epost"
+msgstr "Epost:"
 
-#: fixmystreet/web/alert.cgi:317 fixmystreet/web/index.cgi:924
+#: web/alert.cgi:462 web/alert.cgi:489 web/index.cgi:1077
 msgid "Subscribe"
 msgstr "Abonner"
 
-#: fixmystreet/web/alert.cgi:340
+#: web/alert.cgi:487
+msgid "Receive alerts on new local problems"
+msgstr "Motta varsel om nye lokale problemer"
+
+#: web/alert.cgi:515
 msgid "You have successfully subscribed to that alert."
 msgstr "Du abonnerer nå på denne saken"
 
-#: fixmystreet/web/alert.cgi:343
+#: web/alert.cgi:522
 msgid "We could not validate that alert."
 msgstr "Vi kan ikke bekrefte dette varselet??"
 
-#: fixmystreet/web/alert.cgi:362
+#: web/alert.cgi:544
 msgid "You have successfully confirmed your alert."
 msgstr "Du har nå bekreftet ditt varsel"
 
-#: fixmystreet/web/alert.cgi:366
+#: web/alert.cgi:551
 msgid "You have successfully deleted your alert."
 msgstr "Du har nå slettet dette varselet"
 
-#: fixmystreet/web/alert.cgi:378
+#: web/alert.cgi:571
 msgid "Please enter a valid email address"
 msgstr "Legg inn din epost"
 
-#: fixmystreet/web/alert.cgi:379
+#: web/alert.cgi:572
 msgid "Please select the type of alert you want"
 msgstr "Velg vilken type varsel du ønsker"
 
-#: fixmystreet/web/confirm.cgi:40
-#, fuzzy
+#: web/confirm.cgi:39
+#, perl-format
 msgid ""
 "Thank you for trying to confirm your update or problem. We seem to have an\n"
-"error ourselves though, so <a href=\"/contact\">please let us know what went on</a>\n"
+"error ourselves though, so <a href=\"%s\">please let us know what went on</"
+"a>\n"
 "and we'll look into it.\n"
 msgstr ""
-"Takk for at du prøver å oppdatere/lage en sak. Det vriker som vi har noen\n"
-"problemer i selve portalen vår, så <a href=\"/contact\">vennligst fortell oss om problemet problemet</a>\n"
-"og vi skal ta tak i problemet.\n"
+"Takk for at du forsøker å bekrefte din oppdatering eller ditt problem.  Vi "
+"ser ut til å ha en\n"
+"feil hos oss, så <a href=\"%s\">vær så snill å fortell oss hva som skjedde</"
+"a>\n"
+"så skal vi se på saken.\n"
 
-#: fixmystreet/web/confirm.cgi:97
+#: web/confirm.cgi:101
 #, perl-format
-msgid "You have successfully confirmed your update and you can now <a href=\"%s\">view it on the site</a>."
-msgstr "Du har nå bekreftet din oppdatering <a href=\"%s\">les om saken på portalen</a>."
+msgid ""
+"You have successfully confirmed your update and you can now <a href=\"%s"
+"\">view it on the site</a>."
+msgstr ""
+"Du har nå bekreftet din oppdatering <a href=\"%s\">les om saken på portalen</"
+"a>."
 
-#: fixmystreet/web/confirm.cgi:118
+#: web/confirm.cgi:131
 msgid "Sorry, there has been an error confirming your problem."
 msgstr "Beklager, det har oppstått problemer når vi under lagringen av saken"
 
-#: fixmystreet/web/confirm.cgi:131
+#: web/confirm.cgi:139
 msgid ""
 "Thank you for reporting an empty property on\n"
-"ReportEmptyHomes.com. We have emailed the empty property officer in the council\n"
-"responsible with the details and asked them to do whatever they can to get the\n"
+"ReportEmptyHomes.com. We have emailed the lead officer for empty homes in "
+"the council\n"
+"responsible with details, and asked them to do whatever they can to get the\n"
 "empty property back into use as soon as possible."
 msgstr ""
 
-#: fixmystreet/web/confirm.cgi:135
+#: web/confirm.cgi:143
 msgid ""
-"Most councils are quite good at bringing empty properties back into use. Even\n"
-"so the process can sometimes be slow, especially if the property is in very poor\n"
-"repair or the owner is unwilling to act. In most cases it takes six months\n"
-"before you can expect to see anything change. This doesn&rsquo;t mean the council\n"
-"isn&rsquo;t doing anything. We encourage councils to update the website so you can\n"
-"see what is happening."
-msgstr ""
-
-#: fixmystreet/web/confirm.cgi:141
+"It is worth noting however that the process can sometimes be slow,\n"
+"especially if the property is in very poor repair or the owner is unwilling "
+"to\n"
+"act. In most cases it can take six months or more before you can expect to "
+"see\n"
+"anything change and sometimes there may be considerable barries to a "
+"property\n"
+"being brought back into use. This doesn&rsquo;t mean the council isn&rsquo;"
+"t\n"
+"doing anything. We encourage councils to update the website so you can\n"
+"see what is happening. It may be a long process, but you reporting your\n"
+"concerns about this property to the council is a valuable first step."
+msgstr ""
+
+#: web/confirm.cgi:151
 msgid ""
-"We will contact you again in a month and again after six months to ask what has\n"
-"happened. Hopefully the property will be well on the way to being brought back\n"
-"into use by then, but if not we can offer advice on what you can do next."
+"We may contact you periodically to ask if anything has changed\n"
+"with the property you reported."
 msgstr ""
 
-#: fixmystreet/web/confirm.cgi:144
+#: web/confirm.cgi:153
 msgid ""
 "Thank you for using ReportEmptyHomes.com. Your action is already helping\n"
 "to resolve the UK&rsquo;s empty homes crisis."
 msgstr ""
 
-#: fixmystreet/web/confirm.cgi:146 fixmystreet/web/confirm.cgi:149
-#, fuzzy
+#: web/confirm.cgi:155 web/confirm.cgi:158
 msgid "View your report"
-msgstr "Legg til din sak/problem"
+msgstr "Vis din rapport"
 
-#: fixmystreet/web/confirm.cgi:148
+#: web/confirm.cgi:157
 msgid "Thank you for reporting an empty property on ReportEmptyHomes.com."
-msgstr ""
+msgstr "Takk for at du rapporterer en tom eiendom på ReportEmptyHomes.com."
 
-#: fixmystreet/web/confirm.cgi:153
+#: web/confirm.cgi:163
 msgid "You have successfully confirmed your problem"
 msgstr "Du har nå oppdatert din sak"
 
-#: fixmystreet/web/confirm.cgi:154
+#: web/confirm.cgi:164
 msgid " and <strong>we will now send it to the council</strong>"
-msgstr " og <strong>vi sender det nå til kommunen/etaten</strong>"
+msgstr " og <strong>vi sender det nå til administrasjonen</strong>"
 
-#: fixmystreet/web/confirm.cgi:155
+#: web/confirm.cgi:165
 #, perl-format
 msgid ". You can <a href=\"%s\">view the problem on this site</a>."
 msgstr ". Du kan <a href=\"%s\">lese saken på portalen </a>."
 
-#: fixmystreet/web/confirm.cgi:169
-#, fuzzy
-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 "Gi oss informasjon om du har rapportert en sak til kommunen tidligere"
+#: web/confirm.cgi:189
+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 det er fikset!  Can vi få spørre deg om du har "
+"rapportert et problem til kommunen tidligere?"
 
-#: fixmystreet/web/confirm.cgi:170 fixmystreet/web/questionnaire.cgi:246
+#: web/confirm.cgi:190 web/questionnaire.cgi:234 web-admin/index.cgi:339
+#: web-admin/index.cgi:340 web-admin/index.cgi:589
 msgid "Yes"
 msgstr "Ja"
 
-#: fixmystreet/web/confirm.cgi:171 fixmystreet/web/questionnaire.cgi:247
+#: web/confirm.cgi:191 web/questionnaire.cgi:235 web-admin/index.cgi:339
+#: web-admin/index.cgi:340 web-admin/index.cgi:589
 msgid "No"
 msgstr "Nei"
 
-#: fixmystreet/web/confirm.cgi:209
-#, fuzzy, perl-format
-msgid "Thank you &mdash; you can <a href=\"%s\">view your updated problem</a> on the site."
-msgstr ". Du kan <a href=\"%s\">lese saken på portalen </a>."
+#: web/confirm.cgi:237
+#, perl-format
+msgid ""
+"Thank you &mdash; you can <a href=\"%s\">view your updated problem</a> on "
+"the site."
+msgstr ""
+"Tusen takk &mdash; du kan <a href=\"%s\">ditt oppdaterte problem</a> på "
+"tjenesten."
 
-#: fixmystreet/web/contact.cgi:22
+#: web/contact.cgi:22
 msgid "Contact Us"
 msgstr "Kontakt oss"
 
-#: fixmystreet/web/contact.cgi:39
+#: web/contact.cgi:41
 msgid "Please give your name"
 msgstr "Skriv inn ditt navn"
 
-#: fixmystreet/web/contact.cgi:41
+#: web/contact.cgi:43
 msgid "Please give your email"
 msgstr "Skriv din epost"
 
-#: fixmystreet/web/contact.cgi:43
+#: web/contact.cgi:45
 msgid "Please give a valid email address"
 msgstr "Skriv en gyldig epostadresse"
 
-#: fixmystreet/web/contact.cgi:45
+#: web/contact.cgi:47
 msgid "Please give a subject"
 msgstr "Skriv inn emne"
 
-#: fixmystreet/web/contact.cgi:46
+#: web/contact.cgi:48
 msgid "Please write a message"
 msgstr "Skriv inn en melding"
 
-#: fixmystreet/web/contact.cgi:47
+#: web/contact.cgi:49
 msgid "Illegal ID"
 msgstr "Ugyldig ID"
 
-#: fixmystreet/web/contact.cgi:70
+#: web/contact.cgi:86
 msgid "Thanks for your feedback.  We'll get back to you as soon as we can!"
-msgstr "Takk for ditt innspill. Vi gir deg en tilbakemelding så raskt som mulig"
-
-#: fixmystreet/web/contact.cgi:84
-msgid "Contact the team"
-msgstr "Kontakt prosjektgruppen"
-
-#: fixmystreet/web/contact.cgi:103
-msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:"
-msgstr "Du rapporterer at den aktuelle saken inneholder tekst med personlig informasjon, upassende tekst???:"
+msgstr ""
+"Takk for ditt innspill. Vi gir deg en tilbakemelding så raskt som mulig"
 
-#: fixmystreet/web/contact.cgi:115
+#: web/contact.cgi:134
 msgid ""
 "We&rsquo;d love to hear what you think about this\n"
-"website. Just fill in the form. Please don&rsquo;t contact us about individual empty\n"
+"website. Just fill in the form. Please don&rsquo;t contact us about "
+"individual empty\n"
 "homes; use the box accessed from <a href=\"/\">the front page</a>."
 msgstr ""
 
-#: fixmystreet/web/contact.cgi:121
+#: web/contact.cgi:141
 msgid ""
-"Please do <strong>not</strong> report problems through this form; messages go to\n"
+"Please do <strong>not</strong> report problems through this form; messages "
+"go to\n"
 "the team behind FixMyStreet, not a council. To report a problem,\n"
 "please <a href=\"/\">go to the front page</a> and follow the instructions."
 msgstr ""
-"Vennligst <strong>ikke</strong> ikke rapporter feil gjennom denne siden; messages gå til\n"
-"prosjektet bak fiksgatami for å rapportere sken,\n"
+"Vennligst <strong>ikke</strong> rapporter feil gjennom denne siden; "
+"meldinger går til\n"
+"gruppen som står bak fiksgatami, og ikke til en kommune. For å rapportere et "
+"problem,\n"
 "vennligst <a href=\"/\">gå til forsiden</a> og følg instruksjonene."
 
-#: fixmystreet/web/contact.cgi:124
-#, fuzzy, perl-format
-msgid "We'd love to hear what you think about this site. Just fill in the form, or send an email to <a href='mailto:%s'>%s</a>:"
+#: web/contact.cgi:144
+#, perl-format
+msgid ""
+"We'd love to hear what you think about this site. Just fill in the form, or "
+"send an email to <a href='mailto:%s'>%s</a>:"
+msgstr ""
+"Vi ønsker å få din tilbakemelding om hva du mener om denne tjenesten. Bare "
+"fyll ut skjemaet, eller send en epost <a href='mailto:%s'>%s</a>:"
+
+#: web/contact.cgi:153 web/index.cgi:447
+msgid "There were problems with your report. Please see below."
+msgstr "Det var problemer med din rapport.  Vennligst se under."
+
+#: web/contact.cgi:158
+msgid "Contact the team"
+msgstr "Kontakt prosjektgruppen"
+
+#: web/contact.cgi:196
+msgid ""
+"You are reporting the following update for being abusive, containing "
+"personal information, or similar:"
+msgstr ""
+"Du rapporterer at følgende oppdatering er støtende, inneholder personlig "
+"informasjon, eller lignende:"
+
+#: web/contact.cgi:207
+msgid ""
+"You are reporting the following problem report for being abusive, containing "
+"personal information, or similar:"
 msgstr ""
-"Vi ønsker å få din tilbakemelding om hva du mener om vår nettside. Fyll ut skjema, or\n"
-"send epost <a href='mailto:???team&#64;fixmystreet.com'>team&#64;fiksgatami.no</a>:"
+"Du rapporterer at den aktuelle saken inneholder tekst med personlig "
+"informasjon, upassende tekst???:"
 
-#: fixmystreet/web/contact.cgi:126
+#: web/contact.cgi:234
 msgid "Your name:"
 msgstr "Ditt navn:"
 
-#: fixmystreet/web/contact.cgi:127
+#: web/contact.cgi:235
 msgid "Your&nbsp;email:"
 msgstr "Din&nbsp;epost:"
 
-#: fixmystreet/web/contact.cgi:128 fixmystreet/web/index.cgi:660
+#: web/contact.cgi:236 web/index.cgi:732
 msgid "Subject:"
-msgstr "Tema"
+msgstr "Tema:"
 
-#: fixmystreet/web/contact.cgi:129
+#: web/contact.cgi:237
 msgid "Message:"
-msgstr "Melding"
+msgstr "Melding:"
 
-#: fixmystreet/web/contact.cgi:130 fixmystreet/web/index.cgi:958
+#: web/contact.cgi:238 web/index.cgi:1092
 msgid "Post"
-msgstr "Melding"
+msgstr "Send inn"
 
-#: fixmystreet/web/faq.cgi:18
+#: web/faq.cgi:18
 msgid "Frequently Asked Questions"
 msgstr "Ofte spurte spørsmål"
 
-#: fixmystreet/web/flickr.cgi:45
+#: web/flickr.cgi:45
 msgid ""
 "Thank you for trying to register for your Flickr photos. We seem to have a\n"
-"problem ourselves though, so <a href=\"/contact\">please let us know what went on</a>\n"
+"problem ourselves though, so <a href=\"/contact\">please let us know what "
+"went on</a>\n"
 "and we'll look into it.\n"
 msgstr ""
 "Takk for at du prøver å legge til dine Flickr bilder. Vi har et\n"
-"problem med siden, så <a href=\"/contact\"> vennligst meldt fra til Oss, </a>\n"
+"problem med siden, så <a href=\"/contact\"> vennligst meldt fra til Oss, </"
+"a>\n"
 "så skal vi se saken.\n"
 
-#: fixmystreet/web/fun.cgi:17 fixmystreet/web/fun.cgi:25
+#: web/fun.cgi:17 web/fun.cgi:25
 msgid "Weird and Wonderful reports"
 msgstr "Merkelige saker"
 
-#: fixmystreet/web/index.cgi:74
+#: web/index.cgi:83
 msgid "Submitting your report"
 msgstr "Legg til din sak/problem"
 
-#: fixmystreet/web/index.cgi:77
+#: web/index.cgi:86
 msgid "Submitting your update"
 msgstr "Legg til din oppdatering"
 
-#: fixmystreet/web/index.cgi:81 fixmystreet/web/index.cgi:558 fixmystreet/web/index.cgi:572
+#: web/index.cgi:90 web/index.cgi:638
 msgid "Reporting a problem"
 msgstr "Legger til en sak"
 
-#: fixmystreet/web/index.cgi:84
+#: web/index.cgi:93
 msgid "Viewing a problem"
 msgstr "Ser på en sak"
 
-#: fixmystreet/web/index.cgi:87
+#: web/index.cgi:96
 msgid "Viewing a location"
-msgstr "Ser på en lokasjon"
+msgstr "Ser på et sted"
+
+#: web/index.cgi:121
+msgid "Enter a nearby GB postcode, or street name and area:"
+msgstr "Skriv inn GB-postnummer i nærheten, eller veinavn og sted:"
 
-#: fixmystreet/web/index.cgi:103
+#: web/index.cgi:135
 msgid "Report, view, or discuss local problems"
-msgstr "Rapporter, finn eller diskuter lokale utfordringer/saker"
+msgstr "Rapporter, finn eller diskuter lokale problemer"
 
-#: fixmystreet/web/index.cgi:104
+#: web/index.cgi:136
 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
-msgstr "(som tagging, hull i veien, søppel eller manglende gatelys"
-
-#: fixmystreet/web/index.cgi:125
-#, perl-format
-msgid "<big>%s</big> report in past week"
-msgid_plural "<big>%s</big> reports in past week"
-msgstr[0] ""
-msgstr[1] ""
-
-#: fixmystreet/web/index.cgi:130
-#, perl-format
-msgid "<big>%s</big> report recently"
-msgid_plural "<big>%s</big> reports recently"
-msgstr[0] ""
-msgstr[1] ""
+msgstr "(som tagging, søppel, hull i veien, eller manglende gatelys)"
 
-#: fixmystreet/web/index.cgi:138
-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 below&nbsp;:"
+#: web/index.cgi:158
+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 below&nbsp;:"
 msgstr ""
+"Takk for at du lastet opp ditt bilde.  Nå trenger vi å plassere ditt problem,"
+"så vær så snill å skriv inn navn på vei i nærheten, eller postnummer i "
+"boksen under&nbsp;:"
 
-#: fixmystreet/web/index.cgi:146
-#, fuzzy
-msgid "Enter a nearby GB postcode, or street name and area:"
-msgstr "Legg inn et postnummer eller et gatenavn og område"
-
-#: fixmystreet/web/index.cgi:156
+#: web/index.cgi:176
 msgid "How to report a problem"
-msgstr "Hvordan rapportere en sak"
-
-#: fixmystreet/web/index.cgi:157
-msgid "We send it to the council on your behalf"
-msgstr "Vi sender til den riktige kommunen på vegne av deg"
-
-#: fixmystreet/web/index.cgi:161
-msgid "Enter a nearby GB postcode, or street name and area"
-msgstr "Legg inn et postnummer eller et gatenavn og område"
+msgstr "Hvordan rapportere et problem"
 
-#: fixmystreet/web/index.cgi:162
+#: web/index.cgi:179
 msgid "Locate the problem on a map of the area"
-msgstr "Lokaliser saken/problemet på kartet over området"
+msgstr "Lokaliser problemet på kartet over området"
 
-#: fixmystreet/web/index.cgi:163
+#: web/index.cgi:180
 msgid "Enter details of the problem"
-msgstr "Legg inn tekst og evt. bilde om saken"
-
-#: fixmystreet/web/index.cgi:169
-msgid "FixMyStreet updates"
-msgstr "FiksGataMi oppdateringer"
-
-#: fixmystreet/web/index.cgi:172
-#, perl-format
-msgid "<big>%s</big> fixed in past month"
-msgid_plural "<big>%s</big> fixed in past month"
-msgstr[0] ""
-msgstr[1] ""
+msgstr "Legg inn detaljer om problemet"
 
-#: fixmystreet/web/index.cgi:174
-#, perl-format
-msgid "<big>%s</big> update on reports"
-msgid_plural "<big>%s</big> updates on reports"
-msgstr[0] ""
-msgstr[1] ""
+#: web/index.cgi:181
+msgid "We send it to the council on your behalf"
+msgstr "Vi sender til kommunen på vegne av deg"
 
-#: fixmystreet/web/index.cgi:185
+#: web/index.cgi:196
 msgid "Photos of recent reports"
 msgstr "Bilder av nylig meldte saker"
 
-#: fixmystreet/web/index.cgi:188
+#: web/index.cgi:198
 msgid "Recently reported problems"
 msgstr "Nylig meldte problemer"
 
-#: fixmystreet/web/index.cgi:211
+#: web/index.cgi:222
 msgid "Please enter a message"
 msgstr "Legg til en melding"
 
-#: fixmystreet/web/index.cgi:214 fixmystreet/web/index.cgi:286
+#: web/index.cgi:225 web/index.cgi:309
 msgid "Please enter your email"
 msgstr "Legg inn din epost"
 
-#: fixmystreet/web/index.cgi:216 fixmystreet/web/index.cgi:288
+#: web/index.cgi:227 web/index.cgi:311
 msgid "Please enter a valid email"
 msgstr "Legg til en gyldig epost"
 
-#: fixmystreet/web/index.cgi:225 fixmystreet/web/index.cgi:356
+#: web/index.cgi:236 web/index.cgi:378
 #, perl-format
-msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
+msgid ""
+"That image doesn't appear to have uploaded correctly (%s), please try again."
 msgstr "Bildet ser ikke ut til å blitt lastet opp riktig (%s), prøv på nytt."
 
-#: fixmystreet/web/index.cgi:246
+#: web/index.cgi:258
 msgid "Anonymous"
-msgstr "Anonymt"
+msgstr "Anonym"
 
-#: fixmystreet/web/index.cgi:277
+#: web/index.cgi:300
 msgid "No council selected"
 msgstr "Ingen kommune er valgt"
 
-#: fixmystreet/web/index.cgi:278
+#: web/index.cgi:301
 msgid "Please enter a subject"
 msgstr "Legg inn et tema"
 
-#: fixmystreet/web/index.cgi:279
+#: web/index.cgi:302
 msgid "Please enter some details"
 msgstr "Legg inn opplysninger om saken"
 
-#: fixmystreet/web/index.cgi:281
+#: web/index.cgi:304
 msgid "Please enter your name"
 msgstr "Legg inn ditt navn"
 
-#: fixmystreet/web/index.cgi:283
-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"
-msgstr "Legg inn ditt fulle navn, kommunen som mottar saken trenger dette - hvis du ikke ønsker at ditt navn skal vises, kryss av her"
+#: web/index.cgi:306
+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"
+msgstr ""
+"Legg inn ditt fulle navn, kommunen som mottar saken trenger dette - hvis du "
+"ikke ønsker at ditt navn skal vises, kryss av her"
+
+#: web/index.cgi:313 web/index.cgi:565
+msgid "-- Pick a category --"
+msgstr "-- velg en kategori --"
 
-#: fixmystreet/web/index.cgi:291
+#: web/index.cgi:314 web/index.cgi:354
 msgid "Please choose a category"
 msgstr "Velg en kategori"
 
-#: fixmystreet/web/index.cgi:293 fixmystreet/web/index.cgi:529
-#, fuzzy
+#: web/index.cgi:316 web/index.cgi:572
 msgid "-- Pick a property type --"
-msgstr "Velg en type egenskap"
+msgstr "-- velg en eiendomsstype --"
 
-#: fixmystreet/web/index.cgi:294
+#: web/index.cgi:317
 msgid "Please choose a property type"
 msgstr "Velg en type egenskap"
 
-#: fixmystreet/web/index.cgi:316
+#: web/index.cgi:338
 msgid "That location is not part of that council"
 msgstr "Denne lokasjonen er ikke en del av den kommunen"
 
-#: fixmystreet/web/index.cgi:336
+#: web/index.cgi:358
 msgid "We have details for that council"
 msgstr "Vi har opplysninger om den kommunen"
 
-#: fixmystreet/web/index.cgi:345
+#: web/index.cgi:367
 msgid "Somehow, you only have one co-ordinate. Please try again."
-msgstr "På en eller annen måte har du bare en koordinat, vennligst prøv på nytt."
+msgstr ""
+"På en eller annen måte har du bare en koordinat, vennligst prøv på nytt."
 
-#: fixmystreet/web/index.cgi:347
+#: web/index.cgi:369
 msgid "You haven't specified any sort of co-ordinates. Please try again."
 msgstr "Du har ikke spesifisert koordinater, vennligst prøv på nytt"
 
-#: fixmystreet/web/index.cgi:370 fixmystreet/web/index.cgi:515 fixmystreet/web/index.cgi:522
+#: web/index.cgi:392 web/index.cgi:558 web/index.cgi:565
 msgid "Other"
-msgstr "Andre"
+msgstr "Annet"
 
-#: fixmystreet/web/index.cgi:386
+#: web/index.cgi:408
 #, perl-format
-msgid "You have successfully confirmed your report and you can now <a href=\"%s\">view it on the site</a>."
-msgstr "Du har nå lagt til en sak og kan <a href=\"%s\">se saken på nettsiden</a>."
+msgid ""
+"You have successfully confirmed your report and you can now <a href=\"%s"
+"\">view it on the site</a>."
+msgstr ""
+"Du har nå lagt til en sak og kan <a href=\"%s\">se saken på nettsiden</a>."
 
-#: fixmystreet/web/index.cgi:501
-#, fuzzy
+#: web/index.cgi:545
 msgid ""
 "That spot does not appear to be covered by a council.\n"
 "If you have tried to report an issue past the shoreline, for example,\n"
 "please specify the closest point on land."
-msgstr "Punktet ser ikke ut til å være dekket av en kommune - det kan være at du har markert et havområde , marker nærmeste punkt på land."
+msgstr ""
+"Punktet ser ikke ut til å være dekket av en kommune.\n"
+"Hvis du har forsøkt å rapportere en sak utenfor kysten, for eksempel,\n"
+"så marker nærmeste punkt på land."
 
-#: fixmystreet/web/index.cgi:523
+#: web/index.cgi:566
 msgid "Category:"
 msgstr "Kategori"
 
-#: fixmystreet/web/index.cgi:529
+#: web/index.cgi:572
 msgid "Empty house or bungalow"
-msgstr ""
+msgstr "Tomt hus eller bungalow"
 
-#: fixmystreet/web/index.cgi:530
+#: web/index.cgi:573
 msgid "Empty flat or maisonette"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:530
+#: web/index.cgi:573
 msgid "Whole block of empty flats"
-msgstr ""
+msgstr "Hel blokk med tomme leiligheter"
 
-#: fixmystreet/web/index.cgi:531
+#: web/index.cgi:574
 msgid "Empty office or other commercial"
-msgstr ""
+msgstr "Tomt kontor eller forretningsbygg"
 
-#: fixmystreet/web/index.cgi:531
+#: web/index.cgi:574
 msgid "Empty pub or bar"
-msgstr ""
+msgstr "Tom pub eller bar"
 
-#: fixmystreet/web/index.cgi:532
+#: web/index.cgi:575
 msgid "Empty public building - school, hospital, etc."
-msgstr ""
+msgstr "Tom offentlig bygning - skole, sykehos, etc."
 
-#: fixmystreet/web/index.cgi:533
+#: web/index.cgi:576
 msgid "Property type:"
 msgstr "Type egenskap:"
 
-#: fixmystreet/web/index.cgi:573
+#: web/index.cgi:635
 msgid ""
-"You have located the problem at the point marked with a purple pin on the map.\n"
+"You have located the problem at the point marked with a purple pin on the "
+"map.\n"
 "If this is not the correct location, simply click on the map again. "
 msgstr ""
-"Du har ikke funnet et korrekt punkt på kartet.\n"
-"Klikk på kartet på nytt. "
+"Du har plassert problemet ved punktet i kartet som er markert med en lilla "
+"nål.  Hvis dette ikke er korrekt plassering kan du ganske enkelt klikke på "
+"kartet på nytt."
 
-#: fixmystreet/web/index.cgi:578
+#: web/index.cgi:643
 #, perl-format
 msgid ""
 "All the information you provide here will be sent to <strong>%s</strong>.\n"
 "On the site, we will show the subject and details of the problem, plus your\n"
 "name if you give us permission."
 msgstr ""
+"All informasjonen du legger inn her vil bli sendt til <strong>%s</strong>.\n"
+"På dette nettestedet vil vi vise tema og detaljer om problemet, pluss ditt "
+"navn\n"
+"hvis du gir oss lov."
+
+#: web/index.cgi:647
+#, perl-format
+msgid ""
+"All the information you provide here will be sent to <strong>%s</strong>.\n"
+"The subject and details of the problem will be public, plus your\n"
+"name if you give us permission."
+msgstr ""
+"All informasjonen du gir oss her vil bli sendt til <strong>%s</strong>.\n"
+"Tittelen og detaljene for problemet vil bli offentlig, pluss ditt navn\n"
+"hvis du gir oss tillatelse."
+
+#: web/index.cgi:660 web/index.cgi:662 web/index.cgi:675
+msgid " or "
+msgstr " eller "
+
+#: web/index.cgi:661
+msgid "All the information you provide here will be sent to"
+msgstr "All informasjonen du har lagt inn her vil bli sendt til"
+
+#: web/index.cgi:664
+msgid ""
+"The subject and details of the problem will be public, plus your name if you "
+"give us permission."
+msgstr ""
+"Tittelen og detaljene for problemet vil bli offentlig, pluss navnet ditt\n"
+"hvis du gir oss tillatelse til det."
+
+#: web/index.cgi:666
+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] ""
+"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."
 
-#: fixmystreet/web/index.cgi:613
+#: web/index.cgi:670 web/index.cgi:685
+#, perl-format
 msgid ""
-"<p>We do not yet have details for the council that covers\n"
-"this location. If you submit a report here it will be left on the site, but\n"
-"not reported to the council &ndash; please still leave your report, so that\n"
-"we can show to the council the activity in their area."
+"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 ""
+"Du kan hjelpe oss ved å finne en kontakt-epostadresse for lokale problemer i "
+"%s, og sende den via epost til oss på <a href='mailto:%s'>%s</a>."
+
+#: web/index.cgi:680 web/index.cgi:688
+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."
 
-#: fixmystreet/web/index.cgi:622
+#: web/index.cgi:684
+msgid ""
+"If you submit a problem here the subject and details of the problem will be "
+"public, but the problem will <strong>not</strong> be reported to the council."
+msgstr ""
+"Hvis du sender inn et problem hit, så vil tema og detaljer for problemet "
+"være offentlig, men problemet vil <strong>ikke</strong> bli rapportert til "
+"administrasjonen."
+
+#: web/index.cgi:690
+msgid ""
+"If you submit a report here it will be left on the site, but not reported to "
+"the council &ndash; please still leave your report, so that we can show to "
+"the council the activity in their area."
+msgstr ""
+"Hvis du sender inn en rapport her så vil den bli tilgjengelig her men ikke "
+"rapportert til administrasjonen. &ndash; det er fint om du likevel sender "
+"inn din rapport, slik at vi kan vise administrasjonen aktiviteten i deres "
+"område."
+
+#: web/index.cgi:696
 msgid ""
 "Please fill in the form below with details of the problem,\n"
 "and describe the location as precisely as possible in the details box."
 msgstr ""
+"Vennligst fyll inn skjemaet under med detaljene om problemet,\n"
+"og beskriv stedet så nøyaktig som mulig i boksen for detaljer."
 
-#: fixmystreet/web/index.cgi:631
+#: web/index.cgi:705
 msgid ""
 "Please fill in details of the empty property below, saying what type of\n"
 "property it is e.g. an empty home, block of flats, office etc. Tell us\n"
-"something about its condition and any other information you feel is relevant.\n"
-"There is no need for you to give the exact address. Please be polite, concise\n"
-"and to the point; writing your message entirely in block capitals makes it hard\n"
+"something about its condition and any other information you feel is "
+"relevant.\n"
+"There is no need for you to give the exact address. Please be polite, "
+"concise\n"
+"and to the point; writing your message entirely in block capitals makes it "
+"hard\n"
 "to read, as does a lack of punctuation.\n"
 msgstr ""
 
-#: fixmystreet/web/index.cgi:644
+#: web/index.cgi:713
+msgid ""
+"Please fill in details of the problem below. The council won't be able\n"
+"to help unless you leave as much detail as you can, so please describe the "
+"exact location of\n"
+"the problem (e.g. on a wall), what it is, how long it has been there, a "
+"description (and a\n"
+"photo of the problem if you have one), etc."
+msgstr ""
+"Vennligst fyll inn detaljene om problemet under. Kommunen vil ikke være i "
+"stand\n"
+"til å hjelpe med mindre du legger inn så mange detaljer som du kan. Beskriv\n"
+"eksakt plassering for problemet (f.eks. på en vegg), hva det er, hvor lenge "
+"det har\n"
+"vært der, en beskrivelse (og et bilde av problemet hvis du har et), etc."
+
+#: web/index.cgi:718
 msgid "Please fill in details of the problem below."
 msgstr "Vennligst fyll ut detaljer om saken under"
 
-#: fixmystreet/web/index.cgi:655
+#: web/index.cgi:731
 msgid "Empty property details form"
-msgstr ""
+msgstr "Tom eiendom detaljskjema"
 
-#: fixmystreet/web/index.cgi:661
+#: web/index.cgi:733
 msgid "Details:"
 msgstr "Detaljer:"
 
-#: fixmystreet/web/index.cgi:662 fixmystreet/web/index.cgi:956
+#: web/index.cgi:734 web/index.cgi:1108
 msgid "Photo:"
 msgstr "Bilde:"
 
-#: fixmystreet/web/index.cgi:663 fixmystreet/web/index.cgi:954
+#: web/index.cgi:735 web/index.cgi:1089
 msgid "Name:"
-msgstr ""
+msgstr "Navn:"
 
-#: fixmystreet/web/index.cgi:665 fixmystreet/bin/send-reports:75
+#: web/index.cgi:737 bin/send-reports:89
 msgid "Phone:"
-msgstr ""
+msgstr "Telefon:"
 
-#: fixmystreet/web/index.cgi:666
+#: web/index.cgi:738 web/index.cgi:1096
 msgid "(optional)"
-msgstr ""
+msgstr "(valgfritt)"
 
-#: fixmystreet/web/index.cgi:667
+#: web/index.cgi:740
 msgid "Can we show your name on the site?"
-msgstr ""
+msgstr "Kan vi vise ditt navn her på nettstedet?"
+
+#: web/index.cgi:742
+msgid "Can we show your name publicly?"
+msgstr "Kan vi vise ditt navn offentlig?"
 
-#: fixmystreet/web/index.cgi:668
+#: web/index.cgi:744
 msgid "(we never show your email address or phone number)"
+msgstr "(vi viser aldri din epostadresse eller telefonnummer)"
+
+#: web/index.cgi:771
+msgid "Please note:"
+msgstr "Vennligst merk deg:"
+
+#: web/index.cgi:773
+msgid ""
+"We will only use your personal information in accordance with our <a href=\"/"
+"faq#privacy\">privacy policy.</a>"
 msgstr ""
+"Vi vil kun bruke personlig informasjon om deg i henhold til vår <a href=\"/"
+"faq#privacy\">personvernpolicy.</a>"
 
-#: fixmystreet/web/index.cgi:737
-msgid "Submit"
+#: web/index.cgi:774
+msgid "Please be polite, concise and to the point."
+msgstr "Vær høflig, poengtert og kortfattet."
+
+#: web/index.cgi:775
+msgid ""
+"Please do not be abusive &mdash; abusing your council devalues the service "
+"for all users."
 msgstr ""
+"Ikke vær ufin &mdash; å kjefte på din administrasjon skader verdien av "
+"tjenesten for alle brukerne."
 
-#: fixmystreet/web/index.cgi:784
-msgid "Hide stale reports"
+#: web/index.cgi:776
+msgid ""
+"Writing your message entirely in block capitals makes it hard to read, as "
+"does a lack of punctuation."
 msgstr ""
+"Når du skriver meldingen din med kun store bokstaver blir den vanskelig å "
+"lese. Det samme gjelder manglende tegnsetting."
 
-#: fixmystreet/web/index.cgi:787
-msgid "Include stale reports"
+#: web/index.cgi:777
+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, husk at du kan kontakte administrasjonen direkte via deres egen "
+"nettside."
 
-#: fixmystreet/web/index.cgi:793
-msgid "Show pins"
+#: web/index.cgi:779
+msgid ""
+"FixMyStreet and the Guardian are providing this service in partnership in <a "
+"href=\"/faq#privacy\">certain cities</a>. In those cities, both have access "
+"to any information submitted, including names and email addresses, and will "
+"use it only to ensure the smooth running of the service, in accordance with "
+"their privacy policies."
 msgstr ""
 
-#: fixmystreet/web/index.cgi:797
+#: web/index.cgi:788
+msgid "Submit"
+msgstr "Send inn"
+
+#: web/index.cgi:883
+msgid "Hide stale reports"
+msgstr "Gjem utdaterte rapporter"
+
+#: web/index.cgi:886
+msgid "Include stale reports"
+msgstr "Inkludert utdaterte rapporter"
+
+#: web/index.cgi:905
+msgid "No problems have been reported yet."
+msgstr "Ingen saker er rapporter"
+
+#: web/index.cgi:921
+msgid "No problems found."
+msgstr "Ingen saker er funnet."
+
+#: web/index.cgi:926
+msgid "Show pins"
+msgstr "Vis nåler"
+
+#: web/index.cgi:930
 msgid "Hide pins"
-msgstr ""
+msgstr "Gjem nåler"
+
+#: web/index.cgi:969
+msgid "Email me new local problems"
+msgstr "Send meg epost om lokale problemer"
+
+#: web/index.cgi:971
+msgid "RSS feed of recent local problems"
+msgstr "RSS-strøm med nylige lokale problemer"
 
-#: fixmystreet/web/index.cgi:802
+#: web/index.cgi:974
 msgid "Problems in this area"
 msgstr "Saker i dette område"
 
-#: fixmystreet/web/index.cgi:803
-msgid "Email me new local problems"
-msgstr "Send epost til meg om lokaler saker"
+#: web/index.cgi:975
+msgid "Reports on and around the map"
+msgstr "Saker i og rundt kartet"
 
-#: fixmystreet/web/index.cgi:804
-msgid "RSS feed of recent local problems"
-msgstr "RSS feed med lokale saker som nylig er lagt til"
+#: web/index.cgi:976
+#, perl-format
+msgid "Closest nearby problems <small>(within&nbsp;%skm)</small>"
+msgstr "De nærmeste sakene <small>(innenfor&nbsp;%skm)</small>"
 
-#: fixmystreet/web/index.cgi:819
+#: web/index.cgi:980
 msgid ""
 "To report a problem, simply\n"
 "        <strong>click on the map</strong> at the correct location."
@@ -1023,399 +1439,825 @@ msgstr ""
 "For å lage en sak, \n"
 "        <strong>klikk på kartet</strong> på riktig sted."
 
-#: fixmystreet/web/index.cgi:821
-#, fuzzy, perl-format
+#: web/index.cgi:982
+#, perl-format
 msgid ""
 "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this\n"
 "        step</a>.</small>"
 msgstr ""
-"<small>Hvis du ikke kan se kartet, <a href='%s'>hopp over dette\n"
+"<small>Hvis du ikke kan se kartet, <a href='%s' rel='nofollow'>hopp over "
+"dette\n"
 "        steget</a>.</small>"
 
-#: fixmystreet/web/index.cgi:823
-msgid "Reports on and around the map"
-msgstr "Saker i og rundt kartet"
-
-#: fixmystreet/web/index.cgi:832
-msgid "No problems have been reported yet."
-msgstr "Ingen saker er rapporter"
-
-#: fixmystreet/web/index.cgi:835
-#, perl-format
-msgid "Closest nearby problems <small>(within&nbsp;%skm)</small>"
-msgstr "De nærmeste sakene <small>(innenfor&nbsp;%skm)</small>"
-
-#: fixmystreet/web/index.cgi:844
-msgid "No problems found."
-msgstr "Ingen saker er funnet."
-
-#: fixmystreet/web/index.cgi:851
+#: web/index.cgi:987
 msgid "Recent local problems, FixMyStreet"
-msgstr "Lokale saker som nylig er lagt til, FiksGataMi."
+msgstr "Nylig lokalt problem, FiksGataMi."
+
+#: web/index.cgi:1000
+msgid "There were problems with your update. Please see below."
+msgstr "Det var problemer med din oppdatering. Vennligst se under."
 
-#: fixmystreet/web/index.cgi:881 fixmystreet/web/index.cgi:883
+#: web/index.cgi:1021 web/index.cgi:1023
 msgid "Unknown problem ID"
 msgstr "Ukjent problem-Id"
 
-#: fixmystreet/web/index.cgi:884
+#: web/index.cgi:1024
 msgid "That report has been removed from FixMyStreet."
-msgstr ""
+msgstr "Den rapporten har blitt fjernet fra FiksGataMi."
 
-#: fixmystreet/web/index.cgi:907
+#: web/index.cgi:1044
 msgid "This problem is old and of unknown status."
 msgstr "Denne saken er gammel og med ukjent status."
 
-#: fixmystreet/web/index.cgi:910 fixmystreet/web/index.cgi:952
+#: web/index.cgi:1047 web/index.cgi:1088
 msgid "This problem has been fixed"
 msgstr "Denne saken er løst."
 
-#: fixmystreet/web/index.cgi:915
-msgid "Offensive? Unsuitable? Tell us"
-msgstr ""
-
-#: fixmystreet/web/index.cgi:920
+#: web/index.cgi:1072
 msgid "More problems nearby"
 msgstr "Flere saker i nærheten"
 
-#: fixmystreet/web/index.cgi:922
+#: web/index.cgi:1075
 msgid "Email me updates"
 msgstr "Send meg oppdateringer"
 
-#: fixmystreet/web/index.cgi:925
-#, fuzzy
+#: web/index.cgi:1078
 msgid "Receive email when updates are left on this problem"
-msgstr "Motta epost når det er uppdateringer på denne saken"
+msgstr "Motta epost når oppdateringer legges inn om dette problemet"
 
-#: fixmystreet/web/index.cgi:936
+#: web/index.cgi:1083
 msgid "RSS feed of updates to this problem"
-msgstr "RSS feed med oppdateringer på denne saken"
+msgstr "RSS-strøm med oppdateringer for dette problemet"
 
-#: fixmystreet/web/index.cgi:941
+#: web/index.cgi:1084
 msgid "Provide an update"
-msgstr "Send en oppdatering"
+msgstr "Bidra med oppdatering"
 
-#: fixmystreet/web/index.cgi:942
-msgid "Please note that updates are not sent to the council."
-msgstr "Oppdateringene er ikke sendt til kommunen."
-
-#: fixmystreet/web/index.cgi:955
+#: web/index.cgi:1090
 msgid "Update:"
-msgstr ""
+msgstr "Oppdatering:"
 
-#: fixmystreet/web/index.cgi:957
+#: web/index.cgi:1091
 msgid "Alert me to future updates"
+msgstr "Send meg varsel ved fremtidige oppdateringer"
+
+#: web/index.cgi:1099
+msgid ""
+"Please note that updates are not sent to the council. If you leave your name "
+"it will be public. Your information will only be used in accordance with our "
+"<a href=\"/faq#privacy\">privacy policy</a>"
 msgstr ""
+"Vennligst merk at oppdateringer ikke blir sendt til kommunen.  Hvis du "
+"legger igjen navnet ditt så vil det være offentlig tilgjengelig. Din "
+"informasjon vil kun bli brukt i henhold til våre <a href=\"/faq#privacy"
+"\">personvernpolicy</a>"
 
-#: fixmystreet/web/index.cgi:994
+#: web/index.cgi:1119
 msgid "Updates to this problem, FixMyStreet"
-msgstr "Uppdateringer til denn saken, FiksGataMi"
+msgstr "Oppdateringer til dette problemet, FiksGataMi"
 
-#: fixmystreet/web/questionnaire.cgi:28 fixmystreet/web/questionnaire.cgi:206
+#: web/questionnaire.cgi:29 web/questionnaire.cgi:80 web/questionnaire.cgi:213
+#: web/questionnaire.cgi:233
 msgid "Questionnaire"
 msgstr "Spørreskjema"
 
-#: fixmystreet/web/questionnaire.cgi:38
-msgid "I'm afraid we couldn't validate that token. If you've copied the URL from an email, please check that you copied it exactly.\n"
+#: web/questionnaire.cgi:41
+msgid ""
+"I'm afraid we couldn't validate that token. If you've copied the URL from an "
+"email, please check that you copied it exactly.\n"
 msgstr ""
+"Jeg er redd vi ikke kunne verifisere den referansen. Hvis du kopierte den "
+"URLen fra en annen epost, sjekk at du har kopiert den korrekt.\n"
 
-#: fixmystreet/web/questionnaire.cgi:43
+#: web/questionnaire.cgi:48
 #, perl-format
-msgid "You have already answered this questionnaire. If you have a question, please <a href='/contact'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
+msgid ""
+"You have already answered this questionnaire. If you have a question, please "
+"<a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
 msgstr ""
+"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"
 
-#: fixmystreet/web/questionnaire.cgi:48
+#: web/questionnaire.cgi:53
 msgid "I'm afraid we couldn't locate your problem in the database.\n"
-msgstr ""
+msgstr "Jeg er redd vi ikke klarte å finne ditt problem i databasen.\n"
 
-#: fixmystreet/web/questionnaire.cgi:79
-#, fuzzy
+#: web/questionnaire.cgi:92
 msgid "Please state whether or not the problem has been fixed"
-msgstr "Gi oss informasjon om du har rapportert en sak til kommunen tidligere"
+msgstr "Vennligs oppgi om dette problemet er blitt fikset eller ikke"
 
-#: fixmystreet/web/questionnaire.cgi:80
-msgid "Please say whether you've ever reported a problem to your council before"
+#: web/questionnaire.cgi:95
+msgid ""
+"Please say whether you've ever reported a problem to your council before"
 msgstr "Gi oss informasjon om du har rapportert en sak til kommunen tidligere"
 
-#: fixmystreet/web/questionnaire.cgi:81
+#: web/questionnaire.cgi:97
 msgid "Please indicate whether you'd like to receive another questionnaire"
-msgstr ""
+msgstr "Vennligst indiker om du ønsker å motta et annet spørreskjema"
 
-#: fixmystreet/web/questionnaire.cgi:83
+#: web/questionnaire.cgi:99
 msgid "Please provide some explanation as to why you're reopening this report"
 msgstr ""
+"Vennligst bidra med en forklaring for hvorfor du åpner denne rapporten på "
+"nytt"
 
-#: fixmystreet/web/questionnaire.cgi:99
+#: web/questionnaire.cgi:115
 msgid "Please provide some text as well as a photo"
-msgstr ""
+msgstr "Vennligst bidra med litt tekst i tilegg til et bilde"
 
-#: fixmystreet/web/questionnaire.cgi:130
+#: web/questionnaire.cgi:146
 msgid "Questionnaire filled in by problem reporter"
-msgstr ""
+msgstr "Spørreskjema fylt inn av feilrapportøren"
 
-#: fixmystreet/web/questionnaire.cgi:148
+#: web/questionnaire.cgi:166
 msgid ""
 "<p>Thank you very much for filling in our questionnaire; if you\n"
-"get some more information about the status of your problem, please come back to the\n"
+"get some more information about the status of your problem, please come back "
+"to the\n"
 "site and leave an update.</p>\n"
 msgstr ""
+"<p>Tusen takk for at du fylte ut vårt spørreskjema.  Hvis du\n"
+"får mer informasjon om status for ditt problem, vær så snill å kom tilbake "
+"hit til\n"
+"nettstedet og legg igjen en oppdatering.</p>\n"
 
-#: fixmystreet/web/questionnaire.cgi:154
+#: web/questionnaire.cgi:174
+#, perl-format
 msgid ""
-"<p style=\"font-size:150%\">We're sorry to hear that. We have two suggestions: why not try\n"
-"<a href=\"http://www.writetothem.com/\">writing direct to your councillor(s)</a>\n"
+"<p style=\"font-size:150%%\">We're sorry to hear that. We have two "
+"suggestions: why not try\n"
+"<a href=\"%s\">writing direct to your councillor(s)</a>\n"
 "or, if it's a problem that could be fixed by local people working together,\n"
-"why not <a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n"
+"why not <a href=\"http://www.pledgebank.com/new\">make and publicise a "
+"pledge</a>?\n"
 "</p>\n"
 msgstr ""
+"<p style=\"font-size:150%%\">Det gjør oss triste å høre dette. Vi har to "
+"forslag: hva med å forsøke\n"
+"<a href=\"%s\">å skrive direkte til din kommune</a>, eller hvis det er et "
+"problem som kan fikses\n"
+"av befolkningen som jobber sammen, hva med å <a href=\"http://www.pledgebank."
+"com/new\">lage\n"
+"en \"pledge\" og publiser den</a>?</p>\n"
 
-#: fixmystreet/web/questionnaire.cgi:162
-msgid "<p style=\"font-size:150%\">Thank you very much for filling in our questionnaire; glad to hear it's been fixed.</p>\n"
+#: web/questionnaire.cgi:183
+msgid ""
+"<p style=\"font-size:150%\">Thank you very much for filling in our "
+"questionnaire; glad to hear it's been fixed.</p>\n"
 msgstr ""
+"<p style=\"font-size:150%\">Tusen takk for at du fylte ut vårt "
+"spørreskjema.\n"
+"Veldig glad for å høre at det er blitt fikset.</p>\n"
+
+#: web/questionnaire.cgi:236
+msgid "Don&rsquo;t know"
+msgstr "Vet ikke"
+
+#: web/questionnaire.cgi:237
+msgid "Submit questionnaire"
+msgstr "Lever spørreskjema"
 
-#: fixmystreet/web/questionnaire.cgi:214
+#: web/questionnaire.cgi:254
 msgid ""
 "<p>Getting empty homes back into use can be difficult. You shouldn't expect\n"
-"the property to be back into use yet. But a good council will have started work\n"
+"the property to be back into use yet. But a good council will have started "
+"work\n"
 "and should have reported what they have done on the website. If you are not\n"
-"satisfied with progress or information from the council, now is the right time\n"
-"to say. You may also want to try contacting some other people who may be able\n"
+"satisfied with progress or information from the council, now is the right "
+"time\n"
+"to say. You may also want to try contacting some other people who may be "
+"able\n"
 "to help.  For advice on how to do this and other useful information please\n"
-"go to <a href=\"http://www.emptyhomes.com/getinvolved/campaign.html\">http://www.emptyhomes.com/getinvolved/campaign.html</a>.</p>\n"
+"go to <a href=\"http://www.emptyhomes.com/getinvolved/campaign.html\">http://"
+"www.emptyhomes.com/getinvolved/campaign.html</a>.</p>\n"
 msgstr ""
 
-#: fixmystreet/web/questionnaire.cgi:224
+#: web/questionnaire.cgi:264
 msgid ""
-"<p>Getting empty homes back into use can be difficult, but by now a good council\n"
+"<p>Getting empty homes back into use can be difficult, but by now a good "
+"council\n"
 "will have made a lot of progress and reported what they have done on the\n"
-"website. Even so properties can remain empty for many months if the owner is\n"
-"unwilling or the property is in very poor repair.  If nothing has happened or\n"
-"you are not satisfied with the progress the council is making, now is the right\n"
+"website. Even so properties can remain empty for many months if the owner "
+"is\n"
+"unwilling or the property is in very poor repair.  If nothing has happened "
+"or\n"
+"you are not satisfied with the progress the council is making, now is the "
+"right\n"
 "time to say so. We think it's a good idea to contact some other people who\n"
 "may be able to help or put pressure on the council  For advice on how to do\n"
 "this and other useful information please go to <a\n"
-"href=\"http://www.emptyhomes.com/getinvolved/campaign.html\">http://www.emptyhomes.com/getinvolved/campaign.html</a>.</p>\n"
+"href=\"http://www.emptyhomes.com/getinvolved/campaign.html\">http://www."
+"emptyhomes.com/getinvolved/campaign.html</a>.</p>\n"
 msgstr ""
 
-#: fixmystreet/web/questionnaire.cgi:237
-msgid "The details of your problem are available on the right hand side of this page."
+#: web/questionnaire.cgi:277
+msgid ""
+"The details of your problem are available on the right hand side of this "
+"page."
 msgstr ""
+"Detaljene om ditt problem er tilgjengelig på høyre side av denne siden."
 
-#: fixmystreet/web/questionnaire.cgi:238
+#: web/questionnaire.cgi:278
 msgid "Please take a look at the updates that have been left."
-msgstr ""
+msgstr "Vær sa snill å ta en titt på oppdateringene som har blitt igjen."
 
-#: fixmystreet/web/questionnaire.cgi:244
-#, fuzzy
+#: web/questionnaire.cgi:284
 msgid "An update marked this problem as fixed."
-msgstr "Har denne saken blitt løst?"
+msgstr "En oppdatering markerte dette problemet som fikset."
 
-#: fixmystreet/web/questionnaire.cgi:245
+#: web/questionnaire.cgi:285
 msgid "Has this problem been fixed?"
 msgstr "Har denne saken blitt løst?"
 
-#: fixmystreet/web/questionnaire.cgi:248
-msgid "Don&rsquo;t know"
-msgstr ""
-
-#: fixmystreet/web/questionnaire.cgi:259
-msgid "Have you ever reported a problem to a council before, or is this your first time?"
-msgstr "Har du sendt en sak til kommunen før, eller er dette første gangen?"
-
-#: fixmystreet/web/questionnaire.cgi:261
+#: web/questionnaire.cgi:292
 msgid "Reported before"
-msgstr ""
+msgstr "Rapportert tidligere"
 
-#: fixmystreet/web/questionnaire.cgi:262
+#: web/questionnaire.cgi:293
 msgid "First time"
-msgstr ""
+msgstr "Første gang"
+
+#: web/questionnaire.cgi:294
+msgid ""
+"Have you ever reported a problem to a council before, or is this your first "
+"time?"
+msgstr "Har du sendt en sak til kommunen før, eller er dette første gangen?"
 
-#: fixmystreet/web/questionnaire.cgi:271
+#: web/questionnaire.cgi:304
 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). For example, what was\n"
 "your experience of getting the problem fixed?"
 msgstr ""
-"Hvis du ønsker å legge til en offentlig kommentar til saken, legg den til her\n"
+"Hvis du ønsker å legge til en offentlig kommentar til saken, legg den til "
+"her\n"
 "(denne blir sendt til kommunen). Du kan for eksempel\n"
 "dele din erfaring med hvordan din sak ble løst."
 
-#: fixmystreet/web/questionnaire.cgi:299
-msgid "Submit questionnaire"
-msgstr "Lever spørreskjema"
-
-#: fixmystreet/web/reports.cgi:164 fixmystreet/web/reports.cgi:205
+#: web/reports.cgi:192 web/reports.cgi:239
 msgid "Summary reports"
-msgstr "Oppsummerings rapporter"
+msgstr "Oppsummeringsrapporter"
 
-#: fixmystreet/web/reports.cgi:166
-msgid "This is a summary of all reports on this site; select a particular council to see the reports sent there."
-msgstr "Dette er en listing av alle sakene på nettsiden; velg en enkelt kommunefor å se saker som er sendt dit."
+#: web/reports.cgi:194
+msgid ""
+"This is a summary of all reports on this site; select a particular council "
+"to see the reports sent there."
+msgstr ""
+"Dette er en opplisting av alle sakene i denne tjenesten; velg en bestemt "
+"kommune for å se saker som er sendt dit."
 
-#: fixmystreet/web/reports.cgi:167
+#: web/reports.cgi:195
 msgid "Greyed-out lines are councils that no longer exist."
-msgstr ""
+msgstr "Grå linjer er kommuner som ikke lenger eksisterer."
 
-#: fixmystreet/web/reports.cgi:171
+#: web/reports.cgi:199
 msgid "Name"
-msgstr ""
+msgstr "Navn"
 
-#: fixmystreet/web/reports.cgi:171 fixmystreet/web/reports.cgi:236
+#: web/reports.cgi:199 web/reports.cgi:275
 msgid "New problems"
 msgstr "Nye saker"
 
-#: fixmystreet/web/reports.cgi:171 fixmystreet/web/reports.cgi:244
+#: web/reports.cgi:199 web/reports.cgi:283
 msgid "Older problems"
 msgstr "Eldre saker"
 
-#: fixmystreet/web/reports.cgi:173
-#, fuzzy
+#: web/reports.cgi:201
 msgid "Old problems,<br>state unknown"
-msgstr "Eldre saker med ukjent status"
+msgstr "Eldre saker, <br>ukjent status"
 
-#: fixmystreet/web/reports.cgi:175 fixmystreet/web/reports.cgi:252
+#: web/reports.cgi:203 web/reports.cgi:290
 msgid "Recently fixed"
 msgstr "Nylig løste saker"
 
-#: fixmystreet/web/reports.cgi:175
-#, fuzzy
+#: web/reports.cgi:203
 msgid "Older fixed"
-msgstr "Eldre saker som er løst"
+msgstr "Eldre løste"
 
-#: fixmystreet/web/reports.cgi:211
+#: web/reports.cgi:245
 msgid "council"
-msgstr ""
+msgstr "kommune"
 
-#: fixmystreet/web/reports.cgi:217
-#, fuzzy, perl-format
-msgid "%s - Summary reports"
-msgstr "Oppsummerings rapporter"
+#: web/reports.cgi:255
+#, perl-format
+msgid "RSS feed of problems in this %s"
+msgstr "RSS-strøm for problemer i denne %s"
 
-#: fixmystreet/web/reports.cgi:217
-#, fuzzy, perl-format
-msgid "Problems within %s, FixMyStreet"
-msgstr "Problemer innenfor %s avdeling/etat"
+#: web/reports.cgi:259
+#, perl-format
+msgid "This is a summary of all reports for one %s."
+msgstr "Dette er en oppsummering av alle rapporter for en %s."
 
-#: fixmystreet/web/reports.cgi:219
+#: web/reports.cgi:260
 #, perl-format
-msgid "RSS feed of problems in this %s"
-msgstr "RSS feed for saker innenfor denne %s"
+msgid "This is a summary of all reports for this %s."
+msgstr "Dette er en oppsummering for alle rapporter for denne %s."
 
-#: fixmystreet/web/reports.cgi:222
-#, fuzzy, perl-format
+#: web/reports.cgi:264
+#, perl-format
 msgid "You can <a href=\"%s\">see less detail</a>."
-msgstr ". Du kan <a href=\"%s\">lese saken på portalen </a>."
-
-#: fixmystreet/web/reports.cgi:224
-#, fuzzy, perl-format
-msgid "You can <a href=\"%s\">see more details</a>."
-msgstr ". Du kan <a href=\"%s\">lese saken på portalen </a>."
+msgstr "Du kan <a href=\"%s\">se mindre detaljer</a>."
 
-#: fixmystreet/web/reports.cgi:226
+#: web/reports.cgi:266
 #, perl-format
-msgid "You can <a href=\"%s\">see less detail</a> or go back and <a href=\"/reports\">show all councils</a>."
-msgstr ""
+msgid "You can <a href=\"%s\">see more details</a>."
+msgstr "Du kan <a href=\"%s\">se flere detaljer</a>."
 
-#: fixmystreet/web/reports.cgi:228
+#: web/reports.cgi:268
 #, perl-format
-msgid "You can <a href=\"%s\">see more details</a> or go back and <a href=\"/reports\">show all councils</a>."
+msgid ""
+"You can <a href=\"%s\">see less detail</a> or go back and <a href=\"/reports"
+"\">show all councils</a>."
 msgstr ""
+"Du kan <a href=\"%s\">se mindre detaljer</a> eller gå tilbake og <a href=\"/"
+"reports\">se alle kommunene</a>."
 
-#: fixmystreet/web/reports.cgi:232
+#: web/reports.cgi:270
 #, perl-format
-msgid "This is a summary of all reports for one %s."
+msgid ""
+"You can <a href=\"%s\">see more details</a> or go back and <a href=\"/reports"
+"\">show all councils</a>."
 msgstr ""
+"Du kan <a href=\"%s\">se flere detaljer</a> eller gå tilbake og <a href=\"/"
+"reports\">se alle kommunene</a>."
 
-#: fixmystreet/web/reports.cgi:246
+#: web/reports.cgi:285
 msgid "Old problems, state unknown"
 msgstr "Eldre saker med ukjent status"
 
-#: fixmystreet/web/reports.cgi:253
+#: web/reports.cgi:291
 msgid "Old fixed"
 msgstr "Eldre saker som er løst"
 
-#: fixmystreet/bin/send-reports:77
-msgid "This web page also contains a photo of the problem, provided by the user."
+#: web/reports.cgi:294
+#, perl-format
+msgid "%s - Summary reports"
+msgstr "%s - oppsummeringsrapporter"
+
+#: web/reports.cgi:294
+#, perl-format
+msgid "Problems within %s, FixMyStreet"
+msgstr "Problemer innenfor %s, Fiksgatami"
+
+#: web/reports.cgi:334
+msgid "(not sent to council)"
+msgstr "(ikke rapportert til administrasjonen)"
+
+#: bin/send-reports:91
+msgid ""
+"This web page also contains a photo of the problem, provided by the user."
 msgstr ""
+"Denne nettsiden inneholder også et bilde av problemet, sendt inn av brukeren."
 
-#: fixmystreet/bin/send-reports:83
+#: bin/send-reports:97
 msgid "To view a map of the precise location of this issue"
-msgstr ""
+msgstr "For å se en kart med den presise plasseringen for denne saken."
 
-#: fixmystreet/bin/send-reports:84
-msgid "The user could not locate the problem on a map, but to see the area around the location they entered"
+#: bin/send-reports:98
+msgid ""
+"The user could not locate the problem on a map, but to see the area around "
+"the location they entered"
 msgstr ""
+"Brukeren kunne ikke plassere problemet på et kart, men sjekk området rundt "
+"stedet de skrev inn"
+
+#: bin/send-reports:178
+msgid "this type of local problem"
+msgstr "denne type lokalt problem"
 
-#: fixmystreet/bin/send-reports:88
+#: bin/send-reports:182
 #, perl-format
-msgid "The closest address, as the crow flies, to the location of this problem, %.0fm away, is: %s - please note that this is automatically generated, so ensure that you check it against the details provided by the user and, if possible, the map."
-msgstr ""
+msgid "Category: %s"
+msgstr "Kategori: %s"
 
-#: fixmystreet/db/alert_types_eha.pl:5 fixmystreet/db/alert_types_eha.pl:6
-#, perl-brace-format
-msgid "Updates on {{title}}"
-msgstr ""
+#: bin/send-reports:185
+msgid " and "
+msgstr " og "
 
-#: fixmystreet/db/alert_types_eha.pl:7
-#, perl-brace-format
-msgid "Update by {{name}}"
+#: bin/send-reports:186
+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 eposten 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 skaen, "
+"eller gi oss beskjed om hvilken kategori av problemer dette er så vi kan "
+"legge det til i vårt system."
+
+#: bin/send-reports:192
+#, perl-format
+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, ta "
+"kontakt med oss."
 
-#: fixmystreet/db/alert_types_eha.pl:10
+#: db/alert_types_eha.pl:5
 msgid "New reports on reportemptyhomes.com"
-msgstr ""
-
-#: fixmystreet/db/alert_types_eha.pl:11
-msgid "The latest empty properties reported by users"
-msgstr ""
+msgstr "Nye rapporter på reportemptyhomes.com"
 
-#: fixmystreet/db/alert_types_eha.pl:14
+#: db/alert_types_eha.pl:8
 msgid "Properties recently reported as put back to use on reportemptyhomes.com"
 msgstr ""
 
-#: fixmystreet/db/alert_types_eha.pl:15
+#: db/alert_types_eha.pl:9
 msgid "The latest properties reported back to use by users"
-msgstr ""
+msgstr "De siste eiendommer rapportert tilbake i bruk av brukere"
 
-#: fixmystreet/db/alert_types_eha.pl:18
+#: db/alert_types_eha.pl:12
 msgid "New local reports on reportemptyhomes.com"
-msgstr ""
+msgstr "Nye lokale rapporter på reportemptyhomes.com"
 
-#: fixmystreet/db/alert_types_eha.pl:19
+#: db/alert_types_eha.pl:13
 msgid "The latest local reports reported by users"
-msgstr ""
+msgstr "De siste lokale rapporter rapporter av brukere"
 
-#: fixmystreet/db/alert_types_eha.pl:22
+#: db/alert_types_eha.pl:16
+#, perl-brace-format
+msgid "New reports on reportemptyhomes.com near {{POSTCODE}}"
+msgstr "Nye rapporter på reportemptyhomes.com nær {{POSTCODE}}"
+
+#: db/alert_types_eha.pl:19
 #, perl-brace-format
 msgid "New reports to {{COUNCIL}} on reportemptyhomes.com"
-msgstr ""
+msgstr "Nye rapporter til {{COUNCIL}} på reportemptyhomes.com"
 
-#: fixmystreet/db/alert_types_eha.pl:23
+#: db/alert_types_eha.pl:20
 #, perl-brace-format
 msgid "The latest reports for {{COUNCIL}} reported by users"
-msgstr ""
+msgstr "De siste rapporter for {{COUNCIL}} rapportert av brukere"
 
-#: fixmystreet/db/alert_types_eha.pl:26
+#: db/alert_types_eha.pl:23
 #, perl-brace-format
-msgid "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com"
+msgid ""
+"New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com"
 msgstr ""
 
-#: fixmystreet/db/alert_types_eha.pl:27
+#: db/alert_types_eha.pl:24
 #, perl-brace-format
-msgid "The latest reports for {{COUNCIL}} within {{WARD}} ward reported by users"
+msgid ""
+"The latest reports for {{COUNCIL}} within {{WARD}} ward reported by users"
 msgstr ""
 
-#: fixmystreet/db/alert_types_eha.pl:30
+#: db/alert_types_eha.pl:27
 #, perl-brace-format
 msgid "New reports within {{NAME}}'s boundary on reportemptyhomes.com"
-msgstr ""
+msgstr "Nye rapporter innenfor grensen til {{NAME}} på reportemptyhomes.com"
 
-#: fixmystreet/db/alert_types_eha.pl:31
+#: db/alert_types_eha.pl:28
 #, perl-brace-format
 msgid "The latest reports within {{NAME}}'s boundary reported by users"
+msgstr "De siste rapporter innenfor grensen til {{NAME}} rapportert av brukere"
+
+#: db/alert_types.pl:5 db/alert_types.pl:6
+#, perl-brace-format
+msgid "Updates on {{title}}"
+msgstr "Oppdateringer av {{title}}"
+
+#: db/alert_types.pl:7
+#, perl-brace-format
+msgid "Update by {{name}}"
+msgstr "Oppdatert av {{name}}"
+
+#: db/alert_types.pl:10
+msgid "New problems on FixMyStreet"
+msgstr "Nye problemer på Fiksgatami"
+
+#: db/alert_types.pl:11
+msgid "The latest problems reported by users"
+msgstr "De siste problemene rapportert av brukere"
+
+#: db/alert_types.pl:14
+msgid "Problems recently reported fixed on FixMyStreet"
+msgstr "Problemer nylig rapportert fikset på FiksGataMi"
+
+#: db/alert_types.pl:15
+msgid "The latest problems reported fixed by users"
+msgstr "De siste problemer rapporter fikset av brukere"
+
+#: db/alert_types.pl:18 db/alert_types.pl:22
+msgid "New local problems on FixMyStreet"
+msgstr "Nye lokale problemer på FiksGataMi"
+
+#: 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 "De siste lokale problemer rapporter av brukere"
+
+#: db/alert_types.pl:26
+#, perl-brace-format
+msgid "New problems near {{POSTCODE}} on FixMyStreet"
+msgstr "Nye problemer nær {{POSTCODE}} på FiksGataMi"
+
+#: db/alert_types.pl:30
+#, perl-brace-format
+msgid "New problems NEAR {{POSTCODE}} on FixMyStreet"
+msgstr "Nye problemer nær {{POSTCODE}} på FiksGataMi"
+
+#: db/alert_types.pl:34
+#, perl-brace-format
+msgid "New problems to {{COUNCIL}} on FixMyStreet"
+msgstr "Nye problemer til {{COUNCIL}} på FiksGataMi"
+
+#: db/alert_types.pl:35
+#, perl-brace-format
+msgid "The latest problems for {{COUNCIL}} reported by users"
+msgstr "De siste problemer for {{COUNCIL}} rapportert av brukere"
+
+#: db/alert_types.pl:38
+#, perl-brace-format
+msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet"
+msgstr ""
+
+#: db/alert_types.pl:39
+#, perl-brace-format
+msgid ""
+"The latest problems for {{COUNCIL}} within {{WARD}} ward reported by users"
+msgstr ""
+
+#: db/alert_types.pl:42
+#, perl-brace-format
+msgid "New problems within {{NAME}}"
+msgstr "Nye problemer innenfor {{NAME}}"
+
+#: db/alert_types.pl:43
+#, perl-brace-format
+msgid "The latest problems within {{NAME}}"
+msgstr "De siste problemer innenfor {{NAME}}"
+
+#: web-admin/index.cgi:68 web-admin/index.cgi:123 web-admin/index.cgi:124
+#, fuzzy
+msgid "Summary"
+msgstr "Oppsummeringsrapporter"
+
+#: web-admin/index.cgi:69 web-admin/index.cgi:182 web-admin/index.cgi:183
+#, fuzzy
+msgid "Council contacts"
+msgstr "Kontakt oss"
+
+#: web-admin/index.cgi:71 web-admin/index.cgi:782 web-admin/index.cgi:783
+msgid "Timeline"
+msgstr ""
+
+#: web-admin/index.cgi:84
+#, fuzzy
+msgid "FixMyStreet administration"
+msgstr "Fiksgatami-oppdateringer"
+
+#: web-admin/index.cgi:100
+#, fuzzy
+msgid "FixMyStreet admin:"
+msgstr "FiksGataMi"
+
+#: web-admin/index.cgi:162
+msgid "Graph of problem creation by status over time"
+msgstr ""
+
+#: web-admin/index.cgi:165
+msgid "Problem breakdown by state"
+msgstr ""
+
+#: web-admin/index.cgi:170
+msgid "Update breakdown by state"
+msgstr ""
+
+#: web-admin/index.cgi:186
+msgid "Diligency prize league table"
+msgstr ""
+
+#: web-admin/index.cgi:193
+#, fuzzy
+msgid "No edits have yet been made."
+msgstr "Ingen saker er rapporter"
+
+#: web-admin/index.cgi:197
+#, fuzzy
+msgid "Councils"
+msgstr "kommune"
+
+#: web-admin/index.cgi:210 web-admin/index.cgi:585
+#, fuzzy
+msgid "None"
+msgstr "Nei"
+
+#: web-admin/index.cgi:228
+msgid "No info at all"
+msgstr ""
+
+#: web-admin/index.cgi:230
+msgid "Currently has 1+ deleted"
+msgstr ""
+
+#: web-admin/index.cgi:232
+msgid "Some unconfirmeds"
+msgstr ""
+
+#: web-admin/index.cgi:234
+msgid "All confirmed"
 msgstr ""
 
+#: web-admin/index.cgi:264 web-admin/index.cgi:274 web-admin/index.cgi:291
+msgid "*unknown*"
+msgstr ""
+
+#: web-admin/index.cgi:267 web-admin/index.cgi:295
+#, fuzzy
+msgid "Values updated"
+msgstr "Send meg oppdateringer"
+
+#: web-admin/index.cgi:277
+msgid "New category contact added"
+msgstr ""
+
+#: web-admin/index.cgi:314 web-admin/index.cgi:397
+#, perl-format
+msgid "Council contacts for %s"
+msgstr ""
+
+#: web-admin/index.cgi:327
+#, fuzzy
+msgid " List all reported problems"
+msgstr "Nylig meldte problemer"
+
+#: web-admin/index.cgi:329
+msgid "Text only version"
+msgstr ""
+
+#: web-admin/index.cgi:335
+#, fuzzy
+msgid "Category"
+msgstr "Kategori"
+
+#: web-admin/index.cgi:335 web-admin/index.cgi:437
+#, fuzzy
+msgid "Email"
+msgstr "Epost:"
+
+#: web-admin/index.cgi:335 web-admin/index.cgi:367 web-admin/index.cgi:420
+#: web-admin/index.cgi:437 web-admin/index.cgi:736
+#, fuzzy
+msgid "Confirmed"
+msgstr "Bekreftelse"
+
+#: web-admin/index.cgi:335 web-admin/index.cgi:369 web-admin/index.cgi:422
+#: web-admin/index.cgi:437
+msgid "Deleted"
+msgstr ""
+
+#: web-admin/index.cgi:335
+msgid "Last editor"
+msgstr ""
+
+#: web-admin/index.cgi:335 web-admin/index.cgi:437
+#, fuzzy
+msgid "Note"
+msgstr "Nei"
+
+#: web-admin/index.cgi:335 web-admin/index.cgi:437
+msgid "When edited"
+msgstr ""
+
+#: web-admin/index.cgi:335
+#, fuzzy
+msgid "Confirm"
+msgstr "Bekreftelse"
+
+#: web-admin/index.cgi:352
+#, fuzzy
+msgid "Update statuses"
+msgstr "Oppdateringer"
+
+#: web-admin/index.cgi:357
+msgid "Add new category"
+msgstr ""
+
+#: web-admin/index.cgi:360 web-admin/index.cgi:414
+#, fuzzy
+msgid "Category: "
+msgstr "Kategori"
+
+#: web-admin/index.cgi:363 web-admin/index.cgi:417
+#, fuzzy
+msgid "Email: "
+msgstr "Epost:"
+
+#: web-admin/index.cgi:372 web-admin/index.cgi:425
+msgid "Note: "
+msgstr ""
+
+#: web-admin/index.cgi:379
+#, fuzzy
+msgid "Create category"
+msgstr "Kategori"
+
+#: web-admin/index.cgi:431
+msgid "Save changes"
+msgstr ""
+
+#: web-admin/index.cgi:435
+msgid "History"
+msgstr ""
+
+#: web-admin/index.cgi:437
+msgid "Editor"
+msgstr ""
+
+#: web-admin/index.cgi:441 web-admin/index.cgi:442
+#, fuzzy
+msgid "yes"
+msgstr "Ja"
+
+#: web-admin/index.cgi:441 web-admin/index.cgi:442
+msgid "no"
+msgstr ""
+
+#: web-admin/index.cgi:469
+msgid "Search:"
+msgstr ""
+
+#: web-admin/index.cgi:541
+#, fuzzy
+msgid "That problem will now be resent."
+msgstr "ditt problem vil ikke bli publisert"
+
+#: web-admin/index.cgi:547
+msgid "I am afraid you cannot confirm unconfirmed reports."
+msgstr ""
+
+#: web-admin/index.cgi:576 web-admin/index.cgi:696
+#, fuzzy
+msgid "Updated!"
+msgstr "Oppdateringer"
+
+#: web-admin/index.cgi:580
+#, fuzzy, perl-format
+msgid "Editing problem %d"
+msgstr "Ser på en sak"
+
+#: web-admin/index.cgi:608 web-admin/index.cgi:736
+#, fuzzy
+msgid "State:"
+msgstr "Oppdatering:"
+
+#: web-admin/index.cgi:608
+msgid "Open"
+msgstr ""
+
+#: web-admin/index.cgi:608
+#, fuzzy
+msgid "Fixed"
+msgstr "(løst)"
+
+#: web-admin/index.cgi:608 web-admin/index.cgi:736
+#, fuzzy
+msgid "Hidden"
+msgstr "Gjem nåler"
+
+#: web-admin/index.cgi:608 web-admin/index.cgi:736
+msgid "Unconfirmed"
+msgstr ""
+
+#: web-admin/index.cgi:608
+msgid "Partial"
+msgstr ""
+
+#: web-admin/index.cgi:611
+msgid "You really want to resend?"
+msgstr ""
+
+#: web-admin/index.cgi:611
+#, fuzzy
+msgid "Resend report"
+msgstr "Gjem utdaterte rapporter"
+
+#: web-admin/index.cgi:642 web-admin/index.cgi:756
+#, fuzzy
+msgid "Submit changes"
+msgstr "Send inn"
+
+#: web-admin/index.cgi:674
+msgid "Edit"
+msgstr ""
+
+#: web-admin/index.cgi:701
+#, fuzzy
+msgid "Problem marked as open."
+msgstr "Denne rapporten er for tiden markert som åpen."
+
+#: web-admin/index.cgi:717
+#, fuzzy, perl-format
+msgid "Editing update %d"
+msgstr "Legg til din oppdatering"
+
 #. Please leave the first word "Subject:" untranslated
-#: fixmystreet/templates/emails/alert-confirm
+#: templates/emails/alert-confirm
 msgid ""
 "Subject: Confirm your alert on FixMyStreet\n"
 "\n"
@@ -1447,7 +2289,7 @@ msgstr ""
 "Vennlig Hilsen,  \n"
 "FiksGataMi teamet\n"
 
-#: fixmystreet/templates/emails/alert-problem
+#: templates/emails/alert-problem
 msgid ""
 "Subject: New problems on FixMyStreet\n"
 "\n"
@@ -1473,7 +2315,7 @@ msgstr ""
 "Hvis du ikke ønsker å stå på denne epostlisten,\n"
 "klikk på linken: <?=$values['unsubscribe_url']?>\n"
 
-#: fixmystreet/templates/emails/alert-problem-area
+#: templates/emails/alert-problem-area
 msgid ""
 "Subject: New problems in <?=$values['area_name']?> on FixMyStreet\n"
 "\n"
@@ -1503,7 +2345,7 @@ msgstr ""
 "<?=$values['area_name']?> i fremtiden, klikk på følgende link: \n"
 "<?=$values['unsubscribe_url']?>\n"
 
-#: fixmystreet/templates/emails/alert-problem-council
+#: templates/emails/alert-problem-council
 msgid ""
 "Subject: New problems reported to <?=$values['area_name']?> on FixMyStreet\n"
 "\n"
@@ -1531,7 +2373,7 @@ msgstr ""
 "<?=$values['area_name']?> i fremtiden, klikk på følgende link: \n"
 "<?=$values['unsubscribe_url']?>\n"
 
-#: fixmystreet/templates/emails/alert-problem-nearby
+#: templates/emails/alert-problem-nearby
 msgid ""
 "Subject: New nearby problems on FixMyStreet\n"
 "\n"
@@ -1557,9 +2399,10 @@ msgstr ""
 "Hvis du ikke ønsker å abonnere på epost om problemer i nærheten,\n"
 "klikk på følgende link: <?=$values['unsubscribe_url']?>\n"
 
-#: fixmystreet/templates/emails/alert-problem-ward
+#: templates/emails/alert-problem-ward
 msgid ""
-"Subject: New problems reported to <?=$values['area_name']?> within <?=$values['ward_name']?> on FixMyStreet\n"
+"Subject: New problems reported to <?=$values['area_name']?> within <?=$values"
+"['ward_name']?> on FixMyStreet\n"
 "\n"
 "The following new problems have been reported to <?=$values['area_name']?>\n"
 "within <?=$values['ward_name']?>:\n"
@@ -1573,7 +2416,8 @@ msgid ""
 "<?=$values['area_name']?> within <?=$values['ward_name']?>,\n"
 "please follow this link: <?=$values['unsubscribe_url']?>\n"
 msgstr ""
-"Subject: Nye saker sendt til <?=$values['area_name']?> innenfor <?=$values['ward_name']?> via FiksGataMi.no\n"
+"Subject: Nye saker sendt til <?=$values['area_name']?> innenfor <?=$values "
+"['ward_name']?> via FiksGataMi.no\n"
 "\n"
 "Følgende saker er sendt til <?=$values['area_name']?>\n"
 "innenfor <?=$values['ward_name']?>:\n"
@@ -1587,8 +2431,7 @@ msgstr ""
 "<?=$values['area_name']?> innenfor <?=$values['ward_name']?>,\n"
 "klikk på denne linken: <?=$values['unsubscribe_url']?>\n"
 
-#: fixmystreet/templates/emails/alert-update
-#, fuzzy
+#: templates/emails/alert-update
 msgid ""
 "Subject: New updates on problem - '<?=$values['title']?>'\n"
 "\n"
@@ -1596,6 +2439,8 @@ msgid ""
 "\n"
 "<?=$values['data']?>\n"
 "\n"
+"<?=$values['state_message']?>\n"
+"\n"
 "To view or reply to these updates, please visit the following URL:\n"
 "    <?=$values['problem_url']?>\n"
 "\n"
@@ -1607,26 +2452,27 @@ msgid ""
 "To stop receiving emails when there are new updates on this problem,\n"
 "please follow this link: <?=$values['unsubscribe_url']?>\n"
 msgstr ""
-"Subject: Oppdateringer på saken - '<?=$values['title']?>'\n"
+"Subject: Nye oppdateringer for problem - '<?=$values['title']?>'\n"
 "\n"
-"Følgende oppdateringer er lagt til på saken:\n"
+"Følgende oppdateringer har blitt lagt inn for dette problemet:\n"
 "\n"
 "<?=$values['data']?>\n"
 "\n"
-"For å lese eller svare på disse oppdateringene, klikk på følgende link:\n"
+"<?=$values['state_message']?>\n"
+"\n"
+"For å se på eller svare på disse oppdateringene, besøk denne URLen:\n"
 "    <?=$values['problem_url']?>\n"
 "\n"
-"Svar på denne eposten vil gå til prosjektteamet på FiksGataMi.no, *ikke*\n"
-"til saken og de som leser den.\n"
+"Du kan ikke kontakte noen ved å svare på denne eposten.\n"
 "\n"
-"Vennlig hilsen,  \n"
-"FiksGataMi teamet\n"
+"Vennlig hilsen,,  \n"
+"Fiksgata-laget\n"
 "\n"
-"Hvis du ikke ønsker å abonnere på oppdateringer rundt denne saken,\n"
-"klikk på linken: <?=$values['unsubscribe_url']?>\n"
+"For å slutte å motta epost når det er nye oppdateringer om dettte "
+"problemet,\n"
+"følg denne lenken: <?=$values['unsubscribe_url']?>\n"
 
-#: fixmystreet/templates/emails/empty property-confirm
-#, fuzzy
+#: templates/emails/empty property-confirm
 msgid ""
 "Subject: Confirm your empty property report\n"
 "\n"
@@ -1649,28 +2495,8 @@ msgid ""
 "Yours,  \n"
 "reportemptyhomes.com\n"
 msgstr ""
-"Subject: Bekreftelse på ny sak lagt til på FiksGataMi.no\n"
-"\n"
-"Hi <?=$values['name']?>,\n"
-"\n"
-"Vennligst klikk på linken under for å bekrefte saken du har lagt til\n"
-"på FiksGataMi:\n"
-"\n"
-"<?=$values['url']?>\n"
-"\n"
-"Hvis ditt epost program ikke gir deg mulighet til å klikke på linken,\n"
-"kopier linken inn i nettleseren.\n"
-"\n"
-"Din sak hadde følgende tittel:\n"
-"<?=$values['title']?>\n"
-"\n"
-"Med følgende verdier:\n"
-"<?=$values['detail']?>\n"
-"\n"
-"Vennlig hilsen,  \n"
-"FiksGataMi teamet\n"
 
-#: fixmystreet/templates/emails/flickr-confirm
+#: templates/emails/flickr-confirm
 msgid ""
 "Subject: Confirm your email address on FixMyStreet\n"
 "\n"
@@ -1700,7 +2526,7 @@ msgstr ""
 "Vennlig hilsen,  \n"
 "FiksGataMi teamet\n"
 
-#: fixmystreet/templates/emails/flickr-submit
+#: templates/emails/flickr-submit
 msgid ""
 "Subject: New photo pulled from Flickr to FixMyStreet\n"
 "\n"
@@ -1732,15 +2558,14 @@ msgstr ""
 "Vennlig hilsen,  \n"
 "FiksGataMi teamet\n"
 
-#: fixmystreet/templates/emails/partial
-#, fuzzy
+#: templates/emails/partial
 msgid ""
 "Subject: Confirm your report on FixMyStreet\n"
 "\n"
 "Hi<?=$values['name']?>,\n"
 "\n"
 "To confirm the report you have uploaded to FixMyStreet via\n"
-"<?=$values['service'], and to check or add any details,\n"
+"<?=$values['service']?>, and to check or add any details,\n"
 "please visit the following URL:\n"
 "\n"
 "<?=$values['url']?>\n"
@@ -1750,22 +2575,22 @@ msgid ""
 "Yours,  \n"
 "The FixMyStreet team\n"
 msgstr ""
-"Subject: Din nye sak på FiksGataMi.no\n"
+"Subject: Bekreft din rapport på FiksGataMi\n"
 "\n"
-"Hi<?=$values['name']?>,\n"
+"Hei<?=$values['name']?>,\n"
 "\n"
-"Vi har lagret saken som nå lastet opp via\n"
-"<?=$values['service']?>. For å se saken,\n"
-"og redigere eller lese detaljene, gå til følgende link:\n"
+"For å bekrefte rapporten du har lastet opp til FiksGatami via\n"
+"<?=$values['service']?>, og for å sjekke eller legge til litt detaljer,\n"
+"besøk følgende URL:\n"
 "\n"
 "<?=$values['url']?>\n"
 "\n"
-"Vi sender så saken til kommunen. Takk!\n"
+"Takk!\n"
 "\n"
 "Vennlig hilsen,  \n"
-"FiksGataMi teamet\n"
+"FiksGataMi-gruppen\n"
 
-#: fixmystreet/templates/emails/problem-confirm
+#: templates/emails/problem-confirm
 msgid ""
 "Subject: Confirm your problem on FixMyStreet\n"
 "\n"
@@ -1809,7 +2634,7 @@ msgstr ""
 "Vennlig hilsen,  \n"
 "FiksGataMi teamet\n"
 
-#: fixmystreet/templates/emails/questionnaire
+#: templates/emails/questionnaire
 msgid ""
 "Subject: Questionnaire about your problem on FixMyStreet\n"
 "\n"
@@ -1848,7 +2673,8 @@ msgstr ""
 "\n"
 "    <?=$values['url']?>\n"
 "\n"
-"Vennligst ikke svar på denne eposten; det er muligheter for å kommentere i skjema.\n"
+"Vennligst ikke svar på denne eposten; det er muligheter for å kommentere i "
+"skjema.\n"
 "\n"
 "Vennlig hilsen,  \n"
 "FiksGataMi teamet\n"
@@ -1860,8 +2686,7 @@ msgstr ""
 "<?=$values['detail']?>\n"
 "\n"
 
-#: fixmystreet/templates/emails/questionnaire-eha-26weeks
-#, fuzzy
+#: templates/emails/questionnaire-eha-26weeks
 msgid ""
 "Subject: Questionnaire about your empty property report\n"
 "\n"
@@ -1869,7 +2694,8 @@ msgid ""
 "\n"
 "Six months ago, you reported an empty home on ReportEmptyHomes.com with the\n"
 "details provided at the end of this email. To keep our site up to date and\n"
-"relevant, I'd be grateful if you could fill in this short questionnaire to tell\n"
+"relevant, I'd be grateful if you could fill in this short questionnaire to "
+"tell\n"
 "us what has happened: \n"
 "\n"
 "    <?=$values['url']?>\n"
@@ -1889,34 +2715,8 @@ msgid ""
 "<?=$values['detail']?>\n"
 "\n"
 msgstr ""
-"Subject: Skjema om din sak knyttet til tom eiendom\n"
-"\n"
-"Hi <?=$values['name']?>,\n"
-"\n"
-"Six months ago, you reported an empty home on ReportEmptyHomes.com with the\n"
-"details provided at the end of this email. To keep our site up to date and\n"
-"relevant, I'd be grateful if you could fill in this short questionnaire to tell\n"
-"us what has happened: \n"
-"\n"
-"    <?=$values['url']?>\n"
-"\n"
-"Please do not reply to this email; there is a public comment\n"
-"box on the questionnaire.\n"
-"\n"
-"Yours,  \n"
-"The Empty Homes Agency\n"
-"\n"
-"Your report was as follows:\n"
-"\n"
-"<?=$values['title']?>\n"
-"\n"
-"Property type: <?=$values['category']?>\n"
-"\n"
-"<?=$values['detail']?>\n"
-"\n"
 
-#: fixmystreet/templates/emails/questionnaire-eha-4weeks
-#, fuzzy
+#: templates/emails/questionnaire-eha-4weeks
 msgid ""
 "Subject: Questionnaire about your empty property report\n"
 "\n"
@@ -1924,7 +2724,8 @@ msgid ""
 "\n"
 "Four weeks ago, you reported an empty home on ReportEmptyHomes.com with the\n"
 "details provided at the end of this email. To keep our site up to date and\n"
-"relevant, I'd be grateful if you could fill in this short questionnaire to tell\n"
+"relevant, I'd be grateful if you could fill in this short questionnaire to "
+"tell\n"
 "us what has happened:\n"
 "\n"
 "    <?=$values['url']?>\n"
@@ -1944,39 +2745,15 @@ msgid ""
 "<?=$values['detail']?>\n"
 "\n"
 msgstr ""
-"Subject: Skjema om din sak knyttet til tom eiendom\n"
-"\n"
-"Hi <?=$values['name']?>,\n"
-"\n"
-"Six months ago, you reported an empty home on ReportEmptyHomes.com with the\n"
-"details provided at the end of this email. To keep our site up to date and\n"
-"relevant, I'd be grateful if you could fill in this short questionnaire to tell\n"
-"us what has happened: \n"
-"\n"
-"    <?=$values['url']?>\n"
-"\n"
-"Please do not reply to this email; there is a public comment\n"
-"box on the questionnaire.\n"
-"\n"
-"Yours,  \n"
-"The Empty Homes Agency\n"
-"\n"
-"Your report was as follows:\n"
-"\n"
-"<?=$values['title']?>\n"
-"\n"
-"Property type: <?=$values['category']?>\n"
-"\n"
-"<?=$values['detail']?>\n"
-"\n"
 
-#: fixmystreet/templates/emails/reply-autoresponse
+#: templates/emails/reply-autoresponse
 msgid ""
 "Subject: Automatic reply to your message to FixMyStreet\n"
 "\n"
 "Hi,\n"
 "\n"
-"This is an automatic response to your email; your email has not been delivered.\n"
+"This is an automatic response to your email; your email has not been "
+"delivered.\n"
 "\n"
 "If you're replying to an email about a report update, please visit\n"
 "the URL given in the email in order to leave a reply. You cannot\n"
@@ -1996,9 +2773,31 @@ msgid ""
 "Yours,\n"
 "The FixMyStreet team\n"
 msgstr ""
+"Subject: Automatisk svar på din melding til FiksGataMi\n"
+"\n"
+"Hei,\n"
+"\n"
+"Dette er et automatisk svar på din epost.  Din epost er ikke levert.\n"
+"\n"
+"Hvis du svarer på en epost om en rapportoppdatering, vennligst\n"
+"besøk URLen oppgitt i eposten for å legge igjen et svar.  Du kan\n"
+"ikke svare på en oppdatering via epost.\n"
+"\n"
+"Hvis du forsøker å bekrefte noe, som en rapport eller et epostvarsel,\n"
+"så må du klikke på lenken i eposten vi sendte deg, eller, hvis du ikke\n"
+"kan klikke på lenken, kopier og lim den inn i adressefeltet på din "
+"nettleser.\n"
+"\n"
+"Hvis du forsøker å melde deg av et epostvarsel, så er det en\n"
+"avmeldings-lenke i slutten av eposten.\n"
+"\n"
+"Hvis du har et spørsmål eller en kommentar om nettstedet, vennligst send din "
+"epost til fiksgatami@nuug.no\n"
+"\n"
+"Vennlig hilsen,\n"
+"FiksGataMi-gruppa\n"
 
-#: fixmystreet/templates/emails/submit-brent
-#, fuzzy
+#: templates/emails/submit-brent
 msgid ""
 "Subject: FMS Problem Report: <?=$values['title']?>\n"
 "\n"
@@ -2019,13 +2818,14 @@ msgid ""
 "\n"
 "Email: <?=$values['email']?>\n"
 "\n"
-"<?=$values['phone_line']?><?=$values['category_line']?>Subject: <?=$values['title']?>\n"
+"<?=$values['phone_line']?><?=$values['category_line']?>Subject: <?=$values"
+"['title']?>\n"
 "\n"
 "Details: <?=$values['detail']?>\n"
 "\n"
-"Easting: <?=$values['easting']?>\n"
+"<?=$values['easting_northing']?>Latitude: <?=$values['latitude']?>\n"
 "\n"
-"Northing: <?=$values['northing']?>\n"
+"Longitude: <?=$values['longitude']?>\n"
 "\n"
 "<?=$values['closest_address_machine']?>----------\n"
 "\n"
@@ -2034,23 +2834,26 @@ msgid ""
 "Yours,  \n"
 "The FixMyStreet team\n"
 "\n"
-"[ This message was sent via FixMyStreet, a project of UKCOD, registered charity\n"
-"number 1076346. If there is a more appropriate email address for messages about\n"
-"<?=$values['category_footer']?>, please let us know by visiting <http://www.fixmystreet.com/contact>.\n"
+"[ This message was sent via FixMyStreet, a project of UKCOD, registered "
+"charity\n"
+"number 1076346. If there is a more appropriate email address for messages "
+"about\n"
+"<?=$values['category_footer']?>, please let us know by visiting <http://www."
+"fixmystreet.com/contact>.\n"
 "This will help improve the service for local people. We\n"
 "also welcome any other feedback you may have. ]\n"
 "\n"
 msgstr ""
-"Subject: Sak til kommunen: <?=$values['title']?>\n"
+"Subject: FMS problemrapport: <?=$values['title']?>\n"
 "\n"
-"Dear <?=$values['councils_name']?>,\n"
+"Kjære <?=$values['councils_name']?>,\n"
 "\n"
-"<?=$values['missing']?><?=$values['multiple']?>en bruker har gjennom\n"
-"FiksGataMi sendt følgende sak til deres kommune.\n"
-"Saken er av lokal karakter, og derfor sendt til deres kommune.\n"
+"<?=$values['missing']?><?=$values['multiple']?>En bruker av\n"
+"FiksGataMi har sendt inn følgende rappport\n"
+"om et lokalt problem som vi tror trenger deres oppmerksomhet.\n"
 "\n"
-"<?=$values['fuzzy']?>, vi setter pris på om dere kan oppdatere saken etter behandling,\n"
-"ved å klikke på følgende link:\n"
+"<?=$values['fuzzy']?>, eller for å bidra med en oppdatering om problemet,\n"
+"vennligst besøk følgende lenke:\n"
 "\n"
 "    <?=$values['url']?>\n"
 "\n"
@@ -2060,20 +2863,32 @@ msgstr ""
 "\n"
 "Epost: <?=$values['email']?>\n"
 "\n"
-"<?=$values['phone_line']?><?=$values['category_line']?>Subject: <?=$values['title']?>\n"
+"<?=$values['phone_line']?><?=$values['category_line']?>Tema: <?=$values"
+"['title']?>\n"
 "\n"
 "Detaljer: <?=$values['detail']?>\n"
 "\n"
-"<?=$values['closest_address']?>----------\n"
+"<?=$values['easting_northing']?>Breddegrad: <?=$values['latitude']?>\n"
 "\n"
-"Svar på denne eposten vil gå til brukeren som har meldt saken.\n"
+"Lengdegrad: <?=$values['longitude']?>\n"
 "\n"
-"Med Vennlig Hilsen,  \n"
-"The FixMyStreet team\n"
+"<?=$values['closest_address_machine']?>----------\n"
+"\n"
+"Svar på denne eposten vil gå til brukeren som sendte inn problemet.\n"
+"\n"
+"Vennlig hilsen,,  \n"
+"Fiksgatami-gruppa\n"
+"\n"
+"[ Denne meldingen ble sendt inn via FiksGataMi, et prosjekt hos foreningen "
+"NUUG.\n"
+"Hvis det er en mer passende epostadresse for meldinger om\n"
+"<?=$values['category_footer']?>, vær så snill å gi oss beskjed ved å besøke\n"
+"<http://www.fiksgatami.no/contact>.\n"
+"Dette vil bidra til å forbedre tjenesten for befolkningen. Vi\n"
+"tar også gjerne imot andre tilbakemeldinger som du har noen. ]\n"
 "\n"
 
-#: fixmystreet/templates/emails/submit-council
-#, fuzzy
+#: templates/emails/submit-council
 msgid ""
 "Subject: Problem Report: <?=$values['title']?>\n"
 "\n"
@@ -2094,10 +2909,15 @@ msgid ""
 "\n"
 "Email: <?=$values['email']?>\n"
 "\n"
-"<?=$values['phone_line']?><?=$values['category_line']?>Subject: <?=$values['title']?>\n"
+"<?=$values['phone_line']?><?=$values['category_line']?>Subject: <?=$values"
+"['title']?>\n"
 "\n"
 "Details: <?=$values['detail']?>\n"
 "\n"
+"<?=$values['easting_northing']?>Latitude: <?=$values['latitude']?>\n"
+"\n"
+"Longitude: <?=$values['longitude']?>\n"
+"\n"
 "<?=$values['closest_address']?>----------\n"
 "\n"
 "Replies to this email will go to the user who submitted the problem.\n"
@@ -2105,23 +2925,26 @@ msgid ""
 "Yours,  \n"
 "The FixMyStreet team\n"
 "\n"
-"[ This message was sent via FixMyStreet, a project of UKCOD, registered charity\n"
-"number 1076346. If there is a more appropriate email address for messages about\n"
-"<?=$values['category_footer']?>, please let us know by visiting <http://www.fixmystreet.com/contact>.\n"
+"[ This message was sent via FixMyStreet, a project of UKCOD, registered "
+"charity\n"
+"number 1076346. If there is a more appropriate email address for messages "
+"about\n"
+"<?=$values['category_footer']?>, please let us know by visiting <http://www."
+"fixmystreet.com/contact>.\n"
 "This will help improve the service for local people. We\n"
 "also welcome any other feedback you may have. ]\n"
 "\n"
 msgstr ""
-"Subject: Saksrapport: <?=$values['title']?>\n"
+"Subject: Problemrapport: <?=$values['title']?>\n"
 "\n"
-"Dear <?=$values['councils_name']?>,\n"
+"Kjære <?=$values['councils_name']?>,\n"
 "\n"
 "<?=$values['missing']?><?=$values['multiple']?>En bruker av\n"
-"FiksGataMi har sendt in følgende sak,\n"
-" dette er en lokal sak som kan løses av kommunen.\n"
+"FiksGataMi har sendt inn følgende rapport om et lokalt\n"
+"problem som vi tror trenger deres oppmerksomhet.\n"
 "\n"
-"<?=$values['fuzzy']?>, eller komme med innspill i saken,\n"
-"ved å klikke på følgende link:\n"
+"<?=$values['fuzzy']?>, eller for å bidra med en oppdatering om problemet,\n"
+"vennligst besøk følgende lenke:\n"
 "\n"
 "    <?=$values['url']?>\n"
 "\n"
@@ -2131,41 +2954,61 @@ msgstr ""
 "\n"
 "Epost: <?=$values['email']?>\n"
 "\n"
-"<?=$values['phone_line']?><?=$values['category_line']?>Subject: <?=$values['title']?>\n"
+"<?=$values['phone_line']?><?=$values['category_line']?>Tema: <?=$values"
+"['title']?>\n"
 "\n"
-"Detaljer: <?=$values['detail']?>\n"
+"Detajer: <?=$values['detail']?>\n"
+"\n"
+"<?=$values['easting_northing']?>Breddegrad: <?=$values['latitude']?>\n"
+"\n"
+"Lengegrad: <?=$values['longitude']?>\n"
 "\n"
 "<?=$values['closest_address']?>----------\n"
 "\n"
-"Svar på denne eposten vil gå til den som har meldt inn saken via nettsiden.\n"
+"Svar på denne eposten går til brukeren som sendte inn problemet.\n"
 "\n"
-"Med Vennlig Hilsen,  \n"
-"FiksGataMi teamet\n"
+"Vennlig hilsen,  \n"
+"FiksGataMi-gruppa\n"
+"\n"
+"[ Denne meldingen ble sendt inn via FiksGataMi, et prosjekt hos foreningen "
+"NUUG.\n"
+"Hvis det er en mer passende epostadresse for meldinger om\n"
+"<?=$values['category_footer']?>, vær såsnill å gi oss beskjed ved å besøke "
+"<http://www.fiksgatami.no/contact>.\n"
+"Dette vil bidra til å forbedre tjenesten for de lokale folkene. Vi\n"
+"tar også gjerne imot andre tilbakemeldinger om du har noen. ]\n"
 "\n"
 
-#: fixmystreet/templates/emails/submit-eha
+#: templates/emails/submit-eha
 msgid ""
 "Subject: Empty property report\n"
 "\n"
 "Dear Empty Property Officer,\n"
 "\n"
-"This is a new referral of an empty property in your area made by a user of the\n"
-"website ReportEmptyHomes.com; the website user has been told that the case has\n"
-"been referred to you.  We would be grateful if you could do whatever you can to\n"
-"help get this property back into use. We will contact the user in a month and\n"
+"This is a new referral of an empty property in your area made by a user of "
+"the\n"
+"website ReportEmptyHomes.com; the website user has been told that the case "
+"has\n"
+"been referred to you.  We would be grateful if you could do whatever you can "
+"to\n"
+"help get this property back into use. We will contact the user in a month "
+"and\n"
 "again in six months and ask them what has happened to the property.  \n"
 "\n"
-"We'd encourage you to tell us what you have done, and when the property comes\n"
+"We'd encourage you to tell us what you have done, and when the property "
+"comes\n"
 "back into use, by filling in an update against the property referral on the\n"
 "website:\n"
 "\n"
 "    <?=$values['url']?>\n"
 "\n"
 "This gives useful feedback to website users and helps them understand what\n"
-"action you are taking. We will offer advice to the user on other action they\n"
+"action you are taking. We will offer advice to the user on other action "
+"they\n"
 "might take if the property isn't successfully dealt with.  \n"
 "\n"
-"<?=$values['has_photo']?>If you would like help or advice on getting empty properties back into use\n"
+"<?=$values['has_photo']?>If you would like help or advice on getting empty "
+"properties back into use\n"
 "there is lots of useful information on the Empty Homes Agency's website\n"
 "www.EmptyHomes.com - if you have further questions please give us a call. \n"
 "\n"
@@ -2191,7 +3034,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fixmystreet/templates/emails/tms-confirm
+#: templates/emails/tms-confirm
 msgid ""
 "Subject: Confirm your expression of interest in TextMyStreet\n"
 "\n"
@@ -2209,7 +3052,7 @@ msgid ""
 "The FixMyStreet team\n"
 msgstr ""
 
-#: fixmystreet/templates/emails/update-confirm
+#: templates/emails/update-confirm
 msgid ""
 "Subject: Confirm your update on FixMyStreet\n"
 "\n"
@@ -2229,9 +3072,26 @@ msgid ""
 "Yours,  \n"
 "The FixMyStreet team\n"
 msgstr ""
+"Subject: Bekreft din oppdatering på FiksGataMi\n"
+"\n"
+"Hei <?=$values['name']?>,\n"
+"\n"
+"Vennligst klikk på lenken under for å bekrefte oppdateringen du skrev "
+"nettopp:\n"
+"\n"
+"<?=$values['url']?>\n"
+"\n"
+"Hvis du ikke kan klikke på lenken, kopier og lim den inn\n"
+"i adressefeltet på din nettleser..\n"
+"\n"
+"Din oppdatering inneholder:\n"
+"\n"
+"<?=$values['update']?>\n"
+"\n"
+"Vennlig hilsen,  \n"
+"FiksGataMi-gruppa\n"
 
-#: fixmystreet/templates/emails/eha/alert-problem
-#, fuzzy
+#: templates/emails/emptyhomes/alert-problem
 msgid ""
 "Subject: New empty properties on reportemptyhomes.com\n"
 "\n"
@@ -2245,22 +3105,11 @@ msgid ""
 "To stop receiving emails when there are new properties,\n"
 "please follow this link: <?=$values['unsubscribe_url']?>\n"
 msgstr ""
-"Subject: Ny saker på FiksGataMi.no\n"
-"\n"
-"Følgende ny saker er lagt til:\n"
-"\n"
-"<?=$values['data']?>\n"
-"\n"
-"Vennlig hilsen,  \n"
-"FiksGataMi teamet\n"
-"\n"
-"Hvis du ikke ønsker å stå på denne epostlisten,\n"
-"klikk på linken: <?=$values['unsubscribe_url']?>\n"
 
-#: fixmystreet/templates/emails/eha/alert-problem-area
-#, fuzzy
+#: templates/emails/emptyhomes/alert-problem-area
 msgid ""
-"Subject: New empty properties in <?=$values['area_name']?> on reportemptyhomes.com\n"
+"Subject: New empty properties in <?=$values['area_name']?> on "
+"reportemptyhomes.com\n"
 "\n"
 "The following empty properties have been added within\n"
 "<?=$values['area_name']?>:\n"
@@ -2274,26 +3123,14 @@ msgid ""
 "<?=$values['area_name']?>, please follow this link: \n"
 "<?=$values['unsubscribe_url']?>\n"
 msgstr ""
-"Subject: Nye saker i <?=$values['area_name']?> sendt via FiksGataMi.no\n"
-"\n"
-"Følgende saker er sendt til\n"
-"<?=$values['area_name']?>:\n"
-"\n"
-"<?=$values['data']?>\n"
-"\n"
-"Vennlig hilsen,  \n"
-"FiksGataMi teamet\n"
-"\n"
-"Hvis du ikke ønsker å motta epost om saker som er sendt til\n"
-"<?=$values['area_name']?> i fremtiden, klikk på følgende link: \n"
-"<?=$values['unsubscribe_url']?>\n"
 
-#: fixmystreet/templates/emails/eha/alert-problem-council
-#, fuzzy
+#: templates/emails/emptyhomes/alert-problem-council
 msgid ""
-"Subject: New empty properties reported to <?=$values['area_name']?> on reportemptyhomes.com\n"
+"Subject: New empty properties reported to <?=$values['area_name']?> on "
+"reportemptyhomes.com\n"
 "\n"
-"The following empty properties have been reported to <?=$values['area_name']?>:\n"
+"The following empty properties have been reported to <?=$values['area_name']?"
+">:\n"
 "\n"
 "<?=$values['data']?>\n"
 "\n"
@@ -2304,21 +3141,8 @@ msgid ""
 "<?=$values['area_name']?>, please follow this link: \n"
 "<?=$values['unsubscribe_url']?>\n"
 msgstr ""
-"Subject: Nye saker sendt til <?=$values['area_name']?> via FiksGataMi.no\n"
-"\n"
-"Følgende saker er sendt til <?=$values['area_name']?>:\n"
-"\n"
-"<?=$values['data']?>\n"
-"\n"
-"Vennlig hilsen,  \n"
-"FiksGataMi teamet\n"
-"\n"
-"Hvis du ikke ønsker å motta epost om saker som er sendt til\n"
-"<?=$values['area_name']?> i fremtiden, klikk på følgende link: \n"
-"<?=$values['unsubscribe_url']?>\n"
 
-#: fixmystreet/templates/emails/eha/alert-problem-nearby
-#, fuzzy
+#: templates/emails/emptyhomes/alert-problem-nearby
 msgid ""
 "Subject: New nearby empty properties on reportemptyhomes.com\n"
 "\n"
@@ -2332,24 +3156,14 @@ msgid ""
 "To stop receiving emails when there are nearby properties,\n"
 "please follow this link: <?=$values['unsubscribe_url']?>\n"
 msgstr ""
-"Subject: Nye saker i nærheten på FiksGataMi.no\n"
-"\n"
-"Følgende saker i nærheten er sendt via FiksGataMi.no:\n"
-"\n"
-"<?=$values['data']?>\n"
-"\n"
-"Vennlig hilsen,  \n"
-"FiksGataMi teamet\n"
-"\n"
-"Hvis du ikke ønsker å abonnere på epost om problemer i nærheten,\n"
-"klikk på følgende link: <?=$values['unsubscribe_url']?>\n"
 
-#: fixmystreet/templates/emails/eha/alert-problem-ward
-#, fuzzy
+#: templates/emails/emptyhomes/alert-problem-ward
 msgid ""
-"Subject: New empty properties reported to <?=$values['area_name']?> within <?=$values['ward_name']?> on reportemptyhomes.com\n"
+"Subject: New empty properties reported to <?=$values['area_name']?> within <?"
+"=$values['ward_name']?> on reportemptyhomes.com\n"
 "\n"
-"The following empty properties have been reported to <?=$values['area_name']?>\n"
+"The following empty properties have been reported to <?=$values['area_name']?"
+">\n"
 "within <?=$values['ward_name']?>:\n"
 "\n"
 "<?=$values['data']?>\n"
@@ -2361,22 +3175,8 @@ msgid ""
 "<?=$values['area_name']?> within <?=$values['ward_name']?>,\n"
 "please follow this link: <?=$values['unsubscribe_url']?>\n"
 msgstr ""
-"Subject: Nye saker sendt til <?=$values['area_name']?> innenfor <?=$values['ward_name']?> via FiksGataMi.no\n"
-"\n"
-"Følgende saker er sendt til <?=$values['area_name']?>\n"
-"innenfor <?=$values['ward_name']?>:\n"
-"\n"
-"<?=$values['data']?>\n"
-"\n"
-"Vennlig hilsen,  \n"
-"FiksGataMi teamet\n"
-"\n"
-"Hvis du ikke ønsker å abonnere via epost på saker som er sendt til\n"
-"<?=$values['area_name']?> innenfor <?=$values['ward_name']?>,\n"
-"klikk på denne linken: <?=$values['unsubscribe_url']?>\n"
 
-#: fixmystreet/templates/emails/eha/alert-update
-#, fuzzy
+#: templates/emails/emptyhomes/alert-update
 msgid ""
 "Subject: New updates on empty property- '<?=$values['title']?>'\n"
 "\n"
@@ -2392,21 +3192,3 @@ msgid ""
 "To stop receiving emails when there are new updates on this property,\n"
 "please follow this link: <?=$values['unsubscribe_url']?>\n"
 msgstr ""
-"Subject: Oppdateringer på saken - '<?=$values['title']?>'\n"
-"\n"
-"Følgende oppdateringer er lagt til på saken:\n"
-"\n"
-"<?=$values['data']?>\n"
-"\n"
-"For å lese eller svare på disse oppdateringene, klikk på følgende link:\n"
-"    <?=$values['problem_url']?>\n"
-"\n"
-"Svar på denne eposten vil gå til prosjektteamet på FiksGataMi.no, *ikke*\n"
-"til saken og de som leser den.\n"
-"\n"
-"Vennlig hilsen,  \n"
-"FiksGataMi teamet\n"
-"\n"
-"Hvis du ikke ønsker å abonnere på oppdateringer rundt denne saken,\n"
-"klikk på linken: <?=$values['unsubscribe_url']?>\n"
-
diff --git a/perllib/Cobrand.pm b/perllib/Cobrand.pm
index 328445fcc..fa2dd9e88 100644
--- a/perllib/Cobrand.pm
+++ b/perllib/Cobrand.pm
@@ -41,7 +41,7 @@ my %fns = (
     # Return the base url for the cobranded version of the site
     'base_url' => { default => "mySociety::Config::get('BASE_URL')" },
     # Return the text that prompts the user to enter their postcode/place name. Parameter is QUERY
-    'enter_postcode_text' => { default => '_("Enter a nearby GB postcode, or street name and area:")' },
+    'enter_postcode_text' => { default => '""' },
     # Set the language and domain of the site based on the cobrand and host
     'set_lang_and_domain' => { default => '\&default_set_lang_and_domain' },
     # Return HTML for a list of alert options for the cobrand, given QUERY and OPTIONS.
@@ -55,7 +55,7 @@ my %fns = (
     'front_stats' => { default => '\&Problems::front_stats' },
     # Given a STRING ($_[1]) representing a location and a QUERY, return a string that
     # includes any disambiguating information available
-    'disambiguate_location' => { default => '$_[1]' },
+    'disambiguate_location' => { default => '"$_[1]&gl=uk"' },
     # Parameter is EPOCHTIME
     'prettify_epoch' => { default => '0' },
     # Parameters are FORM_NAME, QUERY. Return HTML for any extra needed elements for FORM_NAME
@@ -116,6 +116,9 @@ my %fns = (
     'admin_pages' => { default => '0' },
     # Show the problem creation graph in the admin interface
     'admin_show_creation_graph' => { default => '1' },
+    # The MaPit types this site handles
+    'area_types' => { default => '[qw(DIS LBO MTD UTA CTY COI)]' },
+    'area_min_generation' => { default => '10' },
 );
 
 foreach (keys %fns) {
diff --git a/perllib/Cobrands/Barnet/Util.pm b/perllib/Cobrands/Barnet/Util.pm
index 8ce296aaf..eb8b91649 100644
--- a/perllib/Cobrands/Barnet/Util.pm
+++ b/perllib/Cobrands/Barnet/Util.pm
@@ -79,7 +79,7 @@ sub council_check {
     }
     my $url = 'http://www.fixmystreet.com/';
     $url .= 'alert' if $context eq 'alert';
-    $url .= '?pc=' . URI::Escape::uri_escape_utf8($q->param('pc')) if $q->param('pc');
+    $url .= '?pc=' . URI::Escape::uri_escape($q->param('pc')) if $q->param('pc');
     my $error_msg = "That location is not covered by Barnet.
 Please visit <a href=\"$url\">the main FixMyStreet site</a>.";
     return (0, $error_msg);
diff --git a/perllib/Cobrands/Emptyhomes/Util.pm b/perllib/Cobrands/Emptyhomes/Util.pm
index acb870695..d23857f50 100644
--- a/perllib/Cobrands/Emptyhomes/Util.pm
+++ b/perllib/Cobrands/Emptyhomes/Util.pm
@@ -33,6 +33,10 @@ sub admin_base_url {
     return 'https://secure.mysociety.org/admin/emptyhomes/';
 }
 
+sub area_types {
+    return qw(DIS LBO MTD UTA LGD COI); # No CTY
+}
+
 =item set_lang_and_domain LANG UNICODE
 
 Set the language and text domain for the site based on the query and host. 
diff --git a/perllib/Cobrands/Fiksgatami/Util.pm b/perllib/Cobrands/Fiksgatami/Util.pm
new file mode 100644
index 000000000..9fb448be5
--- /dev/null
+++ b/perllib/Cobrands/Fiksgatami/Util.pm
@@ -0,0 +1,46 @@
+#!/usr/bin/perl -w
+#
+# Util.pm:
+# Fiksgatami cobranding for FixMyStreet.
+#
+# Copyright (c) 2011 UK Citizens Online Democracy. All rights reserved.
+# Email: matthew@mysociety.org. WWW: http://www.mysociety.org
+
+package Cobrands::Fiksgatami::Util;
+use strict;
+use Carp;
+
+sub new {
+    my $class = shift;
+    return bless {}, $class;
+}
+
+sub set_lang_and_domain {
+    my ($self, $lang, $unicode) = @_;
+    mySociety::Locale::negotiate_language('en-gb,English,en_GB|nb,Norwegian,nb_NO', 'nb');
+    mySociety::Locale::gettext_domain('FixMyStreet', $unicode);
+    mySociety::Locale::change(); 
+}
+
+sub enter_postcode_text {
+    my ($self, $q) = @_;
+    return _('Enter a nearby postcode, or street name and area:');
+}
+
+# Is also adding language parameter
+sub disambiguate_location {
+    my ($self, $s, $q) = @_;
+    $s = "hl=no&gl=no&$s";
+    return $s;
+}
+
+sub area_types {
+    return ( 'NKO', 'NFY' );
+}
+
+sub area_min_generation {
+    return '';
+}
+
+1;
+
diff --git a/perllib/FixMyStreet/Alert.pm b/perllib/FixMyStreet/Alert.pm
index 90a5b1aaa..6b50e62e6 100644
--- a/perllib/FixMyStreet/Alert.pm
+++ b/perllib/FixMyStreet/Alert.pm
@@ -30,7 +30,6 @@ use mySociety::DBHandle qw(dbh);
 use mySociety::Email;
 use mySociety::EmailUtil;
 use mySociety::Gaze;
-use mySociety::GeoUtil;
 use mySociety::Locale;
 use mySociety::MaPit;
 use mySociety::Random qw(random_bytes);
@@ -91,7 +90,7 @@ sub delete ($) {
 sub email_alerts ($) {
     my ($testing_email) = @_;
     my $url; 
-    my $q = dbh()->prepare("select * from alert_type where ref not like 'local_problems%'");
+    my $q = dbh()->prepare("select * from alert_type where ref not like '%local_problems%'");
     $q->execute();
     my $testing_email_clause = '';
     while (my $alert_type = $q->fetchrow_hashref) {
@@ -136,18 +135,18 @@ sub email_alerts ($) {
             # call checks if this is the host that sends mail for this cobrand.
             next unless (Cobrand::email_host($row->{alert_cobrand}));
 
-            # create problem status message for the templates
-            $data{state_message} =
-              $row->{state} eq 'fixed'
-              ? _("This report is currently marked as fixed.")
-              : _("This report is currently marked as open.");
-
             dbh()->do('insert into alert_sent (alert_id, parameter) values (?,?)', {}, $row->{alert_id}, $row->{item_id});
             if ($last_alert_id && $last_alert_id != $row->{alert_id}) {
                 _send_aggregated_alert_email(%data);
                 %data = ( template => $alert_type->{template}, data => '' );
             }
 
+            # create problem status message for the templates
+            $data{state_message} =
+              $row->{state} eq 'fixed'
+              ? _("This report is currently marked as fixed.")
+              : _("This report is currently marked as open.");
+
             $url = Cobrand::base_url_for_emails($row->{alert_cobrand}, $row->{alert_cobrand_data});
             if ($row->{item_text}) {
                 $data{problem_url} = $url . "/report/" . $row->{id};
@@ -307,7 +306,9 @@ sub generate_rss ($$$;$$$$) {
         if ($display_photos && $row->{photo}) {
             $item{description} .= ent("\n<br><img src=\"". Cobrand::url($cobrand, $url, $http_q) . "/photo?id=$row->{id}\">");
         }
-        $item{description} .= ent("\n<br><a href='$cobrand_url'>Report on FixMyStreet</a>");
+        my $recipient_name = Cobrand::contact_name($cobrand);
+        $item{description} .= ent("\n<br><a href='$cobrand_url'>" .
+            sprintf(_("Report on %s"), $recipient_name) . "</a>");
 
         if ($row->{latitude} || $row->{longitude}) {
             $item{georss} = { point => "$row->{latitude} $row->{longitude}" };
diff --git a/perllib/FixMyStreet/Geocode.pm b/perllib/FixMyStreet/Geocode.pm
index 0379169b8..17a4d8539 100644
--- a/perllib/FixMyStreet/Geocode.pm
+++ b/perllib/FixMyStreet/Geocode.pm
@@ -9,6 +9,7 @@
 package FixMyStreet::Geocode;
 
 use strict;
+use Encode;
 use Error qw(:try);
 use File::Slurp;
 use File::Path ();
@@ -18,8 +19,9 @@ use URI::Escape;
 
 use Cobrand;
 use Page;
+use Utils;
 use mySociety::Config;
-use mySociety::GeoUtil;
+use mySociety::Locale;
 use mySociety::MaPit;
 use mySociety::PostcodeUtil;
 use mySociety::Web qw(NewURL);
@@ -38,15 +40,18 @@ BEGIN {
 sub lookup {
     my ($s, $q) = @_;
     my ($latitude, $longitude, $error);
-    if ($s =~ /^\d+$/) {
-        $error = 'FixMyStreet is a UK-based website that currently works in England, Scotland, and Wales. Please enter either a postcode, or a Great British street name and area.';
-    } elsif (mySociety::PostcodeUtil::is_valid_postcode($s)) {
-        my $location = mySociety::MaPit::call('postcode', $s);
-        unless ($error = Page::mapit_check_error($location)) {
-            $latitude  = $location->{wgs84_lat};
-            $longitude = $location->{wgs84_lon};
+    if (mySociety::Config::get('COUNTRY') eq 'GB') {
+        if ($s =~ /^\d+$/) {
+            $error = 'FixMyStreet is a UK-based website that currently works in England, Scotland, and Wales. Please enter either a postcode, or a Great British street name and area.';
+        } elsif (mySociety::PostcodeUtil::is_valid_postcode($s)) {
+            my $location = mySociety::MaPit::call('postcode', $s);
+            unless ($error = Page::mapit_check_error($location)) {
+                $latitude  = $location->{wgs84_lat};
+                $longitude = $location->{wgs84_lon};
+            }
         }
-    } else {
+    }
+    unless ($error || defined $latitude) {
         ($latitude, $longitude, $error) = FixMyStreet::Geocode::string($s, $q);
     }
     return ($latitude, $longitude, $error);
@@ -61,6 +66,16 @@ sub geocoded_string_coordinates {
     } elsif ( $js =~ /"coordinates" *: *\[ *(.*?), *(.*?),/ ) {
         $longitude = $1;
         $latitude  = $2;
+        if (mySociety::Config::get('COUNTRY') eq 'GB') {
+            try {
+                my ($easting, $northing) = Utils::convert_latlon_to_en( $latitude, $longitude );
+            } catch Error::Simple with {
+                mySociety::Locale::pop(); # We threw exception, so it won't have happened.
+                $error = shift;
+                $error = _('That location does not appear to be in Britain; please try again.')
+                    if $error =~ /out of the area covered/;
+            }
+        }
     }
     return ($latitude, $longitude, $error);
 }
@@ -73,8 +88,9 @@ sub geocoded_string_coordinates {
 # of the site. 
 sub string {
     my ($s, $q) = @_;
+    $s = decode_utf8($s);
     $s = lc($s);
-    $s =~ s/[^-&0-9a-z ']/ /g;
+    $s =~ s/[^-&\w ']/ /g;
     $s =~ s/\s+/ /g;
     $s = URI::Escape::uri_escape_utf8($s);
     $s = Cobrand::disambiguate_location(Page::get_cobrand($q), "q=$s", $q);
@@ -86,8 +102,9 @@ sub string {
     if (-s $cache_file) {
         $js = File::Slurp::read_file($cache_file);
     } else {
-        $url .= ',+UK' unless $url =~ /united\++kingdom$/ || $url =~ /uk$/i;
-        $url .= '&sensor=false&gl=uk&key=' . mySociety::Config::get('GOOGLE_MAPS_API_KEY');
+        $url .= ',+UK' unless $url =~ /united\++kingdom$/ || $url =~ /uk$/i
+            || mySociety::Config::get('COUNTRY') ne 'GB';
+        $url .= '&sensor=false&key=' . mySociety::Config::get('GOOGLE_MAPS_API_KEY');
         $js = LWP::Simple::get($url);
         File::Path::mkpath($cache_dir);
         File::Slurp::write_file($cache_file, $js) if $js && $js !~ /"code":6[12]0/;
@@ -130,6 +147,7 @@ sub list_choices {
     my $out = '<p>' . $message . '</p>';
     my $choice_list = '<ul>';
     foreach my $choice (@$choices) {
+        $choice = decode_utf8($choice);
         $choice =~ s/, United Kingdom//;
         $choice =~ s/, UK//;
         $url =  Cobrand::url($cobrand, NewURL($q, -retain => 1, -url => $page, 'pc' => $choice), $q);  
diff --git a/perllib/FixMyStreet/Map.pm b/perllib/FixMyStreet/Map.pm
index 0902914dd..a9978103f 100644
--- a/perllib/FixMyStreet/Map.pm
+++ b/perllib/FixMyStreet/Map.pm
@@ -14,7 +14,6 @@ use Problems;
 use Cobrand;
 use mySociety::Config;
 use mySociety::Gaze;
-use mySociety::GeoUtil qw(national_grid_to_wgs84);
 use mySociety::Locale;
 use mySociety::Web qw(ent NewURL);
 use Utils;
diff --git a/perllib/FixMyStreet/Map/OSM.pm b/perllib/FixMyStreet/Map/OSM.pm
index ccbb3ca53..820a4ce63 100644
--- a/perllib/FixMyStreet/Map/OSM.pm
+++ b/perllib/FixMyStreet/Map/OSM.pm
@@ -15,13 +15,12 @@ sub header_js {
     return '
 <script type="text/javascript" src="http://openlayers.org/api/OpenLayers.js"></script>
 <script type="text/javascript" src="/js/map-OpenStreetMap.js"></script>
-<script type="text/javascript" src="/js/OpenLayers.Projection.OrdnanceSurvey.js"></script>
 ';
 }
 
 # display_map Q PARAMS
 # PARAMS include:
-# EASTING, NORTHING for the centre point of the map
+# latitude, longitude for the centre point of the map
 # TYPE is 1 if the map is clickable, 2 if clickable and has a form upload,
 #     0 if not clickable
 # PINS is array of pins to show, location and colour
@@ -31,16 +30,23 @@ sub display_map {
     $params{pre} ||= '';
     $params{post} ||= '';
 
+    my @pins;
     foreach my $pin (@{$params{pins}}) {
+        $pin->[3] ||= '';
+        push @pins, "[ $pin->[0], $pin->[1], '$pin->[2]', '$pin->[3]' ]";
     }
+    my $pins = join(",\n", @pins);
 
     my $out = FixMyStreet::Map::header($q, $params{type});
     my $copyright = _('Map &copy; <a href="http://www.openstreetmap.org/">OpenStreetMap</a> and contributors, <a href="http://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>');
     $out .= <<EOF;
+<input type="hidden" name="latitude" id="fixmystreet.latitude" value="$params{latitude}">
+<input type="hidden" name="longitude" id="fixmystreet.longitude" value="$params{longitude}">
 <script type="text/javascript">
 var fixmystreet = {
-    'easting': $params{easting},
-    'northing': $params{northing},
+    'latitude': $params{latitude},
+    'longitude': $params{longitude},
+    'pins': [ $pins ],
     'map_type': OpenLayers.Layer.OSM.Mapnik
 }
 </script>
diff --git a/perllib/FixMyStreet/Map/Tilma/Original.pm b/perllib/FixMyStreet/Map/Tilma/Original.pm
index 81b123b30..b6d24fd6a 100644
--- a/perllib/FixMyStreet/Map/Tilma/Original.pm
+++ b/perllib/FixMyStreet/Map/Tilma/Original.pm
@@ -12,13 +12,14 @@ use strict;
 use LWP::Simple;
 
 use Cobrand;
-use mySociety::Web qw(ent NewURL);
 use mySociety::GeoUtil;
+use mySociety::Locale;
+use mySociety::Web qw(ent NewURL);
 use Utils;
 
 sub _ll_to_en {
     my ($lat, $lon) = @_;
-    return mySociety::GeoUtil::wgs84_to_national_grid( $lat, $lon, 'G' );    
+    return Utils::convert_latlon_to_en( $lat, $lon );
 }
 
 sub header_js {
@@ -268,7 +269,7 @@ sub click_to_os {
 # tile they were), convert to WGS84 and return.
 sub click_to_wgs84 {
     my ( $easting, $northing ) = FixMyStreet::Map::click_to_os(@_);
-    my ( $lat, $lon ) = national_grid_to_wgs84( $easting, $northing, 'G' );
+    my ( $lat, $lon ) = mySociety::GeoUtil::national_grid_to_wgs84( $easting, $northing, 'G' );
     return ( $lat, $lon );
 }
 
diff --git a/perllib/Page.pm b/perllib/Page.pm
index fc7127a78..279c5a79a 100644
--- a/perllib/Page.pm
+++ b/perllib/Page.pm
@@ -15,6 +15,7 @@ use strict;
 use Carp;
 use mySociety::CGIFast qw(-no_xhtml);
 use Data::Dumper;
+use Encode;
 use Error qw(:try);
 use File::Slurp;
 use HTTP::Date; # time2str
@@ -49,7 +50,9 @@ use FixMyStreet::Map;
 my $lastmodified;
 
 sub do_fastcgi {
-    my ($func, $lm) = @_;
+    my ($func, $lm, $binary) = @_;
+
+    binmode(STDOUT, ":utf8") unless $binary;
 
     try {
         my $W = new mySociety::WatchUpdate();
@@ -83,7 +86,7 @@ sub report_error {
 
     my $msg_br = join '<br><br>', split m{\n}, $msg;
 
-    print "Status: 500\nContent-Type: text/html; charset=iso-8859-1\n\n",
+    print "Status: 500\nContent-Type: text/html; charset=utf-8\n\n",
             qq(<html><head><title>$somethingwrong</title></head></html>),
             q(<body>),
             qq(<h1>$somethingwrong</h1>),
@@ -111,7 +114,7 @@ sub microsite {
     my $lang;
     $lang = 'cy' if $host =~ /cy/;
     $lang = 'en-gb' if $host =~ /^en\./;
-    Cobrand::set_lang_and_domain(get_cobrand($q), $lang);
+    Cobrand::set_lang_and_domain(get_cobrand($q), $lang, 1);
 
     Problems::set_site_restriction($q);
     Memcached::set_namespace(mySociety::Config::get('BCI_DB_NAME') . ":");
@@ -185,9 +188,8 @@ sub template_vars ($%) {
     my $lang_url = base_url_with_lang($q, 1);
     $lang_url .= $ENV{REQUEST_URI} if $ENV{REQUEST_URI};
 
-    my $site_title = $q->{site} eq 'fixmystreet'
-        ? _('FixMyStreet')
-        : Cobrand::site_title(get_cobrand($q));
+    my $site_title = Cobrand::site_title(get_cobrand($q));
+    $site_title = _('FixMyStreet') unless $site_title;
 
     %vars = (
         'report' => _('Report a problem'),
@@ -202,7 +204,7 @@ sub template_vars ($%) {
         'lang_url' => $lang_url,
         'title' => $params{title},
         'rss' => '',
-        map_js => FixMyStreet::Map::header_js(),
+        map_js => $params{js} || '',
     );
 
     if ($params{rss}) {
@@ -213,12 +215,10 @@ sub template_vars ($%) {
         $vars{robots} = '<meta name="robots" content="' . $params{robots} . '">';
     }
 
-    if ($q->{site} eq 'fixmystreet') {
-        my $home = !$params{title} && $ENV{SCRIPT_NAME} eq '/index.cgi' && !$ENV{QUERY_STRING};
-        $vars{heading_element_start} = $home ? '<h1 id="header">' : '<div id="header"><a href="/">';
-        $vars{heading} = _('Fix<span id="my">My</span>Street');
-        $vars{heading_element_end} = $home ? '</h1>' : '</a></div>';
-    }
+    my $home = !$params{title} && $ENV{SCRIPT_NAME} eq '/index.cgi' && !$ENV{QUERY_STRING};
+    $vars{heading_element_start} = $home ? '<h1 id="header">' : '<div id="header"><a href="/">';
+    $vars{heading} = _('Fix<span id="my">My</span>Street');
+    $vars{heading_element_end} = $home ? '</h1>' : '</a></div>';
 
     return \%vars;
 }
@@ -260,22 +260,6 @@ sub template_include {
     return $template->fill_in(HASH => \%params);
 }
 
-=item template_header TEMPLATE Q ROOT PARAMS
-
-Return HTML for the templated top of a page, given a 
-template name, request, template root, and parameters.
-
-=cut
-
-sub template_header($$$%) {
-    my ($template, $q, $template_root, %params) = @_;
-    $template = $q->{site} eq 'fixmystreet'
-        ? 'header'
-        : $template . '-header';
-    my $vars = template_vars($q, %params);
-    return template_include($template, $q, $template_root, %$vars);
-}
-
 =item header Q [PARAM VALUE ...]
 
 Return HTML for the top of the page, given PARAMs (TITLE is required).
@@ -287,7 +271,7 @@ sub header ($%) {
     my $default_params = Cobrand::header_params(get_cobrand($q), $q, %params);
     my %default_params = %{$default_params};
     %params = (%default_params, %params);
-    my %permitted_params = map { $_ => 1 } qw(title rss expires lastmodified template cachecontrol context status_code robots);
+    my %permitted_params = map { $_ => 1 } qw(title rss expires lastmodified template cachecontrol context status_code robots js);
     foreach (keys %params) {
         croak "bad parameter '$_'" if (!exists($permitted_params{$_}));
     }
@@ -305,8 +289,8 @@ sub header ($%) {
     $params{title} = ent($params{title});
     $params{lang} = $mySociety::Locale::lang;
 
-    my $template = template($q, %params);
-    my $html = template_header($template, $q, template_root($q), %params);
+    my $vars = template_vars($q, %params);
+    my $html = template_include('header', $q, template_root($q), %$vars);
     my $cache_val = $default_params{cachecontrol};
     if (mySociety::Config::get('STAGING_SITE')) {
         $html .= '<p class="error">' . _("This is a developer site; things might break at any time, and the database will be periodically deleted.") . '</p>';
@@ -320,10 +304,28 @@ sub header ($%) {
 sub footer {
     my ($q, %params) = @_;
 
-    if ($q->{site} ne 'fixmystreet') {
-        my $template = template($q, %params) . '-footer';
-        my $template_root = template_root($q);
-        my $html = template_include($template, $q, $template_root, %params);
+    my $pc = $q->param('pc') || '';
+    $pc = '?pc=' . URI::Escape::uri_escape($pc) if $pc;
+
+    my $creditline = _('Built by <a href="http://www.mysociety.org/">mySociety</a>, using some <a href="http://github.com/mysociety/fixmystreet">clever</a>&nbsp;<a href="https://secure.mysociety.org/cvstrac/dir?d=mysociety/services/TilMa">code</a>.');
+    if (mySociety::Config::get('COUNTRY') eq 'NO') {
+        $creditline = _('Built by <a href="http://www.mysociety.org/">mySociety</a> and maintained by <a href="http://www.nuug.no/">NUUG</a>, using some <a href="http://github.com/mysociety/fixmystreet">clever</a>&nbsp;<a href="https://secure.mysociety.org/cvstrac/dir?d=mysociety/services/TilMa">code</a>.');
+    }
+
+    %params = (%params,
+        navigation => _('Navigation'),
+        report => _("Report a problem"),
+        reports => _("All reports"),
+        alerts => _("Local alerts"),
+        help => _("Help"),
+        contact => _("Contact"),
+        pc => $pc,
+        orglogo => _('<a href="http://www.mysociety.org/"><img id="logo" width="133" height="26" src="/i/mysociety-dark.png" alt="View mySociety.org"><span id="logoie"></span></a>'),
+        creditline => $creditline,
+    );
+
+    my $html = template_include('footer', $q, template_root($q), %params);
+    if ($html) {
         my $lang = $mySociety::Locale::lang;
         if ($q->{site} eq 'emptyhomes' && $lang eq 'cy') {
             $html =~ s/25 Walter Road<br>Swansea/25 Heol Walter<br>Abertawe/;
@@ -331,9 +333,6 @@ sub footer {
         return $html;
     }
 
-    my $pc = $q->param('pc') || '';
-    $pc = "?pc=" . ent($pc) if $pc;
-
     my $piwik = "";
     if (mySociety::Config::get('BASE_URL') eq "http://www.fixmystreet.com") {
         $piwik = <<EOF;
@@ -352,29 +351,20 @@ piwikTracker.enableLinkTracking();
 EOF
     }
 
-    my $navigation = _('Navigation');
-    my $report = _("Report a problem");
-    my $reports = _("All reports");
-    my $alerts = _("Local alerts");
-    my $help = _("Help");
-    my $contact = _("Contact");
-    my $orglogo = _('<a href="http://www.mysociety.org/"><img id="logo" width="133" height="26" src="/i/mysociety-dark.png" alt="View mySociety.org"><span id="logoie"></span></a>');
-    my $creditline = _('Built by <a href="http://www.mysociety.org/">mySociety</a>, using some <a href="http://github.com/mysociety/fixmystreet">clever</a>&nbsp;<a href="https://secure.mysociety.org/cvstrac/dir?d=mysociety/services/TilMa">code</a>.');
-
     return <<EOF;
 </div></div>
-<h2 class="v">$navigation</h2>
+<h2 class="v">$params{navigation}</h2>
 <ul id="navigation">
-<li><a href="/">$report</a></li>
-<li><a href="/reports">$reports</a></li>
-<li><a href="/alert$pc">$alerts</a></li>
-<li><a href="/faq">$help</a></li>
-<li><a href="/contact">$contact</a></li>
+<li><a href="/">$params{report}</a></li>
+<li><a href="/reports">$params{reports}</a></li>
+<li><a href="/alert$params{pc}">$params{alerts}</a></li>
+<li><a href="/faq">$params{help}</a></li>
+<li><a href="/contact">$params{contact}</a></li>
 </ul>
 
-$orglogo
+$params{orglogo}
 
-<p id="footer">$creditline</p>
+<p id="footer">$params{creditline}</p>
 
 $piwik
 
@@ -518,17 +508,17 @@ sub prettify_duration {
         return _('less than a minute') if $s == 0;
     }
     my @out = ();
-    _part(\$s, 60*60*24*7, _('week'), \@out);
-    _part(\$s, 60*60*24, _('day'), \@out);
-    _part(\$s, 60*60, _('hour'), \@out);
-    _part(\$s, 60, _('minute'), \@out);
+    _part(\$s, 60*60*24*7, _('%d week'), _('%d weeks'), \@out);
+    _part(\$s, 60*60*24, _('%d day'), _('%d days'), \@out);
+    _part(\$s, 60*60, _('%d hour'), _('%d hours'), \@out);
+    _part(\$s, 60, _('%d minute'), _('%d minutes'), \@out);
     return join(', ', @out);
 }
 sub _part {
-    my ($s, $m, $w, $o) = @_;
+    my ($s, $m, $w1, $w2, $o) = @_;
     if ($$s >= $m) {
         my $i = int($$s / $m);
-        push @$o, "$i $w" . ($i != 1 ? 's' : '');
+        push @$o, sprintf(mySociety::Locale::nget($w1, $w2, $i), $i);
         $$s -= $i * $m;
     }
 }
@@ -688,10 +678,16 @@ sub mapit_check_error {
 }
 
 sub short_name {
-    my $name = shift;
+    my ($area, $info) = @_;
     # Special case Durham as it's the only place with two councils of the same name
-    return 'Durham+County' if ($name eq 'Durham County Council');
-    return 'Durham+City' if ($name eq 'Durham City Council');
+    # And some places in Norway
+    return 'Durham+County' if $area->{name} eq 'Durham County Council';
+    return 'Durham+City' if $area->{name} eq 'Durham City Council';
+    if ($area->{name} =~ /^(Os|Nes|V\xe5ler|Sande|B\xf8|Her\xf8y)$/) {
+        my $parent = $info->{$area->{parent_area}}->{name};
+        return URI::Escape::uri_escape_utf8("$area->{name}, $parent");
+    }
+    my $name = $area->{name};
     $name =~ s/ (Borough|City|District|County) Council$//;
     $name =~ s/ Council$//;
     $name =~ s/ & / and /;
diff --git a/perllib/Problems.pm b/perllib/Problems.pm
index 8c6eeccad..127d88a30 100644
--- a/perllib/Problems.pm
+++ b/perllib/Problems.pm
@@ -12,6 +12,7 @@
 package Problems;
 
 use strict;
+use Encode;
 use Memcached;
 use mySociety::DBHandle qw/dbh select_all/;
 use mySociety::Locale;
@@ -93,12 +94,14 @@ sub recent_photos {
         my $key = "recent_photos:$site_key:$num:$lat:$lon:$dist";
         $probs = Memcached::get($key);
         unless ($probs) {
-            $probs = select_all("select id, title
+            $probs = mySociety::Locale::in_gb_locale {
+                select_all("select id, title
                 from problem_find_nearby(?, ?, ?) as nearby, problem
                 where nearby.problem_id = problem.id
                 and state in ('confirmed', 'fixed') and photo is not null
                 $site_restriction
                 order by confirmed desc limit $num", $lat, $lon, $dist);
+            };
             Memcached::set($key, $probs, 3600);
         }
     } else {
@@ -259,7 +262,7 @@ sub problems_matching_criteria {
     my $areas_info = mySociety::MaPit::call('areas', \@councils);
     foreach my $problem (@$problems){
         if ($problem->{council}) {
-             my @council_names = map { $areas_info->{$_}->{name}} @{$problem->{council}} ;
+             my @council_names = map { $areas_info->{$_}->{name} } @{$problem->{council}} ;
              $problem->{council} = join(' and ', @council_names);
         }
     }
diff --git a/perllib/Utils.pm b/perllib/Utils.pm
index d54e081c8..21994d20b 100644
--- a/perllib/Utils.pm
+++ b/perllib/Utils.pm
@@ -14,6 +14,7 @@ package Utils;
 use strict;
 use mySociety::DBHandle qw(dbh);
 use mySociety::GeoUtil;
+use mySociety::Locale;
 
 sub workaround_pg_bytea {
     my ( $st, $img_idx, @elements ) = @_;
@@ -33,11 +34,30 @@ sub workaround_pg_bytea {
     $s->execute();
 }
 
+=head2 convert_latlon_to_en
+
+    ( $easting, $northing ) = Utils::convert_en_to_latlon( $latitude, $longitude );
+
+Takes the WGS84 latitude and longitude and returns OSGB36 easting and northing.
+
+=cut
+
+sub convert_latlon_to_en {
+    my ( $latitude, $longitude ) = @_;
+
+    my ( $easting, $northing ) =
+        mySociety::Locale::in_gb_locale {
+            mySociety::GeoUtil::wgs84_to_national_grid( $latitude, $longitude, 'G' );
+        };
+
+    return ( $easting, $northing );
+}
+
 =head2 convert_en_to_latlon
 
     ( $latitude, $longitude ) = Utils::convert_en_to_latlon( $easting, $northing );
 
-Takes the easting and northing and returns latitude and longitude.
+Takes the OSGB36 easting and northing and returns WGS84 latitude and longitude.
 
 =cut
 
@@ -56,8 +76,8 @@ sub convert_en_to_latlon {
 
     ( $lat, $lon ) = Utils::convert_en_to_latlon( $easting, $northing );
 
-Takes the easting and northing and returns latitude and longitude (truncated
-using C<Utils::truncate_coordinate>).
+Takes the OSGB36 easting and northing and returns WGS84 latitude and longitude
+(truncated using C<Utils::truncate_coordinate>).
 
 =cut
 
@@ -74,13 +94,15 @@ sub convert_en_to_latlon_truncated {
     $short = Utils::truncate_coordinate( $long );
 
 Given a long coordinate returns a shorter one - rounded to 6 decimal places -
-which is < 1m at the equator.
+which is < 1m at the equator, if you're using WGS84 lat/lon.
 
 =cut
 
 sub truncate_coordinate {
     my $in = shift;
-    my $out = sprintf( '%0.6f', $in );
+    my $out = mySociety::Locale::in_gb_locale {
+        sprintf( '%0.6f', $in );
+    };
     $out =~ s{\.?0+\z}{} if $out =~ m{\.};
     return $out;
 }
diff --git a/t/Cobrand.t b/t/Cobrand.t
index f6c2e9c87..1f38ec605 100755
--- a/t/Cobrand.t
+++ b/t/Cobrand.t
@@ -51,7 +51,7 @@ sub test_disambiguate_location {
     $q = new MockQuery('nosite');
     $s = 'London Road';
     $s = Cobrand::disambiguate_location('nosite', $s, $q);
-    ok($s eq 'London Road', 'should return location string as passed if no cobrand module exists') or diag("Got $s");
+    ok($s eq 'London Road&gl=uk', 'should return location string as passed if no cobrand module exists') or diag("Got $s");
   
 }
 
diff --git a/t/Page.t b/t/Page.t
index f57c56092..a1ae7f3aa 100755
--- a/t/Page.t
+++ b/t/Page.t
@@ -71,9 +71,12 @@ sub test_header() {
 
     # Test that template passed is rendered 
     $params{'template'} = 'test';    
-    $html = Page::template_header('test', $q, '/../t/templates/' . $q->{site} . '/', title=>'My test title', lang=>'en-gb');	
+    $html = Page::template_include('test-header', $q,
+        '/../t/templates/' . $q->{site} . '/',
+        title => 'My test title', lang => 'en-gb'
+    );	
+     
     like  ($html, qr/My test header template/, 'named template rendered ok');
- 
 
     return 1;
 }
diff --git a/templates/website/cobrands/barnet/barnet-footer b/templates/website/cobrands/barnet/footer
index f6963e553..f6963e553 100644
--- a/templates/website/cobrands/barnet/barnet-footer
+++ b/templates/website/cobrands/barnet/footer
diff --git a/templates/website/cobrands/barnet/barnet-header b/templates/website/cobrands/barnet/header
index 67619b417..67619b417 100644
--- a/templates/website/cobrands/barnet/barnet-header
+++ b/templates/website/cobrands/barnet/header
diff --git a/templates/website/cobrands/emptyhomes/emptyhomes-footer b/templates/website/cobrands/emptyhomes/footer
index f93ad0102..f93ad0102 100644
--- a/templates/website/cobrands/emptyhomes/emptyhomes-footer
+++ b/templates/website/cobrands/emptyhomes/footer
diff --git a/templates/website/cobrands/emptyhomes/emptyhomes-header b/templates/website/cobrands/emptyhomes/header
index a9ed5ce51..a9ed5ce51 100644
--- a/templates/website/cobrands/emptyhomes/emptyhomes-header
+++ b/templates/website/cobrands/emptyhomes/header
diff --git a/templates/website/cobrands/fiksgatami/footer b/templates/website/cobrands/fiksgatami/footer
new file mode 100644
index 000000000..2221d99a8
--- /dev/null
+++ b/templates/website/cobrands/fiksgatami/footer
@@ -0,0 +1,16 @@
+</div></div>
+<h2 class="v">$navigation</h2>
+<ul id="navigation">
+<li><a href="/">{{ $report }}</a></li>
+<li><a href="/reports">{{ $reports }}</a></li>
+<li><a href="/alert{{ $pc }}">{{ $alerts }}</a></li>
+<li><a href="/faq">{{ $help }}</a></li>
+<li><a href="/contact">{{ $contact }}</a></li>
+</ul>
+
+{{ $orglogo }}
+
+<p id="footer">{{ $creditline }}</p>
+
+</body>
+</html>
diff --git a/templates/website/cobrands/fiksgatami/header b/templates/website/cobrands/fiksgatami/header
new file mode 100644
index 000000000..cb1396556
--- /dev/null
+++ b/templates/website/cobrands/fiksgatami/header
@@ -0,0 +1,23 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="{{ $lang_code }}">
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+        <script type="text/javascript" src="/yui/utilities.js"></script>
+        <script type="text/javascript" src="/js.js"></script>
+        {{ $map_js }}
+        {{ $robots }}
+
+        <title>{{ $title }}{{ $site_title }}</title>
+        <style type="text/css">
+            @import url("/css/core.css");
+            @import url("/css/main.css");
+            @import url("/cobrands/fiksgatami/css.css");
+        </style>
+        <!--[if LT IE 7]>
+             <style type="text/css">@import url("/css/ie6.css");</style>
+        <![endif]-->
+        {{ $rss }}
+    </head>
+    <body>
+        {{ $heading_element_start }}{{ $heading }}{{ $heading_element_end }}
+        <div id="wrapper"><div id="content">
diff --git a/templates/website/problem b/templates/website/problem
index aba6b009c..4debc1d2e 100644
--- a/templates/website/problem
+++ b/templates/website/problem
@@ -37,7 +37,7 @@
 <input type="hidden" name="submit_update" value="1">
 <input type="hidden" name="id" value="{{ $input_h{id} }}">
 <div><label for="form_name">{{ $name_label }}</label>
-<input type="text" name="name" id="form_name" value="{{ $input_h{name} }}" size="20"> (optional)</div>
+<input type="text" name="name" id="form_name" value="{{ $input_h{name} }}" size="20"> {{ $optional }}</div>
 {{ if ( $field_errors{email}) {
     "<div class='form-error'>$field_errors{email}</div>";
 } }}
diff --git a/web-admin/index.cgi b/web-admin/index.cgi
index 1044f07c5..02ba5d710 100755
--- a/web-admin/index.cgi
+++ b/web-admin/index.cgi
@@ -18,6 +18,7 @@ use strict;
 use FindBin;
 use lib "$FindBin::Bin/../perllib";
 use lib "$FindBin::Bin/../commonlib/perllib";
+use Encode;
 use POSIX qw(strftime);
 use Digest::MD5 qw(md5_hex);
 
@@ -64,10 +65,10 @@ sub allowed_pages($) {
     my $pages = Cobrand::admin_pages($cobrand);
     if (!$pages) {
         $pages = {
-             'summary' => ['Summary', 0],
-             'councilslist' => ['Council contacts', 1],
+             'summary' => [_('Summary'), 0],
+             'councilslist' => [_('Council contacts'), 1],
              'reports' => ['Reports', 2],
-             'timeline' => ['Timeline', 3],
+             'timeline' => [_('Timeline'), 3],
              'councilcontacts' => [undef, undef],        
              'counciledit' => [undef, undef], 
              'report_edit' => [undef, undef], 
@@ -80,10 +81,11 @@ sub allowed_pages($) {
 sub html_head($$) {
     my ($q, $title) = @_;
     my $ret = $q->header(-type => 'text/html', -charset => 'utf-8');
+    my $site_title = _('FixMyStreet administration');
     $ret .= <<END;
 <html>
 <head>
-<title>$title - FixMyStreet administration</title>
+<title>$title - $site_title</title>
 <style type="text/css">
 dt { clear: left; float: left; font-weight: bold; }
 dd { margin-left: 8em; }
@@ -95,7 +97,7 @@ END
     my $pages = allowed_pages($q);    
     my @links = sort {$pages->{$a}[1] <=> $pages->{$b}[1]}  grep {$pages->{$_}->[0] } keys %$pages;
     $ret .= $q->p(
-        $q->strong("FixMyStreet admin:"), 
+        $q->strong(_("FixMyStreet admin:")), 
         map { $q->a( { href => NewURL($q, page => $_) }, $pages->{$_}->[0]) } @links
     ); 
 
@@ -118,8 +120,8 @@ sub fetch_data {
 sub admin_summary ($) {
     my ($q) = @_;
     my $cobrand = Page::get_cobrand($q);
-    print html_head($q, "Summary");
-    print $q->h1("Summary");
+    print html_head($q, _("Summary"));
+    print $q->h1(_("Summary"));
 
     my $contacts = Problems::contact_counts($cobrand);
     my %contacts = @$contacts;
@@ -157,15 +159,15 @@ sub admin_summary ($) {
 
     if (Cobrand::admin_show_creation_graph($cobrand)) {
          print $q->p( $q->a({ href => mySociety::Config::get('BASE_URL') . "/bci-live-creation.png" }, 
-                 "Graph of problem creation by status over time" ));
+                 _("Graph of problem creation by status over time") ));
 
     }
-    print $q->h2("Problem breakdown by state");
+    print $q->h2(_("Problem breakdown by state"));
     print $q->ul(
         map { $q->li("$problems{$_} $_") } sort keys %problems 
     );
 
-    print $q->h2("Update breakdown by state");
+    print $q->h2(_("Update breakdown by state"));
     print $q->ul(
         map { $q->li("$comments{$_} $_") } sort keys %comments
     );
@@ -177,22 +179,25 @@ sub admin_summary ($) {
 sub admin_councils_list ($) {
     my ($q) = @_;
 
-    print html_head($q, "Council contacts");
-    print $q->h1("Council contacts");
+    print html_head($q, _("Council contacts"));
+    print $q->h1(_("Council contacts"));
 
     # Table of editors
-    print $q->h2("Diligency prize league table");
+    print $q->h2(_("Diligency prize league table"));
     my $edit_activity = dbh()->selectall_arrayref("select count(*) as c, editor from contacts_history group by editor order by c desc");
-    print $q->ul(
-        map { $q->li($_->[0] . " edits by " . $_->[1]) } @$edit_activity 
-    );
+    if (@$edit_activity) {
+        print $q->ul(
+            map { $q->li($_->[0] . " edits by " . $_->[1]) } @$edit_activity 
+        );
+    } else {
+        print $q->p(_('No edits have yet been made.'));
+    }
 
     # Table of councils
-    print $q->h2("Councils");
-    my $ignore = 'LGD';
-    $ignore .= '|CTY' if $q->{site} eq 'emptyhomes';
-    my @types = grep { !/$ignore/ } @$mySociety::VotingArea::council_parent_types; # LGD are NI councils
-    my $areas = mySociety::MaPit::call('areas', \@types);
+    print $q->h2(_("Councils"));
+    my $cobrand = Page::get_cobrand($q);
+    my @area_types = Cobrand::area_types($cobrand);
+    my $areas = mySociety::MaPit::call('areas', \@area_types);
     my @councils_ids = sort { $areas->{$a}->{name} cmp $areas->{$b}->{name} } keys %$areas;
     my $bci_info = dbh()->selectall_hashref("
         select area_id, count(*) as c, count(case when deleted then 1 else null end) as deleted,
@@ -202,26 +207,31 @@ sub admin_councils_list ($) {
     my $list_part = sub {
         my @ids = @_;
         if (!scalar(@ids)) {
-            print "None";
+            print _("None");
             return;
         }
-        print $q->p(join($q->br(), 
-            map { 
-                $q->a({ href => NewURL($q, area_id => $_, page => 'councilcontacts') }, 
-                  $areas->{$_}->{name}) . " " .
+        my @li;
+        foreach (@ids) {
+            my $parent = '';
+            $parent = ', ' . $areas->{$areas->{$_}->{parent_area}}->{name}
+                if $areas->{$_}->{parent_area};
+
+            push @li, $q->li($q->a({ href => NewURL($q, area_id => $_, page => 'councilcontacts') }, 
+                  $areas->{$_}->{name}) . $parent . ' ' .
                     ($bci_info->{$_} && $q->{site} ne 'emptyhomes' ?
                         $bci_info->{$_}->{c} . ' addresses'
-                    : '')
-            } @ids));
+                    : ''));
+        }
+        print $q->ul(@li);
     };
 
-    print $q->h3('No info at all');
+    print $q->h3(_('No info at all'));
     &$list_part(grep { !$bci_info->{$_} } @councils_ids);
-    print $q->h3('Currently has 1+ deleted');
+    print $q->h3(_('Currently has 1+ deleted'));
     &$list_part(grep { $bci_info->{$_} && $bci_info->{$_}->{deleted} } @councils_ids);
-    print $q->h3('Some unconfirmeds');
+    print $q->h3(_('Some unconfirmeds'));
     &$list_part(grep { $bci_info->{$_} && !$bci_info->{$_}->{deleted} && $bci_info->{$_}->{confirmed} != $bci_info->{$_}->{c} } @councils_ids);
-    print $q->h3('All confirmed');
+    print $q->h3(_('All confirmed'));
     &$list_part(grep { $bci_info->{$_} && !$bci_info->{$_}->{deleted} && $bci_info->{$_}->{confirmed} == $bci_info->{$_}->{c} } @councils_ids);
     print html_tail($q);
 }
@@ -251,20 +261,20 @@ sub admin_council_contacts ($$) {
             ", {}, 
             $email, ($q->param('confirmed') ? 1 : 0),
             ($q->param('deleted') ? 1 : 0),
-            ($q->remote_user() || "*unknown*"), $q->param('note'),
+            ($q->remote_user() || _("*unknown*")), $q->param('note'),
             $area_id, $category
             );
-        $updated = $q->p($q->em("Values updated"));
+        $updated = $q->p($q->em(_("Values updated")));
         unless ($update > 0) {
             dbh()->do('insert into contacts
                 (area_id, category, email, editor, whenedited, note, confirmed, deleted)
                 values
                 (?, ?, ?, ?, ms_current_timestamp(), ?, ?, ?)', {},
                 $area_id, $category, $email,
-                ($q->remote_user() || '*unknown*'), $q->param('note'),
+                ($q->remote_user() || _('*unknown*')), $q->param('note'),
                 ($q->param('confirmed') ? 1 : 0), ($q->param('deleted') ? 1 : 0)
             );
-            $updated = $q->p($q->em("New category contact added"));
+            $updated = $q->p($q->em(_("New category contact added")));
         }
         dbh()->commit();
     } elsif ($posted eq 'update') {
@@ -278,11 +288,11 @@ sub admin_council_contacts ($$) {
                 where area_id = ?
                 and category = ?
                 ", {},
-                ($q->remote_user() || "*unknown*"),
+                ($q->remote_user() || _("*unknown*")),
                 $area_id, $cat
             );
         }
-        $updated = $q->p($q->em("Values updated"));
+        $updated = $q->p($q->em(_("Values updated")));
         dbh()->commit();
     }
 
@@ -301,7 +311,7 @@ sub admin_council_contacts ($$) {
 
     # Title
     my $mapit_data = mySociety::MaPit::call('area', $area_id);
-    my $title = 'Council contacts for ' . $mapit_data->{name};
+    my $title = sprintf(_('Council contacts for %s'), $mapit_data->{name});
     print html_head($q, $title);
     print $q->h1($title);
     print $updated;
@@ -314,20 +324,20 @@ sub admin_council_contacts ($$) {
                 "Example postcode " . $example_postcode) . " | ";
     }
     $links_html .= ' '  . 
-            $q->a({ href => mySociety::Config::get('BASE_URL') . "/reports?council=" . $area_id }, " List all reported problems");
+            $q->a({ href => mySociety::Config::get('BASE_URL') . "/reports?council=" . $area_id }, _(" List all reported problems"));
     $links_html .= ' ' .
-            $q->a({ href => NewURL($q, area_id => $area_id, page => 'councilcontacts', text => 1) }, 'Text only version');
+            $q->a({ href => NewURL($q, area_id => $area_id, page => 'councilcontacts', text => 1) }, _('Text only version'));
     print $q->p($links_html);
 
     # Display of addresses / update statuses form
     print $q->start_form(-method => 'POST', -action => './');
     print $q->start_table({border=>1, cellpadding=>2, cellspacing=>0});
-    print $q->Tr({}, $q->th({}, ["Category", "Email", "Confirmed", "Deleted", "Last editor", "Note", "When edited", 'Confirm']));
+    print $q->Tr({}, $q->th({}, [_("Category"), _("Email"), _("Confirmed"), _("Deleted"), _("Last editor"), _("Note"), _("When edited"), _('Confirm')]));
     foreach my $l (@$bci_data) {
         print $q->Tr($q->td([
             $q->a({ href => NewURL($q, area_id => $area_id, category => $l->{category}, page => 'counciledit') },
-                $l->{category}), $l->{email}, $l->{confirmed} ? 'Yes' : 'No',
-            $l->{deleted} ? 'Yes' : 'No', $l->{editor}, ent($l->{note}),
+                $l->{category}), $l->{email}, $l->{confirmed} ? _('Yes') : _('No'),
+            $l->{deleted} ? _('Yes') : _('No'), $l->{editor}, ent($l->{note}),
             $l->{whenedited} =~ m/^(.+)\.\d+$/,
             $q->checkbox(-name => 'confirmed', -value => $l->{category}, -label => '')
         ]));
@@ -339,34 +349,34 @@ sub admin_council_contacts ($$) {
         $q->hidden('posted', 'update'),
         $q->hidden('token', get_token($q)),
         $q->hidden('page', 'councilcontacts'),
-        $q->submit('Update statuses')
+        $q->submit(_('Update statuses'))
     );
     print $q->end_form();
 
     # Display form for adding new category
-    print $q->h2('Add new category');
+    print $q->h2(_('Add new category'));
     print $q->start_form(-method => 'POST', -action => './');
     if ($q->{site} ne 'emptyhomes') {
-        print $q->p($q->strong("Category: "),
+        print $q->p($q->strong(_("Category: ")),
             $q->textfield(-name => "category", -size => 30));
     }
-    print $q->p($q->strong("Email: "),
+    print $q->p($q->strong(_("Email: ")),
         $q->textfield(-name => "email", -size => 30));
     $q->autoEscape(0);
     print $q->p(
-        $q->checkbox(-id => 'confirmed', -name => "confirmed", -value => 1, -label => ' ' . $q->label({-for => 'confirmed'}, 'Confirmed')),
+        $q->checkbox(-id => 'confirmed', -name => "confirmed", -value => 1, -label => ' ' . $q->label({-for => 'confirmed'}, _('Confirmed'))),
         ' ',
-        $q->checkbox(-id => 'deleted', -name => "deleted", -value => 1, -label => ' ' . $q->label({-for => 'deleted'}, 'Deleted'))
+        $q->checkbox(-id => 'deleted', -name => "deleted", -value => 1, -label => ' ' . $q->label({-for => 'deleted'}, _('Deleted')))
     );
     $q->autoEscape(1);
-    print $q->p($q->strong("Note: "),
+    print $q->p($q->strong(_("Note: ")),
         $q->textarea(-name => "note", -rows => 3, -columns=>40));
     print $q->p(
         $q->hidden('area_id', $area_id),
         $q->hidden('posted', 'new'),
         $q->hidden('token', get_token($q)),
         $q->hidden('page', 'councilcontacts'),
-        $q->submit('Create category')
+        $q->submit(_('Create category'))
     );
     print $q->end_form();
 
@@ -384,7 +394,7 @@ sub admin_council_edit ($$$) {
     my $mapit_data = mySociety::MaPit::call('area', $area_id);
     
     # Title
-    my $title = 'Council contacts for ' . $mapit_data->{name};
+    my $title = sprintf(_('Council contacts for %s'), $mapit_data->{name});
     print html_head($q, $title);
     print $q->h1($title);
 
@@ -401,35 +411,35 @@ sub admin_council_edit ($$$) {
     map { $q->param($_, $bci_data->{$_}) } qw/category email confirmed deleted/;
     $q->param('page', 'councilcontacts');
     $q->param('posted', 'new');
-    print $q->strong("Category: ") . $bci_data->{category};
+    print $q->strong(_("Category: ")) . $bci_data->{category};
     print $q->hidden('token', get_token($q)),
     print $q->hidden("category");
-    print $q->strong(" Email: ");
+    print $q->strong(' ' . _("Email: "));
     print $q->textfield(-name => "email", -size => 30) . " ";
     $q->autoEscape(0);
-    print $q->checkbox(-id => 'confirmed', -name => "confirmed", -value => 1, -label => ' ' . $q->label({-for => 'confirmed'}, 'Confirmed'));
+    print $q->checkbox(-id => 'confirmed', -name => "confirmed", -value => 1, -label => ' ' . $q->label({-for => 'confirmed'}, _('Confirmed')));
     print ' ';
-    print $q->checkbox(-id => 'deleted', -name => "deleted", -value => 1, -label => ' ' . $q->label({-for => 'deleted'}, 'Deleted'));
+    print $q->checkbox(-id => 'deleted', -name => "deleted", -value => 1, -label => ' ' . $q->label({-for => 'deleted'}, _('Deleted')));
     $q->autoEscape(1);
     print $q->br();
-    print $q->strong("Note: ");
+    print $q->strong(_("Note: "));
     print $q->textarea(-name => "note", -rows => 3, -columns=>40) . " ";
     print $q->br();
     print $q->hidden('area_id');
     print $q->hidden('posted');
     print $q->hidden('page');
-    print $q->submit('Save changes');
+    print $q->submit(_('Save changes'));
     print $q->end_form();
 
     # Display history of changes
-    print $q->h2('History');
+    print $q->h2(_('History'));
     print $q->start_table({border=>1});
-    print $q->Tr({}, $q->th({}, ["When edited", "Email", "Confirmed", "Deleted", "Editor", "Note"]));
+    print $q->Tr({}, $q->th({}, [_("When edited"), _("Email"), _("Confirmed"), _("Deleted"), _("Editor"), _("Note")]));
     my $html = '';
     my $prev = undef;
     foreach my $h (@$bci_history) {
-        $h->{confirmed} = $h->{confirmed} ? "yes" : "no",
-        $h->{deleted} = $h->{deleted} ? "yes" : "no",
+        $h->{confirmed} = $h->{confirmed} ? _("yes") : _("no"),
+        $h->{deleted} = $h->{deleted} ? _("yes") : _("no"),
         my $emailchanged = ($prev && $h->{email} ne $prev->{email}) ? 1 : 0;
         my $confirmedchanged = ($prev && $h->{confirmed} ne $prev->{confirmed}) ? 1 : 0;
         my $deletedchanged = ($prev && $h->{deleted} ne $prev->{deleted}) ? 1 : 0;
@@ -456,7 +466,7 @@ sub admin_reports {
     print html_head($q, $title);
     print $q->h1($title);
     print $q->start_form(-method => 'GET', -action => './');
-    print $q->label({-for => 'search'}, 'Search:'), ' ', $q->textfield(-id => 'search', -name => "search", -size => 30);
+    print $q->label({-for => 'search'}, _('Search:')), ' ', $q->textfield(-id => 'search', -name => "search", -size => 30);
     print $q->hidden('page');
     print $q->end_form;
 
@@ -508,7 +518,7 @@ sub admin_reports {
         }
         print $q->end_table;
 
-        print $q->h2('Updates');
+        print $q->h2(_('Updates'));
         my $updates = Problems::update_search($search);
         admin_show_updates($q, $updates);
     }
@@ -528,13 +538,13 @@ sub admin_edit_report {
         dbh()->do('update problem set whensent=null where id=?', {}, $id);
         admin_log_edit($q, $id, 'problem', 'resend');
         dbh()->commit();
-        $status_message = '<p><em>That problem will now be resent.</em></p>';
+        $status_message = '<p><em>' . _('That problem will now be resent.') . '</em></p>';
     } elsif ($q->param('submit')) {
         return not_found($q) if $q->param('token') ne get_token($q);
         my $new_state = $q->param('state');
         my $done = 0;
         if ($new_state eq 'confirmed' && $row{state} eq 'unconfirmed' && $q->{site} eq 'emptyhomes') {
-            $status_message = '<p><em>I am afraid you cannot confirm unconfirmed reports.</em></p>';
+            $status_message = '<p><em>' . _('I am afraid you cannot confirm unconfirmed reports.') . '</em></p>';
             $done = 1;
         }
         my $query = 'update problem set anonymous=?, state=?, name=?, email=?, title=?, detail=?';
@@ -563,20 +573,20 @@ sub admin_edit_report {
             } 
             dbh()->commit();
             map { $row{$_} = $q->param($_) } qw(anonymous state name email title detail);
-            $status_message = '<p><em>Updated!</em></p>';
+            $status_message = '<p><em>' . _('Updated!') . '</em></p>';
         }
     }
     my %row_h = map { $_ => $row{$_} ? ent($row{$_}) : '' } keys %row;
-    my $title = "Editing problem $id";
+    my $title = sprintf(_("Editing problem %d"), $id);
     print html_head($q, $title);
     print $q->h1($title);
     print $status_message;
 
-    my $council = $row{council} || '<em>None</em>';
+    my $council = $row{council} || '<em>' . _('None') . '</em>';
     (my $areas = $row{areas}) =~ s/^,(.*),$/$1/;
     my $latitude  = $row{latitude};
     my $longitude = $row{longitude};
-    my $questionnaire = $row{send_questionnaire} ? 'Yes' : 'No';
+    my $questionnaire = $row{send_questionnaire} ? _('Yes') : _('No');
     my $used_map = $row{used_map} ? 'used map' : "didn't use map";
     (my $whensent = $row{whensent} || '&nbsp;') =~ s/\..*//;
     (my $confirmed = $row{confirmed} || '-') =~ s/ (.*?)\..*/&nbsp;$1/;
@@ -595,10 +605,10 @@ sub admin_edit_report {
     my $url = $url_base . '/report/' . $row{id};
 
     my $anon = $q->label({-for=>'anonymous'}, 'Anonymous:') . ' ' . $q->popup_menu(-id => 'anonymous', -name => 'anonymous', -values => { 1=>'Yes', 0=>'No' }, -default => $row{anonymous});
-    my $state = $q->label({-for=>'state'}, 'State:') . ' ' . $q->popup_menu(-id => 'state', -name => 'state', -values => { confirmed => 'Open', fixed => 'Fixed', hidden => 'Hidden', unconfirmed => 'Unconfirmed', partial => 'Partial' }, -default => $row{state});
+    my $state = $q->label({-for=>'state'}, _('State:')) . ' ' . $q->popup_menu(-id => 'state', -name => 'state', -values => { confirmed => _('Open'), fixed => _('Fixed'), hidden => _('Hidden'), unconfirmed => _('Unconfirmed'), partial => _('Partial') }, -default => $row{state});
 
     my $resend = '';
-    $resend = ' <input onclick="return confirm(\'You really want to resend?\')" type="submit" name="resend" value="Resend report">' if $row{state} eq 'confirmed';
+    $resend = ' <input onclick="return confirm(\'' . _('You really want to resend?') . '\')" type="submit" name="resend" value="' . _('Resend report') . '">' if $row{state} eq 'confirmed';
 
     print $q->start_form(-method => 'POST', -action => './');
     print $q->hidden('page');
@@ -629,10 +639,10 @@ sub admin_edit_report {
 $photo
 </ul>
 EOF
-    print $q->submit('Submit changes');
+    print $q->submit(_('Submit changes'));
     print $q->end_form;
 
-    print $q->h2('Updates');
+    print $q->h2(_('Updates'));
     my $updates = select_all('select * from comment where problem_id=? order by created', $id);
     admin_show_updates($q, $updates);
     print html_tail($q);
@@ -661,7 +671,7 @@ sub admin_show_updates {
         $attr->{-class} = 'hidden' if $_->{state} eq 'hidden' || ($_->{problem_state} && $_->{problem_state} eq 'hidden');
         print $q->Tr($attr, $q->td([ $url, $_->{state}, ent($_->{name} || ''),
         ent($_->{email}), $_->{created}, $cobrand, ent($_->{text}),
-        $q->a({ -href => NewURL($q, page=>'update_edit', id=>$_->{id}) }, 'Edit')
+        $q->a({ -href => NewURL($q, page=>'update_edit', id=>$_->{id}) }, _('Edit'))
         ]));
     }
     print $q->end_table;
@@ -683,12 +693,12 @@ sub admin_edit_update {
         }
         $query .= ' where id=?';
         dbh()->do($query, {}, $q->param('state'), $q->param('name'), $q->param('email'), $q->param('text'), $id);
-        $status_message = '<p><em>Updated!</em></p>';
+        $status_message = '<p><em>' . _('Updated!') . '</em></p>';
 
         # If we're hiding an update, see if it marked as fixed and unfix if so
         if ($q->param('state') eq 'hidden' && $row{mark_fixed}) {
             dbh()->do("update problem set state='confirmed' where state='fixed' and id=?", {}, $row{problem_id});
-            $status_message .= '<p><em>Problem marked as open.</em></p>';
+            $status_message .= '<p><em>' . _('Problem marked as open.') . '</em></p>';
         }
 
         if ($q->param('state') ne $row{state}) {
@@ -703,8 +713,8 @@ sub admin_edit_update {
         dbh()->commit();
         map { $row{$_} = $q->param($_) } qw(state name email text);
     }
-   my %row_h = map { $_ => $row{$_} ? ent($row{$_}) : '' } keys %row;
-    my $title = "Editing update $id";
+    my %row_h = map { $_ => $row{$_} ? ent($row{$_}) : '' } keys %row;
+    my $title = sprintf(_("Editing update %d"), $id);
     print html_head($q, $title);
     print $q->h1($title);
     print $status_message;
@@ -723,7 +733,7 @@ sub admin_edit_update {
 
     my $url = Cobrand::base_url_for_emails($cobrand, $cobrand_data) . '/report/' . $row{problem_id} . '#update_' . $row{id};
 
-    my $state = $q->label({-for=>'state'}, 'State:') . ' ' . $q->popup_menu(-id => 'state', -name => 'state', -values => { confirmed => 'Confirmed', hidden => 'Hidden', unconfirmed => 'Unconfirmed' }, -default => $row{state});
+    my $state = $q->label({-for=>'state'}, _('State:')) . ' ' . $q->popup_menu(-id => 'state', -name => 'state', -values => { confirmed => _('Confirmed'), hidden => _('Hidden'), unconfirmed => _('Unconfirmed') }, -default => $row{state});
 
     print $q->start_form(-method => 'POST', -action => './');
     print $q->hidden('page');
@@ -743,7 +753,7 @@ sub admin_edit_update {
 $photo
 </ul>
 EOF
-    print $q->submit('Submit changes');
+    print $q->submit(_('Submit changes'));
     print $q->end_form;
     print html_tail($q);
 }
@@ -769,8 +779,8 @@ sub admin_log_edit {
 sub admin_timeline {
     my $q = shift;
     my $cobrand = Page::get_cobrand($q);
-    print html_head($q, 'Timeline');
-    print $q->h1('Timeline');
+    print html_head($q, _('Timeline'));
+    print $q->h1(_('Timeline'));
 
     my %time;
     #my $backto_unix = time() - 60*60*24*7;
diff --git a/web/ajax.cgi b/web/ajax.cgi
index 69c389765..f13529852 100755
--- a/web/ajax.cgi
+++ b/web/ajax.cgi
@@ -59,8 +59,8 @@ sub main {
 
     $list = '';
     foreach (@$around_map) {
-        my $dist = int($_->{distance}/100+.5)/10;
-	$link = Cobrand::url($cobrand, NewURL($q, -retain => 1, 
+        my $dist = int($_->{distance}*10+.5)/10;
+        $link = Cobrand::url($cobrand, NewURL($q, -retain => 1, 
                                                   -url => '/report/' . $_->{id}, 
                                                   pc => undef, 
                                                   x => undef, 
@@ -81,7 +81,7 @@ sub main {
     #$list = '';
     #foreach (@$fixed) {
     #    $list .= '<li><a href="/report/' . $_->{id} . '">';
-    #    $list .= $_->{title} . ' <small>(' . int($_->{distance}/100+.5)/10 . 'km)</small>';
+    #    $list .= $_->{title} . ' <small>(' . int($_->{distance}*10+.5)/10 . 'km)</small>';
     #    $list .= '</a></li>';
     #}
     #my $f_list = $list;
diff --git a/web/alert.cgi b/web/alert.cgi
index 896ca9ccc..e2a4efaac 100755
--- a/web/alert.cgi
+++ b/web/alert.cgi
@@ -11,6 +11,7 @@
 use strict;
 use Standard;
 use Digest::SHA1 qw(sha1_hex);
+use Encode;
 use Error qw(:try);
 use CrossSell;
 use FixMyStreet::Alert;
@@ -96,28 +97,76 @@ sub alert_list {
     return alert_front_page($q, $error) if $error;
 
     my $pretty_pc = $input_h{pc};
+    my $pretty_pc_text;# This one isnt't getting the nbsp.
     if (mySociety::PostcodeUtil::is_valid_postcode($input{pc})) {
         $pretty_pc = mySociety::PostcodeUtil::canonicalise_postcode($input{pc});
+        $pretty_pc_text = $pretty_pc;
+        $pretty_pc_text =~ s/ //g;
         $pretty_pc =~ s/ /&nbsp;/;
     }
 
     my $errors = '';
     $errors = '<ul class="error"><li>' . join('</li><li>', @errors) . '</li></ul>' if @errors;
 
-    my @types = (@$mySociety::VotingArea::council_parent_types, @$mySociety::VotingArea::council_child_types);
-    my %councils = map { $_ => 1 } @$mySociety::VotingArea::council_parent_types;
+    my $cobrand = Page::get_cobrand($q);
+    my @types = (Cobrand::area_types($cobrand), @$mySociety::VotingArea::council_child_types);
+    my %councils = map { $_ => 1 } Cobrand::area_types($cobrand);
 
     my $areas = mySociety::MaPit::call('point', "4326/$lon,$lat", type => \@types);
-    my $cobrand = Page::get_cobrand($q);
     my ($success, $error_msg) = Cobrand::council_check($cobrand, { all_councils => $areas }, $q, 'alert');    
-    if (!$success){
+    if (!$success) {
         return alert_front_page($q, $error_msg);
     }
 
     return alert_front_page($q, _('That location does not appear to be covered by a council, perhaps it is offshore - please try somewhere more specific.')) if keys %$areas == 0;
 
     my ($options, $options_start, $options_end);
-    if (keys %$areas == 2) {
+    if (mySociety::Config::get('COUNTRY') eq 'NO') {
+
+        my (@options, $fylke, $kommune);
+        foreach (values %$areas) {
+            if ($_->{type} eq 'NKO') {
+                $kommune = $_;
+            } else {
+                $fylke = $_;
+            }
+        }
+        my $kommune_name = $kommune->{name};
+        my $fylke_name = $fylke->{name};
+
+        if ($fylke->{id} == 3) { # Oslo
+
+            push @options, [ 'council', $fylke->{id}, Page::short_name($fylke),
+                sprintf(_("Problems within %s"), $fylke_name) ];
+        
+            $options_start = "<div><ul id='rss_feed'>";
+            $options = alert_list_options($q, @options);
+            $options_end = "</ul>";
+
+        } else {
+
+            push @options,
+                [ 'area', $kommune->{id}, Page::short_name($kommune), $kommune_name ],
+                [ 'area', $fylke->{id}, Page::short_name($fylke), $fylke_name ];
+            $options_start = '<div id="rss_list">';
+            $options = $q->p($q->strong(_('Problems within the boundary of:'))) .
+                $q->ul(alert_list_options($q, @options));
+            @options = ();
+            push @options,
+                [ 'council', $kommune->{id}, Page::short_name($kommune), $kommune_name ],
+                [ 'council', $fylke->{id}, Page::short_name($fylke), $fylke_name ];
+            $options .= $q->p($q->strong(_('Or problems reported to:'))) .
+                $q->ul(alert_list_options($q, @options));
+            $options_end = $q->p($q->small(_('FixMyStreet sends different categories of problem
+to the appropriate council, so problems within the boundary of a particular council
+might not match the problems sent to that council. For example, a graffiti report
+will be sent to the district council, so will appear in both of the district
+council&rsquo;s alerts, but will only appear in the "Within the boundary" alert
+for the county council.'))) . '</div><div id="rss_buttons">';
+
+        }
+
+    } elsif (keys %$areas == 2) {
 
         # One-tier council
         my (@options, $council, $ward);
@@ -128,10 +177,12 @@ sub alert_list {
                 $ward = $_;
             }
         }
-        push @options, [ 'council', $council->{id}, Page::short_name($council->{name}),
-            sprintf(_("Problems within %s"), $council->{name}) ];
-        push @options, [ 'ward', $council->{id}.':'.$ward->{id}, Page::short_name($council->{name}) . '/'
-            . Page::short_name($ward->{name}), sprintf(_("Problems within %s ward"), $ward->{name}) ];
+        my $council_name = $council->{name};
+        my $ward_name = $ward->{name};
+        push @options, [ 'council', $council->{id}, Page::short_name($council),
+            sprintf(_("Problems within %s"), $council_name) ];
+        push @options, [ 'ward', $council->{id}.':'.$ward->{id}, Page::short_name($council) . '/'
+            . Page::short_name($ward), sprintf(_("Problems within %s ward"), $ward_name) ];
         
         $options_start = "<div><ul id='rss_feed'>";
         $options = alert_list_options($q, @options);
@@ -144,8 +195,9 @@ sub alert_list {
         foreach (values %$areas) {
             $council = $_;
         }
-        push @options, [ 'council', $council->{id}, Page::short_name($council->{name}),
-            sprintf(_("Problems within %s"), $council->{name}) ];
+        my $council_name = $council->{name};
+        push @options, [ 'council', $council->{id}, Page::short_name($council),
+            sprintf(_("Problems within %s"), $council_name) ];
         
         $options_start = "<div><ul id='rss_feed'>"; 
         $options = alert_list_options($q, @options);
@@ -166,26 +218,30 @@ sub alert_list {
                 $d_ward = $_;
             }
         }
+        my $district_name = $district->{name};
+        my $d_ward_name = $d_ward->{name};
+        my $county_name = $county->{name};
+        my $c_ward_name = $c_ward->{name};
         push @options,
-            [ 'area', $district->{id}, Page::short_name($district->{name}), $district->{name} ],
-            [ 'area', $district->{id}.':'.$d_ward->{id}, Page::short_name($district->{name}) . '/'
-              . Page::short_name($d_ward->{name}), "$d_ward->{name} ward, $district->{name}" ],
-            [ 'area', $county->{id}, Page::short_name($county->{name}), $county->{name} ],
-            [ 'area', $county->{id}.':'.$c_ward->{id}, Page::short_name($county->{name}) . '/'
-              . Page::short_name($c_ward->{name}), "$c_ward->{name} ward, $county->{name}" ];
+            [ 'area', $district->{id}, Page::short_name($district), $district_name ],
+            [ 'area', $district->{id}.':'.$d_ward->{id}, Page::short_name($district) . '/'
+              . Page::short_name($d_ward), "$d_ward_name ward, $district_name" ],
+            [ 'area', $county->{id}, Page::short_name($county), $county_name ],
+            [ 'area', $county->{id}.':'.$c_ward->{id}, Page::short_name($county) . '/'
+              . Page::short_name($c_ward), "$c_ward_name ward, $county_name" ];
         $options_start = '<div id="rss_list">';
         $options = $q->p($q->strong(_('Problems within the boundary of:'))) .
             $q->ul(alert_list_options($q, @options));
         @options = ();
         push @options,
-            [ 'council', $district->{id}, Page::short_name($district->{name}), $district->{name} ],
-            [ 'ward', $district->{id}.':'.$d_ward->{id}, Page::short_name($district->{name}) . '/' . Page::short_name($d_ward->{name}),
-              "$district->{name}, within $d_ward->{name} ward" ];
+            [ 'council', $district->{id}, Page::short_name($district), $district_name ],
+            [ 'ward', $district->{id}.':'.$d_ward->{id}, Page::short_name($district) . '/' . Page::short_name($d_ward),
+              "$district_name, within $d_ward_name ward" ];
         if ($q->{site} ne 'emptyhomes') {
             push @options,
-                [ 'council', $county->{id}, Page::short_name($county->{name}), $county->{name} ],
-                [ 'ward', $county->{id}.':'.$c_ward->{id}, Page::short_name($county->{name}) . '/'
-                  . Page::short_name($c_ward->{name}), "$county->{name}, within $c_ward->{name} ward" ];
+                [ 'council', $county->{id}, Page::short_name($county), $county_name ],
+                [ 'ward', $county->{id}.':'.$c_ward->{id}, Page::short_name($county) . '/'
+                  . Page::short_name($c_ward), "$county_name, within $c_ward_name ward" ];
             $options .= $q->p($q->strong(_('Or problems reported to:'))) .
                 $q->ul(alert_list_options($q, @options));
             $options_end = $q->p($q->small(_('FixMyStreet sends different categories of problem
@@ -238,17 +294,23 @@ feed, or enter your email address to subscribe to an email alert.'));
 <input type="radio" name="feed" id="local:$lat:$lon" value="local:$lat:$lon"$checked>
 <label for="local:$lat:$lon">$rss_label</label>
 EOF
-    my $rss_feed = Cobrand::url($cobrand, "/rss/l/$lat,$lon", $q);
+    my $rss_feed;
+    if ($pretty_pc_text) {
+        $rss_feed = Cobrand::url($cobrand, "/rss/pc/$pretty_pc_text/", $q);
+    } else {
+        $rss_feed = Cobrand::url($cobrand, "/rss/l/$lat,$lon/", $q);
+    }
+
     my $default_link = Cobrand::url($cobrand, "/alert?type=local;feed=local:$lat:$lon", $q);
     my $rss_details = _('(a default distance which covers roughly 200,000 people)');
     $out .= $rss_details;
     $out .= " <a href='$rss_feed'><img src='/i/feed.png' width='16' height='16' title='"
         . _('RSS feed of nearby problems') . "' alt='" . _('RSS feed') . "' border='0'></a>";
     $out .= '</p> <p id="rss_local_alt">' . _('(alternatively the RSS feed can be customised, within');
-    my $rss_feed_2k  = Cobrand::url($cobrand, "/rss/l/$lat,$lon/2", $q);
-    my $rss_feed_5k  = Cobrand::url($cobrand, "/rss/l/$lat,$lon/5", $q);
-    my $rss_feed_10k = Cobrand::url($cobrand, "/rss/l/$lat,$lon/10", $q);
-    my $rss_feed_20k = Cobrand::url($cobrand, "/rss/l/$lat,$lon/20", $q);
+    my $rss_feed_2k  = Cobrand::url($cobrand, $rss_feed.'2', $q);
+    my $rss_feed_5k  = Cobrand::url($cobrand, $rss_feed.'5', $q);
+    my $rss_feed_10k = Cobrand::url($cobrand, $rss_feed.'10', $q);
+    my $rss_feed_20k = Cobrand::url($cobrand, $rss_feed.'20', $q);
     $out .= <<EOF;
  <a href="$rss_feed_2k">2km</a> / <a href="$rss_feed_5k">5km</a>
 / <a href="$rss_feed_10k">10km</a> / <a href="$rss_feed_20k">20km</a>)
diff --git a/web/cobrands/fiksgatami/css.css b/web/cobrands/fiksgatami/css.css
new file mode 100644
index 000000000..8029e6698
--- /dev/null
+++ b/web/cobrands/fiksgatami/css.css
@@ -0,0 +1,3 @@
+#front_stats div {
+    width: 6em;
+}
diff --git a/web/contact.cgi b/web/contact.cgi
index fd0043d94..aefd3de7a 100755
--- a/web/contact.cgi
+++ b/web/contact.cgi
@@ -106,6 +106,8 @@ sub contact_details {
     my $out = '';
     my $sitename = _('FixMyStreet');
     my $contact_info = '';
+    if ( mySociety::Config::get('COUNTRY') eq 'GB' ) {
+        # XXX Rewrite to make brandable?
     $contact_info .= <<EOF;
 <div class="contact-details">
 <p>$sitename is a service provided by mySociety, which is the project of a 
@@ -120,6 +122,7 @@ UK</p>
 </div>
 EOF
     $out .= $contact_info unless $q->{site} eq 'emptyhomes'; 
+    }
     return $out;
 }
 
@@ -203,10 +206,12 @@ sub contact_page {
             } else {
                 $intro .= $q->p(_('You are reporting the following problem report for being abusive, containing personal information, or similar:'));
                 $item_title = ent($p->{title});
+                my $date_time = Page::prettify_epoch($q, $p->{confirmed});
                 $item_meta = $q->em(
-                   'Reported ',
-                   ($p->{anonymous}) ? 'anonymously' : "by " . ent($p->{name}),
-                   ' at ' . Page::prettify_epoch($q, $p->{confirmed}));
+                   $p->{anonymous}
+                       ? sprintf(_('Reported anonymously at %s'), $date_time)
+                       : sprintf(_('Reported by %s at %s'), ent($p->{name}), $date_time)
+                );
                 $item_body = ent($p->{detail});
             }
         }
diff --git a/web/import.cgi b/web/import.cgi
index e7746f589..ac36b2ee5 100755
--- a/web/import.cgi
+++ b/web/import.cgi
@@ -16,7 +16,7 @@ use mySociety::AuthToken;
 use mySociety::Config;
 use mySociety::EmailUtil;
 use mySociety::EvEl;
-use mySociety::GeoUtil;
+use mySociety::Locale;
 
 sub main {
     my $q = shift;
@@ -64,10 +64,8 @@ sub main {
 
     if ( $latitude && mySociety::Config::get('COUNTRY') eq 'GB' ) {
         try {
-            mySociety::GeoUtil::wgs84_to_national_grid( $latitude, $longitude,
-                'G' );
-        }
-        catch Error::Simple with {
+            Utils::convert_latlon_to_en( $latitude, $longitude );
+        } catch Error::Simple with {
             my $e = shift;
             push @errors, "We had a problem with the supplied co-ordinates - outside the UK?";
         };
diff --git a/web/index.cgi b/web/index.cgi
index af89fc8cf..7e177e0a2 100755
--- a/web/index.cgi
+++ b/web/index.cgi
@@ -9,6 +9,7 @@
 use strict;
 use Standard;
 use Utils;
+use Encode;
 use Error qw(:try);
 use File::Slurp;
 use LWP::Simple;
@@ -24,7 +25,6 @@ use mySociety::AuthToken;
 use mySociety::Config;
 use mySociety::DBHandle qw(select_all);
 use mySociety::EmailUtil;
-use mySociety::GeoUtil;
 use mySociety::Locale;
 use mySociety::MaPit;
 use mySociety::PostcodeUtil;
@@ -81,10 +81,10 @@ sub main {
     my %params;
     if ($q->param('submit_problem')) {
         $params{title} = _('Submitting your report');
-        ($out) = submit_problem($q);
+        ($out, %params) = submit_problem($q);
     } elsif ($q->param('submit_update')) {
         $params{title} = _('Submitting your update');
-        ($out) = submit_update($q);
+        ($out, %params) = submit_update($q);
     } elsif ($q->param('submit_map')) {
         ($out, %params) = display_form($q, [], {});
         $params{title} = _('Reporting a problem');
@@ -118,6 +118,8 @@ sub front_page {
     my $cobrand_form_elements = Cobrand::form_elements($cobrand, 'postcodeForm', $q);
     my $form_action = Cobrand::url($cobrand, '/', $q);
     my $question = Cobrand::enter_postcode_text($cobrand, $q);
+    $question = _("Enter a nearby GB postcode, or street name and area:")
+        unless $question;
     my %params = ('context' => 'front-page');
     $params{status_code} = $status_code if $status_code;
     my %vars = (
@@ -276,11 +278,12 @@ sub submit_problem {
     my @errors;
     my %field_errors;
 
+    my $cobrand = Page::get_cobrand($q);
 
     # If in UK and we have a lat,lon coocdinate check it is in UK
     if ( $input{latitude} && mySociety::Config::get('COUNTRY') eq 'GB' ) {
         try {
-            mySociety::GeoUtil::wgs84_to_national_grid($input{latitude}, $input{longitude}, 'G');
+            Utils::convert_latlon_to_en( $input{latitude}, $input{longitude} );
         } catch Error::Simple with { 
             my $e = shift;
             push @errors, "We had a problem with the supplied co-ordinates - outside the UK?";
@@ -307,7 +310,7 @@ sub submit_problem {
     } elsif (!mySociety::EmailUtil::is_valid_email($input{email})) {
         $field_errors{email} = _('Please enter a valid email');
     }
-    if ($input{category} && $input{category} eq '-- Pick a category --') {
+    if ($input{category} && $input{category} eq _('-- Pick a category --')) {
         $field_errors{category} = _('Please choose a category');
         $input{category} = '';
     } elsif ($input{category} && $input{category} eq _('-- Pick a property type --')) {
@@ -323,7 +326,8 @@ sub submit_problem {
         $areas = mySociety::MaPit::call( 'point', $mapit_query );
         if ($input{council} =~ /^[\d,]+(\|[\d,]+)?$/) {
             my $no_details = $1 || '';
-            my %va = map { $_ => 1 } @$mySociety::VotingArea::council_parent_types;
+            my @area_types = Cobrand::area_types($cobrand);
+            my %va = map { $_ => 1 } @area_types;
             my %councils;
             foreach (keys %$areas) {
                 $councils{$_} = 1 if $va{$areas->{$_}->{type}};
@@ -387,7 +391,6 @@ sub submit_problem {
     my $used_map = $input{skipped} ? 'f' : 't';
     $input{category} = _('Other') unless $input{category};
     my ($id, $out);
-    my $cobrand = Page::get_cobrand($q);
     my $cobrand_data = Cobrand::extra_problem_data($cobrand, $q);
     if (my $token = $input{partial}) {
         my $id = mySociety::AuthToken::retrieve('partial', $token);
@@ -515,23 +518,29 @@ sub display_form {
     }
 
     # Look up councils and do checks for the point we've got
-    my $parent_types = $mySociety::VotingArea::council_parent_types;
-    $parent_types = [qw(DIS LBO MTD UTA LGD COI)] # No CTY
-        if $q->{site} eq 'emptyhomes';
+    my @area_types = Cobrand::area_types($cobrand);
     # XXX: I think we want in_gb_locale around the next line, needs testing
-    my $all_councils = mySociety::MaPit::call('point', "4326/$longitude,$latitude", type => $parent_types);
+    my $all_councils = mySociety::MaPit::call('point', "4326/$longitude,$latitude", type => \@area_types);
 
     # Let cobrand do a check
     my ($success, $error_msg) = Cobrand::council_check($cobrand, { all_councils => $all_councils }, $q, 'submit_problem');
-    if (!$success){
+    if (!$success) {
         return front_page($q, $error_msg);
     }
 
-    # Ipswich & St Edmundsbury are responsible for everything in their areas, not Suffolk
-    delete $all_councils->{2241} if $all_councils->{2446} || $all_councils->{2443};
+    if (mySociety::Config::get('COUNTRY') eq 'GB') {
+        # Ipswich & St Edmundsbury are responsible for everything in their areas, not Suffolk
+        delete $all_councils->{2241} if $all_councils->{2446} || $all_councils->{2443};
+
+        # Norwich is responsible for everything in its areas, not Norfolk
+        delete $all_councils->{2233} if $all_councils->{2391};
+
+    } elsif (mySociety::Config::get('COUNTRY') eq 'NO') {
 
-    # Norwich is responsible for everything in its areas, not Norfolk
-    delete $all_councils->{2233} if $all_councils->{2391};
+        # Oslo is both a kommune and a fylke, we only want to show it once
+        delete $all_councils->{301} if $all_councils->{3};
+
+    }
 
     return display_location($q, _('That spot does not appear to be covered by a council.
 If you have tried to report an issue past the shoreline, for example,
@@ -553,7 +562,7 @@ please specify the closest point on land.')) unless %$all_councils;
             @categories = Page::scambs_categories();
         }
         if (@categories) {
-            @categories = ('-- Pick a category --', @categories, _('Other'));
+            @categories = (_('-- Pick a category --'), @categories, _('Other'));
             $category = _('Category:');
         }
     } else {
@@ -648,33 +657,37 @@ name if you give us permission.'), $council_list);
             push @missing, $_ unless $councils{$_};
         }
         my $n = @missing;
-        my $list = join(' or ', map { $all_councils->{$_}->{name} } @missing);
-        $vars{text_help} = '<p>All the information you provide here will be sent to <strong>'
-            . join('</strong> or <strong>', map { $all_councils->{$_}->{name} } @councils)
-            . '</strong>. The subject and details of the problem will be public, plus your
-name if you give us permission.';
-        $vars{text_help} .= ' We do <strong>not</strong> yet have details for the other council';
-        $vars{text_help} .= ($n>1) ? 's that cover' : ' that covers';
-        $vars{text_help} .= " this location. You can help us by finding a contact email address for local
-problems for $list and emailing it to us at <a href='mailto:$e'>$e</a>.";
+        my $list = join(_(' or '), map { $all_councils->{$_}->{name} } @missing);
+        $vars{text_help} = '<p>' . _('All the information you provide here will be sent to') . ' <strong>'
+            . join('</strong>' . _(' or ') . '<strong>', map { $all_councils->{$_}->{name} } @councils)
+            . '</strong>. ';
+        $vars{text_help} .= _('The subject and details of the problem will be public, plus your name if you give us permission.');
+        $vars{text_help} .= ' ' . mySociety::Locale::nget(
+            'We do <strong>not</strong> yet have details for the other council that covers this location.',
+            'We do <strong>not</strong> yet have details for the other councils that cover this location.',
+            $n
+        );
+        $vars{text_help} .=  ' ' . sprintf(_("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>."), $list, $e, $e);
         $vars{text_help} .= '<input type="hidden" name="council" value="' . join(',', @councils)
             . '|' . join(',', @missing) . '">';
     } else {
         my $e = Cobrand::contact_email($cobrand);
-        my $list = join(' or ', map { $_->{name} } values %$all_councils);
+        my $list = join(_(' or '), map { $_->{name} } values %$all_councils);
         my $n = scalar keys %$all_councils;
         if ($q->{site} ne 'emptyhomes') {
-            $vars{text_help} = '<p>We do not yet have details for the council';
-            $vars{text_help} .= ($n>1) ? 's that cover' : ' that covers';
-            $vars{text_help} .= " this location. If you submit a problem here the subject and details 
-of the problem will be public, but the problem will <strong>not</strong> be reported to the council.
-You can help us by finding a contact email address for local
-problems for $list and emailing it to us at <a href='mailto:$e'>$e</a>.";
+            $vars{text_help} = '<p>';
+            $vars{text_help} .= mySociety::Locale::nget(
+                'We do not yet have details for the council that covers this location.',
+                'We do not yet have details for the councils that cover this location.',
+                $n
+            );
+            $vars{text_help} .= _("If you submit a problem here the subject and details of the problem will be public, but the problem will <strong>not</strong> be reported to the council.");
+            $vars{text_help} .= sprintf(_("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>."), $list, $e, $e);
         } else {
-            $vars{text_help} = _("<p>We do not yet have details for the council that covers
-this location. If you submit a report here it will be left on the site, but
-not reported to the council &ndash; please still leave your report, so that
-we can show to the council the activity in their area.");
+            $vars{text_help} = '<p>'
+              . _('We do not yet have details for the council that covers this location.')
+              . ' '
+              . _("If you submit a report here it will be left on the site, but not reported to the council &ndash; please still leave your report, so that we can show to the council the activity in their area.");
         }
         $vars{text_help} .= '<input type="hidden" name="council" value="-1">';
     }
@@ -754,27 +767,18 @@ EOF
     }
 
     if ($q->{site} ne 'emptyhomes') {
-        $vars{text_notes} = <<EOF;
-<p>Please note:</p>
-<ul>
-<li>We will only use your personal
-information in accordance with our <a href="/faq#privacy">privacy policy.</a></li>
-<li>Please be polite, concise and to the point.</li>
-<li>Please do not be abusive &mdash; abusing your council devalues the service for all users.</li>
-<li>Writing your message entirely in block capitals makes it hard to read,
-as does a lack of punctuation.</li>
-<li>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.</li>
-<li>
-FixMyStreet and the Guardian are providing this service in
-partnership in <a href="/faq#privacy">certain cities</a>. In those cities, both have access to
-any information submitted, including names and email addresses, and will use it only to ensure the
-smooth running of the service, in accordance with their privacy policies.
-</li>
-</ul>
-EOF
+        $vars{text_notes} =
+            $q->p(_("Please note:")) .
+            "<ul>" .
+            $q->li(_("We will only use your personal information in accordance with our <a href=\"/faq#privacy\">privacy policy.</a>")) .
+            $q->li(_("Please be polite, concise and to the point.")) .
+            $q->li(_("Please do not be abusive &mdash; abusing your council devalues the service for all users.")) .
+            $q->li(_("Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation.")) .
+            $q->li(_("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."));
+        $vars{text_notes} .=
+            $q->li(_("FixMyStreet and the Guardian are providing this service in partnership in <a href=\"/faq#privacy\">certain cities</a>. In those cities, both have access to any information submitted, including names and email addresses, and will use it only to ensure the smooth running of the service, in accordance with their privacy policies."))
+            if mySociety::Config::get('COUNTRY') eq 'GB';
+        $vars{text_notes} .= "</ul>\n";
     }
 
     %vars = (%vars, 
@@ -783,7 +787,10 @@ EOF
         url_home => Cobrand::url($cobrand, '/', $q),
         submit_button => _('Submit')
     );
-    return (Page::template_include('report-form', $q, Page::template_root($q), %vars), robots => 'noindex,nofollow');
+    return (Page::template_include('report-form', $q, Page::template_root($q), %vars),
+        robots => 'noindex,nofollow',
+        js => FixMyStreet::Map::header_js(),
+    );
 }
 
 # redirect from osgb
@@ -883,7 +890,7 @@ sub display_location {
     my ($on_map_all, $on_map, $around_map, $dist) = FixMyStreet::Map::map_features($q, $latitude, $longitude, $interval);
     my @pins;
     foreach (@$on_map_all) {
-        push @pins, [ $_->{latitude}, $_->{longitude}, $_->{state} eq 'fixed' ? 'green' : 'red' ];
+        push @pins, [ $_->{latitude}, $_->{longitude}, ($_->{state} eq 'fixed' ? 'green' : 'red'), $_->{id} ];
     }
     my $on_list = '';
     foreach (@$on_map) {
@@ -902,14 +909,14 @@ sub display_location {
     foreach (@$around_map) {
         my $report_url = Cobrand::url($cobrand, NewURL($q, -retain => 1, -url => '/report/' . $_->{id}, pc => undef, x => undef, 'y' => undef), $q);  
         $around_list .= '<li><a href="' . $report_url . '">';
-        my $dist = int($_->{distance}/100+0.5);
+        my $dist = int($_->{distance}*10+0.5);
         $dist = $dist / 10;
         $around_list .= ent($_->{title}) . '</a> <small>(';
         $around_list .= Page::prettify_epoch($q, $_->{time}, 1) . ', ';
         $around_list .= $dist . 'km)</small>';
         $around_list .= ' <small>' . _('(fixed)') . '</small>' if $_->{state} eq 'fixed';
         $around_list .= '</li>';
-        push @pins, [ $_->{latitude}, $_->{longitude}, $_->{state} eq 'fixed' ? 'green' : 'red' ];
+        push @pins, [ $_->{latitude}, $_->{longitude}, ($_->{state} eq 'fixed' ? 'green' : 'red'), $_->{id} ];
     }
     $around_list = $q->li(_('No problems found.'))
         unless $around_list;
@@ -936,6 +943,17 @@ sub display_location {
     );
     my $pc_h = ent($q->param('pc') || '');
     
+    my $rss_url;
+    if ($pc_h) {
+        $rss_url = "/rss/pc/" . URI::Escape::uri_escape($pc_h);
+    } else {
+        $rss_url = "/rss/l/$short_lat,$short_lon";
+    }
+    $rss_url = Cobrand::url( $cobrand,
+        NewURL($q, -retain => 1, -url=> $rss_url,
+            pc => undef, x => undef, y => undef, lat=> undef, lon => undef ),
+        $q);
+
     my %vars = (
         'map' => FixMyStreet::Map::display_map($q,
             latitude => $latitude, longitude => $longitude,
@@ -945,7 +963,7 @@ sub display_location {
         ),
         map_end => FixMyStreet::Map::display_map_end(1),
         url_home => Cobrand::url($cobrand, '/', $q),
-        url_rss => Cobrand::url($cobrand, NewURL($q, -retain => 1, -url=> "/rss/l/$short_lat,$short_lon", pc => undef, x => undef, y => undef, lat => undef, lon => undef ), $q),
+        url_rss => $rss_url,
         url_email => Cobrand::url($cobrand, NewURL($q, -retain => 1, pc => undef, lat => $short_lat, lon => $short_lon, -url=>'/alert', feed=>"local:$short_lat:$short_lon"), $q),
         url_skip => $url_skip,
         email_me => _('Email me new local problems'),
@@ -966,7 +984,8 @@ sub display_location {
     );
 
     my %params = (
-        rss => [ _('Recent local problems, FixMyStreet'), "/rss/l/$short_lat,$short_lon" ],
+        rss => [ _('Recent local problems, FixMyStreet'), $rss_url ],
+        js => FixMyStreet::Map::header_js(),
         robots => 'noindex,nofollow',
     );
 
@@ -1013,11 +1032,12 @@ sub display_problem {
       map { Utils::truncate_coordinate($_) }    #
       ( $problem->{latitude}, $problem->{longitude} );
 
-    my $map_links =
-        "<p id='sub_map_links'>"
+    my $map_links = '';
+    $map_links = "<p id='sub_map_links'>"
       . "<a href=\"http://maps.google.co.uk/maps?output=embed&amp;z=16&amp;q="
       . URI::Escape::uri_escape_utf8( $problem->{title} . ' - ' . $google_link )
-      . "\@$short_lat,$short_lon\">View on Google Maps</a></p>";
+      . "\@$short_lat,$short_lon\">View on Google Maps</a></p>"
+        if mySociety::Config::get('COUNTRY') eq 'GB';
 
     my $banner;
     if ($q->{site} ne 'emptyhomes' && $problem->{state} eq 'confirmed' && $problem->{duration} > 8*7*24*60*60) {
@@ -1073,6 +1093,7 @@ sub display_problem {
         cobrand_form_elements => Cobrand::form_elements($cobrand, 'updateForm', $q),
         form_action => Cobrand::url($cobrand, '/', $q),
         input_h => \%input_h,
+        optional => _('(optional)'),
     );
 
     $vars{update_blurb} = $q->p($q->small(_('Please note that updates are not sent to the council. If you leave your name it will be public. Your information will only be used in accordance with our <a href="/faq#privacy">privacy policy</a>')))
@@ -1097,6 +1118,7 @@ EOF
     my %params = (
         rss => [ _('Updates to this problem, FixMyStreet'), "/rss/$input_h{id}" ],
         robots => 'index, nofollow',
+        js => FixMyStreet::Map::header_js(),
         title => $problem->{title}
     );
 
diff --git a/web/js/map-OpenStreetMap.js b/web/js/map-OpenStreetMap.js
index 04237e075..c5aa318b0 100644
--- a/web/js/map-OpenStreetMap.js
+++ b/web/js/map-OpenStreetMap.js
@@ -1,5 +1,5 @@
 YAHOO.util.Event.onContentReady('map', function() {
-    var map = new OpenLayers.Map("map", {
+    fixmystreet.map = new OpenLayers.Map("map", {
         controls: [
             new OpenLayers.Control.ArgParser(),
             //new OpenLayers.Control.LayerSwitcher(),
@@ -8,20 +8,82 @@ YAHOO.util.Event.onContentReady('map', function() {
         ],
         displayProjection: new OpenLayers.Projection("EPSG:4326")
     });
-    var streetview = new fixmystreet.map_type("", {
+    var osm = new fixmystreet.map_type("", {
         zoomOffset: 14,
         numZoomLevels: 4
     });
-    map.addLayer(streetview);
+    fixmystreet.map.addLayer(osm);
 
-    var centre = new OpenLayers.LonLat( fixmystreet.easting, fixmystreet.northing );
+    var centre = new OpenLayers.LonLat( fixmystreet.longitude, fixmystreet.latitude );
     centre.transform(
-        new OpenLayers.Projection("EPSG:27700"),
-        map.getProjectionObject()
+        new OpenLayers.Projection("EPSG:4326"),
+        fixmystreet.map.getProjectionObject()
     );
-    map.setCenter(centre, 2);
+    fixmystreet.map.setCenter(centre, 2);
+
+    if (document.getElementById('mapForm')) {
+        var click = new OpenLayers.Control.Click();
+        fixmystreet.map.addControl(click);
+        click.activate();
+    }
+
+    var markers = new OpenLayers.Layer.Markers("Markers");
+    var cols = { 'red':'R', 'green':'G', 'blue':'B', 'purple':'P' };
+    for (var i=0; i<fixmystreet.pins.length; i++) {
+        var pin = fixmystreet.pins[i];
+        var src = '/i/pin' + cols[pin[2]] + '.gif';
+        var size = new OpenLayers.Size(32, 59);
+        var offset = new OpenLayers.Pixel(-3, -size.h-2);
+        var icon = new OpenLayers.Icon(src, size, offset);
+        var loc = new OpenLayers.LonLat(pin[1], pin[0]);
+        loc.transform(
+            new OpenLayers.Projection("EPSG:4326"),
+            fixmystreet.map.getProjectionObject()
+        );
+        var marker = new OpenLayers.Marker(loc, icon);
+        if (pin[3]) {
+            marker.events.register('click', marker, function(evt) { window.location = '/report/' + pin[3]; OpenLayers.Event.stop(evt); });
+        }
+        markers.addMarker(marker);
+    }
+    fixmystreet.map.addLayer(markers);
+
 });
 
+OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, {                
+    defaultHandlerOptions: {
+        'single': true,
+        'double': false,
+        'pixelTolerance': 0,
+        'stopSingle': false,
+        'stopDouble': false
+    },
+
+    initialize: function(options) {
+        this.handlerOptions = OpenLayers.Util.extend(
+            {}, this.defaultHandlerOptions
+        );
+        OpenLayers.Control.prototype.initialize.apply(
+            this, arguments
+        ); 
+        this.handler = new OpenLayers.Handler.Click(
+            this, {
+                'click': this.trigger
+            }, this.handlerOptions
+        );
+    }, 
+
+    trigger: function(e) {
+        var lonlat = fixmystreet.map.getLonLatFromViewPortPx(e.xy);
+        lonlat.transform(
+            fixmystreet.map.getProjectionObject(),
+            new OpenLayers.Projection("EPSG:4326")
+        );
+        document.getElementById('fixmystreet.latitude').value = lonlat.lat;
+        document.getElementById('fixmystreet.longitude').value = lonlat.lon;
+        document.getElementById('mapForm').submit();
+    }
+});
 
 // http://www.openstreetmap.org/openlayers/OpenStreetMap.js (added maxResolution)
 
diff --git a/web/photo.cgi b/web/photo.cgi
index fc89fc0f7..bd38e3bf1 100755
--- a/web/photo.cgi
+++ b/web/photo.cgi
@@ -39,7 +39,7 @@ sub main {
 
     print $photo;
 }
-Page::do_fastcgi(\&main);
+Page::do_fastcgi(\&main, 0, 1);
 
 sub resize {
     my ($photo, $size) = @_;
diff --git a/web/questionnaire.cgi b/web/questionnaire.cgi
index cb5e553d3..1eb62d03e 100755
--- a/web/questionnaire.cgi
+++ b/web/questionnaire.cgi
@@ -25,7 +25,10 @@ sub main {
     } else {
         $out = display_questionnaire($q);
     }
-    print Page::header($q, title=>_('Questionnaire'));
+    print Page::header($q,
+        title => _('Questionnaire'),
+        js => FixMyStreet::Map::header_js(),
+    );
     print $out;
     print Page::footer($q);
 }
diff --git a/web/reports.cgi b/web/reports.cgi
index 999e82bb3..f0ecf9c7a 100755
--- a/web/reports.cgi
+++ b/web/reports.cgi
@@ -11,6 +11,7 @@
 
 use strict;
 use Standard;
+use Encode;
 use URI::Escape;
 use FixMyStreet::Alert;
 use mySociety::MaPit;
@@ -40,24 +41,50 @@ sub main {
             print $q->redirect($base_url . '/reports');
             return;
         }
-        $area_name = Page::short_name($va_info->{name});
+        $area_name = Page::short_name($va_info);
         if (length($q_council) == 6) {
             $va_info = mySociety::MaPit::call('area', $va_info->{parent_area});
-            $area_name = Page::short_name($va_info->{name}) . '/' . $area_name;
+            $area_name = Page::short_name($va_info) . '/' . $area_name;
         }
         $rss = '/rss' if $rss;
         print $q->redirect($base_url . $rss . '/reports/' . $area_name);
         return;
+    } elsif (mySociety::Config::get('COUNTRY') eq 'NO' && $q_council eq 'Oslo') {
+        $one_council = mySociety::MaPit::call('area', 3);
+        $area_type = $one_council->{type};
+        $area_name = $one_council->{name};
+    } elsif (mySociety::Config::get('COUNTRY') eq 'NO' && $q_council =~ /,/) {
+        my ($kommune, $fylke) = split /\s*,\s*/, $q_council;
+        my @area_types = Cobrand::area_types($cobrand);
+        my $areas_k = mySociety::MaPit::call('areas', $kommune, type => \@area_types);
+        my $areas_f = mySociety::MaPit::call('areas', $fylke, type => \@area_types);
+        if (keys %$areas_f == 1) {
+            ($fylke) = values %$areas_f;
+            $kommune = decode_utf8($kommune);
+            foreach (values %$areas_k) {
+                if ($_->{name} eq $kommune && $_->{parent_area} == $fylke->{id}) {
+                    $one_council = $_;
+                    $area_type = $_->{type};
+                    $area_name = $_->{name};
+                    last;
+                }
+            }
+        }
+        if (!$one_council) { # Given a false council name
+            print $q->redirect($base_url . '/reports');
+            return;
+        }
     } elsif ($q_council =~ /\D/) {
-        my $areas = mySociety::MaPit::call('areas', $q_council, type => $mySociety::VotingArea::council_parent_types, min_generation=>10 );
+        my @area_types = Cobrand::area_types($cobrand);
+        my $areas = mySociety::MaPit::call('areas', $q_council, type => \@area_types, min_generation=>Cobrand::area_min_generation($cobrand) );
         if (keys %$areas == 1) {
-            ($one_council) = keys %$areas;
-            $area_type = $areas->{$one_council}->{type};
-            $area_name = $areas->{$one_council}->{name};
+            ($one_council) = values %$areas;
+            $area_type = $one_council->{type};
+            $area_name = $one_council->{name};
         } else {
             foreach (keys %$areas) {
                 if ($areas->{$_}->{name} =~ /^\Q$q_council\E (Borough|City|District|County) Council$/) {
-                    $one_council = $_;
+                    $one_council = $areas->{$_};
                     $area_type = $areas->{$_}->{type};
                     $area_name = $q_council;
                 }
@@ -73,8 +100,7 @@ sub main {
             print $q->redirect($base_url . '/reports');
             return;
         }
-        $area_name = $va_info->{name};
-        print $q->redirect($base_url . '/reports/' . Page::short_name($area_name));
+        print $q->redirect($base_url . '/reports/' . Page::short_name($va_info));
         return;
     }
     $all = 0 unless $one_council;
@@ -83,23 +109,24 @@ sub main {
     my $q_ward = $q->param('ward') || '';
     my $ward;
     if ($one_council && $q_ward) {
-        my $qw = mySociety::MaPit::call('areas', $q_ward, type => $mySociety::VotingArea::council_child_types, min_generation => 10);
+        my $qw = mySociety::MaPit::call('areas', $q_ward, type => $mySociety::VotingArea::council_child_types,
+            min_generation => Cobrand::area_min_generation($cobrand));
         foreach my $id (sort keys %$qw) {
-            if ($qw->{$id}->{parent_area} == $one_council) {
-                $ward = $id;
+            if ($qw->{$id}->{parent_area} == $one_council->{id}) {
+                $ward = $qw->{$id};
                 last;
             }
         }
         if (!$ward) { # Given a false ward name
-            print $q->redirect($base_url . '/reports/' . Page::short_name($q_council));
+            print $q->redirect($base_url . '/reports/' . Page::short_name($one_council));
             return;
         }
     }
 
     # RSS - reports for sent reports, area for all problems in area
     if ($rss && $one_council) {
-        my $url = Page::short_name($q_council);
-        $url .= '/' . Page::short_name($q_ward) if $ward;
+        my $url = Page::short_name($one_council);
+        $url .= '/' . Page::short_name($ward) if $ward;
         if ($rss eq 'area' && $area_type ne 'DIS' && $area_type ne 'CTY') {
             # Two possibilites are the same for one-tier councils, so redirect one to the other
             print $q->redirect($base_url . '/rss/reports/' . $url);
@@ -108,8 +135,8 @@ sub main {
         my $type = 'council_problems'; # Problems sent to a council
         my (@params, %title_params);
         $title_params{COUNCIL} = $area_name;
-        push @params, $one_council if $rss eq 'reports';
-        push @params, $ward ? $ward : $one_council;
+        push @params, $one_council->{id} if $rss eq 'reports';
+        push @params, $ward ? $ward->{id} : $one_council->{id};
         if ($ward && $rss eq 'reports') {
             $type = 'ward_problems'; # Problems sent to a council, restricted to a ward
             $title_params{WARD} = $q_ward;
@@ -127,16 +154,20 @@ sub main {
 
     my $areas_info;
     if ($one_council) {
-        $areas_info = mySociety::MaPit::call('areas', $one_council);
+        $areas_info = mySociety::MaPit::call('areas', [ $one_council->{id}, $one_council->{parent_area} ])
+            if $one_council->{parent_area};
+        $areas_info = { $one_council->{id} => $one_council }
+            unless $areas_info;
     } else {
         # Show all councils on main report page
-        my $ignore = 'LGD';
-        $ignore .= '|CTY' if $q->{site} eq 'emptyhomes';
-        my @types = grep { !/$ignore/ } @$mySociety::VotingArea::council_parent_types;
-        $areas_info = mySociety::MaPit::call('areas', [ @types ], min_generation=>10 );
+        my @area_types = Cobrand::area_types($cobrand);
+        $areas_info = mySociety::MaPit::call('areas', \@area_types, min_generation=>Cobrand::area_min_generation($cobrand) );
     }
 
-    my $problems = Problems::council_problems($ward, $one_council); 
+    my $problems = Problems::council_problems(
+        $ward ? $ward->{id} : undef,
+        $one_council ? $one_council->{id} : undef
+    );
 
     my (%fixed, %open);
     my $re_councils = join('|', keys %$areas_info);
@@ -151,7 +182,7 @@ sub main {
             $row->{council} =~ s/\|.*$//;
             my @council = split /,/, $row->{council};
             foreach (@council) {
-                next if $one_council && $_ != $one_council;
+                next if $one_council && $_ != $one_council->{id};
                 add_row($row, scalar @council, $_, \%fixed, \%open);
             }
         }
@@ -171,17 +202,22 @@ sub main {
         }
         print '<th>' . _('Recently fixed') . '</th><th>' . _('Older fixed') . '</th></tr>';
         foreach (sort { $areas_info->{$a}->{name} cmp $areas_info->{$b}->{name} } keys %$areas_info) {
+            next if mySociety::Config::get('COUNTRY') eq 'NO' && $_ eq 301; # Only want one Oslo
             print '<tr align="center"';
             ++$c;
-            if ($areas_info->{$_}->{generation_high}==10) {
+            if (mySociety::Config::get('COUNTRY') eq 'GB' && $areas_info->{$_}->{generation_high} == 10) {
                 print ' class="gone"';
             } elsif ($c%2) {
                 print ' class="a"';
             }
-            my $url = Page::short_name($areas_info->{$_}->{name});
+            my $url = Page::short_name($areas_info->{$_}, $areas_info);
             my $cobrand_url = Cobrand::url($cobrand, "/reports/$url", $q);
             print '><td align="left"><a href="' . $cobrand_url . '">' .
-                $areas_info->{$_}->{name} . '</a></td>';
+                $areas_info->{$_}->{name};
+            if ($areas_info->{$_}->{parent_area} && $url =~ /,|%2C/) {
+                print ', ' . $areas_info->{$areas_info->{$_}->{parent_area}}->{name};
+            }
+            print '</a></td>';
             summary_cell(\@{$open{$_}{new}});
             if ($q->{site} eq 'emptyhomes') {
                 my $c = 0;
@@ -198,17 +234,17 @@ sub main {
         }
         print '</table>';
     } else {
-        my $name = $areas_info->{$one_council}->{name};
+        my $name = $one_council->{name};
         if (!$name) {
             print Page::header($q, title=>_("Summary reports"));
-            print "Council with identifier " . ent($one_council). " not found. ";
+            print "Council with identifier " . ent($one_council->{id}). " not found. ";
             print $q->a({href => Cobrand::url($cobrand, '/reports', $q) }, 'Show all councils');
             print ".";
         } else {
-            my $rss_url = '/rss/reports/' . Page::short_name($name);
+            my $rss_url = '/rss/reports/' . Page::short_name($one_council, $areas_info);
             my $thing = _('council');
             if ($ward) {
-                $rss_url .= '/' . Page::short_name($q_ward);
+                $rss_url .= '/' . Page::short_name($ward);
                 $thing = 'ward';
                 $name = ent($q_ward) . ", $name";
             }
@@ -234,24 +270,25 @@ sub main {
                 $vars{summary_line} = sprintf(_('You can <a href="%s">see more details</a> or go back and <a href="/reports">show all councils</a>.'), Cobrand::url($cobrand, NewURL($q, all=>1), $q));
             }
 
-            if ($open{$one_council}) {
-                my $col = list_problems($q, _('New problems'), $open{$one_council}{new}, $all, 0);
+            my $id = $one_council->{id};
+            if ($open{$id}) {
+                my $col = list_problems($q, _('New problems'), $open{$id}{new}, $all, 0);
                 my $old = [];
                 if ($q->{site} eq 'emptyhomes') {
-                    push @$old, @{$open{$one_council}{older}} if $open{$one_council}{older};
-                    push @$old, @{$open{$one_council}{unknown}} if $open{$one_council}{unknown};
+                    push @$old, @{$open{$id}{older}} if $open{$id}{older};
+                    push @$old, @{$open{$id}{unknown}} if $open{$id}{unknown};
                 } else {
-                    $old = $open{$one_council}{older};
+                    $old = $open{$id}{older};
                 }
                 $col .= list_problems($q, _('Older problems'), $old, $all, 0);
                 if ($q->{site} ne 'emptyhomes') {
-                    $col .= list_problems($q, _('Old problems, state unknown'), $open{$one_council}{unknown}, $all, 0);
+                    $col .= list_problems($q, _('Old problems, state unknown'), $open{$id}{unknown}, $all, 0);
                 }
                 $vars{col_problems} = $col;
             }
-            if ($fixed{$one_council}) {
-                my $col = list_problems($q, _('Recently fixed'), $fixed{$one_council}{new}, $all, 1);
-                $col .= list_problems($q, _('Old fixed'), $fixed{$one_council}{old}, $all, 1);
+            if ($fixed{$id}) {
+                my $col = list_problems($q, _('Recently fixed'), $fixed{$id}{new}, $all, 1);
+                $col .= list_problems($q, _('Old fixed'), $fixed{$id}{old}, $all, 1);
                 $vars{col_fixed} = $col;
             }
             print Page::header($q, context => 'reports', title=>sprintf(_('%s - Summary reports'), $name), rss => [ sprintf(_('Problems within %s, FixMyStreet'), $name), Cobrand::url($cobrand, $rss_url, $q) ]);
@@ -294,7 +331,7 @@ sub list_problems {
         $out .= ent($_->{title});
         $out .= '</a>';
         $out .= ' <small>(sent to both)</small>' if $_->{councils}>1;
-        $out .= ' <small>(not sent to council)</small>' if $_->{councils}==0 && $q->{site} ne 'emptyhomes';
+        $out .= ' <small>' . _('(not sent to council)') . '</small>' if $_->{councils}==0 && $q->{site} ne 'emptyhomes';
         $out .= '<br><small>' . ent($_->{detail}) . '</small>' if $all;
         $out .= '</li>';
     }
diff --git a/web/rss.cgi b/web/rss.cgi
index cb5221537..1ca2a1fe2 100755
--- a/web/rss.cgi
+++ b/web/rss.cgi
@@ -11,11 +11,11 @@
 use strict;
 use Error qw(:try);
 use Standard;
+use Encode;
 use URI::Escape;
 use FixMyStreet::Alert;
 use FixMyStreet::Geocode;
 use mySociety::MaPit;
-use mySociety::GeoUtil;
 use mySociety::Gaze;
 use Utils;
 
@@ -63,6 +63,7 @@ Page::do_fastcgi(\&main);
 sub rss_local_problems {
     my $q = shift;
     my $pc = $q->param('pc');
+
     my $x = $q->param('x');
     my $y = $q->param('y');
     my $lat = $q->param('lat');
@@ -82,6 +83,10 @@ sub rss_local_problems {
 
     $state = 'confirmed' if $state eq 'open';
 
+    my $qs;
+    my %title_params;
+    my $alert_type;
+
     my $cobrand = Page::get_cobrand($q);
     my $base = Cobrand::base_url($cobrand);
     if ($x && $y) {
@@ -102,11 +107,22 @@ sub rss_local_problems {
         } catch Error::Simple with {
             $error = shift;
         };
-        unless ($error) {
+        if ($error) {
+            return '';
+        } else {
             ( $lat, $lon ) = map { Utils::truncate_coordinate($_) } ( $lat, $lon );             
-            print $q->redirect(-location => "$base/rss/l/$lat,$lon$d_str$state_qs");
+
+            my $pretty_pc = $pc;
+            if (mySociety::PostcodeUtil::is_valid_postcode($pc)) {
+                $pretty_pc = mySociety::PostcodeUtil::canonicalise_postcode($pc);
+            }
+            my $pretty_pc_escaped = URI::Escape::uri_escape_utf8($pretty_pc);
+            $pretty_pc_escaped =~ s/%20/+/g;
+            $qs = "?pc=$pretty_pc_escaped";
+
+            $title_params{'POSTCODE'} = $pretty_pc;
         }
-        return '';
+        # pass through rather than redirecting.
     } elsif ( $lat || $lon ) { 
         # pass through
     } else {
@@ -116,7 +132,9 @@ sub rss_local_problems {
     # truncate the lat,lon for nicer urls
     ( $lat, $lon ) = map { Utils::truncate_coordinate($_) } ( $lat, $lon );    
     
-    my $qs = "?lat=$lat;lon/=$lon";
+    if (!$qs) {
+        $qs = "?lat=$lat;lon=$lon";
+    }
 
     if ($d) {
         $qs .= ";d=$d";
@@ -127,10 +145,20 @@ sub rss_local_problems {
     }
 
     my $xsl = Cobrand::feed_xsl($cobrand);
-    if ($state eq 'all') {
-        return FixMyStreet::Alert::generate_rss('local_problems', $xsl, $qs, [$lat, $lon, $d], undef, $cobrand, $q);
+
+    if ($pc) {
+        $alert_type = 'postcode_local_problems';
     } else {
-        return FixMyStreet::Alert::generate_rss('local_problems_state', $xsl, $qs, [$lat, $lon, $d, $state], undef, $cobrand, $q);
+        $alert_type = 'local_problems';
     }
+
+    my @db_params = ($lat, $lon, $d);
+
+    if ($state ne 'all') {
+        $alert_type .= '_state';
+        push @db_params, $state;
+    }
+    
+    return FixMyStreet::Alert::generate_rss($alert_type, $xsl, $qs, \@db_params, \%title_params, $cobrand, $q);
 }
author	Edmund von der Burg <evdb@mysociety.org>	2011-02-22 14:25:17 +0000
committer	Edmund von der Burg <evdb@mysociety.org>	2011-02-22 14:25:17 +0000
commit	7da8f20c36726fd205ae48130f07db49fab745e0 (patch)
tree	9573ce8c11fd8a067ad74a1aedb452784654b076
parent	36e118f44144e24e6f1a98ea845b4cc2fed799d8 (diff)
parent	a88db262384d3800c36589bb6d1a933b9319e2df (diff)