aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--.tx/config2
-rw-r--r--README.md36
-rwxr-xr-xbin/cpanm11111
-rw-r--r--bin/site-specific-install.sh2
-rwxr-xr-xbin/zurich-overdue-alert4
-rw-r--r--conf/crontab-example12
-rw-r--r--conf/general.yml-example5
-rw-r--r--locale/FixMyStreet.po642
-rw-r--r--locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po874
-rw-r--r--locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po873
-rw-r--r--locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po880
-rw-r--r--locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po956
-rw-r--r--locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po888
-rw-r--r--locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po900
-rw-r--r--locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po4478
-rw-r--r--locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po4412
-rw-r--r--locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po4407
-rw-r--r--locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po958
-rw-r--r--locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po893
-rw-r--r--locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po885
-rw-r--r--locale/pt_CV.UTF-8/LC_MESSAGES/FixMyStreet.po929
-rw-r--r--locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po4392
-rw-r--r--perllib/FixMyStreet.pm6
-rw-r--r--perllib/FixMyStreet/App.pm36
-rw-r--r--perllib/FixMyStreet/App/Controller/Council.pm11
-rw-r--r--perllib/FixMyStreet/DB/Result/Problem.pm7
-rw-r--r--perllib/FixMyStreet/DB/ResultSet/AlertType.pm2
-rw-r--r--perllib/FixMyStreet/DB/ResultSet/Problem.pm6
-rw-r--r--perllib/FixMyStreet/DB/ResultSet/Questionnaire.pm5
-rw-r--r--perllib/FixMyStreet/Map/FMS.pm2
-rw-r--r--t/app/controller/alert_new.t131
-rw-r--r--t/app/controller/around.t4
-rw-r--r--t/app/controller/auth.t2
-rw-r--r--t/app/controller/report_import.t4
-rw-r--r--t/app/controller/report_new.t10
-rw-r--r--t/app/controller/report_updates.t6
-rw-r--r--t/app/model/problem.t4
-rw-r--r--t/cobrand/zurich.t14
-rw-r--r--templates/email/default/alert-confirm.txt19
-rw-r--r--templates/email/default/alert-problem-area.txt18
-rw-r--r--templates/email/default/alert-problem-council.txt19
-rw-r--r--templates/email/default/alert-problem-nearby.txt20
-rw-r--r--templates/email/default/alert-problem-ward.txt22
-rw-r--r--templates/email/default/alert-problem.txt19
-rw-r--r--templates/email/default/alert-update.txt20
-rw-r--r--templates/email/default/confirm_report_sent.txt24
-rw-r--r--templates/email/default/login.txt10
-rw-r--r--templates/email/default/partial.txt13
-rw-r--r--templates/email/default/problem-confirm.txt24
-rw-r--r--templates/email/default/questionnaire.txt21
-rw-r--r--templates/email/default/reply-autoresponse44
-rw-r--r--templates/email/default/signature.txt3
-rw-r--r--templates/email/default/submit-brent.txt2
-rw-r--r--templates/email/default/submit-example.txt2
-rw-r--r--templates/email/default/submit.txt2
-rw-r--r--templates/email/default/update-confirm-donotsend.txt3
-rw-r--r--templates/email/default/update-confirm.txt14
-rw-r--r--templates/email/fixmystreet/alert-problem-area.txt14
-rw-r--r--templates/email/fixmystreet/alert-problem-council.txt13
-rw-r--r--templates/email/fixmystreet/alert-problem-nearby.txt12
-rw-r--r--templates/email/fixmystreet/alert-problem-ward.txt14
-rw-r--r--templates/email/fixmystreet/alert-problem.txt12
-rw-r--r--templates/email/fixmystreet/alert-update.txt19
-rw-r--r--templates/email/fixmystreet/signature.txt11
-rw-r--r--templates/email/fixmystreet/update-confirm-donotsend.txt8
-rw-r--r--templates/web/default/admin/config_page.html1
-rw-r--r--templates/web/default/my/my.html2
-rw-r--r--templates/web/fixamingata/front/recent.html30
-rw-r--r--templates/web/fixamingata/index.html84
-rw-r--r--templates/web/fixmystreet/front/recent.html24
-rw-r--r--templates/web/fixmystreet/index.html25
-rw-r--r--templates/web/fixmystreet/my/my.html2
-rw-r--r--templates/web/fixmystreet/questionnaire/completed-open.html20
-rw-r--r--web/js/map-bing-ol.js2
75 files changed, 22167 insertions, 17215 deletions
diff --git a/.gitignore b/.gitignore
index eae1bd32f..f60e3084c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
*.ttc
+*.swp
*~
._*
diff --git a/.tx/config b/.tx/config
index 6023a14d1..29315d247 100644
--- a/.tx/config
+++ b/.tx/config
@@ -2,7 +2,7 @@
host = https://www.transifex.com
type = PO
-[fixmystreet.v1-3]
+[fixmystreet.v1-4]
file_filter = locale/<lang>.UTF-8/LC_MESSAGES/FixMyStreet.po
source_file = locale/FixMyStreet.po
source_lang = en_GB
diff --git a/README.md b/README.md
index b606192f1..b52d13e3d 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ RSS alerts of problems in their area.
It was created in 2007 by [mySociety](http://www.mysociety.org/) for reporting
problems to UK councils and has been copied around the world. The FixMyStreet
-Platform is now at version 1.3.
+Platform is now at version 1.4.1.
## Installation
@@ -38,6 +38,40 @@ We've extracted all of the mobile apps from this repository into the
## Releases
+* v1.4.1 (23rd May 2014)
+ - Don't run some cron scripts by default, and rejig timings, to alleviate
+ memory problems on EC2 micro instances. #640
+* v1.4 (16th May 2014)
+ - User improvements:
+ - Adds some guidance on an empty /my page. #671
+ - Auto-selects the category when reporting if there is only one. #690
+ - Stops indenting emails a few spaces. #715
+ - Email template updates. #700
+ - Installation/developer improvements:
+ - Makes it easier to change the pin icons. #721
+ - Sends reports on staging sites to the reporter. #653
+ - Adds a no-op send method to suspend report sending. #507
+ - Improves the example Apache config. #733
+ - Includes a nicer crontab example. #621
+ - New developer scripts:
+ - make_css_watch. #680
+ - geocode. #758
+ - Adds external_url field to Bodies. #710
+ - Reinstates Open311 original update fetching code. #710 #755
+ - Pins sass/compass versions. #585
+ - Adds new MAPIT_GENERATION variable. #784
+ - Bugfixes:
+ - Fixes MapQuest and OSM attribution. #710 #687
+ - Remove cached photos when deleted from admin.
+ - Tiny bugfixes processing Open311 updates. #677
+ - Correctly sets language in email alert loop. #542
+ - Cron emails use EMAIL_DOMAIN in Message-ID. #678
+ - Minor fixes for Debian wheezy.
+ - Graph display of fixed states.
+ - Slight CSS simplification. #609
+ - Internal things:
+ - Improves the robustness of Carton installation. #675
+ - Doubles the speed of running tests on Travis.
* v1.3 (12th November 2013)
- Changes cobrand behaviour so if only one is specified, always use it. #598
- Allows multiple email addresses to be given for a contact.
diff --git a/bin/cpanm b/bin/cpanm
index 14a9a3cb4..954aae1bf 100755
--- a/bin/cpanm
+++ b/bin/cpanm
@@ -4,732 +4,85 @@
# install itself for you. You might want to run it as a root with sudo
# if you want to install to places like /usr/local/bin.
#
-# % curl -L http://cpanmin.us | perl - --self-upgrade
+# % curl -L http://cpanmin.us | perl - App::cpanminus
#
# If you don't have curl but wget, replace `curl -L` with `wget -O -`.
#
# For more details about this program, visit http://search.cpan.org/dist/App-cpanminus
-#
+
+our $VERSION = "1.6928";
# DO NOT EDIT -- this is an auto generated file
+
# This chunk of stuff was generated by App::FatPacker. To find the original
# file's code, look for the end of this BEGIN block or the string 'FATPACK'
BEGIN {
my %fatpacked;
$fatpacked{"App/cpanminus.pm"} = <<'APP_CPANMINUS';
- package App::cpanminus;
- our $VERSION = "1.5007";
-
- =head1 NAME
-
- App::cpanminus - get, unpack, build and install modules from CPAN
-
- =head1 SYNOPSIS
-
- cpanm Module
-
- Run C<cpanm -h> for more options.
-
- =head1 DESCRIPTION
-
- cpanminus is a script to get, unpack, build and install modules from
- CPAN and does nothing else.
-
- It's dependency free (can bootstrap itself), requires zero
- configuration, and stands alone. When running, it requires only 10MB
- of RAM.
-
- =head1 INSTALLATION
-
- There are several ways to install cpanminus to your system.
-
- =head2 Package management system
-
- There are Debian packages, RPMs, FreeBSD ports, and packages for other
- operation systems available. If you want to use the package management system,
- search for cpanminus and use the appropriate command to install. This makes it
- easy to install C<cpanm> to your system without thinking about where to
- install, and later upgrade.
-
- =head2 Installing to system perl
-
- You can also use the latest cpanminus to install cpanminus itself:
-
- curl -L http://cpanmin.us | perl - --sudo App::cpanminus
-
- This will install C<cpanm> to your bin directory like
- C</usr/local/bin> (unless you configured C<INSTALL_BASE> with
- L<local::lib>), so you probably need the C<--sudo> option.
-
- =head2 Installing to local perl (perlbrew)
-
- If you have perl in your home directory, which is the case if you use
- tools like L<perlbrew>, you don't need the C<--sudo> option, since
- you're most likely to have a write permission to the perl's library
- path. You can just do:
-
- curl -L http://cpanmin.us | perl - App::cpanminus
-
- to install the C<cpanm> executable to the perl's bin path, like
- C<~/perl5/perlbrew/bin/cpanm>.
-
- =head2 Downloading the standalone executable
-
- You can also copy the standalone executable to whatever location you'd like.
-
- cd ~/bin
- curl -LO http://xrl.us/cpanm
- chmod +x cpanm
- # edit shebang if you don't have /usr/bin/env
-
- This just works, but be sure to grab the new version manually when you
- upgrade because C<--self-upgrade> might not work for this.
-
- =head1 DEPENDENCIES
-
- perl 5.8 or later.
-
- =over 4
-
- =item *
-
- 'tar' executable (bsdtar or GNU tar version 1.22 are rcommended) or Archive::Tar to unpack files.
-
- =item *
-
- C compiler, if you want to build XS modules.
-
- =item *
-
- make
-
- =item *
-
- Module::Build (core in 5.10)
-
- =back
-
- =head1 QUESTIONS
-
- =head2 Another CPAN installer?
-
- OK, the first motivation was this: the CPAN shell runs out of memory (or swaps
- heavily and gets really slow) on Slicehost/linode's most affordable plan with
- only 256MB RAM. Should I pay more to install perl modules from CPAN? I don't
- think so.
-
- =head2 But why a new client?
-
- First of all, let me be clear that CPAN and CPANPLUS are great tools
- I've used for I<literally> years (you know how many modules I have on
- CPAN, right?). I really respect their efforts of maintaining the most
- important tools in the CPAN toolchain ecosystem.
-
- However, for less experienced users (mostly from outside the Perl community),
- or even really experienced Perl developers who know how to shoot themselves in
- their feet, setting up the CPAN toolchain often feels like yak shaving,
- especially when all they want to do is just install some modules and start
- writing code.
-
- =head2 Zero-conf? How does this module get/parse/update the CPAN index?
-
- It queries the CPAN Meta DB site running on Google AppEngine at
- L<http://cpanmetadb.plackperl.org/>. The site is updated every hour to reflect
- the latest changes from fast syncing mirrors. The script then also falls back
- to scrape the site L<http://search.cpan.org/>.
-
- Fetched files are unpacked in C<~/.cpanm> and automatically cleaned up
- periodically. You can configure the location of this with the
- C<PERL_CPANM_HOME> environment variable.
-
- =head2 Where does this install modules to? Do I need root access?
-
- It installs to wherever ExtUtils::MakeMaker and Module::Build are
- configured to (via C<PERL_MM_OPT> and C<PERL_MB_OPT>). So if you're
- using local::lib, then it installs to your local perl5
- directory. Otherwise it installs to the site_perl directory that
- belongs to your perl.
-
- cpanminus at a boot time checks whether you have configured
- local::lib, or have the permission to install modules to the site_perl
- directory. If neither, it automatically sets up local::lib compatible
- installation path in a C<perl5> directory under your home
- directory. To avoid this, run the script as the root user, with
- C<--sudo> option or with C<--local-lib> option.
-
- =head2 cpanminus can't install the module XYZ. Is it a bug?
-
- It is more likely a problem with the distribution itself. cpanminus
- doesn't support or is known to have issues with distributions like as
- follows:
-
- =over 4
-
- =item *
-
- Tests that require input from STDIN.
-
- =item *
-
- Tests that might fail when C<AUTOMATED_TESTING> is enabled.
-
- =item *
-
- Modules that have invalid numeric values as VERSION (such as C<1.1a>)
-
- =back
-
- These failures can be reported back to the author of the module so
- that they can fix it accordingly, rather than me.
-
- =head2 Does cpanm support the feature XYZ of L<CPAN> and L<CPANPLUS>?
-
- Most likely not. Here are the things that cpanm doesn't do by
- itself. And it's a feature - you got that from the name I<minus>,
- right?
-
- If you need these features, use L<CPAN>, L<CPANPLUS> or the standalone
- tools that are mentioned.
-
- =over 4
-
- =item *
-
- Bundle:: module dependencies
-
- =item *
-
- CPAN testers reporting
-
- =item *
-
- Building RPM packages from CPAN modules
-
- =item *
-
- Listing the outdated modules that needs upgrading. See L<App::cpanoutdated>
-
- =item *
-
- Uninstalling modules. See L<pm-uninstall>.
-
- =item *
-
- Showing the changes of the modules you're about to upgrade. See L<cpan-listchanges>
-
- =item *
-
- Patching CPAN modules with distroprefs.
-
- =back
-
- See L<cpanm> or C<cpanm -h> to see what cpanminus I<can> do :)
-
- =head1 COPYRIGHT
-
- Copyright 2010- Tatsuhiko Miyagawa
-
- The standalone executable contains the following modules embedded.
-
- =over 4
-
- =item L<CPAN::DistnameInfo> Copyright 2003 Graham Barr
-
- =item L<Parse::CPAN::Meta> Copyright 2006-2009 Adam Kennedy
-
- =item L<local::lib> Copyright 2007-2009 Matt S Trout
-
- =item L<HTTP::Tiny> Copyright 2011 Christian Hansen
-
- =item L<Module::Metadata> Copyright 2001-2006 Ken Williams. 2010 Matt S Trout
-
- =item L<version> Copyright 2004-2010 John Peacock
-
- =item L<JSON::PP> Copyright 2007−2011 by Makamaka Hannyaharamitu
-
- =item L<CPAN::Meta> Copyright (c) 2010 by David Golden and Ricardo Signes
-
- =item L<Try::Tiny> Copyright (c) 2009 Yuval Kogman
-
- =item L<parent> Copyright (c) 2007-10 Max Maischein
-
- =item L<Version::Requirements> copyright (c) 2010 by Ricardo Signes
-
- =item L<CPAN::Meta::YAML> copyright (c) 2010 by Adam Kennedy
-
- =back
-
- =head1 LICENSE
-
- Same as Perl.
-
- =head1 CREDITS
-
- =head2 CONTRIBUTORS
-
- Patches and code improvements were contributed by:
-
- Goro Fuji, Kazuhiro Osawa, Tokuhiro Matsuno, Kenichi Ishigaki, Ian
- Wells, Pedro Melo, Masayoshi Sekimura, Matt S Trout (mst), squeeky,
- horus and Ingy dot Net.
-
- =head2 ACKNOWLEDGEMENTS
-
- Bug reports, suggestions and feedbacks were sent by, or general
- acknowledgement goes to:
-
- Jesse Vincent, David Golden, Andreas Koenig, Jos Boumans, Chris
- Williams, Adam Kennedy, Audrey Tang, J. Shirley, Chris Prather, Jesse
- Luehrs, Marcus Ramberg, Shawn M Moore, chocolateboy, Chirs Nehren,
- Jonathan Rockway, Leon Brocard, Simon Elliott, Ricardo Signes, AEvar
- Arnfjord Bjarmason, Eric Wilhelm, Florian Ragwitz and xaicron.
-
- =head1 COMMUNITY
-
- =over 4
-
- =item L<http://github.com/miyagawa/cpanminus> - source code repository, issue tracker
-
- =item L<irc://irc.perl.org/#toolchain> - discussions about Perl toolchain. I'm there.
-
- =back
-
- =head1 NO WARRANTY
-
- This software is provided "as-is," without any express or implied
- warranty. In no event shall the author be held liable for any damages
- arising from the use of the software.
-
- =head1 SEE ALSO
-
- L<CPAN> L<CPANPLUS> L<pip>
-
- =cut
-
- 1;
+ package App::cpanminus;our$VERSION="1.7001";1;
APP_CPANMINUS
+$fatpacked{"App/cpanminus/CPANVersion.pm"} = <<'APP_CPANMINUS_CPANVERSION';
+ package App::cpanminus::CPANVersion;use strict;sub vcmp {my($self,$l,$r)=@_;local($^W)=0;return 0 if$l eq $r;for ($l,$r){s/_//g}for ($l,$r){next unless tr/.// > 1 || /^v/;s/^v?/v/;1 while s/\.0+(\d)/.$1/}if ($l=~/^v/ <=> $r=~/^v/){for ($l,$r){next if /^v/;$_=$self->float2vv($_)}}my$lvstring="v0";my$rvstring="v0";if ($] >= 5.006 && $l =~ /^v/ && $r =~ /^v/){$lvstring=$self->vstring($l);$rvstring=$self->vstring($r)}return (($l ne "undef")<=> ($r ne "undef")|| $lvstring cmp $rvstring || $l <=> $r || $l cmp $r)}sub vgt {my($self,$l,$r)=@_;$self->vcmp($l,$r)> 0}sub vlt {my($self,$l,$r)=@_;$self->vcmp($l,$r)< 0}sub vge {my($self,$l,$r)=@_;$self->vcmp($l,$r)>= 0}sub vle {my($self,$l,$r)=@_;$self->vcmp($l,$r)<= 0}sub vstring {my($self,$n)=@_;$n =~ s/^v// or die "CPAN::Version::vstring() called with invalid arg [$n]";pack "U*",split /\./,$n}sub float2vv {my($self,$n)=@_;my($rev)=int($n);$rev ||=0;my($mantissa)=$n =~ /\.(\d{1,12})/;$mantissa ||=0;$mantissa .= "0" while length($mantissa)%3;my$ret="v" .$rev;while ($mantissa){$mantissa =~ s/(\d{1,3})// or die "Panic: length>0 but not a digit? mantissa[$mantissa]";$ret .= ".".int($1)}$ret =~ s/(\.0)+/.0/;$ret}sub readable {my($self,$n)=@_;$n =~ /^([\w\-\+\.]+)/;return $1 if defined $1 && length($1)>0;if ($] < 5.006){warn("Suspicious version string seen [$n]\n");return$n}my$better=sprintf "v%vd",$n;return$better}1;
+APP_CPANMINUS_CPANVERSION
+
+$fatpacked{"App/cpanminus/Dependency.pm"} = <<'APP_CPANMINUS_DEPENDENCY';
+ package App::cpanminus::Dependency;use strict;use CPAN::Meta::Requirements;sub from_prereqs {my($class,$prereq,$phases,$types)=@_;my@deps;for my$type (@$types){my$req=CPAN::Meta::Requirements->new;$req->add_requirements($prereq->requirements_for($_,$type))for @$phases;push@deps,$class->from_versions($req->as_string_hash,$type)}return@deps}sub from_versions {my($class,$versions,$type)=@_;my@deps;while (my($module,$version)=each %$versions){push@deps,$class->new($module,$version,$type)}@deps}sub new {my($class,$module,$version,$type)=@_;bless {module=>$module,version=>$version,type=>$type || 'requires',},$class}sub module {$_[0]->{module}}sub version {$_[0]->{version}}sub type {$_[0]->{type}}sub is_requirement {$_[0]->{type}eq 'requires'}1;
+APP_CPANMINUS_DEPENDENCY
+
+$fatpacked{"App/cpanminus/ParsePM.pm"} = <<'APP_CPANMINUS_PARSEPM';
+ package App::cpanminus::ParsePM;use strict;use warnings;use Safe;use JSON::PP;use Dumpvalue;use version ();use File::Spec ();use File::Temp ();use POSIX ':sys_wait_h';use App::cpanminus::CPANVersion;our$VERSION='0.04';our$VERBOSE=0;our$ALLOW_DEV_VERSION=0;sub new {my ($class,$meta)=@_;bless {META_CONTENT=>$meta},$class}sub parse {my ($self,$pmfile)=@_;$pmfile =~ s|\\|/|g;my($filemtime)=(stat$pmfile)[9];$self->{MTIME}=$filemtime;$self->{PMFILE}=$pmfile;unless ($self->_version_from_meta_ok){$self->{VERSION}=$self->_parse_version;if ($self->{VERSION}=~ /^\{.*\}$/){}elsif ($self->{VERSION}=~ /[_\s]/ &&!$ALLOW_DEV_VERSION){return}}my($ppp)=$self->_packages_per_pmfile;my@keys_ppp=$self->_filter_ppps(sort keys %$ppp);$self->_verbose(1,"Will check keys_ppp[@keys_ppp]\n");my ($package);DBPACK: foreach$package (@keys_ppp){if ($package !~ /^\w[\w\:\']*\w?\z/ || $package !~ /\w\z/ || $package =~ /:/ && $package !~ /::/ || $package =~ /\w:\w/ || $package =~ /:::/){$self->_verbose(1,"Package[$package] did not pass the ultimate sanity check");delete$ppp->{$package};next}my$pp=$ppp->{$package};if ($pp->{version}&& $pp->{version}=~ /^\{.*\}$/){my$err=JSON::PP::decode_json($pp->{version});if ($err->{openerr}){$self->_verbose(1,qq{Parse::PMFile was not able to
+ read the file. It issued the following error: C< $err->{r} >},)}else {$self->_verbose(1,qq{Parse::PMFile was not able to
+ parse the following line in that file: C< $err->{line} >
+
+ Note: the indexer is running in a Safe compartement and cannot
+ provide the full functionality of perl in the VERSION line. It
+ is trying hard, but sometime it fails. As a workaround, please
+ consider writing a META.yml that contains a 'provides'
+ attribute or contact the CPAN admins to investigate (yet
+ another) workaround against "Safe" limitations.)},)}delete$ppp->{$package};next}for ($package,$pp->{version},){if (!defined || /^\s*$/ || /\s/){delete$ppp->{$package};next}}}return$ppp}sub _parse_version {my$self=shift;use strict;my$pmfile=$self->{PMFILE};my$tmpfile=File::Spec->catfile(File::Spec->tmpdir,"ParsePMFile$$" .rand(1000));my$pmcp=$pmfile;for ($pmcp){s/([^\\](\\\\)*)@/$1\\@/g}my($v);{package main;my$pid=fork();die "Can't fork: $!" unless defined$pid;if ($pid){waitpid($pid,0);if (open my$fh,'<',$tmpfile){$v=<$fh>}}else {my($comp)=Safe->new("_pause::mldistwatch");my$eval=qq{
+ local(\$^W) = 0;
+ App::cpanminus::ParsePM::_parse_version_safely("$pmcp");
+ };$comp->permit("entereval");$comp->share("*App::cpanminus::ParsePM::_parse_version_safely");$comp->share("*version::new");$comp->share("*version::numify");$comp->share_from('main',['*version::','*Exporter::','*DynaLoader::']);$comp->share_from('version',['&qv']);$comp->deny(qw/enteriter iter unstack goto/);{no strict;$v=$comp->reval($eval)}if ($@){my$err=$@;if (ref$err){if ($err->{line}=~ /[\$*]([\w\:\']*)\bVERSION\b.*?\=(.*)/){local*qv=\&version::qv;$v=eval "$2"}if ($@){$self->_verbose(1,sprintf("reval failed: err[%s] for eval[%s]",JSON::PP::encode_json($err),$eval,));$v=JSON::PP::encode_json($err)}}else {$v=JSON::PP::encode_json({openerr=>$err })}}if (defined$v){$v=$v->numify if ref($v)eq 'version'}else {$v=""}open my$fh,'>:utf8',$tmpfile;print$fh $v;exit 0}}unlink$tmpfile if -e $tmpfile;return$self->_normalize_version($v)}sub _packages_per_pmfile {my$self=shift;my$ppp={};my$pmfile=$self->{PMFILE};my$filemtime=$self->{MTIME};my$version=$self->{VERSION};$DB::single++;open my$fh,"<","$pmfile" or return$ppp;local $/="\n";my$inpod=0;PLINE: while (<$fh>){chomp;my($pline)=$_;$inpod=$pline =~ /^=(?!cut)/ ? 1 : $pline =~ /^=cut/ ? 0 : $inpod;next if$inpod;next if substr($pline,0,4)eq "=cut";$pline =~ s/\#.*//;next if$pline =~ /^\s*$/;if ($pline =~ /\b__(?:END|DATA)__\b/ and $pmfile !~ /\.PL$/){last PLINE}my$pkg;my$strict_version;if ($pline =~ m{
+ # (.*) # takes too much time if $pline is long
+ \bpackage\s+
+ ([\w\:\']+)
+ \s*
+ (?: $ | [\}\;] | \s+($version::STRICT) )
+ }x){$pkg=$1;$strict_version=$2;if ($pkg eq "DB"){next PLINE}}if ($pkg){$pkg =~ s/\'/::/;next PLINE unless$pkg =~ /^[A-Za-z]/;next PLINE unless$pkg =~ /\w$/;next PLINE if$pkg eq "main";next PLINE if length($pkg)> 128;$ppp->{$pkg}{parsed}++;$ppp->{$pkg}{infile}=$pmfile;if ($self->_simile($pmfile,$pkg)){$ppp->{$pkg}{simile}=$pmfile;if ($self->_version_from_meta_ok){my$provides=$self->{META_CONTENT}{provides};if (exists$provides->{$pkg}){if (exists$provides->{$pkg}{version}){my$v=$provides->{$pkg}{version};if ($v =~ /[_\s]/ &&!$ALLOW_DEV_VERSION){next PLINE}else {$ppp->{$pkg}{version}=$self->_normalize_version($v)}}else {$ppp->{$pkg}{version}="undef"}}}else {if (defined$strict_version){$ppp->{$pkg}{version}=$strict_version }else {$ppp->{$pkg}{version}=defined$version ? $version : ""}no warnings;if ($version eq 'undef'){$ppp->{$pkg}{version}=$version unless defined$ppp->{$pkg}{version}}else {$ppp->{$pkg}{version}=$version if$version > $ppp->{$pkg}{version}|| $version gt $ppp->{$pkg}{version}}}}else {$ppp->{$pkg}{version}=$version unless defined$ppp->{$pkg}{version}&& length($ppp->{$pkg}{version})}$ppp->{$pkg}{filemtime}=$filemtime}else {}}$fh->close;$ppp}{no strict;sub _parse_version_safely {my($parsefile)=@_;my$result;local*FH;local $/="\n";open(FH,$parsefile)or die "Could not open '$parsefile': $!";my$inpod=0;while (<FH>){$inpod=/^=(?!cut)/ ? 1 : /^=cut/ ? 0 : $inpod;next if$inpod || /^\s*#/;chop;next unless /([\$*])(([\w\:\']*)\bVERSION)\b.*\=/;my$current_parsed_line=$_;my$eval=qq{
+ package #
+ ExtUtils::MakeMaker::_version;
+
+ local $1$2;
+ \$$2=undef; do {
+ $_
+ }; \$$2
+ };local $^W=0;local$SIG{__WARN__}=sub {};$result=eval($eval);if ($@ or!defined$result){die +{eval=>$eval,line=>$current_parsed_line,file=>$parsefile,err=>$@,}}last}close FH;$result="undef" unless defined$result;return$result}}sub _filter_ppps {my($self,@ppps)=@_;my@res;MANI: for my$ppp (@ppps){if ($self->{META_CONTENT}){my$no_index=$self->{META_CONTENT}{no_index}|| $self->{META_CONTENT}{private};if (ref($no_index)eq 'HASH'){my%map=(package=>qr{\z},namespace=>qr{::},);for my$k (qw(package namespace)){next unless my$v=$no_index->{$k};my$rest=$map{$k};if (ref$v eq "ARRAY"){for my$ve (@$v){$ve =~ s|::$||;if ($ppp =~ /^$ve$rest/){$self->_verbose(1,"Skipping ppp[$ppp] due to ve[$ve]");next MANI}else {$self->_verbose(1,"NOT skipping ppp[$ppp] due to ve[$ve]")}}}else {$v =~ s|::$||;if ($ppp =~ /^$v$rest/){$self->_verbose(1,"Skipping ppp[$ppp] due to v[$v]");next MANI}else {$self->_verbose(1,"NOT skipping ppp[$ppp] due to v[$v]")}}}}else {$self->_verbose(1,"No keyword 'no_index' or 'private' in META_CONTENT")}}else {}push@res,$ppp}$self->_verbose(1,"Result of filter_ppps: res[@res]");@res}sub _simile {my($self,$file,$package)=@_;$file =~ s|.*/||;$file =~ s|\.pm(?:\.PL)?||;my$ret=$package =~ m/\b\Q$file\E$/;$ret ||=0;unless ($ret){$ret=1 if lc$file eq 'version'}$self->_verbose(1,"Result of simile(): file[$file] package[$package] ret[$ret]\n");$ret}sub _normalize_version {my($self,$v)=@_;$v="undef" unless defined$v;my$dv=Dumpvalue->new;my$sdv=$dv->stringify($v,1);$self->_verbose(1,"Result of normalize_version: sdv[$sdv]\n");return$v if$v eq "undef";return$v if$v =~ /^\{.*\}$/;$v =~ s/^\s+//;$v =~ s/\s+\z//;if ($v =~ /_/){return$v }my$vv=eval {no warnings;version->new($v)->numify};if ($@){return "undef"}if ($vv eq $v){}else {my$forced=$self->_force_numeric($v);if ($forced eq $vv){}elsif ($forced =~ /^v(.+)/){$vv=version->new($1)->numify}else {if ($forced==$vv){$vv=$forced}}}return$vv}sub _force_numeric {my($self,$v)=@_;$v=App::cpanminus::CPANVersion->readable($v);if ($v =~ /^(\+?)(\d*)(\.(\d*))?/ && (defined $2 && length $2 || defined $4 && length $4)){my$two=defined $2 ? $2 : "";my$three=defined $3 ? $3 : "";$v="$two$three"}$v}sub _version_from_meta_ok {my($self)=@_;return$self->{VERSION_FROM_META_OK}if exists$self->{VERSION_FROM_META_OK};my$c=$self->{META_CONTENT};return($self->{VERSION_FROM_META_OK}=0)unless$c->{provides};my ($mb_v)=(defined$c->{generated_by}? $c->{generated_by}: '')=~ /Module::Build version ([\d\.]+)/;return($self->{VERSION_FROM_META_OK}=1)unless$mb_v;return($self->{VERSION_FROM_META_OK}=1)if$mb_v eq '0.250.0';if ($mb_v >= 0.19 && $mb_v < 0.26 &&!keys %{$c->{provides}}){return($self->{VERSION_FROM_META_OK}=0)}return($self->{VERSION_FROM_META_OK}=1)}sub _verbose {my($self,$level,@what)=@_;warn@what if$level <= $VERBOSE}1;
+APP_CPANMINUS_PARSEPM
+
$fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';
- package App::cpanminus::script;
- use strict;
- use Config;
- use Cwd ();
- use File::Basename ();
- use File::Find ();
- use File::Path ();
- use File::Spec ();
- use File::Copy ();
- use Getopt::Long ();
- use Parse::CPAN::Meta;
- use Symbol ();
-
- use constant WIN32 => $^O eq 'MSWin32';
- use constant SUNOS => $^O eq 'solaris';
-
- our $VERSION = "1.5007";
-
- my $quote = WIN32 ? q/"/ : q/'/;
-
- sub new {
- my $class = shift;
-
- bless {
- home => "$ENV{HOME}/.cpanm",
- cmd => 'install',
- seen => {},
- notest => undef,
- installdeps => undef,
- force => undef,
- sudo => undef,
- make => undef,
- verbose => undef,
- quiet => undef,
- interactive => undef,
- log => undef,
- mirrors => [],
- mirror_only => undef,
- mirror_index => undef,
- perl => $^X,
- argv => [],
- local_lib => undef,
- self_contained => undef,
- prompt_timeout => 0,
- prompt => undef,
- configure_timeout => 60,
- try_lwp => 1,
- try_wget => 1,
- try_curl => 1,
- uninstall_shadows => ($] < 5.012),
- skip_installed => 1,
- skip_satisfied => 0,
- auto_cleanup => 7, # days
- pod2man => 1,
- installed_dists => 0,
- showdeps => 0,
- scandeps => 0,
- scandeps_tree => [],
- format => 'tree',
- save_dists => undef,
- skip_configure => 0,
- @_,
- }, $class;
- }
-
- sub env {
- my($self, $key) = @_;
- $ENV{"PERL_CPANM_" . $key};
- }
-
- sub parse_options {
- my $self = shift;
-
- local @ARGV = @{$self->{argv}};
- push @ARGV, split /\s+/, $self->env('OPT');
- push @ARGV, @_;
-
- Getopt::Long::Configure("bundling");
- Getopt::Long::GetOptions(
- 'f|force' => sub { $self->{skip_installed} = 0; $self->{force} = 1 },
- 'n|notest!' => \$self->{notest},
- 'S|sudo!' => \$self->{sudo},
- 'v|verbose' => sub { $self->{verbose} = $self->{interactive} = 1 },
- 'q|quiet!' => \$self->{quiet},
- 'h|help' => sub { $self->{action} = 'show_help' },
- 'V|version' => sub { $self->{action} = 'show_version' },
- 'perl=s' => \$self->{perl},
- 'l|local-lib=s' => sub { $self->{local_lib} = $self->maybe_abs($_[1]) },
- 'L|local-lib-contained=s' => sub {
- $self->{local_lib} = $self->maybe_abs($_[1]);
- $self->{self_contained} = 1;
- $self->{pod2man} = undef;
- },
- 'mirror=s@' => $self->{mirrors},
- 'mirror-only!' => \$self->{mirror_only},
- 'mirror-index=s' => sub { $self->{mirror_index} = $_[1]; $self->{mirror_only} = 1 },
- 'cascade-search!' => \$self->{cascade_search},
- 'prompt!' => \$self->{prompt},
- 'installdeps' => \$self->{installdeps},
- 'skip-installed!' => \$self->{skip_installed},
- 'skip-satisfied!' => \$self->{skip_satisfied},
- 'reinstall' => sub { $self->{skip_installed} = 0 },
- 'interactive!' => \$self->{interactive},
- 'i|install' => sub { $self->{cmd} = 'install' },
- 'info' => sub { $self->{cmd} = 'info' },
- 'look' => sub { $self->{cmd} = 'look'; $self->{skip_installed} = 0 },
- 'self-upgrade' => sub { $self->{cmd} = 'install'; $self->{skip_installed} = 1; push @ARGV, 'App::cpanminus' },
- 'uninst-shadows!' => \$self->{uninstall_shadows},
- 'lwp!' => \$self->{try_lwp},
- 'wget!' => \$self->{try_wget},
- 'curl!' => \$self->{try_curl},
- 'auto-cleanup=s' => \$self->{auto_cleanup},
- 'man-pages!' => \$self->{pod2man},
- 'scandeps' => \$self->{scandeps},
- 'showdeps' => sub { $self->{showdeps} = 1; $self->{skip_installed} = 0 },
- 'format=s' => \$self->{format},
- 'save-dists=s' => sub {
- $self->{save_dists} = $self->maybe_abs($_[1]);
- },
- 'skip-configure!' => \$self->{skip_configure},
- 'metacpan' => \$self->{metacpan},
- );
-
- if (!@ARGV && $0 ne '-' && !-t STDIN){ # e.g. # cpanm < author/requires.cpanm
- push @ARGV, $self->load_argv_from_fh(\*STDIN);
- $self->{load_from_stdin} = 1;
- }
-
- $self->{argv} = \@ARGV;
- }
-
- sub check_libs {
- my $self = shift;
- return if $self->{_checked}++;
-
- $self->bootstrap_local_lib;
- if (@{$self->{bootstrap_deps} || []}) {
- local $self->{notest} = 1; # test failure in bootstrap should be tolerated
- local $self->{scandeps} = 0;
- $self->install_deps(Cwd::cwd, 0, @{$self->{bootstrap_deps}});
- }
- }
-
- sub doit {
- my $self = shift;
-
- $self->setup_home;
- $self->init_tools;
-
- if (my $action = $self->{action}) {
- $self->$action() and return 1;
- }
-
- $self->show_help(1)
- unless @{$self->{argv}} or $self->{load_from_stdin};
-
- $self->configure_mirrors;
-
- my $cwd = Cwd::cwd;
+ package App::cpanminus::script;use strict;use Config;use Cwd ();use App::cpanminus;use File::Basename ();use File::Find ();use File::Path ();use File::Spec ();use File::Copy ();use File::Temp ();use Getopt::Long ();use Parse::CPAN::Meta;use Symbol ();use String::ShellQuote ();use version ();use aliased 'App::cpanminus::Dependency';use constant WIN32=>$^O eq 'MSWin32';use constant SUNOS=>$^O eq 'solaris';use constant CAN_SYMLINK=>eval {symlink("","");1};our$VERSION=$App::cpanminus::VERSION;if ($INC{"App/FatPacker/Trace.pm"}){require JSON::PP;require CPAN::Meta::YAML;require CPAN::Meta::Prereqs;require version::vpp;require File::pushd}my$quote=WIN32 ? q/"/ : q/'/;sub agent {my$self=shift;my$agent="cpanminus/$VERSION";$agent .= " perl/$]" if$self->{report_perl_version};$agent}sub determine_home {my$class=shift;my$homedir=$ENV{HOME}|| eval {require File::HomeDir;File::HomeDir->my_home}|| join('',@ENV{qw(HOMEDRIVE HOMEPATH)});if (WIN32){require Win32;$homedir=Win32::GetShortPathName($homedir)}return "$homedir/.cpanm"}sub new {my$class=shift;bless {home=>$class->determine_home,cmd=>'install',seen=>{},notest=>undef,test_only=>undef,installdeps=>undef,force=>undef,sudo=>undef,make=>undef,verbose=>undef,quiet=>undef,interactive=>undef,log=>undef,mirrors=>[],mirror_only=>undef,mirror_index=>undef,cpanmetadb=>"http://cpanmetadb.plackperl.org/v1.0/",perl=>$^X,argv=>[],local_lib=>undef,self_contained=>undef,prompt_timeout=>0,prompt=>undef,configure_timeout=>60,build_timeout=>3600,test_timeout=>1800,try_lwp=>1,try_wget=>1,try_curl=>1,uninstall_shadows=>($] < 5.012),skip_installed=>1,skip_satisfied=>0,auto_cleanup=>7,pod2man=>1,installed_dists=>0,install_types=>['requires'],with_develop=>0,showdeps=>0,scandeps=>0,scandeps_tree=>[],format=>'tree',save_dists=>undef,skip_configure=>0,verify=>0,report_perl_version=>1,build_args=>{},features=>{},pure_perl=>0,cpanfile_path=>'cpanfile',@_,},$class}sub env {my($self,$key)=@_;$ENV{"PERL_CPANM_" .$key}}sub install_type_handlers {my$self=shift;my@handlers;for my$type (qw(recommends suggests)){push@handlers,"with-$type"=>sub {my%uniq;$self->{install_types}=[grep!$uniq{$_}++,@{$self->{install_types}},$type ]};push@handlers,"without-$type"=>sub {$self->{install_types}=[grep $_ ne $type,@{$self->{install_types}}]}}@handlers}sub build_args_handlers {my$self=shift;my@handlers;for my$phase (qw(configure build test install)){push@handlers,"$phase-args=s"=>\($self->{build_args}{$phase})}@handlers}sub parse_options {my$self=shift;local@ARGV=@{$self->{argv}};push@ARGV,grep length,split /\s+/,$self->env('OPT');push@ARGV,@_;Getopt::Long::Configure("bundling");Getopt::Long::GetOptions('f|force'=>sub {$self->{skip_installed}=0;$self->{force}=1},'n|notest!'=>\$self->{notest},'test-only'=>sub {$self->{notest}=0;$self->{skip_installed}=0;$self->{test_only}=1},'S|sudo!'=>\$self->{sudo},'v|verbose'=>\$self->{verbose},'verify!'=>\$self->{verify},'q|quiet!'=>\$self->{quiet},'h|help'=>sub {$self->{action}='show_help'},'V|version'=>sub {$self->{action}='show_version'},'perl=s'=>\$self->{perl},'l|local-lib=s'=>sub {$self->{local_lib}=$self->maybe_abs($_[1])},'L|local-lib-contained=s'=>sub {$self->{local_lib}=$self->maybe_abs($_[1]);$self->{self_contained}=1;$self->{pod2man}=undef},'self-contained!'=>\$self->{self_contained},'mirror=s@'=>$self->{mirrors},'mirror-only!'=>\$self->{mirror_only},'mirror-index=s'=>\$self->{mirror_index},'cpanmetadb=s'=>\$self->{cpanmetadb},'cascade-search!'=>\$self->{cascade_search},'prompt!'=>\$self->{prompt},'installdeps'=>\$self->{installdeps},'skip-installed!'=>\$self->{skip_installed},'skip-satisfied!'=>\$self->{skip_satisfied},'reinstall'=>sub {$self->{skip_installed}=0},'interactive!'=>\$self->{interactive},'i|install'=>sub {$self->{cmd}='install'},'info'=>sub {$self->{cmd}='info'},'look'=>sub {$self->{cmd}='look';$self->{skip_installed}=0},'U|uninstall'=>sub {$self->{cmd}='uninstall'},'self-upgrade'=>sub {$self->{action}='self_upgrade'},'uninst-shadows!'=>\$self->{uninstall_shadows},'lwp!'=>\$self->{try_lwp},'wget!'=>\$self->{try_wget},'curl!'=>\$self->{try_curl},'auto-cleanup=s'=>\$self->{auto_cleanup},'man-pages!'=>\$self->{pod2man},'scandeps'=>\$self->{scandeps},'showdeps'=>sub {$self->{showdeps}=1;$self->{skip_installed}=0},'format=s'=>\$self->{format},'save-dists=s'=>sub {$self->{save_dists}=$self->maybe_abs($_[1])},'skip-configure!'=>\$self->{skip_configure},'dev!'=>\$self->{dev_release},'metacpan!'=>\$self->{metacpan},'report-perl-version!'=>\$self->{report_perl_version},'configure-timeout=i'=>\$self->{configure_timeout},'build-timeout=i'=>\$self->{build_timeout},'test-timeout=i'=>\$self->{test_timeout},'with-develop'=>\$self->{with_develop},'without-develop'=>sub {$self->{with_develop}=0},'with-feature=s'=>sub {$self->{features}{$_[1]}=1},'without-feature=s'=>sub {$self->{features}{$_[1]}=0},'with-all-features'=>sub {$self->{features}{__all}=1},'pp|pureperl!'=>\$self->{pure_perl},"cpanfile=s"=>\$self->{cpanfile_path},$self->install_type_handlers,$self->build_args_handlers,);if (!@ARGV && $0 ne '-' &&!-t STDIN){push@ARGV,$self->load_argv_from_fh(\*STDIN);$self->{load_from_stdin}=1}$self->{argv}=\@ARGV}sub check_upgrade {my$self=shift;my$install_base=$ENV{PERL_LOCAL_LIB_ROOT}? $self->local_lib_target($ENV{PERL_LOCAL_LIB_ROOT}): $Config{installsitebin};if ($0 eq '-'){return}elsif ($0 !~ /^$install_base/){if ($0 =~ m!perlbrew/bin!){die <<DIE}else {die <<DIE}}}sub check_libs {my$self=shift;return if$self->{_checked}++;$self->bootstrap_local_lib;if (@{$self->{bootstrap_deps}|| []}){local$self->{notest}=1;local$self->{scandeps}=0;$self->install_deps(Cwd::cwd,0,@{$self->{bootstrap_deps}})}}sub setup_verify {my$self=shift;my$has_modules=eval {require Module::Signature;require Digest::SHA;1};$self->{cpansign}=$self->which('cpansign');unless ($has_modules && $self->{cpansign}){warn "WARNING: Module::Signature and Digest::SHA is required for distribution verifications.\n";$self->{verify}=0}}sub parse_module_args {my($self,$module)=@_;$module =~ s/^([A-Za-z0-9_:]+)@([v\d\._]+)$/$1~== $2/;if ($module =~ /\~[v\d\._,\!<>= ]+$/){return split /\~/,$module,2}else {return$module,undef}}sub _exit {my($self,$code)=@_;die App::cpanminus::CommandExit->new($code)}sub doit {my$self=shift;my$code;eval {$code=($self->_doit==0)};if (my$e=$@){if (ref$e eq 'App::cpanminus::CommandExit'){$code=$e->code}else {warn$e;$code=1}}return$code}sub _doit {my$self=shift;$self->setup_home;$self->init_tools;$self->setup_verify if$self->{verify};if (my$action=$self->{action}){$self->$action()and return 1}$self->show_help(1)unless @{$self->{argv}}or $self->{load_from_stdin};$self->configure_mirrors;my$cwd=Cwd::cwd;my@fail;for my$module (@{$self->{argv}}){if ($module =~ s/\.pm$//i){my ($volume,$dirs,$file)=File::Spec->splitpath($module);$module=join '::',grep {$_}File::Spec->splitdir($dirs),$file}($module,my$version)=$self->parse_module_args($module);$self->chdir($cwd);if ($self->{cmd}eq 'uninstall'){$self->uninstall_module($module)or push@fail,$module}else {$self->install_module($module,0,$version)or push@fail,$module}}if ($self->{base}&& $self->{auto_cleanup}){$self->cleanup_workdirs}if ($self->{installed_dists}){my$dists=$self->{installed_dists}> 1 ? "distributions" : "distribution";$self->diag("$self->{installed_dists} $dists installed\n",1)}if ($self->{scandeps}){$self->dump_scandeps()}$self->chdir($cwd);return!@fail}sub setup_home {my$self=shift;$self->{home}=$self->env('HOME')if$self->env('HOME');unless (_writable($self->{home})){die "Can't write to cpanm home '$self->{home}': You should fix it with chown/chmod first.\n"}$self->{base}="$self->{home}/work/" .time .".$$";File::Path::mkpath([$self->{base}],0,0777);$self->{log}=File::Spec->catfile($self->{base},"build.log");my$final_log="$self->{home}/build.log";{open my$out,">$self->{log}" or die "$self->{log}: $!"}if (CAN_SYMLINK){my$build_link="$self->{home}/latest-build";unlink$build_link;symlink$self->{base},$build_link;unlink$final_log;symlink$self->{log},$final_log}else {my$log=$self->{log};my$home=$self->{home};$self->{at_exit}=sub {my$self=shift;my$temp_log="$home/build.log." .time .".$$";File::Copy::copy($log,$temp_log)&& unlink($final_log)&& rename($temp_log,$final_log)}}$self->chat("cpanm (App::cpanminus) $VERSION on perl $] built for $Config{archname}\n" ."Work directory is $self->{base}\n")}sub package_index_for {my ($self,$mirror)=@_;return$self->source_for($mirror)."/02packages.details.txt"}sub generate_mirror_index {my ($self,$mirror)=@_;my$file=$self->package_index_for($mirror);my$gz_file=$file .'.gz';my$index_mtime=(stat$gz_file)[9];unless (-e $file && (stat$file)[9]>= $index_mtime){$self->chat("Uncompressing index file...\n");if (eval {require Compress::Zlib}){my$gz=Compress::Zlib::gzopen($gz_file,"rb")or do {$self->diag_fail("$Compress::Zlib::gzerrno opening compressed index");return};open my$fh,'>',$file or do {$self->diag_fail("$! opening uncompressed index for write");return};my$buffer;while (my$status=$gz->gzread($buffer)){if ($status < 0){$self->diag_fail($gz->gzerror ." reading compressed index");return}print$fh $buffer}}else {if (system("gunzip -c $gz_file > $file")){$self->diag_fail("Cannot uncompress -- please install gunzip or Compress::Zlib");return}}utime$index_mtime,$index_mtime,$file}return 1}sub search_mirror_index {my ($self,$mirror,$module,$version)=@_;$self->search_mirror_index_file($self->package_index_for($mirror),$module,$version)}sub search_mirror_index_file {my($self,$file,$module,$version)=@_;open my$fh,'<',$file or return;my$found;while (<$fh>){if (m!^\Q$module\E\s+([\w\.]+)\s+(\S*)!m){$found=$self->cpan_module($module,$2,$1);last}}return$found unless$self->{cascade_search};if ($found){if ($self->satisfy_version($module,$found->{module_version},$version)){return$found}else {$self->chat("Found $module $found->{module_version} which doesn't satisfy $version.\n")}}return}sub with_version_range {my($self,$version)=@_;defined($version)&& $version =~ /[<>=]/}sub encode_json {my($self,$data)=@_;require JSON::PP;my$json=JSON::PP::encode_json($data);$json =~ s/([^a-zA-Z0-9_\-.])/uc sprintf("%%%02x",ord($1))/eg;$json}sub version_to_query {my($self,$module,$version)=@_;require CPAN::Meta::Requirements;my$requirements=CPAN::Meta::Requirements->new;$requirements->add_string_requirement($module,$version || '0');my$req=$requirements->requirements_for_module($module);if ($req =~ s/^==\s*//){return {term=>{'module.version'=>$req },}}elsif ($req !~ /\s/){return {range=>{'module.version_numified'=>{'gte'=>$self->numify_ver($req)}},}}else {my%ops=qw(< lt <= lte > gt >= gte);my(%range,@exclusion);my@requirements=split /,\s*/,$req;for my$r (@requirements){if ($r =~ s/^([<>]=?)\s*//){$range{$ops{$1}}=$self->numify_ver($r)}elsif ($r =~ s/\!=\s*//){push@exclusion,$self->numify_ver($r)}}my@filters=({range=>{'module.version_numified'=>\%range }},);if (@exclusion){push@filters,{not=>{or=>[map {+{term=>{'module.version_numified'=>$self->numify_ver($_)}}}@exclusion ]},}}return@filters}}sub numify_ver {my($self,$ver)=@_;version->new($ver)->numify}sub maturity_filter {my($self,$module,$version)=@_;my@filters;if (!$self->with_version_range($version)or $self->{dev_release}){push@filters,{not=>{term=>{status=>'backpan' }}}}unless ($self->{dev_release}or $version =~ /==/){push@filters,{term=>{maturity=>'released' }}}return@filters}sub by_version {my%s=qw(latest 3 cpan 2 backpan 1);$b->{_score}<=> $a->{_score}|| $s{$b->{fields}{status}}<=> $s{$a->{fields}{status}}}sub by_first_come {$a->{fields}{date}cmp $b->{fields}{date}}sub by_date {$b->{fields}{date}cmp $a->{fields}{date}}sub find_best_match {my($self,$match,$version)=@_;return unless$match && @{$match->{hits}{hits}|| []};my@hits=$self->{dev_release}? sort {by_version || by_date}@{$match->{hits}{hits}}: sort {by_version || by_first_come}@{$match->{hits}{hits}};$hits[0]->{fields}}sub search_metacpan {my($self,$module,$version)=@_;require JSON::PP;$self->chat("Searching $module ($version) on metacpan ...\n");my$metacpan_uri='http://api.metacpan.org/v0';my@filter=$self->maturity_filter($module,$version);my$query={filtered=>{(@filter ? (filter=>{and=>\@filter }): ()),query=>{nested=>{score_mode=>'max',path=>'module',query=>{custom_score=>{metacpan_script=>"score_version_numified",query=>{constant_score=>{filter=>{and=>[{term=>{'module.authorized'=>JSON::PP::true()}},{term=>{'module.indexed'=>JSON::PP::true()}},{term=>{'module.name'=>$module }},$self->version_to_query($module,$version),]}}},}},}},}};my$module_uri="$metacpan_uri/file/_search?source=";$module_uri .= $self->encode_json({query=>$query,fields=>['date','release','module','status' ],});my($release,$module_version);my$module_json=$self->get($module_uri);my$module_meta=eval {JSON::PP::decode_json($module_json)};my$match=$self->find_best_match($module_meta);if ($match){$release=$match->{release};my$module_matched=(grep {$_->{name}eq $module}@{$match->{module}})[0];$module_version=$module_matched->{version}}unless ($release){$self->chat("! Could not find a release matching $module ($version) on MetaCPAN.\n");return}my$dist_uri="$metacpan_uri/release/_search?source=";$dist_uri .= $self->encode_json({filter=>{term=>{'release.name'=>$release },},fields=>['download_url','stat','status' ],});my$dist_json=$self->get($dist_uri);my$dist_meta=eval {JSON::PP::decode_json($dist_json)};if ($dist_meta){$dist_meta=$dist_meta->{hits}{hits}[0]{fields}}if ($dist_meta && $dist_meta->{download_url}){(my$distfile=$dist_meta->{download_url})=~ s!.+/authors/id/!!;local$self->{mirrors}=$self->{mirrors};if ($dist_meta->{status}eq 'backpan'){$self->{mirrors}=['http://backpan.perl.org' ]}elsif ($dist_meta->{stat}{mtime}> time()-24*60*60){$self->{mirrors}=['http://cpan.metacpan.org' ]}return$self->cpan_module($module,$distfile,$module_version)}$self->diag_fail("Finding $module on metacpan failed.");return}sub search_database {my($self,$module,$version)=@_;my$found;my$range=($self->with_version_range($version)|| $self->{dev_release});if ($range or $self->{metacpan}){$found=$self->search_metacpan($module,$version)and return$found;$found=$self->search_cpanmetadb($module,$version)and return$found}else {$found=$self->search_cpanmetadb($module,$version)and return$found;$found=$self->search_metacpan($module,$version)and return$found}}sub search_cpanmetadb {my($self,$module,$version)=@_;$self->chat("Searching $module on cpanmetadb ...\n");(my$uri=$self->{cpanmetadb})=~ s{/?$}{/package/$module};my$yaml=$self->get($uri);my$meta=$self->parse_meta_string($yaml);if ($meta && $meta->{distfile}){return$self->cpan_module($module,$meta->{distfile},$meta->{version})}$self->diag_fail("Finding $module on cpanmetadb failed.");return}sub search_module {my($self,$module,$version)=@_;if ($self->{mirror_index}){$self->mask_output(chat=>"Searching $module on mirror index $self->{mirror_index} ...\n");my$pkg=$self->search_mirror_index_file($self->{mirror_index},$module,$version);return$pkg if$pkg;unless ($self->{cascade_search}){$self->mask_output(diag_fail=>"Finding $module ($version) on mirror index $self->{mirror_index} failed.");return}}unless ($self->{mirror_only}){my$found=$self->search_database($module,$version);return$found if$found}MIRROR: for my$mirror (@{$self->{mirrors}}){$self->mask_output(chat=>"Searching $module on mirror $mirror ...\n");my$name='02packages.details.txt.gz';my$uri="$mirror/modules/$name";my$gz_file=$self->package_index_for($mirror).'.gz';unless ($self->{pkgs}{$uri}){$self->mask_output(chat=>"Downloading index file $uri ...\n");$self->mirror($uri,$gz_file);$self->generate_mirror_index($mirror)or next MIRROR;$self->{pkgs}{$uri}="!!retrieved!!"}my$pkg=$self->search_mirror_index($mirror,$module,$version);return$pkg if$pkg;$self->mask_output(diag_fail=>"Finding $module ($version) on mirror $mirror failed.")}return}sub source_for {my($self,$mirror)=@_;$mirror =~ s/[^\w\.\-]+/%/g;my$dir="$self->{home}/sources/$mirror";File::Path::mkpath([$dir ],0,0777);return$dir}sub load_argv_from_fh {my($self,$fh)=@_;my@argv;while(defined(my$line=<$fh>)){chomp$line;$line =~ s/#.+$//;$line =~ s/^\s+//;$line =~ s/\s+$//;push@argv,split ' ',$line if$line}return@argv}sub show_version {my$self=shift;print "cpanm (App::cpanminus) version $VERSION ($0)\n";print "perl version $] ($^X)\n\n";print " \%Config:\n";for my$key (qw(archname installsitelib installsitebin installman1dir installman3dir sitelibexp archlibexp privlibexp)){print " $key=$Config{$key}\n"}print " \%ENV:\n";for my$key (grep /^PERL/,sort keys%ENV){print " $key=$ENV{$key}\n"}print " \@INC:\n";for my$inc (@INC){print " $inc\n" unless ref($inc)eq 'CODE'}return 1}sub show_help {my$self=shift;if ($_[0]){print <<USAGE;$self->_exit(1)}print <<HELP;return 1}sub _writable {my$dir=shift;my@dir=File::Spec->splitdir($dir);while (@dir){$dir=File::Spec->catdir(@dir);if (-e $dir){return -w _}pop@dir}return}sub maybe_abs {my($self,$lib)=@_;if ($lib eq '_' or $lib =~ /^~/ or File::Spec->file_name_is_absolute($lib)){return$lib}else {return File::Spec->canonpath(File::Spec->catdir(Cwd::cwd(),$lib))}}sub local_lib_target {my($self,$root)=@_;(grep {$_ ne ''}split /\Q$Config{path_sep}/,$root)[-1]}sub bootstrap_local_lib {my$self=shift;if ($self->{local_lib}){return$self->setup_local_lib($self->{local_lib})}if ($ENV{PERL_LOCAL_LIB_ROOT}&& $ENV{PERL_MM_OPT}){return$self->setup_local_lib($self->local_lib_target($ENV{PERL_LOCAL_LIB_ROOT}),1)}return if$self->{sudo}or (_writable($Config{installsitelib})and _writable($Config{installsitebin}));if ($ENV{PERL_MM_OPT}and ($ENV{MODULEBUILDRC}or $ENV{PERL_MB_OPT})){$self->bootstrap_local_lib_deps;return}$self->setup_local_lib;$self->diag(<<DIAG,1);sleep 2}sub _core_only_inc {my($self,$base)=@_;require local::lib;(local::lib->resolve_path(local::lib->install_base_perl_path($base)),local::lib->resolve_path(local::lib->install_base_arch_path($base)),@Config{qw(privlibexp archlibexp)},)}sub _diff {my($self,$old,$new)=@_;my@diff;my%old=map {$_=>1}@$old;for my$n (@$new){push@diff,$n unless exists$old{$n}}@diff}sub _setup_local_lib_env {my($self,$base)=@_;$self->diag(<<WARN,1)if$base =~ /\s/;local$SIG{__WARN__}=sub {};local::lib->setup_env_hash_for($base,0)}sub setup_local_lib {my($self,$base,$no_env)=@_;$base=undef if$base eq '_';require local::lib;{local $0='cpanm';$base ||="~/perl5";$base=local::lib->resolve_path($base);if ($self->{self_contained}){my@inc=$self->_core_only_inc($base);$self->{search_inc}=[@inc ]}else {$self->{search_inc}=[local::lib->install_base_arch_path($base),local::lib->install_base_perl_path($base),@INC,]}$self->_setup_local_lib_env($base)unless$no_env;$self->{local_lib}=$base}$self->bootstrap_local_lib_deps}sub bootstrap_local_lib_deps {my$self=shift;push @{$self->{bootstrap_deps}},Dependency->new('ExtUtils::MakeMaker'=>6.31),Dependency->new('ExtUtils::Install'=>1.46)}sub prompt_bool {my($self,$mess,$def)=@_;my$val=$self->prompt($mess,$def);return lc$val eq 'y'}sub prompt {my($self,$mess,$def)=@_;my$isa_tty=-t STDIN && (-t STDOUT ||!(-f STDOUT || -c STDOUT));my$dispdef=defined$def ? "[$def] " : " ";$def=defined$def ? $def : "";if (!$self->{prompt}|| (!$isa_tty && eof STDIN)){return$def}local $|=1;local $\;my$ans;eval {local$SIG{ALRM}=sub {undef$ans;die "alarm\n"};print STDOUT "$mess $dispdef";alarm$self->{prompt_timeout}if$self->{prompt_timeout};$ans=<STDIN>;alarm 0};if (defined$ans){chomp$ans}else {print STDOUT "\n"}return (!defined$ans || $ans eq '')? $def : $ans}sub diag_ok {my($self,$msg)=@_;chomp$msg;$msg ||="OK";if ($self->{in_progress}){$self->_diag("$msg\n");$self->{in_progress}=0}$self->log("-> $msg\n")}sub diag_fail {my($self,$msg,$always)=@_;chomp$msg;if ($self->{in_progress}){$self->_diag("FAIL\n");$self->{in_progress}=0}if ($msg){$self->_diag("! $msg\n",$always,1);$self->log("-> FAIL $msg\n")}}sub diag_progress {my($self,$msg)=@_;chomp$msg;$self->{in_progress}=1;$self->_diag("$msg ... ");$self->log("$msg\n")}sub _diag {my($self,$msg,$always,$error)=@_;my$fh=$error ? *STDERR : *STDOUT;print {$fh}$msg if$always or $self->{verbose}or!$self->{quiet}}sub diag {my($self,$msg,$always)=@_;$self->_diag($msg,$always);$self->log($msg)}sub chat {my$self=shift;print STDERR @_ if$self->{verbose};$self->log(@_)}sub mask_output {my$self=shift;my$method=shift;$self->$method($self->mask_uri_passwords(@_))}sub log {my$self=shift;open my$out,">>$self->{log}";print$out @_}sub run {my($self,$cmd)=@_;if (WIN32){$cmd=$self->shell_quote(@$cmd)if ref$cmd eq 'ARRAY';unless ($self->{verbose}){$cmd .= " >> " .$self->shell_quote($self->{log})." 2>&1"}!system$cmd}else {my$pid=fork;if ($pid){waitpid$pid,0;return!$?}else {$self->run_exec($cmd)}}}sub run_exec {my($self,$cmd)=@_;if (ref$cmd eq 'ARRAY'){unless ($self->{verbose}){open my$logfh,">>",$self->{log};open STDERR,'>&',$logfh;open STDOUT,'>&',$logfh;close$logfh}exec @$cmd}else {unless ($self->{verbose}){$cmd .= " >> " .$self->shell_quote($self->{log})." 2>&1"}exec$cmd}}sub run_timeout {my($self,$cmd,$timeout)=@_;return$self->run($cmd)if WIN32 || $self->{verbose}||!$timeout;my$pid=fork;if ($pid){eval {local$SIG{ALRM}=sub {die "alarm\n"};alarm$timeout;waitpid$pid,0;alarm 0};if ($@ && $@ eq "alarm\n"){$self->diag_fail("Timed out (> ${timeout}s). Use --verbose to retry.");local$SIG{TERM}='IGNORE';kill TERM=>0;waitpid$pid,0;return}return!$?}elsif ($pid==0){$self->run_exec($cmd)}else {$self->chat("! fork failed: falling back to system()\n");$self->run($cmd)}}sub append_args {my($self,$cmd,$phase)=@_;if (my$args=$self->{build_args}{$phase}){$cmd=join ' ',$self->shell_quote(@$cmd),$args}$cmd}sub configure {my($self,$cmd,$depth)=@_;local$ENV{PERL5_CPAN_IS_RUNNING}=local$ENV{PERL5_CPANPLUS_IS_RUNNING}=$$;local$ENV{PERL5_CPANM_IS_RUNNING}=$$;my$use_default=!$self->{interactive};local$ENV{PERL_MM_USE_DEFAULT}=$use_default;local$ENV{PERL_MM_OPT}=$ENV{PERL_MM_OPT};local$ENV{PERL_MB_OPT}=$ENV{PERL_MB_OPT};unless ($self->{pod2man}){$ENV{PERL_MM_OPT}.= " INSTALLMAN1DIR=none INSTALLMAN3DIR=none";$ENV{PERL_MB_OPT}.= " --config installman1dir= --config installsiteman1dir= --config installman3dir= --config installsiteman3dir="}if ($self->{pure_perl}){$ENV{PERL_MM_OPT}.= " PUREPERL_ONLY=1";$ENV{PERL_MB_OPT}.= " --pureperl-only"}$cmd=$self->append_args($cmd,'configure')if$depth==0;local$self->{verbose}=$self->{verbose}|| $self->{interactive};$self->run_timeout($cmd,$self->{configure_timeout})}sub build {my($self,$cmd,$distname,$depth)=@_;local$ENV{PERL_MM_USE_DEFAULT}=!$self->{interactive};$cmd=$self->append_args($cmd,'build')if$depth==0;return 1 if$self->run_timeout($cmd,$self->{build_timeout});while (1){my$ans=lc$self->prompt("Building $distname failed.\nYou can s)kip, r)etry, e)xamine build log, or l)ook ?","s");return if$ans eq 's';return$self->build($cmd,$distname,$depth)if$ans eq 'r';$self->show_build_log if$ans eq 'e';$self->look if$ans eq 'l'}}sub test {my($self,$cmd,$distname,$depth)=@_;return 1 if$self->{notest};local$ENV{PERL_MM_USE_DEFAULT}=!$self->{interactive};local$ENV{NONINTERACTIVE_TESTING}=!$self->{interactive};$cmd=$self->append_args($cmd,'test')if$depth==0;return 1 if$self->run_timeout($cmd,$self->{test_timeout});if ($self->{force}){$self->diag_fail("Testing $distname failed but installing it anyway.");return 1}else {$self->diag_fail;while (1){my$ans=lc$self->prompt("Testing $distname failed.\nYou can s)kip, r)etry, f)orce install, e)xamine build log, or l)ook ?","s");return if$ans eq 's';return$self->test($cmd,$distname,$depth)if$ans eq 'r';return 1 if$ans eq 'f';$self->show_build_log if$ans eq 'e';$self->look if$ans eq 'l'}}}sub install {my($self,$cmd,$uninst_opts,$depth)=@_;if ($depth==0 && $self->{test_only}){return 1}if ($self->{sudo}){unshift @$cmd,"sudo"}if ($self->{uninstall_shadows}&&!$ENV{PERL_MM_OPT}){push @$cmd,@$uninst_opts}$cmd=$self->append_args($cmd,'install')if$depth==0;$self->run($cmd)}sub look {my$self=shift;my$shell=$ENV{SHELL};$shell ||=$ENV{COMSPEC}if WIN32;if ($shell){my$cwd=Cwd::cwd;$self->diag("Entering $cwd with $shell\n");system$shell}else {$self->diag_fail("You don't seem to have a SHELL :/")}}sub show_build_log {my$self=shift;my@pagers=($ENV{PAGER},(WIN32 ? (): ('less')),'more');my$pager;while (@pagers){$pager=shift@pagers;next unless$pager;$pager=$self->which($pager);next unless$pager;last}if ($pager){system("$pager < $self->{log}")}else {$self->diag_fail("You don't seem to have a PAGER :/")}}sub chdir {my$self=shift;Cwd::chdir(File::Spec->canonpath($_[0]))or die "$_[0]: $!"}sub configure_mirrors {my$self=shift;unless (@{$self->{mirrors}}){$self->{mirrors}=['http://www.cpan.org' ]}for (@{$self->{mirrors}}){s!^/!file:///!;s!/$!!}}sub self_upgrade {my$self=shift;$self->check_upgrade;$self->{argv}=['App::cpanminus' ];return}sub install_module {my($self,$module,$depth,$version)=@_;$self->check_libs;if ($self->{seen}{$module}++){$self->chat("Already tried $module. Skipping.\n");return 1}if ($self->{skip_satisfied}){my($ok,$local)=$self->check_module($module,$version || 0);if ($ok){$self->diag("You have $module ($local)\n",1);return 1}}my$dist=$self->resolve_name($module,$version);unless ($dist){my$what=$module .($version ? " ($version)" : "");$self->diag_fail("Couldn't find module or a distribution $what",1);return}if ($dist->{distvname}&& $self->{seen}{$dist->{distvname}}++){$self->chat("Already tried $dist->{distvname}. Skipping.\n");return 1}if ($self->{cmd}eq 'info'){print$self->format_dist($dist),"\n";return 1}$dist->{depth}=$depth;if ($dist->{module}){unless ($self->satisfy_version($dist->{module},$dist->{module_version},$version)){$self->diag("Found $dist->{module} $dist->{module_version} which doesn't satisfy $version.\n",1);return}my$cmp=$version ? "==" : "";my$requirement=$dist->{module_version}? "$cmp$dist->{module_version}" : 0;my($ok,$local)=$self->check_module($dist->{module},$requirement);if ($self->{skip_installed}&& $ok){$self->diag("$dist->{module} is up to date. ($local)\n",1);return 1}}if ($dist->{dist}eq 'perl'){$self->diag("skipping $dist->{pathname}\n");return 1}$self->diag("--> Working on $module\n");$dist->{dir}||=$self->fetch_module($dist);unless ($dist->{dir}){$self->diag_fail("Failed to fetch distribution $dist->{distvname}",1);return}$self->chat("Entering $dist->{dir}\n");$self->chdir($self->{base});$self->chdir($dist->{dir});if ($self->{cmd}eq 'look'){$self->look;return 1}return$self->build_stuff($module,$dist,$depth)}sub uninstall_search_path {my$self=shift;$self->{local_lib}? (local::lib->install_base_arch_path($self->{local_lib}),local::lib->install_base_perl_path($self->{local_lib})): @Config{qw(installsitearch installsitelib)}}sub uninstall_module {my ($self,$module)=@_;$self->check_libs;my@inc=$self->uninstall_search_path;my($metadata,$packlist)=$self->packlists_containing($module,\@inc);unless ($packlist){$self->diag_fail(<<DIAG,1);return}my@uninst_files=$self->uninstall_target($metadata,$packlist);$self->ask_permission($module,\@uninst_files)or return;$self->uninstall_files(@uninst_files,$packlist);$self->diag("Successfully uninstalled $module\n",1);return 1}sub packlists_containing {my($self,$module,$inc)=@_;require Module::Metadata;my$metadata=Module::Metadata->new_from_module($module,inc=>$inc)or return;my$packlist;my$wanted=sub {return unless $_ eq '.packlist' && -f $_;for my$file ($self->unpack_packlist($File::Find::name)){$packlist ||=$File::Find::name if$file eq $metadata->filename}};{require File::pushd;my$pushd=File::pushd::pushd();my@search=grep -d $_,map File::Spec->catdir($_,'auto'),@$inc;File::Find::find($wanted,@search)}return$metadata,$packlist}sub uninstall_target {my($self,$metadata,$packlist)=@_;if ($self->has_shadow_install($metadata)or $self->{local_lib}){grep$self->should_unlink($_),$self->unpack_packlist($packlist)}else {$self->unpack_packlist($packlist)}}sub has_shadow_install {my($self,$metadata)=@_;my@shadow=grep defined,map Module::Metadata->new_from_module($metadata->name,inc=>[$_]),@INC;@shadow >= 2}sub should_unlink {my($self,$file)=@_;if ($self->{local_lib}){$file =~ /^\Q$self->{local_lib}\E/}else {!(grep$file =~ /^\Q$_\E/,@Config{qw(installbin installscript installman1dir installman3dir)})}}sub ask_permission {my ($self,$module,$files)=@_;$self->diag("$module contains the following files:\n\n");for my$file (@$files){$self->diag(" $file\n")}$self->diag("\n");return 'force uninstall' if$self->{force};local$self->{prompt}=1;return$self->prompt_bool("Are you sure you want to uninstall $module?",'y')}sub unpack_packlist {my ($self,$packlist)=@_;open my$fh,'<',$packlist or die "$packlist: $!";map {chomp;$_}<$fh>}sub uninstall_files {my ($self,@files)=@_;$self->diag("\n");for my$file (@files){$self->diag("Unlink: $file\n");unlink$file or $self->diag_fail("$!: $file")}$self->diag("\n");return 1}sub format_dist {my($self,$dist)=@_;return "$dist->{cpanid}/$dist->{filename}"}sub trim {local $_=shift;tr/\n/ /d;s/^\s*|\s*$//g;$_}sub fetch_module {my($self,$dist)=@_;$self->chdir($self->{base});for my$uri (@{$dist->{uris}}){$self->mask_output(diag_progress=>"Fetching $uri");my$filename=$dist->{filename}|| $uri;my$name=File::Basename::basename($filename);my$cancelled;my$fetch=sub {my$file;eval {local$SIG{INT}=sub {$cancelled=1;die "SIGINT\n"};$self->mirror($uri,$name);$file=$name if -e $name};$self->diag("ERROR: " .trim("$@")."\n",1)if $@ && $@ ne "SIGINT\n";return$file};my($try,$file);while ($try++ < 3){$file=$fetch->();last if$cancelled or $file;$self->diag_fail("Download $uri failed. Retrying ... ")}if ($cancelled){$self->diag_fail("Download cancelled.");return}unless ($file){$self->diag_fail("Failed to download $uri");next}$self->diag_ok;$dist->{local_path}=File::Spec->rel2abs($name);my$dir=$self->unpack($file,$uri,$dist);next unless$dir;if (my$save=$self->{save_dists}){my$path=$dist->{pathname}? "$save/authors/id/$dist->{pathname}" : "$save/vendor/$file";$self->chat("Copying $name to $path\n");File::Path::mkpath([File::Basename::dirname($path)],0,0777);File::Copy::copy($file,$path)or warn $!}return$dist,$dir}}sub unpack {my($self,$file,$uri,$dist)=@_;if ($self->{verify}){$self->verify_archive($file,$uri,$dist)or return}$self->chat("Unpacking $file\n");my$dir=$file =~ /\.zip/i ? $self->unzip($file): $self->untar($file);unless ($dir){$self->diag_fail("Failed to unpack $file: no directory")}return$dir}sub verify_checksums_signature {my($self,$chk_file)=@_;require Module::Signature;$self->chat("Verifying the signature of CHECKSUMS\n");my$rv=eval {local$SIG{__WARN__}=sub {};my$v=Module::Signature::_verify($chk_file);$v==Module::Signature::SIGNATURE_OK()};if ($rv){$self->chat("Verified OK!\n")}else {$self->diag_fail("Verifying CHECKSUMS signature failed: $rv\n");return}return 1}sub verify_archive {my($self,$file,$uri,$dist)=@_;unless ($dist->{cpanid}){$self->chat("Archive '$file' does not seem to be from PAUSE. Skip verification.\n")}(my$mirror=$uri)=~ s!/authors/id.*$!!;(my$chksum_uri=$uri)=~ s!/[^/]*$!/CHECKSUMS!;my$chk_file=$self->source_for($mirror)."/$dist->{cpanid}.CHECKSUMS";$self->mask_output(diag_progress=>"Fetching $chksum_uri");$self->mirror($chksum_uri,$chk_file);unless (-e $chk_file){$self->diag_fail("Fetching $chksum_uri failed.\n");return}$self->diag_ok;$self->verify_checksums_signature($chk_file)or return;$self->verify_checksum($file,$chk_file)}sub verify_checksum {my($self,$file,$chk_file)=@_;$self->chat("Verifying the SHA1 for $file\n");open my$fh,"<$chk_file" or die "$chk_file: $!";my$data=join '',<$fh>;$data =~ s/\015?\012/\n/g;require Safe;my$chksum=Safe->new->reval($data);if (!ref$chksum or ref$chksum ne 'HASH'){$self->diag_fail("! Checksum file downloaded from $chk_file is broken.\n");return}if (my$sha=$chksum->{$file}{sha256}){my$hex=$self->sha1_for($file);if ($hex eq $sha){$self->chat("Checksum for $file: Verified!\n")}else {$self->diag_fail("Checksum mismatch for $file\n");return}}else {$self->chat("Checksum for $file not found in CHECKSUMS.\n");return}}sub sha1_for {my($self,$file)=@_;require Digest::SHA;open my$fh,"<",$file or die "$file: $!";my$dg=Digest::SHA->new(256);my($data);while (read($fh,$data,4096)){$dg->add($data)}return$dg->hexdigest}sub verify_signature {my($self,$dist)=@_;$self->diag_progress("Verifying the SIGNATURE file");my$out=`$self->{cpansign} -v --skip 2>&1`;$self->log($out);if ($out =~ /Signature verified OK/){$self->diag_ok("Verified OK");return 1}else {$self->diag_fail("SIGNATURE verificaion for $dist->{filename} failed\n");return}}sub resolve_name {my($self,$module,$version)=@_;if ($module =~ /^(ftp|https?|file):/){if ($module =~ m!authors/id/(.*)!){return$self->cpan_dist($1,$module)}else {return {uris=>[$module ]}}}if ($module =~ m!^[\./]! && -d $module){return {source=>'local',dir=>Cwd::abs_path($module),}}if (-f $module){return {source=>'local',uris=>["file://" .Cwd::abs_path($module)],}}if ($module =~ /(?:^git:|\.git(?:@.+)?$)/){return$self->git_uri($module)}if ($module =~ s!^cpan:///distfile/!!){return$self->cpan_dist($module)}if ($module =~ m!^(?:[A-Z]/[A-Z]{2}/)?([A-Z]{2}[\-A-Z0-9]*/.*)$!){return$self->cpan_dist($1)}return$self->search_module($module,$version)}sub cpan_module {my($self,$module,$dist,$version)=@_;my$dist=$self->cpan_dist($dist);$dist->{module}=$module;$dist->{module_version}=$version if$version && $version ne 'undef';return$dist}sub cpan_dist {my($self,$dist,$url)=@_;$dist =~ s!^([A-Z]{2})!substr($1,0,1)."/".substr($1,0,2)."/".$1!e;require CPAN::DistnameInfo;my$d=CPAN::DistnameInfo->new($dist);if ($url){$url=[$url ]unless ref$url eq 'ARRAY'}else {my$id=$d->cpanid;my$fn=substr($id,0,1)."/" .substr($id,0,2)."/" .$id ."/" .$d->filename;my@mirrors=@{$self->{mirrors}};my@urls=map "$_/authors/id/$fn",@mirrors;$url=\@urls,}return {$d->properties,source=>'cpan',uris=>$url,}}sub git_uri {my ($self,$uri)=@_;($uri,my$commitish)=split /(?<=\.git)@/i,$uri,2;my$dir=File::Temp::tempdir(CLEANUP=>1);$self->mask_output(diag_progress=>"Cloning $uri");$self->run(['git','clone',$uri,$dir ]);unless (-e "$dir/.git"){$self->diag_fail("Failed cloning git repository $uri",1);return}if ($commitish){require File::pushd;my$dir=File::pushd::pushd($dir);unless ($self->run(['git','checkout',$commitish ])){$self->diag_fail("Failed to checkout '$commitish' in git repository $uri\n");return}}$self->diag_ok;return {source=>'local',dir=>$dir,}}sub setup_module_build_patch {my$self=shift;open my$out,">$self->{base}/ModuleBuildSkipMan.pm" or die $!;print$out <<EOF}sub core_version_for {my($self,$module)=@_;require Module::CoreList;unless (exists$Module::CoreList::version{$]+0}){die sprintf("Module::CoreList %s (loaded from %s) doesn't seem to have entries for perl $]. " ."You're strongly recommended to upgrade Module::CoreList from CPAN.\n",$Module::CoreList::VERSION,$INC{"Module/CoreList.pm"})}unless (exists$Module::CoreList::version{$]+0}{$module}){return -1}return$Module::CoreList::version{$]+0}{$module}}sub check_module {my($self,$mod,$want_ver)=@_;require Module::Metadata;my$meta=Module::Metadata->new_from_module($mod,inc=>$self->{search_inc})or return 0,undef;my$version=$meta->version;if ($self->{self_contained}&& $self->loaded_from_perl_lib($meta)){$version=$self->core_version_for($mod);return 0,undef if$version && $version==-1}$self->{local_versions}{$mod}=$version;if ($self->is_deprecated($meta)){return 0,$version}elsif ($self->satisfy_version($mod,$version,$want_ver)){return 1,($version || 'undef')}else {return 0,$version}}sub satisfy_version {my($self,$mod,$version,$want_ver)=@_;$want_ver='0' unless defined($want_ver)&& length($want_ver);require CPAN::Meta::Requirements;my$requirements=CPAN::Meta::Requirements->new;$requirements->add_string_requirement($mod,$want_ver);$requirements->accepts_module($mod,$version)}sub unsatisfy_how {my($self,$ver,$want_ver)=@_;if ($want_ver =~ /^[v0-9\.\_]+$/){return "$ver < $want_ver"}else {return "$ver doesn't satisfy $want_ver"}}sub is_deprecated {my($self,$meta)=@_;my$deprecated=eval {require Module::CoreList;Module::CoreList::is_deprecated($meta->{module})};return$deprecated && $self->loaded_from_perl_lib($meta)}sub loaded_from_perl_lib {my($self,$meta)=@_;require Config;for my$dir (qw(archlibexp privlibexp)){my$confdir=$Config{$dir};if ($confdir eq substr($meta->filename,0,length($confdir))){return 1}}return}sub should_install {my($self,$mod,$ver)=@_;$self->chat("Checking if you have $mod $ver ... ");my($ok,$local)=$self->check_module($mod,$ver);if ($ok){$self->chat("Yes ($local)\n")}elsif ($local){$self->chat("No (" .$self->unsatisfy_how($local,$ver).")\n")}else {$self->chat("No\n")}return$mod unless$ok;return}sub check_perl_version {my($self,$version)=@_;require CPAN::Meta::Requirements;my$req=CPAN::Meta::Requirements->from_string_hash({perl=>$version });$req->accepts_module(perl=>$])}sub install_deps {my($self,$dir,$depth,@deps)=@_;my(@install,%seen,@fail);for my$dep (@deps){next if$seen{$dep->module};if ($dep->module eq 'perl'){if ($dep->is_requirement &&!$self->check_perl_version($dep->version)){$self->diag("Needs perl @{[$dep->version]}, you have $]\n");push@fail,'perl'}}elsif ($self->should_install($dep->module,$dep->version)){push@install,$dep;$seen{$dep->module}=1}}if (@install){$self->diag("==> Found dependencies: " .join(", ",map $_->module,@install)."\n")}for my$dep (@install){$self->install_module($dep->module,$depth + 1,$dep->version)}$self->chdir($self->{base});$self->chdir($dir)if$dir;if ($self->{scandeps}){return 1}my@not_ok=$self->unsatisfied_deps(@deps);if (@not_ok){return 0,\@not_ok}else {return 1}}sub unsatisfied_deps {my($self,@deps)=@_;require CPAN::Meta::Check;require CPAN::Meta::Requirements;my$reqs=CPAN::Meta::Requirements->new;for my$dep (grep $_->is_requirement,@deps){$reqs->add_string_requirement($dep->module=>$dep->version || '0')}my$ret=CPAN::Meta::Check::check_requirements($reqs,'requires',$self->{search_inc});grep defined,values %$ret}sub install_deps_bailout {my($self,$target,$dir,$depth,@deps)=@_;my($ok,$fail)=$self->install_deps($dir,$depth,@deps);if (!$ok){$self->diag_fail("Installing the dependencies failed: " .join(", ",@$fail),1);unless ($self->prompt_bool("Do you want to continue building $target anyway?","n")){$self->diag_fail("Bailing out the installation for $target.",1);return}}return 1}sub build_stuff {my($self,$stuff,$dist,$depth)=@_;if ($self->{verify}&& -e 'SIGNATURE'){$self->verify_signature($dist)or return}require CPAN::Meta;my($meta_file)=grep -f,qw(META.json META.yml);if ($meta_file){$self->chat("Checking configure dependencies from $meta_file\n");$dist->{cpanmeta}=eval {CPAN::Meta->load_file($meta_file)}}elsif ($dist->{dist}&& $dist->{version}){$self->chat("META.yml/json not found. Creating skeleton for it.\n");$dist->{cpanmeta}=CPAN::Meta->new({name=>$dist->{dist},version=>$dist->{version}})}$dist->{meta}=$dist->{cpanmeta}? $dist->{cpanmeta}->as_struct : {};my@config_deps;if ($dist->{cpanmeta}){push@config_deps,Dependency->from_prereqs($dist->{cpanmeta}->effective_prereqs,['configure'],$self->{install_types},)}else {push@config_deps,Dependency->from_versions($dist->{meta}{configure_requires}|| {},'configure',)}if (-e 'Build.PL' &&!$self->should_use_mm($dist->{dist})){push@config_deps,Dependency->from_versions({'Module::Build'=>'0.36' },'configure',)}my$target=$dist->{meta}{name}? "$dist->{meta}{name}-$dist->{meta}{version}" : $dist->{dir};$self->install_deps_bailout($target,$dist->{dir},$depth,@config_deps)or return;$self->diag_progress("Configuring $target");my$configure_state=$self->configure_this($dist,$depth);$self->diag_ok($configure_state->{configured_ok}? "OK" : "N/A");$dist->{provides}=$self->extract_packages($dist->{cpanmeta},".")if$dist->{cpanmeta}&& $dist->{source}eq 'cpan';my$root_target=(($self->{installdeps}or $self->{showdeps})and $depth==0);$dist->{want_phases}=$self->{notest}&&!$root_target ? [qw(build runtime)]: [qw(build test runtime)];push @{$dist->{want_phases}},'develop' if$self->{with_develop}&& $depth==0;my@deps=$self->find_prereqs($dist);my$module_name=$self->find_module_name($configure_state)|| $dist->{meta}{name};$module_name =~ s/-/::/g;if ($self->{showdeps}){for my$dep (@config_deps,@deps){print$dep->module,($dep->version ? ("~".$dep->version): ""),"\n"}return 1}my$distname=$dist->{meta}{name}? "$dist->{meta}{name}-$dist->{meta}{version}" : $stuff;my$walkup;if ($self->{scandeps}){$walkup=$self->scandeps_append_child($dist)}$self->install_deps_bailout($distname,$dist->{dir},$depth,@deps)or return;if ($self->{scandeps}){unless ($configure_state->{configured_ok}){my$diag=<<DIAG;if (@config_deps){my@tree=@{$self->{scandeps_tree}};$diag .= "!\n" .join("",map "! * $_->[0]{module}\n",@tree[0..$#tree-1])if@tree}$self->diag("!\n$diag!\n",1)}$walkup->();return 1}if ($self->{installdeps}&& $depth==0){if ($configure_state->{configured_ok}){$self->diag("<== Installed dependencies for $stuff. Finishing.\n");return 1}else {$self->diag("! Configuring $distname failed. See $self->{log} for details.\n",1);return}}my$installed;if ($configure_state->{use_module_build}&& -e 'Build' && -f _){$self->diag_progress("Building " .($self->{notest}? "" : "and testing ").$distname);$self->build([$self->{perl},"./Build" ],$distname,$depth)&& $self->test([$self->{perl},"./Build","test" ],$distname,$depth)&& $self->install([$self->{perl},"./Build","install" ],["--uninst",1 ],$depth)&& $installed++}elsif ($self->{make}&& -e 'Makefile'){$self->diag_progress("Building " .($self->{notest}? "" : "and testing ").$distname);$self->build([$self->{make}],$distname,$depth)&& $self->test([$self->{make},"test" ],$distname,$depth)&& $self->install([$self->{make},"install" ],["UNINST=1" ],$depth)&& $installed++}else {my$why;my$configure_failed=$configure_state->{configured}&&!$configure_state->{configured_ok};if ($configure_failed){$why="Configure failed for $distname."}elsif ($self->{make}){$why="The distribution doesn't have a proper Makefile.PL/Build.PL"}else {$why="Can't configure the distribution. You probably need to have 'make'."}$self->diag_fail("$why See $self->{log} for details.",1);return}if ($installed && $self->{test_only}){$self->diag_ok;$self->diag("Successfully tested $distname\n",1)}elsif ($installed){my$local=$self->{local_versions}{$dist->{module}|| ''};my$version=$dist->{module_version}|| $dist->{meta}{version}|| $dist->{version};my$reinstall=$local && ($local eq $version);my$action=$local &&!$reinstall ? $self->numify_ver($version)< $self->numify_ver($local)? "downgraded" : "upgraded" : undef;my$how=$reinstall ? "reinstalled $distname" : $local ? "installed $distname ($action from $local)" : "installed $distname" ;my$msg="Successfully $how";$self->diag_ok;$self->diag("$msg\n",1);$self->{installed_dists}++;$self->save_meta($stuff,$dist,$module_name,\@config_deps,\@deps);return 1}else {my$what=$self->{test_only}? "Testing" : "Installing";$self->diag_fail("$what $stuff failed. See $self->{log} for details. Retry with --force to force install it.",1);return}}sub perl_requirements {my($self,@requires)=@_;my@perl;for my$requires (grep defined,@requires){if (exists$requires->{perl}){push@perl,Dependency->new(perl=>$requires->{perl})}}return@perl}sub should_use_mm {my($self,$dist)=@_;my%should_use_mm=map {$_=>1}qw(version ExtUtils-ParseXS ExtUtils-Install ExtUtils-Manifest);$should_use_mm{$dist}}sub configure_this {my($self,$dist,$depth)=@_;if (-e $self->{cpanfile_path}&& $self->{installdeps}&& $depth==0){require Module::CPANfile;$dist->{cpanfile}=eval {Module::CPANfile->load($self->{cpanfile_path})};$self->diag_fail($@,1)if $@;return {configured=>1,configured_ok=>!!$dist->{cpanfile},use_module_build=>0,}}if ($self->{skip_configure}){my$eumm=-e 'Makefile';my$mb=-e 'Build' && -f _;return {configured=>1,configured_ok=>$eumm || $mb,use_module_build=>$mb,}}my$state={};my$try_eumm=sub {if (-e 'Makefile.PL'){$self->chat("Running Makefile.PL\n");if ($self->configure([$self->{perl},"Makefile.PL" ],$depth)){$state->{configured_ok}=-e 'Makefile'}$state->{configured}++}};my$try_mb=sub {if (-e 'Build.PL'){$self->chat("Running Build.PL\n");if ($self->configure([$self->{perl},"Build.PL" ],$depth)){$state->{configured_ok}=-e 'Build' && -f _}$state->{use_module_build}++;$state->{configured}++}};my@try;if ($dist->{dist}&& $self->should_use_mm($dist->{dist})){@try=($try_eumm,$try_mb)}else {@try=($try_mb,$try_eumm)}for my$try (@try){$try->();last if$state->{configured_ok}}unless ($state->{configured_ok}){while (1){my$ans=lc$self->prompt("Configuring $dist->{dist} failed.\nYou can s)kip, r)etry, e)xamine build log, or l)ook ?","s");last if$ans eq 's';return$self->configure_this($dist,$depth)if$ans eq 'r';$self->show_build_log if$ans eq 'e';$self->look if$ans eq 'l'}}return$state}sub find_module_name {my($self,$state)=@_;return unless$state->{configured_ok};if ($state->{use_module_build}&& -e "_build/build_params"){my$params=do {open my$in,"_build/build_params";$self->safe_eval(join "",<$in>)};return eval {$params->[2]{module_name}}|| undef}elsif (-e "Makefile"){open my$mf,"Makefile";while (<$mf>){if (/^\#\s+NAME\s+=>\s+(.*)/){return$self->safe_eval($1)}}}return}sub list_files {my$self=shift;if (-e 'MANIFEST'){require ExtUtils::Manifest;my$manifest=eval {ExtUtils::Manifest::manifind()}|| {};return sort {lc$a cmp lc$b}keys %$manifest}else {require File::Find;my@files;my$finder=sub {my$name=$File::Find::name;$name =~ s!\.[/\\]!!;push@files,$name};File::Find::find($finder,".");return sort {lc$a cmp lc$b}@files}}sub extract_packages {my($self,$meta,$dir)=@_;my$try=sub {my$file=shift;return 1 unless$meta->{no_index};return 0 if grep {$file =~ m!^$_/!}@{$meta->{no_index}{directory}|| []};return 0 if grep {$file eq $_}@{$meta->{no_index}{file}|| []};return 1};require App::cpanminus::ParsePM;my@files=grep {/\.pm(?:\.PL)?$/ && $try->($_)}$self->list_files;my$provides={};for my$file (@files){my$parser=App::cpanminus::ParsePM->new($meta);my$packages=$parser->parse($file);while (my($package,$meta)=each %$packages){$provides->{$package}||={file=>$meta->{infile},($meta->{version}eq 'undef')? (): (version=>$meta->{version}),}}}return$provides}sub save_meta {my($self,$module,$dist,$module_name,$config_deps,$build_deps)=@_;return unless$dist->{distvname}&& $dist->{source}eq 'cpan';my$base=($ENV{PERL_MM_OPT}|| '')=~ /INSTALL_BASE=/ ? ($self->install_base($ENV{PERL_MM_OPT})."/lib/perl5"): $Config{sitelibexp};my$provides=$dist->{provides};File::Path::mkpath("blib/meta",0,0777);my$local={name=>$module_name,target=>$module,version=>exists$provides->{$module_name}? ($provides->{$module_name}{version}|| $dist->{version}): $dist->{version},dist=>$dist->{distvname},pathname=>$dist->{pathname},provides=>$provides,};require JSON::PP;open my$fh,">","blib/meta/install.json" or die $!;print$fh JSON::PP::encode_json($local);if (-e "MYMETA.json"){File::Copy::copy("MYMETA.json","blib/meta/MYMETA.json")}my@cmd=(($self->{sudo}? 'sudo' : ()),$^X,'-MExtUtils::Install=install','-e',qq[install({ 'blib/meta' => '$base/$Config{archname}/.meta/$dist->{distvname}' })],);$self->run(\@cmd)}sub _merge_hashref {my($self,@hashrefs)=@_;my%hash;for my$h (@hashrefs){%hash=(%hash,%$h)}return \%hash}sub install_base {my($self,$mm_opt)=@_;$mm_opt =~ /INSTALL_BASE=(\S+)/ and return $1;die "Your PERL_MM_OPT doesn't contain INSTALL_BASE"}sub safe_eval {my($self,$code)=@_;eval$code}sub configure_features {my($self,$dist,@features)=@_;map $_->identifier,grep {$self->effective_feature($dist,$_)}@features}sub effective_feature {my($self,$dist,$feature)=@_;if ($dist->{depth}==0){my$value=$self->{features}{$feature->identifier};return$value if defined$value;return 1 if$self->{features}{__all}}if ($self->{interactive}){require CPAN::Meta::Requirements;$self->diag("[@{[ $feature->description ]}]\n",1);my$req=CPAN::Meta::Requirements->new;for my$phase (@{$dist->{want_phases}}){for my$type (@{$self->{install_types}}){$req->add_requirements($feature->prereqs->requirements_for($phase,$type))}}my$reqs=$req->as_string_hash;my@missing;for my$module (keys %$reqs){if ($self->should_install($module,$req->{$module})){push@missing,$module}}if (@missing){my$howmany=@missing;$self->diag("==> Found missing dependencies: " .join(", ",@missing)."\n",1);local$self->{prompt}=1;return$self->prompt_bool("Install the $howmany optional module(s)?","y")}}return}sub find_prereqs {my($self,$dist)=@_;my@deps=$self->extract_meta_prereqs($dist);if ($dist->{module}=~ /^Bundle::/i){push@deps,$self->bundle_deps($dist)}return@deps}sub extract_meta_prereqs {my($self,$dist)=@_;if ($dist->{cpanfile}){my@features=$self->configure_features($dist,$dist->{cpanfile}->features);my$prereqs=$dist->{cpanfile}->prereqs_with(@features);return Dependency->from_prereqs($prereqs,$dist->{want_phases},$self->{install_types})}my$meta=$dist->{meta};my@deps;if (-e "MYMETA.json"){require JSON::PP;$self->chat("Checking dependencies from MYMETA.json ...\n");my$json=do {open my$in,"<MYMETA.json";local $/;<$in>};my$mymeta=JSON::PP::decode_json($json);if ($mymeta){$meta->{$_}=$mymeta->{$_}for qw(name version);return$self->extract_prereqs($mymeta,$dist)}}if (-e 'MYMETA.yml'){$self->chat("Checking dependencies from MYMETA.yml ...\n");my$mymeta=$self->parse_meta('MYMETA.yml');if ($mymeta){$meta->{$_}=$mymeta->{$_}for qw(name version);return$self->extract_prereqs($mymeta,$dist)}}if (-e '_build/prereqs'){$self->chat("Checking dependencies from _build/prereqs ...\n");my$prereqs=do {open my$in,"_build/prereqs";$self->safe_eval(join "",<$in>)};@deps=$self->extract_prereqs({name=>$meta->{name},version=>$meta->{version},%$prereqs },$dist)}elsif (-e 'Makefile'){$self->chat("Finding PREREQ from Makefile ...\n");open my$mf,"Makefile";while (<$mf>){if (/^\#\s+PREREQ_PM => \{\s*(.*?)\s*\}/){my@all;my@pairs=split ', ',$1;for (@pairs){my ($pkg,$v)=split '=>',$_;push@all,[$pkg,$v ]}my$list=join ", ",map {"'$_->[0]' => $_->[1]"}@all;my$prereq=$self->safe_eval("no strict; +{ $list }");push@deps,Dependency->from_versions($prereq)if$prereq;last}}}return@deps}sub bundle_deps {my($self,$dist)=@_;my@files;File::Find::find({wanted=>sub {push@files,File::Spec->rel2abs($_)if /\.pm/i},no_chdir=>1,},'.');my@deps;for my$file (@files){open my$pod,"<",$file or next;my$in_contents;while (<$pod>){if (/^=head\d\s+CONTENTS/){$in_contents=1}elsif (/^=/){$in_contents=0}elsif ($in_contents){/^(\S+)\s*(\S+)?/ and push@deps,Dependency->new($1,$self->maybe_version($2))}}}return@deps}sub maybe_version {my($self,$string)=@_;return$string && $string =~ /^\.?\d/ ? $string : undef}sub extract_prereqs {my($self,$metadata,$dist)=@_;require CPAN::Meta;my$meta=CPAN::Meta->new($metadata,{lazy_validation=>1 });my@features=$self->configure_features($dist,$meta->features);return Dependency->from_prereqs($meta->effective_prereqs(\@features),$dist->{want_phases},$self->{install_types})}sub cleanup_workdirs {my$self=shift;my$expire=time - 24 * 60 * 60 * $self->{auto_cleanup};my@targets;opendir my$dh,"$self->{home}/work";while (my$e=readdir$dh){next if$e !~ /^(\d+)\.\d+$/;my$time=$1;if ($time < $expire){push@targets,"$self->{home}/work/$e"}}if (@targets){if (@targets >= 64){$self->diag("Expiring " .scalar(@targets)." work directories. This might take long...\n")}else {$self->chat("Expiring " .scalar(@targets)." work directories.\n")}File::Path::rmtree(\@targets,0,0)}}sub scandeps_append_child {my($self,$dist)=@_;my$new_node=[$dist,[]];my$curr_node=$self->{scandeps_current}|| [undef,$self->{scandeps_tree}];push @{$curr_node->[1]},$new_node;$self->{scandeps_current}=$new_node;return sub {$self->{scandeps_current}=$curr_node}}sub dump_scandeps {my$self=shift;if ($self->{format}eq 'tree'){$self->walk_down(sub {my($dist,$depth)=@_;if ($depth==0){print "$dist->{distvname}\n"}else {print " " x ($depth - 1);print "\\_ $dist->{distvname}\n"}},1)}elsif ($self->{format}=~ /^dists?$/){$self->walk_down(sub {my($dist,$depth)=@_;print$self->format_dist($dist),"\n"},0)}elsif ($self->{format}eq 'json'){require JSON::PP;print JSON::PP::encode_json($self->{scandeps_tree})}elsif ($self->{format}eq 'yaml'){require YAML;print YAML::Dump($self->{scandeps_tree})}else {$self->diag("Unknown format: $self->{format}\n")}}sub walk_down {my($self,$cb,$pre)=@_;$self->_do_walk_down($self->{scandeps_tree},$cb,0,$pre)}sub _do_walk_down {my($self,$children,$cb,$depth,$pre)=@_;for my$node (@$children){$cb->($node->[0],$depth)if$pre;$self->_do_walk_down($node->[1],$cb,$depth + 1,$pre);$cb->($node->[0],$depth)unless$pre}}sub DESTROY {my$self=shift;$self->{at_exit}->($self)if$self->{at_exit}}sub shell_quote {my($self,@stuff)=@_;if (WIN32){join ' ',map {/^${quote}.+${quote}$/ ? $_ : ($quote .$_ .$quote)}@stuff}else {String::ShellQuote::shell_quote_best_effort(@stuff)}}sub which {my($self,$name)=@_;return$name if File::Spec->file_name_is_absolute($name)&& -x $name;my$exe_ext=$Config{_exe};for my$dir (File::Spec->path){my$fullpath=File::Spec->catfile($dir,$name);if (-x $fullpath || -x ($fullpath .= $exe_ext)){if ($fullpath =~ /\s/){$fullpath=$self->shell_quote($fullpath)}return$fullpath}}return}sub get {my($self,$uri)=@_;if ($uri =~ /^file:/){$self->file_get($uri)}else {$self->{_backends}{get}->(@_)}}sub mirror {my($self,$uri,$local)=@_;if ($uri =~ /^file:/){$self->file_mirror($uri,$local)}else {$self->{_backends}{mirror}->(@_)}}sub untar {$_[0]->{_backends}{untar}->(@_)};sub unzip {$_[0]->{_backends}{unzip}->(@_)};sub uri_to_file {my($self,$uri)=@_;if ($uri =~ s!file:/+!!){$uri="/$uri" unless$uri =~ m![a-zA-Z]:!}return$uri}sub file_get {my($self,$uri)=@_;my$file=$self->uri_to_file($uri);open my$fh,"<$file" or return;join '',<$fh>}sub file_mirror {my($self,$uri,$path)=@_;my$file=$self->uri_to_file($uri);File::Copy::copy($file,$path)}sub has_working_lwp {my($self,$mirrors)=@_;my$https=grep /^https:/,@$mirrors;eval {require LWP::UserAgent;LWP::UserAgent->VERSION(5.802);require LWP::Protocol::https if$https;1}}sub init_tools {my$self=shift;return if$self->{initialized}++;if ($self->{make}=$self->which($Config{make})){$self->chat("You have make $self->{make}\n")}if ($self->{try_lwp}&& $self->has_working_lwp($self->{mirrors})){$self->chat("You have LWP $LWP::VERSION\n");my$ua=sub {LWP::UserAgent->new(parse_head=>0,env_proxy=>1,agent=>$self->agent,timeout=>30,@_,)};$self->{_backends}{get}=sub {my$self=shift;my$res=$ua->()->request(HTTP::Request->new(GET=>$_[0]));return unless$res->is_success;return$res->decoded_content};$self->{_backends}{mirror}=sub {my$self=shift;my$res=$ua->()->mirror(@_);die$res->content if$res->code==501;$res->code}}elsif ($self->{try_wget}and my$wget=$self->which('wget')){$self->chat("You have $wget\n");my@common=('--user-agent',$self->agent,'--retry-connrefused',($self->{verbose}? (): ('-q')),);$self->{_backends}{get}=sub {my($self,$uri)=@_;$self->safeexec(my$fh,$wget,$uri,@common,'-O','-')or die "wget $uri: $!";local $/;<$fh>};$self->{_backends}{mirror}=sub {my($self,$uri,$path)=@_;$self->safeexec(my$fh,$wget,$uri,@common,'-O',$path)or die "wget $uri: $!";local $/;<$fh>}}elsif ($self->{try_curl}and my$curl=$self->which('curl')){$self->chat("You have $curl\n");my@common=('--location','--user-agent',$self->agent,($self->{verbose}? (): '-s'),);$self->{_backends}{get}=sub {my($self,$uri)=@_;$self->safeexec(my$fh,$curl,@common,$uri)or die "curl $uri: $!";local $/;<$fh>};$self->{_backends}{mirror}=sub {my($self,$uri,$path)=@_;$self->safeexec(my$fh,$curl,@common,$uri,'-#','-o',$path)or die "curl $uri: $!";local $/;<$fh>}}else {require HTTP::Tiny;$self->chat("Falling back to HTTP::Tiny $HTTP::Tiny::VERSION\n");my%common=(agent=>$self->agent,);$self->{_backends}{get}=sub {my$self=shift;my$res=HTTP::Tiny->new(%common)->get($_[0]);return unless$res->{success};return$res->{content}};$self->{_backends}{mirror}=sub {my$self=shift;my$res=HTTP::Tiny->new(%common)->mirror(@_);return$res->{status}}}my$tar=$self->which('tar');my$tar_ver;my$maybe_bad_tar=sub {WIN32 || SUNOS || (($tar_ver=`$tar --version 2>/dev/null`)=~ /GNU.*1\.13/i)};if ($tar &&!$maybe_bad_tar->()){chomp$tar_ver;$self->chat("You have $tar: $tar_ver\n");$self->{_backends}{untar}=sub {my($self,$tarfile)=@_;my$xf=($self->{verbose}? 'v' : '')."xf";my$ar=$tarfile =~ /bz2$/ ? 'j' : 'z';my($root,@others)=`$tar ${ar}tf $tarfile` or return undef;FILE: {chomp$root;$root =~ s!^\./!!;$root =~ s{^(.+?)/.*$}{$1};if (!length($root)){$root=shift(@others);redo FILE if$root}}system "$tar $ar$xf $tarfile";return$root if -d $root;$self->diag_fail("Bad archive: $tarfile");return undef}}elsif ($tar and my$gzip=$self->which('gzip')and my$bzip2=$self->which('bzip2')){$self->chat("You have $tar, $gzip and $bzip2\n");$self->{_backends}{untar}=sub {my($self,$tarfile)=@_;my$x="x" .($self->{verbose}? 'v' : '')."f -";my$ar=$tarfile =~ /bz2$/ ? $bzip2 : $gzip;my($root,@others)=`$ar -dc $tarfile | $tar tf -` or return undef;FILE: {chomp$root;$root =~ s!^\./!!;$root =~ s{^(.+?)/.*$}{$1};if (!length($root)){$root=shift(@others);redo FILE if$root}}system "$ar -dc $tarfile | $tar $x";return$root if -d $root;$self->diag_fail("Bad archive: $tarfile");return undef}}elsif (eval {require Archive::Tar}){$self->chat("Falling back to Archive::Tar $Archive::Tar::VERSION\n");$self->{_backends}{untar}=sub {my$self=shift;my$t=Archive::Tar->new($_[0]);my($root,@others)=$t->list_files;FILE: {$root =~ s!^\./!!;$root =~ s{^(.+?)/.*$}{$1};if (!length($root)){$root=shift(@others);redo FILE if$root}}$t->extract;return -d $root ? $root : undef}}else {$self->{_backends}{untar}=sub {die "Failed to extract $_[1] - You need to have tar or Archive::Tar installed.\n"}}if (my$unzip=$self->which('unzip')){$self->chat("You have $unzip\n");$self->{_backends}{unzip}=sub {my($self,$zipfile)=@_;my$opt=$self->{verbose}? '' : '-q';my(undef,$root,@others)=`$unzip -t $zipfile` or return undef;chomp$root;$root =~ s{^\s+testing:\s+([^/]+)/.*?\s+OK$}{$1};system "$unzip $opt $zipfile";return$root if -d $root;$self->diag_fail("Bad archive: [$root] $zipfile");return undef}}else {$self->{_backends}{unzip}=sub {eval {require Archive::Zip}or die "Failed to extract $_[1] - You need to have unzip or Archive::Zip installed.\n";my($self,$file)=@_;my$zip=Archive::Zip->new();my$status;$status=$zip->read($file);$self->diag_fail("Read of file[$file] failed")if$status!=Archive::Zip::AZ_OK();my@members=$zip->members();for my$member (@members){my$af=$member->fileName();next if ($af =~ m!^(/|\.\./)!);$status=$member->extractToFileNamed($af);$self->diag_fail("Extracting of file[$af] from zipfile[$file failed")if$status!=Archive::Zip::AZ_OK()}my ($root)=$zip->membersMatching(qr<^[^/]+/$>);$root &&=$root->fileName;return -d $root ? $root : undef}}}sub safeexec {my$self=shift;my$rdr=$_[0]||=Symbol::gensym();if (WIN32){my$cmd=$self->shell_quote(@_[1..$#_]);return open($rdr,"$cmd |")}if (my$pid=open($rdr,'-|')){return$pid}elsif (defined$pid){exec(@_[1 .. $#_ ]);exit 1}else {return}}sub mask_uri_passwords {my($self,@strings)=@_;s{ (https?://) ([^:/]+) : [^@/]+ @ }{$1$2:*password*@}gx for@strings;return@strings}sub parse_meta {my($self,$file)=@_;return eval {Parse::CPAN::Meta->load_file($file)}}sub parse_meta_string {my($self,$yaml)=@_;return eval {Parse::CPAN::Meta->load_yaml_string($yaml)}}package App::cpanminus::CommandExit;sub new {bless {code=>$_[1]},$_[0]}sub code {$_[0]->{code}}1;
+ It appears your cpanm executable was installed via `perlbrew install-cpanm`.
+ cpanm --self-upgrade won't upgrade the version of cpanm you're running.
- my @fail;
- for my $module (@{$self->{argv}}) {
- if ($module =~ s/\.pm$//i) {
- my ($volume, $dirs, $file) = File::Spec->splitpath($module);
- $module = join '::', grep { $_ } File::Spec->splitdir($dirs), $file;
- }
-
- ($module, my $version) = split /\~/, $module, 2;
- if ($self->{skip_satisfied} or defined $version) {
- $self->check_libs;
- my($ok, $local) = $self->check_module($module, $version || 0);
- if ($ok) {
- $self->diag("You have $module (" . ($local || 'undef') . ")\n", 1);
- next;
- }
- }
+ Run the following command to get it upgraded.
- $self->chdir($cwd);
- $self->install_module($module, 0, $version)
- or push @fail, $module;
- }
-
- if ($self->{base} && $self->{auto_cleanup}) {
- $self->cleanup_workdirs;
- }
-
- if ($self->{installed_dists}) {
- my $dists = $self->{installed_dists} > 1 ? "distributions" : "distribution";
- $self->diag("$self->{installed_dists} $dists installed\n", 1);
- }
-
- if ($self->{scandeps}) {
- $self->dump_scandeps();
- }
-
- return !@fail;
- }
-
- sub setup_home {
- my $self = shift;
-
- $self->{home} = $self->env('HOME') if $self->env('HOME');
-
- unless (_writable($self->{home})) {
- die "Can't write to cpanm home '$self->{home}': You should fix it with chown/chmod first.\n";
- }
-
- $self->{base} = "$self->{home}/work/" . time . ".$$";
- File::Path::mkpath([ $self->{base} ], 0, 0777);
-
- my $link = "$self->{home}/latest-build";
- eval { unlink $link; symlink $self->{base}, $link };
-
- $self->{log} = File::Spec->catfile($self->{home}, "build.log"); # because we use shell redirect
-
- {
- my $log = $self->{log}; my $base = $self->{base};
- $self->{at_exit} = sub {
- my $self = shift;
- File::Copy::copy($self->{log}, "$self->{base}/build.log");
- };
- }
-
- { open my $out, ">$self->{log}" or die "$self->{log}: $!" }
-
- $self->chat("cpanm (App::cpanminus) $VERSION on perl $] built for $Config{archname}\n" .
- "Work directory is $self->{base}\n");
- }
+ perlbrew install-cpanm
- sub fetch_meta_sco {
- my($self, $dist) = @_;
- return if $self->{mirror_only};
-
- my $meta_yml = $self->get("http://search.cpan.org/meta/$dist->{distvname}/META.yml");
- return $self->parse_meta_string($meta_yml);
- }
-
- sub package_index_for {
- my ($self, $mirror) = @_;
- return $self->source_for($mirror) . "/02packages.details.txt";
- }
-
- sub generate_mirror_index {
- my ($self, $mirror) = @_;
- my $file = $self->package_index_for($mirror);
- my $gz_file = $file . '.gz';
- my $index_mtime = (stat $gz_file)[9];
-
- unless (-e $file && (stat $file)[9] >= $index_mtime) {
- $self->chat("Uncompressing index file...\n");
- if (eval {require Compress::Zlib}) {
- my $gz = Compress::Zlib::gzopen($gz_file, "rb")
- or do { $self->diag_fail("$Compress::Zlib::gzerrno opening compressed index"); return};
- open my $fh, '>', $file
- or do { $self->diag_fail("$! opening uncompressed index for write"); return };
- my $buffer;
- while (my $status = $gz->gzread($buffer)) {
- if ($status < 0) {
- $self->diag_fail($gz->gzerror . " reading compressed index");
- return;
- }
- print $fh $buffer;
- }
- } else {
- if (system("gunzip -c $gz_file > $file")) {
- $self->diag_fail("Cannot uncompress -- please install gunzip or Compress::Zlib");
- return;
- }
- }
- utime $index_mtime, $index_mtime, $file;
- }
- return 1;
- }
-
- sub search_mirror_index {
- my ($self, $mirror, $module, $version) = @_;
- $self->search_mirror_index_file($self->package_index_for($mirror), $module, $version);
- }
-
- sub search_mirror_index_file {
- my($self, $file, $module, $version) = @_;
-
- open my $fh, '<', $file or return;
- my $found;
- while (<$fh>) {
- if (m!^\Q$module\E\s+([\w\.]+)\s+(.*)!m) {
- $found = $self->cpan_module($module, $2, $1);
- last;
- }
- }
-
- return $found unless $self->{cascade_search};
-
- if ($found) {
- if (!$version or
- version->new($found->{version} || 0) >= version->new($version)) {
- return $found;
- } else {
- $self->chat("Found $module version $found->{version} < $version.\n");
- }
- }
-
- return;
- }
+ DIE
+ You are running cpanm from the path where your current perl won't install executables to.
+ Because of that, cpanm --self-upgrade won't upgrade the version of cpanm you're running.
- sub search_module {
- my($self, $module, $version) = @_;
+ cpanm path : $0
+ Install path : $Config{installsitebin}
- unless ($self->{mirror_only}) {
- if ($self->{metacpan}) {
- require JSON::PP;
- $self->chat("Searching $module on metacpan ...\n");
- my $module_uri = "http://api.metacpan.org/module/$module";
- my $module_json = $self->get($module_uri);
- my $module_meta = eval { JSON::PP::decode_json($module_json) };
- if ($module_meta && $module_meta->{distribution}) {
- my $dist_uri = "http://api.metacpan.org/release/$module_meta->{distribution}";
- my $dist_json = $self->get($dist_uri);
- my $dist_meta = eval { JSON::PP::decode_json($dist_json) };
- if ($dist_meta && $dist_meta->{download_url}) {
- (my $distfile = $dist_meta->{download_url}) =~ s!.+/authors/id/!!;
- local $self->{mirrors} = $self->{mirrors};
- if ($dist_meta->{stat}->{mtime} > time()-24*60*60) {
- $self->{mirrors} = ['http://cpan.metacpan.org'];
- }
- return $self->cpan_module($module, $distfile, $dist_meta->{version});
- }
- }
- $self->diag_fail("Finding $module on metacpan failed.");
- }
-
- $self->chat("Searching $module on cpanmetadb ...\n");
- my $uri = "http://cpanmetadb.plackperl.org/v1.0/package/$module";
- my $yaml = $self->get($uri);
- my $meta = $self->parse_meta_string($yaml);
- if ($meta && $meta->{distfile}) {
- return $self->cpan_module($module, $meta->{distfile}, $meta->{version});
- }
-
- $self->diag_fail("Finding $module on cpanmetadb failed.");
-
- $self->chat("Searching $module on search.cpan.org ...\n");
- my $uri = "http://search.cpan.org/perldoc?$module";
- my $html = $self->get($uri);
- $html =~ m!<a href="/CPAN/authors/id/(.*?\.(?:tar\.gz|tgz|tar\.bz2|zip))">!
- and return $self->cpan_module($module, $1);
-
- $self->diag_fail("Finding $module on search.cpan.org failed.");
- }
-
- if ($self->{mirror_index}) {
- $self->chat("Searching $module on mirror index $self->{mirror_index} ...\n");
- my $pkg = $self->search_mirror_index_file($self->{mirror_index}, $module, $version);
- return $pkg if $pkg;
- }
-
- MIRROR: for my $mirror (@{ $self->{mirrors} }) {
- $self->chat("Searching $module on mirror $mirror ...\n");
- my $name = '02packages.details.txt.gz';
- my $uri = "$mirror/modules/$name";
- my $gz_file = $self->package_index_for($mirror) . '.gz';
-
- unless ($self->{pkgs}{$uri}) {
- $self->chat("Downloading index file $uri ...\n");
- $self->mirror($uri, $gz_file);
- $self->generate_mirror_index($mirror) or next MIRROR;
- $self->{pkgs}{$uri} = "!!retrieved!!";
- }
-
- my $pkg = $self->search_mirror_index($mirror, $module, $version);
- return $pkg if $pkg;
-
- $self->diag_fail("Finding $module ($version) on mirror $mirror failed.");
- }
-
- return;
- }
-
- sub source_for {
- my($self, $mirror) = @_;
- $mirror =~ s/[^\w\.\-]+/%/g;
-
- my $dir = "$self->{home}/sources/$mirror";
- File::Path::mkpath([ $dir ], 0, 0777);
-
- return $dir;
- }
-
- sub load_argv_from_fh {
- my($self, $fh) = @_;
-
- my @argv;
- while(defined(my $line = <$fh>)){
- chomp $line;
- $line =~ s/#.+$//; # comment
- $line =~ s/^\s+//; # trim spaces
- $line =~ s/\s+$//; # trim spaces
-
- push @argv, split ' ', $line if $line;
- }
- return @argv;
- }
-
- sub show_version {
- print "cpanm (App::cpanminus) version $VERSION\n";
- return 1;
- }
-
- sub show_help {
- my $self = shift;
-
- if ($_[0]) {
- die <<USAGE;
+ It means you either installed cpanm globally with system perl, or use distro packages such
+ as rpm or apt-get, and you have to use them again to upgrade cpanm.
+ DIE
Usage: cpanm [options] Module [...]
Try `cpanm --help` or `man cpanm` for more options.
USAGE
- }
-
- print <<HELP;
Usage: cpanm [options] Module [...]
Options:
@@ -738,6 +91,7 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';
--interactive Turns on interactive configure (required for Task:: modules)
-f,--force force install
-n,--notest Do not run unit tests
+ --test-only Run tests only, do not install
-S,--sudo sudo to run install commands
--installdeps Only install dependencies
--showdeps Only display direct dependencies
@@ -747,12 +101,14 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';
--prompt Prompt when configure/build/test fails
-l,--local-lib Specify the install base to install modules
-L,--local-lib-contained Specify the install base to install all non-core modules
+ --self-contained Install all non-core modules, even if they're already installed.
--auto-cleanup Number of days that cpanm's work directories expire in. Defaults to 7
Commands:
--self-upgrade upgrades itself
--info Displays distribution info on CPAN
--look Opens the distribution with your SHELL
+ -U,--uninstall Uninstalls the modules (EXPERIMENTAL)
-V,--version Displays software version
Examples:
@@ -774,639 +130,23 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';
Type `man cpanm` or `perldoc cpanm` for the more detailed explanation of the options.
HELP
-
- return 1;
- }
-
- sub _writable {
- my $dir = shift;
- my @dir = File::Spec->splitdir($dir);
- while (@dir) {
- $dir = File::Spec->catdir(@dir);
- if (-e $dir) {
- return -w _;
- }
- pop @dir;
- }
-
- return;
- }
-
- sub maybe_abs {
- my($self, $lib) = @_;
- return $lib if $lib eq '_'; # special case: gh-113
- $lib =~ /^[~\/]/ ? $lib : File::Spec->canonpath(Cwd::cwd . "/$lib");
- }
-
- sub bootstrap_local_lib {
- my $self = shift;
-
- # If -l is specified, use that.
- if ($self->{local_lib}) {
- return $self->setup_local_lib($self->{local_lib});
- }
-
- # root, locally-installed perl or --sudo: don't care about install_base
- return if $self->{sudo} or (_writable($Config{installsitelib}) and _writable($Config{installsitebin}));
-
- # local::lib is configured in the shell -- yay
- if ($ENV{PERL_MM_OPT} and ($ENV{MODULEBUILDRC} or $ENV{PERL_MB_OPT})) {
- $self->bootstrap_local_lib_deps;
- return;
- }
-
- $self->setup_local_lib;
-
- $self->diag(<<DIAG);
!
! Can't write to $Config{installsitelib} and $Config{installsitebin}: Installing modules to $ENV{HOME}/perl5
! To turn off this warning, you have to do one of the following:
! - run me as a root or with --sudo option (to install to $Config{installsitelib} and $Config{installsitebin})
- | - run me with --local-lib option e.g. cpanm --local-lib=~/perl5
- ! - Set PERL_CPANM_OPT="--local-lib=~/perl5" environment variable (in your shell rc file)
- ! - Configure local::lib in your shell to set PERL_MM_OPT etc.
+ ! - Configure local::lib your existing local::lib in this shell to set PERL_MM_OPT etc.
+ ! - Install local::lib by running the following commands
+ !
+ ! cpanm --local-lib=~/perl5 local::lib && eval \$(perl -I ~/perl5/lib/perl5/ -Mlocal::lib)
!
DIAG
- sleep 2;
- }
-
- sub _core_only_inc {
- my($self, $base) = @_;
- require local::lib;
- (
- local::lib->install_base_perl_path($base),
- local::lib->install_base_arch_path($base),
- @Config{qw(privlibexp archlibexp)},
- );
- }
-
- sub _diff {
- my($self, $old, $new) = @_;
-
- my @diff;
- my %old = map { $_ => 1 } @$old;
- for my $n (@$new) {
- push @diff, $n unless exists $old{$n};
- }
-
- @diff;
- }
-
- sub _setup_local_lib_env {
- my($self, $base) = @_;
- local $SIG{__WARN__} = sub { }; # catch 'Attempting to write ...'
- local::lib->setup_env_hash_for($base);
- }
-
- sub setup_local_lib {
- my($self, $base) = @_;
- $base = undef if $base eq '_';
-
- require local::lib;
- {
- local $0 = 'cpanm'; # so curl/wget | perl works
- $base ||= "~/perl5";
- if ($self->{self_contained}) {
- my @inc = $self->_core_only_inc($base);
- $self->{search_inc} = [ @inc ];
- } else {
- $self->{search_inc} = [
- local::lib->install_base_arch_path($base),
- local::lib->install_base_perl_path($base),
- @INC,
- ];
- }
- $self->_setup_local_lib_env($base);
- }
-
- $self->bootstrap_local_lib_deps;
- }
-
- sub bootstrap_local_lib_deps {
- my $self = shift;
- push @{$self->{bootstrap_deps}},
- 'ExtUtils::MakeMaker' => 6.31,
- 'ExtUtils::Install' => 1.46;
- }
-
- sub prompt_bool {
- my($self, $mess, $def) = @_;
-
- my $val = $self->prompt($mess, $def);
- return lc $val eq 'y';
- }
-
- sub prompt {
- my($self, $mess, $def) = @_;
+ WARNING: Your lib directory name ($base) contains a space in it. It's known to cause issues with perl builder tools such as local::lib and MakeMaker. You're recommended to rename your directory.
+ WARN
+ $module is not found in the following directories and can't be uninstalled.
- my $isa_tty = -t STDIN && (-t STDOUT || !(-f STDOUT || -c STDOUT)) ;
- my $dispdef = defined $def ? "[$def] " : " ";
- $def = defined $def ? $def : "";
+ @{[ join(" \n", map " $_", @inc) ]}
- if (!$self->{prompt} || (!$isa_tty && eof STDIN)) {
- return $def;
- }
-
- local $|=1;
- local $\;
- my $ans;
- eval {
- local $SIG{ALRM} = sub { undef $ans; die "alarm\n" };
- print STDOUT "$mess $dispdef";
- alarm $self->{prompt_timeout} if $self->{prompt_timeout};
- $ans = <STDIN>;
- alarm 0;
- };
- if ( defined $ans ) {
- chomp $ans;
- } else { # user hit ctrl-D or alarm timeout
- print STDOUT "\n";
- }
-
- return (!defined $ans || $ans eq '') ? $def : $ans;
- }
-
- sub diag_ok {
- my($self, $msg) = @_;
- chomp $msg;
- $msg ||= "OK";
- if ($self->{in_progress}) {
- $self->_diag("$msg\n");
- $self->{in_progress} = 0;
- }
- $self->log("-> $msg\n");
- }
-
- sub diag_fail {
- my($self, $msg, $always) = @_;
- chomp $msg;
- if ($self->{in_progress}) {
- $self->_diag("FAIL\n");
- $self->{in_progress} = 0;
- }
-
- if ($msg) {
- $self->_diag("! $msg\n", $always);
- $self->log("-> FAIL $msg\n");
- }
- }
-
- sub diag_progress {
- my($self, $msg) = @_;
- chomp $msg;
- $self->{in_progress} = 1;
- $self->_diag("$msg ... ");
- $self->log("$msg\n");
- }
-
- sub _diag {
- my($self, $msg, $always) = @_;
- print STDERR $msg if $always or $self->{verbose} or !$self->{quiet};
- }
-
- sub diag {
- my($self, $msg, $always) = @_;
- $self->_diag($msg, $always);
- $self->log($msg);
- }
-
- sub chat {
- my $self = shift;
- print STDERR @_ if $self->{verbose};
- $self->log(@_);
- }
-
- sub log {
- my $self = shift;
- open my $out, ">>$self->{log}";
- print $out @_;
- }
-
- sub run {
- my($self, $cmd) = @_;
-
- if (WIN32 && ref $cmd eq 'ARRAY') {
- $cmd = join q{ }, map { $self->shell_quote($_) } @$cmd;
- }
-
- if (ref $cmd eq 'ARRAY') {
- my $pid = fork;
- if ($pid) {
- waitpid $pid, 0;
- return !$?;
- } else {
- $self->run_exec($cmd);
- }
- } else {
- unless ($self->{verbose}) {
- $cmd .= " >> " . $self->shell_quote($self->{log}) . " 2>&1";
- }
- !system $cmd;
- }
- }
-
- sub run_exec {
- my($self, $cmd) = @_;
-
- if (ref $cmd eq 'ARRAY') {
- unless ($self->{verbose}) {
- open my $logfh, ">>", $self->{log};
- open STDERR, '>&', $logfh;
- open STDOUT, '>&', $logfh;
- close $logfh;
- }
- exec @$cmd;
- } else {
- unless ($self->{verbose}) {
- $cmd .= " >> " . $self->shell_quote($self->{log}) . " 2>&1";
- }
- exec $cmd;
- }
- }
-
- sub run_timeout {
- my($self, $cmd, $timeout) = @_;
- return $self->run($cmd) if WIN32 || $self->{verbose} || !$timeout;
-
- my $pid = fork;
- if ($pid) {
- eval {
- local $SIG{ALRM} = sub { die "alarm\n" };
- alarm $timeout;
- waitpid $pid, 0;
- alarm 0;
- };
- if ($@ && $@ eq "alarm\n") {
- $self->diag_fail("Timed out (> ${timeout}s). Use --verbose to retry.");
- local $SIG{TERM} = 'IGNORE';
- kill TERM => 0;
- waitpid $pid, 0;
- return;
- }
- return !$?;
- } elsif ($pid == 0) {
- $self->run_exec($cmd);
- } else {
- $self->chat("! fork failed: falling back to system()\n");
- $self->run($cmd);
- }
- }
-
- sub configure {
- my($self, $cmd) = @_;
-
- # trick AutoInstall
- local $ENV{PERL5_CPAN_IS_RUNNING} = local $ENV{PERL5_CPANPLUS_IS_RUNNING} = $$;
-
- # e.g. skip CPAN configuration on local::lib
- local $ENV{PERL5_CPANM_IS_RUNNING} = $$;
-
- my $use_default = !$self->{interactive};
- local $ENV{PERL_MM_USE_DEFAULT} = $use_default;
-
- # skip man page generation
- local $ENV{PERL_MM_OPT} = $ENV{PERL_MM_OPT};
- unless ($self->{pod2man}) {
- $ENV{PERL_MM_OPT} .= " INSTALLMAN1DIR=none INSTALLMAN3DIR=none";
- }
-
- local $self->{verbose} = $self->{verbose} || $self->{interactive};
- $self->run_timeout($cmd, $self->{configure_timeout});
- }
-
- sub build {
- my($self, $cmd, $distname) = @_;
-
- return 1 if $self->run_timeout($cmd, $self->{build_timeout});
- while (1) {
- my $ans = lc $self->prompt("Building $distname failed.\nYou can s)kip, r)etry, e)xamine build log, or l)ook ?", "s");
- return if $ans eq 's';
- return $self->build($cmd, $distname) if $ans eq 'r';
- $self->show_build_log if $ans eq 'e';
- $self->look if $ans eq 'l';
- }
- }
-
- sub test {
- my($self, $cmd, $distname) = @_;
- return 1 if $self->{notest};
-
- # https://rt.cpan.org/Ticket/Display.html?id=48965#txn-1013385
- local $ENV{PERL_MM_USE_DEFAULT} = 1;
-
- return 1 if $self->run_timeout($cmd, $self->{test_timeout});
- if ($self->{force}) {
- $self->diag_fail("Testing $distname failed but installing it anyway.");
- return 1;
- } else {
- $self->diag_fail;
- while (1) {
- my $ans = lc $self->prompt("Testing $distname failed.\nYou can s)kip, r)etry, f)orce install, e)xamine build log, or l)ook ?", "s");
- return if $ans eq 's';
- return $self->test($cmd, $distname) if $ans eq 'r';
- return 1 if $ans eq 'f';
- $self->show_build_log if $ans eq 'e';
- $self->look if $ans eq 'l';
- }
- }
- }
-
- sub install {
- my($self, $cmd, $uninst_opts) = @_;
-
- if ($self->{sudo}) {
- unshift @$cmd, "sudo";
- }
-
- if ($self->{uninstall_shadows} && !$ENV{PERL_MM_OPT}) {
- push @$cmd, @$uninst_opts;
- }
-
- $self->run($cmd);
- }
-
- sub look {
- my $self = shift;
-
- my $shell = $ENV{SHELL};
- $shell ||= $ENV{COMSPEC} if WIN32;
- if ($shell) {
- my $cwd = Cwd::cwd;
- $self->diag("Entering $cwd with $shell\n");
- system $shell;
- } else {
- $self->diag_fail("You don't seem to have a SHELL :/");
- }
- }
-
- sub show_build_log {
- my $self = shift;
-
- my @pagers = (
- $ENV{PAGER},
- (WIN32 ? () : ('less')),
- 'more'
- );
- my $pager;
- while (@pagers) {
- $pager = shift @pagers;
- next unless $pager;
- $pager = $self->which($pager);
- next unless $pager;
- last;
- }
-
- if ($pager) {
- # win32 'more' doesn't allow "more build.log", the < is required
- system("$pager < $self->{log}");
- }
- else {
- $self->diag_fail("You don't seem to have a PAGER :/");
- }
- }
-
- sub chdir {
- my $self = shift;
- Cwd::chdir(File::Spec->canonpath($_[0])) or die "$_[0]: $!";
- }
-
- sub configure_mirrors {
- my $self = shift;
- unless (@{$self->{mirrors}}) {
- $self->{mirrors} = [ 'http://search.cpan.org/CPAN' ];
- }
- for (@{$self->{mirrors}}) {
- s!^/!file:///!;
- s!/$!!;
- }
- }
-
- sub self_upgrade {
- my $self = shift;
- $self->{argv} = [ 'App::cpanminus' ];
- return; # continue
- }
-
- sub install_module {
- my($self, $module, $depth, $version) = @_;
-
- if ($self->{seen}{$module}++) {
- $self->chat("Already tried $module. Skipping.\n");
- return 1;
- }
-
- my $dist = $self->resolve_name($module, $version);
- unless ($dist) {
- $self->diag_fail("Couldn't find module or a distribution $module ($version)", 1);
- return;
- }
-
- if ($dist->{distvname} && $self->{seen}{$dist->{distvname}}++) {
- $self->chat("Already tried $dist->{distvname}. Skipping.\n");
- return 1;
- }
-
- if ($self->{cmd} eq 'info') {
- print $self->format_dist($dist), "\n";
- return 1;
- }
-
- $self->check_libs;
- $self->setup_module_build_patch unless $self->{pod2man};
-
- if ($dist->{module}) {
- my($ok, $local) = $self->check_module($dist->{module}, $dist->{module_version} || 0);
- if ($self->{skip_installed} && $ok) {
- $self->diag("$dist->{module} is up to date. ($local)\n", 1);
- return 1;
- }
- }
-
- if ($dist->{dist} eq 'perl'){
- $self->diag("skipping $dist->{pathname}\n");
- return 1;
- }
-
- $self->diag("--> Working on $module\n");
-
- $dist->{dir} ||= $self->fetch_module($dist);
-
- unless ($dist->{dir}) {
- $self->diag_fail("Failed to fetch distribution $dist->{distvname}", 1);
- return;
- }
-
- $self->chat("Entering $dist->{dir}\n");
- $self->chdir($self->{base});
- $self->chdir($dist->{dir});
-
- if ($self->{cmd} eq 'look') {
- $self->look;
- return 1;
- }
-
- return $self->build_stuff($module, $dist, $depth);
- }
-
- sub format_dist {
- my($self, $dist) = @_;
-
- # TODO support --dist-format?
- return "$dist->{cpanid}/$dist->{filename}";
- }
-
- sub fetch_module {
- my($self, $dist) = @_;
-
- $self->chdir($self->{base});
-
- for my $uri (@{$dist->{uris}}) {
- $self->diag_progress("Fetching $uri");
-
- # Ugh, $dist->{filename} can contain sub directory
- my $filename = $dist->{filename} || $uri;
- my $name = File::Basename::basename($filename);
-
- my $cancelled;
- my $fetch = sub {
- my $file;
- eval {
- local $SIG{INT} = sub { $cancelled = 1; die "SIGINT\n" };
- $self->mirror($uri, $name);
- $file = $name if -e $name;
- };
- $self->chat("$@") if $@ && $@ ne "SIGINT\n";
- return $file;
- };
-
- my($try, $file);
- while ($try++ < 3) {
- $file = $fetch->();
- last if $cancelled or $file;
- $self->diag_fail("Download $uri failed. Retrying ... ");
- }
-
- if ($cancelled) {
- $self->diag_fail("Download cancelled.");
- return;
- }
-
- unless ($file) {
- $self->diag_fail("Failed to download $uri");
- next;
- }
-
- $self->diag_ok;
- $dist->{local_path} = File::Spec->rel2abs($name);
-
- my $dir = $self->unpack($file);
- next unless $dir; # unpack failed
-
- if (my $save = $self->{save_dists}) {
- my $path = "$save/authors/id/$dist->{pathname}";
- $self->chat("Copying $name to $path\n");
- File::Path::mkpath([ File::Basename::dirname($path) ], 0, 0777);
- File::Copy::copy($file, $path) or warn $!;
- }
-
- return $dist, $dir;
- }
- }
-
- sub unpack {
- my($self, $file) = @_;
- $self->chat("Unpacking $file\n");
- my $dir = $file =~ /\.zip/i ? $self->unzip($file) : $self->untar($file);
- unless ($dir) {
- $self->diag_fail("Failed to unpack $file: no directory");
- }
- return $dir;
- }
-
- sub resolve_name {
- my($self, $module, $version) = @_;
-
- # URL
- if ($module =~ /^(ftp|https?|file):/) {
- if ($module =~ m!authors/id/!) {
- return $self->cpan_dist($module, $module);
- } else {
- return { uris => [ $module ] };
- }
- }
-
- # Directory
- if ($module =~ m!^[\./]! && -d $module) {
- return {
- source => 'local',
- dir => Cwd::abs_path($module),
- };
- }
-
- # File
- if (-f $module) {
- return {
- source => 'local',
- uris => [ "file://" . Cwd::abs_path($module) ],
- };
- }
-
- # cpan URI
- if ($module =~ s!^cpan:///distfile/!!) {
- return $self->cpan_dist($module);
- }
-
- # PAUSEID/foo
- if ($module =~ m!([A-Z]{3,})/!) {
- return $self->cpan_dist($module);
- }
-
- # Module name
- return $self->search_module($module, $version);
- }
-
- sub cpan_module {
- my($self, $module, $dist, $version) = @_;
-
- my $dist = $self->cpan_dist($dist);
- $dist->{module} = $module;
- $dist->{module_version} = $version if $version && $version ne 'undef';
-
- return $dist;
- }
-
- sub cpan_dist {
- my($self, $dist, $url) = @_;
-
- $dist =~ s!^([A-Z]{3})!substr($1,0,1)."/".substr($1,0,2)."/".$1!e;
-
- require CPAN::DistnameInfo;
- my $d = CPAN::DistnameInfo->new($dist);
-
- if ($url) {
- $url = [ $url ] unless ref $url eq 'ARRAY';
- } else {
- my $id = $d->cpanid;
- my $fn = substr($id, 0, 1) . "/" . substr($id, 0, 2) . "/" . $id . "/" . $d->filename;
-
- my @mirrors = @{$self->{mirrors}};
- my @urls = map "$_/authors/id/$fn", @mirrors;
-
- $url = \@urls,
- }
-
- return {
- $d->properties,
- source => 'cpan',
- uris => $url,
- };
- }
-
- sub setup_module_build_patch {
- my $self = shift;
-
- open my $out, ">$self->{base}/ModuleBuildSkipMan.pm" or die $!;
- print $out <<EOF;
+ DIAG
package ModuleBuildSkipMan;
CHECK {
if (%Module::Build::) {
@@ -1417,880 +157,13 @@ $fatpacked{"App/cpanminus/script.pm"} = <<'APP_CPANMINUS_SCRIPT';
}
1;
EOF
- }
-
- sub check_module {
- my($self, $mod, $want_ver) = @_;
-
- require Module::Metadata;
- my $meta = Module::Metadata->new_from_module($mod, inc => $self->{search_inc})
- or return 0, undef;
-
- my $version = $meta->version;
-
- # When -L is in use, the version loaded from 'perl' library path
- # might be newer than (or actually wasn't core at) the version
- # that is shipped with the current perl
- if ($self->{self_contained} && $self->loaded_from_perl_lib($meta)) {
- require Module::CoreList;
- unless (exists $Module::CoreList::version{$]+0}{$mod}) {
- return 0, undef;
- }
- $version = $Module::CoreList::version{$]+0}{$mod};
- }
-
- $self->{local_versions}{$mod} = $version;
-
- if ($self->is_deprecated($meta)){
- return 0, $version;
- } elsif (!$want_ver or $version >= version->new($want_ver)) {
- return 1, ($version || 'undef');
- } else {
- return 0, $version;
- }
- }
-
- sub is_deprecated {
- my($self, $meta) = @_;
-
- my $deprecated = eval {
- require Module::CoreList;
- Module::CoreList::is_deprecated($meta->{module});
- };
-
- return unless $deprecated;
- return $self->loaded_from_perl_lib($meta);
- }
-
- sub loaded_from_perl_lib {
- my($self, $meta) = @_;
-
- require Config;
- for my $dir (qw(archlibexp privlibexp)) {
- my $confdir = $Config{$dir};
- if ($confdir eq substr($meta->filename, 0, length($confdir))) {
- return 1;
- }
- }
-
- return;
- }
-
- sub should_install {
- my($self, $mod, $ver) = @_;
-
- $self->chat("Checking if you have $mod $ver ... ");
- my($ok, $local) = $self->check_module($mod, $ver);
-
- if ($ok) { $self->chat("Yes ($local)\n") }
- elsif ($local) { $self->chat("No ($local < $ver)\n") }
- else { $self->chat("No\n") }
-
- return $mod unless $ok;
- return;
- }
-
- sub install_deps {
- my($self, $dir, $depth, @deps) = @_;
-
- my(@install, %seen);
- while (my($mod, $ver) = splice @deps, 0, 2) {
- next if $seen{$mod} or $mod eq 'perl' or $mod eq 'Config';
- if ($self->should_install($mod, $ver)) {
- push @install, [ $mod, $ver ];
- $seen{$mod} = 1;
- }
- }
-
- if (@install) {
- $self->diag("==> Found dependencies: " . join(", ", map $_->[0], @install) . "\n");
- }
-
- my @fail;
- for my $mod (@install) {
- $self->install_module($mod->[0], $depth + 1, $mod->[1])
- or push @fail, $mod->[0];
- }
-
- $self->chdir($self->{base});
- $self->chdir($dir) if $dir;
-
- return @fail;
- }
-
- sub install_deps_bailout {
- my($self, $target, $dir, $depth, @deps) = @_;
-
- my @fail = $self->install_deps($dir, $depth, @deps);
- if (@fail) {
- unless ($self->prompt_bool("Installing the following dependencies failed:\n==> " .
- join(", ", @fail) . "\nDo you want to continue building $target anyway?", "n")) {
- $self->diag_fail("Bailing out the installation for $target. Retry with --prompt or --force.", 1);
- return;
- }
- }
-
- return 1;
- }
-
- sub build_stuff {
- my($self, $stuff, $dist, $depth) = @_;
-
- my @config_deps;
- if (!%{$dist->{meta} || {}} && -e 'META.yml') {
- $self->chat("Checking configure dependencies from META.yml\n");
- $dist->{meta} = $self->parse_meta('META.yml');
- }
-
- if (!$dist->{meta} && $dist->{source} eq 'cpan') {
- $self->chat("META.yml not found or unparsable. Fetching META.yml from search.cpan.org\n");
- $dist->{meta} = $self->fetch_meta_sco($dist);
- }
-
- $dist->{meta} ||= {};
-
- push @config_deps, %{$dist->{meta}{configure_requires} || {}};
-
- my $target = $dist->{meta}{name} ? "$dist->{meta}{name}-$dist->{meta}{version}" : $dist->{dir};
-
- $self->install_deps_bailout($target, $dist->{dir}, $depth, @config_deps)
- or return;
-
- $self->diag_progress("Configuring $target");
-
- my $configure_state = $self->configure_this($dist);
-
- $self->diag_ok($configure_state->{configured_ok} ? "OK" : "N/A");
-
- my @deps = $self->find_prereqs($dist);
- my $module_name = $self->find_module_name($configure_state) || $dist->{meta}{name};
- $module_name =~ s/-/::/g;
-
- if ($self->{showdeps}) {
- my %rootdeps = (@config_deps, @deps); # merge
- for my $mod (keys %rootdeps) {
- my $ver = $rootdeps{$mod};
- print $mod, ($ver ? "~$ver" : ""), "\n";
- }
- return 1;
- }
-
- my $distname = $dist->{meta}{name} ? "$dist->{meta}{name}-$dist->{meta}{version}" : $stuff;
-
- my $walkup;
- if ($self->{scandeps}) {
- $walkup = $self->scandeps_append_child($dist);
- }
-
- $self->install_deps_bailout($distname, $dist->{dir}, $depth, @deps)
- or return;
-
- if ($self->{scandeps}) {
- unless ($configure_state->{configured_ok}) {
- my $diag = <<DIAG;
! Configuring $distname failed. See $self->{log} for details.
! You might have to install the following modules first to get --scandeps working correctly.
DIAG
- if (@config_deps) {
- my @tree = @{$self->{scandeps_tree}};
- $diag .= "!\n" . join("", map "! * $_->[0]{module}\n", @tree[0..$#tree-1]) if @tree;
- }
- $self->diag("!\n$diag!\n", 1);
- }
- $walkup->();
- return 1;
- }
-
- if ($self->{installdeps} && $depth == 0) {
- if ($configure_state->{configured_ok}) {
- $self->diag("<== Installed dependencies for $stuff. Finishing.\n");
- return 1;
- } else {
- $self->diag("! Configuring $distname failed. See $self->{log} for details.\n", 1);
- return;
- }
- }
-
- my $installed;
- if ($configure_state->{use_module_build} && -e 'Build' && -f _) {
- my @switches = $self->{pod2man} ? () : ("-I$self->{base}", "-MModuleBuildSkipMan");
- $self->diag_progress("Building " . ($self->{notest} ? "" : "and testing ") . $distname);
- $self->build([ $self->{perl}, @switches, "./Build" ], $distname) &&
- $self->test([ $self->{perl}, "./Build", "test" ], $distname) &&
- $self->install([ $self->{perl}, @switches, "./Build", "install" ], [ "--uninst", 1 ]) &&
- $installed++;
- } elsif ($self->{make} && -e 'Makefile') {
- $self->diag_progress("Building " . ($self->{notest} ? "" : "and testing ") . $distname);
- $self->build([ $self->{make} ], $distname) &&
- $self->test([ $self->{make}, "test" ], $distname) &&
- $self->install([ $self->{make}, "install" ], [ "UNINST=1" ]) &&
- $installed++;
- } else {
- my $why;
- my $configure_failed = $configure_state->{configured} && !$configure_state->{configured_ok};
- if ($configure_failed) { $why = "Configure failed for $distname." }
- elsif ($self->{make}) { $why = "The distribution doesn't have a proper Makefile.PL/Build.PL" }
- else { $why = "Can't configure the distribution. You probably need to have 'make'." }
-
- $self->diag_fail("$why See $self->{log} for details.", 1);
- return;
- }
-
- if ($installed) {
- my $local = $self->{local_versions}{$dist->{module} || ''};
- my $version = $dist->{module_version} || $dist->{meta}{version} || $dist->{version};
- my $reinstall = $local && ($local eq $version);
-
- my $how = $reinstall ? "reinstalled $distname"
- : $local ? "installed $distname (upgraded from $local)"
- : "installed $distname" ;
- my $msg = "Successfully $how";
- $self->diag_ok;
- $self->diag("$msg\n", 1);
- $self->{installed_dists}++;
- $self->save_meta($stuff, $dist, $module_name, \@config_deps, \@deps);
- return 1;
- } else {
- my $msg = "Building $distname failed";
- $self->diag_fail("Installing $stuff failed. See $self->{log} for details.", 1);
- return;
- }
- }
-
- sub configure_this {
- my($self, $dist) = @_;
-
- if ($self->{skip_configure}) {
- my $eumm = -e 'Makefile';
- my $mb = -e 'Build' && -f _;
- return {
- configured => 1,
- configured_ok => $eumm || $mb,
- use_module_build => $mb,
- };
- }
-
- my @mb_switches;
- unless ($self->{pod2man}) {
- # it has to be push, so Module::Build is loaded from the adjusted path when -L is in use
- push @mb_switches, ("-I$self->{base}", "-MModuleBuildSkipMan");
- }
-
- my $state = {};
-
- my $try_eumm = sub {
- if (-e 'Makefile.PL') {
- $self->chat("Running Makefile.PL\n");
-
- # NOTE: according to Devel::CheckLib, most XS modules exit
- # with 0 even if header files are missing, to avoid receiving
- # tons of FAIL reports in such cases. So exit code can't be
- # trusted if it went well.
- if ($self->configure([ $self->{perl}, "Makefile.PL" ])) {
- $state->{configured_ok} = -e 'Makefile';
- }
- $state->{configured}++;
- }
- };
-
- my $try_mb = sub {
- if (-e 'Build.PL') {
- $self->chat("Running Build.PL\n");
- if ($self->configure([ $self->{perl}, @mb_switches, "Build.PL" ])) {
- $state->{configured_ok} = -e 'Build' && -f _;
- }
- $state->{use_module_build}++;
- $state->{configured}++;
- }
- };
-
- # Module::Build deps should use MakeMaker because that causes circular deps and fail
- # Otherwise we should prefer Build.PL
- my %should_use_mm = map { $_ => 1 } qw( version ExtUtils-ParseXS ExtUtils-Install ExtUtils-Manifest );
-
- my @try;
- if ($dist->{dist} && $should_use_mm{$dist->{dist}}) {
- @try = ($try_eumm, $try_mb);
- } else {
- @try = ($try_mb, $try_eumm);
- }
-
- for my $try (@try) {
- $try->();
- last if $state->{configured_ok};
- }
-
- unless ($state->{configured_ok}) {
- while (1) {
- my $ans = lc $self->prompt("Configuring $dist->{dist} failed.\nYou can s)kip, r)etry, e)xamine build log, or l)ook ?", "s");
- last if $ans eq 's';
- return $self->configure_this($dist) if $ans eq 'r';
- $self->show_build_log if $ans eq 'e';
- $self->look if $ans eq 'l';
- }
- }
-
- return $state;
- }
-
- sub find_module_name {
- my($self, $state) = @_;
-
- return unless $state->{configured_ok};
-
- if ($state->{use_module_build} &&
- -e "_build/build_params") {
- my $params = do { open my $in, "_build/build_params"; $self->safe_eval(join "", <$in>) };
- return eval { $params->[2]{module_name} } || undef;
- } elsif (-e "Makefile") {
- open my $mf, "Makefile";
- while (<$mf>) {
- if (/^\#\s+NAME\s+=>\s+(.*)/) {
- return $self->safe_eval($1);
- }
- }
- }
-
- return;
- }
-
- sub save_meta {
- my($self, $module, $dist, $module_name, $config_deps, $build_deps) = @_;
-
- return unless $dist->{distvname} && $dist->{source} eq 'cpan';
-
- my $base = ($ENV{PERL_MM_OPT} || '') =~ /INSTALL_BASE=/
- ? ($self->install_base($ENV{PERL_MM_OPT}) . "/lib/perl5") : $Config{sitelibexp};
-
- my $provides = $self->_merge_hashref(
- map Module::Metadata->package_versions_from_directory($_),
- qw( blib/lib blib/arch ) # FCGI.pm :(
- );
-
- mkdir "blib/meta", 0777 or die $!;
-
- my $local = {
- name => $module_name,
- module => $module,
- version => $provides->{$module}{version} || $dist->{version},
- dist => $dist->{distvname},
- pathname => $dist->{pathname},
- provides => $provides,
- };
-
- require JSON::PP;
- open my $fh, ">", "blib/meta/install.json" or die $!;
- print $fh JSON::PP::encode_json($local);
-
- # Existence of MYMETA.* Depends on EUMM/M::B versions and CPAN::Meta
- if (-e "MYMETA.json") {
- File::Copy::copy("MYMETA.json", "blib/meta/MYMETA.json");
- }
-
- my @cmd = (
- ($self->{sudo} ? 'sudo' : ()),
- $^X,
- '-MExtUtils::Install=install',
- '-e',
- qq[install({ 'blib/meta' => '$base/$Config{archname}/.meta/$dist->{distvname}' })],
- );
- $self->run(\@cmd);
- }
-
- sub _merge_hashref {
- my($self, @hashrefs) = @_;
-
- my %hash;
- for my $h (@hashrefs) {
- %hash = (%hash, %$h);
- }
-
- return \%hash;
- }
-
- sub install_base {
- my($self, $mm_opt) = @_;
- $mm_opt =~ /INSTALL_BASE=(\S+)/ and return $1;
- die "Your PERL_MM_OPT doesn't contain INSTALL_BASE";
- }
-
- sub safe_eval {
- my($self, $code) = @_;
- eval $code;
- }
-
- sub find_prereqs {
- my($self, $dist) = @_;
-
- my @deps = $self->extract_meta_prereqs($dist);
-
- if ($dist->{module} =~ /^Bundle::/i) {
- push @deps, $self->bundle_deps($dist);
- }
-
- return @deps;
- }
-
- sub extract_meta_prereqs {
- my($self, $dist) = @_;
-
- my $meta = $dist->{meta};
-
- my @deps;
- if (-e "MYMETA.json") {
- require JSON::PP;
- $self->chat("Checking dependencies from MYMETA.json ...\n");
- my $json = do { open my $in, "<MYMETA.json"; local $/; <$in> };
- my $mymeta = JSON::PP::decode_json($json);
- if ($mymeta) {
- $meta->{$_} = $mymeta->{$_} for qw(name version);
- return $self->extract_requires($mymeta);
- }
- }
-
- if (-e 'MYMETA.yml') {
- $self->chat("Checking dependencies from MYMETA.yml ...\n");
- my $mymeta = $self->parse_meta('MYMETA.yml');
- if ($mymeta) {
- $meta->{$_} = $mymeta->{$_} for qw(name version);
- return $self->extract_requires($mymeta);
- }
- }
-
- if (-e '_build/prereqs') {
- $self->chat("Checking dependencies from _build/prereqs ...\n");
- my $mymeta = do { open my $in, "_build/prereqs"; $self->safe_eval(join "", <$in>) };
- @deps = $self->extract_requires($mymeta);
- } elsif (-e 'Makefile') {
- $self->chat("Finding PREREQ from Makefile ...\n");
- open my $mf, "Makefile";
- while (<$mf>) {
- if (/^\#\s+PREREQ_PM => {\s*(.*?)\s*}/) {
- my @all;
- my @pairs = split ', ', $1;
- for (@pairs) {
- my ($pkg, $v) = split '=>', $_;
- push @all, [ $pkg, $v ];
- }
- my $list = join ", ", map { "'$_->[0]' => $_->[1]" } @all;
- my $prereq = $self->safe_eval("no strict; +{ $list }");
- push @deps, %$prereq if $prereq;
- last;
- }
- }
- }
-
- return @deps;
- }
-
- sub bundle_deps {
- my($self, $dist) = @_;
-
- my @files;
- File::Find::find({
- wanted => sub { push @files, File::Spec->rel2abs($_) if /\.pm/i },
- no_chdir => 1,
- }, '.');
-
- my @deps;
-
- for my $file (@files) {
- open my $pod, "<", $file or next;
- my $in_contents;
- while (<$pod>) {
- if (/^=head\d\s+CONTENTS/) {
- $in_contents = 1;
- } elsif (/^=/) {
- $in_contents = 0;
- } elsif ($in_contents) {
- /^(\S+)\s*(\S+)?/
- and push @deps, $1, $self->maybe_version($2);
- }
- }
- }
-
- return @deps;
- }
-
- sub maybe_version {
- my($self, $string) = @_;
- return $string && $string =~ /^\.?\d/ ? $string : undef;
- }
-
- sub extract_requires {
- my($self, $meta) = @_;
-
- if ($meta->{'meta-spec'} && $meta->{'meta-spec'}{version} == 2) {
- my @phase = $self->{notest} ? qw( build runtime ) : qw( build test runtime );
- my @deps = map {
- my $p = $meta->{prereqs}{$_} || {};
- %{$p->{requires} || {}};
- } @phase;
- return @deps;
- }
-
- my @deps;
- push @deps, %{$meta->{build_requires}} if $meta->{build_requires};
- push @deps, %{$meta->{requires}} if $meta->{requires};
-
- return @deps;
- }
-
- sub cleanup_workdirs {
- my $self = shift;
-
- my $expire = time - 24 * 60 * 60 * $self->{auto_cleanup};
- my @targets;
-
- opendir my $dh, "$self->{home}/work";
- while (my $e = readdir $dh) {
- next if $e !~ /^(\d+)\.\d+$/; # {UNIX time}.{PID}
- my $time = $1;
- if ($time < $expire) {
- push @targets, "$self->{home}/work/$e";
- }
- }
-
- if (@targets) {
- $self->chat("Expiring ", scalar(@targets), " work directories.\n");
- File::Path::rmtree(\@targets, 0, 0); # safe = 0, since blib usually doesn't have write bits
- }
- }
-
- sub scandeps_append_child {
- my($self, $dist) = @_;
-
- my $new_node = [ $dist, [] ];
-
- my $curr_node = $self->{scandeps_current} || [ undef, $self->{scandeps_tree} ];
- push @{$curr_node->[1]}, $new_node;
-
- $self->{scandeps_current} = $new_node;
-
- return sub { $self->{scandeps_current} = $curr_node };
- }
-
- sub dump_scandeps {
- my $self = shift;
-
- if ($self->{format} eq 'tree') {
- $self->walk_down(sub {
- my($dist, $depth) = @_;
- if ($depth == 0) {
- print "$dist->{distvname}\n";
- } else {
- print " " x ($depth - 1);
- print "\\_ $dist->{distvname}\n";
- }
- }, 1);
- } elsif ($self->{format} =~ /^dists?$/) {
- $self->walk_down(sub {
- my($dist, $depth) = @_;
- print $self->format_dist($dist), "\n";
- }, 0);
- } elsif ($self->{format} eq 'json') {
- require JSON::PP;
- print JSON::PP::encode_json($self->{scandeps_tree});
- } elsif ($self->{format} eq 'yaml') {
- require YAML;
- print YAML::Dump($self->{scandeps_tree});
- } else {
- $self->diag("Unknown format: $self->{format}\n");
- }
- }
-
- sub walk_down {
- my($self, $cb, $pre) = @_;
- $self->_do_walk_down($self->{scandeps_tree}, $cb, 0, $pre);
- }
-
- sub _do_walk_down {
- my($self, $children, $cb, $depth, $pre) = @_;
-
- # DFS - $pre determines when we call the callback
- for my $node (@$children) {
- $cb->($node->[0], $depth) if $pre;
- $self->_do_walk_down($node->[1], $cb, $depth + 1, $pre);
- $cb->($node->[0], $depth) unless $pre;
- }
- }
-
- sub DESTROY {
- my $self = shift;
- $self->{at_exit}->($self) if $self->{at_exit};
- }
-
- # Utils
-
- sub shell_quote {
- my($self, $stuff) = @_;
- $stuff =~ /^${quote}.+${quote}$/ ? $stuff : ($quote . $stuff . $quote);
- }
-
- sub which {
- my($self, $name) = @_;
- my $exe_ext = $Config{_exe};
- for my $dir (File::Spec->path) {
- my $fullpath = File::Spec->catfile($dir, $name);
- if (-x $fullpath || -x ($fullpath .= $exe_ext)) {
- if ($fullpath =~ /\s/ && $fullpath !~ /^$quote/) {
- $fullpath = $self->shell_quote($fullpath);
- }
- return $fullpath;
- }
- }
- return;
- }
-
- sub get { $_[0]->{_backends}{get}->(@_) };
- sub mirror { $_[0]->{_backends}{mirror}->(@_) };
- sub untar { $_[0]->{_backends}{untar}->(@_) };
- sub unzip { $_[0]->{_backends}{unzip}->(@_) };
-
- sub file_get {
- my($self, $uri) = @_;
- open my $fh, "<$uri" or return;
- join '', <$fh>;
- }
-
- sub file_mirror {
- my($self, $uri, $path) = @_;
- File::Copy::copy($uri, $path);
- }
-
- sub init_tools {
- my $self = shift;
-
- return if $self->{initialized}++;
-
- if ($self->{make} = $self->which($Config{make})) {
- $self->chat("You have make $self->{make}\n");
- }
-
- # use --no-lwp if they have a broken LWP, to upgrade LWP
- if ($self->{try_lwp} && eval { require LWP::UserAgent; LWP::UserAgent->VERSION(5.802) }) {
- $self->chat("You have LWP $LWP::VERSION\n");
- my $ua = sub {
- LWP::UserAgent->new(
- parse_head => 0,
- env_proxy => 1,
- agent => "cpanminus/$VERSION",
- timeout => 30,
- @_,
- );
- };
- $self->{_backends}{get} = sub {
- my $self = shift;
- my $res = $ua->()->request(HTTP::Request->new(GET => $_[0]));
- return unless $res->is_success;
- return $res->decoded_content;
- };
- $self->{_backends}{mirror} = sub {
- my $self = shift;
- my $res = $ua->()->mirror(@_);
- $res->code;
- };
- } elsif ($self->{try_wget} and my $wget = $self->which('wget')) {
- $self->chat("You have $wget\n");
- $self->{_backends}{get} = sub {
- my($self, $uri) = @_;
- return $self->file_get($uri) if $uri =~ s!^file:/+!/!;
- $self->safeexec( my $fh, $wget, $uri, ( $self->{verbose} ? () : '-q' ), '-O', '-' ) or die "wget $uri: $!";
- local $/;
- <$fh>;
- };
- $self->{_backends}{mirror} = sub {
- my($self, $uri, $path) = @_;
- return $self->file_mirror($uri, $path) if $uri =~ s!^file:/+!/!;
- $self->safeexec( my $fh, $wget, '--retry-connrefused', $uri, ( $self->{verbose} ? () : '-q' ), '-O', $path ) or die "wget $uri: $!";
- local $/;
- <$fh>;
- };
- } elsif ($self->{try_curl} and my $curl = $self->which('curl')) {
- $self->chat("You have $curl\n");
- $self->{_backends}{get} = sub {
- my($self, $uri) = @_;
- return $self->file_get($uri) if $uri =~ s!^file:/+!/!;
- $self->safeexec( my $fh, $curl, '-L', ( $self->{verbose} ? () : '-s' ), $uri ) or die "curl $uri: $!";
- local $/;
- <$fh>;
- };
- $self->{_backends}{mirror} = sub {
- my($self, $uri, $path) = @_;
- return $self->file_mirror($uri, $path) if $uri =~ s!^file:/+!/!;
- $self->safeexec( my $fh, $curl, '-L', $uri, ( $self->{verbose} ? () : '-s' ), '-#', '-o', $path ) or die "curl $uri: $!";
- local $/;
- <$fh>;
- };
- } else {
- require HTTP::Tiny;
- $self->chat("Falling back to HTTP::Tiny $HTTP::Tiny::VERSION\n");
-
- $self->{_backends}{get} = sub {
- my $self = shift;
- my $res = HTTP::Tiny->new->get($_[0]);
- return unless $res->{success};
- return $res->{content};
- };
- $self->{_backends}{mirror} = sub {
- my $self = shift;
- my $res = HTTP::Tiny->new->mirror(@_);
- return $res->{status};
- };
- }
-
- my $tar = $self->which('tar');
- my $tar_ver;
- my $maybe_bad_tar = sub { WIN32 || SUNOS || (($tar_ver = `$tar --version 2>/dev/null`) =~ /GNU.*1\.13/i) };
-
- if ($tar && !$maybe_bad_tar->()) {
- chomp $tar_ver;
- $self->chat("You have $tar: $tar_ver\n");
- $self->{_backends}{untar} = sub {
- my($self, $tarfile) = @_;
-
- my $xf = "xf" . ($self->{verbose} ? 'v' : '');
- my $ar = $tarfile =~ /bz2$/ ? 'j' : 'z';
-
- my($root, @others) = `$tar tf$ar $tarfile`
- or return undef;
-
- chomp $root;
- $root =~ s!^\./!!;
- $root =~ s{^(.+?)/.*$}{$1};
-
- system "$tar $xf$ar $tarfile";
- return $root if -d $root;
-
- $self->diag_fail("Bad archive: $tarfile");
- return undef;
- }
- } elsif ( $tar
- and my $gzip = $self->which('gzip')
- and my $bzip2 = $self->which('bzip2')) {
- $self->chat("You have $tar, $gzip and $bzip2\n");
- $self->{_backends}{untar} = sub {
- my($self, $tarfile) = @_;
-
- my $x = "x" . ($self->{verbose} ? 'v' : '') . "f -";
- my $ar = $tarfile =~ /bz2$/ ? $bzip2 : $gzip;
-
- my($root, @others) = `$ar -dc $tarfile | $tar tf -`
- or return undef;
-
- chomp $root;
- $root =~ s{^(.+?)/.*$}{$1};
-
- system "$ar -dc $tarfile | $tar $x";
- return $root if -d $root;
-
- $self->diag_fail("Bad archive: $tarfile");
- return undef;
- }
- } elsif (eval { require Archive::Tar }) { # uses too much memory!
- $self->chat("Falling back to Archive::Tar $Archive::Tar::VERSION\n");
- $self->{_backends}{untar} = sub {
- my $self = shift;
- my $t = Archive::Tar->new($_[0]);
- my $root = ($t->list_files)[0];
- $root =~ s{^(.+?)/.*$}{$1};
- $t->extract;
- return -d $root ? $root : undef;
- };
- } else {
- $self->{_backends}{untar} = sub {
- die "Failed to extract $_[1] - You need to have tar or Archive::Tar installed.\n";
- };
- }
-
- if (my $unzip = $self->which('unzip')) {
- $self->chat("You have $unzip\n");
- $self->{_backends}{unzip} = sub {
- my($self, $zipfile) = @_;
-
- my $opt = $self->{verbose} ? '' : '-q';
- my(undef, $root, @others) = `$unzip -t $zipfile`
- or return undef;
-
- chomp $root;
- $root =~ s{^\s+testing:\s+(.+?)/\s+OK$}{$1};
-
- system "$unzip $opt $zipfile";
- return $root if -d $root;
-
- $self->diag_fail("Bad archive: [$root] $zipfile");
- return undef;
- }
- } else {
- $self->{_backends}{unzip} = sub {
- eval { require Archive::Zip }
- or die "Failed to extract $_[1] - You need to have unzip or Archive::Zip installed.\n";
- my($self, $file) = @_;
- my $zip = Archive::Zip->new();
- my $status;
- $status = $zip->read($file);
- $self->diag_fail("Read of file[$file] failed")
- if $status != Archive::Zip::AZ_OK();
- my @members = $zip->members();
- my $root;
- for my $member ( @members ) {
- my $af = $member->fileName();
- next if ($af =~ m!^(/|\.\./)!);
- $root = $af unless $root;
- $status = $member->extractToFileNamed( $af );
- $self->diag_fail("Extracting of file[$af] from zipfile[$file failed")
- if $status != Archive::Zip::AZ_OK();
- }
- return -d $root ? $root : undef;
- };
- }
- }
-
- sub safeexec {
- my $self = shift;
- my $rdr = $_[0] ||= Symbol::gensym();
-
- if (WIN32) {
- my $cmd = join q{ }, map { $self->shell_quote($_) } @_[ 1 .. $#_ ];
- return open( $rdr, "$cmd |" );
- }
-
- if ( my $pid = open( $rdr, '-|' ) ) {
- return $pid;
- }
- elsif ( defined $pid ) {
- exec( @_[ 1 .. $#_ ] );
- exit 1;
- }
- else {
- return;
- }
- }
-
- sub parse_meta {
- my($self, $file) = @_;
- return eval { (Parse::CPAN::Meta::LoadFile($file))[0] } || undef;
- }
-
- sub parse_meta_string {
- my($self, $yaml) = @_;
- return eval { (Parse::CPAN::Meta::Load($yaml))[0] } || undef;
- }
-
- 1;
APP_CPANMINUS_SCRIPT
$fatpacked{"CPAN/DistnameInfo.pm"} = <<'CPAN_DISTNAMEINFO';
-
- package CPAN::DistnameInfo;
-
- $VERSION = "0.11";
- use strict;
-
- sub distname_info {
- my $file = shift or return;
-
- my ($dist, $version) = $file =~ /^
+ package CPAN::DistnameInfo;$VERSION="0.12";use strict;sub distname_info {my$file=shift or return;my ($dist,$version)=$file =~ /^
((?:[-+.]*(?:[A-Za-z0-9]+|(?<=\D)_|_(?=\D))*
(?:
[A-Za-z](?=[^A-Za-z]|$)
@@ -2298,3398 +171,50 @@ $fatpacked{"CPAN/DistnameInfo.pm"} = <<'CPAN_DISTNAMEINFO';
\d(?=-)
)(?<![._-][vV])
)+)(.*)
- $/xs or return ($file,undef,undef);
-
- if ($dist =~ /-undef\z/ and ! length $version) {
- $dist =~ s/-undef\z//;
- }
-
- # Remove potential -withoutworldwriteables suffix
- $version =~ s/-withoutworldwriteables$//;
-
- if ($version =~ /^(-[Vv].*)-(\d.*)/) {
-
- # Catch names like Unicode-Collate-Standard-V3_1_1-0.1
- # where the V3_1_1 is part of the distname
- $dist .= $1;
- $version = $2;
- }
-
- # Normalize the Dist.pm-1.23 convention which CGI.pm and
- # a few others use.
- $dist =~ s{\.pm$}{};
-
- $version = $1
- if !length $version and $dist =~ s/-(\d+\w)$//;
-
- $version = $1 . $version
- if $version =~ /^\d+$/ and $dist =~ s/-(\w+)$//;
-
- if ($version =~ /\d\.\d/) {
- $version =~ s/^[-_.]+//;
- }
- else {
- $version =~ s/^[-_]+//;
- }
-
- my $dev;
- if (length $version) {
- if ($file =~ /^perl-?\d+\.(\d+)(?:\D(\d+))?(-(?:TRIAL|RC)\d+)?$/) {
- $dev = 1 if (($1 > 6 and $1 & 1) or ($2 and $2 >= 50)) or $3;
- }
- elsif ($version =~ /\d\D\d+_\d/ or $version =~ /-TRIAL/) {
- $dev = 1;
- }
- }
- else {
- $version = undef;
- }
-
- ($dist, $version, $dev);
- }
-
- sub new {
- my $class = shift;
- my $distfile = shift;
-
- $distfile =~ s,//+,/,g;
-
- my %info = ( pathname => $distfile );
-
- ($info{filename} = $distfile) =~ s,^(((.*?/)?authors/)?id/)?([A-Z])/(\4[A-Z])/(\5[-A-Z0-9]*)/,,
- and $info{cpanid} = $6;
-
- if ($distfile =~ m,([^/]+)\.(tar\.(?:g?z|bz2)|zip|tgz)$,i) { # support more ?
- $info{distvname} = $1;
- $info{extension} = $2;
- }
-
- @info{qw(dist version beta)} = distname_info($info{distvname});
- $info{maturity} = delete $info{beta} ? 'developer' : 'released';
-
- return bless \%info, $class;
- }
-
- sub dist { shift->{dist} }
- sub version { shift->{version} }
- sub maturity { shift->{maturity} }
- sub filename { shift->{filename} }
- sub cpanid { shift->{cpanid} }
- sub distvname { shift->{distvname} }
- sub extension { shift->{extension} }
- sub pathname { shift->{pathname} }
-
- sub properties { %{ $_[0] } }
-
- 1;
-
- __END__
-
+ $/xs or return ($file,undef,undef);if ($dist =~ /-undef\z/ and!length$version){$dist =~ s/-undef\z//}$version =~ s/-withoutworldwriteables$//;if ($version =~ /^(-[Vv].*)-(\d.*)/){$dist .= $1;$version=$2}if ($version =~ /(.+_.*)-(\d.*)/){$dist .= $1;$version=$2}$dist =~ s{\.pm$}{};$version=$1 if!length$version and $dist =~ s/-(\d+\w)$//;$version=$1 .$version if$version =~ /^\d+$/ and $dist =~ s/-(\w+)$//;if ($version =~ /\d\.\d/){$version =~ s/^[-_.]+//}else {$version =~ s/^[-_]+//}my$dev;if (length$version){if ($file =~ /^perl-?\d+\.(\d+)(?:\D(\d+))?(-(?:TRIAL|RC)\d+)?$/){$dev=1 if (($1 > 6 and $1 & 1)or ($2 and $2 >= 50))or $3}elsif ($version =~ /\d\D\d+_\d/ or $version =~ /-TRIAL/){$dev=1}}else {$version=undef}($dist,$version,$dev)}sub new {my$class=shift;my$distfile=shift;$distfile =~ s,//+,/,g;my%info=(pathname=>$distfile);($info{filename}=$distfile)=~ s,^(((.*?/)?authors/)?id/)?([A-Z])/(\4[A-Z])/(\5[-A-Z0-9]*)/,, and $info{cpanid}=$6;if ($distfile =~ m,([^/]+)\.(tar\.(?:g?z|bz2)|zip|tgz)$,i){$info{distvname}=$1;$info{extension}=$2}@info{qw(dist version beta)}=distname_info($info{distvname});$info{maturity}=delete$info{beta}? 'developer' : 'released';return bless \%info,$class}sub dist {shift->{dist}}sub version {shift->{version}}sub maturity {shift->{maturity}}sub filename {shift->{filename}}sub cpanid {shift->{cpanid}}sub distvname {shift->{distvname}}sub extension {shift->{extension}}sub pathname {shift->{pathname}}sub properties {%{$_[0]}}1;
CPAN_DISTNAMEINFO
$fatpacked{"CPAN/Meta.pm"} = <<'CPAN_META';
- use 5.006;
- use strict;
- use warnings;
- package CPAN::Meta;
- BEGIN {
- $CPAN::Meta::VERSION = '2.110930';
- }
- # ABSTRACT: the distribution metadata for a CPAN dist
-
-
- use Carp qw(carp croak);
- use CPAN::Meta::Feature;
- use CPAN::Meta::Prereqs;
- use CPAN::Meta::Converter;
- use CPAN::Meta::Validator;
- use Parse::CPAN::Meta 1.4400 ();
-
- sub _dclone {
- my $ref = shift;
- my $backend = Parse::CPAN::Meta->json_backend();
- return $backend->new->decode(
- $backend->new->convert_blessed->encode($ref)
- );
- }
-
-
- BEGIN {
- my @STRING_READERS = qw(
- abstract
- description
- dynamic_config
- generated_by
- name
- release_status
- version
- );
-
- no strict 'refs';
- for my $attr (@STRING_READERS) {
- *$attr = sub { $_[0]{ $attr } };
- }
- }
-
-
- BEGIN {
- my @LIST_READERS = qw(
- author
- keywords
- license
- );
-
- no strict 'refs';
- for my $attr (@LIST_READERS) {
- *$attr = sub {
- my $value = $_[0]{ $attr };
- croak "$attr must be called in list context"
- unless wantarray;
- return @{ _dclone($value) } if ref $value;
- return $value;
- };
- }
- }
-
- sub authors { $_[0]->author }
- sub licenses { $_[0]->license }
-
-
- BEGIN {
- my @MAP_READERS = qw(
- meta-spec
- resources
- provides
- no_index
-
- prereqs
- optional_features
- );
-
- no strict 'refs';
- for my $attr (@MAP_READERS) {
- (my $subname = $attr) =~ s/-/_/;
- *$subname = sub {
- my $value = $_[0]{ $attr };
- return _dclone($value) if $value;
- return {};
- };
- }
- }
-
-
- sub custom_keys {
- return grep { /^x_/i } keys %{$_[0]};
- }
-
- sub custom {
- my ($self, $attr) = @_;
- my $value = $self->{$attr};
- return _dclone($value) if ref $value;
- return $value;
- }
-
-
- sub _new {
- my ($class, $struct, $options) = @_;
- my $self;
-
- if ( $options->{lazy_validation} ) {
- # try to convert to a valid structure; if succeeds, then return it
- my $cmc = CPAN::Meta::Converter->new( $struct );
- $self = $cmc->convert( version => 2 ); # valid or dies
- return bless $self, $class;
- }
- else {
- # validate original struct
- my $cmv = CPAN::Meta::Validator->new( $struct );
- unless ( $cmv->is_valid) {
- die "Invalid metadata structure. Errors: "
- . join(", ", $cmv->errors) . "\n";
- }
- }
-
- # up-convert older spec versions
- my $version = $struct->{'meta-spec'}{version} || '1.0';
- if ( $version == 2 ) {
- $self = $struct;
- }
- else {
- my $cmc = CPAN::Meta::Converter->new( $struct );
- $self = $cmc->convert( version => 2 );
- }
-
- return bless $self, $class;
- }
-
- sub new {
- my ($class, $struct, $options) = @_;
- my $self = eval { $class->_new($struct, $options) };
- croak($@) if $@;
- return $self;
- }
-
-
- sub create {
- my ($class, $struct, $options) = @_;
- my $version = __PACKAGE__->VERSION || 2;
- $struct->{generated_by} ||= __PACKAGE__ . " version $version" ;
- $struct->{'meta-spec'}{version} ||= int($version);
- my $self = eval { $class->_new($struct, $options) };
- croak ($@) if $@;
- return $self;
- }
-
-
- sub load_file {
- my ($class, $file, $options) = @_;
- $options->{lazy_validation} = 1 unless exists $options->{lazy_validation};
-
- croak "load_file() requires a valid, readable filename"
- unless -r $file;
-
- my $self;
- eval {
- my $struct = Parse::CPAN::Meta->load_file( $file );
- $self = $class->_new($struct, $options);
- };
- croak($@) if $@;
- return $self;
- }
-
-
- sub load_yaml_string {
- my ($class, $yaml, $options) = @_;
- $options->{lazy_validation} = 1 unless exists $options->{lazy_validation};
-
- my $self;
- eval {
- my ($struct) = Parse::CPAN::Meta->load_yaml_string( $yaml );
- $self = $class->_new($struct, $options);
- };
- croak($@) if $@;
- return $self;
- }
-
-
- sub load_json_string {
- my ($class, $json, $options) = @_;
- $options->{lazy_validation} = 1 unless exists $options->{lazy_validation};
-
- my $self;
- eval {
- my $struct = Parse::CPAN::Meta->load_json_string( $json );
- $self = $class->_new($struct, $options);
- };
- croak($@) if $@;
- return $self;
- }
-
-
- sub save {
- my ($self, $file, $options) = @_;
-
- my $version = $options->{version} || '2';
- my $layer = $] ge '5.008001' ? ':utf8' : '';
-
- if ( $version ge '2' ) {
- carp "'$file' should end in '.json'"
- unless $file =~ m{\.json$};
- }
- else {
- carp "'$file' should end in '.yml'"
- unless $file =~ m{\.yml$};
- }
-
- my $data = $self->as_string( $options );
- open my $fh, ">$layer", $file
- or die "Error opening '$file' for writing: $!\n";
-
- print {$fh} $data;
- close $fh
- or die "Error closing '$file': $!\n";
-
- return 1;
- }
-
-
- sub meta_spec_version {
- my ($self) = @_;
- return $self->meta_spec->{version};
- }
-
-
- sub effective_prereqs {
- my ($self, $features) = @_;
- $features ||= [];
-
- my $prereq = CPAN::Meta::Prereqs->new($self->prereqs);
-
- return $prereq unless @$features;
-
- my @other = map {; $self->feature($_)->prereqs } @$features;
-
- return $prereq->with_merged_prereqs(\@other);
- }
-
-
- sub should_index_file {
- my ($self, $filename) = @_;
-
- for my $no_index_file (@{ $self->no_index->{file} || [] }) {
- return if $filename eq $no_index_file;
- }
-
- for my $no_index_dir (@{ $self->no_index->{directory} }) {
- $no_index_dir =~ s{$}{/} unless $no_index_dir =~ m{/\z};
- return if index($filename, $no_index_dir) == 0;
- }
-
- return 1;
- }
-
-
- sub should_index_package {
- my ($self, $package) = @_;
-
- for my $no_index_pkg (@{ $self->no_index->{package} || [] }) {
- return if $package eq $no_index_pkg;
- }
-
- for my $no_index_ns (@{ $self->no_index->{namespace} }) {
- return if index($package, "${no_index_ns}::") == 0;
- }
-
- return 1;
- }
-
-
- sub features {
- my ($self) = @_;
-
- my $opt_f = $self->optional_features;
- my @features = map {; CPAN::Meta::Feature->new($_ => $opt_f->{ $_ }) }
- keys %$opt_f;
-
- return @features;
- }
-
-
- sub feature {
- my ($self, $ident) = @_;
-
- croak "no feature named $ident"
- unless my $f = $self->optional_features->{ $ident };
-
- return CPAN::Meta::Feature->new($ident, $f);
- }
-
-
- sub as_struct {
- my ($self, $options) = @_;
- my $struct = _dclone($self);
- if ( $options->{version} ) {
- my $cmc = CPAN::Meta::Converter->new( $struct );
- $struct = $cmc->convert( version => $options->{version} );
- }
- return $struct;
- }
-
-
- sub as_string {
- my ($self, $options) = @_;
-
- my $version = $options->{version} || '2';
-
- my $struct;
- if ( $self->meta_spec_version ne $version ) {
- my $cmc = CPAN::Meta::Converter->new( $self->as_struct );
- $struct = $cmc->convert( version => $version );
- }
- else {
- $struct = $self->as_struct;
- }
-
- my ($data, $backend);
- if ( $version ge '2' ) {
- $backend = Parse::CPAN::Meta->json_backend();
- $data = $backend->new->pretty->canonical->encode($struct);
- }
- else {
- $backend = Parse::CPAN::Meta->yaml_backend();
- $data = eval { no strict 'refs'; &{"$backend\::Dump"}($struct) };
- if ( $@ ) {
- croak $backend->can('errstr') ? $backend->errstr : $@
- }
- }
-
- return $data;
- }
-
- # Used by JSON::PP, etc. for "convert_blessed"
- sub TO_JSON {
- return { %{ $_[0] } };
- }
-
- 1;
-
-
-
-
- __END__
-
-
+ use 5.006;use strict;use warnings;package CPAN::Meta;our$VERSION='2.132510';use Carp qw(carp croak);use CPAN::Meta::Feature;use CPAN::Meta::Prereqs;use CPAN::Meta::Converter;use CPAN::Meta::Validator;use Parse::CPAN::Meta 1.4403 ();BEGIN {*_dclone=\&CPAN::Meta::Converter::_dclone}BEGIN {my@STRING_READERS=qw(abstract description dynamic_config generated_by name release_status version);no strict 'refs';for my$attr (@STRING_READERS){*$attr=sub {$_[0]{$attr }}}}BEGIN {my@LIST_READERS=qw(author keywords license);no strict 'refs';for my$attr (@LIST_READERS){*$attr=sub {my$value=$_[0]{$attr };croak "$attr must be called in list context" unless wantarray;return @{_dclone($value)}if ref$value;return$value}}}sub authors {$_[0]->author}sub licenses {$_[0]->license}BEGIN {my@MAP_READERS=qw(meta-spec resources provides no_index prereqs optional_features);no strict 'refs';for my$attr (@MAP_READERS){(my$subname=$attr)=~ s/-/_/;*$subname=sub {my$value=$_[0]{$attr };return _dclone($value)if$value;return {}}}}sub custom_keys {return grep {/^x_/i}keys %{$_[0]}}sub custom {my ($self,$attr)=@_;my$value=$self->{$attr};return _dclone($value)if ref$value;return$value}sub _new {my ($class,$struct,$options)=@_;my$self;if ($options->{lazy_validation}){my$cmc=CPAN::Meta::Converter->new($struct);$self=$cmc->convert(version=>2);return bless$self,$class}else {my$cmv=CPAN::Meta::Validator->new($struct);unless ($cmv->is_valid){die "Invalid metadata structure. Errors: " .join(", ",$cmv->errors)."\n"}}my$version=$struct->{'meta-spec'}{version}|| '1.0';if ($version==2){$self=$struct}else {my$cmc=CPAN::Meta::Converter->new($struct);$self=$cmc->convert(version=>2)}return bless$self,$class}sub new {my ($class,$struct,$options)=@_;my$self=eval {$class->_new($struct,$options)};croak($@)if $@;return$self}sub create {my ($class,$struct,$options)=@_;my$version=__PACKAGE__->VERSION || 2;$struct->{generated_by}||=__PACKAGE__ ." version $version" ;$struct->{'meta-spec'}{version}||=int($version);my$self=eval {$class->_new($struct,$options)};croak ($@)if $@;return$self}sub load_file {my ($class,$file,$options)=@_;$options->{lazy_validation}=1 unless exists$options->{lazy_validation};croak "load_file() requires a valid, readable filename" unless -r $file;my$self;eval {my$struct=Parse::CPAN::Meta->load_file($file);$self=$class->_new($struct,$options)};croak($@)if $@;return$self}sub load_yaml_string {my ($class,$yaml,$options)=@_;$options->{lazy_validation}=1 unless exists$options->{lazy_validation};my$self;eval {my ($struct)=Parse::CPAN::Meta->load_yaml_string($yaml);$self=$class->_new($struct,$options)};croak($@)if $@;return$self}sub load_json_string {my ($class,$json,$options)=@_;$options->{lazy_validation}=1 unless exists$options->{lazy_validation};my$self;eval {my$struct=Parse::CPAN::Meta->load_json_string($json);$self=$class->_new($struct,$options)};croak($@)if $@;return$self}sub save {my ($self,$file,$options)=@_;my$version=$options->{version}|| '2';my$layer=$] ge '5.008001' ? ':utf8' : '';if ($version ge '2'){carp "'$file' should end in '.json'" unless$file =~ m{\.json$}}else {carp "'$file' should end in '.yml'" unless$file =~ m{\.yml$}}my$data=$self->as_string($options);open my$fh,">$layer",$file or die "Error opening '$file' for writing: $!\n";print {$fh}$data;close$fh or die "Error closing '$file': $!\n";return 1}sub meta_spec_version {my ($self)=@_;return$self->meta_spec->{version}}sub effective_prereqs {my ($self,$features)=@_;$features ||=[];my$prereq=CPAN::Meta::Prereqs->new($self->prereqs);return$prereq unless @$features;my@other=map {;$self->feature($_)->prereqs}@$features;return$prereq->with_merged_prereqs(\@other)}sub should_index_file {my ($self,$filename)=@_;for my$no_index_file (@{$self->no_index->{file}|| []}){return if$filename eq $no_index_file}for my$no_index_dir (@{$self->no_index->{directory}}){$no_index_dir =~ s{$}{/} unless$no_index_dir =~ m{/\z};return if index($filename,$no_index_dir)==0}return 1}sub should_index_package {my ($self,$package)=@_;for my$no_index_pkg (@{$self->no_index->{package}|| []}){return if$package eq $no_index_pkg}for my$no_index_ns (@{$self->no_index->{namespace}}){return if index($package,"${no_index_ns}::")==0}return 1}sub features {my ($self)=@_;my$opt_f=$self->optional_features;my@features=map {;CPAN::Meta::Feature->new($_=>$opt_f->{$_ })}keys %$opt_f;return@features}sub feature {my ($self,$ident)=@_;croak "no feature named $ident" unless my$f=$self->optional_features->{$ident };return CPAN::Meta::Feature->new($ident,$f)}sub as_struct {my ($self,$options)=@_;my$struct=_dclone($self);if ($options->{version}){my$cmc=CPAN::Meta::Converter->new($struct);$struct=$cmc->convert(version=>$options->{version})}return$struct}sub as_string {my ($self,$options)=@_;my$version=$options->{version}|| '2';my$struct;if ($self->meta_spec_version ne $version){my$cmc=CPAN::Meta::Converter->new($self->as_struct);$struct=$cmc->convert(version=>$version)}else {$struct=$self->as_struct}my ($data,$backend);if ($version ge '2'){$backend=Parse::CPAN::Meta->json_backend();$data=$backend->new->pretty->canonical->encode($struct)}else {$backend=Parse::CPAN::Meta->yaml_backend();$data=eval {no strict 'refs';&{"$backend\::Dump"}($struct)};if ($@){croak$backend->can('errstr')? $backend->errstr : $@}}return$data}sub TO_JSON {return {%{$_[0]}}}1;
CPAN_META
+$fatpacked{"CPAN/Meta/Check.pm"} = <<'CPAN_META_CHECK';
+ package CPAN::Meta::Check;{$CPAN::Meta::Check::VERSION='0.007'}use strict;use warnings;use Exporter 5.57 'import';our@EXPORT=qw//;our@EXPORT_OK=qw/check_requirements requirements_for verify_dependencies/;our%EXPORT_TAGS=(all=>[@EXPORT,@EXPORT_OK ]);use CPAN::Meta::Requirements 2.120920;use Module::Metadata;sub _check_dep {my ($reqs,$module,$dirs)=@_;my$version=$module eq 'perl' ? $] : do {my$metadata=Module::Metadata->new_from_module($module,inc=>$dirs);return "Module '$module' is not installed" if not defined$metadata;eval {$metadata->version}};return "Missing version info for module '$module'" if$reqs->requirements_for_module($module)and not $version;return sprintf 'Installed version (%s) of %s is not in range \'%s\'',$version,$module,$reqs->requirements_for_module($module)if not $reqs->accepts_module($module,$version || 0);return}sub _check_conflict {my ($reqs,$module,$dirs)=@_;my$metadata=Module::Metadata->new_from_module($module,inc=>$dirs);return if not defined$metadata;my$version=eval {$metadata->version};return "Missing version info for module '$module'" if not $version;return sprintf 'Installed version (%s) of %s is in range \'%s\'',$version,$module,$reqs->requirements_for_module($module)if$reqs->accepts_module($module,$version);return}sub requirements_for {my ($meta,$phases,$type)=@_;my$prereqs=ref($meta)eq 'CPAN::Meta' ? $meta->effective_prereqs : $meta;if (!ref$phases){return$prereqs->requirements_for($phases,$type)}else {my$ret=CPAN::Meta::Requirements->new;for my$phase (@{$phases}){$ret->add_requirements($prereqs->requirements_for($phase,$type))}return$ret}}sub check_requirements {my ($reqs,$type,$dirs)=@_;my%ret;if ($type ne 'conflicts'){for my$module ($reqs->required_modules){$ret{$module}=_check_dep($reqs,$module,$dirs)}}else {for my$module ($reqs->required_modules){$ret{$module}=_check_conflict($reqs,$module,$dirs)}}return \%ret}sub verify_dependencies {my ($meta,$phases,$type,$dirs)=@_;my$reqs=requirements_for($meta,$phases,$type);my$issues=check_requirements($reqs,$type,$dirs);return grep {defined}values %{$issues}}1;
+CPAN_META_CHECK
+
$fatpacked{"CPAN/Meta/Converter.pm"} = <<'CPAN_META_CONVERTER';
- use 5.006;
- use strict;
- use warnings;
- package CPAN::Meta::Converter;
- BEGIN {
- $CPAN::Meta::Converter::VERSION = '2.110930';
- }
- # ABSTRACT: Convert CPAN distribution metadata structures
-
-
- use CPAN::Meta::Validator;
- use version 0.82 ();
- use Parse::CPAN::Meta 1.4400 ();
-
- sub _dclone {
- my $ref = shift;
- my $backend = Parse::CPAN::Meta->json_backend();
- return $backend->new->decode(
- $backend->new->convert_blessed->encode($ref)
- );
- }
-
- my %known_specs = (
- '2' => 'http://search.cpan.org/perldoc?CPAN::Meta::Spec',
- '1.4' => 'http://module-build.sourceforge.net/META-spec-v1.4.html',
- '1.3' => 'http://module-build.sourceforge.net/META-spec-v1.3.html',
- '1.2' => 'http://module-build.sourceforge.net/META-spec-v1.2.html',
- '1.1' => 'http://module-build.sourceforge.net/META-spec-v1.1.html',
- '1.0' => 'http://module-build.sourceforge.net/META-spec-v1.0.html'
- );
-
- my @spec_list = sort { $a <=> $b } keys %known_specs;
- my ($LOWEST, $HIGHEST) = @spec_list[0,-1];
-
- #--------------------------------------------------------------------------#
- # converters
- #
- # called as $converter->($element, $field_name, $full_meta, $to_version)
- #
- # defined return value used for field
- # undef return value means field is skipped
- #--------------------------------------------------------------------------#
-
- sub _keep { $_[0] }
-
- sub _keep_or_one { defined($_[0]) ? $_[0] : 1 }
-
- sub _keep_or_zero { defined($_[0]) ? $_[0] : 0 }
-
- sub _keep_or_unknown { defined($_[0]) && length($_[0]) ? $_[0] : "unknown" }
-
- sub _generated_by {
- my $gen = shift;
- my $sig = __PACKAGE__ . " version " . (__PACKAGE__->VERSION || "<dev>");
-
- return $sig unless defined $gen and length $gen;
- return $gen if $gen =~ /(, )\Q$sig/;
- return "$gen, $sig";
- }
-
- sub _listify { ! defined $_[0] ? undef : ref $_[0] eq 'ARRAY' ? $_[0] : [$_[0]] }
-
- sub _prefix_custom {
- my $key = shift;
- $key =~ s/^(?!x_) # Unless it already starts with x_
+ use 5.006;use strict;use warnings;package CPAN::Meta::Converter;our$VERSION='2.132510';use CPAN::Meta::Validator;use CPAN::Meta::Requirements;use version 0.88 ();use Parse::CPAN::Meta 1.4400 ();sub _dclone {my$ref=shift;no warnings 'once';local*UNIVERSAL::TO_JSON=sub {return "$_[0]"};my$backend=Parse::CPAN::Meta->json_backend();return$backend->new->utf8->decode($backend->new->utf8->allow_blessed->convert_blessed->encode($ref))}my%known_specs=('2'=>'http://search.cpan.org/perldoc?CPAN::Meta::Spec','1.4'=>'http://module-build.sourceforge.net/META-spec-v1.4.html','1.3'=>'http://module-build.sourceforge.net/META-spec-v1.3.html','1.2'=>'http://module-build.sourceforge.net/META-spec-v1.2.html','1.1'=>'http://module-build.sourceforge.net/META-spec-v1.1.html','1.0'=>'http://module-build.sourceforge.net/META-spec-v1.0.html');my@spec_list=sort {$a <=> $b}keys%known_specs;my ($LOWEST,$HIGHEST)=@spec_list[0,-1];sub _keep {$_[0]}sub _keep_or_one {defined($_[0])? $_[0]: 1}sub _keep_or_zero {defined($_[0])? $_[0]: 0}sub _keep_or_unknown {defined($_[0])&& length($_[0])? $_[0]: "unknown"}sub _generated_by {my$gen=shift;my$sig=__PACKAGE__ ." version " .(__PACKAGE__->VERSION || "<dev>");return$sig unless defined$gen and length$gen;return$gen if$gen =~ /(, )\Q$sig/;return "$gen, $sig"}sub _listify {!defined $_[0]? undef : ref $_[0]eq 'ARRAY' ? $_[0]: [$_[0]]}sub _prefix_custom {my$key=shift;$key =~ s/^(?!x_) # Unless it already starts with x_
(?:x-?)? # Remove leading x- or x (if present)
- /x_/ix; # and prepend x_
- return $key;
- }
-
- sub _ucfirst_custom {
- my $key = shift;
- $key = ucfirst $key unless $key =~ /[A-Z]/;
- return $key;
- }
-
- sub _change_meta_spec {
- my ($element, undef, undef, $version) = @_;
- $element->{version} = $version;
- $element->{url} = $known_specs{$version};
- return $element;
- }
-
- my @valid_licenses_1 = (
- 'perl',
- 'gpl',
- 'apache',
- 'artistic',
- 'artistic_2',
- 'lgpl',
- 'bsd',
- 'gpl',
- 'mit',
- 'mozilla',
- 'open_source',
- 'unrestricted',
- 'restrictive',
- 'unknown',
- );
-
- my %license_map_1 = (
- ( map { $_ => $_ } @valid_licenses_1 ),
- artistic2 => 'artistic_2',
- );
-
- sub _license_1 {
- my ($element) = @_;
- return 'unknown' unless defined $element;
- if ( $license_map_1{lc $element} ) {
- return $license_map_1{lc $element};
- }
- return 'unknown';
- }
-
- my @valid_licenses_2 = qw(
- agpl_3
- apache_1_1
- apache_2_0
- artistic_1
- artistic_2
- bsd
- freebsd
- gfdl_1_2
- gfdl_1_3
- gpl_1
- gpl_2
- gpl_3
- lgpl_2_1
- lgpl_3_0
- mit
- mozilla_1_0
- mozilla_1_1
- openssl
- perl_5
- qpl_1_0
- ssleay
- sun
- zlib
- open_source
- restricted
- unrestricted
- unknown
- );
-
- # The "old" values were defined by Module::Build, and were often vague. I have
- # made the decisions below based on reading Module::Build::API and how clearly
- # it specifies the version of the license.
- my %license_map_2 = (
- (map { $_ => $_ } @valid_licenses_2),
- apache => 'apache_2_0', # clearly stated as 2.0
- artistic => 'artistic_1', # clearly stated as 1
- artistic2 => 'artistic_2', # clearly stated as 2
- gpl => 'open_source', # we don't know which GPL; punt
- lgpl => 'open_source', # we don't know which LGPL; punt
- mozilla => 'open_source', # we don't know which MPL; punt
- perl => 'perl_5', # clearly Perl 5
- restrictive => 'restricted',
- );
-
- sub _license_2 {
- my ($element) = @_;
- return [ 'unknown' ] unless defined $element;
- $element = [ $element ] unless ref $element eq 'ARRAY';
- my @new_list;
- for my $lic ( @$element ) {
- next unless defined $lic;
- if ( my $new = $license_map_2{lc $lic} ) {
- push @new_list, $new;
- }
- }
- return @new_list ? \@new_list : [ 'unknown' ];
- }
-
- my %license_downgrade_map = qw(
- agpl_3 open_source
- apache_1_1 apache
- apache_2_0 apache
- artistic_1 artistic
- artistic_2 artistic_2
- bsd bsd
- freebsd open_source
- gfdl_1_2 open_source
- gfdl_1_3 open_source
- gpl_1 gpl
- gpl_2 gpl
- gpl_3 gpl
- lgpl_2_1 lgpl
- lgpl_3_0 lgpl
- mit mit
- mozilla_1_0 mozilla
- mozilla_1_1 mozilla
- openssl open_source
- perl_5 perl
- qpl_1_0 open_source
- ssleay open_source
- sun open_source
- zlib open_source
- open_source open_source
- restricted restrictive
- unrestricted unrestricted
- unknown unknown
- );
-
- sub _downgrade_license {
- my ($element) = @_;
- if ( ! defined $element ) {
- return "unknown";
- }
- elsif( ref $element eq 'ARRAY' ) {
- if ( @$element == 1 ) {
- return $license_downgrade_map{$element->[0]} || "unknown";
- }
- }
- elsif ( ! ref $element ) {
- return $license_downgrade_map{$element} || "unknown";
- }
- return "unknown";
- }
-
- my $no_index_spec_1_2 = {
- 'file' => \&_listify,
- 'dir' => \&_listify,
- 'package' => \&_listify,
- 'namespace' => \&_listify,
- };
-
- my $no_index_spec_1_3 = {
- 'file' => \&_listify,
- 'directory' => \&_listify,
- 'package' => \&_listify,
- 'namespace' => \&_listify,
- };
-
- my $no_index_spec_2 = {
- 'file' => \&_listify,
- 'directory' => \&_listify,
- 'package' => \&_listify,
- 'namespace' => \&_listify,
- ':custom' => \&_prefix_custom,
- };
-
- sub _no_index_1_2 {
- my (undef, undef, $meta) = @_;
- my $no_index = $meta->{no_index} || $meta->{private};
- return unless $no_index;
-
- # cleanup wrong format
- if ( ! ref $no_index ) {
- my $item = $no_index;
- $no_index = { dir => [ $item ], file => [ $item ] };
- }
- elsif ( ref $no_index eq 'ARRAY' ) {
- my $list = $no_index;
- $no_index = { dir => [ @$list ], file => [ @$list ] };
- }
-
- # common mistake: files -> file
- if ( exists $no_index->{files} ) {
- $no_index->{file} = delete $no_index->{file};
- }
- # common mistake: modules -> module
- if ( exists $no_index->{modules} ) {
- $no_index->{module} = delete $no_index->{module};
- }
- return _convert($no_index, $no_index_spec_1_2);
- }
-
- sub _no_index_directory {
- my ($element, $key, $meta, $version) = @_;
- return unless $element;
-
- # cleanup wrong format
- if ( ! ref $element ) {
- my $item = $element;
- $element = { directory => [ $item ], file => [ $item ] };
- }
- elsif ( ref $element eq 'ARRAY' ) {
- my $list = $element;
- $element = { directory => [ @$list ], file => [ @$list ] };
- }
-
- if ( exists $element->{dir} ) {
- $element->{directory} = delete $element->{dir};
- }
- # common mistake: files -> file
- if ( exists $element->{files} ) {
- $element->{file} = delete $element->{file};
- }
- # common mistake: modules -> module
- if ( exists $element->{modules} ) {
- $element->{module} = delete $element->{module};
- }
- my $spec = $version == 2 ? $no_index_spec_2 : $no_index_spec_1_3;
- return _convert($element, $spec);
- }
-
- sub _is_module_name {
- my $mod = shift;
- return unless defined $mod && length $mod;
- return $mod =~ m{^[A-Za-z][A-Za-z0-9_]*(?:::[A-Za-z0-9_]+)*$};
- }
-
- sub _clean_version {
- my ($element, $key, $meta, $to_version) = @_;
- return 0 if ! defined $element;
-
- $element =~ s{^\s*}{};
- $element =~ s{\s*$}{};
- $element =~ s{^\.}{0.};
-
- return 0 if ! length $element;
- return 0 if ( $element eq 'undef' || $element eq '<undef>' );
-
- if ( my $v = eval { version->new($element) } ) {
- return $v->is_qv ? $v->normal : $element;
- }
- else {
- return 0;
- }
- }
-
- sub _version_map {
- my ($element) = @_;
- return undef unless defined $element;
- if ( ref $element eq 'HASH' ) {
- my $new_map = {};
- for my $k ( keys %$element ) {
- next unless _is_module_name($k);
- my $value = $element->{$k};
- if ( ! ( defined $value && length $value ) ) {
- $new_map->{$k} = 0;
- }
- elsif ( $value eq 'undef' || $value eq '<undef>' ) {
- $new_map->{$k} = 0;
- }
- elsif ( _is_module_name( $value ) ) { # some weird, old META have this
- $new_map->{$k} = 0;
- $new_map->{$value} = 0;
- }
- else {
- $new_map->{$k} = _clean_version($value);
- }
- }
- return $new_map;
- }
- elsif ( ref $element eq 'ARRAY' ) {
- my $hashref = { map { $_ => 0 } @$element };
- return _version_map($hashref); # cleanup any weird stuff
- }
- elsif ( ref $element eq '' && length $element ) {
- return { $element => 0 }
- }
- return;
- }
-
- sub _prereqs_from_1 {
- my (undef, undef, $meta) = @_;
- my $prereqs = {};
- for my $phase ( qw/build configure/ ) {
- my $key = "${phase}_requires";
- $prereqs->{$phase}{requires} = _version_map($meta->{$key})
- if $meta->{$key};
- }
- for my $rel ( qw/requires recommends conflicts/ ) {
- $prereqs->{runtime}{$rel} = _version_map($meta->{$rel})
- if $meta->{$rel};
- }
- return $prereqs;
- }
-
- my $prereqs_spec = {
- configure => \&_prereqs_rel,
- build => \&_prereqs_rel,
- test => \&_prereqs_rel,
- runtime => \&_prereqs_rel,
- develop => \&_prereqs_rel,
- ':custom' => \&_prefix_custom,
- };
-
- my $relation_spec = {
- requires => \&_version_map,
- recommends => \&_version_map,
- suggests => \&_version_map,
- conflicts => \&_version_map,
- ':custom' => \&_prefix_custom,
- };
-
- sub _cleanup_prereqs {
- my ($prereqs, $key, $meta, $to_version) = @_;
- return unless $prereqs && ref $prereqs eq 'HASH';
- return _convert( $prereqs, $prereqs_spec, $to_version );
- }
-
- sub _prereqs_rel {
- my ($relation, $key, $meta, $to_version) = @_;
- return unless $relation && ref $relation eq 'HASH';
- return _convert( $relation, $relation_spec, $to_version );
- }
-
-
- BEGIN {
- my @old_prereqs = qw(
- requires
- configure_requires
- recommends
- conflicts
- );
-
- for ( @old_prereqs ) {
- my $sub = "_get_$_";
- my ($phase,$type) = split qr/_/, $_;
- if ( ! defined $type ) {
- $type = $phase;
- $phase = 'runtime';
- }
- no strict 'refs';
- *{$sub} = sub { _extract_prereqs($_[2]->{prereqs},$phase,$type) };
- }
- }
-
- sub _get_build_requires {
- my ($data, $key, $meta) = @_;
-
- my $test_h = _extract_prereqs($_[2]->{prereqs}, qw(test requires)) || {};
- my $build_h = _extract_prereqs($_[2]->{prereqs}, qw(build requires)) || {};
-
- require Version::Requirements;
- my $test_req = Version::Requirements->from_string_hash($test_h);
- my $build_req = Version::Requirements->from_string_hash($build_h);
-
- $test_req->add_requirements($build_req)->as_string_hash;
- }
-
- sub _extract_prereqs {
- my ($prereqs, $phase, $type) = @_;
- return unless ref $prereqs eq 'HASH';
- return $prereqs->{$phase}{$type};
- }
-
- sub _downgrade_optional_features {
- my (undef, undef, $meta) = @_;
- return undef unless exists $meta->{optional_features};
- my $origin = $meta->{optional_features};
- my $features = {};
- for my $name ( keys %$origin ) {
- $features->{$name} = {
- description => $origin->{$name}{description},
- requires => _extract_prereqs($origin->{$name}{prereqs},'runtime','requires'),
- configure_requires => _extract_prereqs($origin->{$name}{prereqs},'runtime','configure_requires'),
- build_requires => _extract_prereqs($origin->{$name}{prereqs},'runtime','build_requires'),
- recommends => _extract_prereqs($origin->{$name}{prereqs},'runtime','recommends'),
- conflicts => _extract_prereqs($origin->{$name}{prereqs},'runtime','conflicts'),
- };
- for my $k (keys %{$features->{$name}} ) {
- delete $features->{$name}{$k} unless defined $features->{$name}{$k};
- }
- }
- return $features;
- }
-
- sub _upgrade_optional_features {
- my (undef, undef, $meta) = @_;
- return undef unless exists $meta->{optional_features};
- my $origin = $meta->{optional_features};
- my $features = {};
- for my $name ( keys %$origin ) {
- $features->{$name} = {
- description => $origin->{$name}{description},
- prereqs => _prereqs_from_1(undef, undef, $origin->{$name}),
- };
- delete $features->{$name}{prereqs}{configure};
- }
- return $features;
- }
-
- my $optional_features_2_spec = {
- description => \&_keep,
- prereqs => \&_cleanup_prereqs,
- ':custom' => \&_prefix_custom,
- };
-
- sub _feature_2 {
- my ($element, $key, $meta, $to_version) = @_;
- return unless $element && ref $element eq 'HASH';
- _convert( $element, $optional_features_2_spec, $to_version );
- }
-
- sub _cleanup_optional_features_2 {
- my ($element, $key, $meta, $to_version) = @_;
- return unless $element && ref $element eq 'HASH';
- my $new_data = {};
- for my $k ( keys %$element ) {
- $new_data->{$k} = _feature_2( $element->{$k}, $k, $meta, $to_version );
- }
- return unless keys %$new_data;
- return $new_data;
- }
-
- sub _optional_features_1_4 {
- my ($element) = @_;
- return unless $element;
- $element = _optional_features_as_map($element);
- for my $name ( keys %$element ) {
- for my $drop ( qw/requires_packages requires_os excluded_os/ ) {
- delete $element->{$name}{$drop};
- }
- }
- return $element;
- }
-
- sub _optional_features_as_map {
- my ($element) = @_;
- return unless $element;
- if ( ref $element eq 'ARRAY' ) {
- my %map;
- for my $feature ( @$element ) {
- my (@parts) = %$feature;
- $map{$parts[0]} = $parts[1];
- }
- $element = \%map;
- }
- return $element;
- }
-
- sub _is_urlish { defined $_[0] && $_[0] =~ m{\A[-+.a-z0-9]+:.+}i }
-
- sub _url_or_drop {
- my ($element) = @_;
- return $element if _is_urlish($element);
- return;
- }
-
- sub _url_list {
- my ($element) = @_;
- return unless $element;
- $element = _listify( $element );
- $element = [ grep { _is_urlish($_) } @$element ];
- return unless @$element;
- return $element;
- }
-
- sub _author_list {
- my ($element) = @_;
- return [ 'unknown' ] unless $element;
- $element = _listify( $element );
- $element = [ map { defined $_ && length $_ ? $_ : 'unknown' } @$element ];
- return [ 'unknown' ] unless @$element;
- return $element;
- }
-
- my $resource2_upgrade = {
- license => sub { return _is_urlish($_[0]) ? _listify( $_[0] ) : undef },
- homepage => \&_url_or_drop,
- bugtracker => sub {
- my ($item) = @_;
- return unless $item;
- if ( $item =~ m{^mailto:(.*)$} ) { return { mailto => $1 } }
- elsif( _is_urlish($item) ) { return { web => $item } }
- else { return undef }
- },
- repository => sub { return _is_urlish($_[0]) ? { url => $_[0] } : undef },
- ':custom' => \&_prefix_custom,
- };
-
- sub _upgrade_resources_2 {
- my (undef, undef, $meta, $version) = @_;
- return undef unless exists $meta->{resources};
- return _convert($meta->{resources}, $resource2_upgrade);
- }
-
- my $bugtracker2_spec = {
- web => \&_url_or_drop,
- mailto => \&_keep,
- ':custom' => \&_prefix_custom,
- };
-
- sub _repo_type {
- my ($element, $key, $meta, $to_version) = @_;
- return $element if defined $element;
- return unless exists $meta->{url};
- my $repo_url = $meta->{url};
- for my $type ( qw/git svn/ ) {
- return $type if $repo_url =~ m{\A$type};
- }
- return;
- }
-
- my $repository2_spec = {
- web => \&_url_or_drop,
- url => \&_url_or_drop,
- type => \&_repo_type,
- ':custom' => \&_prefix_custom,
- };
-
- my $resources2_cleanup = {
- license => \&_url_list,
- homepage => \&_url_or_drop,
- bugtracker => sub { ref $_[0] ? _convert( $_[0], $bugtracker2_spec ) : undef },
- repository => sub { my $data = shift; ref $data ? _convert( $data, $repository2_spec ) : undef },
- ':custom' => \&_prefix_custom,
- };
-
- sub _cleanup_resources_2 {
- my ($resources, $key, $meta, $to_version) = @_;
- return undef unless $resources && ref $resources eq 'HASH';
- return _convert($resources, $resources2_cleanup, $to_version);
- }
-
- my $resource1_spec = {
- license => \&_url_or_drop,
- homepage => \&_url_or_drop,
- bugtracker => \&_url_or_drop,
- repository => \&_url_or_drop,
- ':custom' => \&_keep,
- };
-
- sub _resources_1_3 {
- my (undef, undef, $meta, $version) = @_;
- return undef unless exists $meta->{resources};
- return _convert($meta->{resources}, $resource1_spec);
- }
-
- *_resources_1_4 = *_resources_1_3;
-
- sub _resources_1_2 {
- my (undef, undef, $meta) = @_;
- my $resources = $meta->{resources} || {};
- if ( $meta->{license_url} && ! $resources->{license} ) {
- $resources->{license} = $meta->license_url
- if _is_urlish($meta->{license_url});
- }
- return undef unless keys %$resources;
- return _convert($resources, $resource1_spec);
- }
-
- my $resource_downgrade_spec = {
- license => sub { return ref $_[0] ? $_[0]->[0] : $_[0] },
- homepage => \&_url_or_drop,
- bugtracker => sub { return $_[0]->{web} },
- repository => sub { return $_[0]->{url} || $_[0]->{web} },
- ':custom' => \&_ucfirst_custom,
- };
-
- sub _downgrade_resources {
- my (undef, undef, $meta, $version) = @_;
- return undef unless exists $meta->{resources};
- return _convert($meta->{resources}, $resource_downgrade_spec);
- }
-
- sub _release_status {
- my ($element, undef, $meta) = @_;
- return $element if $element && $element =~ m{\A(?:stable|testing|unstable)\z};
- return _release_status_from_version(undef, undef, $meta);
- }
-
- sub _release_status_from_version {
- my (undef, undef, $meta) = @_;
- my $version = $meta->{version} || '';
- return ( $version =~ /_/ ) ? 'testing' : 'stable';
- }
-
- my $provides_spec = {
- file => \&_keep,
- version => \&_clean_version,
- };
-
- my $provides_spec_2 = {
- file => \&_keep,
- version => \&_clean_version,
- ':custom' => \&_prefix_custom,
- };
-
- sub _provides {
- my ($element, $key, $meta, $to_version) = @_;
- return unless defined $element && ref $element eq 'HASH';
- my $spec = $to_version == 2 ? $provides_spec_2 : $provides_spec;
- my $new_data = {};
- for my $k ( keys %$element ) {
- $new_data->{$k} = _convert($element->{$k}, $spec, $to_version);
- }
- return $new_data;
- }
-
- sub _convert {
- my ($data, $spec, $to_version) = @_;
-
- my $new_data = {};
- for my $key ( keys %$spec ) {
- next if $key eq ':custom' || $key eq ':drop';
- next unless my $fcn = $spec->{$key};
- die "spec for '$key' is not a coderef"
- unless ref $fcn && ref $fcn eq 'CODE';
- my $new_value = $fcn->($data->{$key}, $key, $data, $to_version);
- $new_data->{$key} = $new_value if defined $new_value;
- }
-
- my $drop_list = $spec->{':drop'};
- my $customizer = $spec->{':custom'} || \&_keep;
-
- for my $key ( keys %$data ) {
- next if $drop_list && grep { $key eq $_ } @$drop_list;
- next if exists $spec->{$key}; # we handled it
- $new_data->{ $customizer->($key) } = $data->{$key};
- }
-
- return $new_data;
- }
-
- #--------------------------------------------------------------------------#
- # define converters for each conversion
- #--------------------------------------------------------------------------#
-
- # each converts from prior version
- # special ":custom" field is used for keys not recognized in spec
- my %up_convert = (
- '2-from-1.4' => {
- # PRIOR MANDATORY
- 'abstract' => \&_keep_or_unknown,
- 'author' => \&_author_list,
- 'generated_by' => \&_generated_by,
- 'license' => \&_license_2,
- 'meta-spec' => \&_change_meta_spec,
- 'name' => \&_keep,
- 'version' => \&_keep,
- # CHANGED TO MANDATORY
- 'dynamic_config' => \&_keep_or_one,
- # ADDED MANDATORY
- 'release_status' => \&_release_status_from_version,
- # PRIOR OPTIONAL
- 'keywords' => \&_keep,
- 'no_index' => \&_no_index_directory,
- 'optional_features' => \&_upgrade_optional_features,
- 'provides' => \&_provides,
- 'resources' => \&_upgrade_resources_2,
- # ADDED OPTIONAL
- 'description' => \&_keep,
- 'prereqs' => \&_prereqs_from_1,
-
- # drop these deprecated fields, but only after we convert
- ':drop' => [ qw(
- build_requires
- configure_requires
- conflicts
- distribution_type
- license_url
- private
- recommends
- requires
- ) ],
-
- # other random keys need x_ prefixing
- ':custom' => \&_prefix_custom,
- },
- '1.4-from-1.3' => {
- # PRIOR MANDATORY
- 'abstract' => \&_keep_or_unknown,
- 'author' => \&_author_list,
- 'generated_by' => \&_generated_by,
- 'license' => \&_license_1,
- 'meta-spec' => \&_change_meta_spec,
- 'name' => \&_keep,
- 'version' => \&_keep,
- # PRIOR OPTIONAL
- 'build_requires' => \&_version_map,
- 'conflicts' => \&_version_map,
- 'distribution_type' => \&_keep,
- 'dynamic_config' => \&_keep_or_one,
- 'keywords' => \&_keep,
- 'no_index' => \&_no_index_directory,
- 'optional_features' => \&_optional_features_1_4,
- 'provides' => \&_provides,
- 'recommends' => \&_version_map,
- 'requires' => \&_version_map,
- 'resources' => \&_resources_1_4,
- # ADDED OPTIONAL
- 'configure_requires' => \&_keep,
-
- # drop these deprecated fields, but only after we convert
- ':drop' => [ qw(
- license_url
- private
- )],
-
- # other random keys are OK if already valid
- ':custom' => \&_keep
- },
- '1.3-from-1.2' => {
- # PRIOR MANDATORY
- 'abstract' => \&_keep_or_unknown,
- 'author' => \&_author_list,
- 'generated_by' => \&_generated_by,
- 'license' => \&_license_1,
- 'meta-spec' => \&_change_meta_spec,
- 'name' => \&_keep,
- 'version' => \&_keep,
- # PRIOR OPTIONAL
- 'build_requires' => \&_version_map,
- 'conflicts' => \&_version_map,
- 'distribution_type' => \&_keep,
- 'dynamic_config' => \&_keep_or_one,
- 'keywords' => \&_keep,
- 'no_index' => \&_no_index_directory,
- 'optional_features' => \&_optional_features_as_map,
- 'provides' => \&_provides,
- 'recommends' => \&_version_map,
- 'requires' => \&_version_map,
- 'resources' => \&_resources_1_3,
-
- # drop these deprecated fields, but only after we convert
- ':drop' => [ qw(
- license_url
- private
- )],
-
- # other random keys are OK if already valid
- ':custom' => \&_keep
- },
- '1.2-from-1.1' => {
- # PRIOR MANDATORY
- 'version' => \&_keep,
- # CHANGED TO MANDATORY
- 'license' => \&_license_1,
- 'name' => \&_keep,
- 'generated_by' => \&_generated_by,
- # ADDED MANDATORY
- 'abstract' => \&_keep_or_unknown,
- 'author' => \&_author_list,
- 'meta-spec' => \&_change_meta_spec,
- # PRIOR OPTIONAL
- 'build_requires' => \&_version_map,
- 'conflicts' => \&_version_map,
- 'distribution_type' => \&_keep,
- 'dynamic_config' => \&_keep_or_one,
- 'recommends' => \&_version_map,
- 'requires' => \&_version_map,
- # ADDED OPTIONAL
- 'keywords' => \&_keep,
- 'no_index' => \&_no_index_1_2,
- 'optional_features' => \&_optional_features_as_map,
- 'provides' => \&_provides,
- 'resources' => \&_resources_1_2,
-
- # drop these deprecated fields, but only after we convert
- ':drop' => [ qw(
- license_url
- private
- )],
-
- # other random keys are OK if already valid
- ':custom' => \&_keep
- },
- '1.1-from-1.0' => {
- # CHANGED TO MANDATORY
- 'version' => \&_keep,
- # IMPLIED MANDATORY
- 'name' => \&_keep,
- # PRIOR OPTIONAL
- 'build_requires' => \&_version_map,
- 'conflicts' => \&_version_map,
- 'distribution_type' => \&_keep,
- 'dynamic_config' => \&_keep_or_one,
- 'generated_by' => \&_generated_by,
- 'license' => \&_license_1,
- 'recommends' => \&_version_map,
- 'requires' => \&_version_map,
- # ADDED OPTIONAL
- 'license_url' => \&_url_or_drop,
- 'private' => \&_keep,
-
- # other random keys are OK if already valid
- ':custom' => \&_keep
- },
- );
-
- my %down_convert = (
- '1.4-from-2' => {
- # MANDATORY
- 'abstract' => \&_keep_or_unknown,
- 'author' => \&_author_list,
- 'generated_by' => \&_generated_by,
- 'license' => \&_downgrade_license,
- 'meta-spec' => \&_change_meta_spec,
- 'name' => \&_keep,
- 'version' => \&_keep,
- # OPTIONAL
- 'build_requires' => \&_get_build_requires,
- 'configure_requires' => \&_get_configure_requires,
- 'conflicts' => \&_get_conflicts,
- 'distribution_type' => \&_keep,
- 'dynamic_config' => \&_keep_or_one,
- 'keywords' => \&_keep,
- 'no_index' => \&_no_index_directory,
- 'optional_features' => \&_downgrade_optional_features,
- 'provides' => \&_provides,
- 'recommends' => \&_get_recommends,
- 'requires' => \&_get_requires,
- 'resources' => \&_downgrade_resources,
-
- # drop these unsupported fields (after conversion)
- ':drop' => [ qw(
- description
- prereqs
- release_status
- )],
-
- # custom keys will be left unchanged
- ':custom' => \&_keep
- },
- '1.3-from-1.4' => {
- # MANDATORY
- 'abstract' => \&_keep_or_unknown,
- 'author' => \&_author_list,
- 'generated_by' => \&_generated_by,
- 'license' => \&_license_1,
- 'meta-spec' => \&_change_meta_spec,
- 'name' => \&_keep,
- 'version' => \&_keep,
- # OPTIONAL
- 'build_requires' => \&_version_map,
- 'conflicts' => \&_version_map,
- 'distribution_type' => \&_keep,
- 'dynamic_config' => \&_keep_or_one,
- 'keywords' => \&_keep,
- 'no_index' => \&_no_index_directory,
- 'optional_features' => \&_optional_features_as_map,
- 'provides' => \&_provides,
- 'recommends' => \&_version_map,
- 'requires' => \&_version_map,
- 'resources' => \&_resources_1_3,
-
- # drop these unsupported fields, but only after we convert
- ':drop' => [ qw(
- configure_requires
- )],
-
- # other random keys are OK if already valid
- ':custom' => \&_keep,
- },
- '1.2-from-1.3' => {
- # MANDATORY
- 'abstract' => \&_keep_or_unknown,
- 'author' => \&_author_list,
- 'generated_by' => \&_generated_by,
- 'license' => \&_license_1,
- 'meta-spec' => \&_change_meta_spec,
- 'name' => \&_keep,
- 'version' => \&_keep,
- # OPTIONAL
- 'build_requires' => \&_version_map,
- 'conflicts' => \&_version_map,
- 'distribution_type' => \&_keep,
- 'dynamic_config' => \&_keep_or_one,
- 'keywords' => \&_keep,
- 'no_index' => \&_no_index_1_2,
- 'optional_features' => \&_optional_features_as_map,
- 'provides' => \&_provides,
- 'recommends' => \&_version_map,
- 'requires' => \&_version_map,
- 'resources' => \&_resources_1_3,
-
- # other random keys are OK if already valid
- ':custom' => \&_keep,
- },
- '1.1-from-1.2' => {
- # MANDATORY
- 'version' => \&_keep,
- # IMPLIED MANDATORY
- 'name' => \&_keep,
- 'meta-spec' => \&_change_meta_spec,
- # OPTIONAL
- 'build_requires' => \&_version_map,
- 'conflicts' => \&_version_map,
- 'distribution_type' => \&_keep,
- 'dynamic_config' => \&_keep_or_one,
- 'generated_by' => \&_generated_by,
- 'license' => \&_license_1,
- 'private' => \&_keep,
- 'recommends' => \&_version_map,
- 'requires' => \&_version_map,
-
- # drop unsupported fields
- ':drop' => [ qw(
- abstract
- author
- provides
- no_index
- keywords
- resources
- )],
-
- # other random keys are OK if already valid
- ':custom' => \&_keep,
- },
- '1.0-from-1.1' => {
- # IMPLIED MANDATORY
- 'name' => \&_keep,
- 'meta-spec' => \&_change_meta_spec,
- 'version' => \&_keep,
- # PRIOR OPTIONAL
- 'build_requires' => \&_version_map,
- 'conflicts' => \&_version_map,
- 'distribution_type' => \&_keep,
- 'dynamic_config' => \&_keep_or_one,
- 'generated_by' => \&_generated_by,
- 'license' => \&_license_1,
- 'recommends' => \&_version_map,
- 'requires' => \&_version_map,
-
- # other random keys are OK if already valid
- ':custom' => \&_keep,
- },
- );
-
- my %cleanup = (
- '2' => {
- # PRIOR MANDATORY
- 'abstract' => \&_keep_or_unknown,
- 'author' => \&_author_list,
- 'generated_by' => \&_generated_by,
- 'license' => \&_license_2,
- 'meta-spec' => \&_change_meta_spec,
- 'name' => \&_keep,
- 'version' => \&_keep,
- # CHANGED TO MANDATORY
- 'dynamic_config' => \&_keep_or_one,
- # ADDED MANDATORY
- 'release_status' => \&_release_status,
- # PRIOR OPTIONAL
- 'keywords' => \&_keep,
- 'no_index' => \&_no_index_directory,
- 'optional_features' => \&_cleanup_optional_features_2,
- 'provides' => \&_provides,
- 'resources' => \&_cleanup_resources_2,
- # ADDED OPTIONAL
- 'description' => \&_keep,
- 'prereqs' => \&_cleanup_prereqs,
-
- # drop these deprecated fields, but only after we convert
- ':drop' => [ qw(
- build_requires
- configure_requires
- conflicts
- distribution_type
- license_url
- private
- recommends
- requires
- ) ],
-
- # other random keys need x_ prefixing
- ':custom' => \&_prefix_custom,
- },
- '1.4' => {
- # PRIOR MANDATORY
- 'abstract' => \&_keep_or_unknown,
- 'author' => \&_author_list,
- 'generated_by' => \&_generated_by,
- 'license' => \&_license_1,
- 'meta-spec' => \&_change_meta_spec,
- 'name' => \&_keep,
- 'version' => \&_keep,
- # PRIOR OPTIONAL
- 'build_requires' => \&_version_map,
- 'conflicts' => \&_version_map,
- 'distribution_type' => \&_keep,
- 'dynamic_config' => \&_keep_or_one,
- 'keywords' => \&_keep,
- 'no_index' => \&_no_index_directory,
- 'optional_features' => \&_optional_features_1_4,
- 'provides' => \&_provides,
- 'recommends' => \&_version_map,
- 'requires' => \&_version_map,
- 'resources' => \&_resources_1_4,
- # ADDED OPTIONAL
- 'configure_requires' => \&_keep,
-
- # other random keys are OK if already valid
- ':custom' => \&_keep
- },
- '1.3' => {
- # PRIOR MANDATORY
- 'abstract' => \&_keep_or_unknown,
- 'author' => \&_author_list,
- 'generated_by' => \&_generated_by,
- 'license' => \&_license_1,
- 'meta-spec' => \&_change_meta_spec,
- 'name' => \&_keep,
- 'version' => \&_keep,
- # PRIOR OPTIONAL
- 'build_requires' => \&_version_map,
- 'conflicts' => \&_version_map,
- 'distribution_type' => \&_keep,
- 'dynamic_config' => \&_keep_or_one,
- 'keywords' => \&_keep,
- 'no_index' => \&_no_index_directory,
- 'optional_features' => \&_optional_features_as_map,
- 'provides' => \&_provides,
- 'recommends' => \&_version_map,
- 'requires' => \&_version_map,
- 'resources' => \&_resources_1_3,
-
- # other random keys are OK if already valid
- ':custom' => \&_keep
- },
- '1.2' => {
- # PRIOR MANDATORY
- 'version' => \&_keep,
- # CHANGED TO MANDATORY
- 'license' => \&_license_1,
- 'name' => \&_keep,
- 'generated_by' => \&_generated_by,
- # ADDED MANDATORY
- 'abstract' => \&_keep_or_unknown,
- 'author' => \&_author_list,
- 'meta-spec' => \&_change_meta_spec,
- # PRIOR OPTIONAL
- 'build_requires' => \&_version_map,
- 'conflicts' => \&_version_map,
- 'distribution_type' => \&_keep,
- 'dynamic_config' => \&_keep_or_one,
- 'recommends' => \&_version_map,
- 'requires' => \&_version_map,
- # ADDED OPTIONAL
- 'keywords' => \&_keep,
- 'no_index' => \&_no_index_1_2,
- 'optional_features' => \&_optional_features_as_map,
- 'provides' => \&_provides,
- 'resources' => \&_resources_1_2,
-
- # other random keys are OK if already valid
- ':custom' => \&_keep
- },
- '1.1' => {
- # CHANGED TO MANDATORY
- 'version' => \&_keep,
- # IMPLIED MANDATORY
- 'name' => \&_keep,
- 'meta-spec' => \&_change_meta_spec,
- # PRIOR OPTIONAL
- 'build_requires' => \&_version_map,
- 'conflicts' => \&_version_map,
- 'distribution_type' => \&_keep,
- 'dynamic_config' => \&_keep_or_one,
- 'generated_by' => \&_generated_by,
- 'license' => \&_license_1,
- 'recommends' => \&_version_map,
- 'requires' => \&_version_map,
- # ADDED OPTIONAL
- 'license_url' => \&_url_or_drop,
- 'private' => \&_keep,
-
- # other random keys are OK if already valid
- ':custom' => \&_keep
- },
- '1.0' => {
- # IMPLIED MANDATORY
- 'name' => \&_keep,
- 'meta-spec' => \&_change_meta_spec,
- 'version' => \&_keep,
- # IMPLIED OPTIONAL
- 'build_requires' => \&_version_map,
- 'conflicts' => \&_version_map,
- 'distribution_type' => \&_keep,
- 'dynamic_config' => \&_keep_or_one,
- 'generated_by' => \&_generated_by,
- 'license' => \&_license_1,
- 'recommends' => \&_version_map,
- 'requires' => \&_version_map,
-
- # other random keys are OK if already valid
- ':custom' => \&_keep,
- },
- );
-
- #--------------------------------------------------------------------------#
- # Code
- #--------------------------------------------------------------------------#
-
-
- sub new {
- my ($class,$data) = @_;
-
- # create an attributes hash
- my $self = {
- 'data' => $data,
- 'spec' => $data->{'meta-spec'}{'version'} || "1.0",
- };
-
- # create the object
- return bless $self, $class;
- }
-
-
- sub convert {
- my ($self, %args) = @_;
- my $args = { %args };
-
- my $new_version = $args->{version} || $HIGHEST;
-
- my ($old_version) = $self->{spec};
- my $converted = _dclone($self->{data});
-
- if ( $old_version == $new_version ) {
- $converted = _convert( $converted, $cleanup{$old_version}, $old_version );
- my $cmv = CPAN::Meta::Validator->new( $converted );
- unless ( $cmv->is_valid ) {
- my $errs = join("\n", $cmv->errors);
- die "Failed to clean-up $old_version metadata. Errors:\n$errs\n";
- }
- return $converted;
- }
- elsif ( $old_version > $new_version ) {
- my @vers = sort { $b <=> $a } keys %known_specs;
- for my $i ( 0 .. $#vers-1 ) {
- next if $vers[$i] > $old_version;
- last if $vers[$i+1] < $new_version;
- my $spec_string = "$vers[$i+1]-from-$vers[$i]";
- $converted = _convert( $converted, $down_convert{$spec_string}, $vers[$i+1] );
- my $cmv = CPAN::Meta::Validator->new( $converted );
- unless ( $cmv->is_valid ) {
- my $errs = join("\n", $cmv->errors);
- die "Failed to downconvert metadata to $vers[$i+1]. Errors:\n$errs\n";
- }
- }
- return $converted;
- }
- else {
- my @vers = sort { $a <=> $b } keys %known_specs;
- for my $i ( 0 .. $#vers-1 ) {
- next if $vers[$i] < $old_version;
- last if $vers[$i+1] > $new_version;
- my $spec_string = "$vers[$i+1]-from-$vers[$i]";
- $converted = _convert( $converted, $up_convert{$spec_string}, $vers[$i+1] );
- my $cmv = CPAN::Meta::Validator->new( $converted );
- unless ( $cmv->is_valid ) {
- my $errs = join("\n", $cmv->errors);
- die "Failed to upconvert metadata to $vers[$i+1]. Errors:\n$errs\n";
- }
- }
- return $converted;
- }
- }
-
- 1;
-
-
-
-
- __END__
-
-
+ /x_/ix;return$key}sub _ucfirst_custom {my$key=shift;$key=ucfirst$key unless$key =~ /[A-Z]/;return$key}sub _no_prefix_ucfirst_custom {my$key=shift;$key =~ s/^x_//;return _ucfirst_custom($key)}sub _change_meta_spec {my ($element,undef,undef,$version)=@_;$element->{version}=$version;$element->{url}=$known_specs{$version};return$element}my@valid_licenses_1=('perl','gpl','apache','artistic','artistic_2','lgpl','bsd','gpl','mit','mozilla','open_source','unrestricted','restrictive','unknown',);my%license_map_1=((map {$_=>$_}@valid_licenses_1),artistic2=>'artistic_2',);sub _license_1 {my ($element)=@_;return 'unknown' unless defined$element;if ($license_map_1{lc$element}){return$license_map_1{lc$element}}return 'unknown'}my@valid_licenses_2=qw(agpl_3 apache_1_1 apache_2_0 artistic_1 artistic_2 bsd freebsd gfdl_1_2 gfdl_1_3 gpl_1 gpl_2 gpl_3 lgpl_2_1 lgpl_3_0 mit mozilla_1_0 mozilla_1_1 openssl perl_5 qpl_1_0 ssleay sun zlib open_source restricted unrestricted unknown);my%license_map_2=((map {$_=>$_}@valid_licenses_2),apache=>'apache_2_0',artistic=>'artistic_1',artistic2=>'artistic_2',gpl=>'open_source',lgpl=>'open_source',mozilla=>'open_source',perl=>'perl_5',restrictive=>'restricted',);sub _license_2 {my ($element)=@_;return ['unknown' ]unless defined$element;$element=[$element ]unless ref$element eq 'ARRAY';my@new_list;for my$lic (@$element){next unless defined$lic;if (my$new=$license_map_2{lc$lic}){push@new_list,$new}}return@new_list ? \@new_list : ['unknown' ]}my%license_downgrade_map=qw(agpl_3 open_source apache_1_1 apache apache_2_0 apache artistic_1 artistic artistic_2 artistic_2 bsd bsd freebsd open_source gfdl_1_2 open_source gfdl_1_3 open_source gpl_1 gpl gpl_2 gpl gpl_3 gpl lgpl_2_1 lgpl lgpl_3_0 lgpl mit mit mozilla_1_0 mozilla mozilla_1_1 mozilla openssl open_source perl_5 perl qpl_1_0 open_source ssleay open_source sun open_source zlib open_source open_source open_source restricted restrictive unrestricted unrestricted unknown unknown);sub _downgrade_license {my ($element)=@_;if (!defined$element){return "unknown"}elsif(ref$element eq 'ARRAY'){if (@$element==1){return$license_downgrade_map{$element->[0]}|| "unknown"}}elsif (!ref$element){return$license_downgrade_map{$element}|| "unknown"}return "unknown"}my$no_index_spec_1_2={'file'=>\&_listify,'dir'=>\&_listify,'package'=>\&_listify,'namespace'=>\&_listify,};my$no_index_spec_1_3={'file'=>\&_listify,'directory'=>\&_listify,'package'=>\&_listify,'namespace'=>\&_listify,};my$no_index_spec_2={'file'=>\&_listify,'directory'=>\&_listify,'package'=>\&_listify,'namespace'=>\&_listify,':custom'=>\&_prefix_custom,};sub _no_index_1_2 {my (undef,undef,$meta)=@_;my$no_index=$meta->{no_index}|| $meta->{private};return unless$no_index;if (!ref$no_index){my$item=$no_index;$no_index={dir=>[$item ],file=>[$item ]}}elsif (ref$no_index eq 'ARRAY'){my$list=$no_index;$no_index={dir=>[@$list ],file=>[@$list ]}}if (exists$no_index->{files}){$no_index->{file}=delete$no_index->{file}}if (exists$no_index->{modules}){$no_index->{module}=delete$no_index->{module}}return _convert($no_index,$no_index_spec_1_2)}sub _no_index_directory {my ($element,$key,$meta,$version)=@_;return unless$element;if (!ref$element){my$item=$element;$element={directory=>[$item ],file=>[$item ]}}elsif (ref$element eq 'ARRAY'){my$list=$element;$element={directory=>[@$list ],file=>[@$list ]}}if (exists$element->{dir}){$element->{directory}=delete$element->{dir}}if (exists$element->{files}){$element->{file}=delete$element->{file}}if (exists$element->{modules}){$element->{module}=delete$element->{module}}my$spec=$version==2 ? $no_index_spec_2 : $no_index_spec_1_3;return _convert($element,$spec)}sub _is_module_name {my$mod=shift;return unless defined$mod && length$mod;return$mod =~ m{^[A-Za-z][A-Za-z0-9_]*(?:::[A-Za-z0-9_]+)*$}}sub _clean_version {my ($element)=@_;return 0 if!defined$element;$element =~ s{^\s*}{};$element =~ s{\s*$}{};$element =~ s{^\.}{0.};return 0 if!length$element;return 0 if ($element eq 'undef' || $element eq '<undef>');my$v=eval {version->new($element)};if (defined$v){return$v->is_qv ? $v->normal : $element}else {return 0}}sub _bad_version_hook {my ($v)=@_;$v =~ s{[a-z]+$}{};my$vobj=eval {version->parse($v)};return defined($vobj)? $vobj : version->parse(0)}sub _version_map {my ($element)=@_;return unless defined$element;if (ref$element eq 'HASH'){my$new_map=CPAN::Meta::Requirements->new({bad_version_hook=>sub {version->new(0)}});while (my ($k,$v)=each %$element){next unless _is_module_name($k);if (!defined($v)||!length($v)|| $v eq 'undef' || $v eq '<undef>'){$v=0}if (_is_module_name($v)&&!version::is_lax($v)){$new_map->add_minimum($k=>0);$new_map->add_minimum($v=>0)}$new_map->add_string_requirement($k=>$v)}return$new_map->as_string_hash}elsif (ref$element eq 'ARRAY'){my$hashref={map {$_=>0}@$element };return _version_map($hashref)}elsif (ref$element eq '' && length$element){return {$element=>0 }}return}sub _prereqs_from_1 {my (undef,undef,$meta)=@_;my$prereqs={};for my$phase (qw/build configure/){my$key="${phase}_requires";$prereqs->{$phase}{requires}=_version_map($meta->{$key})if$meta->{$key}}for my$rel (qw/requires recommends conflicts/){$prereqs->{runtime}{$rel}=_version_map($meta->{$rel})if$meta->{$rel}}return$prereqs}my$prereqs_spec={configure=>\&_prereqs_rel,build=>\&_prereqs_rel,test=>\&_prereqs_rel,runtime=>\&_prereqs_rel,develop=>\&_prereqs_rel,':custom'=>\&_prefix_custom,};my$relation_spec={requires=>\&_version_map,recommends=>\&_version_map,suggests=>\&_version_map,conflicts=>\&_version_map,':custom'=>\&_prefix_custom,};sub _cleanup_prereqs {my ($prereqs,$key,$meta,$to_version)=@_;return unless$prereqs && ref$prereqs eq 'HASH';return _convert($prereqs,$prereqs_spec,$to_version)}sub _prereqs_rel {my ($relation,$key,$meta,$to_version)=@_;return unless$relation && ref$relation eq 'HASH';return _convert($relation,$relation_spec,$to_version)}BEGIN {my@old_prereqs=qw(requires configure_requires recommends conflicts);for (@old_prereqs){my$sub="_get_$_";my ($phase,$type)=split qr/_/,$_;if (!defined$type){$type=$phase;$phase='runtime'}no strict 'refs';*{$sub}=sub {_extract_prereqs($_[2]->{prereqs},$phase,$type)}}}sub _get_build_requires {my ($data,$key,$meta)=@_;my$test_h=_extract_prereqs($_[2]->{prereqs},qw(test requires))|| {};my$build_h=_extract_prereqs($_[2]->{prereqs},qw(build requires))|| {};my$test_req=CPAN::Meta::Requirements->from_string_hash($test_h);my$build_req=CPAN::Meta::Requirements->from_string_hash($build_h);$test_req->add_requirements($build_req)->as_string_hash}sub _extract_prereqs {my ($prereqs,$phase,$type)=@_;return unless ref$prereqs eq 'HASH';return scalar _version_map($prereqs->{$phase}{$type})}sub _downgrade_optional_features {my (undef,undef,$meta)=@_;return unless exists$meta->{optional_features};my$origin=$meta->{optional_features};my$features={};for my$name (keys %$origin){$features->{$name}={description=>$origin->{$name}{description},requires=>_extract_prereqs($origin->{$name}{prereqs},'runtime','requires'),configure_requires=>_extract_prereqs($origin->{$name}{prereqs},'runtime','configure_requires'),build_requires=>_extract_prereqs($origin->{$name}{prereqs},'runtime','build_requires'),recommends=>_extract_prereqs($origin->{$name}{prereqs},'runtime','recommends'),conflicts=>_extract_prereqs($origin->{$name}{prereqs},'runtime','conflicts'),};for my$k (keys %{$features->{$name}}){delete$features->{$name}{$k}unless defined$features->{$name}{$k}}}return$features}sub _upgrade_optional_features {my (undef,undef,$meta)=@_;return unless exists$meta->{optional_features};my$origin=$meta->{optional_features};my$features={};for my$name (keys %$origin){$features->{$name}={description=>$origin->{$name}{description},prereqs=>_prereqs_from_1(undef,undef,$origin->{$name}),};delete$features->{$name}{prereqs}{configure}}return$features}my$optional_features_2_spec={description=>\&_keep,prereqs=>\&_cleanup_prereqs,':custom'=>\&_prefix_custom,};sub _feature_2 {my ($element,$key,$meta,$to_version)=@_;return unless$element && ref$element eq 'HASH';_convert($element,$optional_features_2_spec,$to_version)}sub _cleanup_optional_features_2 {my ($element,$key,$meta,$to_version)=@_;return unless$element && ref$element eq 'HASH';my$new_data={};for my$k (keys %$element){$new_data->{$k}=_feature_2($element->{$k},$k,$meta,$to_version)}return unless keys %$new_data;return$new_data}sub _optional_features_1_4 {my ($element)=@_;return unless$element;$element=_optional_features_as_map($element);for my$name (keys %$element){for my$drop (qw/requires_packages requires_os excluded_os/){delete$element->{$name}{$drop}}}return$element}sub _optional_features_as_map {my ($element)=@_;return unless$element;if (ref$element eq 'ARRAY'){my%map;for my$feature (@$element){my (@parts)=%$feature;$map{$parts[0]}=$parts[1]}$element=\%map}return$element}sub _is_urlish {defined $_[0]&& $_[0]=~ m{\A[-+.a-z0-9]+:.+}i}sub _url_or_drop {my ($element)=@_;return$element if _is_urlish($element);return}sub _url_list {my ($element)=@_;return unless$element;$element=_listify($element);$element=[grep {_is_urlish($_)}@$element ];return unless @$element;return$element}sub _author_list {my ($element)=@_;return ['unknown' ]unless$element;$element=_listify($element);$element=[map {defined $_ && length $_ ? $_ : 'unknown'}@$element ];return ['unknown' ]unless @$element;return$element}my$resource2_upgrade={license=>sub {return _is_urlish($_[0])? _listify($_[0]): undef},homepage=>\&_url_or_drop,bugtracker=>sub {my ($item)=@_;return unless$item;if ($item =~ m{^mailto:(.*)$}){return {mailto=>$1 }}elsif(_is_urlish($item)){return {web=>$item }}else {return}},repository=>sub {return _is_urlish($_[0])? {url=>$_[0]}: undef},':custom'=>\&_prefix_custom,};sub _upgrade_resources_2 {my (undef,undef,$meta,$version)=@_;return unless exists$meta->{resources};return _convert($meta->{resources},$resource2_upgrade)}my$bugtracker2_spec={web=>\&_url_or_drop,mailto=>\&_keep,':custom'=>\&_prefix_custom,};sub _repo_type {my ($element,$key,$meta,$to_version)=@_;return$element if defined$element;return unless exists$meta->{url};my$repo_url=$meta->{url};for my$type (qw/git svn/){return$type if$repo_url =~ m{\A$type}}return}my$repository2_spec={web=>\&_url_or_drop,url=>\&_url_or_drop,type=>\&_repo_type,':custom'=>\&_prefix_custom,};my$resources2_cleanup={license=>\&_url_list,homepage=>\&_url_or_drop,bugtracker=>sub {ref $_[0]? _convert($_[0],$bugtracker2_spec): undef},repository=>sub {my$data=shift;ref$data ? _convert($data,$repository2_spec): undef},':custom'=>\&_prefix_custom,};sub _cleanup_resources_2 {my ($resources,$key,$meta,$to_version)=@_;return unless$resources && ref$resources eq 'HASH';return _convert($resources,$resources2_cleanup,$to_version)}my$resource1_spec={license=>\&_url_or_drop,homepage=>\&_url_or_drop,bugtracker=>\&_url_or_drop,repository=>\&_url_or_drop,':custom'=>\&_keep,};sub _resources_1_3 {my (undef,undef,$meta,$version)=@_;return unless exists$meta->{resources};return _convert($meta->{resources},$resource1_spec)}*_resources_1_4=*_resources_1_3;sub _resources_1_2 {my (undef,undef,$meta)=@_;my$resources=$meta->{resources}|| {};if ($meta->{license_url}&&!$resources->{license}){$resources->{license}=$meta->license_url if _is_urlish($meta->{license_url})}return unless keys %$resources;return _convert($resources,$resource1_spec)}my$resource_downgrade_spec={license=>sub {return ref $_[0]? $_[0]->[0]: $_[0]},homepage=>\&_url_or_drop,bugtracker=>sub {return $_[0]->{web}},repository=>sub {return $_[0]->{url}|| $_[0]->{web}},':custom'=>\&_no_prefix_ucfirst_custom,};sub _downgrade_resources {my (undef,undef,$meta,$version)=@_;return unless exists$meta->{resources};return _convert($meta->{resources},$resource_downgrade_spec)}sub _release_status {my ($element,undef,$meta)=@_;return$element if$element && $element =~ m{\A(?:stable|testing|unstable)\z};return _release_status_from_version(undef,undef,$meta)}sub _release_status_from_version {my (undef,undef,$meta)=@_;my$version=$meta->{version}|| '';return ($version =~ /_/)? 'testing' : 'stable'}my$provides_spec={file=>\&_keep,version=>\&_keep,};my$provides_spec_2={file=>\&_keep,version=>\&_keep,':custom'=>\&_prefix_custom,};sub _provides {my ($element,$key,$meta,$to_version)=@_;return unless defined$element && ref$element eq 'HASH';my$spec=$to_version==2 ? $provides_spec_2 : $provides_spec;my$new_data={};for my$k (keys %$element){$new_data->{$k}=_convert($element->{$k},$spec,$to_version);$new_data->{$k}{version}=_clean_version($element->{$k}{version})if exists$element->{$k}{version}}return$new_data}sub _convert {my ($data,$spec,$to_version)=@_;my$new_data={};for my$key (keys %$spec){next if$key eq ':custom' || $key eq ':drop';next unless my$fcn=$spec->{$key};die "spec for '$key' is not a coderef" unless ref$fcn && ref$fcn eq 'CODE';my$new_value=$fcn->($data->{$key},$key,$data,$to_version);$new_data->{$key}=$new_value if defined$new_value}my$drop_list=$spec->{':drop'};my$customizer=$spec->{':custom'}|| \&_keep;for my$key (keys %$data){next if$drop_list && grep {$key eq $_}@$drop_list;next if exists$spec->{$key};$new_data->{$customizer->($key)}=$data->{$key}}return$new_data}my%up_convert=('2-from-1.4'=>{'abstract'=>\&_keep_or_unknown,'author'=>\&_author_list,'generated_by'=>\&_generated_by,'license'=>\&_license_2,'meta-spec'=>\&_change_meta_spec,'name'=>\&_keep,'version'=>\&_keep,'dynamic_config'=>\&_keep_or_one,'release_status'=>\&_release_status_from_version,'keywords'=>\&_keep,'no_index'=>\&_no_index_directory,'optional_features'=>\&_upgrade_optional_features,'provides'=>\&_provides,'resources'=>\&_upgrade_resources_2,'description'=>\&_keep,'prereqs'=>\&_prereqs_from_1,':drop'=>[qw(build_requires configure_requires conflicts distribution_type license_url private recommends requires) ],':custom'=>\&_prefix_custom,},'1.4-from-1.3'=>{'abstract'=>\&_keep_or_unknown,'author'=>\&_author_list,'generated_by'=>\&_generated_by,'license'=>\&_license_1,'meta-spec'=>\&_change_meta_spec,'name'=>\&_keep,'version'=>\&_keep,'build_requires'=>\&_version_map,'conflicts'=>\&_version_map,'distribution_type'=>\&_keep,'dynamic_config'=>\&_keep_or_one,'keywords'=>\&_keep,'no_index'=>\&_no_index_directory,'optional_features'=>\&_optional_features_1_4,'provides'=>\&_provides,'recommends'=>\&_version_map,'requires'=>\&_version_map,'resources'=>\&_resources_1_4,'configure_requires'=>\&_keep,':drop'=>[qw(license_url private)],':custom'=>\&_keep },'1.3-from-1.2'=>{'abstract'=>\&_keep_or_unknown,'author'=>\&_author_list,'generated_by'=>\&_generated_by,'license'=>\&_license_1,'meta-spec'=>\&_change_meta_spec,'name'=>\&_keep,'version'=>\&_keep,'build_requires'=>\&_version_map,'conflicts'=>\&_version_map,'distribution_type'=>\&_keep,'dynamic_config'=>\&_keep_or_one,'keywords'=>\&_keep,'no_index'=>\&_no_index_directory,'optional_features'=>\&_optional_features_as_map,'provides'=>\&_provides,'recommends'=>\&_version_map,'requires'=>\&_version_map,'resources'=>\&_resources_1_3,':drop'=>[qw(license_url private)],':custom'=>\&_keep },'1.2-from-1.1'=>{'version'=>\&_keep,'license'=>\&_license_1,'name'=>\&_keep,'generated_by'=>\&_generated_by,'abstract'=>\&_keep_or_unknown,'author'=>\&_author_list,'meta-spec'=>\&_change_meta_spec,'build_requires'=>\&_version_map,'conflicts'=>\&_version_map,'distribution_type'=>\&_keep,'dynamic_config'=>\&_keep_or_one,'recommends'=>\&_version_map,'requires'=>\&_version_map,'keywords'=>\&_keep,'no_index'=>\&_no_index_1_2,'optional_features'=>\&_optional_features_as_map,'provides'=>\&_provides,'resources'=>\&_resources_1_2,':drop'=>[qw(license_url private)],':custom'=>\&_keep },'1.1-from-1.0'=>{'version'=>\&_keep,'name'=>\&_keep,'build_requires'=>\&_version_map,'conflicts'=>\&_version_map,'distribution_type'=>\&_keep,'dynamic_config'=>\&_keep_or_one,'generated_by'=>\&_generated_by,'license'=>\&_license_1,'recommends'=>\&_version_map,'requires'=>\&_version_map,'license_url'=>\&_url_or_drop,'private'=>\&_keep,':custom'=>\&_keep },);my%down_convert=('1.4-from-2'=>{'abstract'=>\&_keep_or_unknown,'author'=>\&_author_list,'generated_by'=>\&_generated_by,'license'=>\&_downgrade_license,'meta-spec'=>\&_change_meta_spec,'name'=>\&_keep,'version'=>\&_keep,'build_requires'=>\&_get_build_requires,'configure_requires'=>\&_get_configure_requires,'conflicts'=>\&_get_conflicts,'distribution_type'=>\&_keep,'dynamic_config'=>\&_keep_or_one,'keywords'=>\&_keep,'no_index'=>\&_no_index_directory,'optional_features'=>\&_downgrade_optional_features,'provides'=>\&_provides,'recommends'=>\&_get_recommends,'requires'=>\&_get_requires,'resources'=>\&_downgrade_resources,':drop'=>[qw(description prereqs release_status)],':custom'=>\&_keep },'1.3-from-1.4'=>{'abstract'=>\&_keep_or_unknown,'author'=>\&_author_list,'generated_by'=>\&_generated_by,'license'=>\&_license_1,'meta-spec'=>\&_change_meta_spec,'name'=>\&_keep,'version'=>\&_keep,'build_requires'=>\&_version_map,'conflicts'=>\&_version_map,'distribution_type'=>\&_keep,'dynamic_config'=>\&_keep_or_one,'keywords'=>\&_keep,'no_index'=>\&_no_index_directory,'optional_features'=>\&_optional_features_as_map,'provides'=>\&_provides,'recommends'=>\&_version_map,'requires'=>\&_version_map,'resources'=>\&_resources_1_3,':drop'=>[qw(configure_requires)],':custom'=>\&_keep,},'1.2-from-1.3'=>{'abstract'=>\&_keep_or_unknown,'author'=>\&_author_list,'generated_by'=>\&_generated_by,'license'=>\&_license_1,'meta-spec'=>\&_change_meta_spec,'name'=>\&_keep,'version'=>\&_keep,'build_requires'=>\&_version_map,'conflicts'=>\&_version_map,'distribution_type'=>\&_keep,'dynamic_config'=>\&_keep_or_one,'keywords'=>\&_keep,'no_index'=>\&_no_index_1_2,'optional_features'=>\&_optional_features_as_map,'provides'=>\&_provides,'recommends'=>\&_version_map,'requires'=>\&_version_map,'resources'=>\&_resources_1_3,':custom'=>\&_keep,},'1.1-from-1.2'=>{'version'=>\&_keep,'name'=>\&_keep,'meta-spec'=>\&_change_meta_spec,'build_requires'=>\&_version_map,'conflicts'=>\&_version_map,'distribution_type'=>\&_keep,'dynamic_config'=>\&_keep_or_one,'generated_by'=>\&_generated_by,'license'=>\&_license_1,'private'=>\&_keep,'recommends'=>\&_version_map,'requires'=>\&_version_map,':drop'=>[qw(abstract author provides no_index keywords resources)],':custom'=>\&_keep,},'1.0-from-1.1'=>{'name'=>\&_keep,'meta-spec'=>\&_change_meta_spec,'version'=>\&_keep,'build_requires'=>\&_version_map,'conflicts'=>\&_version_map,'distribution_type'=>\&_keep,'dynamic_config'=>\&_keep_or_one,'generated_by'=>\&_generated_by,'license'=>\&_license_1,'recommends'=>\&_version_map,'requires'=>\&_version_map,':custom'=>\&_keep,},);my%cleanup=('2'=>{'abstract'=>\&_keep_or_unknown,'author'=>\&_author_list,'generated_by'=>\&_generated_by,'license'=>\&_license_2,'meta-spec'=>\&_change_meta_spec,'name'=>\&_keep,'version'=>\&_keep,'dynamic_config'=>\&_keep_or_one,'release_status'=>\&_release_status,'keywords'=>\&_keep,'no_index'=>\&_no_index_directory,'optional_features'=>\&_cleanup_optional_features_2,'provides'=>\&_provides,'resources'=>\&_cleanup_resources_2,'description'=>\&_keep,'prereqs'=>\&_cleanup_prereqs,':drop'=>[qw(build_requires configure_requires conflicts distribution_type license_url private recommends requires) ],':custom'=>\&_prefix_custom,},'1.4'=>{'abstract'=>\&_keep_or_unknown,'author'=>\&_author_list,'generated_by'=>\&_generated_by,'license'=>\&_license_1,'meta-spec'=>\&_change_meta_spec,'name'=>\&_keep,'version'=>\&_keep,'build_requires'=>\&_version_map,'conflicts'=>\&_version_map,'distribution_type'=>\&_keep,'dynamic_config'=>\&_keep_or_one,'keywords'=>\&_keep,'no_index'=>\&_no_index_directory,'optional_features'=>\&_optional_features_1_4,'provides'=>\&_provides,'recommends'=>\&_version_map,'requires'=>\&_version_map,'resources'=>\&_resources_1_4,'configure_requires'=>\&_keep,':custom'=>\&_keep },'1.3'=>{'abstract'=>\&_keep_or_unknown,'author'=>\&_author_list,'generated_by'=>\&_generated_by,'license'=>\&_license_1,'meta-spec'=>\&_change_meta_spec,'name'=>\&_keep,'version'=>\&_keep,'build_requires'=>\&_version_map,'conflicts'=>\&_version_map,'distribution_type'=>\&_keep,'dynamic_config'=>\&_keep_or_one,'keywords'=>\&_keep,'no_index'=>\&_no_index_directory,'optional_features'=>\&_optional_features_as_map,'provides'=>\&_provides,'recommends'=>\&_version_map,'requires'=>\&_version_map,'resources'=>\&_resources_1_3,':custom'=>\&_keep },'1.2'=>{'version'=>\&_keep,'license'=>\&_license_1,'name'=>\&_keep,'generated_by'=>\&_generated_by,'abstract'=>\&_keep_or_unknown,'author'=>\&_author_list,'meta-spec'=>\&_change_meta_spec,'build_requires'=>\&_version_map,'conflicts'=>\&_version_map,'distribution_type'=>\&_keep,'dynamic_config'=>\&_keep_or_one,'recommends'=>\&_version_map,'requires'=>\&_version_map,'keywords'=>\&_keep,'no_index'=>\&_no_index_1_2,'optional_features'=>\&_optional_features_as_map,'provides'=>\&_provides,'resources'=>\&_resources_1_2,':custom'=>\&_keep },'1.1'=>{'version'=>\&_keep,'name'=>\&_keep,'meta-spec'=>\&_change_meta_spec,'build_requires'=>\&_version_map,'conflicts'=>\&_version_map,'distribution_type'=>\&_keep,'dynamic_config'=>\&_keep_or_one,'generated_by'=>\&_generated_by,'license'=>\&_license_1,'recommends'=>\&_version_map,'requires'=>\&_version_map,'license_url'=>\&_url_or_drop,'private'=>\&_keep,':custom'=>\&_keep },'1.0'=>{'name'=>\&_keep,'meta-spec'=>\&_change_meta_spec,'version'=>\&_keep,'build_requires'=>\&_version_map,'conflicts'=>\&_version_map,'distribution_type'=>\&_keep,'dynamic_config'=>\&_keep_or_one,'generated_by'=>\&_generated_by,'license'=>\&_license_1,'recommends'=>\&_version_map,'requires'=>\&_version_map,':custom'=>\&_keep,},);sub new {my ($class,$data)=@_;my$self={'data'=>$data,'spec'=>$data->{'meta-spec'}{'version'}|| "1.0",};return bless$self,$class}sub convert {my ($self,%args)=@_;my$args={%args };my$new_version=$args->{version}|| $HIGHEST;my ($old_version)=$self->{spec};my$converted=_dclone($self->{data});if ($old_version==$new_version){$converted=_convert($converted,$cleanup{$old_version},$old_version);my$cmv=CPAN::Meta::Validator->new($converted);unless ($cmv->is_valid){my$errs=join("\n",$cmv->errors);die "Failed to clean-up $old_version metadata. Errors:\n$errs\n"}return$converted}elsif ($old_version > $new_version){my@vers=sort {$b <=> $a}keys%known_specs;for my$i (0 .. $#vers-1){next if$vers[$i]> $old_version;last if$vers[$i+1]< $new_version;my$spec_string="$vers[$i+1]-from-$vers[$i]";$converted=_convert($converted,$down_convert{$spec_string},$vers[$i+1]);my$cmv=CPAN::Meta::Validator->new($converted);unless ($cmv->is_valid){my$errs=join("\n",$cmv->errors);die "Failed to downconvert metadata to $vers[$i+1]. Errors:\n$errs\n"}}return$converted}else {my@vers=sort {$a <=> $b}keys%known_specs;for my$i (0 .. $#vers-1){next if$vers[$i]< $old_version;last if$vers[$i+1]> $new_version;my$spec_string="$vers[$i+1]-from-$vers[$i]";$converted=_convert($converted,$up_convert{$spec_string},$vers[$i+1]);my$cmv=CPAN::Meta::Validator->new($converted);unless ($cmv->is_valid){my$errs=join("\n",$cmv->errors);die "Failed to upconvert metadata to $vers[$i+1]. Errors:\n$errs\n"}}return$converted}}1;
CPAN_META_CONVERTER
$fatpacked{"CPAN/Meta/Feature.pm"} = <<'CPAN_META_FEATURE';
- use 5.006;
- use strict;
- use warnings;
- package CPAN::Meta::Feature;
- BEGIN {
- $CPAN::Meta::Feature::VERSION = '2.110930';
- }
- # ABSTRACT: an optional feature provided by a CPAN distribution
-
- use CPAN::Meta::Prereqs;
-
-
- sub new {
- my ($class, $identifier, $spec) = @_;
-
- my %guts = (
- identifier => $identifier,
- description => $spec->{description},
- prereqs => CPAN::Meta::Prereqs->new($spec->{prereqs}),
- );
-
- bless \%guts => $class;
- }
-
-
- sub identifier { $_[0]{identifier} }
-
-
- sub description { $_[0]{description} }
-
-
- sub prereqs { $_[0]{prereqs} }
-
- 1;
-
-
-
-
- __END__
-
-
-
+ use 5.006;use strict;use warnings;package CPAN::Meta::Feature;our$VERSION='2.132510';use CPAN::Meta::Prereqs;sub new {my ($class,$identifier,$spec)=@_;my%guts=(identifier=>$identifier,description=>$spec->{description},prereqs=>CPAN::Meta::Prereqs->new($spec->{prereqs}),);bless \%guts=>$class}sub identifier {$_[0]{identifier}}sub description {$_[0]{description}}sub prereqs {$_[0]{prereqs}}1;
CPAN_META_FEATURE
$fatpacked{"CPAN/Meta/History.pm"} = <<'CPAN_META_HISTORY';
- # vi:tw=72
- use 5.006;
- use strict;
- use warnings;
- package CPAN::Meta::History;
- BEGIN {
- $CPAN::Meta::History::VERSION = '2.110930';
- }
- # ABSTRACT: history of CPAN Meta Spec changes
- 1;
-
-
-
- __END__
- =pod
-
+ use 5.006;use strict;use warnings;package CPAN::Meta::History;our$VERSION='2.132510';1;
CPAN_META_HISTORY
$fatpacked{"CPAN/Meta/Prereqs.pm"} = <<'CPAN_META_PREREQS';
- use 5.006;
- use strict;
- use warnings;
- package CPAN::Meta::Prereqs;
- BEGIN {
- $CPAN::Meta::Prereqs::VERSION = '2.110930';
- }
- # ABSTRACT: a set of distribution prerequisites by phase and type
-
-
- use Carp qw(confess);
- use Scalar::Util qw(blessed);
- use Version::Requirements 0.101020; # finalize
-
-
- sub __legal_phases { qw(configure build test runtime develop) }
- sub __legal_types { qw(requires recommends suggests conflicts) }
-
- # expect a prereq spec from META.json -- rjbs, 2010-04-11
- sub new {
- my ($class, $prereq_spec) = @_;
- $prereq_spec ||= {};
-
- my %is_legal_phase = map {; $_ => 1 } $class->__legal_phases;
- my %is_legal_type = map {; $_ => 1 } $class->__legal_types;
-
- my %guts;
- PHASE: for my $phase (keys %$prereq_spec) {
- next PHASE unless $phase =~ /\Ax_/i or $is_legal_phase{$phase};
-
- my $phase_spec = $prereq_spec->{ $phase };
- next PHASE unless keys %$phase_spec;
-
- TYPE: for my $type (keys %$phase_spec) {
- next TYPE unless $type =~ /\Ax_/i or $is_legal_type{$type};
-
- my $spec = $phase_spec->{ $type };
-
- next TYPE unless keys %$spec;
-
- $guts{prereqs}{$phase}{$type} = Version::Requirements->from_string_hash(
- $spec
- );
- }
- }
-
- return bless \%guts => $class;
- }
-
-
- sub requirements_for {
- my ($self, $phase, $type) = @_;
-
- confess "requirements_for called without phase" unless defined $phase;
- confess "requirements_for called without type" unless defined $type;
-
- unless ($phase =~ /\Ax_/i or grep { $phase eq $_ } $self->__legal_phases) {
- confess "requested requirements for unknown phase: $phase";
- }
-
- unless ($type =~ /\Ax_/i or grep { $type eq $_ } $self->__legal_types) {
- confess "requested requirements for unknown type: $type";
- }
-
- my $req = ($self->{prereqs}{$phase}{$type} ||= Version::Requirements->new);
-
- $req->finalize if $self->is_finalized;
-
- return $req;
- }
-
-
- sub with_merged_prereqs {
- my ($self, $other) = @_;
-
- my @other = blessed($other) ? $other : @$other;
-
- my @prereq_objs = ($self, @other);
-
- my %new_arg;
-
- for my $phase ($self->__legal_phases) {
- for my $type ($self->__legal_types) {
- my $req = Version::Requirements->new;
-
- for my $prereq (@prereq_objs) {
- my $this_req = $prereq->requirements_for($phase, $type);
- next unless $this_req->required_modules;
-
- $req->add_requirements($this_req);
- }
-
- next unless $req->required_modules;
-
- $new_arg{ $phase }{ $type } = $req->as_string_hash;
- }
- }
-
- return (ref $self)->new(\%new_arg);
- }
-
-
- sub as_string_hash {
- my ($self) = @_;
-
- my %hash;
-
- for my $phase ($self->__legal_phases) {
- for my $type ($self->__legal_types) {
- my $req = $self->requirements_for($phase, $type);
- next unless $req->required_modules;
-
- $hash{ $phase }{ $type } = $req->as_string_hash;
- }
- }
-
- return \%hash;
- }
-
-
- sub is_finalized { $_[0]{finalized} }
-
-
- sub finalize {
- my ($self) = @_;
-
- $self->{finalized} = 1;
-
- for my $phase (keys %{ $self->{prereqs} }) {
- $_->finalize for values %{ $self->{prereqs}{$phase} };
- }
- }
-
-
- sub clone {
- my ($self) = @_;
-
- my $clone = (ref $self)->new( $self->as_string_hash );
- }
-
- 1;
-
-
-
-
- __END__
-
-
-
+ use 5.006;use strict;use warnings;package CPAN::Meta::Prereqs;our$VERSION='2.132510';use Carp qw(confess);use Scalar::Util qw(blessed);use CPAN::Meta::Requirements 2.121;sub __legal_phases {qw(configure build test runtime develop)}sub __legal_types {qw(requires recommends suggests conflicts)}sub new {my ($class,$prereq_spec)=@_;$prereq_spec ||={};my%is_legal_phase=map {;$_=>1}$class->__legal_phases;my%is_legal_type=map {;$_=>1}$class->__legal_types;my%guts;PHASE: for my$phase (keys %$prereq_spec){next PHASE unless$phase =~ /\Ax_/i or $is_legal_phase{$phase};my$phase_spec=$prereq_spec->{$phase };next PHASE unless keys %$phase_spec;TYPE: for my$type (keys %$phase_spec){next TYPE unless$type =~ /\Ax_/i or $is_legal_type{$type};my$spec=$phase_spec->{$type };next TYPE unless keys %$spec;$guts{prereqs}{$phase}{$type}=CPAN::Meta::Requirements->from_string_hash($spec)}}return bless \%guts=>$class}sub requirements_for {my ($self,$phase,$type)=@_;confess "requirements_for called without phase" unless defined$phase;confess "requirements_for called without type" unless defined$type;unless ($phase =~ /\Ax_/i or grep {$phase eq $_}$self->__legal_phases){confess "requested requirements for unknown phase: $phase"}unless ($type =~ /\Ax_/i or grep {$type eq $_}$self->__legal_types){confess "requested requirements for unknown type: $type"}my$req=($self->{prereqs}{$phase}{$type}||=CPAN::Meta::Requirements->new);$req->finalize if$self->is_finalized;return$req}sub with_merged_prereqs {my ($self,$other)=@_;my@other=blessed($other)? $other : @$other;my@prereq_objs=($self,@other);my%new_arg;for my$phase ($self->__legal_phases){for my$type ($self->__legal_types){my$req=CPAN::Meta::Requirements->new;for my$prereq (@prereq_objs){my$this_req=$prereq->requirements_for($phase,$type);next unless$this_req->required_modules;$req->add_requirements($this_req)}next unless$req->required_modules;$new_arg{$phase }{$type }=$req->as_string_hash}}return (ref$self)->new(\%new_arg)}sub as_string_hash {my ($self)=@_;my%hash;for my$phase ($self->__legal_phases){for my$type ($self->__legal_types){my$req=$self->requirements_for($phase,$type);next unless$req->required_modules;$hash{$phase }{$type }=$req->as_string_hash}}return \%hash}sub is_finalized {$_[0]{finalized}}sub finalize {my ($self)=@_;$self->{finalized}=1;for my$phase (keys %{$self->{prereqs}}){$_->finalize for values %{$self->{prereqs}{$phase}}}}sub clone {my ($self)=@_;my$clone=(ref$self)->new($self->as_string_hash)}1;
CPAN_META_PREREQS
+$fatpacked{"CPAN/Meta/Requirements.pm"} = <<'CPAN_META_REQUIREMENTS';
+ use strict;use warnings;package CPAN::Meta::Requirements;our$VERSION='2.123';use Carp ();use Scalar::Util ();use version 0.77 ();my@valid_options=qw(bad_version_hook);sub new {my ($class,$options)=@_;$options ||={};Carp::croak "Argument to $class\->new() must be a hash reference" unless ref$options eq 'HASH';my%self=map {;$_=>$options->{$_}}@valid_options;return bless \%self=>$class}sub _version_object {my ($self,$version)=@_;my$vobj;eval {$vobj=(!defined$version)? version->parse(0): (!Scalar::Util::blessed($version))? version->parse($version): $version};if (my$err=$@){my$hook=$self->{bad_version_hook};$vobj=eval {$hook->($version)}if ref$hook eq 'CODE';unless (Scalar::Util::blessed($vobj)&& $vobj->isa("version")){$err =~ s{ at .* line \d+.*$}{};die "Can't convert '$version': $err"}}if ($vobj =~ m{\A\.}){$vobj=version->parse("0$vobj")}if ($vobj->is_qv){$vobj=version->parse($vobj->normal)}return$vobj}BEGIN {for my$type (qw(minimum maximum exclusion exact_version)){my$method="with_$type";my$to_add=$type eq 'exact_version' ? $type : "add_$type";my$code=sub {my ($self,$name,$version)=@_;$version=$self->_version_object($version);$self->__modify_entry_for($name,$method,$version);return$self};no strict 'refs';*$to_add=$code}}sub add_requirements {my ($self,$req)=@_;for my$module ($req->required_modules){my$modifiers=$req->__entry_for($module)->as_modifiers;for my$modifier (@$modifiers){my ($method,@args)=@$modifier;$self->$method($module=>@args)}}return$self}sub accepts_module {my ($self,$module,$version)=@_;$version=$self->_version_object($version);return 1 unless my$range=$self->__entry_for($module);return$range->_accepts($version)}sub clear_requirement {my ($self,$module)=@_;return$self unless$self->__entry_for($module);Carp::confess("can't clear requirements on finalized requirements")if$self->is_finalized;delete$self->{requirements}{$module };return$self}sub requirements_for_module {my ($self,$module)=@_;my$entry=$self->__entry_for($module);return unless$entry;return$entry->as_string}sub required_modules {keys %{$_[0]{requirements}}}sub clone {my ($self)=@_;my$new=(ref$self)->new;return$new->add_requirements($self)}sub __entry_for {$_[0]{requirements}{$_[1]}}sub __modify_entry_for {my ($self,$name,$method,$version)=@_;my$fin=$self->is_finalized;my$old=$self->__entry_for($name);Carp::confess("can't add new requirements to finalized requirements")if$fin and not $old;my$new=($old || 'CPAN::Meta::Requirements::_Range::Range')->$method($version);Carp::confess("can't modify finalized requirements")if$fin and $old->as_string ne $new->as_string;$self->{requirements}{$name }=$new}sub is_simple {my ($self)=@_;for my$module ($self->required_modules){return if$self->__entry_for($module)->as_string =~ /\s/}return 1}sub is_finalized {$_[0]{finalized}}sub finalize {$_[0]{finalized}=1}sub as_string_hash {my ($self)=@_;my%hash=map {;$_=>$self->{requirements}{$_}->as_string}$self->required_modules;return \%hash}my%methods_for_op=('=='=>[qw(exact_version) ],'!='=>[qw(add_exclusion) ],'>='=>[qw(add_minimum) ],'<='=>[qw(add_maximum) ],'>'=>[qw(add_minimum add_exclusion) ],'<'=>[qw(add_maximum add_exclusion) ],);sub add_string_requirement {my ($self,$module,$req)=@_;Carp::confess("No requirement string provided for $module")unless defined$req && length$req;my@parts=split qr{\s*,\s*},$req;for my$part (@parts){my ($op,$ver)=$part =~ m{\A\s*(==|>=|>|<=|<|!=)\s*(.*)\z};if (!defined$op){$self->add_minimum($module=>$part)}else {Carp::confess("illegal requirement string: $req")unless my$methods=$methods_for_op{$op };$self->$_($module=>$ver)for @$methods}}}sub from_string_hash {my ($class,$hash)=@_;my$self=$class->new;for my$module (keys %$hash){my$req=$hash->{$module};unless (defined$req && length$req){$req=0;Carp::carp("Undefined requirement for $module treated as '0'")}$self->add_string_requirement($module,$req)}return$self}{package CPAN::Meta::Requirements::_Range::Exact;sub _new {bless {version=>$_[1]}=>$_[0]}sub _accepts {return $_[0]{version}==$_[1]}sub as_string {return "== $_[0]{version}"}sub as_modifiers {return [[exact_version=>$_[0]{version}]]}sub _clone {(ref $_[0])->_new(version->new($_[0]{version}))}sub with_exact_version {my ($self,$version)=@_;return$self->_clone if$self->_accepts($version);Carp::confess("illegal requirements: unequal exact version specified")}sub with_minimum {my ($self,$minimum)=@_;return$self->_clone if$self->{version}>= $minimum;Carp::confess("illegal requirements: minimum above exact specification")}sub with_maximum {my ($self,$maximum)=@_;return$self->_clone if$self->{version}<= $maximum;Carp::confess("illegal requirements: maximum below exact specification")}sub with_exclusion {my ($self,$exclusion)=@_;return$self->_clone unless$exclusion==$self->{version};Carp::confess("illegal requirements: excluded exact specification")}}{package CPAN::Meta::Requirements::_Range::Range;sub _self {ref($_[0])? $_[0]: (bless {}=>$_[0])}sub _clone {return (bless {}=>$_[0])unless ref $_[0];my ($s)=@_;my%guts=((exists$s->{minimum}? (minimum=>version->new($s->{minimum})): ()),(exists$s->{maximum}? (maximum=>version->new($s->{maximum})): ()),(exists$s->{exclusions}? (exclusions=>[map {version->new($_)}@{$s->{exclusions}}]): ()),);bless \%guts=>ref($s)}sub as_modifiers {my ($self)=@_;my@mods;push@mods,[add_minimum=>$self->{minimum}]if exists$self->{minimum};push@mods,[add_maximum=>$self->{maximum}]if exists$self->{maximum};push@mods,map {;[add_exclusion=>$_ ]}@{$self->{exclusions}|| []};return \@mods}sub as_string {my ($self)=@_;return 0 if!keys %$self;return "$self->{minimum}" if (keys %$self)==1 and exists$self->{minimum};my@exclusions=@{$self->{exclusions}|| []};my@parts;for my$pair ([qw(>= > minimum) ],[qw(<= < maximum) ],){my ($op,$e_op,$k)=@$pair;if (exists$self->{$k}){my@new_exclusions=grep {$_!=$self->{$k }}@exclusions;if (@new_exclusions==@exclusions){push@parts,"$op $self->{ $k }"}else {push@parts,"$e_op $self->{ $k }";@exclusions=@new_exclusions}}}push@parts,map {;"!= $_"}@exclusions;return join q{, },@parts}sub with_exact_version {my ($self,$version)=@_;$self=$self->_clone;Carp::confess("illegal requirements: exact specification outside of range")unless$self->_accepts($version);return CPAN::Meta::Requirements::_Range::Exact->_new($version)}sub _simplify {my ($self)=@_;if (defined$self->{minimum}and defined$self->{maximum}){if ($self->{minimum}==$self->{maximum}){Carp::confess("illegal requirements: excluded all values")if grep {$_==$self->{minimum}}@{$self->{exclusions}|| []};return CPAN::Meta::Requirements::_Range::Exact->_new($self->{minimum})}Carp::confess("illegal requirements: minimum exceeds maximum")if$self->{minimum}> $self->{maximum}}if ($self->{exclusions}){my%seen;@{$self->{exclusions}}=grep {(!defined$self->{minimum}or $_ >= $self->{minimum})and (!defined$self->{maximum}or $_ <= $self->{maximum})and !$seen{$_}++}@{$self->{exclusions}}}return$self}sub with_minimum {my ($self,$minimum)=@_;$self=$self->_clone;if (defined (my$old_min=$self->{minimum})){$self->{minimum}=(sort {$b cmp $a}($minimum,$old_min))[0]}else {$self->{minimum}=$minimum}return$self->_simplify}sub with_maximum {my ($self,$maximum)=@_;$self=$self->_clone;if (defined (my$old_max=$self->{maximum})){$self->{maximum}=(sort {$a cmp $b}($maximum,$old_max))[0]}else {$self->{maximum}=$maximum}return$self->_simplify}sub with_exclusion {my ($self,$exclusion)=@_;$self=$self->_clone;push @{$self->{exclusions}||=[]},$exclusion;return$self->_simplify}sub _accepts {my ($self,$version)=@_;return if defined$self->{minimum}and $version < $self->{minimum};return if defined$self->{maximum}and $version > $self->{maximum};return if defined$self->{exclusions}and grep {$version==$_}@{$self->{exclusions}};return 1}}1;
+CPAN_META_REQUIREMENTS
+
$fatpacked{"CPAN/Meta/Spec.pm"} = <<'CPAN_META_SPEC';
- # vi:tw=72
- use 5.006;
- use strict;
- use warnings;
- package CPAN::Meta::Spec;
- BEGIN {
- $CPAN::Meta::Spec::VERSION = '2.110930';
- }
- # ABSTRACT: specification for CPAN distribution metadata
- 1;
-
-
-
- __END__
- =pod
-
+ use 5.006;use strict;use warnings;package CPAN::Meta::Spec;our$VERSION='2.132510';1;
CPAN_META_SPEC
$fatpacked{"CPAN/Meta/Validator.pm"} = <<'CPAN_META_VALIDATOR';
- use 5.006;
- use strict;
- use warnings;
- package CPAN::Meta::Validator;
- BEGIN {
- $CPAN::Meta::Validator::VERSION = '2.110930';
- }
- # ABSTRACT: validate CPAN distribution metadata structures
-
-
- #--------------------------------------------------------------------------#
- # This code copied and adapted from Test::CPAN::Meta
- # by Barbie, <barbie@cpan.org> for Miss Barbell Productions,
- # L<http://www.missbarbell.co.uk>
- #--------------------------------------------------------------------------#
-
- #--------------------------------------------------------------------------#
- # Specification Definitions
- #--------------------------------------------------------------------------#
-
- my %known_specs = (
- '1.4' => 'http://module-build.sourceforge.net/META-spec-v1.4.html',
- '1.3' => 'http://module-build.sourceforge.net/META-spec-v1.3.html',
- '1.2' => 'http://module-build.sourceforge.net/META-spec-v1.2.html',
- '1.1' => 'http://module-build.sourceforge.net/META-spec-v1.1.html',
- '1.0' => 'http://module-build.sourceforge.net/META-spec-v1.0.html'
- );
- my %known_urls = map {$known_specs{$_} => $_} keys %known_specs;
-
- my $module_map1 = { 'map' => { ':key' => { name => \&module, value => \&exversion } } };
-
- my $module_map2 = { 'map' => { ':key' => { name => \&module, value => \&version } } };
-
- my $no_index_2 = {
- 'map' => { file => { list => { value => \&string } },
- directory => { list => { value => \&string } },
- 'package' => { list => { value => \&string } },
- namespace => { list => { value => \&string } },
- ':key' => { name => \&custom_2, value => \&anything },
- }
- };
-
- my $no_index_1_3 = {
- 'map' => { file => { list => { value => \&string } },
- directory => { list => { value => \&string } },
- 'package' => { list => { value => \&string } },
- namespace => { list => { value => \&string } },
- ':key' => { name => \&string, value => \&anything },
- }
- };
-
- my $no_index_1_2 = {
- 'map' => { file => { list => { value => \&string } },
- dir => { list => { value => \&string } },
- 'package' => { list => { value => \&string } },
- namespace => { list => { value => \&string } },
- ':key' => { name => \&string, value => \&anything },
- }
- };
-
- my $no_index_1_1 = {
- 'map' => { ':key' => { name => \&string, list => { value => \&string } },
- }
- };
-
- my $prereq_map = {
- map => {
- ':key' => {
- name => \&phase,
- 'map' => {
- ':key' => {
- name => \&relation,
- %$module_map1,
- },
- },
- }
- },
- };
-
- my %definitions = (
- '2' => {
- # REQUIRED
- 'abstract' => { mandatory => 1, value => \&string },
- 'author' => { mandatory => 1, lazylist => { value => \&string } },
- 'dynamic_config' => { mandatory => 1, value => \&boolean },
- 'generated_by' => { mandatory => 1, value => \&string },
- 'license' => { mandatory => 1, lazylist => { value => \&license } },
- 'meta-spec' => {
- mandatory => 1,
- 'map' => {
- version => { mandatory => 1, value => \&version},
- url => { value => \&url },
- ':key' => { name => \&custom_2, value => \&anything },
- }
- },
- 'name' => { mandatory => 1, value => \&string },
- 'release_status' => { mandatory => 1, value => \&release_status },
- 'version' => { mandatory => 1, value => \&version },
-
- # OPTIONAL
- 'description' => { value => \&string },
- 'keywords' => { lazylist => { value => \&string } },
- 'no_index' => $no_index_2,
- 'optional_features' => {
- 'map' => {
- ':key' => {
- name => \&string,
- 'map' => {
- description => { value => \&string },
- prereqs => $prereq_map,
- ':key' => { name => \&custom_2, value => \&anything },
- }
- }
- }
- },
- 'prereqs' => $prereq_map,
- 'provides' => {
- 'map' => {
- ':key' => {
- name => \&module,
- 'map' => {
- file => { mandatory => 1, value => \&file },
- version => { value => \&version },
- ':key' => { name => \&custom_2, value => \&anything },
- }
- }
- }
- },
- 'resources' => {
- 'map' => {
- license => { lazylist => { value => \&url } },
- homepage => { value => \&url },
- bugtracker => {
- 'map' => {
- web => { value => \&url },
- mailto => { value => \&string},
- ':key' => { name => \&custom_2, value => \&anything },
- }
- },
- repository => {
- 'map' => {
- web => { value => \&url },
- url => { value => \&url },
- type => { value => \&string },
- ':key' => { name => \&custom_2, value => \&anything },
- }
- },
- ':key' => { value => \&string, name => \&custom_2 },
- }
- },
-
- # CUSTOM -- additional user defined key/value pairs
- # note we can only validate the key name, as the structure is user defined
- ':key' => { name => \&custom_2, value => \&anything },
- },
-
- '1.4' => {
- 'meta-spec' => {
- mandatory => 1,
- 'map' => {
- version => { mandatory => 1, value => \&version},
- url => { mandatory => 1, value => \&urlspec },
- ':key' => { name => \&string, value => \&anything },
- },
- },
-
- 'name' => { mandatory => 1, value => \&string },
- 'version' => { mandatory => 1, value => \&version },
- 'abstract' => { mandatory => 1, value => \&string },
- 'author' => { mandatory => 1, list => { value => \&string } },
- 'license' => { mandatory => 1, value => \&license },
- 'generated_by' => { mandatory => 1, value => \&string },
-
- 'distribution_type' => { value => \&string },
- 'dynamic_config' => { value => \&boolean },
-
- 'requires' => $module_map1,
- 'recommends' => $module_map1,
- 'build_requires' => $module_map1,
- 'configure_requires' => $module_map1,
- 'conflicts' => $module_map2,
-
- 'optional_features' => {
- 'map' => {
- ':key' => { name => \&string,
- 'map' => { description => { value => \&string },
- requires => $module_map1,
- recommends => $module_map1,
- build_requires => $module_map1,
- conflicts => $module_map2,
- ':key' => { name => \&string, value => \&anything },
- }
- }
- }
- },
-
- 'provides' => {
- 'map' => {
- ':key' => { name => \&module,
- 'map' => {
- file => { mandatory => 1, value => \&file },
- version => { value => \&version },
- ':key' => { name => \&string, value => \&anything },
- }
- }
- }
- },
-
- 'no_index' => $no_index_1_3,
- 'private' => $no_index_1_3,
-
- 'keywords' => { list => { value => \&string } },
-
- 'resources' => {
- 'map' => { license => { value => \&url },
- homepage => { value => \&url },
- bugtracker => { value => \&url },
- repository => { value => \&url },
- ':key' => { value => \&string, name => \&custom_1 },
- }
- },
-
- # additional user defined key/value pairs
- # note we can only validate the key name, as the structure is user defined
- ':key' => { name => \&string, value => \&anything },
- },
-
- '1.3' => {
- 'meta-spec' => {
- mandatory => 1,
- 'map' => {
- version => { mandatory => 1, value => \&version},
- url => { mandatory => 1, value => \&urlspec },
- ':key' => { name => \&string, value => \&anything },
- },
- },
-
- 'name' => { mandatory => 1, value => \&string },
- 'version' => { mandatory => 1, value => \&version },
- 'abstract' => { mandatory => 1, value => \&string },
- 'author' => { mandatory => 1, list => { value => \&string } },
- 'license' => { mandatory => 1, value => \&license },
- 'generated_by' => { mandatory => 1, value => \&string },
-
- 'distribution_type' => { value => \&string },
- 'dynamic_config' => { value => \&boolean },
-
- 'requires' => $module_map1,
- 'recommends' => $module_map1,
- 'build_requires' => $module_map1,
- 'conflicts' => $module_map2,
-
- 'optional_features' => {
- 'map' => {
- ':key' => { name => \&string,
- 'map' => { description => { value => \&string },
- requires => $module_map1,
- recommends => $module_map1,
- build_requires => $module_map1,
- conflicts => $module_map2,
- ':key' => { name => \&string, value => \&anything },
- }
- }
- }
- },
-
- 'provides' => {
- 'map' => {
- ':key' => { name => \&module,
- 'map' => {
- file => { mandatory => 1, value => \&file },
- version => { value => \&version },
- ':key' => { name => \&string, value => \&anything },
- }
- }
- }
- },
-
-
- 'no_index' => $no_index_1_3,
- 'private' => $no_index_1_3,
-
- 'keywords' => { list => { value => \&string } },
-
- 'resources' => {
- 'map' => { license => { value => \&url },
- homepage => { value => \&url },
- bugtracker => { value => \&url },
- repository => { value => \&url },
- ':key' => { value => \&string, name => \&custom_1 },
- }
- },
-
- # additional user defined key/value pairs
- # note we can only validate the key name, as the structure is user defined
- ':key' => { name => \&string, value => \&anything },
- },
-
- # v1.2 is misleading, it seems to assume that a number of fields where created
- # within v1.1, when they were created within v1.2. This may have been an
- # original mistake, and that a v1.1 was retro fitted into the timeline, when
- # v1.2 was originally slated as v1.1. But I could be wrong ;)
- '1.2' => {
- 'meta-spec' => {
- mandatory => 1,
- 'map' => {
- version => { mandatory => 1, value => \&version},
- url => { mandatory => 1, value => \&urlspec },
- ':key' => { name => \&string, value => \&anything },
- },
- },
-
-
- 'name' => { mandatory => 1, value => \&string },
- 'version' => { mandatory => 1, value => \&version },
- 'license' => { mandatory => 1, value => \&license },
- 'generated_by' => { mandatory => 1, value => \&string },
- 'author' => { mandatory => 1, list => { value => \&string } },
- 'abstract' => { mandatory => 1, value => \&string },
-
- 'distribution_type' => { value => \&string },
- 'dynamic_config' => { value => \&boolean },
-
- 'keywords' => { list => { value => \&string } },
-
- 'private' => $no_index_1_2,
- '$no_index' => $no_index_1_2,
-
- 'requires' => $module_map1,
- 'recommends' => $module_map1,
- 'build_requires' => $module_map1,
- 'conflicts' => $module_map2,
-
- 'optional_features' => {
- 'map' => {
- ':key' => { name => \&string,
- 'map' => { description => { value => \&string },
- requires => $module_map1,
- recommends => $module_map1,
- build_requires => $module_map1,
- conflicts => $module_map2,
- ':key' => { name => \&string, value => \&anything },
- }
- }
- }
- },
-
- 'provides' => {
- 'map' => {
- ':key' => { name => \&module,
- 'map' => {
- file => { mandatory => 1, value => \&file },
- version => { value => \&version },
- ':key' => { name => \&string, value => \&anything },
- }
- }
- }
- },
-
- 'resources' => {
- 'map' => { license => { value => \&url },
- homepage => { value => \&url },
- bugtracker => { value => \&url },
- repository => { value => \&url },
- ':key' => { value => \&string, name => \&custom_1 },
- }
- },
-
- # additional user defined key/value pairs
- # note we can only validate the key name, as the structure is user defined
- ':key' => { name => \&string, value => \&anything },
- },
-
- # note that the 1.1 spec only specifies 'version' as mandatory
- '1.1' => {
- 'name' => { value => \&string },
- 'version' => { mandatory => 1, value => \&version },
- 'license' => { value => \&license },
- 'generated_by' => { value => \&string },
-
- 'license_uri' => { value => \&url },
- 'distribution_type' => { value => \&string },
- 'dynamic_config' => { value => \&boolean },
-
- 'private' => $no_index_1_1,
-
- 'requires' => $module_map1,
- 'recommends' => $module_map1,
- 'build_requires' => $module_map1,
- 'conflicts' => $module_map2,
-
- # additional user defined key/value pairs
- # note we can only validate the key name, as the structure is user defined
- ':key' => { name => \&string, value => \&anything },
- },
-
- # note that the 1.0 spec doesn't specify optional or mandatory fields
- # but we will treat version as mandatory since otherwise META 1.0 is
- # completely arbitrary and pointless
- '1.0' => {
- 'name' => { value => \&string },
- 'version' => { mandatory => 1, value => \&version },
- 'license' => { value => \&license },
- 'generated_by' => { value => \&string },
-
- 'license_uri' => { value => \&url },
- 'distribution_type' => { value => \&string },
- 'dynamic_config' => { value => \&boolean },
-
- 'requires' => $module_map1,
- 'recommends' => $module_map1,
- 'build_requires' => $module_map1,
- 'conflicts' => $module_map2,
-
- # additional user defined key/value pairs
- # note we can only validate the key name, as the structure is user defined
- ':key' => { name => \&string, value => \&anything },
- },
- );
-
- #--------------------------------------------------------------------------#
- # Code
- #--------------------------------------------------------------------------#
-
-
- sub new {
- my ($class,$data) = @_;
-
- # create an attributes hash
- my $self = {
- 'data' => $data,
- 'spec' => $data->{'meta-spec'}{'version'} || "1.0",
- 'errors' => undef,
- };
-
- # create the object
- return bless $self, $class;
- }
-
-
- sub is_valid {
- my $self = shift;
- my $data = $self->{data};
- my $spec_version = $self->{spec};
- $self->check_map($definitions{$spec_version},$data);
- return ! $self->errors;
- }
-
-
- sub errors {
- my $self = shift;
- return () unless(defined $self->{errors});
- return @{$self->{errors}};
- }
-
-
- my $spec_error = "Missing validation action in specification. "
- . "Must be one of 'map', 'list', 'lazylist', or 'value'";
-
- sub check_map {
- my ($self,$spec,$data) = @_;
-
- if(ref($spec) ne 'HASH') {
- $self->_error( "Unknown META specification, cannot validate." );
- return;
- }
-
- if(ref($data) ne 'HASH') {
- $self->_error( "Expected a map structure from string or file." );
- return;
- }
-
- for my $key (keys %$spec) {
- next unless($spec->{$key}->{mandatory});
- next if(defined $data->{$key});
- push @{$self->{stack}}, $key;
- $self->_error( "Missing mandatory field, '$key'" );
- pop @{$self->{stack}};
- }
-
- for my $key (keys %$data) {
- push @{$self->{stack}}, $key;
- if($spec->{$key}) {
- if($spec->{$key}{value}) {
- $spec->{$key}{value}->($self,$key,$data->{$key});
- } elsif($spec->{$key}{'map'}) {
- $self->check_map($spec->{$key}{'map'},$data->{$key});
- } elsif($spec->{$key}{'list'}) {
- $self->check_list($spec->{$key}{'list'},$data->{$key});
- } elsif($spec->{$key}{'lazylist'}) {
- $self->check_lazylist($spec->{$key}{'lazylist'},$data->{$key});
- } else {
- $self->_error( "$spec_error for '$key'" );
- }
-
- } elsif ($spec->{':key'}) {
- $spec->{':key'}{name}->($self,$key,$key);
- if($spec->{':key'}{value}) {
- $spec->{':key'}{value}->($self,$key,$data->{$key});
- } elsif($spec->{':key'}{'map'}) {
- $self->check_map($spec->{':key'}{'map'},$data->{$key});
- } elsif($spec->{':key'}{'list'}) {
- $self->check_list($spec->{':key'}{'list'},$data->{$key});
- } elsif($spec->{':key'}{'lazylist'}) {
- $self->check_lazylist($spec->{':key'}{'lazylist'},$data->{$key});
- } else {
- $self->_error( "$spec_error for ':key'" );
- }
-
-
- } else {
- $self->_error( "Unknown key, '$key', found in map structure" );
- }
- pop @{$self->{stack}};
- }
- }
-
- # if it's a string, make it into a list and check the list
- sub check_lazylist {
- my ($self,$spec,$data) = @_;
-
- if ( defined $data && ! ref($data) ) {
- $data = [ $data ];
- }
-
- $self->check_list($spec,$data);
- }
-
- sub check_list {
- my ($self,$spec,$data) = @_;
-
- if(ref($data) ne 'ARRAY') {
- $self->_error( "Expected a list structure" );
- return;
- }
-
- if(defined $spec->{mandatory}) {
- if(!defined $data->[0]) {
- $self->_error( "Missing entries from mandatory list" );
- }
- }
-
- for my $value (@$data) {
- push @{$self->{stack}}, $value || "<undef>";
- if(defined $spec->{value}) {
- $spec->{value}->($self,'list',$value);
- } elsif(defined $spec->{'map'}) {
- $self->check_map($spec->{'map'},$value);
- } elsif(defined $spec->{'list'}) {
- $self->check_list($spec->{'list'},$value);
- } elsif(defined $spec->{'lazylist'}) {
- $self->check_lazylist($spec->{'lazylist'},$value);
- } elsif ($spec->{':key'}) {
- $self->check_map($spec,$value);
- } else {
- $self->_error( "$spec_error associated with '$self->{stack}[-2]'" );
- }
- pop @{$self->{stack}};
- }
- }
-
-
- sub header {
- my ($self,$key,$value) = @_;
- if(defined $value) {
- return 1 if($value && $value =~ /^--- #YAML:1.0/);
- }
- $self->_error( "file does not have a valid YAML header." );
- return 0;
- }
-
- sub release_status {
- my ($self,$key,$value) = @_;
- if(defined $value) {
- my $version = $self->{data}{version} || '';
- if ( $version =~ /_/ ) {
- return 1 if ( $value =~ /\A(?:testing|unstable)\z/ );
- $self->_error( "'$value' for '$key' is invalid for version '$version'" );
- }
- else {
- return 1 if ( $value =~ /\A(?:stable|testing|unstable)\z/ );
- $self->_error( "'$value' for '$key' is invalid" );
- }
- }
- else {
- $self->_error( "'$key' is not defined" );
- }
- return 0;
- }
-
- # _uri_split taken from URI::Split by Gisle Aas, Copyright 2003
- sub _uri_split {
- return $_[0] =~ m,(?:([^:/?#]+):)?(?://([^/?#]*))?([^?#]*)(?:\?([^#]*))?(?:#(.*))?,;
- }
-
- sub url {
- my ($self,$key,$value) = @_;
- if(defined $value) {
- my ($scheme, $auth, $path, $query, $frag) = _uri_split($value);
- unless ( defined $scheme && length $scheme ) {
- $self->_error( "'$value' for '$key' does not have a URL scheme" );
- return 0;
- }
- unless ( defined $auth && length $auth ) {
- $self->_error( "'$value' for '$key' does not have a URL authority" );
- return 0;
- }
- return 1;
- }
- $value ||= '';
- $self->_error( "'$value' for '$key' is not a valid URL." );
- return 0;
- }
-
- sub urlspec {
- my ($self,$key,$value) = @_;
- if(defined $value) {
- return 1 if($value && $known_specs{$self->{spec}} eq $value);
- if($value && $known_urls{$value}) {
- $self->_error( 'META specification URL does not match version' );
- return 0;
- }
- }
- $self->_error( 'Unknown META specification' );
- return 0;
- }
-
- sub anything { return 1 }
-
- sub string {
- my ($self,$key,$value) = @_;
- if(defined $value) {
- return 1 if($value || $value =~ /^0$/);
- }
- $self->_error( "value is an undefined string" );
- return 0;
- }
-
- sub string_or_undef {
- my ($self,$key,$value) = @_;
- return 1 unless(defined $value);
- return 1 if($value || $value =~ /^0$/);
- $self->_error( "No string defined for '$key'" );
- return 0;
- }
-
- sub file {
- my ($self,$key,$value) = @_;
- return 1 if(defined $value);
- $self->_error( "No file defined for '$key'" );
- return 0;
- }
-
- sub exversion {
- my ($self,$key,$value) = @_;
- if(defined $value && ($value || $value =~ /0/)) {
- my $pass = 1;
- for(split(",",$value)) { $self->version($key,$_) or ($pass = 0); }
- return $pass;
- }
- $value = '<undef>' unless(defined $value);
- $self->_error( "'$value' for '$key' is not a valid version." );
- return 0;
- }
-
- sub version {
- my ($self,$key,$value) = @_;
- if(defined $value) {
- return 0 unless($value || $value =~ /0/);
- return 1 if($value =~ /^\s*((<|<=|>=|>|!=|==)\s*)?v?\d+((\.\d+((_|\.)\d+)?)?)/);
- } else {
- $value = '<undef>';
- }
- $self->_error( "'$value' for '$key' is not a valid version." );
- return 0;
- }
-
- sub boolean {
- my ($self,$key,$value) = @_;
- if(defined $value) {
- return 1 if($value =~ /^(0|1|true|false)$/);
- } else {
- $value = '<undef>';
- }
- $self->_error( "'$value' for '$key' is not a boolean value." );
- return 0;
- }
-
- my %v1_licenses = (
- 'perl' => 'http://dev.perl.org/licenses/',
- 'gpl' => 'http://www.opensource.org/licenses/gpl-license.php',
- 'apache' => 'http://apache.org/licenses/LICENSE-2.0',
- 'artistic' => 'http://opensource.org/licenses/artistic-license.php',
- 'artistic_2' => 'http://opensource.org/licenses/artistic-license-2.0.php',
- 'lgpl' => 'http://www.opensource.org/licenses/lgpl-license.phpt',
- 'bsd' => 'http://www.opensource.org/licenses/bsd-license.php',
- 'gpl' => 'http://www.opensource.org/licenses/gpl-license.php',
- 'mit' => 'http://opensource.org/licenses/mit-license.php',
- 'mozilla' => 'http://opensource.org/licenses/mozilla1.1.php',
- 'open_source' => undef,
- 'unrestricted' => undef,
- 'restrictive' => undef,
- 'unknown' => undef,
- );
-
- my %v2_licenses = map { $_ => 1 } qw(
- agpl_3
- apache_1_1
- apache_2_0
- artistic_1
- artistic_2
- bsd
- freebsd
- gfdl_1_2
- gfdl_1_3
- gpl_1
- gpl_2
- gpl_3
- lgpl_2_1
- lgpl_3_0
- mit
- mozilla_1_0
- mozilla_1_1
- openssl
- perl_5
- qpl_1_0
- ssleay
- sun
- zlib
- open_source
- restricted
- unrestricted
- unknown
- );
-
- sub license {
- my ($self,$key,$value) = @_;
- my $licenses = $self->{spec} < 2 ? \%v1_licenses : \%v2_licenses;
- if(defined $value) {
- return 1 if($value && exists $licenses->{$value});
- } else {
- $value = '<undef>';
- }
- $self->_error( "License '$value' is invalid" );
- return 0;
- }
-
- sub custom_1 {
- my ($self,$key) = @_;
- if(defined $key) {
- # a valid user defined key should be alphabetic
- # and contain at least one capital case letter.
- return 1 if($key && $key =~ /^[_a-z]+$/i && $key =~ /[A-Z]/);
- } else {
- $key = '<undef>';
- }
- $self->_error( "Custom resource '$key' must be in CamelCase." );
- return 0;
- }
-
- sub custom_2 {
- my ($self,$key) = @_;
- if(defined $key) {
- return 1 if($key && $key =~ /^x_/i); # user defined
- } else {
- $key = '<undef>';
- }
- $self->_error( "Custom key '$key' must begin with 'x_' or 'X_'." );
- return 0;
- }
-
- sub identifier {
- my ($self,$key) = @_;
- if(defined $key) {
- return 1 if($key && $key =~ /^([a-z][_a-z]+)$/i); # spec 2.0 defined
- } else {
- $key = '<undef>';
- }
- $self->_error( "Key '$key' is not a legal identifier." );
- return 0;
- }
-
- sub module {
- my ($self,$key) = @_;
- if(defined $key) {
- return 1 if($key && $key =~ /^[A-Za-z0-9_]+(::[A-Za-z0-9_]+)*$/);
- } else {
- $key = '<undef>';
- }
- $self->_error( "Key '$key' is not a legal module name." );
- return 0;
- }
-
- my @valid_phases = qw/ configure build test runtime develop /;
- sub phase {
- my ($self,$key) = @_;
- if(defined $key) {
- return 1 if( length $key && grep { $key eq $_ } @valid_phases );
- return 1 if $key =~ /x_/i;
- } else {
- $key = '<undef>';
- }
- $self->_error( "Key '$key' is not a legal phase." );
- return 0;
- }
-
- my @valid_relations = qw/ requires recommends suggests conflicts /;
- sub relation {
- my ($self,$key) = @_;
- if(defined $key) {
- return 1 if( length $key && grep { $key eq $_ } @valid_relations );
- return 1 if $key =~ /x_/i;
- } else {
- $key = '<undef>';
- }
- $self->_error( "Key '$key' is not a legal prereq relationship." );
- return 0;
- }
-
- sub _error {
- my $self = shift;
- my $mess = shift;
-
- $mess .= ' ('.join(' -> ',@{$self->{stack}}).')' if($self->{stack});
- $mess .= " [Validation: $self->{spec}]";
-
- push @{$self->{errors}}, $mess;
- }
-
- 1;
-
-
-
-
- __END__
-
-
-
+ use 5.006;use strict;use warnings;package CPAN::Meta::Validator;our$VERSION='2.132510';my%known_specs=('1.4'=>'http://module-build.sourceforge.net/META-spec-v1.4.html','1.3'=>'http://module-build.sourceforge.net/META-spec-v1.3.html','1.2'=>'http://module-build.sourceforge.net/META-spec-v1.2.html','1.1'=>'http://module-build.sourceforge.net/META-spec-v1.1.html','1.0'=>'http://module-build.sourceforge.net/META-spec-v1.0.html');my%known_urls=map {$known_specs{$_}=>$_}keys%known_specs;my$module_map1={'map'=>{':key'=>{name=>\&module,value=>\&exversion }}};my$module_map2={'map'=>{':key'=>{name=>\&module,value=>\&version }}};my$no_index_2={'map'=>{file=>{list=>{value=>\&string }},directory=>{list=>{value=>\&string }},'package'=>{list=>{value=>\&string }},namespace=>{list=>{value=>\&string }},':key'=>{name=>\&custom_2,value=>\&anything },}};my$no_index_1_3={'map'=>{file=>{list=>{value=>\&string }},directory=>{list=>{value=>\&string }},'package'=>{list=>{value=>\&string }},namespace=>{list=>{value=>\&string }},':key'=>{name=>\&string,value=>\&anything },}};my$no_index_1_2={'map'=>{file=>{list=>{value=>\&string }},dir=>{list=>{value=>\&string }},'package'=>{list=>{value=>\&string }},namespace=>{list=>{value=>\&string }},':key'=>{name=>\&string,value=>\&anything },}};my$no_index_1_1={'map'=>{':key'=>{name=>\&string,list=>{value=>\&string }},}};my$prereq_map={map=>{':key'=>{name=>\&phase,'map'=>{':key'=>{name=>\&relation,%$module_map1,},},}},};my%definitions=('2'=>{'abstract'=>{mandatory=>1,value=>\&string },'author'=>{mandatory=>1,lazylist=>{value=>\&string }},'dynamic_config'=>{mandatory=>1,value=>\&boolean },'generated_by'=>{mandatory=>1,value=>\&string },'license'=>{mandatory=>1,lazylist=>{value=>\&license }},'meta-spec'=>{mandatory=>1,'map'=>{version=>{mandatory=>1,value=>\&version},url=>{value=>\&url },':key'=>{name=>\&custom_2,value=>\&anything },}},'name'=>{mandatory=>1,value=>\&string },'release_status'=>{mandatory=>1,value=>\&release_status },'version'=>{mandatory=>1,value=>\&version },'description'=>{value=>\&string },'keywords'=>{lazylist=>{value=>\&string }},'no_index'=>$no_index_2,'optional_features'=>{'map'=>{':key'=>{name=>\&string,'map'=>{description=>{value=>\&string },prereqs=>$prereq_map,':key'=>{name=>\&custom_2,value=>\&anything },}}}},'prereqs'=>$prereq_map,'provides'=>{'map'=>{':key'=>{name=>\&module,'map'=>{file=>{mandatory=>1,value=>\&file },version=>{value=>\&version },':key'=>{name=>\&custom_2,value=>\&anything },}}}},'resources'=>{'map'=>{license=>{lazylist=>{value=>\&url }},homepage=>{value=>\&url },bugtracker=>{'map'=>{web=>{value=>\&url },mailto=>{value=>\&string},':key'=>{name=>\&custom_2,value=>\&anything },}},repository=>{'map'=>{web=>{value=>\&url },url=>{value=>\&url },type=>{value=>\&string },':key'=>{name=>\&custom_2,value=>\&anything },}},':key'=>{value=>\&string,name=>\&custom_2 },}},':key'=>{name=>\&custom_2,value=>\&anything },},'1.4'=>{'meta-spec'=>{mandatory=>1,'map'=>{version=>{mandatory=>1,value=>\&version},url=>{mandatory=>1,value=>\&urlspec },':key'=>{name=>\&string,value=>\&anything },},},'name'=>{mandatory=>1,value=>\&string },'version'=>{mandatory=>1,value=>\&version },'abstract'=>{mandatory=>1,value=>\&string },'author'=>{mandatory=>1,list=>{value=>\&string }},'license'=>{mandatory=>1,value=>\&license },'generated_by'=>{mandatory=>1,value=>\&string },'distribution_type'=>{value=>\&string },'dynamic_config'=>{value=>\&boolean },'requires'=>$module_map1,'recommends'=>$module_map1,'build_requires'=>$module_map1,'configure_requires'=>$module_map1,'conflicts'=>$module_map2,'optional_features'=>{'map'=>{':key'=>{name=>\&string,'map'=>{description=>{value=>\&string },requires=>$module_map1,recommends=>$module_map1,build_requires=>$module_map1,conflicts=>$module_map2,':key'=>{name=>\&string,value=>\&anything },}}}},'provides'=>{'map'=>{':key'=>{name=>\&module,'map'=>{file=>{mandatory=>1,value=>\&file },version=>{value=>\&version },':key'=>{name=>\&string,value=>\&anything },}}}},'no_index'=>$no_index_1_3,'private'=>$no_index_1_3,'keywords'=>{list=>{value=>\&string }},'resources'=>{'map'=>{license=>{value=>\&url },homepage=>{value=>\&url },bugtracker=>{value=>\&url },repository=>{value=>\&url },':key'=>{value=>\&string,name=>\&custom_1 },}},':key'=>{name=>\&string,value=>\&anything },},'1.3'=>{'meta-spec'=>{mandatory=>1,'map'=>{version=>{mandatory=>1,value=>\&version},url=>{mandatory=>1,value=>\&urlspec },':key'=>{name=>\&string,value=>\&anything },},},'name'=>{mandatory=>1,value=>\&string },'version'=>{mandatory=>1,value=>\&version },'abstract'=>{mandatory=>1,value=>\&string },'author'=>{mandatory=>1,list=>{value=>\&string }},'license'=>{mandatory=>1,value=>\&license },'generated_by'=>{mandatory=>1,value=>\&string },'distribution_type'=>{value=>\&string },'dynamic_config'=>{value=>\&boolean },'requires'=>$module_map1,'recommends'=>$module_map1,'build_requires'=>$module_map1,'conflicts'=>$module_map2,'optional_features'=>{'map'=>{':key'=>{name=>\&string,'map'=>{description=>{value=>\&string },requires=>$module_map1,recommends=>$module_map1,build_requires=>$module_map1,conflicts=>$module_map2,':key'=>{name=>\&string,value=>\&anything },}}}},'provides'=>{'map'=>{':key'=>{name=>\&module,'map'=>{file=>{mandatory=>1,value=>\&file },version=>{value=>\&version },':key'=>{name=>\&string,value=>\&anything },}}}},'no_index'=>$no_index_1_3,'private'=>$no_index_1_3,'keywords'=>{list=>{value=>\&string }},'resources'=>{'map'=>{license=>{value=>\&url },homepage=>{value=>\&url },bugtracker=>{value=>\&url },repository=>{value=>\&url },':key'=>{value=>\&string,name=>\&custom_1 },}},':key'=>{name=>\&string,value=>\&anything },},'1.2'=>{'meta-spec'=>{mandatory=>1,'map'=>{version=>{mandatory=>1,value=>\&version},url=>{mandatory=>1,value=>\&urlspec },':key'=>{name=>\&string,value=>\&anything },},},'name'=>{mandatory=>1,value=>\&string },'version'=>{mandatory=>1,value=>\&version },'license'=>{mandatory=>1,value=>\&license },'generated_by'=>{mandatory=>1,value=>\&string },'author'=>{mandatory=>1,list=>{value=>\&string }},'abstract'=>{mandatory=>1,value=>\&string },'distribution_type'=>{value=>\&string },'dynamic_config'=>{value=>\&boolean },'keywords'=>{list=>{value=>\&string }},'private'=>$no_index_1_2,'$no_index'=>$no_index_1_2,'requires'=>$module_map1,'recommends'=>$module_map1,'build_requires'=>$module_map1,'conflicts'=>$module_map2,'optional_features'=>{'map'=>{':key'=>{name=>\&string,'map'=>{description=>{value=>\&string },requires=>$module_map1,recommends=>$module_map1,build_requires=>$module_map1,conflicts=>$module_map2,':key'=>{name=>\&string,value=>\&anything },}}}},'provides'=>{'map'=>{':key'=>{name=>\&module,'map'=>{file=>{mandatory=>1,value=>\&file },version=>{value=>\&version },':key'=>{name=>\&string,value=>\&anything },}}}},'resources'=>{'map'=>{license=>{value=>\&url },homepage=>{value=>\&url },bugtracker=>{value=>\&url },repository=>{value=>\&url },':key'=>{value=>\&string,name=>\&custom_1 },}},':key'=>{name=>\&string,value=>\&anything },},'1.1'=>{'name'=>{value=>\&string },'version'=>{mandatory=>1,value=>\&version },'license'=>{value=>\&license },'generated_by'=>{value=>\&string },'license_uri'=>{value=>\&url },'distribution_type'=>{value=>\&string },'dynamic_config'=>{value=>\&boolean },'private'=>$no_index_1_1,'requires'=>$module_map1,'recommends'=>$module_map1,'build_requires'=>$module_map1,'conflicts'=>$module_map2,':key'=>{name=>\&string,value=>\&anything },},'1.0'=>{'name'=>{value=>\&string },'version'=>{mandatory=>1,value=>\&version },'license'=>{value=>\&license },'generated_by'=>{value=>\&string },'license_uri'=>{value=>\&url },'distribution_type'=>{value=>\&string },'dynamic_config'=>{value=>\&boolean },'requires'=>$module_map1,'recommends'=>$module_map1,'build_requires'=>$module_map1,'conflicts'=>$module_map2,':key'=>{name=>\&string,value=>\&anything },},);sub new {my ($class,$data)=@_;my$self={'data'=>$data,'spec'=>$data->{'meta-spec'}{'version'}|| "1.0",'errors'=>undef,};return bless$self,$class}sub is_valid {my$self=shift;my$data=$self->{data};my$spec_version=$self->{spec};$self->check_map($definitions{$spec_version},$data);return!$self->errors}sub errors {my$self=shift;return ()unless(defined$self->{errors});return @{$self->{errors}}}my$spec_error="Missing validation action in specification. " ."Must be one of 'map', 'list', 'lazylist', or 'value'";sub check_map {my ($self,$spec,$data)=@_;if(ref($spec)ne 'HASH'){$self->_error("Unknown META specification, cannot validate.");return}if(ref($data)ne 'HASH'){$self->_error("Expected a map structure from string or file.");return}for my$key (keys %$spec){next unless($spec->{$key}->{mandatory});next if(defined$data->{$key});push @{$self->{stack}},$key;$self->_error("Missing mandatory field, '$key'");pop @{$self->{stack}}}for my$key (keys %$data){push @{$self->{stack}},$key;if($spec->{$key}){if($spec->{$key}{value}){$spec->{$key}{value}->($self,$key,$data->{$key})}elsif($spec->{$key}{'map'}){$self->check_map($spec->{$key}{'map'},$data->{$key})}elsif($spec->{$key}{'list'}){$self->check_list($spec->{$key}{'list'},$data->{$key})}elsif($spec->{$key}{'lazylist'}){$self->check_lazylist($spec->{$key}{'lazylist'},$data->{$key})}else {$self->_error("$spec_error for '$key'")}}elsif ($spec->{':key'}){$spec->{':key'}{name}->($self,$key,$key);if($spec->{':key'}{value}){$spec->{':key'}{value}->($self,$key,$data->{$key})}elsif($spec->{':key'}{'map'}){$self->check_map($spec->{':key'}{'map'},$data->{$key})}elsif($spec->{':key'}{'list'}){$self->check_list($spec->{':key'}{'list'},$data->{$key})}elsif($spec->{':key'}{'lazylist'}){$self->check_lazylist($spec->{':key'}{'lazylist'},$data->{$key})}else {$self->_error("$spec_error for ':key'")}}else {$self->_error("Unknown key, '$key', found in map structure")}pop @{$self->{stack}}}}sub check_lazylist {my ($self,$spec,$data)=@_;if (defined$data &&!ref($data)){$data=[$data ]}$self->check_list($spec,$data)}sub check_list {my ($self,$spec,$data)=@_;if(ref($data)ne 'ARRAY'){$self->_error("Expected a list structure");return}if(defined$spec->{mandatory}){if(!defined$data->[0]){$self->_error("Missing entries from mandatory list")}}for my$value (@$data){push @{$self->{stack}},$value || "<undef>";if(defined$spec->{value}){$spec->{value}->($self,'list',$value)}elsif(defined$spec->{'map'}){$self->check_map($spec->{'map'},$value)}elsif(defined$spec->{'list'}){$self->check_list($spec->{'list'},$value)}elsif(defined$spec->{'lazylist'}){$self->check_lazylist($spec->{'lazylist'},$value)}elsif ($spec->{':key'}){$self->check_map($spec,$value)}else {$self->_error("$spec_error associated with '$self->{stack}[-2]'")}pop @{$self->{stack}}}}sub header {my ($self,$key,$value)=@_;if(defined$value){return 1 if($value && $value =~ /^--- #YAML:1.0/)}$self->_error("file does not have a valid YAML header.");return 0}sub release_status {my ($self,$key,$value)=@_;if(defined$value){my$version=$self->{data}{version}|| '';if ($version =~ /_/){return 1 if ($value =~ /\A(?:testing|unstable)\z/);$self->_error("'$value' for '$key' is invalid for version '$version'")}else {return 1 if ($value =~ /\A(?:stable|testing|unstable)\z/);$self->_error("'$value' for '$key' is invalid")}}else {$self->_error("'$key' is not defined")}return 0}sub _uri_split {return $_[0]=~ m,(?:([^:/?#]+):)?(?://([^/?#]*))?([^?#]*)(?:\?([^#]*))?(?:#(.*))?,}sub url {my ($self,$key,$value)=@_;if(defined$value){my ($scheme,$auth,$path,$query,$frag)=_uri_split($value);unless (defined$scheme && length$scheme){$self->_error("'$value' for '$key' does not have a URL scheme");return 0}unless (defined$auth && length$auth){$self->_error("'$value' for '$key' does not have a URL authority");return 0}return 1}$value ||='';$self->_error("'$value' for '$key' is not a valid URL.");return 0}sub urlspec {my ($self,$key,$value)=@_;if(defined$value){return 1 if($value && $known_specs{$self->{spec}}eq $value);if($value && $known_urls{$value}){$self->_error('META specification URL does not match version');return 0}}$self->_error('Unknown META specification');return 0}sub anything {return 1}sub string {my ($self,$key,$value)=@_;if(defined$value){return 1 if($value || $value =~ /^0$/)}$self->_error("value is an undefined string");return 0}sub string_or_undef {my ($self,$key,$value)=@_;return 1 unless(defined$value);return 1 if($value || $value =~ /^0$/);$self->_error("No string defined for '$key'");return 0}sub file {my ($self,$key,$value)=@_;return 1 if(defined$value);$self->_error("No file defined for '$key'");return 0}sub exversion {my ($self,$key,$value)=@_;if(defined$value && ($value || $value =~ /0/)){my$pass=1;for(split(",",$value)){$self->version($key,$_)or ($pass=0)}return$pass}$value='<undef>' unless(defined$value);$self->_error("'$value' for '$key' is not a valid version.");return 0}sub version {my ($self,$key,$value)=@_;if(defined$value){return 0 unless($value || $value =~ /0/);return 1 if($value =~ /^\s*((<|<=|>=|>|!=|==)\s*)?v?\d+((\.\d+((_|\.)\d+)?)?)/)}else {$value='<undef>'}$self->_error("'$value' for '$key' is not a valid version.");return 0}sub boolean {my ($self,$key,$value)=@_;if(defined$value){return 1 if($value =~ /^(0|1|true|false)$/)}else {$value='<undef>'}$self->_error("'$value' for '$key' is not a boolean value.");return 0}my%v1_licenses=('perl'=>'http://dev.perl.org/licenses/','gpl'=>'http://www.opensource.org/licenses/gpl-license.php','apache'=>'http://apache.org/licenses/LICENSE-2.0','artistic'=>'http://opensource.org/licenses/artistic-license.php','artistic_2'=>'http://opensource.org/licenses/artistic-license-2.0.php','lgpl'=>'http://www.opensource.org/licenses/lgpl-license.php','bsd'=>'http://www.opensource.org/licenses/bsd-license.php','gpl'=>'http://www.opensource.org/licenses/gpl-license.php','mit'=>'http://opensource.org/licenses/mit-license.php','mozilla'=>'http://opensource.org/licenses/mozilla1.1.php','open_source'=>undef,'unrestricted'=>undef,'restrictive'=>undef,'unknown'=>undef,);my%v2_licenses=map {$_=>1}qw(agpl_3 apache_1_1 apache_2_0 artistic_1 artistic_2 bsd freebsd gfdl_1_2 gfdl_1_3 gpl_1 gpl_2 gpl_3 lgpl_2_1 lgpl_3_0 mit mozilla_1_0 mozilla_1_1 openssl perl_5 qpl_1_0 ssleay sun zlib open_source restricted unrestricted unknown);sub license {my ($self,$key,$value)=@_;my$licenses=$self->{spec}< 2 ? \%v1_licenses : \%v2_licenses;if(defined$value){return 1 if($value && exists$licenses->{$value})}else {$value='<undef>'}$self->_error("License '$value' is invalid");return 0}sub custom_1 {my ($self,$key)=@_;if(defined$key){return 1 if($key && $key =~ /^[_a-z]+$/i && $key =~ /[A-Z]/)}else {$key='<undef>'}$self->_error("Custom resource '$key' must be in CamelCase.");return 0}sub custom_2 {my ($self,$key)=@_;if(defined$key){return 1 if($key && $key =~ /^x_/i)}else {$key='<undef>'}$self->_error("Custom key '$key' must begin with 'x_' or 'X_'.");return 0}sub identifier {my ($self,$key)=@_;if(defined$key){return 1 if($key && $key =~ /^([a-z][_a-z]+)$/i)}else {$key='<undef>'}$self->_error("Key '$key' is not a legal identifier.");return 0}sub module {my ($self,$key)=@_;if(defined$key){return 1 if($key && $key =~ /^[A-Za-z0-9_]+(::[A-Za-z0-9_]+)*$/)}else {$key='<undef>'}$self->_error("Key '$key' is not a legal module name.");return 0}my@valid_phases=qw/configure build test runtime develop/;sub phase {my ($self,$key)=@_;if(defined$key){return 1 if(length$key && grep {$key eq $_}@valid_phases);return 1 if$key =~ /x_/i}else {$key='<undef>'}$self->_error("Key '$key' is not a legal phase.");return 0}my@valid_relations=qw/requires recommends suggests conflicts/;sub relation {my ($self,$key)=@_;if(defined$key){return 1 if(length$key && grep {$key eq $_}@valid_relations);return 1 if$key =~ /x_/i}else {$key='<undef>'}$self->_error("Key '$key' is not a legal prereq relationship.");return 0}sub _error {my$self=shift;my$mess=shift;$mess .= ' ('.join(' -> ',@{$self->{stack}}).')' if($self->{stack});$mess .= " [Validation: $self->{spec}]";push @{$self->{errors}},$mess}1;
CPAN_META_VALIDATOR
$fatpacked{"CPAN/Meta/YAML.pm"} = <<'CPAN_META_YAML';
- package CPAN::Meta::YAML;
- BEGIN {
- $CPAN::Meta::YAML::VERSION = '0.003';
- }
-
- use strict;
-
- # UTF Support?
- sub HAVE_UTF8 () { $] >= 5.007003 }
- BEGIN {
- if ( HAVE_UTF8 ) {
- # The string eval helps hide this from Test::MinimumVersion
- eval "require utf8;";
- die "Failed to load UTF-8 support" if $@;
- }
-
- # Class structure
- require 5.004;
- require Exporter;
- require Carp;
- @CPAN::Meta::YAML::ISA = qw{ Exporter };
- @CPAN::Meta::YAML::EXPORT = qw{ Load Dump };
- @CPAN::Meta::YAML::EXPORT_OK = qw{ LoadFile DumpFile freeze thaw };
-
- # Error storage
- $CPAN::Meta::YAML::errstr = '';
- }
-
- # The character class of all characters we need to escape
- # NOTE: Inlined, since it's only used once
- # my $RE_ESCAPE = '[\\x00-\\x08\\x0b-\\x0d\\x0e-\\x1f\"\n]';
-
- # Printed form of the unprintable characters in the lowest range
- # of ASCII characters, listed by ASCII ordinal position.
- my @UNPRINTABLE = qw(
- z x01 x02 x03 x04 x05 x06 a
- x08 t n v f r x0e x0f
- x10 x11 x12 x13 x14 x15 x16 x17
- x18 x19 x1a e x1c x1d x1e x1f
- );
-
- # Printable characters for escapes
- my %UNESCAPES = (
- z => "\x00", a => "\x07", t => "\x09",
- n => "\x0a", v => "\x0b", f => "\x0c",
- r => "\x0d", e => "\x1b", '\\' => '\\',
- );
-
- # Special magic boolean words
- my %QUOTE = map { $_ => 1 } qw{
- null Null NULL
- y Y yes Yes YES n N no No NO
- true True TRUE false False FALSE
- on On ON off Off OFF
- };
-
-
-
-
-
- #####################################################################
- # Implementation
-
- # Create an empty CPAN::Meta::YAML object
- sub new {
- my $class = shift;
- bless [ @_ ], $class;
- }
-
- # Create an object from a file
- sub read {
- my $class = ref $_[0] ? ref shift : shift;
-
- # Check the file
- my $file = shift or return $class->_error( 'You did not specify a file name' );
- return $class->_error( "File '$file' does not exist" ) unless -e $file;
- return $class->_error( "'$file' is a directory, not a file" ) unless -f _;
- return $class->_error( "Insufficient permissions to read '$file'" ) unless -r _;
-
- # Slurp in the file
- local $/ = undef;
- local *CFG;
- unless ( open(CFG, $file) ) {
- return $class->_error("Failed to open file '$file': $!");
- }
- my $contents = <CFG>;
- unless ( close(CFG) ) {
- return $class->_error("Failed to close file '$file': $!");
- }
-
- $class->read_string( $contents );
- }
-
- # Create an object from a string
- sub read_string {
- my $class = ref $_[0] ? ref shift : shift;
- my $self = bless [], $class;
- my $string = $_[0];
- eval {
- unless ( defined $string ) {
- die \"Did not provide a string to load";
- }
-
- # Byte order marks
- # NOTE: Keeping this here to educate maintainers
- # my %BOM = (
- # "\357\273\277" => 'UTF-8',
- # "\376\377" => 'UTF-16BE',
- # "\377\376" => 'UTF-16LE',
- # "\377\376\0\0" => 'UTF-32LE'
- # "\0\0\376\377" => 'UTF-32BE',
- # );
- if ( $string =~ /^(?:\376\377|\377\376|\377\376\0\0|\0\0\376\377)/ ) {
- die \"Stream has a non UTF-8 BOM";
- } else {
- # Strip UTF-8 bom if found, we'll just ignore it
- $string =~ s/^\357\273\277//;
- }
-
- # Try to decode as utf8
- utf8::decode($string) if HAVE_UTF8;
-
- # Check for some special cases
- return $self unless length $string;
- unless ( $string =~ /[\012\015]+\z/ ) {
- die \"Stream does not end with newline character";
- }
-
- # Split the file into lines
- my @lines = grep { ! /^\s*(?:\#.*)?\z/ }
- split /(?:\015{1,2}\012|\015|\012)/, $string;
-
- # Strip the initial YAML header
- @lines and $lines[0] =~ /^\%YAML[: ][\d\.]+.*\z/ and shift @lines;
-
- # A nibbling parser
- while ( @lines ) {
- # Do we have a document header?
- if ( $lines[0] =~ /^---\s*(?:(.+)\s*)?\z/ ) {
- # Handle scalar documents
- shift @lines;
- if ( defined $1 and $1 !~ /^(?:\#.+|\%YAML[: ][\d\.]+)\z/ ) {
- push @$self, $self->_read_scalar( "$1", [ undef ], \@lines );
- next;
- }
- }
-
- if ( ! @lines or $lines[0] =~ /^(?:---|\.\.\.)/ ) {
- # A naked document
- push @$self, undef;
- while ( @lines and $lines[0] !~ /^---/ ) {
- shift @lines;
- }
-
- } elsif ( $lines[0] =~ /^\s*\-/ ) {
- # An array at the root
- my $document = [ ];
- push @$self, $document;
- $self->_read_array( $document, [ 0 ], \@lines );
-
- } elsif ( $lines[0] =~ /^(\s*)\S/ ) {
- # A hash at the root
- my $document = { };
- push @$self, $document;
- $self->_read_hash( $document, [ length($1) ], \@lines );
-
- } else {
- die \"CPAN::Meta::YAML failed to classify the line '$lines[0]'";
- }
- }
- };
- if ( ref $@ eq 'SCALAR' ) {
- return $self->_error(${$@});
- } elsif ( $@ ) {
- require Carp;
- Carp::croak($@);
- }
-
- return $self;
- }
-
- # Deparse a scalar string to the actual scalar
- sub _read_scalar {
- my ($self, $string, $indent, $lines) = @_;
-
- # Trim trailing whitespace
- $string =~ s/\s*\z//;
-
- # Explitic null/undef
- return undef if $string eq '~';
-
- # Single quote
- if ( $string =~ /^\'(.*?)\'(?:\s+\#.*)?\z/ ) {
- return '' unless defined $1;
- $string = $1;
- $string =~ s/\'\'/\'/g;
- return $string;
- }
-
- # Double quote.
- # The commented out form is simpler, but overloaded the Perl regex
- # engine due to recursion and backtracking problems on strings
- # larger than 32,000ish characters. Keep it for reference purposes.
- # if ( $string =~ /^\"((?:\\.|[^\"])*)\"\z/ ) {
- if ( $string =~ /^\"([^\\"]*(?:\\.[^\\"]*)*)\"(?:\s+\#.*)?\z/ ) {
- # Reusing the variable is a little ugly,
- # but avoids a new variable and a string copy.
- $string = $1;
- $string =~ s/\\"/"/g;
- $string =~ s/\\([never\\fartz]|x([0-9a-fA-F]{2}))/(length($1)>1)?pack("H2",$2):$UNESCAPES{$1}/gex;
- return $string;
- }
-
- # Special cases
- if ( $string =~ /^[\'\"!&]/ ) {
- die \"CPAN::Meta::YAML does not support a feature in line '$string'";
- }
- return {} if $string =~ /^{}(?:\s+\#.*)?\z/;
- return [] if $string =~ /^\[\](?:\s+\#.*)?\z/;
-
- # Regular unquoted string
- if ( $string !~ /^[>|]/ ) {
- if (
- $string =~ /^(?:-(?:\s|$)|[\@\%\`])/
- or
- $string =~ /:(?:\s|$)/
- ) {
- die \"CPAN::Meta::YAML found illegal characters in plain scalar: '$string'";
- }
- $string =~ s/\s+#.*\z//;
- return $string;
- }
-
- # Error
- die \"CPAN::Meta::YAML failed to find multi-line scalar content" unless @$lines;
-
- # Check the indent depth
- $lines->[0] =~ /^(\s*)/;
- $indent->[-1] = length("$1");
- if ( defined $indent->[-2] and $indent->[-1] <= $indent->[-2] ) {
- die \"CPAN::Meta::YAML found bad indenting in line '$lines->[0]'";
- }
-
- # Pull the lines
- my @multiline = ();
- while ( @$lines ) {
- $lines->[0] =~ /^(\s*)/;
- last unless length($1) >= $indent->[-1];
- push @multiline, substr(shift(@$lines), length($1));
- }
-
- my $j = (substr($string, 0, 1) eq '>') ? ' ' : "\n";
- my $t = (substr($string, 1, 1) eq '-') ? '' : "\n";
- return join( $j, @multiline ) . $t;
- }
-
- # Parse an array
- sub _read_array {
- my ($self, $array, $indent, $lines) = @_;
-
- while ( @$lines ) {
- # Check for a new document
- if ( $lines->[0] =~ /^(?:---|\.\.\.)/ ) {
- while ( @$lines and $lines->[0] !~ /^---/ ) {
- shift @$lines;
- }
- return 1;
- }
-
- # Check the indent level
- $lines->[0] =~ /^(\s*)/;
- if ( length($1) < $indent->[-1] ) {
- return 1;
- } elsif ( length($1) > $indent->[-1] ) {
- die \"CPAN::Meta::YAML found bad indenting in line '$lines->[0]'";
- }
-
- if ( $lines->[0] =~ /^(\s*\-\s+)[^\'\"]\S*\s*:(?:\s+|$)/ ) {
- # Inline nested hash
- my $indent2 = length("$1");
- $lines->[0] =~ s/-/ /;
- push @$array, { };
- $self->_read_hash( $array->[-1], [ @$indent, $indent2 ], $lines );
-
- } elsif ( $lines->[0] =~ /^\s*\-(\s*)(.+?)\s*\z/ ) {
- # Array entry with a value
- shift @$lines;
- push @$array, $self->_read_scalar( "$2", [ @$indent, undef ], $lines );
-
- } elsif ( $lines->[0] =~ /^\s*\-\s*\z/ ) {
- shift @$lines;
- unless ( @$lines ) {
- push @$array, undef;
- return 1;
- }
- if ( $lines->[0] =~ /^(\s*)\-/ ) {
- my $indent2 = length("$1");
- if ( $indent->[-1] == $indent2 ) {
- # Null array entry
- push @$array, undef;
- } else {
- # Naked indenter
- push @$array, [ ];
- $self->_read_array( $array->[-1], [ @$indent, $indent2 ], $lines );
- }
-
- } elsif ( $lines->[0] =~ /^(\s*)\S/ ) {
- push @$array, { };
- $self->_read_hash( $array->[-1], [ @$indent, length("$1") ], $lines );
-
- } else {
- die \"CPAN::Meta::YAML failed to classify line '$lines->[0]'";
- }
-
- } elsif ( defined $indent->[-2] and $indent->[-1] == $indent->[-2] ) {
- # This is probably a structure like the following...
- # ---
- # foo:
- # - list
- # bar: value
- #
- # ... so lets return and let the hash parser handle it
- return 1;
-
- } else {
- die \"CPAN::Meta::YAML failed to classify line '$lines->[0]'";
- }
- }
-
- return 1;
- }
-
- # Parse an array
- sub _read_hash {
- my ($self, $hash, $indent, $lines) = @_;
-
- while ( @$lines ) {
- # Check for a new document
- if ( $lines->[0] =~ /^(?:---|\.\.\.)/ ) {
- while ( @$lines and $lines->[0] !~ /^---/ ) {
- shift @$lines;
- }
- return 1;
- }
-
- # Check the indent level
- $lines->[0] =~ /^(\s*)/;
- if ( length($1) < $indent->[-1] ) {
- return 1;
- } elsif ( length($1) > $indent->[-1] ) {
- die \"CPAN::Meta::YAML found bad indenting in line '$lines->[0]'";
- }
-
- # Get the key
- unless ( $lines->[0] =~ s/^\s*([^\'\" ][^\n]*?)\s*:(\s+(?:\#.*)?|$)// ) {
- if ( $lines->[0] =~ /^\s*[?\'\"]/ ) {
- die \"CPAN::Meta::YAML does not support a feature in line '$lines->[0]'";
- }
- die \"CPAN::Meta::YAML failed to classify line '$lines->[0]'";
- }
- my $key = $1;
-
- # Do we have a value?
- if ( length $lines->[0] ) {
- # Yes
- $hash->{$key} = $self->_read_scalar( shift(@$lines), [ @$indent, undef ], $lines );
- } else {
- # An indent
- shift @$lines;
- unless ( @$lines ) {
- $hash->{$key} = undef;
- return 1;
- }
- if ( $lines->[0] =~ /^(\s*)-/ ) {
- $hash->{$key} = [];
- $self->_read_array( $hash->{$key}, [ @$indent, length($1) ], $lines );
- } elsif ( $lines->[0] =~ /^(\s*)./ ) {
- my $indent2 = length("$1");
- if ( $indent->[-1] >= $indent2 ) {
- # Null hash entry
- $hash->{$key} = undef;
- } else {
- $hash->{$key} = {};
- $self->_read_hash( $hash->{$key}, [ @$indent, length($1) ], $lines );
- }
- }
- }
- }
-
- return 1;
- }
-
- # Save an object to a file
- sub write {
- my $self = shift;
- my $file = shift or return $self->_error('No file name provided');
-
- # Write it to the file
- open( CFG, '>' . $file ) or return $self->_error(
- "Failed to open file '$file' for writing: $!"
- );
- print CFG $self->write_string;
- close CFG;
-
- return 1;
- }
-
- # Save an object to a string
- sub write_string {
- my $self = shift;
- return '' unless @$self;
-
- # Iterate over the documents
- my $indent = 0;
- my @lines = ();
- foreach my $cursor ( @$self ) {
- push @lines, '---';
-
- # An empty document
- if ( ! defined $cursor ) {
- # Do nothing
-
- # A scalar document
- } elsif ( ! ref $cursor ) {
- $lines[-1] .= ' ' . $self->_write_scalar( $cursor, $indent );
-
- # A list at the root
- } elsif ( ref $cursor eq 'ARRAY' ) {
- unless ( @$cursor ) {
- $lines[-1] .= ' []';
- next;
- }
- push @lines, $self->_write_array( $cursor, $indent, {} );
-
- # A hash at the root
- } elsif ( ref $cursor eq 'HASH' ) {
- unless ( %$cursor ) {
- $lines[-1] .= ' {}';
- next;
- }
- push @lines, $self->_write_hash( $cursor, $indent, {} );
-
- } else {
- Carp::croak("Cannot serialize " . ref($cursor));
- }
- }
-
- join '', map { "$_\n" } @lines;
- }
-
- sub _write_scalar {
- my $string = $_[1];
- return '~' unless defined $string;
- return "''" unless length $string;
- if ( $string =~ /[\x00-\x08\x0b-\x0d\x0e-\x1f\"\'\n]/ ) {
- $string =~ s/\\/\\\\/g;
- $string =~ s/"/\\"/g;
- $string =~ s/\n/\\n/g;
- $string =~ s/([\x00-\x1f])/\\$UNPRINTABLE[ord($1)]/g;
- return qq|"$string"|;
- }
- if ( $string =~ /(?:^\W|\s)/ or $QUOTE{$string} ) {
- return "'$string'";
- }
- return $string;
- }
-
- sub _write_array {
- my ($self, $array, $indent, $seen) = @_;
- if ( $seen->{refaddr($array)}++ ) {
- die "CPAN::Meta::YAML does not support circular references";
- }
- my @lines = ();
- foreach my $el ( @$array ) {
- my $line = (' ' x $indent) . '-';
- my $type = ref $el;
- if ( ! $type ) {
- $line .= ' ' . $self->_write_scalar( $el, $indent + 1 );
- push @lines, $line;
-
- } elsif ( $type eq 'ARRAY' ) {
- if ( @$el ) {
- push @lines, $line;
- push @lines, $self->_write_array( $el, $indent + 1, $seen );
- } else {
- $line .= ' []';
- push @lines, $line;
- }
-
- } elsif ( $type eq 'HASH' ) {
- if ( keys %$el ) {
- push @lines, $line;
- push @lines, $self->_write_hash( $el, $indent + 1, $seen );
- } else {
- $line .= ' {}';
- push @lines, $line;
- }
-
- } else {
- die "CPAN::Meta::YAML does not support $type references";
- }
- }
-
- @lines;
- }
-
- sub _write_hash {
- my ($self, $hash, $indent, $seen) = @_;
- if ( $seen->{refaddr($hash)}++ ) {
- die "CPAN::Meta::YAML does not support circular references";
- }
- my @lines = ();
- foreach my $name ( sort keys %$hash ) {
- my $el = $hash->{$name};
- my $line = (' ' x $indent) . "$name:";
- my $type = ref $el;
- if ( ! $type ) {
- $line .= ' ' . $self->_write_scalar( $el, $indent + 1 );
- push @lines, $line;
-
- } elsif ( $type eq 'ARRAY' ) {
- if ( @$el ) {
- push @lines, $line;
- push @lines, $self->_write_array( $el, $indent + 1, $seen );
- } else {
- $line .= ' []';
- push @lines, $line;
- }
-
- } elsif ( $type eq 'HASH' ) {
- if ( keys %$el ) {
- push @lines, $line;
- push @lines, $self->_write_hash( $el, $indent + 1, $seen );
- } else {
- $line .= ' {}';
- push @lines, $line;
- }
-
- } else {
- die "CPAN::Meta::YAML does not support $type references";
- }
- }
-
- @lines;
- }
-
- # Set error
- sub _error {
- $CPAN::Meta::YAML::errstr = $_[1];
- undef;
- }
-
- # Retrieve error
- sub errstr {
- $CPAN::Meta::YAML::errstr;
- }
-
-
-
-
-
- #####################################################################
- # YAML Compatibility
-
- sub Dump {
- CPAN::Meta::YAML->new(@_)->write_string;
- }
-
- sub Load {
- my $self = CPAN::Meta::YAML->read_string(@_);
- unless ( $self ) {
- Carp::croak("Failed to load YAML document from string");
- }
- if ( wantarray ) {
- return @$self;
- } else {
- # To match YAML.pm, return the last document
- return $self->[-1];
- }
- }
-
- BEGIN {
- *freeze = *Dump;
- *thaw = *Load;
- }
-
- sub DumpFile {
- my $file = shift;
- CPAN::Meta::YAML->new(@_)->write($file);
- }
-
- sub LoadFile {
- my $self = CPAN::Meta::YAML->read($_[0]);
- unless ( $self ) {
- Carp::croak("Failed to load YAML document from '" . ($_[0] || '') . "'");
- }
- if ( wantarray ) {
- return @$self;
- } else {
- # Return only the last document to match YAML.pm,
- return $self->[-1];
- }
- }
-
-
-
-
-
- #####################################################################
- # Use Scalar::Util if possible, otherwise emulate it
-
- BEGIN {
- eval {
- require Scalar::Util;
- *refaddr = *Scalar::Util::refaddr;
- };
- eval <<'END_PERL' if $@;
- # Failed to load Scalar::Util
+ package CPAN::Meta::YAML;{$CPAN::Meta::YAML::VERSION='0.008'}use strict;sub HAVE_UTF8 () {$] >= 5.007003}BEGIN {if (HAVE_UTF8){eval "require utf8;";die "Failed to load UTF-8 support" if $@}require 5.004;require Exporter;require Carp;@CPAN::Meta::YAML::ISA=qw{Exporter};@CPAN::Meta::YAML::EXPORT=qw{Load Dump};@CPAN::Meta::YAML::EXPORT_OK=qw{LoadFile DumpFile freeze thaw};$CPAN::Meta::YAML::errstr=''}my@UNPRINTABLE=qw(z x01 x02 x03 x04 x05 x06 a x08 t n v f r x0e x0f x10 x11 x12 x13 x14 x15 x16 x17 x18 x19 x1a e x1c x1d x1e x1f);my%UNESCAPES=(z=>"\x00",a=>"\x07",t=>"\x09",n=>"\x0a",v=>"\x0b",f=>"\x0c",r=>"\x0d",e=>"\x1b",'\\'=>'\\',);my%QUOTE=map {$_=>1}qw{null Null NULL y Y yes Yes YES n N no No NO true True TRUE false False FALSE on On ON off Off OFF};sub new {my$class=shift;bless [@_ ],$class}sub read {my$class=ref $_[0]? ref shift : shift;my$file=shift or return$class->_error('You did not specify a file name');return$class->_error("File '$file' does not exist")unless -e $file;return$class->_error("'$file' is a directory, not a file")unless -f _;return$class->_error("Insufficient permissions to read '$file'")unless -r _;local $/=undef;local*CFG;unless (open(CFG,$file)){return$class->_error("Failed to open file '$file': $!")}my$contents=<CFG>;unless (close(CFG)){return$class->_error("Failed to close file '$file': $!")}$class->read_string($contents)}sub read_string {my$class=ref $_[0]? ref shift : shift;my$self=bless [],$class;my$string=$_[0];eval {unless (defined$string){die \"Did not provide a string to load"}if ($string =~ /^(?:\376\377|\377\376|\377\376\0\0|\0\0\376\377)/){die \"Stream has a non UTF-8 BOM"}else {$string =~ s/^\357\273\277//}utf8::decode($string)if HAVE_UTF8;return$self unless length$string;unless ($string =~ /[\012\015]+\z/){die \"Stream does not end with newline character"}my@lines=grep {!/^\s*(?:\#.*)?\z/}split /(?:\015{1,2}\012|\015|\012)/,$string;@lines and $lines[0]=~ /^\%YAML[: ][\d\.]+.*\z/ and shift@lines;while (@lines){if ($lines[0]=~ /^---\s*(?:(.+)\s*)?\z/){shift@lines;if (defined $1 and $1 !~ /^(?:\#.+|\%YAML[: ][\d\.]+)\z/){push @$self,$self->_read_scalar("$1",[undef ],\@lines);next}}if (!@lines or $lines[0]=~ /^(?:---|\.\.\.)/){push @$self,undef;while (@lines and $lines[0]!~ /^---/){shift@lines}}elsif ($lines[0]=~ /^\s*\-/){my$document=[];push @$self,$document;$self->_read_array($document,[0 ],\@lines)}elsif ($lines[0]=~ /^(\s*)\S/){my$document={};push @$self,$document;$self->_read_hash($document,[length($1)],\@lines)}else {die \"CPAN::Meta::YAML failed to classify the line '$lines[0]'"}}};if (ref $@ eq 'SCALAR'){return$self->_error(${$@})}elsif ($@){require Carp;Carp::croak($@)}return$self}sub _read_scalar {my ($self,$string,$indent,$lines)=@_;$string =~ s/\s*\z//;return undef if$string eq '~';if ($string =~ /^\'(.*?)\'(?:\s+\#.*)?\z/){return '' unless defined $1;$string=$1;$string =~ s/\'\'/\'/g;return$string}if ($string =~ /^\"([^\\"]*(?:\\.[^\\"]*)*)\"(?:\s+\#.*)?\z/){$string=$1;$string =~ s/\\"/"/g;$string =~ s/\\([never\\fartz]|x([0-9a-fA-F]{2}))/(length($1)>1)?pack("H2",$2):$UNESCAPES{$1}/gex;return$string}if ($string =~ /^[\'\"!&]/){die \"CPAN::Meta::YAML does not support a feature in line '$string'"}return {}if$string =~ /^{}(?:\s+\#.*)?\z/;return []if$string =~ /^\[\](?:\s+\#.*)?\z/;if ($string !~ /^[>|]/){if ($string =~ /^(?:-(?:\s|$)|[\@\%\`])/ or $string =~ /:(?:\s|$)/){die \"CPAN::Meta::YAML found illegal characters in plain scalar: '$string'"}$string =~ s/\s+#.*\z//;return$string}die \"CPAN::Meta::YAML failed to find multi-line scalar content" unless @$lines;$lines->[0]=~ /^(\s*)/;$indent->[-1]=length("$1");if (defined$indent->[-2]and $indent->[-1]<= $indent->[-2]){die \"CPAN::Meta::YAML found bad indenting in line '$lines->[0]'"}my@multiline=();while (@$lines){$lines->[0]=~ /^(\s*)/;last unless length($1)>= $indent->[-1];push@multiline,substr(shift(@$lines),length($1))}my$j=(substr($string,0,1)eq '>')? ' ' : "\n";my$t=(substr($string,1,1)eq '-')? '' : "\n";return join($j,@multiline).$t}sub _read_array {my ($self,$array,$indent,$lines)=@_;while (@$lines){if ($lines->[0]=~ /^(?:---|\.\.\.)/){while (@$lines and $lines->[0]!~ /^---/){shift @$lines}return 1}$lines->[0]=~ /^(\s*)/;if (length($1)< $indent->[-1]){return 1}elsif (length($1)> $indent->[-1]){die \"CPAN::Meta::YAML found bad indenting in line '$lines->[0]'"}if ($lines->[0]=~ /^(\s*\-\s+)[^\'\"]\S*\s*:(?:\s+|$)/){my$indent2=length("$1");$lines->[0]=~ s/-/ /;push @$array,{};$self->_read_hash($array->[-1],[@$indent,$indent2 ],$lines)}elsif ($lines->[0]=~ /^\s*\-(\s*)(.+?)\s*\z/){shift @$lines;push @$array,$self->_read_scalar("$2",[@$indent,undef ],$lines)}elsif ($lines->[0]=~ /^\s*\-\s*\z/){shift @$lines;unless (@$lines){push @$array,undef;return 1}if ($lines->[0]=~ /^(\s*)\-/){my$indent2=length("$1");if ($indent->[-1]==$indent2){push @$array,undef}else {push @$array,[];$self->_read_array($array->[-1],[@$indent,$indent2 ],$lines)}}elsif ($lines->[0]=~ /^(\s*)\S/){push @$array,{};$self->_read_hash($array->[-1],[@$indent,length("$1")],$lines)}else {die \"CPAN::Meta::YAML failed to classify line '$lines->[0]'"}}elsif (defined$indent->[-2]and $indent->[-1]==$indent->[-2]){return 1}else {die \"CPAN::Meta::YAML failed to classify line '$lines->[0]'"}}return 1}sub _read_hash {my ($self,$hash,$indent,$lines)=@_;while (@$lines){if ($lines->[0]=~ /^(?:---|\.\.\.)/){while (@$lines and $lines->[0]!~ /^---/){shift @$lines}return 1}$lines->[0]=~ /^(\s*)/;if (length($1)< $indent->[-1]){return 1}elsif (length($1)> $indent->[-1]){die \"CPAN::Meta::YAML found bad indenting in line '$lines->[0]'"}unless ($lines->[0]=~ s/^\s*([^\'\" ][^\n]*?)\s*:(\s+(?:\#.*)?|$)//){if ($lines->[0]=~ /^\s*[?\'\"]/){die \"CPAN::Meta::YAML does not support a feature in line '$lines->[0]'"}die \"CPAN::Meta::YAML failed to classify line '$lines->[0]'"}my$key=$1;if (length$lines->[0]){$hash->{$key}=$self->_read_scalar(shift(@$lines),[@$indent,undef ],$lines)}else {shift @$lines;unless (@$lines){$hash->{$key}=undef;return 1}if ($lines->[0]=~ /^(\s*)-/){$hash->{$key}=[];$self->_read_array($hash->{$key},[@$indent,length($1)],$lines)}elsif ($lines->[0]=~ /^(\s*)./){my$indent2=length("$1");if ($indent->[-1]>= $indent2){$hash->{$key}=undef}else {$hash->{$key}={};$self->_read_hash($hash->{$key},[@$indent,length($1)],$lines)}}}}return 1}sub write {my$self=shift;my$file=shift or return$self->_error('No file name provided');open(CFG,'>' .$file)or return$self->_error("Failed to open file '$file' for writing: $!");print CFG$self->write_string;close CFG;return 1}sub write_string {my$self=shift;return '' unless @$self;my$indent=0;my@lines=();for my$cursor (@$self){push@lines,'---';if (!defined$cursor){}elsif (!ref$cursor){$lines[-1].= ' ' .$self->_write_scalar($cursor,$indent)}elsif (ref$cursor eq 'ARRAY'){unless (@$cursor){$lines[-1].= ' []';next}push@lines,$self->_write_array($cursor,$indent,{})}elsif (ref$cursor eq 'HASH'){unless (%$cursor){$lines[-1].= ' {}';next}push@lines,$self->_write_hash($cursor,$indent,{})}else {Carp::croak("Cannot serialize " .ref($cursor))}}join '',map {"$_\n"}@lines}sub _write_scalar {my$string=$_[1];return '~' unless defined$string;return "''" unless length$string;if ($string =~ /[\x00-\x08\x0b-\x0d\x0e-\x1f\"\'\n]/){$string =~ s/\\/\\\\/g;$string =~ s/"/\\"/g;$string =~ s/\n/\\n/g;$string =~ s/([\x00-\x1f])/\\$UNPRINTABLE[ord($1)]/g;return qq|"$string"|}if ($string =~ /(?:^\W|\s|:\z)/ or $QUOTE{$string}){return "'$string'"}return$string}sub _write_array {my ($self,$array,$indent,$seen)=@_;if ($seen->{refaddr($array)}++){die "CPAN::Meta::YAML does not support circular references"}my@lines=();for my$el (@$array){my$line=(' ' x $indent).'-';my$type=ref$el;if (!$type){$line .= ' ' .$self->_write_scalar($el,$indent + 1);push@lines,$line}elsif ($type eq 'ARRAY'){if (@$el){push@lines,$line;push@lines,$self->_write_array($el,$indent + 1,$seen)}else {$line .= ' []';push@lines,$line}}elsif ($type eq 'HASH'){if (keys %$el){push@lines,$line;push@lines,$self->_write_hash($el,$indent + 1,$seen)}else {$line .= ' {}';push@lines,$line}}else {die "CPAN::Meta::YAML does not support $type references"}}@lines}sub _write_hash {my ($self,$hash,$indent,$seen)=@_;if ($seen->{refaddr($hash)}++){die "CPAN::Meta::YAML does not support circular references"}my@lines=();for my$name (sort keys %$hash){my$el=$hash->{$name};my$line=(' ' x $indent)."$name:";my$type=ref$el;if (!$type){$line .= ' ' .$self->_write_scalar($el,$indent + 1);push@lines,$line}elsif ($type eq 'ARRAY'){if (@$el){push@lines,$line;push@lines,$self->_write_array($el,$indent + 1,$seen)}else {$line .= ' []';push@lines,$line}}elsif ($type eq 'HASH'){if (keys %$el){push@lines,$line;push@lines,$self->_write_hash($el,$indent + 1,$seen)}else {$line .= ' {}';push@lines,$line}}else {die "CPAN::Meta::YAML does not support $type references"}}@lines}sub _error {$CPAN::Meta::YAML::errstr=$_[1];undef}sub errstr {$CPAN::Meta::YAML::errstr}sub Dump {CPAN::Meta::YAML->new(@_)->write_string}sub Load {my$self=CPAN::Meta::YAML->read_string(@_);unless ($self){Carp::croak("Failed to load YAML document from string")}if (wantarray){return @$self}else {return$self->[-1]}}BEGIN {*freeze=*Dump;*thaw=*Load}sub DumpFile {my$file=shift;CPAN::Meta::YAML->new(@_)->write($file)}sub LoadFile {my$self=CPAN::Meta::YAML->read($_[0]);unless ($self){Carp::croak("Failed to load YAML document from '" .($_[0]|| '')."'")}if (wantarray){return @$self}else {return$self->[-1]}}BEGIN {local $@;eval {require Scalar::Util};my$v=eval("$Scalar::Util::VERSION")|| 0;if ($@ or $v < 1.18){eval <<'END_PERL'}else {*refaddr=*Scalar::Util::refaddr}}1;
+ # Scalar::Util failed to load or too old
sub refaddr {
my $pkg = ref($_[0]) or return undef;
if ( !! UNIVERSAL::can($_[0], 'can') ) {
@@ -5703,847 +228,33 @@ $fatpacked{"CPAN/Meta/YAML.pm"} = <<'CPAN_META_YAML';
$i;
}
END_PERL
-
- }
-
- 1;
-
-
-
-
- __END__
-
-
- # ABSTRACT: Read and write a subset of YAML for CPAN Meta files
-
-
CPAN_META_YAML
+$fatpacked{"Exporter.pm"} = <<'EXPORTER';
+ package Exporter;require 5.006;our$Debug=0;our$ExportLevel=0;our$Verbose ||=0;our$VERSION='5.68';our (%Cache);sub as_heavy {require Exporter::Heavy;my$c=(caller(1))[3];$c =~ s/.*:://;\&{"Exporter::Heavy::heavy_$c"}}sub export {goto &{as_heavy()}}sub import {my$pkg=shift;my$callpkg=caller($ExportLevel);if ($pkg eq "Exporter" and @_ and $_[0]eq "import"){*{$callpkg."::import"}=\&import;return}my$exports=\@{"$pkg\::EXPORT"};my$fail=${$pkg .'::'}{EXPORT_FAIL}&& \@{"$pkg\::EXPORT_FAIL"};return export$pkg,$callpkg,@_ if$Verbose or $Debug or $fail && @$fail > 1;my$export_cache=($Cache{$pkg}||={});my$args=@_ or @_=@$exports;if ($args and not %$export_cache){s/^&//,$export_cache->{$_}=1 foreach (@$exports,@{"$pkg\::EXPORT_OK"})}my$heavy;if ($args or $fail){($heavy=(/\W/ or $args and not exists$export_cache->{$_}or $fail and @$fail and $_ eq $fail->[0]))and last foreach (@_)}else {($heavy=/\W/)and last foreach (@_)}return export$pkg,$callpkg,($args ? @_ : ())if$heavy;local$SIG{__WARN__}=sub {require Carp;&Carp::carp}if not $SIG{__WARN__};*{"$callpkg\::$_"}=\&{"$pkg\::$_"}foreach @_}sub export_fail {my$self=shift;@_}sub export_to_level {goto &{as_heavy()}}sub export_tags {goto &{as_heavy()}}sub export_ok_tags {goto &{as_heavy()}}sub require_version {goto &{as_heavy()}}1;
+EXPORTER
+
+$fatpacked{"Exporter/Heavy.pm"} = <<'EXPORTER_HEAVY';
+ package Exporter::Heavy;use strict;no strict 'refs';require Exporter;our$VERSION=$Exporter::VERSION;sub _rebuild_cache {my ($pkg,$exports,$cache)=@_;s/^&// foreach @$exports;@{$cache}{@$exports}=(1)x @$exports;my$ok=\@{"${pkg}::EXPORT_OK"};if (@$ok){s/^&// foreach @$ok;@{$cache}{@$ok}=(1)x @$ok}}sub heavy_export {local$SIG{__WARN__}=sub {my$text=shift;if ($text =~ s/ at \S*Exporter\S*.pm line \d+.*\n//){require Carp;local$Carp::CarpLevel=1;Carp::carp($text)}else {warn$text}};local$SIG{__DIE__}=sub {require Carp;local$Carp::CarpLevel=1;Carp::croak("$_[0]Illegal null symbol in \@${1}::EXPORT")if $_[0]=~ /^Unable to create sub named "(.*?)::"/};my($pkg,$callpkg,@imports)=@_;my($type,$sym,$cache_is_current,$oops);my($exports,$export_cache)=(\@{"${pkg}::EXPORT"},$Exporter::Cache{$pkg}||={});if (@imports){if (!%$export_cache){_rebuild_cache ($pkg,$exports,$export_cache);$cache_is_current=1}if (grep m{^[/!:]},@imports){my$tagsref=\%{"${pkg}::EXPORT_TAGS"};my$tagdata;my%imports;my($remove,$spec,@names,@allexports);unshift@imports,':DEFAULT' if$imports[0]=~ m/^!/;for$spec (@imports){$remove=$spec =~ s/^!//;if ($spec =~ s/^://){if ($spec eq 'DEFAULT'){@names=@$exports}elsif ($tagdata=$tagsref->{$spec}){@names=@$tagdata}else {warn qq["$spec" is not defined in %${pkg}::EXPORT_TAGS];++$oops;next}}elsif ($spec =~ m:^/(.*)/$:){my$patn=$1;@allexports=keys %$export_cache unless@allexports;@names=grep(/$patn/,@allexports)}else {@names=($spec)}warn "Import ".($remove ? "del":"add").": @names " if$Exporter::Verbose;if ($remove){for$sym (@names){delete$imports{$sym}}}else {@imports{@names}=(1)x @names}}@imports=keys%imports}my@carp;for$sym (@imports){if (!$export_cache->{$sym}){if ($sym =~ m/^\d/){$pkg->VERSION($sym);if (@imports==1){@imports=@$exports;last}if (@imports==2 and!$imports[1]){@imports=();last}}elsif ($sym !~ s/^&// ||!$export_cache->{$sym}){unless ($cache_is_current){%$export_cache=();_rebuild_cache ($pkg,$exports,$export_cache);$cache_is_current=1}if (!$export_cache->{$sym}){push@carp,qq["$sym" is not exported by the $pkg module\n];$oops++}}}}if ($oops){require Carp;Carp::croak("@{carp}Can't continue after import errors")}}else {@imports=@$exports}my($fail,$fail_cache)=(\@{"${pkg}::EXPORT_FAIL"},$Exporter::FailCache{$pkg}||={});if (@$fail){if (!%$fail_cache){my@expanded=map {/^\w/ ? ($_,'&'.$_): $_}@$fail;warn "${pkg}::EXPORT_FAIL cached: @expanded" if$Exporter::Verbose;@{$fail_cache}{@expanded}=(1)x @expanded}my@failed;for$sym (@imports){push(@failed,$sym)if$fail_cache->{$sym}}if (@failed){@failed=$pkg->export_fail(@failed);for$sym (@failed){require Carp;Carp::carp(qq["$sym" is not implemented by the $pkg module ],"on this architecture")}if (@failed){require Carp;Carp::croak("Can't continue after import errors")}}}warn "Importing into $callpkg from $pkg: ",join(", ",sort@imports)if$Exporter::Verbose;for$sym (@imports){(*{"${callpkg}::$sym"}=\&{"${pkg}::$sym"},next)unless$sym =~ s/^(\W)//;$type=$1;no warnings 'once';*{"${callpkg}::$sym"}=$type eq '&' ? \&{"${pkg}::$sym"}: $type eq '$' ? \${"${pkg}::$sym"}: $type eq '@' ? \@{"${pkg}::$sym"}: $type eq '%' ? \%{"${pkg}::$sym"}: $type eq '*' ? *{"${pkg}::$sym"}: do {require Carp;Carp::croak("Can't export symbol: $type$sym")}}}sub heavy_export_to_level {my$pkg=shift;my$level=shift;(undef)=shift;my$callpkg=caller($level);$pkg->export($callpkg,@_)}sub _push_tags {my($pkg,$var,$syms)=@_;my@nontag=();my$export_tags=\%{"${pkg}::EXPORT_TAGS"};push(@{"${pkg}::$var"},map {$export_tags->{$_}? @{$export_tags->{$_}}: scalar(push(@nontag,$_),$_)}(@$syms)? @$syms : keys %$export_tags);if (@nontag and $^W){require Carp;Carp::carp(join(", ",@nontag)." are not tags of $pkg")}}sub heavy_require_version {my($self,$wanted)=@_;my$pkg=ref$self || $self;return ${pkg}->VERSION($wanted)}sub heavy_export_tags {_push_tags((caller)[0],"EXPORT",\@_)}sub heavy_export_ok_tags {_push_tags((caller)[0],"EXPORT_OK",\@_)}1;
+EXPORTER_HEAVY
+
+$fatpacked{"File/pushd.pm"} = <<'FILE_PUSHD';
+ use strict;use warnings;package File::pushd;our$VERSION='1.005';our@EXPORT=qw(pushd tempd);our@ISA=qw(Exporter);use Exporter;use Carp;use Cwd qw(getcwd abs_path);use File::Path qw(rmtree);use File::Temp qw();use File::Spec;use overload q{""}=>sub {File::Spec->canonpath($_[0]->{_pushd})},fallback=>1;sub pushd {my ($target_dir,$options)=@_;$options->{untaint_pattern}||=qr{^([-+@\w./]+)$};$target_dir="." unless defined$target_dir;croak "Can't locate directory $target_dir" unless -d $target_dir;my$tainted_orig=getcwd;my$orig;if ($tainted_orig =~ $options->{untaint_pattern}){$orig=$1}else {$orig=$tainted_orig}my$tainted_dest;eval {$tainted_dest=$target_dir ? abs_path($target_dir): $orig};croak "Can't locate absolute path for $target_dir: $@" if $@;my$dest;if ($tainted_dest =~ $options->{untaint_pattern}){$dest=$1}else {$dest=$tainted_dest}if ($dest ne $orig){chdir$dest or croak "Can't chdir to $dest\: $!"}my$self=bless {_pushd=>$dest,_original=>$orig },__PACKAGE__;return$self}sub tempd {my ($options)=@_;my$dir;eval {$dir=pushd(File::Temp::tempdir(CLEANUP=>0),$options)};croak $@ if $@;$dir->{_tempd}=1;return$dir}sub preserve {my$self=shift;return 1 if!$self->{"_tempd"};if (@_==0){return$self->{_preserve}=1}else {return$self->{_preserve}=$_[0]? 1 : 0}}sub DESTROY {my ($self)=@_;my$orig=$self->{_original};chdir$orig if$orig;if ($self->{_tempd}&& !$self->{_preserve}){my$err=do {local $@;eval {rmtree($self->{_pushd})};$@};carp$err if$err}}1;
+FILE_PUSHD
+
$fatpacked{"HTTP/Tiny.pm"} = <<'HTTP_TINY';
- # vim: ts=4 sts=4 sw=4 et:
- #
- # This file is part of HTTP-Tiny
- #
- # This software is copyright (c) 2011 by Christian Hansen.
- #
- # This is free software; you can redistribute it and/or modify it under
- # the same terms as the Perl 5 programming language system itself.
- #
- package HTTP::Tiny;
- BEGIN {
- $HTTP::Tiny::VERSION = '0.009';
- }
- use strict;
- use warnings;
- # ABSTRACT: A small, simple, correct HTTP/1.1 client
-
- use Carp ();
-
-
- my @attributes;
- BEGIN {
- @attributes = qw(agent default_headers max_redirect max_size proxy timeout);
- no strict 'refs';
- for my $accessor ( @attributes ) {
- *{$accessor} = sub {
- @_ > 1 ? $_[0]->{$accessor} = $_[1] : $_[0]->{$accessor};
- };
- }
- }
-
- sub new {
- my($class, %args) = @_;
- (my $agent = $class) =~ s{::}{-}g;
- my $self = {
- agent => $agent . "/" . ($class->VERSION || 0),
- max_redirect => 5,
- timeout => 60,
- };
- for my $key ( @attributes ) {
- $self->{$key} = $args{$key} if exists $args{$key}
- }
- return bless $self, $class;
- }
-
-
- sub get {
- my ($self, $url, $args) = @_;
- @_ == 2 || (@_ == 3 && ref $args eq 'HASH')
- or Carp::croak(q/Usage: $http->get(URL, [HASHREF])/);
- return $self->request('GET', $url, $args || {});
- }
-
-
- sub mirror {
- my ($self, $url, $file, $args) = @_;
- @_ == 3 || (@_ == 4 && ref $args eq 'HASH')
- or Carp::croak(q/Usage: $http->mirror(URL, FILE, [HASHREF])/);
- if ( -e $file and my $mtime = (stat($file))[9] ) {
- $args->{headers}{'if-modified-since'} ||= $self->_http_date($mtime);
- }
- my $tempfile = $file . int(rand(2**31));
- open my $fh, ">", $tempfile
- or Carp::croak(qq/Error: Could not open temporary file $tempfile for downloading: $!/);
- $args->{data_callback} = sub { print {$fh} $_[0] };
- my $response = $self->request('GET', $url, $args);
- close $fh
- or Carp::croak(qq/Error: Could not close temporary file $tempfile: $!/);
- if ( $response->{success} ) {
- rename $tempfile, $file
- or Carp::croak "Error replacing $file with $tempfile: $!\n";
- my $lm = $response->{headers}{'last-modified'};
- if ( $lm and my $mtime = $self->_parse_http_date($lm) ) {
- utime $mtime, $mtime, $file;
- }
- }
- $response->{success} ||= $response->{status} eq '304';
- unlink $tempfile;
- return $response;
- }
-
-
- my %idempotent = map { $_ => 1 } qw/GET HEAD PUT DELETE OPTIONS TRACE/;
-
- sub request {
- my ($self, $method, $url, $args) = @_;
- @_ == 3 || (@_ == 4 && ref $args eq 'HASH')
- or Carp::croak(q/Usage: $http->request(METHOD, URL, [HASHREF])/);
- $args ||= {}; # we keep some state in this during _request
-
- # RFC 2616 Section 8.1.4 mandates a single retry on broken socket
- my $response;
- for ( 0 .. 1 ) {
- $response = eval { $self->_request($method, $url, $args) };
- last unless $@ && $idempotent{$method}
- && $@ =~ m{^(?:Socket closed|Unexpected end)};
- }
-
- if (my $e = "$@") {
- $response = {
- success => q{},
- status => 599,
- reason => 'Internal Exception',
- content => $e,
- headers => {
- 'content-type' => 'text/plain',
- 'content-length' => length $e,
- }
- };
- }
- return $response;
- }
-
- my %DefaultPort = (
- http => 80,
- https => 443,
- );
-
- sub _request {
- my ($self, $method, $url, $args) = @_;
-
- my ($scheme, $host, $port, $path_query) = $self->_split_url($url);
-
- my $request = {
- method => $method,
- scheme => $scheme,
- host_port => ($port == $DefaultPort{$scheme} ? $host : "$host:$port"),
- uri => $path_query,
- headers => {},
- };
-
- my $handle = HTTP::Tiny::Handle->new(timeout => $self->{timeout});
-
- if ($self->{proxy}) {
- $request->{uri} = "$scheme://$request->{host_port}$path_query";
- croak(qq/HTTPS via proxy is not supported/)
- if $request->{scheme} eq 'https';
- $handle->connect(($self->_split_url($self->{proxy}))[0..2]);
- }
- else {
- $handle->connect($scheme, $host, $port);
- }
-
- $self->_prepare_headers_and_cb($request, $args);
- $handle->write_request($request);
-
- my $response;
- do { $response = $handle->read_response_header }
- until (substr($response->{status},0,1) ne '1');
-
- if ( my @redir_args = $self->_maybe_redirect($request, $response, $args) ) {
- $handle->close;
- return $self->_request(@redir_args, $args);
- }
-
- if ($method eq 'HEAD' || $response->{status} =~ /^[23]04/) {
- # response has no message body
- }
- else {
- my $data_cb = $self->_prepare_data_cb($response, $args);
- $handle->read_body($data_cb, $response);
- }
-
- $handle->close;
- $response->{success} = substr($response->{status},0,1) eq '2';
- return $response;
- }
-
- sub _prepare_headers_and_cb {
- my ($self, $request, $args) = @_;
-
- for ($self->{default_headers}, $args->{headers}) {
- next unless defined;
- while (my ($k, $v) = each %$_) {
- $request->{headers}{lc $k} = $v;
- }
- }
- $request->{headers}{'host'} = $request->{host_port};
- $request->{headers}{'connection'} = "close";
- $request->{headers}{'user-agent'} ||= $self->{agent};
-
- if (defined $args->{content}) {
- $request->{headers}{'content-type'} ||= "application/octet-stream";
- if (ref $args->{content} eq 'CODE') {
- $request->{headers}{'transfer-encoding'} = 'chunked'
- unless $request->{headers}{'content-length'}
- || $request->{headers}{'transfer-encoding'};
- $request->{cb} = $args->{content};
- }
- else {
- my $content = $args->{content};
- if ( $] ge '5.008' ) {
- utf8::downgrade($content, 1)
- or Carp::croak(q/Wide character in request message body/);
- }
- $request->{headers}{'content-length'} = length $content
- unless $request->{headers}{'content-length'}
- || $request->{headers}{'transfer-encoding'};
- $request->{cb} = sub { substr $content, 0, length $content, '' };
- }
- $request->{trailer_cb} = $args->{trailer_callback}
- if ref $args->{trailer_callback} eq 'CODE';
- }
- return;
- }
-
- sub _prepare_data_cb {
- my ($self, $response, $args) = @_;
- my $data_cb = $args->{data_callback};
- $response->{content} = '';
-
- if (!$data_cb || $response->{status} !~ /^2/) {
- if (defined $self->{max_size}) {
- $data_cb = sub {
- $_[1]->{content} .= $_[0];
- die(qq/Size of response body exceeds the maximum allowed of $self->{max_size}\n/)
- if length $_[1]->{content} > $self->{max_size};
- };
- }
- else {
- $data_cb = sub { $_[1]->{content} .= $_[0] };
- }
- }
- return $data_cb;
- }
-
- sub _maybe_redirect {
- my ($self, $request, $response, $args) = @_;
- my $headers = $response->{headers};
- my ($status, $method) = ($response->{status}, $request->{method});
- if (($status eq '303' or ($status =~ /^30[127]/ && $method =~ /^GET|HEAD$/))
- and $headers->{location}
- and ++$args->{redirects} <= $self->{max_redirect}
- ) {
- my $location = ($headers->{location} =~ /^\//)
- ? "$request->{scheme}://$request->{host_port}$headers->{location}"
- : $headers->{location} ;
- return (($status eq '303' ? 'GET' : $method), $location);
- }
- return;
- }
-
- sub _split_url {
- my $url = pop;
-
- # URI regex adapted from the URI module
- my ($scheme, $authority, $path_query) = $url =~ m<\A([^:/?#]+)://([^/?#]*)([^#]*)>
- or Carp::croak(qq/Cannot parse URL: '$url'/);
-
- $scheme = lc $scheme;
- $path_query = "/$path_query" unless $path_query =~ m<\A/>;
-
- my $host = (length($authority)) ? lc $authority : 'localhost';
- $host =~ s/\A[^@]*@//; # userinfo
- my $port = do {
- $host =~ s/:([0-9]*)\z// && length $1
- ? $1
- : ($scheme eq 'http' ? 80 : $scheme eq 'https' ? 443 : undef);
- };
-
- return ($scheme, $host, $port, $path_query);
- }
-
- # Date conversions adapted from HTTP::Date
- my $DoW = "Sun|Mon|Tue|Wed|Thu|Fri|Sat";
- my $MoY = "Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec";
- sub _http_date {
- my ($sec, $min, $hour, $mday, $mon, $year, $wday) = gmtime($_[1]);
- return sprintf("%s, %02d %s %04d %02d:%02d:%02d GMT",
- substr($DoW,$wday*4,3),
- $mday, substr($MoY,$mon*4,3), $year+1900,
- $hour, $min, $sec
- );
- }
-
- sub _parse_http_date {
- my ($self, $str) = @_;
- require Time::Local;
- my @tl_parts;
- if ($str =~ /^[SMTWF][a-z]+, +(\d{1,2}) ($MoY) +(\d\d\d\d) +(\d\d):(\d\d):(\d\d) +GMT$/) {
- @tl_parts = ($6, $5, $4, $1, (index($MoY,$2)/4), $3);
- }
- elsif ($str =~ /^[SMTWF][a-z]+, +(\d\d)-($MoY)-(\d{2,4}) +(\d\d):(\d\d):(\d\d) +GMT$/ ) {
- @tl_parts = ($6, $5, $4, $1, (index($MoY,$2)/4), $3);
- }
- elsif ($str =~ /^[SMTWF][a-z]+ +($MoY) +(\d{1,2}) +(\d\d):(\d\d):(\d\d) +(?:[^0-9]+ +)?(\d\d\d\d)$/ ) {
- @tl_parts = ($5, $4, $3, $2, (index($MoY,$1)/4), $6);
- }
- return eval {
- my $t = @tl_parts ? Time::Local::timegm(@tl_parts) : -1;
- $t < 0 ? undef : $t;
- };
- }
-
- package
- HTTP::Tiny::Handle; # hide from PAUSE/indexers
- use strict;
- use warnings;
-
- use Carp qw[croak];
- use Errno qw[EINTR EPIPE];
- use IO::Socket qw[SOCK_STREAM];
-
- sub BUFSIZE () { 32768 }
-
- my $Printable = sub {
- local $_ = shift;
- s/\r/\\r/g;
- s/\n/\\n/g;
- s/\t/\\t/g;
- s/([^\x20-\x7E])/sprintf('\\x%.2X', ord($1))/ge;
- $_;
- };
-
- my $Token = qr/[\x21\x23-\x27\x2A\x2B\x2D\x2E\x30-\x39\x41-\x5A\x5E-\x7A\x7C\x7E]/;
-
- sub new {
- my ($class, %args) = @_;
- return bless {
- rbuf => '',
- timeout => 60,
- max_line_size => 16384,
- max_header_lines => 64,
- %args
- }, $class;
- }
-
- my $ssl_verify_args = {
- check_cn => "when_only",
- wildcards_in_alt => "anywhere",
- wildcards_in_cn => "anywhere"
- };
-
- sub connect {
- @_ == 4 || croak(q/Usage: $handle->connect(scheme, host, port)/);
- my ($self, $scheme, $host, $port) = @_;
-
- if ( $scheme eq 'https' ) {
- eval "require IO::Socket::SSL"
- unless exists $INC{'IO/Socket/SSL.pm'};
- croak(qq/IO::Socket::SSL must be installed for https support\n/)
- unless $INC{'IO/Socket/SSL.pm'};
- }
- elsif ( $scheme ne 'http' ) {
- croak(qq/Unsupported URL scheme '$scheme'/);
- }
-
- $self->{fh} = 'IO::Socket::INET'->new(
- PeerHost => $host,
- PeerPort => $port,
- Proto => 'tcp',
- Type => SOCK_STREAM,
- Timeout => $self->{timeout}
- ) or croak(qq/Could not connect to '$host:$port': $@/);
-
- binmode($self->{fh})
- or croak(qq/Could not binmode() socket: '$!'/);
-
- if ( $scheme eq 'https') {
- IO::Socket::SSL->start_SSL($self->{fh});
- ref($self->{fh}) eq 'IO::Socket::SSL'
- or die(qq/SSL connection failed for $host\n/);
- $self->{fh}->verify_hostname( $host, $ssl_verify_args )
- or die(qq/SSL certificate not valid for $host\n/);
- }
-
- $self->{host} = $host;
- $self->{port} = $port;
-
- return $self;
- }
-
- sub close {
- @_ == 1 || croak(q/Usage: $handle->close()/);
- my ($self) = @_;
- CORE::close($self->{fh})
- or croak(qq/Could not close socket: '$!'/);
- }
-
- sub write {
- @_ == 2 || croak(q/Usage: $handle->write(buf)/);
- my ($self, $buf) = @_;
-
- if ( $] ge '5.008' ) {
- utf8::downgrade($buf, 1)
- or croak(q/Wide character in write()/);
- }
-
- my $len = length $buf;
- my $off = 0;
-
- local $SIG{PIPE} = 'IGNORE';
-
- while () {
- $self->can_write
- or croak(q/Timed out while waiting for socket to become ready for writing/);
- my $r = syswrite($self->{fh}, $buf, $len, $off);
- if (defined $r) {
- $len -= $r;
- $off += $r;
- last unless $len > 0;
- }
- elsif ($! == EPIPE) {
- croak(qq/Socket closed by remote server: $!/);
- }
- elsif ($! != EINTR) {
- croak(qq/Could not write to socket: '$!'/);
- }
- }
- return $off;
- }
-
- sub read {
- @_ == 2 || @_ == 3 || croak(q/Usage: $handle->read(len [, allow_partial])/);
- my ($self, $len, $allow_partial) = @_;
-
- my $buf = '';
- my $got = length $self->{rbuf};
-
- if ($got) {
- my $take = ($got < $len) ? $got : $len;
- $buf = substr($self->{rbuf}, 0, $take, '');
- $len -= $take;
- }
-
- while ($len > 0) {
- $self->can_read
- or croak(q/Timed out while waiting for socket to become ready for reading/);
- my $r = sysread($self->{fh}, $buf, $len, length $buf);
- if (defined $r) {
- last unless $r;
- $len -= $r;
- }
- elsif ($! != EINTR) {
- croak(qq/Could not read from socket: '$!'/);
- }
- }
- if ($len && !$allow_partial) {
- croak(q/Unexpected end of stream/);
- }
- return $buf;
- }
-
- sub readline {
- @_ == 1 || croak(q/Usage: $handle->readline()/);
- my ($self) = @_;
-
- while () {
- if ($self->{rbuf} =~ s/\A ([^\x0D\x0A]* \x0D?\x0A)//x) {
- return $1;
- }
- if (length $self->{rbuf} >= $self->{max_line_size}) {
- croak(qq/Line size exceeds the maximum allowed size of $self->{max_line_size}/);
- }
- $self->can_read
- or croak(q/Timed out while waiting for socket to become ready for reading/);
- my $r = sysread($self->{fh}, $self->{rbuf}, BUFSIZE, length $self->{rbuf});
- if (defined $r) {
- last unless $r;
- }
- elsif ($! != EINTR) {
- croak(qq/Could not read from socket: '$!'/);
- }
- }
- croak(q/Unexpected end of stream while looking for line/);
- }
-
- sub read_header_lines {
- @_ == 1 || @_ == 2 || croak(q/Usage: $handle->read_header_lines([headers])/);
- my ($self, $headers) = @_;
- $headers ||= {};
- my $lines = 0;
- my $val;
-
- while () {
- my $line = $self->readline;
-
- if (++$lines >= $self->{max_header_lines}) {
- croak(qq/Header lines exceeds maximum number allowed of $self->{max_header_lines}/);
- }
- elsif ($line =~ /\A ([^\x00-\x1F\x7F:]+) : [\x09\x20]* ([^\x0D\x0A]*)/x) {
- my ($field_name) = lc $1;
- if (exists $headers->{$field_name}) {
- for ($headers->{$field_name}) {
- $_ = [$_] unless ref $_ eq "ARRAY";
- push @$_, $2;
- $val = \$_->[-1];
- }
- }
- else {
- $val = \($headers->{$field_name} = $2);
- }
- }
- elsif ($line =~ /\A [\x09\x20]+ ([^\x0D\x0A]*)/x) {
- $val
- or croak(q/Unexpected header continuation line/);
- next unless length $1;
- $$val .= ' ' if length $$val;
- $$val .= $1;
- }
- elsif ($line =~ /\A \x0D?\x0A \z/x) {
- last;
- }
- else {
- croak(q/Malformed header line: / . $Printable->($line));
- }
- }
- return $headers;
- }
-
- sub write_request {
- @_ == 2 || croak(q/Usage: $handle->write_request(request)/);
- my($self, $request) = @_;
- $self->write_request_header(@{$request}{qw/method uri headers/});
- $self->write_body($request) if $request->{cb};
- return;
- }
-
- my %HeaderCase = (
- 'content-md5' => 'Content-MD5',
- 'etag' => 'ETag',
- 'te' => 'TE',
- 'www-authenticate' => 'WWW-Authenticate',
- 'x-xss-protection' => 'X-XSS-Protection',
- );
-
- sub write_header_lines {
- (@_ == 2 && ref $_[1] eq 'HASH') || croak(q/Usage: $handle->write_header_lines(headers)/);
- my($self, $headers) = @_;
-
- my $buf = '';
- while (my ($k, $v) = each %$headers) {
- my $field_name = lc $k;
- if (exists $HeaderCase{$field_name}) {
- $field_name = $HeaderCase{$field_name};
- }
- else {
- $field_name =~ /\A $Token+ \z/xo
- or croak(q/Invalid HTTP header field name: / . $Printable->($field_name));
- $field_name =~ s/\b(\w)/\u$1/g;
- $HeaderCase{lc $field_name} = $field_name;
- }
- for (ref $v eq 'ARRAY' ? @$v : $v) {
- /[^\x0D\x0A]/
- or croak(qq/Invalid HTTP header field value ($field_name): / . $Printable->($_));
- $buf .= "$field_name: $_\x0D\x0A";
- }
- }
- $buf .= "\x0D\x0A";
- return $self->write($buf);
- }
-
- sub read_body {
- @_ == 3 || croak(q/Usage: $handle->read_body(callback, response)/);
- my ($self, $cb, $response) = @_;
- my $te = $response->{headers}{'transfer-encoding'} || '';
- if ( grep { /chunked/i } ( ref $te eq 'ARRAY' ? @$te : $te ) ) {
- $self->read_chunked_body($cb, $response);
- }
- else {
- $self->read_content_body($cb, $response);
- }
- return;
- }
-
- sub write_body {
- @_ == 2 || croak(q/Usage: $handle->write_body(request)/);
- my ($self, $request) = @_;
- if ($request->{headers}{'content-length'}) {
- return $self->write_content_body($request);
- }
- else {
- return $self->write_chunked_body($request);
- }
- }
-
- sub read_content_body {
- @_ == 3 || @_ == 4 || croak(q/Usage: $handle->read_content_body(callback, response, [read_length])/);
- my ($self, $cb, $response, $content_length) = @_;
- $content_length ||= $response->{headers}{'content-length'};
-
- if ( $content_length ) {
- my $len = $content_length;
- while ($len > 0) {
- my $read = ($len > BUFSIZE) ? BUFSIZE : $len;
- $cb->($self->read($read, 0), $response);
- $len -= $read;
- }
- }
- else {
- my $chunk;
- $cb->($chunk, $response) while length( $chunk = $self->read(BUFSIZE, 1) );
- }
-
- return;
- }
-
- sub write_content_body {
- @_ == 2 || croak(q/Usage: $handle->write_content_body(request)/);
- my ($self, $request) = @_;
-
- my ($len, $content_length) = (0, $request->{headers}{'content-length'});
- while () {
- my $data = $request->{cb}->();
-
- defined $data && length $data
- or last;
-
- if ( $] ge '5.008' ) {
- utf8::downgrade($data, 1)
- or croak(q/Wide character in write_content()/);
- }
-
- $len += $self->write($data);
- }
-
- $len == $content_length
- or croak(qq/Content-Length missmatch (got: $len expected: $content_length)/);
-
- return $len;
- }
-
- sub read_chunked_body {
- @_ == 3 || croak(q/Usage: $handle->read_chunked_body(callback, $response)/);
- my ($self, $cb, $response) = @_;
-
- while () {
- my $head = $self->readline;
-
- $head =~ /\A ([A-Fa-f0-9]+)/x
- or croak(q/Malformed chunk head: / . $Printable->($head));
-
- my $len = hex($1)
- or last;
-
- $self->read_content_body($cb, $response, $len);
-
- $self->read(2) eq "\x0D\x0A"
- or croak(q/Malformed chunk: missing CRLF after chunk data/);
- }
- $self->read_header_lines($response->{headers});
- return;
- }
-
- sub write_chunked_body {
- @_ == 2 || croak(q/Usage: $handle->write_chunked_body(request)/);
- my ($self, $request) = @_;
-
- my $len = 0;
- while () {
- my $data = $request->{cb}->();
-
- defined $data && length $data
- or last;
-
- if ( $] ge '5.008' ) {
- utf8::downgrade($data, 1)
- or croak(q/Wide character in write_chunked_body()/);
- }
-
- $len += length $data;
-
- my $chunk = sprintf '%X', length $data;
- $chunk .= "\x0D\x0A";
- $chunk .= $data;
- $chunk .= "\x0D\x0A";
-
- $self->write($chunk);
- }
- $self->write("0\x0D\x0A");
- $self->write_header_lines($request->{trailer_cb}->())
- if ref $request->{trailer_cb} eq 'CODE';
- return $len;
- }
-
- sub read_response_header {
- @_ == 1 || croak(q/Usage: $handle->read_response_header()/);
- my ($self) = @_;
-
- my $line = $self->readline;
-
- $line =~ /\A (HTTP\/(0*\d+\.0*\d+)) [\x09\x20]+ ([0-9]{3}) [\x09\x20]+ ([^\x0D\x0A]*) \x0D?\x0A/x
- or croak(q/Malformed Status-Line: / . $Printable->($line));
-
- my ($protocol, $version, $status, $reason) = ($1, $2, $3, $4);
-
- croak (qq/Unsupported HTTP protocol: $protocol/)
- unless $version =~ /0*1\.0*[01]/;
-
- return {
- status => $status,
- reason => $reason,
- headers => $self->read_header_lines,
- protocol => $protocol,
- };
- }
-
- sub write_request_header {
- @_ == 4 || croak(q/Usage: $handle->write_request_header(method, request_uri, headers)/);
- my ($self, $method, $request_uri, $headers) = @_;
-
- return $self->write("$method $request_uri HTTP/1.1\x0D\x0A")
- + $self->write_header_lines($headers);
- }
-
- sub _do_timeout {
- my ($self, $type, $timeout) = @_;
- $timeout = $self->{timeout}
- unless defined $timeout && $timeout >= 0;
-
- my $fd = fileno $self->{fh};
- defined $fd && $fd >= 0
- or croak(q/select(2): 'Bad file descriptor'/);
-
- my $initial = time;
- my $pending = $timeout;
- my $nfound;
-
- vec(my $fdset = '', $fd, 1) = 1;
-
- while () {
- $nfound = ($type eq 'read')
- ? select($fdset, undef, undef, $pending)
- : select(undef, $fdset, undef, $pending) ;
- if ($nfound == -1) {
- $! == EINTR
- or croak(qq/select(2): '$!'/);
- redo if !$timeout || ($pending = $timeout - (time - $initial)) > 0;
- $nfound = 0;
- }
- last;
- }
- $! = 0;
- return $nfound;
- }
-
- sub can_read {
- @_ == 1 || @_ == 2 || croak(q/Usage: $handle->can_read([timeout])/);
- my $self = shift;
- return $self->_do_timeout('read', @_)
- }
-
- sub can_write {
- @_ == 1 || @_ == 2 || croak(q/Usage: $handle->can_write([timeout])/);
- my $self = shift;
- return $self->_do_timeout('write', @_)
- }
-
- 1;
-
-
-
- __END__
- =pod
-
+ package HTTP::Tiny;use strict;use warnings;our$VERSION='0.034';use Carp ();my@attributes;BEGIN {@attributes=qw(cookie_jar default_headers local_address max_redirect max_size proxy no_proxy timeout SSL_options verify_SSL);no strict 'refs';for my$accessor (@attributes){*{$accessor}=sub {@_ > 1 ? $_[0]->{$accessor}=$_[1]: $_[0]->{$accessor}}}}sub agent {my($self,$agent)=@_;if(@_ > 1){$self->{agent}=(defined$agent && $agent =~ / $/)? $agent .$self->_agent : $agent}return$self->{agent}}sub new {my($class,%args)=@_;my$self={max_redirect=>5,timeout=>60,verify_SSL=>$args{verify_SSL}|| $args{verify_ssl}|| 0,no_proxy=>$ENV{no_proxy},};bless$self,$class;$class->_validate_cookie_jar($args{cookie_jar})if$args{cookie_jar};for my$key (@attributes){$self->{$key}=$args{$key}if exists$args{$key}}$self->agent(exists$args{agent}? $args{agent}: $class->_agent);if (!exists$self->{proxy}&& (my$http_proxy=$ENV{http_proxy})){if ($http_proxy =~ m{\Ahttp://[^/?#:@]+:\d+/?\z}){$self->{proxy}=$http_proxy}else {Carp::croak(qq{Environment 'http_proxy' must be in format http://<host>:<port>/\n})}}unless (ref$self->{no_proxy}eq 'ARRAY'){$self->{no_proxy}=(defined$self->{no_proxy})? [split /\s*,\s*/,$self->{no_proxy}]: []}return$self}for my$sub_name (qw/get head put post delete/){my$req_method=uc$sub_name;no strict 'refs';eval <<"HERE"}sub post_form {my ($self,$url,$data,$args)=@_;(@_==3 || @_==4 && ref$args eq 'HASH')or Carp::croak(q/Usage: $http->post_form(URL, DATAREF, [HASHREF])/ ."\n");my$headers={};while (my ($key,$value)=each %{$args->{headers}|| {}}){$headers->{lc$key}=$value}delete$args->{headers};return$self->request('POST',$url,{%$args,content=>$self->www_form_urlencode($data),headers=>{%$headers,'content-type'=>'application/x-www-form-urlencoded' },})}sub mirror {my ($self,$url,$file,$args)=@_;@_==3 || (@_==4 && ref$args eq 'HASH')or Carp::croak(q/Usage: $http->mirror(URL, FILE, [HASHREF])/ ."\n");if (-e $file and my$mtime=(stat($file))[9]){$args->{headers}{'if-modified-since'}||=$self->_http_date($mtime)}my$tempfile=$file .int(rand(2**31));open my$fh,">",$tempfile or Carp::croak(qq/Error: Could not open temporary file $tempfile for downloading: $!\n/);binmode$fh;$args->{data_callback}=sub {print {$fh}$_[0]};my$response=$self->request('GET',$url,$args);close$fh or Carp::croak(qq/Error: Could not close temporary file $tempfile: $!\n/);if ($response->{success}){rename$tempfile,$file or Carp::croak(qq/Error replacing $file with $tempfile: $!\n/);my$lm=$response->{headers}{'last-modified'};if ($lm and my$mtime=$self->_parse_http_date($lm)){utime$mtime,$mtime,$file}}$response->{success}||=$response->{status}eq '304';unlink$tempfile;return$response}my%idempotent=map {$_=>1}qw/GET HEAD PUT DELETE OPTIONS TRACE/;sub request {my ($self,$method,$url,$args)=@_;@_==3 || (@_==4 && ref$args eq 'HASH')or Carp::croak(q/Usage: $http->request(METHOD, URL, [HASHREF])/ ."\n");$args ||={};my$response;for (0 .. 1){$response=eval {$self->_request($method,$url,$args)};last unless $@ && $idempotent{$method}&& $@ =~ m{^(?:Socket closed|Unexpected end)}}if (my$e="$@"){$response={url=>$url,success=>q{},status=>599,reason=>'Internal Exception',content=>$e,headers=>{'content-type'=>'text/plain','content-length'=>length$e,}}}return$response}sub www_form_urlencode {my ($self,$data)=@_;(@_==2 && ref$data)or Carp::croak(q/Usage: $http->www_form_urlencode(DATAREF)/ ."\n");(ref$data eq 'HASH' || ref$data eq 'ARRAY')or Carp::croak("form data must be a hash or array reference\n");my@params=ref$data eq 'HASH' ? %$data : @$data;@params % 2==0 or Carp::croak("form data reference must have an even number of terms\n");my@terms;while(@params){my ($key,$value)=splice(@params,0,2);if (ref$value eq 'ARRAY'){unshift@params,map {$key=>$_}@$value}else {push@terms,join("=",map {$self->_uri_escape($_)}$key,$value)}}return join("&",sort@terms)}my%DefaultPort=(http=>80,https=>443,);sub _agent {my$class=ref($_[0])|| $_[0];(my$default_agent=$class)=~ s{::}{-}g;return$default_agent ."/" .($class->VERSION || 0)}sub _request {my ($self,$method,$url,$args)=@_;my ($scheme,$host,$port,$path_query,$auth)=$self->_split_url($url);my$request={method=>$method,scheme=>$scheme,host_port=>($port==$DefaultPort{$scheme}? $host : "$host:$port"),uri=>$path_query,headers=>{},};my$handle=HTTP::Tiny::Handle->new(timeout=>$self->{timeout},SSL_options=>$self->{SSL_options},verify_SSL=>$self->{verify_SSL},local_address=>$self->{local_address},);if ($self->{proxy}&&!grep {$host =~ /\Q$_\E$/}@{$self->{no_proxy}}){$request->{uri}="$scheme://$request->{host_port}$path_query";die(qq/HTTPS via proxy is not supported\n/)if$request->{scheme}eq 'https';$handle->connect(($self->_split_url($self->{proxy}))[0..2])}else {$handle->connect($scheme,$host,$port)}$self->_prepare_headers_and_cb($request,$args,$url,$auth);$handle->write_request($request);my$response;do {$response=$handle->read_response_header}until (substr($response->{status},0,1)ne '1');$self->_update_cookie_jar($url,$response)if$self->{cookie_jar};if (my@redir_args=$self->_maybe_redirect($request,$response,$args)){$handle->close;return$self->_request(@redir_args,$args)}if ($method eq 'HEAD' || $response->{status}=~ /^[23]04/){}else {my$data_cb=$self->_prepare_data_cb($response,$args);$handle->read_body($data_cb,$response)}$handle->close;$response->{success}=substr($response->{status},0,1)eq '2';$response->{url}=$url;return$response}sub _prepare_headers_and_cb {my ($self,$request,$args,$url,$auth)=@_;for ($self->{default_headers},$args->{headers}){next unless defined;while (my ($k,$v)=each %$_){$request->{headers}{lc$k}=$v}}$request->{headers}{'host'}=$request->{host_port};$request->{headers}{'connection'}="close";$request->{headers}{'user-agent'}||=$self->{agent};if (defined$args->{content}){if (ref$args->{content}eq 'CODE'){$request->{headers}{'content-type'}||="application/octet-stream";$request->{headers}{'transfer-encoding'}='chunked' unless$request->{headers}{'content-length'}|| $request->{headers}{'transfer-encoding'};$request->{cb}=$args->{content}}elsif (length$args->{content}){my$content=$args->{content};if ($] ge '5.008'){utf8::downgrade($content,1)or die(qq/Wide character in request message body\n/)}$request->{headers}{'content-type'}||="application/octet-stream";$request->{headers}{'content-length'}=length$content unless$request->{headers}{'content-length'}|| $request->{headers}{'transfer-encoding'};$request->{cb}=sub {substr$content,0,length$content,''}}$request->{trailer_cb}=$args->{trailer_callback}if ref$args->{trailer_callback}eq 'CODE'}if ($self->{cookie_jar}){my$cookies=$self->cookie_jar->cookie_header($url);$request->{headers}{cookie}=$cookies if length$cookies}if (length$auth &&!defined$request->{headers}{authentication}){require MIME::Base64;$request->{headers}{authorization}="Basic " .MIME::Base64::encode_base64($auth,"")}return}sub _prepare_data_cb {my ($self,$response,$args)=@_;my$data_cb=$args->{data_callback};$response->{content}='';if (!$data_cb || $response->{status}!~ /^2/){if (defined$self->{max_size}){$data_cb=sub {$_[1]->{content}.= $_[0];die(qq/Size of response body exceeds the maximum allowed of $self->{max_size}\n/)if length $_[1]->{content}> $self->{max_size}}}else {$data_cb=sub {$_[1]->{content}.= $_[0]}}}return$data_cb}sub _update_cookie_jar {my ($self,$url,$response)=@_;my$cookies=$response->{headers}->{'set-cookie'};return unless defined$cookies;my@cookies=ref$cookies ? @$cookies : $cookies;$self->cookie_jar->add($url,$_)for@cookies;return}sub _validate_cookie_jar {my ($class,$jar)=@_;for my$method (qw/add cookie_header/){Carp::croak(qq/Cookie jar must provide the '$method' method\n/)unless ref($jar)&& ref($jar)->can($method)}return}sub _maybe_redirect {my ($self,$request,$response,$args)=@_;my$headers=$response->{headers};my ($status,$method)=($response->{status},$request->{method});if (($status eq '303' or ($status =~ /^30[127]/ && $method =~ /^GET|HEAD$/))and $headers->{location}and ++$args->{redirects}<= $self->{max_redirect}){my$location=($headers->{location}=~ /^\//)? "$request->{scheme}://$request->{host_port}$headers->{location}" : $headers->{location};return (($status eq '303' ? 'GET' : $method),$location)}return}sub _split_url {my$url=pop;my ($scheme,$authority,$path_query)=$url =~ m<\A([^:/?#]+)://([^/?#]*)([^#]*)> or die(qq/Cannot parse URL: '$url'\n/);$scheme=lc$scheme;$path_query="/$path_query" unless$path_query =~ m<\A/>;my ($auth,$host);$authority=(length($authority))? $authority : 'localhost';if ($authority =~ /@/){($auth,$host)=$authority =~ m/\A([^@]*)@(.*)\z/}else {$host=$authority;$auth=''}$host=lc$host;my$port=do {$host =~ s/:([0-9]*)\z// && length $1 ? $1 : ($scheme eq 'http' ? 80 : $scheme eq 'https' ? 443 : undef)};return ($scheme,$host,$port,$path_query,$auth)}my$DoW="Sun|Mon|Tue|Wed|Thu|Fri|Sat";my$MoY="Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec";sub _http_date {my ($sec,$min,$hour,$mday,$mon,$year,$wday)=gmtime($_[1]);return sprintf("%s, %02d %s %04d %02d:%02d:%02d GMT",substr($DoW,$wday*4,3),$mday,substr($MoY,$mon*4,3),$year+1900,$hour,$min,$sec)}sub _parse_http_date {my ($self,$str)=@_;require Time::Local;my@tl_parts;if ($str =~ /^[SMTWF][a-z]+, +(\d{1,2}) ($MoY) +(\d\d\d\d) +(\d\d):(\d\d):(\d\d) +GMT$/){@tl_parts=($6,$5,$4,$1,(index($MoY,$2)/4),$3)}elsif ($str =~ /^[SMTWF][a-z]+, +(\d\d)-($MoY)-(\d{2,4}) +(\d\d):(\d\d):(\d\d) +GMT$/){@tl_parts=($6,$5,$4,$1,(index($MoY,$2)/4),$3)}elsif ($str =~ /^[SMTWF][a-z]+ +($MoY) +(\d{1,2}) +(\d\d):(\d\d):(\d\d) +(?:[^0-9]+ +)?(\d\d\d\d)$/){@tl_parts=($5,$4,$3,$2,(index($MoY,$1)/4),$6)}return eval {my$t=@tl_parts ? Time::Local::timegm(@tl_parts): -1;$t < 0 ? undef : $t}}my%escapes=map {chr($_)=>sprintf("%%%02X",$_)}0..255;$escapes{' '}="+";my$unsafe_char=qr/[^A-Za-z0-9\-\._~]/;sub _uri_escape {my ($self,$str)=@_;if ($] ge '5.008'){utf8::encode($str)}else {$str=pack("U*",unpack("C*",$str))if (length$str==do {use bytes;length$str});$str=pack("C*",unpack("C*",$str))}$str =~ s/($unsafe_char)/$escapes{$1}/ge;return$str}package HTTP::Tiny::Handle;use strict;use warnings;use Errno qw[EINTR EPIPE];use IO::Socket qw[SOCK_STREAM];sub BUFSIZE () {32768}my$Printable=sub {local $_=shift;s/\r/\\r/g;s/\n/\\n/g;s/\t/\\t/g;s/([^\x20-\x7E])/sprintf('\\x%.2X', ord($1))/ge;$_};my$Token=qr/[\x21\x23-\x27\x2A\x2B\x2D\x2E\x30-\x39\x41-\x5A\x5E-\x7A\x7C\x7E]/;sub new {my ($class,%args)=@_;return bless {rbuf=>'',timeout=>60,max_line_size=>16384,max_header_lines=>64,verify_SSL=>0,SSL_options=>{},%args },$class}sub connect {@_==4 || die(q/Usage: $handle->connect(scheme, host, port)/ ."\n");my ($self,$scheme,$host,$port)=@_;if ($scheme eq 'https'){die(qq/IO::Socket::SSL 1.42 must be installed for https support\n/)unless eval {require IO::Socket::SSL;IO::Socket::SSL->VERSION(1.42)};die(qq/Net::SSLeay 1.49 must be installed for https support\n/)unless eval {require Net::SSLeay;Net::SSLeay->VERSION(1.49)}}elsif ($scheme ne 'http'){die(qq/Unsupported URL scheme '$scheme'\n/)}$self->{fh}='IO::Socket::INET'->new(PeerHost=>$host,PeerPort=>$port,$self->{local_address}? (LocalAddr=>$self->{local_address}): (),Proto=>'tcp',Type=>SOCK_STREAM,Timeout=>$self->{timeout})or die(qq/Could not connect to '$host:$port': $@\n/);binmode($self->{fh})or die(qq/Could not binmode() socket: '$!'\n/);if ($scheme eq 'https'){my$ssl_args=$self->_ssl_args($host);IO::Socket::SSL->start_SSL($self->{fh},%$ssl_args,SSL_create_ctx_callback=>sub {my$ctx=shift;Net::SSLeay::CTX_set_mode($ctx,Net::SSLeay::MODE_AUTO_RETRY())},);unless (ref($self->{fh})eq 'IO::Socket::SSL'){my$ssl_err=IO::Socket::SSL->errstr;die(qq/SSL connection failed for $host: $ssl_err\n/)}}$self->{host}=$host;$self->{port}=$port;return$self}sub close {@_==1 || die(q/Usage: $handle->close()/ ."\n");my ($self)=@_;CORE::close($self->{fh})or die(qq/Could not close socket: '$!'\n/)}sub write {@_==2 || die(q/Usage: $handle->write(buf)/ ."\n");my ($self,$buf)=@_;if ($] ge '5.008'){utf8::downgrade($buf,1)or die(qq/Wide character in write()\n/)}my$len=length$buf;my$off=0;local$SIG{PIPE}='IGNORE';while (){$self->can_write or die(qq/Timed out while waiting for socket to become ready for writing\n/);my$r=syswrite($self->{fh},$buf,$len,$off);if (defined$r){$len -= $r;$off += $r;last unless$len > 0}elsif ($!==EPIPE){die(qq/Socket closed by remote server: $!\n/)}elsif ($!!=EINTR){if ($self->{fh}->can('errstr')){my$err=$self->{fh}->errstr();die (qq/Could not write to SSL socket: '$err'\n /)}else {die(qq/Could not write to socket: '$!'\n/)}}}return$off}sub read {@_==2 || @_==3 || die(q/Usage: $handle->read(len [, allow_partial])/ ."\n");my ($self,$len,$allow_partial)=@_;my$buf='';my$got=length$self->{rbuf};if ($got){my$take=($got < $len)? $got : $len;$buf=substr($self->{rbuf},0,$take,'');$len -= $take}while ($len > 0){$self->can_read or die(q/Timed out while waiting for socket to become ready for reading/ ."\n");my$r=sysread($self->{fh},$buf,$len,length$buf);if (defined$r){last unless$r;$len -= $r}elsif ($!!=EINTR){if ($self->{fh}->can('errstr')){my$err=$self->{fh}->errstr();die (qq/Could not read from SSL socket: '$err'\n /)}else {die(qq/Could not read from socket: '$!'\n/)}}}if ($len &&!$allow_partial){die(qq/Unexpected end of stream\n/)}return$buf}sub readline {@_==1 || die(q/Usage: $handle->readline()/ ."\n");my ($self)=@_;while (){if ($self->{rbuf}=~ s/\A ([^\x0D\x0A]* \x0D?\x0A)//x){return $1}if (length$self->{rbuf}>= $self->{max_line_size}){die(qq/Line size exceeds the maximum allowed size of $self->{max_line_size}\n/)}$self->can_read or die(qq/Timed out while waiting for socket to become ready for reading\n/);my$r=sysread($self->{fh},$self->{rbuf},BUFSIZE,length$self->{rbuf});if (defined$r){last unless$r}elsif ($!!=EINTR){if ($self->{fh}->can('errstr')){my$err=$self->{fh}->errstr();die (qq/Could not read from SSL socket: '$err'\n /)}else {die(qq/Could not read from socket: '$!'\n/)}}}die(qq/Unexpected end of stream while looking for line\n/)}sub read_header_lines {@_==1 || @_==2 || die(q/Usage: $handle->read_header_lines([headers])/ ."\n");my ($self,$headers)=@_;$headers ||={};my$lines=0;my$val;while (){my$line=$self->readline;if (++$lines >= $self->{max_header_lines}){die(qq/Header lines exceeds maximum number allowed of $self->{max_header_lines}\n/)}elsif ($line =~ /\A ([^\x00-\x1F\x7F:]+) : [\x09\x20]* ([^\x0D\x0A]*)/x){my ($field_name)=lc $1;if (exists$headers->{$field_name}){for ($headers->{$field_name}){$_=[$_]unless ref $_ eq "ARRAY";push @$_,$2;$val=\$_->[-1]}}else {$val=\($headers->{$field_name}=$2)}}elsif ($line =~ /\A [\x09\x20]+ ([^\x0D\x0A]*)/x){$val or die(qq/Unexpected header continuation line\n/);next unless length $1;$$val .= ' ' if length $$val;$$val .= $1}elsif ($line =~ /\A \x0D?\x0A \z/x){last}else {die(q/Malformed header line: / .$Printable->($line)."\n")}}return$headers}sub write_request {@_==2 || die(q/Usage: $handle->write_request(request)/ ."\n");my($self,$request)=@_;$self->write_request_header(@{$request}{qw/method uri headers/});$self->write_body($request)if$request->{cb};return}my%HeaderCase=('content-md5'=>'Content-MD5','etag'=>'ETag','te'=>'TE','www-authenticate'=>'WWW-Authenticate','x-xss-protection'=>'X-XSS-Protection',);sub write_header_lines {(@_==2 && ref $_[1]eq 'HASH')|| die(q/Usage: $handle->write_header_lines(headers)/ ."\n");my($self,$headers)=@_;my$buf='';while (my ($k,$v)=each %$headers){my$field_name=lc$k;if (exists$HeaderCase{$field_name}){$field_name=$HeaderCase{$field_name}}else {$field_name =~ /\A $Token+ \z/xo or die(q/Invalid HTTP header field name: / .$Printable->($field_name)."\n");$field_name =~ s/\b(\w)/\u$1/g;$HeaderCase{lc$field_name}=$field_name}for (ref$v eq 'ARRAY' ? @$v : $v){/[^\x0D\x0A]/ or die(qq/Invalid HTTP header field value ($field_name): / .$Printable->($_)."\n");$buf .= "$field_name: $_\x0D\x0A"}}$buf .= "\x0D\x0A";return$self->write($buf)}sub read_body {@_==3 || die(q/Usage: $handle->read_body(callback, response)/ ."\n");my ($self,$cb,$response)=@_;my$te=$response->{headers}{'transfer-encoding'}|| '';if (grep {/chunked/i}(ref$te eq 'ARRAY' ? @$te : $te)){$self->read_chunked_body($cb,$response)}else {$self->read_content_body($cb,$response)}return}sub write_body {@_==2 || die(q/Usage: $handle->write_body(request)/ ."\n");my ($self,$request)=@_;if ($request->{headers}{'content-length'}){return$self->write_content_body($request)}else {return$self->write_chunked_body($request)}}sub read_content_body {@_==3 || @_==4 || die(q/Usage: $handle->read_content_body(callback, response, [read_length])/ ."\n");my ($self,$cb,$response,$content_length)=@_;$content_length ||=$response->{headers}{'content-length'};if (defined$content_length){my$len=$content_length;while ($len > 0){my$read=($len > BUFSIZE)? BUFSIZE : $len;$cb->($self->read($read,0),$response);$len -= $read}}else {my$chunk;$cb->($chunk,$response)while length($chunk=$self->read(BUFSIZE,1))}return}sub write_content_body {@_==2 || die(q/Usage: $handle->write_content_body(request)/ ."\n");my ($self,$request)=@_;my ($len,$content_length)=(0,$request->{headers}{'content-length'});while (){my$data=$request->{cb}->();defined$data && length$data or last;if ($] ge '5.008'){utf8::downgrade($data,1)or die(qq/Wide character in write_content()\n/)}$len += $self->write($data)}$len==$content_length or die(qq/Content-Length missmatch (got: $len expected: $content_length)\n/);return$len}sub read_chunked_body {@_==3 || die(q/Usage: $handle->read_chunked_body(callback, $response)/ ."\n");my ($self,$cb,$response)=@_;while (){my$head=$self->readline;$head =~ /\A ([A-Fa-f0-9]+)/x or die(q/Malformed chunk head: / .$Printable->($head)."\n");my$len=hex($1)or last;$self->read_content_body($cb,$response,$len);$self->read(2)eq "\x0D\x0A" or die(qq/Malformed chunk: missing CRLF after chunk data\n/)}$self->read_header_lines($response->{headers});return}sub write_chunked_body {@_==2 || die(q/Usage: $handle->write_chunked_body(request)/ ."\n");my ($self,$request)=@_;my$len=0;while (){my$data=$request->{cb}->();defined$data && length$data or last;if ($] ge '5.008'){utf8::downgrade($data,1)or die(qq/Wide character in write_chunked_body()\n/)}$len += length$data;my$chunk=sprintf '%X',length$data;$chunk .= "\x0D\x0A";$chunk .= $data;$chunk .= "\x0D\x0A";$self->write($chunk)}$self->write("0\x0D\x0A");$self->write_header_lines($request->{trailer_cb}->())if ref$request->{trailer_cb}eq 'CODE';return$len}sub read_response_header {@_==1 || die(q/Usage: $handle->read_response_header()/ ."\n");my ($self)=@_;my$line=$self->readline;$line =~ /\A (HTTP\/(0*\d+\.0*\d+)) [\x09\x20]+ ([0-9]{3}) [\x09\x20]+ ([^\x0D\x0A]*) \x0D?\x0A/x or die(q/Malformed Status-Line: / .$Printable->($line)."\n");my ($protocol,$version,$status,$reason)=($1,$2,$3,$4);die (qq/Unsupported HTTP protocol: $protocol\n/)unless$version =~ /0*1\.0*[01]/;return {status=>$status,reason=>$reason,headers=>$self->read_header_lines,protocol=>$protocol,}}sub write_request_header {@_==4 || die(q/Usage: $handle->write_request_header(method, request_uri, headers)/ ."\n");my ($self,$method,$request_uri,$headers)=@_;return$self->write("$method $request_uri HTTP/1.1\x0D\x0A")+ $self->write_header_lines($headers)}sub _do_timeout {my ($self,$type,$timeout)=@_;$timeout=$self->{timeout}unless defined$timeout && $timeout >= 0;my$fd=fileno$self->{fh};defined$fd && $fd >= 0 or die(qq/select(2): 'Bad file descriptor'\n/);my$initial=time;my$pending=$timeout;my$nfound;vec(my$fdset='',$fd,1)=1;while (){$nfound=($type eq 'read')? select($fdset,undef,undef,$pending): select(undef,$fdset,undef,$pending);if ($nfound==-1){$!==EINTR or die(qq/select(2): '$!'\n/);redo if!$timeout || ($pending=$timeout - (time - $initial))> 0;$nfound=0}last}$!=0;return$nfound}sub can_read {@_==1 || @_==2 || die(q/Usage: $handle->can_read([timeout])/ ."\n");my$self=shift;return$self->_do_timeout('read',@_)}sub can_write {@_==1 || @_==2 || die(q/Usage: $handle->can_write([timeout])/ ."\n");my$self=shift;return$self->_do_timeout('write',@_)}sub _find_CA_file {my$self=shift();return$self->{SSL_options}->{SSL_ca_file}if$self->{SSL_options}->{SSL_ca_file}and -e $self->{SSL_options}->{SSL_ca_file};return Mozilla::CA::SSL_ca_file()if eval {require Mozilla::CA};for my$ca_bundle (qw{/etc/ssl/certs/ca-certificates.crt /etc/pki/tls/certs/ca-bundle.crt /etc/ssl/ca-bundle.pem}){return$ca_bundle if -e $ca_bundle}die qq/Couldn't find a CA bundle with which to verify the SSL certificate.\n/ .qq/Try installing Mozilla::CA from CPAN\n/}sub _ssl_args {my ($self,$host)=@_;my%ssl_args;if (Net::SSLeay::OPENSSL_VERSION_NUMBER()>= 0x01000000){$ssl_args{SSL_hostname}=$host,}if ($self->{verify_SSL}){$ssl_args{SSL_verifycn_scheme}='http';$ssl_args{SSL_verifycn_name}=$host;$ssl_args{SSL_verify_mode}=0x01;$ssl_args{SSL_ca_file}=$self->_find_CA_file}else {$ssl_args{SSL_verifycn_scheme}='none';$ssl_args{SSL_verify_mode}=0x00}for my$k (keys %{$self->{SSL_options}}){$ssl_args{$k}=$self->{SSL_options}{$k}if$k =~ m/^SSL_/}return \%ssl_args}1;
+ sub $sub_name {
+ my (\$self, \$url, \$args) = \@_;
+ \@_ == 2 || (\@_ == 3 && ref \$args eq 'HASH')
+ or Carp::croak(q/Usage: \$http->$sub_name(URL, [HASHREF])/ . "\n");
+ return \$self->request('$req_method', \$url, \$args || {});
+ }
+ HERE
HTTP_TINY
$fatpacked{"JSON/PP.pm"} = <<'JSON_PP';
- package JSON::PP;
-
- # JSON-2.0
-
- use 5.005;
- use strict;
- use base qw(Exporter);
- use overload ();
-
- use Carp ();
- use B ();
- #use Devel::Peek;
-
- $JSON::PP::VERSION = '2.27200';
-
- @JSON::PP::EXPORT = qw(encode_json decode_json from_json to_json);
-
- # instead of hash-access, i tried index-access for speed.
- # but this method is not faster than what i expected. so it will be changed.
-
- use constant P_ASCII => 0;
- use constant P_LATIN1 => 1;
- use constant P_UTF8 => 2;
- use constant P_INDENT => 3;
- use constant P_CANONICAL => 4;
- use constant P_SPACE_BEFORE => 5;
- use constant P_SPACE_AFTER => 6;
- use constant P_ALLOW_NONREF => 7;
- use constant P_SHRINK => 8;
- use constant P_ALLOW_BLESSED => 9;
- use constant P_CONVERT_BLESSED => 10;
- use constant P_RELAXED => 11;
-
- use constant P_LOOSE => 12;
- use constant P_ALLOW_BIGNUM => 13;
- use constant P_ALLOW_BAREKEY => 14;
- use constant P_ALLOW_SINGLEQUOTE => 15;
- use constant P_ESCAPE_SLASH => 16;
- use constant P_AS_NONBLESSED => 17;
-
- use constant P_ALLOW_UNKNOWN => 18;
-
- use constant OLD_PERL => $] < 5.008 ? 1 : 0;
-
- BEGIN {
- my @xs_compati_bit_properties = qw(
- latin1 ascii utf8 indent canonical space_before space_after allow_nonref shrink
- allow_blessed convert_blessed relaxed allow_unknown
- );
- my @pp_bit_properties = qw(
- allow_singlequote allow_bignum loose
- allow_barekey escape_slash as_nonblessed
- );
-
- # Perl version check, Unicode handling is enable?
- # Helper module sets @JSON::PP::_properties.
- if ($] < 5.008 ) {
- my $helper = $] >= 5.006 ? 'JSON::PP::Compat5006' : 'JSON::PP::Compat5005';
- eval qq| require $helper |;
- if ($@) { Carp::croak $@; }
- }
-
- for my $name (@xs_compati_bit_properties, @pp_bit_properties) {
- my $flag_name = 'P_' . uc($name);
-
- eval qq/
+ package JSON::PP;use 5.005;use strict;use base qw(Exporter);use overload ();use Carp ();use B ();$JSON::PP::VERSION='2.27202';@JSON::PP::EXPORT=qw(encode_json decode_json from_json to_json);use constant P_ASCII=>0;use constant P_LATIN1=>1;use constant P_UTF8=>2;use constant P_INDENT=>3;use constant P_CANONICAL=>4;use constant P_SPACE_BEFORE=>5;use constant P_SPACE_AFTER=>6;use constant P_ALLOW_NONREF=>7;use constant P_SHRINK=>8;use constant P_ALLOW_BLESSED=>9;use constant P_CONVERT_BLESSED=>10;use constant P_RELAXED=>11;use constant P_LOOSE=>12;use constant P_ALLOW_BIGNUM=>13;use constant P_ALLOW_BAREKEY=>14;use constant P_ALLOW_SINGLEQUOTE=>15;use constant P_ESCAPE_SLASH=>16;use constant P_AS_NONBLESSED=>17;use constant P_ALLOW_UNKNOWN=>18;use constant OLD_PERL=>$] < 5.008 ? 1 : 0;BEGIN {my@xs_compati_bit_properties=qw(latin1 ascii utf8 indent canonical space_before space_after allow_nonref shrink allow_blessed convert_blessed relaxed allow_unknown);my@pp_bit_properties=qw(allow_singlequote allow_bignum loose allow_barekey escape_slash as_nonblessed);if ($] < 5.008){my$helper=$] >= 5.006 ? 'JSON::PP::Compat5006' : 'JSON::PP::Compat5005';eval qq| require $helper |;if ($@){Carp::croak $@}}for my$name (@xs_compati_bit_properties,@pp_bit_properties){my$flag_name='P_' .uc($name);eval qq/
sub $name {
my \$enable = defined \$_[1] ? \$_[1] : 1;
@@ -6560,1090 +271,7 @@ $fatpacked{"JSON/PP.pm"} = <<'JSON_PP';
sub get_$name {
\$_[0]->{PROPS}->[$flag_name] ? 1 : '';
}
- /;
- }
-
- }
-
-
-
- # Functions
-
- my %encode_allow_method
- = map {($_ => 1)} qw/utf8 pretty allow_nonref latin1 self_encode escape_slash
- allow_blessed convert_blessed indent indent_length allow_bignum
- as_nonblessed
- /;
- my %decode_allow_method
- = map {($_ => 1)} qw/utf8 allow_nonref loose allow_singlequote allow_bignum
- allow_barekey max_size relaxed/;
-
-
- my $JSON; # cache
-
- sub encode_json ($) { # encode
- ($JSON ||= __PACKAGE__->new->utf8)->encode(@_);
- }
-
-
- sub decode_json { # decode
- ($JSON ||= __PACKAGE__->new->utf8)->decode(@_);
- }
-
- # Obsoleted
-
- sub to_json($) {
- Carp::croak ("JSON::PP::to_json has been renamed to encode_json.");
- }
-
-
- sub from_json($) {
- Carp::croak ("JSON::PP::from_json has been renamed to decode_json.");
- }
-
-
- # Methods
-
- sub new {
- my $class = shift;
- my $self = {
- max_depth => 512,
- max_size => 0,
- indent => 0,
- FLAGS => 0,
- fallback => sub { encode_error('Invalid value. JSON can only reference.') },
- indent_length => 3,
- };
-
- bless $self, $class;
- }
-
-
- sub encode {
- return $_[0]->PP_encode_json($_[1]);
- }
-
-
- sub decode {
- return $_[0]->PP_decode_json($_[1], 0x00000000);
- }
-
-
- sub decode_prefix {
- return $_[0]->PP_decode_json($_[1], 0x00000001);
- }
-
-
- # accessor
-
-
- # pretty printing
-
- sub pretty {
- my ($self, $v) = @_;
- my $enable = defined $v ? $v : 1;
-
- if ($enable) { # indent_length(3) for JSON::XS compatibility
- $self->indent(1)->indent_length(3)->space_before(1)->space_after(1);
- }
- else {
- $self->indent(0)->space_before(0)->space_after(0);
- }
-
- $self;
- }
-
- # etc
-
- sub max_depth {
- my $max = defined $_[1] ? $_[1] : 0x80000000;
- $_[0]->{max_depth} = $max;
- $_[0];
- }
-
-
- sub get_max_depth { $_[0]->{max_depth}; }
-
-
- sub max_size {
- my $max = defined $_[1] ? $_[1] : 0;
- $_[0]->{max_size} = $max;
- $_[0];
- }
-
-
- sub get_max_size { $_[0]->{max_size}; }
-
-
- sub filter_json_object {
- $_[0]->{cb_object} = defined $_[1] ? $_[1] : 0;
- $_[0]->{F_HOOK} = ($_[0]->{cb_object} or $_[0]->{cb_sk_object}) ? 1 : 0;
- $_[0];
- }
-
- sub filter_json_single_key_object {
- if (@_ > 1) {
- $_[0]->{cb_sk_object}->{$_[1]} = $_[2];
- }
- $_[0]->{F_HOOK} = ($_[0]->{cb_object} or $_[0]->{cb_sk_object}) ? 1 : 0;
- $_[0];
- }
-
- sub indent_length {
- if (!defined $_[1] or $_[1] > 15 or $_[1] < 0) {
- Carp::carp "The acceptable range of indent_length() is 0 to 15.";
- }
- else {
- $_[0]->{indent_length} = $_[1];
- }
- $_[0];
- }
-
- sub get_indent_length {
- $_[0]->{indent_length};
- }
-
- sub sort_by {
- $_[0]->{sort_by} = defined $_[1] ? $_[1] : 1;
- $_[0];
- }
-
- sub allow_bigint {
- Carp::carp("allow_bigint() is obsoleted. use allow_bignum() insted.");
- }
-
- ###############################
-
- ###
- ### Perl => JSON
- ###
-
-
- { # Convert
-
- my $max_depth;
- my $indent;
- my $ascii;
- my $latin1;
- my $utf8;
- my $space_before;
- my $space_after;
- my $canonical;
- my $allow_blessed;
- my $convert_blessed;
-
- my $indent_length;
- my $escape_slash;
- my $bignum;
- my $as_nonblessed;
-
- my $depth;
- my $indent_count;
- my $keysort;
-
-
- sub PP_encode_json {
- my $self = shift;
- my $obj = shift;
-
- $indent_count = 0;
- $depth = 0;
-
- my $idx = $self->{PROPS};
-
- ($ascii, $latin1, $utf8, $indent, $canonical, $space_before, $space_after, $allow_blessed,
- $convert_blessed, $escape_slash, $bignum, $as_nonblessed)
- = @{$idx}[P_ASCII .. P_SPACE_AFTER, P_ALLOW_BLESSED, P_CONVERT_BLESSED,
- P_ESCAPE_SLASH, P_ALLOW_BIGNUM, P_AS_NONBLESSED];
-
- ($max_depth, $indent_length) = @{$self}{qw/max_depth indent_length/};
-
- $keysort = $canonical ? sub { $a cmp $b } : undef;
-
- if ($self->{sort_by}) {
- $keysort = ref($self->{sort_by}) eq 'CODE' ? $self->{sort_by}
- : $self->{sort_by} =~ /\D+/ ? $self->{sort_by}
- : sub { $a cmp $b };
- }
-
- encode_error("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)")
- if(!ref $obj and !$idx->[ P_ALLOW_NONREF ]);
-
- my $str = $self->object_to_json($obj);
-
- $str .= "\n" if ( $indent ); # JSON::XS 2.26 compatible
-
- unless ($ascii or $latin1 or $utf8) {
- utf8::upgrade($str);
- }
-
- if ($idx->[ P_SHRINK ]) {
- utf8::downgrade($str, 1);
- }
-
- return $str;
- }
-
-
- sub object_to_json {
- my ($self, $obj) = @_;
- my $type = ref($obj);
-
- if($type eq 'HASH'){
- return $self->hash_to_json($obj);
- }
- elsif($type eq 'ARRAY'){
- return $self->array_to_json($obj);
- }
- elsif ($type) { # blessed object?
- if (blessed($obj)) {
-
- return $self->value_to_json($obj) if ( $obj->isa('JSON::PP::Boolean') );
-
- if ( $convert_blessed and $obj->can('TO_JSON') ) {
- my $result = $obj->TO_JSON();
- if ( defined $result and ref( $result ) ) {
- if ( refaddr( $obj ) eq refaddr( $result ) ) {
- encode_error( sprintf(
- "%s::TO_JSON method returned same object as was passed instead of a new one",
- ref $obj
- ) );
- }
- }
-
- return $self->object_to_json( $result );
- }
-
- return "$obj" if ( $bignum and _is_bignum($obj) );
- return $self->blessed_to_json($obj) if ($allow_blessed and $as_nonblessed); # will be removed.
-
- encode_error( sprintf("encountered object '%s', but neither allow_blessed "
- . "nor convert_blessed settings are enabled", $obj)
- ) unless ($allow_blessed);
-
- return 'null';
- }
- else {
- return $self->value_to_json($obj);
- }
- }
- else{
- return $self->value_to_json($obj);
- }
- }
-
-
- sub hash_to_json {
- my ($self, $obj) = @_;
- my @res;
-
- encode_error("json text or perl structure exceeds maximum nesting level (max_depth set too low?)")
- if (++$depth > $max_depth);
-
- my ($pre, $post) = $indent ? $self->_up_indent() : ('', '');
- my $del = ($space_before ? ' ' : '') . ':' . ($space_after ? ' ' : '');
-
- for my $k ( _sort( $obj ) ) {
- if ( OLD_PERL ) { utf8::decode($k) } # key for Perl 5.6 / be optimized
- push @res, string_to_json( $self, $k )
- . $del
- . ( $self->object_to_json( $obj->{$k} ) || $self->value_to_json( $obj->{$k} ) );
- }
-
- --$depth;
- $self->_down_indent() if ($indent);
-
- return '{' . ( @res ? $pre : '' ) . ( @res ? join( ",$pre", @res ) . $post : '' ) . '}';
- }
-
-
- sub array_to_json {
- my ($self, $obj) = @_;
- my @res;
-
- encode_error("json text or perl structure exceeds maximum nesting level (max_depth set too low?)")
- if (++$depth > $max_depth);
-
- my ($pre, $post) = $indent ? $self->_up_indent() : ('', '');
-
- for my $v (@$obj){
- push @res, $self->object_to_json($v) || $self->value_to_json($v);
- }
-
- --$depth;
- $self->_down_indent() if ($indent);
-
- return '[' . ( @res ? $pre : '' ) . ( @res ? join( ",$pre", @res ) . $post : '' ) . ']';
- }
-
-
- sub value_to_json {
- my ($self, $value) = @_;
-
- return 'null' if(!defined $value);
-
- my $b_obj = B::svref_2object(\$value); # for round trip problem
- my $flags = $b_obj->FLAGS;
-
- return $value # as is
- if $flags & ( B::SVp_IOK | B::SVp_NOK ) and !( $flags & B::SVp_POK ); # SvTYPE is IV or NV?
-
- my $type = ref($value);
-
- if(!$type){
- return string_to_json($self, $value);
- }
- elsif( blessed($value) and $value->isa('JSON::PP::Boolean') ){
- return $$value == 1 ? 'true' : 'false';
- }
- elsif ($type) {
- if ((overload::StrVal($value) =~ /=(\w+)/)[0]) {
- return $self->value_to_json("$value");
- }
-
- if ($type eq 'SCALAR' and defined $$value) {
- return $$value eq '1' ? 'true'
- : $$value eq '0' ? 'false'
- : $self->{PROPS}->[ P_ALLOW_UNKNOWN ] ? 'null'
- : encode_error("cannot encode reference to scalar");
- }
-
- if ( $self->{PROPS}->[ P_ALLOW_UNKNOWN ] ) {
- return 'null';
- }
- else {
- if ( $type eq 'SCALAR' or $type eq 'REF' ) {
- encode_error("cannot encode reference to scalar");
- }
- else {
- encode_error("encountered $value, but JSON can only represent references to arrays or hashes");
- }
- }
-
- }
- else {
- return $self->{fallback}->($value)
- if ($self->{fallback} and ref($self->{fallback}) eq 'CODE');
- return 'null';
- }
-
- }
-
-
- my %esc = (
- "\n" => '\n',
- "\r" => '\r',
- "\t" => '\t',
- "\f" => '\f',
- "\b" => '\b',
- "\"" => '\"',
- "\\" => '\\\\',
- "\'" => '\\\'',
- );
-
-
- sub string_to_json {
- my ($self, $arg) = @_;
-
- $arg =~ s/([\x22\x5c\n\r\t\f\b])/$esc{$1}/g;
- $arg =~ s/\//\\\//g if ($escape_slash);
- $arg =~ s/([\x00-\x08\x0b\x0e-\x1f])/'\\u00' . unpack('H2', $1)/eg;
-
- if ($ascii) {
- $arg = JSON_PP_encode_ascii($arg);
- }
-
- if ($latin1) {
- $arg = JSON_PP_encode_latin1($arg);
- }
-
- if ($utf8) {
- utf8::encode($arg);
- }
-
- return '"' . $arg . '"';
- }
-
-
- sub blessed_to_json {
- my $reftype = reftype($_[1]) || '';
- if ($reftype eq 'HASH') {
- return $_[0]->hash_to_json($_[1]);
- }
- elsif ($reftype eq 'ARRAY') {
- return $_[0]->array_to_json($_[1]);
- }
- else {
- return 'null';
- }
- }
-
-
- sub encode_error {
- my $error = shift;
- Carp::croak "$error";
- }
-
-
- sub _sort {
- defined $keysort ? (sort $keysort (keys %{$_[0]})) : keys %{$_[0]};
- }
-
-
- sub _up_indent {
- my $self = shift;
- my $space = ' ' x $indent_length;
-
- my ($pre,$post) = ('','');
-
- $post = "\n" . $space x $indent_count;
-
- $indent_count++;
-
- $pre = "\n" . $space x $indent_count;
-
- return ($pre,$post);
- }
-
-
- sub _down_indent { $indent_count--; }
-
-
- sub PP_encode_box {
- {
- depth => $depth,
- indent_count => $indent_count,
- };
- }
-
- } # Convert
-
-
- sub _encode_ascii {
- join('',
- map {
- $_ <= 127 ?
- chr($_) :
- $_ <= 65535 ?
- sprintf('\u%04x', $_) : sprintf('\u%x\u%x', _encode_surrogates($_));
- } unpack('U*', $_[0])
- );
- }
-
-
- sub _encode_latin1 {
- join('',
- map {
- $_ <= 255 ?
- chr($_) :
- $_ <= 65535 ?
- sprintf('\u%04x', $_) : sprintf('\u%x\u%x', _encode_surrogates($_));
- } unpack('U*', $_[0])
- );
- }
-
-
- sub _encode_surrogates { # from perlunicode
- my $uni = $_[0] - 0x10000;
- return ($uni / 0x400 + 0xD800, $uni % 0x400 + 0xDC00);
- }
-
-
- sub _is_bignum {
- $_[0]->isa('Math::BigInt') or $_[0]->isa('Math::BigFloat');
- }
-
-
-
- #
- # JSON => Perl
- #
-
- my $max_intsize;
-
- BEGIN {
- my $checkint = 1111;
- for my $d (5..64) {
- $checkint .= 1;
- my $int = eval qq| $checkint |;
- if ($int =~ /[eE]/) {
- $max_intsize = $d - 1;
- last;
- }
- }
- }
-
- { # PARSE
-
- my %escapes = ( # by Jeremy Muhlich <jmuhlich [at] bitflood.org>
- b => "\x8",
- t => "\x9",
- n => "\xA",
- f => "\xC",
- r => "\xD",
- '\\' => '\\',
- '"' => '"',
- '/' => '/',
- );
-
- my $text; # json data
- my $at; # offset
- my $ch; # 1chracter
- my $len; # text length (changed according to UTF8 or NON UTF8)
- # INTERNAL
- my $depth; # nest counter
- my $encoding; # json text encoding
- my $is_valid_utf8; # temp variable
- my $utf8_len; # utf8 byte length
- # FLAGS
- my $utf8; # must be utf8
- my $max_depth; # max nest nubmer of objects and arrays
- my $max_size;
- my $relaxed;
- my $cb_object;
- my $cb_sk_object;
-
- my $F_HOOK;
-
- my $allow_bigint; # using Math::BigInt
- my $singlequote; # loosely quoting
- my $loose; #
- my $allow_barekey; # bareKey
-
- # $opt flag
- # 0x00000001 .... decode_prefix
- # 0x10000000 .... incr_parse
-
- sub PP_decode_json {
- my ($self, $opt); # $opt is an effective flag during this decode_json.
-
- ($self, $text, $opt) = @_;
-
- ($at, $ch, $depth) = (0, '', 0);
-
- if ( !defined $text or ref $text ) {
- decode_error("malformed JSON string, neither array, object, number, string or atom");
- }
-
- my $idx = $self->{PROPS};
-
- ($utf8, $relaxed, $loose, $allow_bigint, $allow_barekey, $singlequote)
- = @{$idx}[P_UTF8, P_RELAXED, P_LOOSE .. P_ALLOW_SINGLEQUOTE];
-
- if ( $utf8 ) {
- utf8::downgrade( $text, 1 ) or Carp::croak("Wide character in subroutine entry");
- }
- else {
- utf8::upgrade( $text );
- }
-
- $len = length $text;
-
- ($max_depth, $max_size, $cb_object, $cb_sk_object, $F_HOOK)
- = @{$self}{qw/max_depth max_size cb_object cb_sk_object F_HOOK/};
-
- if ($max_size > 1) {
- use bytes;
- my $bytes = length $text;
- decode_error(
- sprintf("attempted decode of JSON text of %s bytes size, but max_size is set to %s"
- , $bytes, $max_size), 1
- ) if ($bytes > $max_size);
- }
-
- # Currently no effect
- # should use regexp
- my @octets = unpack('C4', $text);
- $encoding = ( $octets[0] and $octets[1]) ? 'UTF-8'
- : (!$octets[0] and $octets[1]) ? 'UTF-16BE'
- : (!$octets[0] and !$octets[1]) ? 'UTF-32BE'
- : ( $octets[2] ) ? 'UTF-16LE'
- : (!$octets[2] ) ? 'UTF-32LE'
- : 'unknown';
-
- white(); # remove head white space
-
- my $valid_start = defined $ch; # Is there a first character for JSON structure?
-
- my $result = value();
-
- return undef if ( !$result && ( $opt & 0x10000000 ) ); # for incr_parse
-
- decode_error("malformed JSON string, neither array, object, number, string or atom") unless $valid_start;
-
- if ( !$idx->[ P_ALLOW_NONREF ] and !ref $result ) {
- decode_error(
- 'JSON text must be an object or array (but found number, string, true, false or null,'
- . ' use allow_nonref to allow this)', 1);
- }
-
- Carp::croak('something wrong.') if $len < $at; # we won't arrive here.
-
- my $consumed = defined $ch ? $at - 1 : $at; # consumed JSON text length
-
- white(); # remove tail white space
-
- if ( $ch ) {
- return ( $result, $consumed ) if ($opt & 0x00000001); # all right if decode_prefix
- decode_error("garbage after JSON object");
- }
-
- ( $opt & 0x00000001 ) ? ( $result, $consumed ) : $result;
- }
-
-
- sub next_chr {
- return $ch = undef if($at >= $len);
- $ch = substr($text, $at++, 1);
- }
-
-
- sub value {
- white();
- return if(!defined $ch);
- return object() if($ch eq '{');
- return array() if($ch eq '[');
- return string() if($ch eq '"' or ($singlequote and $ch eq "'"));
- return number() if($ch =~ /[0-9]/ or $ch eq '-');
- return word();
- }
-
- sub string {
- my ($i, $s, $t, $u);
- my $utf16;
- my $is_utf8;
-
- ($is_valid_utf8, $utf8_len) = ('', 0);
-
- $s = ''; # basically UTF8 flag on
-
- if($ch eq '"' or ($singlequote and $ch eq "'")){
- my $boundChar = $ch;
-
- OUTER: while( defined(next_chr()) ){
-
- if($ch eq $boundChar){
- next_chr();
-
- if ($utf16) {
- decode_error("missing low surrogate character in surrogate pair");
- }
-
- utf8::decode($s) if($is_utf8);
-
- return $s;
- }
- elsif($ch eq '\\'){
- next_chr();
- if(exists $escapes{$ch}){
- $s .= $escapes{$ch};
- }
- elsif($ch eq 'u'){ # UNICODE handling
- my $u = '';
-
- for(1..4){
- $ch = next_chr();
- last OUTER if($ch !~ /[0-9a-fA-F]/);
- $u .= $ch;
- }
-
- # U+D800 - U+DBFF
- if ($u =~ /^[dD][89abAB][0-9a-fA-F]{2}/) { # UTF-16 high surrogate?
- $utf16 = $u;
- }
- # U+DC00 - U+DFFF
- elsif ($u =~ /^[dD][c-fC-F][0-9a-fA-F]{2}/) { # UTF-16 low surrogate?
- unless (defined $utf16) {
- decode_error("missing high surrogate character in surrogate pair");
- }
- $is_utf8 = 1;
- $s .= JSON_PP_decode_surrogates($utf16, $u) || next;
- $utf16 = undef;
- }
- else {
- if (defined $utf16) {
- decode_error("surrogate pair expected");
- }
-
- if ( ( my $hex = hex( $u ) ) > 127 ) {
- $is_utf8 = 1;
- $s .= JSON_PP_decode_unicode($u) || next;
- }
- else {
- $s .= chr $hex;
- }
- }
-
- }
- else{
- unless ($loose) {
- $at -= 2;
- decode_error('illegal backslash escape sequence in string');
- }
- $s .= $ch;
- }
- }
- else{
-
- if ( ord $ch > 127 ) {
- if ( $utf8 ) {
- unless( $ch = is_valid_utf8($ch) ) {
- $at -= 1;
- decode_error("malformed UTF-8 character in JSON string");
- }
- else {
- $at += $utf8_len - 1;
- }
- }
- else {
- utf8::encode( $ch );
- }
-
- $is_utf8 = 1;
- }
-
- if (!$loose) {
- if ($ch =~ /[\x00-\x1f\x22\x5c]/) { # '/' ok
- $at--;
- decode_error('invalid character encountered while parsing JSON string');
- }
- }
-
- $s .= $ch;
- }
- }
- }
-
- decode_error("unexpected end of string while parsing JSON string");
- }
-
-
- sub white {
- while( defined $ch ){
- if($ch le ' '){
- next_chr();
- }
- elsif($ch eq '/'){
- next_chr();
- if(defined $ch and $ch eq '/'){
- 1 while(defined(next_chr()) and $ch ne "\n" and $ch ne "\r");
- }
- elsif(defined $ch and $ch eq '*'){
- next_chr();
- while(1){
- if(defined $ch){
- if($ch eq '*'){
- if(defined(next_chr()) and $ch eq '/'){
- next_chr();
- last;
- }
- }
- else{
- next_chr();
- }
- }
- else{
- decode_error("Unterminated comment");
- }
- }
- next;
- }
- else{
- $at--;
- decode_error("malformed JSON string, neither array, object, number, string or atom");
- }
- }
- else{
- if ($relaxed and $ch eq '#') { # correctly?
- pos($text) = $at;
- $text =~ /\G([^\n]*(?:\r\n|\r|\n|$))/g;
- $at = pos($text);
- next_chr;
- next;
- }
-
- last;
- }
- }
- }
-
-
- sub array {
- my $a = $_[0] || []; # you can use this code to use another array ref object.
-
- decode_error('json text or perl structure exceeds maximum nesting level (max_depth set too low?)')
- if (++$depth > $max_depth);
-
- next_chr();
- white();
-
- if(defined $ch and $ch eq ']'){
- --$depth;
- next_chr();
- return $a;
- }
- else {
- while(defined($ch)){
- push @$a, value();
-
- white();
-
- if (!defined $ch) {
- last;
- }
-
- if($ch eq ']'){
- --$depth;
- next_chr();
- return $a;
- }
-
- if($ch ne ','){
- last;
- }
-
- next_chr();
- white();
-
- if ($relaxed and $ch eq ']') {
- --$depth;
- next_chr();
- return $a;
- }
-
- }
- }
-
- decode_error(", or ] expected while parsing array");
- }
-
-
- sub object {
- my $o = $_[0] || {}; # you can use this code to use another hash ref object.
- my $k;
-
- decode_error('json text or perl structure exceeds maximum nesting level (max_depth set too low?)')
- if (++$depth > $max_depth);
- next_chr();
- white();
-
- if(defined $ch and $ch eq '}'){
- --$depth;
- next_chr();
- if ($F_HOOK) {
- return _json_object_hook($o);
- }
- return $o;
- }
- else {
- while (defined $ch) {
- $k = ($allow_barekey and $ch ne '"' and $ch ne "'") ? bareKey() : string();
- white();
-
- if(!defined $ch or $ch ne ':'){
- $at--;
- decode_error("':' expected");
- }
-
- next_chr();
- $o->{$k} = value();
- white();
-
- last if (!defined $ch);
-
- if($ch eq '}'){
- --$depth;
- next_chr();
- if ($F_HOOK) {
- return _json_object_hook($o);
- }
- return $o;
- }
-
- if($ch ne ','){
- last;
- }
-
- next_chr();
- white();
-
- if ($relaxed and $ch eq '}') {
- --$depth;
- next_chr();
- if ($F_HOOK) {
- return _json_object_hook($o);
- }
- return $o;
- }
-
- }
-
- }
-
- $at--;
- decode_error(", or } expected while parsing object/hash");
- }
-
-
- sub bareKey { # doesn't strictly follow Standard ECMA-262 3rd Edition
- my $key;
- while($ch =~ /[^\x00-\x23\x25-\x2F\x3A-\x40\x5B-\x5E\x60\x7B-\x7F]/){
- $key .= $ch;
- next_chr();
- }
- return $key;
- }
-
-
- sub word {
- my $word = substr($text,$at-1,4);
-
- if($word eq 'true'){
- $at += 3;
- next_chr;
- return $JSON::PP::true;
- }
- elsif($word eq 'null'){
- $at += 3;
- next_chr;
- return undef;
- }
- elsif($word eq 'fals'){
- $at += 3;
- if(substr($text,$at,1) eq 'e'){
- $at++;
- next_chr;
- return $JSON::PP::false;
- }
- }
-
- $at--; # for decode_error report
-
- decode_error("'null' expected") if ($word =~ /^n/);
- decode_error("'true' expected") if ($word =~ /^t/);
- decode_error("'false' expected") if ($word =~ /^f/);
- decode_error("malformed JSON string, neither array, object, number, string or atom");
- }
-
-
- sub number {
- my $n = '';
- my $v;
-
- # According to RFC4627, hex or oct digts are invalid.
- if($ch eq '0'){
- my $peek = substr($text,$at,1);
- my $hex = $peek =~ /[xX]/; # 0 or 1
-
- if($hex){
- decode_error("malformed number (leading zero must not be followed by another digit)");
- ($n) = ( substr($text, $at+1) =~ /^([0-9a-fA-F]+)/);
- }
- else{ # oct
- ($n) = ( substr($text, $at) =~ /^([0-7]+)/);
- if (defined $n and length $n > 1) {
- decode_error("malformed number (leading zero must not be followed by another digit)");
- }
- }
-
- if(defined $n and length($n)){
- if (!$hex and length($n) == 1) {
- decode_error("malformed number (leading zero must not be followed by another digit)");
- }
- $at += length($n) + $hex;
- next_chr;
- return $hex ? hex($n) : oct($n);
- }
- }
-
- if($ch eq '-'){
- $n = '-';
- next_chr;
- if (!defined $ch or $ch !~ /\d/) {
- decode_error("malformed number (no digits after initial minus)");
- }
- }
-
- while(defined $ch and $ch =~ /\d/){
- $n .= $ch;
- next_chr;
- }
-
- if(defined $ch and $ch eq '.'){
- $n .= '.';
-
- next_chr;
- if (!defined $ch or $ch !~ /\d/) {
- decode_error("malformed number (no digits after decimal point)");
- }
- else {
- $n .= $ch;
- }
-
- while(defined(next_chr) and $ch =~ /\d/){
- $n .= $ch;
- }
- }
-
- if(defined $ch and ($ch eq 'e' or $ch eq 'E')){
- $n .= $ch;
- next_chr;
-
- if(defined($ch) and ($ch eq '+' or $ch eq '-')){
- $n .= $ch;
- next_chr;
- if (!defined $ch or $ch =~ /\D/) {
- decode_error("malformed number (no digits after exp sign)");
- }
- $n .= $ch;
- }
- elsif(defined($ch) and $ch =~ /\d/){
- $n .= $ch;
- }
- else {
- decode_error("malformed number (no digits after exp sign)");
- }
-
- while(defined(next_chr) and $ch =~ /\d/){
- $n .= $ch;
- }
-
- }
-
- $v .= $n;
-
- if ($v !~ /[.eE]/ and length $v > $max_intsize) {
- if ($allow_bigint) { # from Adam Sussman
- require Math::BigInt;
- return Math::BigInt->new($v);
- }
- else {
- return "$v";
- }
- }
- elsif ($allow_bigint) {
- require Math::BigFloat;
- return Math::BigFloat->new($v);
- }
-
- return 0+$v;
- }
-
-
- sub is_valid_utf8 {
-
- $utf8_len = $_[0] =~ /[\x00-\x7F]/ ? 1
- : $_[0] =~ /[\xC2-\xDF]/ ? 2
- : $_[0] =~ /[\xE0-\xEF]/ ? 3
- : $_[0] =~ /[\xF0-\xF4]/ ? 4
- : 0
- ;
-
- return unless $utf8_len;
-
- my $is_valid_utf8 = substr($text, $at - 1, $utf8_len);
-
- return ( $is_valid_utf8 =~ /^(?:
+ /}}my%encode_allow_method =map {($_=>1)}qw/utf8 pretty allow_nonref latin1 self_encode escape_slash allow_blessed convert_blessed indent indent_length allow_bignum as_nonblessed/;my%decode_allow_method =map {($_=>1)}qw/utf8 allow_nonref loose allow_singlequote allow_bignum allow_barekey max_size relaxed/;my$JSON;sub encode_json ($) {($JSON ||=__PACKAGE__->new->utf8)->encode(@_)}sub decode_json {($JSON ||=__PACKAGE__->new->utf8)->decode(@_)}sub to_json($) {Carp::croak ("JSON::PP::to_json has been renamed to encode_json.")}sub from_json($) {Carp::croak ("JSON::PP::from_json has been renamed to decode_json.")}sub new {my$class=shift;my$self={max_depth=>512,max_size=>0,indent=>0,FLAGS=>0,fallback=>sub {encode_error('Invalid value. JSON can only reference.')},indent_length=>3,};bless$self,$class}sub encode {return $_[0]->PP_encode_json($_[1])}sub decode {return $_[0]->PP_decode_json($_[1],0x00000000)}sub decode_prefix {return $_[0]->PP_decode_json($_[1],0x00000001)}sub pretty {my ($self,$v)=@_;my$enable=defined$v ? $v : 1;if ($enable){$self->indent(1)->indent_length(3)->space_before(1)->space_after(1)}else {$self->indent(0)->space_before(0)->space_after(0)}$self}sub max_depth {my$max=defined $_[1]? $_[1]: 0x80000000;$_[0]->{max_depth}=$max;$_[0]}sub get_max_depth {$_[0]->{max_depth}}sub max_size {my$max=defined $_[1]? $_[1]: 0;$_[0]->{max_size}=$max;$_[0]}sub get_max_size {$_[0]->{max_size}}sub filter_json_object {$_[0]->{cb_object}=defined $_[1]? $_[1]: 0;$_[0]->{F_HOOK}=($_[0]->{cb_object}or $_[0]->{cb_sk_object})? 1 : 0;$_[0]}sub filter_json_single_key_object {if (@_ > 1){$_[0]->{cb_sk_object}->{$_[1]}=$_[2]}$_[0]->{F_HOOK}=($_[0]->{cb_object}or $_[0]->{cb_sk_object})? 1 : 0;$_[0]}sub indent_length {if (!defined $_[1]or $_[1]> 15 or $_[1]< 0){Carp::carp "The acceptable range of indent_length() is 0 to 15."}else {$_[0]->{indent_length}=$_[1]}$_[0]}sub get_indent_length {$_[0]->{indent_length}}sub sort_by {$_[0]->{sort_by}=defined $_[1]? $_[1]: 1;$_[0]}sub allow_bigint {Carp::carp("allow_bigint() is obsoleted. use allow_bignum() insted.")}{my$max_depth;my$indent;my$ascii;my$latin1;my$utf8;my$space_before;my$space_after;my$canonical;my$allow_blessed;my$convert_blessed;my$indent_length;my$escape_slash;my$bignum;my$as_nonblessed;my$depth;my$indent_count;my$keysort;sub PP_encode_json {my$self=shift;my$obj=shift;$indent_count=0;$depth=0;my$idx=$self->{PROPS};($ascii,$latin1,$utf8,$indent,$canonical,$space_before,$space_after,$allow_blessed,$convert_blessed,$escape_slash,$bignum,$as_nonblessed)=@{$idx}[P_ASCII .. P_SPACE_AFTER,P_ALLOW_BLESSED,P_CONVERT_BLESSED,P_ESCAPE_SLASH,P_ALLOW_BIGNUM,P_AS_NONBLESSED];($max_depth,$indent_length)=@{$self}{qw/max_depth indent_length/};$keysort=$canonical ? sub {$a cmp $b}: undef;if ($self->{sort_by}){$keysort=ref($self->{sort_by})eq 'CODE' ? $self->{sort_by}: $self->{sort_by}=~ /\D+/ ? $self->{sort_by}: sub {$a cmp $b}}encode_error("hash- or arrayref expected (not a simple scalar, use allow_nonref to allow this)")if(!ref$obj and!$idx->[P_ALLOW_NONREF ]);my$str=$self->object_to_json($obj);$str .= "\n" if ($indent);unless ($ascii or $latin1 or $utf8){utf8::upgrade($str)}if ($idx->[P_SHRINK ]){utf8::downgrade($str,1)}return$str}sub object_to_json {my ($self,$obj)=@_;my$type=ref($obj);if($type eq 'HASH'){return$self->hash_to_json($obj)}elsif($type eq 'ARRAY'){return$self->array_to_json($obj)}elsif ($type){if (blessed($obj)){return$self->value_to_json($obj)if ($obj->isa('JSON::PP::Boolean'));if ($convert_blessed and $obj->can('TO_JSON')){my$result=$obj->TO_JSON();if (defined$result and ref($result)){if (refaddr($obj)eq refaddr($result)){encode_error(sprintf("%s::TO_JSON method returned same object as was passed instead of a new one",ref$obj))}}return$self->object_to_json($result)}return "$obj" if ($bignum and _is_bignum($obj));return$self->blessed_to_json($obj)if ($allow_blessed and $as_nonblessed);encode_error(sprintf("encountered object '%s', but neither allow_blessed " ."nor convert_blessed settings are enabled",$obj))unless ($allow_blessed);return 'null'}else {return$self->value_to_json($obj)}}else{return$self->value_to_json($obj)}}sub hash_to_json {my ($self,$obj)=@_;my@res;encode_error("json text or perl structure exceeds maximum nesting level (max_depth set too low?)")if (++$depth > $max_depth);my ($pre,$post)=$indent ? $self->_up_indent(): ('','');my$del=($space_before ? ' ' : '').':' .($space_after ? ' ' : '');for my$k (_sort($obj)){if (OLD_PERL){utf8::decode($k)}push@res,string_to_json($self,$k).$del .($self->object_to_json($obj->{$k})|| $self->value_to_json($obj->{$k}))}--$depth;$self->_down_indent()if ($indent);return '{' .(@res ? $pre : '').(@res ? join(",$pre",@res).$post : '').'}'}sub array_to_json {my ($self,$obj)=@_;my@res;encode_error("json text or perl structure exceeds maximum nesting level (max_depth set too low?)")if (++$depth > $max_depth);my ($pre,$post)=$indent ? $self->_up_indent(): ('','');for my$v (@$obj){push@res,$self->object_to_json($v)|| $self->value_to_json($v)}--$depth;$self->_down_indent()if ($indent);return '[' .(@res ? $pre : '').(@res ? join(",$pre",@res).$post : '').']'}sub value_to_json {my ($self,$value)=@_;return 'null' if(!defined$value);my$b_obj=B::svref_2object(\$value);my$flags=$b_obj->FLAGS;return$value if$flags & (B::SVp_IOK | B::SVp_NOK)and!($flags & B::SVp_POK);my$type=ref($value);if(!$type){return string_to_json($self,$value)}elsif(blessed($value)and $value->isa('JSON::PP::Boolean')){return $$value==1 ? 'true' : 'false'}elsif ($type){if ((overload::StrVal($value)=~ /=(\w+)/)[0]){return$self->value_to_json("$value")}if ($type eq 'SCALAR' and defined $$value){return $$value eq '1' ? 'true' : $$value eq '0' ? 'false' : $self->{PROPS}->[P_ALLOW_UNKNOWN ]? 'null' : encode_error("cannot encode reference to scalar")}if ($self->{PROPS}->[P_ALLOW_UNKNOWN ]){return 'null'}else {if ($type eq 'SCALAR' or $type eq 'REF'){encode_error("cannot encode reference to scalar")}else {encode_error("encountered $value, but JSON can only represent references to arrays or hashes")}}}else {return$self->{fallback}->($value)if ($self->{fallback}and ref($self->{fallback})eq 'CODE');return 'null'}}my%esc=("\n"=>'\n',"\r"=>'\r',"\t"=>'\t',"\f"=>'\f',"\b"=>'\b',"\""=>'\"',"\\"=>'\\\\',"\'"=>'\\\'',);sub string_to_json {my ($self,$arg)=@_;$arg =~ s/([\x22\x5c\n\r\t\f\b])/$esc{$1}/g;$arg =~ s/\//\\\//g if ($escape_slash);$arg =~ s/([\x00-\x08\x0b\x0e-\x1f])/'\\u00' . unpack('H2', $1)/eg;if ($ascii){$arg=JSON_PP_encode_ascii($arg)}if ($latin1){$arg=JSON_PP_encode_latin1($arg)}if ($utf8){utf8::encode($arg)}return '"' .$arg .'"'}sub blessed_to_json {my$reftype=reftype($_[1])|| '';if ($reftype eq 'HASH'){return $_[0]->hash_to_json($_[1])}elsif ($reftype eq 'ARRAY'){return $_[0]->array_to_json($_[1])}else {return 'null'}}sub encode_error {my$error=shift;Carp::croak "$error"}sub _sort {defined$keysort ? (sort$keysort (keys %{$_[0]})): keys %{$_[0]}}sub _up_indent {my$self=shift;my$space=' ' x $indent_length;my ($pre,$post)=('','');$post="\n" .$space x $indent_count;$indent_count++;$pre="\n" .$space x $indent_count;return ($pre,$post)}sub _down_indent {$indent_count--}sub PP_encode_box {{depth=>$depth,indent_count=>$indent_count,}}}sub _encode_ascii {join('',map {$_ <= 127 ? chr($_): $_ <= 65535 ? sprintf('\u%04x',$_): sprintf('\u%x\u%x',_encode_surrogates($_))}unpack('U*',$_[0]))}sub _encode_latin1 {join('',map {$_ <= 255 ? chr($_): $_ <= 65535 ? sprintf('\u%04x',$_): sprintf('\u%x\u%x',_encode_surrogates($_))}unpack('U*',$_[0]))}sub _encode_surrogates {my$uni=$_[0]- 0x10000;return ($uni / 0x400 + 0xD800,$uni % 0x400 + 0xDC00)}sub _is_bignum {$_[0]->isa('Math::BigInt')or $_[0]->isa('Math::BigFloat')}my$max_intsize;BEGIN {my$checkint=1111;for my$d (5..64){$checkint .= 1;my$int=eval qq| $checkint |;if ($int =~ /[eE]/){$max_intsize=$d - 1;last}}}{my%escapes=(b=>"\x8",t=>"\x9",n=>"\xA",f=>"\xC",r=>"\xD",'\\'=>'\\','"'=>'"','/'=>'/',);my$text;my$at;my$ch;my$len;my$depth;my$encoding;my$is_valid_utf8;my$utf8_len;my$utf8;my$max_depth;my$max_size;my$relaxed;my$cb_object;my$cb_sk_object;my$F_HOOK;my$allow_bigint;my$singlequote;my$loose;my$allow_barekey;sub PP_decode_json {my ($self,$opt);($self,$text,$opt)=@_;($at,$ch,$depth)=(0,'',0);if (!defined$text or ref$text){decode_error("malformed JSON string, neither array, object, number, string or atom")}my$idx=$self->{PROPS};($utf8,$relaxed,$loose,$allow_bigint,$allow_barekey,$singlequote)=@{$idx}[P_UTF8,P_RELAXED,P_LOOSE .. P_ALLOW_SINGLEQUOTE];if ($utf8){utf8::downgrade($text,1)or Carp::croak("Wide character in subroutine entry")}else {utf8::upgrade($text)}$len=length$text;($max_depth,$max_size,$cb_object,$cb_sk_object,$F_HOOK)=@{$self}{qw/max_depth max_size cb_object cb_sk_object F_HOOK/};if ($max_size > 1){use bytes;my$bytes=length$text;decode_error(sprintf("attempted decode of JSON text of %s bytes size, but max_size is set to %s" ,$bytes,$max_size),1)if ($bytes > $max_size)}my@octets=unpack('C4',$text);$encoding=($octets[0]and $octets[1])? 'UTF-8' : (!$octets[0]and $octets[1])? 'UTF-16BE' : (!$octets[0]and!$octets[1])? 'UTF-32BE' : ($octets[2])? 'UTF-16LE' : (!$octets[2])? 'UTF-32LE' : 'unknown';white();my$valid_start=defined$ch;my$result=value();return undef if (!$result && ($opt & 0x10000000));decode_error("malformed JSON string, neither array, object, number, string or atom")unless$valid_start;if (!$idx->[P_ALLOW_NONREF ]and!ref$result){decode_error('JSON text must be an object or array (but found number, string, true, false or null,' .' use allow_nonref to allow this)',1)}Carp::croak('something wrong.')if$len < $at;my$consumed=defined$ch ? $at - 1 : $at;white();if ($ch){return ($result,$consumed)if ($opt & 0x00000001);decode_error("garbage after JSON object")}($opt & 0x00000001)? ($result,$consumed): $result}sub next_chr {return$ch=undef if($at >= $len);$ch=substr($text,$at++,1)}sub value {white();return if(!defined$ch);return object()if($ch eq '{');return array()if($ch eq '[');return string()if($ch eq '"' or ($singlequote and $ch eq "'"));return number()if($ch =~ /[0-9]/ or $ch eq '-');return word()}sub string {my ($i,$s,$t,$u);my$utf16;my$is_utf8;($is_valid_utf8,$utf8_len)=('',0);$s='';if($ch eq '"' or ($singlequote and $ch eq "'")){my$boundChar=$ch;OUTER: while(defined(next_chr())){if($ch eq $boundChar){next_chr();if ($utf16){decode_error("missing low surrogate character in surrogate pair")}utf8::decode($s)if($is_utf8);return$s}elsif($ch eq '\\'){next_chr();if(exists$escapes{$ch}){$s .= $escapes{$ch}}elsif($ch eq 'u'){my$u='';for(1..4){$ch=next_chr();last OUTER if($ch !~ /[0-9a-fA-F]/);$u .= $ch}if ($u =~ /^[dD][89abAB][0-9a-fA-F]{2}/){$utf16=$u}elsif ($u =~ /^[dD][c-fC-F][0-9a-fA-F]{2}/){unless (defined$utf16){decode_error("missing high surrogate character in surrogate pair")}$is_utf8=1;$s .= JSON_PP_decode_surrogates($utf16,$u)|| next;$utf16=undef}else {if (defined$utf16){decode_error("surrogate pair expected")}if ((my$hex=hex($u))> 127){$is_utf8=1;$s .= JSON_PP_decode_unicode($u)|| next}else {$s .= chr$hex}}}else{unless ($loose){$at -= 2;decode_error('illegal backslash escape sequence in string')}$s .= $ch}}else{if (ord$ch > 127){if ($utf8){unless($ch=is_valid_utf8($ch)){$at -= 1;decode_error("malformed UTF-8 character in JSON string")}else {$at += $utf8_len - 1}}else {utf8::encode($ch)}$is_utf8=1}if (!$loose){if ($ch =~ /[\x00-\x1f\x22\x5c]/){$at--;decode_error('invalid character encountered while parsing JSON string')}}$s .= $ch}}}decode_error("unexpected end of string while parsing JSON string")}sub white {while(defined$ch){if($ch le ' '){next_chr()}elsif($ch eq '/'){next_chr();if(defined$ch and $ch eq '/'){1 while(defined(next_chr())and $ch ne "\n" and $ch ne "\r")}elsif(defined$ch and $ch eq '*'){next_chr();while(1){if(defined$ch){if($ch eq '*'){if(defined(next_chr())and $ch eq '/'){next_chr();last}}else{next_chr()}}else{decode_error("Unterminated comment")}}next}else{$at--;decode_error("malformed JSON string, neither array, object, number, string or atom")}}else{if ($relaxed and $ch eq '#'){pos($text)=$at;$text =~ /\G([^\n]*(?:\r\n|\r|\n|$))/g;$at=pos($text);next_chr;next}last}}}sub array {my$a=$_[0]|| [];decode_error('json text or perl structure exceeds maximum nesting level (max_depth set too low?)')if (++$depth > $max_depth);next_chr();white();if(defined$ch and $ch eq ']'){--$depth;next_chr();return$a}else {while(defined($ch)){push @$a,value();white();if (!defined$ch){last}if($ch eq ']'){--$depth;next_chr();return$a}if($ch ne ','){last}next_chr();white();if ($relaxed and $ch eq ']'){--$depth;next_chr();return$a}}}decode_error(", or ] expected while parsing array")}sub object {my$o=$_[0]|| {};my$k;decode_error('json text or perl structure exceeds maximum nesting level (max_depth set too low?)')if (++$depth > $max_depth);next_chr();white();if(defined$ch and $ch eq '}'){--$depth;next_chr();if ($F_HOOK){return _json_object_hook($o)}return$o}else {while (defined$ch){$k=($allow_barekey and $ch ne '"' and $ch ne "'")? bareKey(): string();white();if(!defined$ch or $ch ne ':'){$at--;decode_error("':' expected")}next_chr();$o->{$k}=value();white();last if (!defined$ch);if($ch eq '}'){--$depth;next_chr();if ($F_HOOK){return _json_object_hook($o)}return$o}if($ch ne ','){last}next_chr();white();if ($relaxed and $ch eq '}'){--$depth;next_chr();if ($F_HOOK){return _json_object_hook($o)}return$o}}}$at--;decode_error(", or } expected while parsing object/hash")}sub bareKey {my$key;while($ch =~ /[^\x00-\x23\x25-\x2F\x3A-\x40\x5B-\x5E\x60\x7B-\x7F]/){$key .= $ch;next_chr()}return$key}sub word {my$word=substr($text,$at-1,4);if($word eq 'true'){$at += 3;next_chr;return$JSON::PP::true}elsif($word eq 'null'){$at += 3;next_chr;return undef}elsif($word eq 'fals'){$at += 3;if(substr($text,$at,1)eq 'e'){$at++;next_chr;return$JSON::PP::false}}$at--;decode_error("'null' expected")if ($word =~ /^n/);decode_error("'true' expected")if ($word =~ /^t/);decode_error("'false' expected")if ($word =~ /^f/);decode_error("malformed JSON string, neither array, object, number, string or atom")}sub number {my$n='';my$v;if($ch eq '0'){my$peek=substr($text,$at,1);my$hex=$peek =~ /[xX]/;if($hex){decode_error("malformed number (leading zero must not be followed by another digit)");($n)=(substr($text,$at+1)=~ /^([0-9a-fA-F]+)/)}else{($n)=(substr($text,$at)=~ /^([0-7]+)/);if (defined$n and length$n > 1){decode_error("malformed number (leading zero must not be followed by another digit)")}}if(defined$n and length($n)){if (!$hex and length($n)==1){decode_error("malformed number (leading zero must not be followed by another digit)")}$at += length($n)+ $hex;next_chr;return$hex ? hex($n): oct($n)}}if($ch eq '-'){$n='-';next_chr;if (!defined$ch or $ch !~ /\d/){decode_error("malformed number (no digits after initial minus)")}}while(defined$ch and $ch =~ /\d/){$n .= $ch;next_chr}if(defined$ch and $ch eq '.'){$n .= '.';next_chr;if (!defined$ch or $ch !~ /\d/){decode_error("malformed number (no digits after decimal point)")}else {$n .= $ch}while(defined(next_chr)and $ch =~ /\d/){$n .= $ch}}if(defined$ch and ($ch eq 'e' or $ch eq 'E')){$n .= $ch;next_chr;if(defined($ch)and ($ch eq '+' or $ch eq '-')){$n .= $ch;next_chr;if (!defined$ch or $ch =~ /\D/){decode_error("malformed number (no digits after exp sign)")}$n .= $ch}elsif(defined($ch)and $ch =~ /\d/){$n .= $ch}else {decode_error("malformed number (no digits after exp sign)")}while(defined(next_chr)and $ch =~ /\d/){$n .= $ch}}$v .= $n;if ($v !~ /[.eE]/ and length$v > $max_intsize){if ($allow_bigint){require Math::BigInt;return Math::BigInt->new($v)}else {return "$v"}}elsif ($allow_bigint){require Math::BigFloat;return Math::BigFloat->new($v)}return 0+$v}sub is_valid_utf8 {$utf8_len=$_[0]=~ /[\x00-\x7F]/ ? 1 : $_[0]=~ /[\xC2-\xDF]/ ? 2 : $_[0]=~ /[\xE0-\xEF]/ ? 3 : $_[0]=~ /[\xF0-\xF4]/ ? 4 : 0 ;return unless$utf8_len;my$is_valid_utf8=substr($text,$at - 1,$utf8_len);return ($is_valid_utf8 =~ /^(?:
[\x00-\x7F]
|[\xC2-\xDF][\x80-\xBF]
|[\xE0][\xA0-\xBF][\x80-\xBF]
@@ -7653,122 +281,7 @@ $fatpacked{"JSON/PP.pm"} = <<'JSON_PP';
|[\xF0][\x90-\xBF][\x80-\xBF][\x80-\xBF]
|[\xF1-\xF3][\x80-\xBF][\x80-\xBF][\x80-\xBF]
|[\xF4][\x80-\x8F][\x80-\xBF][\x80-\xBF]
- )$/x ) ? $is_valid_utf8 : '';
- }
-
-
- sub decode_error {
- my $error = shift;
- my $no_rep = shift;
- my $str = defined $text ? substr($text, $at) : '';
- my $mess = '';
- my $type = $] >= 5.008 ? 'U*'
- : $] < 5.006 ? 'C*'
- : utf8::is_utf8( $str ) ? 'U*' # 5.6
- : 'C*'
- ;
-
- for my $c ( unpack( $type, $str ) ) { # emulate pv_uni_display() ?
- $mess .= $c == 0x07 ? '\a'
- : $c == 0x09 ? '\t'
- : $c == 0x0a ? '\n'
- : $c == 0x0d ? '\r'
- : $c == 0x0c ? '\f'
- : $c < 0x20 ? sprintf('\x{%x}', $c)
- : $c == 0x5c ? '\\\\'
- : $c < 0x80 ? chr($c)
- : sprintf('\x{%x}', $c)
- ;
- if ( length $mess >= 20 ) {
- $mess .= '...';
- last;
- }
- }
-
- unless ( length $mess ) {
- $mess = '(end of string)';
- }
-
- Carp::croak (
- $no_rep ? "$error" : "$error, at character offset $at (before \"$mess\")"
- );
-
- }
-
-
- sub _json_object_hook {
- my $o = $_[0];
- my @ks = keys %{$o};
-
- if ( $cb_sk_object and @ks == 1 and exists $cb_sk_object->{ $ks[0] } and ref $cb_sk_object->{ $ks[0] } ) {
- my @val = $cb_sk_object->{ $ks[0] }->( $o->{$ks[0]} );
- if (@val == 1) {
- return $val[0];
- }
- }
-
- my @val = $cb_object->($o) if ($cb_object);
- if (@val == 0 or @val > 1) {
- return $o;
- }
- else {
- return $val[0];
- }
- }
-
-
- sub PP_decode_box {
- {
- text => $text,
- at => $at,
- ch => $ch,
- len => $len,
- depth => $depth,
- encoding => $encoding,
- is_valid_utf8 => $is_valid_utf8,
- };
- }
-
- } # PARSE
-
-
- sub _decode_surrogates { # from perlunicode
- my $uni = 0x10000 + (hex($_[0]) - 0xD800) * 0x400 + (hex($_[1]) - 0xDC00);
- my $un = pack('U*', $uni);
- utf8::encode( $un );
- return $un;
- }
-
-
- sub _decode_unicode {
- my $un = pack('U', hex shift);
- utf8::encode( $un );
- return $un;
- }
-
- #
- # Setup for various Perl versions (the code from JSON::PP58)
- #
-
- BEGIN {
-
- unless ( defined &utf8::is_utf8 ) {
- require Encode;
- *utf8::is_utf8 = *Encode::is_utf8;
- }
-
- if ( $] >= 5.008 ) {
- *JSON::PP::JSON_PP_encode_ascii = \&_encode_ascii;
- *JSON::PP::JSON_PP_encode_latin1 = \&_encode_latin1;
- *JSON::PP::JSON_PP_decode_surrogates = \&_decode_surrogates;
- *JSON::PP::JSON_PP_decode_unicode = \&_decode_unicode;
- }
-
- if ($] >= 5.008 and $] < 5.008003) { # join() in 5.8.0 - 5.8.2 is broken.
- package JSON::PP;
- require subs;
- subs->import('join');
- eval q|
+ )$/x)? $is_valid_utf8 : ''}sub decode_error {my$error=shift;my$no_rep=shift;my$str=defined$text ? substr($text,$at): '';my$mess='';my$type=$] >= 5.008 ? 'U*' : $] < 5.006 ? 'C*' : utf8::is_utf8($str)? 'U*' : 'C*' ;for my$c (unpack($type,$str)){$mess .= $c==0x07 ? '\a' : $c==0x09 ? '\t' : $c==0x0a ? '\n' : $c==0x0d ? '\r' : $c==0x0c ? '\f' : $c < 0x20 ? sprintf('\x{%x}',$c): $c==0x5c ? '\\\\' : $c < 0x80 ? chr($c): sprintf('\x{%x}',$c);if (length$mess >= 20){$mess .= '...';last}}unless (length$mess){$mess='(end of string)'}Carp::croak ($no_rep ? "$error" : "$error, at character offset $at (before \"$mess\")")}sub _json_object_hook {my$o=$_[0];my@ks=keys %{$o};if ($cb_sk_object and @ks==1 and exists$cb_sk_object->{$ks[0]}and ref$cb_sk_object->{$ks[0]}){my@val=$cb_sk_object->{$ks[0]}->($o->{$ks[0]});if (@val==1){return$val[0]}}my@val=$cb_object->($o)if ($cb_object);if (@val==0 or @val > 1){return$o}else {return$val[0]}}sub PP_decode_box {{text=>$text,at=>$at,ch=>$ch,len=>$len,depth=>$depth,encoding=>$encoding,is_valid_utf8=>$is_valid_utf8,}}}sub _decode_surrogates {my$uni=0x10000 + (hex($_[0])- 0xD800)* 0x400 + (hex($_[1])- 0xDC00);my$un=pack('U*',$uni);utf8::encode($un);return$un}sub _decode_unicode {my$un=pack('U',hex shift);utf8::encode($un);return$un}BEGIN {unless (defined&utf8::is_utf8){require Encode;*utf8::is_utf8=*Encode::is_utf8}if ($] >= 5.008){*JSON::PP::JSON_PP_encode_ascii=\&_encode_ascii;*JSON::PP::JSON_PP_encode_latin1=\&_encode_latin1;*JSON::PP::JSON_PP_decode_surrogates=\&_decode_surrogates;*JSON::PP::JSON_PP_decode_unicode=\&_decode_unicode}if ($] >= 5.008 and $] < 5.008003){package JSON::PP;require subs;subs->import('join');eval q|
sub join {
return '' if (@_ < 2);
my $j = shift;
@@ -7776,26 +289,7 @@ $fatpacked{"JSON/PP.pm"} = <<'JSON_PP';
for (@_) { $str .= $j . $_; }
return $str;
}
- |;
- }
-
-
- sub JSON::PP::incr_parse {
- local $Carp::CarpLevel = 1;
- ( $_[0]->{_incr_parser} ||= JSON::PP::IncrParser->new )->incr_parse( @_ );
- }
-
-
- sub JSON::PP::incr_skip {
- ( $_[0]->{_incr_parser} ||= JSON::PP::IncrParser->new )->incr_skip;
- }
-
-
- sub JSON::PP::incr_reset {
- ( $_[0]->{_incr_parser} ||= JSON::PP::IncrParser->new )->incr_reset;
- }
-
- eval q{
+ |}sub JSON::PP::incr_parse {local$Carp::CarpLevel=1;($_[0]->{_incr_parser}||=JSON::PP::IncrParser->new)->incr_parse(@_)}sub JSON::PP::incr_skip {($_[0]->{_incr_parser}||=JSON::PP::IncrParser->new)->incr_skip}sub JSON::PP::incr_reset {($_[0]->{_incr_parser}||=JSON::PP::IncrParser->new)->incr_reset}eval q{
sub JSON::PP::incr_text : lvalue {
$_[0]->{_incr_parser} ||= JSON::PP::IncrParser->new;
@@ -7804,334 +298,68 @@ $fatpacked{"JSON/PP.pm"} = <<'JSON_PP';
}
$_[0]->{_incr_parser}->{incr_text};
}
- } if ( $] >= 5.006 );
-
- } # Setup for various Perl versions (the code from JSON::PP58)
-
-
- ###############################
- # Utilities
- #
-
- BEGIN {
- eval 'require Scalar::Util';
- unless($@){
- *JSON::PP::blessed = \&Scalar::Util::blessed;
- *JSON::PP::reftype = \&Scalar::Util::reftype;
- *JSON::PP::refaddr = \&Scalar::Util::refaddr;
- }
- else{ # This code is from Sclar::Util.
- # warn $@;
- eval 'sub UNIVERSAL::a_sub_not_likely_to_be_here { ref($_[0]) }';
- *JSON::PP::blessed = sub {
- local($@, $SIG{__DIE__}, $SIG{__WARN__});
- ref($_[0]) ? eval { $_[0]->a_sub_not_likely_to_be_here } : undef;
- };
- my %tmap = qw(
- B::NULL SCALAR
- B::HV HASH
- B::AV ARRAY
- B::CV CODE
- B::IO IO
- B::GV GLOB
- B::REGEXP REGEXP
- );
- *JSON::PP::reftype = sub {
- my $r = shift;
-
- return undef unless length(ref($r));
-
- my $t = ref(B::svref_2object($r));
-
- return
- exists $tmap{$t} ? $tmap{$t}
- : length(ref($$r)) ? 'REF'
- : 'SCALAR';
- };
- *JSON::PP::refaddr = sub {
- return undef unless length(ref($_[0]));
-
- my $addr;
- if(defined(my $pkg = blessed($_[0]))) {
- $addr .= bless $_[0], 'Scalar::Util::Fake';
- bless $_[0], $pkg;
- }
- else {
- $addr .= $_[0]
- }
-
- $addr =~ /0x(\w+)/;
- local $^W;
- #no warnings 'portable';
- hex($1);
- }
- }
- }
-
-
- # shamely copied and modified from JSON::XS code.
-
- $JSON::PP::true = do { bless \(my $dummy = 1), "JSON::PP::Boolean" };
- $JSON::PP::false = do { bless \(my $dummy = 0), "JSON::PP::Boolean" };
-
- sub is_bool { defined $_[0] and UNIVERSAL::isa($_[0], "JSON::PP::Boolean"); }
-
- sub true { $JSON::PP::true }
- sub false { $JSON::PP::false }
- sub null { undef; }
-
- ###############################
-
- package JSON::PP::Boolean;
-
- use overload (
- "0+" => sub { ${$_[0]} },
- "++" => sub { $_[0] = ${$_[0]} + 1 },
- "--" => sub { $_[0] = ${$_[0]} - 1 },
- fallback => 1,
- );
-
-
- ###############################
-
- package JSON::PP::IncrParser;
-
- use strict;
-
- use constant INCR_M_WS => 0; # initial whitespace skipping
- use constant INCR_M_STR => 1; # inside string
- use constant INCR_M_BS => 2; # inside backslash
- use constant INCR_M_JSON => 3; # outside anything, count nesting
- use constant INCR_M_C0 => 4;
- use constant INCR_M_C1 => 5;
-
- $JSON::PP::IncrParser::VERSION = '1.01';
-
- my $unpack_format = $] < 5.006 ? 'C*' : 'U*';
-
- sub new {
- my ( $class ) = @_;
-
- bless {
- incr_nest => 0,
- incr_text => undef,
- incr_parsing => 0,
- incr_p => 0,
- }, $class;
- }
-
-
- sub incr_parse {
- my ( $self, $coder, $text ) = @_;
-
- $self->{incr_text} = '' unless ( defined $self->{incr_text} );
-
- if ( defined $text ) {
- if ( utf8::is_utf8( $text ) and !utf8::is_utf8( $self->{incr_text} ) ) {
- utf8::upgrade( $self->{incr_text} ) ;
- utf8::decode( $self->{incr_text} ) ;
- }
- $self->{incr_text} .= $text;
- }
-
-
- my $max_size = $coder->get_max_size;
-
- if ( defined wantarray ) {
-
- $self->{incr_mode} = INCR_M_WS unless defined $self->{incr_mode};
-
- if ( wantarray ) {
- my @ret;
-
- $self->{incr_parsing} = 1;
-
- do {
- push @ret, $self->_incr_parse( $coder, $self->{incr_text} );
-
- unless ( !$self->{incr_nest} and $self->{incr_mode} == INCR_M_JSON ) {
- $self->{incr_mode} = INCR_M_WS if $self->{incr_mode} != INCR_M_STR;
- }
-
- } until ( length $self->{incr_text} >= $self->{incr_p} );
-
- $self->{incr_parsing} = 0;
-
- return @ret;
- }
- else { # in scalar context
- $self->{incr_parsing} = 1;
- my $obj = $self->_incr_parse( $coder, $self->{incr_text} );
- $self->{incr_parsing} = 0 if defined $obj; # pointed by Martin J. Evans
- return $obj ? $obj : undef; # $obj is an empty string, parsing was completed.
- }
-
- }
-
- }
-
-
- sub _incr_parse {
- my ( $self, $coder, $text, $skip ) = @_;
- my $p = $self->{incr_p};
- my $restore = $p;
-
- my @obj;
- my $len = length $text;
-
- if ( $self->{incr_mode} == INCR_M_WS ) {
- while ( $len > $p ) {
- my $s = substr( $text, $p, 1 );
- $p++ and next if ( 0x20 >= unpack($unpack_format, $s) );
- $self->{incr_mode} = INCR_M_JSON;
- last;
- }
- }
-
- while ( $len > $p ) {
- my $s = substr( $text, $p++, 1 );
-
- if ( $s eq '"' ) {
- if (substr( $text, $p - 2, 1 ) eq '\\' ) {
- next;
- }
-
- if ( $self->{incr_mode} != INCR_M_STR ) {
- $self->{incr_mode} = INCR_M_STR;
- }
- else {
- $self->{incr_mode} = INCR_M_JSON;
- unless ( $self->{incr_nest} ) {
- last;
- }
- }
- }
-
- if ( $self->{incr_mode} == INCR_M_JSON ) {
-
- if ( $s eq '[' or $s eq '{' ) {
- if ( ++$self->{incr_nest} > $coder->get_max_depth ) {
- Carp::croak('json text or perl structure exceeds maximum nesting level (max_depth set too low?)');
- }
- }
- elsif ( $s eq ']' or $s eq '}' ) {
- last if ( --$self->{incr_nest} <= 0 );
- }
- elsif ( $s eq '#' ) {
- while ( $len > $p ) {
- last if substr( $text, $p++, 1 ) eq "\n";
- }
- }
-
- }
-
- }
-
- $self->{incr_p} = $p;
-
- return if ( $self->{incr_mode} == INCR_M_STR and not $self->{incr_nest} );
- return if ( $self->{incr_mode} == INCR_M_JSON and $self->{incr_nest} > 0 );
-
- return '' unless ( length substr( $self->{incr_text}, 0, $p ) );
-
- local $Carp::CarpLevel = 2;
-
- $self->{incr_p} = $restore;
- $self->{incr_c} = $p;
-
- my ( $obj, $tail ) = $coder->PP_decode_json( substr( $self->{incr_text}, 0, $p ), 0x10000001 );
-
- $self->{incr_text} = substr( $self->{incr_text}, $p );
- $self->{incr_p} = 0;
-
- return $obj or '';
- }
-
-
- sub incr_text {
- if ( $_[0]->{incr_parsing} ) {
- Carp::croak("incr_text can not be called when the incremental parser already started parsing");
- }
- $_[0]->{incr_text};
- }
-
-
- sub incr_skip {
- my $self = shift;
- $self->{incr_text} = substr( $self->{incr_text}, $self->{incr_c} );
- $self->{incr_p} = 0;
- }
-
-
- sub incr_reset {
- my $self = shift;
- $self->{incr_text} = undef;
- $self->{incr_p} = 0;
- $self->{incr_mode} = 0;
- $self->{incr_nest} = 0;
- $self->{incr_parsing} = 0;
- }
-
- ###############################
-
-
- 1;
- __END__
- =pod
-
+ } if ($] >= 5.006)}BEGIN {eval 'require Scalar::Util';unless($@){*JSON::PP::blessed=\&Scalar::Util::blessed;*JSON::PP::reftype=\&Scalar::Util::reftype;*JSON::PP::refaddr=\&Scalar::Util::refaddr}else{eval 'sub UNIVERSAL::a_sub_not_likely_to_be_here { ref($_[0]) }';*JSON::PP::blessed=sub {local($@,$SIG{__DIE__},$SIG{__WARN__});ref($_[0])? eval {$_[0]->a_sub_not_likely_to_be_here}: undef};my%tmap=qw(B::NULL SCALAR B::HV HASH B::AV ARRAY B::CV CODE B::IO IO B::GV GLOB B::REGEXP REGEXP);*JSON::PP::reftype=sub {my$r=shift;return undef unless length(ref($r));my$t=ref(B::svref_2object($r));return exists$tmap{$t}? $tmap{$t}: length(ref($$r))? 'REF' : 'SCALAR'};*JSON::PP::refaddr=sub {return undef unless length(ref($_[0]));my$addr;if(defined(my$pkg=blessed($_[0]))){$addr .= bless $_[0],'Scalar::Util::Fake';bless $_[0],$pkg}else {$addr .= $_[0]}$addr =~ /0x(\w+)/;local $^W;hex($1)}}}$JSON::PP::true=do {bless \(my$dummy=1),"JSON::PP::Boolean"};$JSON::PP::false=do {bless \(my$dummy=0),"JSON::PP::Boolean"};sub is_bool {defined $_[0]and UNIVERSAL::isa($_[0],"JSON::PP::Boolean")}sub true {$JSON::PP::true}sub false {$JSON::PP::false}sub null {undef}package JSON::PP::Boolean;use overload ("0+"=>sub {${$_[0]}},"++"=>sub {$_[0]=${$_[0]}+ 1},"--"=>sub {$_[0]=${$_[0]}- 1},fallback=>1,);package JSON::PP::IncrParser;use strict;use constant INCR_M_WS=>0;use constant INCR_M_STR=>1;use constant INCR_M_BS=>2;use constant INCR_M_JSON=>3;use constant INCR_M_C0=>4;use constant INCR_M_C1=>5;$JSON::PP::IncrParser::VERSION='1.01';my$unpack_format=$] < 5.006 ? 'C*' : 'U*';sub new {my ($class)=@_;bless {incr_nest=>0,incr_text=>undef,incr_parsing=>0,incr_p=>0,},$class}sub incr_parse {my ($self,$coder,$text)=@_;$self->{incr_text}='' unless (defined$self->{incr_text});if (defined$text){if (utf8::is_utf8($text)and!utf8::is_utf8($self->{incr_text})){utf8::upgrade($self->{incr_text});utf8::decode($self->{incr_text})}$self->{incr_text}.= $text}my$max_size=$coder->get_max_size;if (defined wantarray){$self->{incr_mode}=INCR_M_WS unless defined$self->{incr_mode};if (wantarray){my@ret;$self->{incr_parsing}=1;do {push@ret,$self->_incr_parse($coder,$self->{incr_text});unless (!$self->{incr_nest}and $self->{incr_mode}==INCR_M_JSON){$self->{incr_mode}=INCR_M_WS if$self->{incr_mode}!=INCR_M_STR}}until (length$self->{incr_text}>= $self->{incr_p});$self->{incr_parsing}=0;return@ret}else {$self->{incr_parsing}=1;my$obj=$self->_incr_parse($coder,$self->{incr_text});$self->{incr_parsing}=0 if defined$obj;return$obj ? $obj : undef}}}sub _incr_parse {my ($self,$coder,$text,$skip)=@_;my$p=$self->{incr_p};my$restore=$p;my@obj;my$len=length$text;if ($self->{incr_mode}==INCR_M_WS){while ($len > $p){my$s=substr($text,$p,1);$p++ and next if (0x20 >= unpack($unpack_format,$s));$self->{incr_mode}=INCR_M_JSON;last}}while ($len > $p){my$s=substr($text,$p++,1);if ($s eq '"'){if (substr($text,$p - 2,1)eq '\\'){next}if ($self->{incr_mode}!=INCR_M_STR){$self->{incr_mode}=INCR_M_STR}else {$self->{incr_mode}=INCR_M_JSON;unless ($self->{incr_nest}){last}}}if ($self->{incr_mode}==INCR_M_JSON){if ($s eq '[' or $s eq '{'){if (++$self->{incr_nest}> $coder->get_max_depth){Carp::croak('json text or perl structure exceeds maximum nesting level (max_depth set too low?)')}}elsif ($s eq ']' or $s eq '}'){last if (--$self->{incr_nest}<= 0)}elsif ($s eq '#'){while ($len > $p){last if substr($text,$p++,1)eq "\n"}}}}$self->{incr_p}=$p;return if ($self->{incr_mode}==INCR_M_STR and not $self->{incr_nest});return if ($self->{incr_mode}==INCR_M_JSON and $self->{incr_nest}> 0);return '' unless (length substr($self->{incr_text},0,$p));local$Carp::CarpLevel=2;$self->{incr_p}=$restore;$self->{incr_c}=$p;my ($obj,$tail)=$coder->PP_decode_json(substr($self->{incr_text},0,$p),0x10000001);$self->{incr_text}=substr($self->{incr_text},$p);$self->{incr_p}=0;return$obj or ''}sub incr_text {if ($_[0]->{incr_parsing}){Carp::croak("incr_text can not be called when the incremental parser already started parsing")}$_[0]->{incr_text}}sub incr_skip {my$self=shift;$self->{incr_text}=substr($self->{incr_text},$self->{incr_c});$self->{incr_p}=0}sub incr_reset {my$self=shift;$self->{incr_text}=undef;$self->{incr_p}=0;$self->{incr_mode}=0;$self->{incr_nest}=0;$self->{incr_parsing}=0}1;
JSON_PP
$fatpacked{"JSON/PP/Boolean.pm"} = <<'JSON_PP_BOOLEAN';
- use JSON::PP ();
- use strict;
-
- 1;
-
+ use JSON::PP ();use strict;1;
JSON_PP_BOOLEAN
-$fatpacked{"Module/Metadata.pm"} = <<'MODULE_METADATA';
- # -*- mode: cperl; tab-width: 8; indent-tabs-mode: nil; basic-offset: 2 -*-
- # vim:ts=8:sw=2:et:sta:sts=2
- package Module::Metadata;
-
- # Adapted from Perl-licensed code originally distributed with
- # Module-Build by Ken Williams
-
- # This module provides routines to gather information about
- # perl modules (assuming this may be expanded in the distant
- # parrot future to look at other types of modules).
-
- use strict;
- use vars qw($VERSION);
- $VERSION = '1.000007';
- $VERSION = eval $VERSION;
-
- use File::Spec;
- use IO::File;
- use version 0.87;
- BEGIN {
- if ($INC{'Log/Contextual.pm'}) {
- Log::Contextual->import('log_info');
- } else {
- *log_info = sub (&) { warn $_[0]->() };
- }
- }
- use File::Find qw(find);
+$fatpacked{"Module/CPANfile.pm"} = <<'MODULE_CPANFILE';
+ package Module::CPANfile;use strict;use warnings;use Cwd;use Carp ();use Module::CPANfile::Environment;use Module::CPANfile::Result;our$VERSION='1.0002';sub new {my($class,$file)=@_;bless {},$class}sub load {my($proto,$file)=@_;my$self=ref$proto ? $proto : $proto->new;$self->parse($file || Cwd::abs_path('cpanfile'));$self}sub save {my($self,$path)=@_;open my$out,">",$path or die "$path: $!";print {$out}$self->to_string}sub parse {my($self,$file)=@_;my$code=do {open my$fh,"<",$file or die "$file: $!";join '',<$fh>};my$env=Module::CPANfile::Environment->new($file);$self->{result}=$env->parse($code)or die $@}sub from_prereqs {my($proto,$prereqs)=@_;my$self=$proto->new;$self->{result}=Module::CPANfile::Result->from_prereqs($prereqs);$self}sub features {my$self=shift;map$self->feature($_),keys %{$self->{result}{features}}}sub feature {my($self,$identifier)=@_;my$data=$self->{result}{features}{$identifier}or Carp::croak("Unknown feature '$identifier'");require CPAN::Meta::Feature;CPAN::Meta::Feature->new($data->{identifier},{description=>$data->{description},prereqs=>$data->{spec},})}sub prereq {shift->prereqs}sub prereqs {my$self=shift;require CPAN::Meta::Prereqs;CPAN::Meta::Prereqs->new($self->prereq_specs)}sub effective_prereqs {my($self,$features)=@_;$self->prereqs_with(@{$features || []})}sub prereqs_with {my($self,@feature_identifiers)=@_;my$prereqs=$self->prereqs;my@others=map {$self->feature($_)->prereqs}@feature_identifiers;$prereqs->with_merged_prereqs(\@others)}sub prereq_specs {my$self=shift;$self->{result}{spec}}sub merge_meta {my($self,$file,$version)=@_;require CPAN::Meta;$version ||=$file =~ /\.yml$/ ? '1.4' : '2';my$prereq=$self->prereqs;my$meta=CPAN::Meta->load_file($file);my$prereqs_hash=$prereq->with_merged_prereqs($meta->effective_prereqs)->as_string_hash;my$struct={%{$meta->as_struct},prereqs=>$prereqs_hash };CPAN::Meta->new($struct)->save($file,{version=>$version })}sub _dump {my$str=shift;require Data::Dumper;chomp(my$value=Data::Dumper->new([$str])->Terse(1)->Dump);$value}sub to_string {my($self,$include_empty)=@_;my$prereqs=$self->{result}{spec};my$code='';$code .= $self->_dump_prereqs($self->{result}{spec},$include_empty);for my$feature (values %{$self->{result}{features}}){$code .= sprintf "feature %s, %s => sub {\n",_dump($feature->{identifier}),_dump($feature->{description});$code .= $self->_dump_prereqs($feature->{spec},$include_empty,4);$code .= "}\n\n"}$code =~ s/\n+$/\n/s;$code}sub _dump_prereqs {my($self,$prereqs,$include_empty,$base_indent)=@_;my$code='';for my$phase (qw(runtime configure build test develop)){my$indent=$phase eq 'runtime' ? '' : ' ';$indent=(' ' x ($base_indent || 0)).$indent;my($phase_code,$requirements);$phase_code .= "on $phase => sub {\n" unless$phase eq 'runtime';for my$type (qw(requires recommends suggests conflicts)){for my$mod (sort keys %{$prereqs->{$phase}{$type}}){my$ver=$prereqs->{$phase}{$type}{$mod};$phase_code .= $ver eq '0' ? "${indent}$type '$mod';\n" : "${indent}$type '$mod', '$ver';\n";$requirements++}}$phase_code .= "\n" unless$requirements;$phase_code .= "};\n" unless$phase eq 'runtime';$code .= $phase_code ."\n" if$requirements or $include_empty}$code =~ s/\n+$/\n/s;$code}1;
+MODULE_CPANFILE
+
+$fatpacked{"Module/CPANfile/Environment.pm"} = <<'MODULE_CPANFILE_ENVIRONMENT';
+ package Module::CPANfile::Environment;use strict;use warnings;use Module::CPANfile::Result;use Carp ();my@bindings=qw(on requires recommends suggests conflicts feature osname configure_requires build_requires test_requires author_requires);my$file_id=1;sub new {my($class,$file)=@_;bless {file=>$file,},$class}sub bind {my$class=shift;my$pkg=caller;my$result=Module::CPANfile::Result->new;for my$binding (@bindings){no strict 'refs';*{"$pkg\::$binding"}=sub {$result->$binding(@_)}}return$result}sub parse {my($self,$code)=@_;my($res,$err);{local $@;$file_id++;$res=eval <<EVAL;$err=$@}if ($err){die "Parsing $self->{file} failed: $err"};return$res}1;
+ package Module::CPANfile::Sandbox$file_id;
+ no warnings;
+ my \$_result;
+ BEGIN { \$_result = Module::CPANfile::Environment->bind }
- my $V_NUM_REGEXP = qr{v?[0-9._]+}; # crudely, a v-string or decimal
+ # line 1 "$self->{file}"
+ $code;
- my $PKG_REGEXP = qr{ # match a package declaration
+ \$_result;
+ EVAL
+MODULE_CPANFILE_ENVIRONMENT
+
+$fatpacked{"Module/CPANfile/Result.pm"} = <<'MODULE_CPANFILE_RESULT';
+ package Module::CPANfile::Result;use strict;sub from_prereqs {my($class,$spec)=@_;bless {phase=>'runtime',spec=>$spec,},$class}sub new {bless {phase=>'runtime',features=>{},feature=>undef,spec=>{},},shift}sub on {my($self,$phase,$code)=@_;local$self->{phase}=$phase;$code->()}sub feature {my($self,$identifier,$description,$code)=@_;if (@_==3 && ref($description)eq 'CODE'){$code=$description;$description=$identifier}unless (ref$description eq '' && ref$code eq 'CODE'){Carp::croak("Usage: feature 'identifier', 'Description' => sub { ... }")}local$self->{feature}=$self->{features}{$identifier}={identifier=>$identifier,description=>$description,spec=>{}};$code->()}sub osname {die "TODO"}sub requires {my($self,$module,$requirement)=@_;($self->{feature}? $self->{feature}{spec}: $self->{spec})->{$self->{phase}}{requires}{$module}=$requirement || 0}sub recommends {my($self,$module,$requirement)=@_;($self->{feature}? $self->{feature}{spec}: $self->{spec})->{$self->{phase}}{recommends}{$module}=$requirement || 0}sub suggests {my($self,$module,$requirement)=@_;($self->{feature}? $self->{feature}{spec}: $self->{spec})->{$self->{phase}}{suggests}{$module}=$requirement || 0}sub conflicts {my($self,$module,$requirement)=@_;($self->{feature}? $self->{feature}{spec}: $self->{spec})->{$self->{phase}}{conflicts}{$module}=$requirement || 0}sub configure_requires {my($self,@args)=@_;$self->on(configure=>sub {$self->requires(@args)})}sub build_requires {my($self,@args)=@_;$self->on(build=>sub {$self->requires(@args)})}sub test_requires {my($self,@args)=@_;$self->on(test=>sub {$self->requires(@args)})}sub author_requires {my($self,@args)=@_;$self->on(develop=>sub {$self->requires(@args)})}1;
+MODULE_CPANFILE_RESULT
+
+$fatpacked{"Module/Metadata.pm"} = <<'MODULE_METADATA';
+ package Module::Metadata;use strict;use vars qw($VERSION);$VERSION='1.000016';$VERSION=eval$VERSION;use Carp qw/croak/;use File::Spec;use IO::File;use version 0.87;BEGIN {if ($INC{'Log/Contextual.pm'}){Log::Contextual->import('log_info')}else {*log_info=sub (&) {warn $_[0]->()}}}use File::Find qw(find);my$V_NUM_REGEXP=qr{v?[0-9._]+};my$PKG_FIRST_WORD_REGEXP=qr{ # the FIRST word in a package name
+ [a-zA-Z_] # the first word CANNOT start with a digit
+ (?:
+ [\w']? # can contain letters, digits, _, or ticks
+ \w # But, NO multi-ticks or trailing ticks
+ )*
+ }x;my$PKG_ADDL_WORD_REGEXP=qr{ # the 2nd+ word in a package name
+ \w # the 2nd+ word CAN start with digits
+ (?:
+ [\w']? # and can contain letters or ticks
+ \w # But, NO multi-ticks or trailing ticks
+ )*
+ }x;my$PKG_NAME_REGEXP=qr{ # match a package name
+ (?: :: )? # a pkg name can start with aristotle
+ $PKG_FIRST_WORD_REGEXP # a package word
+ (?:
+ (?: :: )+ ### aristotle (allow one or many times)
+ $PKG_ADDL_WORD_REGEXP ### a package word
+ )* # ^ zero, one or many times
+ (?:
+ :: # allow trailing aristotle
+ )?
+ }x;my$PKG_REGEXP=qr{ # match a package declaration
^[\s\{;]* # intro chars on a line
package # the word 'package'
\s+ # whitespace
- ([\w:]+) # a package name
+ ($PKG_NAME_REGEXP) # a package name
\s* # optional whitespace
($V_NUM_REGEXP)? # optional version number
\s* # optional whitesapce
[;\{] # semicolon line terminator or block start (since 5.16)
- }x;
-
- my $VARNAME_REGEXP = qr{ # match fully-qualified VERSION name
+ }x;my$VARNAME_REGEXP=qr{ # match fully-qualified VERSION name
([\$*]) # sigil - $ or *
(
( # optional leading package name
@@ -8140,9 +368,7 @@ $fatpacked{"Module/Metadata.pm"} = <<'MODULE_METADATA';
)?
VERSION
)\b
- }x;
-
- my $VERS_REGEXP = qr{ # match a VERSION definition
+ }x;my$VERS_REGEXP=qr{ # match a VERSION definition
(?:
\(\s*$VARNAME_REGEXP\s*\) # with parens
|
@@ -8150,478 +376,7 @@ $fatpacked{"Module/Metadata.pm"} = <<'MODULE_METADATA';
)
\s*
=[^=~] # = but not ==, nor =~
- }x;
-
-
- sub new_from_file {
- my $class = shift;
- my $filename = File::Spec->rel2abs( shift );
-
- return undef unless defined( $filename ) && -f $filename;
- return $class->_init(undef, $filename, @_);
- }
-
- sub new_from_handle {
- my $class = shift;
- my $handle = shift;
- my $filename = shift;
- return undef unless defined($handle) && defined($filename);
- $filename = File::Spec->rel2abs( $filename );
-
- return $class->_init(undef, $filename, @_, handle => $handle);
-
- }
-
-
- sub new_from_module {
- my $class = shift;
- my $module = shift;
- my %props = @_;
-
- $props{inc} ||= \@INC;
- my $filename = $class->find_module_by_name( $module, $props{inc} );
- return undef unless defined( $filename ) && -f $filename;
- return $class->_init($module, $filename, %props);
- }
-
- {
-
- my $compare_versions = sub {
- my ($v1, $op, $v2) = @_;
- $v1 = version->new($v1)
- unless UNIVERSAL::isa($v1,'version');
-
- my $eval_str = "\$v1 $op \$v2";
- my $result = eval $eval_str;
- log_info { "error comparing versions: '$eval_str' $@" } if $@;
-
- return $result;
- };
-
- my $normalize_version = sub {
- my ($version) = @_;
- if ( $version =~ /[=<>!,]/ ) { # logic, not just version
- # take as is without modification
- }
- elsif ( ref $version eq 'version' ) { # version objects
- $version = $version->is_qv ? $version->normal : $version->stringify;
- }
- elsif ( $version =~ /^[^v][^.]*\.[^.]+\./ ) { # no leading v, multiple dots
- # normalize string tuples without "v": "1.2.3" -> "v1.2.3"
- $version = "v$version";
- }
- else {
- # leave alone
- }
- return $version;
- };
-
- # separate out some of the conflict resolution logic
-
- my $resolve_module_versions = sub {
- my $packages = shift;
-
- my( $file, $version );
- my $err = '';
- foreach my $p ( @$packages ) {
- if ( defined( $p->{version} ) ) {
- if ( defined( $version ) ) {
- if ( $compare_versions->( $version, '!=', $p->{version} ) ) {
- $err .= " $p->{file} ($p->{version})\n";
- } else {
- # same version declared multiple times, ignore
- }
- } else {
- $file = $p->{file};
- $version = $p->{version};
- }
- }
- $file ||= $p->{file} if defined( $p->{file} );
- }
-
- if ( $err ) {
- $err = " $file ($version)\n" . $err;
- }
-
- my %result = (
- file => $file,
- version => $version,
- err => $err
- );
-
- return \%result;
- };
-
- sub package_versions_from_directory {
- my ( $class, $dir, $files ) = @_;
-
- my @files;
-
- if ( $files ) {
- @files = @$files;
- } else {
- find( {
- wanted => sub {
- push @files, $_ if -f $_ && /\.pm$/;
- },
- no_chdir => 1,
- }, $dir );
- }
-
- # First, we enumerate all packages & versions,
- # separating into primary & alternative candidates
- my( %prime, %alt );
- foreach my $file (@files) {
- my $mapped_filename = File::Spec->abs2rel( $file, $dir );
- my @path = split( /\//, $mapped_filename );
- (my $prime_package = join( '::', @path )) =~ s/\.pm$//;
-
- my $pm_info = $class->new_from_file( $file );
-
- foreach my $package ( $pm_info->packages_inside ) {
- next if $package eq 'main'; # main can appear numerous times, ignore
- next if $package eq 'DB'; # special debugging package, ignore
- next if grep /^_/, split( /::/, $package ); # private package, ignore
-
- my $version = $pm_info->version( $package );
-
- if ( $package eq $prime_package ) {
- if ( exists( $prime{$package} ) ) {
- die "Unexpected conflict in '$package'; multiple versions found.\n";
- } else {
- $prime{$package}{file} = $mapped_filename;
- $prime{$package}{version} = $version if defined( $version );
- }
- } else {
- push( @{$alt{$package}}, {
- file => $mapped_filename,
- version => $version,
- } );
- }
- }
- }
-
- # Then we iterate over all the packages found above, identifying conflicts
- # and selecting the "best" candidate for recording the file & version
- # for each package.
- foreach my $package ( keys( %alt ) ) {
- my $result = $resolve_module_versions->( $alt{$package} );
-
- if ( exists( $prime{$package} ) ) { # primary package selected
-
- if ( $result->{err} ) {
- # Use the selected primary package, but there are conflicting
- # errors among multiple alternative packages that need to be
- # reported
- log_info {
- "Found conflicting versions for package '$package'\n" .
- " $prime{$package}{file} ($prime{$package}{version})\n" .
- $result->{err}
- };
-
- } elsif ( defined( $result->{version} ) ) {
- # There is a primary package selected, and exactly one
- # alternative package
-
- if ( exists( $prime{$package}{version} ) &&
- defined( $prime{$package}{version} ) ) {
- # Unless the version of the primary package agrees with the
- # version of the alternative package, report a conflict
- if ( $compare_versions->(
- $prime{$package}{version}, '!=', $result->{version}
- )
- ) {
-
- log_info {
- "Found conflicting versions for package '$package'\n" .
- " $prime{$package}{file} ($prime{$package}{version})\n" .
- " $result->{file} ($result->{version})\n"
- };
- }
-
- } else {
- # The prime package selected has no version so, we choose to
- # use any alternative package that does have a version
- $prime{$package}{file} = $result->{file};
- $prime{$package}{version} = $result->{version};
- }
-
- } else {
- # no alt package found with a version, but we have a prime
- # package so we use it whether it has a version or not
- }
-
- } else { # No primary package was selected, use the best alternative
-
- if ( $result->{err} ) {
- log_info {
- "Found conflicting versions for package '$package'\n" .
- $result->{err}
- };
- }
-
- # Despite possible conflicting versions, we choose to record
- # something rather than nothing
- $prime{$package}{file} = $result->{file};
- $prime{$package}{version} = $result->{version}
- if defined( $result->{version} );
- }
- }
-
- # Normalize versions. Can't use exists() here because of bug in YAML::Node.
- # XXX "bug in YAML::Node" comment seems irrelvant -- dagolden, 2009-05-18
- for (grep defined $_->{version}, values %prime) {
- $_->{version} = $normalize_version->( $_->{version} );
- }
-
- return \%prime;
- }
- }
-
-
- sub _init {
- my $class = shift;
- my $module = shift;
- my $filename = shift;
- my %props = @_;
-
- my $handle = delete $props{handle};
- my( %valid_props, @valid_props );
- @valid_props = qw( collect_pod inc );
- @valid_props{@valid_props} = delete( @props{@valid_props} );
- warn "Unknown properties: @{[keys %props]}\n" if scalar( %props );
-
- my %data = (
- module => $module,
- filename => $filename,
- version => undef,
- packages => [],
- versions => {},
- pod => {},
- pod_headings => [],
- collect_pod => 0,
-
- %valid_props,
- );
-
- my $self = bless(\%data, $class);
-
- if ( $handle ) {
- $self->_parse_fh($handle);
- }
- else {
- $self->_parse_file();
- }
-
- unless($self->{module} and length($self->{module})) {
- my ($v, $d, $f) = File::Spec->splitpath($self->{filename});
- if($f =~ /\.pm$/) {
- $f =~ s/\..+$//;
- my @candidates = grep /$f$/, @{$self->{packages}};
- $self->{module} = shift(@candidates); # punt
- }
- else {
- if(grep /main/, @{$self->{packages}}) {
- $self->{module} = 'main';
- }
- else {
- $self->{module} = $self->{packages}[0] || '';
- }
- }
- }
-
- $self->{version} = $self->{versions}{$self->{module}}
- if defined( $self->{module} );
-
- return $self;
- }
-
- # class method
- sub _do_find_module {
- my $class = shift;
- my $module = shift || die 'find_module_by_name() requires a package name';
- my $dirs = shift || \@INC;
-
- my $file = File::Spec->catfile(split( /::/, $module));
- foreach my $dir ( @$dirs ) {
- my $testfile = File::Spec->catfile($dir, $file);
- return [ File::Spec->rel2abs( $testfile ), $dir ]
- if -e $testfile and !-d _; # For stuff like ExtUtils::xsubpp
- return [ File::Spec->rel2abs( "$testfile.pm" ), $dir ]
- if -e "$testfile.pm";
- }
- return;
- }
-
- # class method
- sub find_module_by_name {
- my $found = shift()->_do_find_module(@_) or return;
- return $found->[0];
- }
-
- # class method
- sub find_module_dir_by_name {
- my $found = shift()->_do_find_module(@_) or return;
- return $found->[1];
- }
-
-
- # given a line of perl code, attempt to parse it if it looks like a
- # $VERSION assignment, returning sigil, full name, & package name
- sub _parse_version_expression {
- my $self = shift;
- my $line = shift;
-
- my( $sig, $var, $pkg );
- if ( $line =~ $VERS_REGEXP ) {
- ( $sig, $var, $pkg ) = $2 ? ( $1, $2, $3 ) : ( $4, $5, $6 );
- if ( $pkg ) {
- $pkg = ($pkg eq '::') ? 'main' : $pkg;
- $pkg =~ s/::$//;
- }
- }
-
- return ( $sig, $var, $pkg );
- }
-
- sub _parse_file {
- my $self = shift;
-
- my $filename = $self->{filename};
- my $fh = IO::File->new( $filename )
- or die( "Can't open '$filename': $!" );
-
- $self->_parse_fh($fh);
- }
-
- sub _parse_fh {
- my ($self, $fh) = @_;
-
- my( $in_pod, $seen_end, $need_vers ) = ( 0, 0, 0 );
- my( @pkgs, %vers, %pod, @pod );
- my $pkg = 'main';
- my $pod_sect = '';
- my $pod_data = '';
-
- while (defined( my $line = <$fh> )) {
- my $line_num = $.;
-
- chomp( $line );
- next if $line =~ /^\s*#/;
-
- $in_pod = ($line =~ /^=(?!cut)/) ? 1 : ($line =~ /^=cut/) ? 0 : $in_pod;
-
- # Would be nice if we could also check $in_string or something too
- last if !$in_pod && $line =~ /^__(?:DATA|END)__$/;
-
- if ( $in_pod || $line =~ /^=cut/ ) {
-
- if ( $line =~ /^=head\d\s+(.+)\s*$/ ) {
- push( @pod, $1 );
- if ( $self->{collect_pod} && length( $pod_data ) ) {
- $pod{$pod_sect} = $pod_data;
- $pod_data = '';
- }
- $pod_sect = $1;
-
-
- } elsif ( $self->{collect_pod} ) {
- $pod_data .= "$line\n";
-
- }
-
- } else {
-
- $pod_sect = '';
- $pod_data = '';
-
- # parse $line to see if it's a $VERSION declaration
- my( $vers_sig, $vers_fullname, $vers_pkg ) =
- $self->_parse_version_expression( $line );
-
- if ( $line =~ $PKG_REGEXP ) {
- $pkg = $1;
- push( @pkgs, $pkg ) unless grep( $pkg eq $_, @pkgs );
- $vers{$pkg} = (defined $2 ? $2 : undef) unless exists( $vers{$pkg} );
- $need_vers = defined $2 ? 0 : 1;
-
- # VERSION defined with full package spec, i.e. $Module::VERSION
- } elsif ( $vers_fullname && $vers_pkg ) {
- push( @pkgs, $vers_pkg ) unless grep( $vers_pkg eq $_, @pkgs );
- $need_vers = 0 if $vers_pkg eq $pkg;
-
- unless ( defined $vers{$vers_pkg} && length $vers{$vers_pkg} ) {
- $vers{$vers_pkg} =
- $self->_evaluate_version_line( $vers_sig, $vers_fullname, $line );
- } else {
- # Warn unless the user is using the "$VERSION = eval
- # $VERSION" idiom (though there are probably other idioms
- # that we should watch out for...)
- warn <<"EOM" unless $line =~ /=\s*eval/;
- Package '$vers_pkg' already declared with version '$vers{$vers_pkg}',
- ignoring subsequent declaration on line $line_num.
- EOM
- }
-
- # first non-comment line in undeclared package main is VERSION
- } elsif ( !exists($vers{main}) && $pkg eq 'main' && $vers_fullname ) {
- $need_vers = 0;
- my $v =
- $self->_evaluate_version_line( $vers_sig, $vers_fullname, $line );
- $vers{$pkg} = $v;
- push( @pkgs, 'main' );
-
- # first non-comment line in undeclared package defines package main
- } elsif ( !exists($vers{main}) && $pkg eq 'main' && $line =~ /\w+/ ) {
- $need_vers = 1;
- $vers{main} = '';
- push( @pkgs, 'main' );
-
- # only keep if this is the first $VERSION seen
- } elsif ( $vers_fullname && $need_vers ) {
- $need_vers = 0;
- my $v =
- $self->_evaluate_version_line( $vers_sig, $vers_fullname, $line );
-
-
- unless ( defined $vers{$pkg} && length $vers{$pkg} ) {
- $vers{$pkg} = $v;
- } else {
- warn <<"EOM";
- Package '$pkg' already declared with version '$vers{$pkg}'
- ignoring new version '$v' on line $line_num.
- EOM
- }
-
- }
-
- }
-
- }
-
- if ( $self->{collect_pod} && length($pod_data) ) {
- $pod{$pod_sect} = $pod_data;
- }
-
- $self->{versions} = \%vers;
- $self->{packages} = \@pkgs;
- $self->{pod} = \%pod;
- $self->{pod_headings} = \@pod;
- }
-
- {
- my $pn = 0;
- sub _evaluate_version_line {
- my $self = shift;
- my( $sigil, $var, $line ) = @_;
-
- # Some of this code came from the ExtUtils:: hierarchy.
-
- # We compile into $vsub because 'use version' would cause
- # compiletime/runtime issues with local()
- my $vsub;
- $pn++; # everybody gets their own package
- my $eval = qq{BEGIN { q# Hide from _packages_inside()
+ }x;sub new_from_file {my$class=shift;my$filename=File::Spec->rel2abs(shift);return undef unless defined($filename)&& -f $filename;return$class->_init(undef,$filename,@_)}sub new_from_handle {my$class=shift;my$handle=shift;my$filename=shift;return undef unless defined($handle)&& defined($filename);$filename=File::Spec->rel2abs($filename);return$class->_init(undef,$filename,@_,handle=>$handle)}sub new_from_module {my$class=shift;my$module=shift;my%props=@_;$props{inc}||=\@INC;my$filename=$class->find_module_by_name($module,$props{inc});return undef unless defined($filename)&& -f $filename;return$class->_init($module,$filename,%props)}{my$compare_versions=sub {my ($v1,$op,$v2)=@_;$v1=version->new($v1)unless UNIVERSAL::isa($v1,'version');my$eval_str="\$v1 $op \$v2";my$result=eval$eval_str;log_info {"error comparing versions: '$eval_str' $@"}if $@;return$result};my$normalize_version=sub {my ($version)=@_;if ($version =~ /[=<>!,]/){}elsif (ref$version eq 'version'){$version=$version->is_qv ? $version->normal : $version->stringify}elsif ($version =~ /^[^v][^.]*\.[^.]+\./){$version="v$version"}else {}return$version};my$resolve_module_versions=sub {my$packages=shift;my($file,$version);my$err='';for my$p (@$packages){if (defined($p->{version})){if (defined($version)){if ($compare_versions->($version,'!=',$p->{version})){$err .= " $p->{file} ($p->{version})\n"}else {}}else {$file=$p->{file};$version=$p->{version}}}$file ||=$p->{file}if defined($p->{file})}if ($err){$err=" $file ($version)\n" .$err}my%result=(file=>$file,version=>$version,err=>$err);return \%result};sub provides {my$class=shift;croak "provides() requires key/value pairs \n" if @_ % 2;my%args=@_;croak "provides() takes only one of 'dir' or 'files'\n" if$args{dir}&& $args{files};croak "provides() requires a 'version' argument" unless defined$args{version};croak "provides() does not support version '$args{version}' metadata" unless grep {$args{version}eq $_}qw/1.4 2/;$args{prefix}='lib' unless defined$args{prefix};my$p;if ($args{dir}){$p=$class->package_versions_from_directory($args{dir})}else {croak "provides() requires 'files' to be an array reference\n" unless ref$args{files}eq 'ARRAY';$p=$class->package_versions_from_directory($args{files})}if (length$args{prefix}){$args{prefix}=~ s{/$}{};for my$v (values %$p){$v->{file}="$args{prefix}/$v->{file}"}}return$p}sub package_versions_from_directory {my ($class,$dir,$files)=@_;my@files;if ($files){@files=@$files}else {find({wanted=>sub {push@files,$_ if -f $_ && /\.pm$/},no_chdir=>1,},$dir)}my(%prime,%alt);for my$file (@files){my$mapped_filename=File::Spec::Unix->abs2rel($file,$dir);my@path=split(/\//,$mapped_filename);(my$prime_package=join('::',@path))=~ s/\.pm$//;my$pm_info=$class->new_from_file($file);for my$package ($pm_info->packages_inside){next if$package eq 'main';next if$package eq 'DB';next if grep /^_/,split(/::/,$package);my$version=$pm_info->version($package);$prime_package=$package if lc($prime_package)eq lc($package);if ($package eq $prime_package){if (exists($prime{$package})){croak "Unexpected conflict in '$package'; multiple versions found.\n"}else {$mapped_filename="$package.pm" if lc("$package.pm")eq lc($mapped_filename);$prime{$package}{file}=$mapped_filename;$prime{$package}{version}=$version if defined($version)}}else {push(@{$alt{$package}},{file=>$mapped_filename,version=>$version,})}}}for my$package (keys(%alt)){my$result=$resolve_module_versions->($alt{$package});if (exists($prime{$package})){if ($result->{err}){log_info {"Found conflicting versions for package '$package'\n" ." $prime{$package}{file} ($prime{$package}{version})\n" .$result->{err}}}elsif (defined($result->{version})){if (exists($prime{$package}{version})&& defined($prime{$package}{version})){if ($compare_versions->($prime{$package}{version},'!=',$result->{version})){log_info {"Found conflicting versions for package '$package'\n" ." $prime{$package}{file} ($prime{$package}{version})\n" ." $result->{file} ($result->{version})\n"}}}else {$prime{$package}{file}=$result->{file};$prime{$package}{version}=$result->{version}}}else {}}else {if ($result->{err}){log_info {"Found conflicting versions for package '$package'\n" .$result->{err}}}$prime{$package}{file}=$result->{file};$prime{$package}{version}=$result->{version}if defined($result->{version})}}for (grep defined $_->{version},values%prime){$_->{version}=$normalize_version->($_->{version})}return \%prime}}sub _init {my$class=shift;my$module=shift;my$filename=shift;my%props=@_;my$handle=delete$props{handle};my(%valid_props,@valid_props);@valid_props=qw(collect_pod inc);@valid_props{@valid_props}=delete(@props{@valid_props});warn "Unknown properties: @{[keys %props]}\n" if scalar(%props);my%data=(module=>$module,filename=>$filename,version=>undef,packages=>[],versions=>{},pod=>{},pod_headings=>[],collect_pod=>0,%valid_props,);my$self=bless(\%data,$class);if ($handle){$self->_parse_fh($handle)}else {$self->_parse_file()}unless($self->{module}and length($self->{module})){my ($v,$d,$f)=File::Spec->splitpath($self->{filename});if($f =~ /\.pm$/){$f =~ s/\..+$//;my@candidates=grep /$f$/,@{$self->{packages}};$self->{module}=shift(@candidates)}else {if(grep /main/,@{$self->{packages}}){$self->{module}='main'}else {$self->{module}=$self->{packages}[0]|| ''}}}$self->{version}=$self->{versions}{$self->{module}}if defined($self->{module});return$self}sub _do_find_module {my$class=shift;my$module=shift || croak 'find_module_by_name() requires a package name';my$dirs=shift || \@INC;my$file=File::Spec->catfile(split(/::/,$module));for my$dir (@$dirs){my$testfile=File::Spec->catfile($dir,$file);return [File::Spec->rel2abs($testfile),$dir ]if -e $testfile and!-d _;return [File::Spec->rel2abs("$testfile.pm"),$dir ]if -e "$testfile.pm"}return}sub find_module_by_name {my$found=shift()->_do_find_module(@_)or return;return$found->[0]}sub find_module_dir_by_name {my$found=shift()->_do_find_module(@_)or return;return$found->[1]}sub _parse_version_expression {my$self=shift;my$line=shift;my($sig,$var,$pkg);if ($line =~ /$VERS_REGEXP/o){($sig,$var,$pkg)=$2 ? ($1,$2,$3): ($4,$5,$6);if ($pkg){$pkg=($pkg eq '::')? 'main' : $pkg;$pkg =~ s/::$//}}return ($sig,$var,$pkg)}sub _parse_file {my$self=shift;my$filename=$self->{filename};my$fh=IO::File->new($filename)or croak("Can't open '$filename': $!");$self->_handle_bom($fh,$filename);$self->_parse_fh($fh)}sub _handle_bom {my ($self,$fh,$filename)=@_;my$pos=$fh->getpos;return unless defined$pos;my$buf=' ' x 2;my$count=$fh->read($buf,length$buf);return unless defined$count and $count >= 2;my$encoding;if ($buf eq "\x{FE}\x{FF}"){$encoding='UTF-16BE'}elsif ($buf eq "\x{FF}\x{FE}"){$encoding='UTF-16LE'}elsif ($buf eq "\x{EF}\x{BB}"){$buf=' ';$count=$fh->read($buf,length$buf);if (defined$count and $count >= 1 and $buf eq "\x{BF}"){$encoding='UTF-8'}}if (defined$encoding){if ("$]" >= 5.008){binmode($fh,":encoding($encoding)")}}else {$fh->setpos($pos)or croak(sprintf "Can't reset position to the top of '$filename'")}return$encoding}sub _parse_fh {my ($self,$fh)=@_;my($in_pod,$seen_end,$need_vers)=(0,0,0);my(@pkgs,%vers,%pod,@pod);my$pkg='main';my$pod_sect='';my$pod_data='';my$in_end=0;while (defined(my$line=<$fh>)){my$line_num=$.;chomp($line);my$is_cut;if ($line =~ /^=([a-zA-Z].*)/){my$cmd=$1;$is_cut=$cmd =~ /^cut(?:[^a-zA-Z]|$)/;$in_pod=!$is_cut}if ($in_pod){if ($line =~ /^=head[1-4]\s+(.+)\s*$/){push(@pod,$1);if ($self->{collect_pod}&& length($pod_data)){$pod{$pod_sect}=$pod_data;$pod_data=''}$pod_sect=$1}elsif ($self->{collect_pod}){$pod_data .= "$line\n"}}elsif ($is_cut){if ($self->{collect_pod}&& length($pod_data)){$pod{$pod_sect}=$pod_data;$pod_data=''}$pod_sect=''}else {next if$in_end;next if$line =~ /^\s*#/;if ($line eq '__END__'){$in_end++;next}last if$line eq '__DATA__';my($vers_sig,$vers_fullname,$vers_pkg)=($line =~ /VERSION/)? $self->_parse_version_expression($line): ();if ($line =~ /$PKG_REGEXP/o){$pkg=$1;push(@pkgs,$pkg)unless grep($pkg eq $_,@pkgs);$vers{$pkg}=$2 unless exists($vers{$pkg});$need_vers=defined $2 ? 0 : 1}elsif ($vers_fullname && $vers_pkg){push(@pkgs,$vers_pkg)unless grep($vers_pkg eq $_,@pkgs);$need_vers=0 if$vers_pkg eq $pkg;unless (defined$vers{$vers_pkg}&& length$vers{$vers_pkg}){$vers{$vers_pkg}=$self->_evaluate_version_line($vers_sig,$vers_fullname,$line)}}elsif (!exists($vers{main})&& $pkg eq 'main' && $vers_fullname){$need_vers=0;my$v=$self->_evaluate_version_line($vers_sig,$vers_fullname,$line);$vers{$pkg}=$v;push(@pkgs,'main')}elsif (!exists($vers{main})&& $pkg eq 'main' && $line =~ /\w+/){$need_vers=1;$vers{main}='';push(@pkgs,'main')}elsif ($vers_fullname && $need_vers){$need_vers=0;my$v=$self->_evaluate_version_line($vers_sig,$vers_fullname,$line);unless (defined$vers{$pkg}&& length$vers{$pkg}){$vers{$pkg}=$v}}}}if ($self->{collect_pod}&& length($pod_data)){$pod{$pod_sect}=$pod_data}$self->{versions}=\%vers;$self->{packages}=\@pkgs;$self->{pod}=\%pod;$self->{pod_headings}=\@pod}{my$pn=0;sub _evaluate_version_line {my$self=shift;my($sigil,$var,$line)=@_;my$vsub;$pn++;my$eval=qq{BEGIN { q# Hide from _packages_inside()
#; package Module::Metadata::_version::p$pn;
use version;
no strict;
@@ -8632,455 +387,27 @@ $fatpacked{"Module/Metadata.pm"} = <<'MODULE_METADATA';
$line;
\$$var
};
- }};
-
- local $^W;
- # Try to get the $VERSION
- eval $eval;
- # some modules say $VERSION = $Foo::Bar::VERSION, but Foo::Bar isn't
- # installed, so we need to hunt in ./lib for it
- if ( $@ =~ /Can't locate/ && -d 'lib' ) {
- local @INC = ('lib',@INC);
- eval $eval;
- }
- warn "Error evaling version line '$eval' in $self->{filename}: $@\n"
- if $@;
- (ref($vsub) eq 'CODE') or
- die "failed to build version sub for $self->{filename}";
- my $result = eval { $vsub->() };
- die "Could not get version from $self->{filename} by executing:\n$eval\n\nThe fatal error was: $@\n"
- if $@;
-
- # Upgrade it into a version object
- my $version = eval { _dwim_version($result) };
-
- die "Version '$result' from $self->{filename} does not appear to be valid:\n$eval\n\nThe fatal error was: $@\n"
- unless defined $version; # "0" is OK!
-
- return $version;
- }
- }
-
- # Try to DWIM when things fail the lax version test in obvious ways
- {
- my @version_prep = (
- # Best case, it just works
- sub { return shift },
-
- # If we still don't have a version, try stripping any
- # trailing junk that is prohibited by lax rules
- sub {
- my $v = shift;
- $v =~ s{([0-9])[a-z-].*$}{$1}i; # 1.23-alpha or 1.23b
- return $v;
- },
-
- # Activestate apparently creates custom versions like '1.23_45_01', which
- # cause version.pm to think it's an invalid alpha. So check for that
- # and strip them
- sub {
- my $v = shift;
- my $num_dots = () = $v =~ m{(\.)}g;
- my $num_unders = () = $v =~ m{(_)}g;
- my $leading_v = substr($v,0,1) eq 'v';
- if ( ! $leading_v && $num_dots < 2 && $num_unders > 1 ) {
- $v =~ s{_}{}g;
- $num_unders = () = $v =~ m{(_)}g;
- }
- return $v;
- },
-
- # Worst case, try numifying it like we would have before version objects
- sub {
- my $v = shift;
- no warnings 'numeric';
- return 0 + $v;
- },
-
- );
-
- sub _dwim_version {
- my ($result) = shift;
-
- return $result if ref($result) eq 'version';
-
- my ($version, $error);
- for my $f (@version_prep) {
- $result = $f->($result);
- $version = eval { version->new($result) };
- $error ||= $@ if $@; # capture first failure
- last if defined $version;
- }
-
- die $error unless defined $version;
-
- return $version;
- }
- }
-
- ############################################################
-
- # accessors
- sub name { $_[0]->{module} }
-
- sub filename { $_[0]->{filename} }
- sub packages_inside { @{$_[0]->{packages}} }
- sub pod_inside { @{$_[0]->{pod_headings}} }
- sub contains_pod { $#{$_[0]->{pod_headings}} }
-
- sub version {
- my $self = shift;
- my $mod = shift || $self->{module};
- my $vers;
- if ( defined( $mod ) && length( $mod ) &&
- exists( $self->{versions}{$mod} ) ) {
- return $self->{versions}{$mod};
- } else {
- return undef;
- }
- }
-
- sub pod {
- my $self = shift;
- my $sect = shift;
- if ( defined( $sect ) && length( $sect ) &&
- exists( $self->{pod}{$sect} ) ) {
- return $self->{pod}{$sect};
- } else {
- return undef;
- }
- }
-
- 1;
-
+ }};local $^W;eval$eval;if ($@ =~ /Can't locate/ && -d 'lib'){local@INC=('lib',@INC);eval$eval}warn "Error evaling version line '$eval' in $self->{filename}: $@\n" if $@;(ref($vsub)eq 'CODE')or croak "failed to build version sub for $self->{filename}";my$result=eval {$vsub->()};croak "Could not get version from $self->{filename} by executing:\n$eval\n\nThe fatal error was: $@\n" if $@;my$version=eval {_dwim_version($result)};croak "Version '$result' from $self->{filename} does not appear to be valid:\n$eval\n\nThe fatal error was: $@\n" unless defined$version;return$version}}{my@version_prep=(sub {return shift},sub {my$v=shift;$v =~ s{([0-9])[a-z-].*$}{$1}i;return$v},sub {my$v=shift;my$num_dots=()=$v =~ m{(\.)}g;my$num_unders=()=$v =~ m{(_)}g;my$leading_v=substr($v,0,1)eq 'v';if (!$leading_v && $num_dots < 2 && $num_unders > 1){$v =~ s{_}{}g;$num_unders=()=$v =~ m{(_)}g}return$v},sub {my$v=shift;no warnings 'numeric';return 0 + $v},);sub _dwim_version {my ($result)=shift;return$result if ref($result)eq 'version';my ($version,$error);for my$f (@version_prep){$result=$f->($result);$version=eval {version->new($result)};$error ||=$@ if $@;last if defined$version}croak$error unless defined$version;return$version}}sub name {$_[0]->{module}}sub filename {$_[0]->{filename}}sub packages_inside {@{$_[0]->{packages}}}sub pod_inside {@{$_[0]->{pod_headings}}}sub contains_pod {0+@{$_[0]->{pod_headings}}}sub version {my$self=shift;my$mod=shift || $self->{module};my$vers;if (defined($mod)&& length($mod)&& exists($self->{versions}{$mod})){return$self->{versions}{$mod}}else {return undef}}sub pod {my$self=shift;my$sect=shift;if (defined($sect)&& length($sect)&& exists($self->{pod}{$sect})){return$self->{pod}{$sect}}else {return undef}}1;
MODULE_METADATA
$fatpacked{"Parse/CPAN/Meta.pm"} = <<'PARSE_CPAN_META';
- package Parse::CPAN::Meta;
-
- use strict;
- use Carp 'croak';
-
- # UTF Support?
- sub HAVE_UTF8 () { $] >= 5.007003 }
- sub IO_LAYER () { $] >= 5.008001 ? ":utf8" : "" }
-
- BEGIN {
- if ( HAVE_UTF8 ) {
- # The string eval helps hide this from Test::MinimumVersion
- eval "require utf8;";
- die "Failed to load UTF-8 support" if $@;
- }
-
- # Class structure
- require 5.004;
- require Exporter;
- $Parse::CPAN::Meta::VERSION = '1.4401';
- @Parse::CPAN::Meta::ISA = qw{ Exporter };
- @Parse::CPAN::Meta::EXPORT_OK = qw{ Load LoadFile };
- }
-
- sub load_file {
- my ($class, $filename) = @_;
-
- if ($filename =~ /\.ya?ml$/) {
- return $class->load_yaml_string(_slurp($filename));
- }
-
- if ($filename =~ /\.json$/) {
- return $class->load_json_string(_slurp($filename));
- }
-
- croak("file type cannot be determined by filename");
- }
-
- sub load_yaml_string {
- my ($class, $string) = @_;
- my $backend = $class->yaml_backend();
- my $data = eval { no strict 'refs'; &{"$backend\::Load"}($string) };
- if ( $@ ) {
- croak $backend->can('errstr') ? $backend->errstr : $@
- }
- return $data || {}; # in case document was valid but empty
- }
-
- sub load_json_string {
- my ($class, $string) = @_;
- return $class->json_backend()->new->decode($string);
- }
-
- sub yaml_backend {
- local $Module::Load::Conditional::CHECK_INC_HASH = 1;
- if (! defined $ENV{PERL_YAML_BACKEND} ) {
- _can_load( 'CPAN::Meta::YAML', 0.002 )
- or croak "CPAN::Meta::YAML 0.002 is not available\n";
- return "CPAN::Meta::YAML";
- }
- else {
- my $backend = $ENV{PERL_YAML_BACKEND};
- _can_load( $backend )
- or croak "Could not load PERL_YAML_BACKEND '$backend'\n";
- $backend->can("Load")
- or croak "PERL_YAML_BACKEND '$backend' does not implement Load()\n";
- return $backend;
- }
- }
-
- sub json_backend {
- local $Module::Load::Conditional::CHECK_INC_HASH = 1;
- if (! $ENV{PERL_JSON_BACKEND} or $ENV{PERL_JSON_BACKEND} eq 'JSON::PP') {
- _can_load( 'JSON::PP' => 2.27103 )
- or croak "JSON::PP 2.27103 is not available\n";
- return 'JSON::PP';
- }
- else {
- _can_load( 'JSON' => 2.5 )
- or croak "JSON 2.5 is required for " .
- "\$ENV{PERL_JSON_BACKEND} = '$ENV{PERL_JSON_BACKEND}'\n";
- return "JSON";
- }
- }
-
- sub _slurp {
- open my $fh, "<" . IO_LAYER, "$_[0]"
- or die "can't open $_[0] for reading: $!";
- return do { local $/; <$fh> };
- }
-
- sub _can_load {
- my ($module, $version) = @_;
- (my $file = $module) =~ s{::}{/}g;
- $file .= ".pm";
- return 1 if $INC{$file};
- return 0 if exists $INC{$file}; # prior load failed
- eval { require $file; 1 }
- or return 0;
- if ( defined $version ) {
- eval { $module->VERSION($version); 1 }
- or return 0;
- }
- return 1;
- }
-
- # Kept for backwards compatibility only
- # Create an object from a file
- sub LoadFile ($) {
- require CPAN::Meta::YAML;
- return CPAN::Meta::YAML::LoadFile(shift)
- or die CPAN::Meta::YAML->errstr;
- }
-
- # Parse a document from a string.
- sub Load ($) {
- require CPAN::Meta::YAML;
- return CPAN::Meta::YAML::Load(shift)
- or die CPAN::Meta::YAML->errstr;
- }
-
- 1;
-
- __END__
-
+ use strict;package Parse::CPAN::Meta;our$VERSION='1.4407';use Carp 'croak';sub HAVE_UTF8 () {$] >= 5.007003}sub IO_LAYER () {$] >= 5.008001 ? ":utf8" : ""}BEGIN {if (HAVE_UTF8){eval "require utf8;";die "Failed to load UTF-8 support" if $@}require 5.004;require Exporter;@Parse::CPAN::Meta::ISA=qw{Exporter};@Parse::CPAN::Meta::EXPORT_OK=qw{Load LoadFile}}sub load_file {my ($class,$filename)=@_;if ($filename =~ /\.ya?ml$/){return$class->load_yaml_string(_slurp($filename))}if ($filename =~ /\.json$/){return$class->load_json_string(_slurp($filename))}croak("file type cannot be determined by filename")}sub load_yaml_string {my ($class,$string)=@_;my$backend=$class->yaml_backend();my$data=eval {no strict 'refs';&{"$backend\::Load"}($string)};if ($@){croak$backend->can('errstr')? $backend->errstr : $@}return$data || {}}sub load_json_string {my ($class,$string)=@_;return$class->json_backend()->new->decode($string)}sub yaml_backend {local$Module::Load::Conditional::CHECK_INC_HASH=1;if (!defined$ENV{PERL_YAML_BACKEND}){_can_load('CPAN::Meta::YAML',0.002)or croak "CPAN::Meta::YAML 0.002 is not available\n";return "CPAN::Meta::YAML"}else {my$backend=$ENV{PERL_YAML_BACKEND};_can_load($backend)or croak "Could not load PERL_YAML_BACKEND '$backend'\n";$backend->can("Load")or croak "PERL_YAML_BACKEND '$backend' does not implement Load()\n";return$backend}}sub json_backend {local$Module::Load::Conditional::CHECK_INC_HASH=1;if (!$ENV{PERL_JSON_BACKEND}or $ENV{PERL_JSON_BACKEND}eq 'JSON::PP'){_can_load('JSON::PP'=>2.27103)or croak "JSON::PP 2.27103 is not available\n";return 'JSON::PP'}else {_can_load('JSON'=>2.5)or croak "JSON 2.5 is required for " ."\$ENV{PERL_JSON_BACKEND} = '$ENV{PERL_JSON_BACKEND}'\n";return "JSON"}}sub _slurp {open my$fh,"<" .IO_LAYER,"$_[0]" or die "can't open $_[0] for reading: $!";return do {local $/;<$fh>}}sub _can_load {my ($module,$version)=@_;(my$file=$module)=~ s{::}{/}g;$file .= ".pm";return 1 if$INC{$file};return 0 if exists$INC{$file};eval {require$file;1}or return 0;if (defined$version){eval {$module->VERSION($version);1}or return 0}return 1}sub LoadFile ($) {require CPAN::Meta::YAML;my$object=CPAN::Meta::YAML::LoadFile(shift)or die CPAN::Meta::YAML->errstr;return$object}sub Load ($) {require CPAN::Meta::YAML;my$object=CPAN::Meta::YAML::Load(shift)or die CPAN::Meta::YAML->errstr;return$object}1;
PARSE_CPAN_META
-$fatpacked{"Try/Tiny.pm"} = <<'TRY_TINY';
- package Try::Tiny;
-
- use strict;
- #use warnings;
-
- use vars qw(@EXPORT @EXPORT_OK $VERSION @ISA);
-
- BEGIN {
- require Exporter;
- @ISA = qw(Exporter);
- }
-
- $VERSION = "0.09";
-
- $VERSION = eval $VERSION;
-
- @EXPORT = @EXPORT_OK = qw(try catch finally);
-
- $Carp::Internal{+__PACKAGE__}++;
-
- # Need to prototype as @ not $$ because of the way Perl evaluates the prototype.
- # Keeping it at $$ means you only ever get 1 sub because we need to eval in a list
- # context & not a scalar one
-
- sub try (&;@) {
- my ( $try, @code_refs ) = @_;
-
- # we need to save this here, the eval block will be in scalar context due
- # to $failed
- my $wantarray = wantarray;
-
- my ( $catch, @finally );
-
- # find labeled blocks in the argument list.
- # catch and finally tag the blocks by blessing a scalar reference to them.
- foreach my $code_ref (@code_refs) {
- next unless $code_ref;
-
- my $ref = ref($code_ref);
-
- if ( $ref eq 'Try::Tiny::Catch' ) {
- $catch = ${$code_ref};
- } elsif ( $ref eq 'Try::Tiny::Finally' ) {
- push @finally, ${$code_ref};
- } else {
- use Carp;
- confess("Unknown code ref type given '${ref}'. Check your usage & try again");
- }
- }
-
- # save the value of $@ so we can set $@ back to it in the beginning of the eval
- my $prev_error = $@;
-
- my ( @ret, $error, $failed );
-
- # FIXME consider using local $SIG{__DIE__} to accumulate all errors. It's
- # not perfect, but we could provide a list of additional errors for
- # $catch->();
-
- {
- # localize $@ to prevent clobbering of previous value by a successful
- # eval.
- local $@;
-
- # failed will be true if the eval dies, because 1 will not be returned
- # from the eval body
- $failed = not eval {
- $@ = $prev_error;
-
- # evaluate the try block in the correct context
- if ( $wantarray ) {
- @ret = $try->();
- } elsif ( defined $wantarray ) {
- $ret[0] = $try->();
- } else {
- $try->();
- };
-
- return 1; # properly set $fail to false
- };
-
- # copy $@ to $error; when we leave this scope, local $@ will revert $@
- # back to its previous value
- $error = $@;
- }
-
- # set up a scope guard to invoke the finally block at the end
- my @guards =
- map { Try::Tiny::ScopeGuard->_new($_, $failed ? $error : ()) }
- @finally;
-
- # at this point $failed contains a true value if the eval died, even if some
- # destructor overwrote $@ as the eval was unwinding.
- if ( $failed ) {
- # if we got an error, invoke the catch block.
- if ( $catch ) {
- # This works like given($error), but is backwards compatible and
- # sets $_ in the dynamic scope for the body of C<$catch>
- for ($error) {
- return $catch->($error);
- }
-
- # in case when() was used without an explicit return, the C<for>
- # loop will be aborted and there's no useful return value
- }
-
- return;
- } else {
- # no failure, $@ is back to what it was, everything is fine
- return $wantarray ? @ret : $ret[0];
- }
- }
-
- sub catch (&;@) {
- my ( $block, @rest ) = @_;
-
- return (
- bless(\$block, 'Try::Tiny::Catch'),
- @rest,
- );
- }
-
- sub finally (&;@) {
- my ( $block, @rest ) = @_;
-
- return (
- bless(\$block, 'Try::Tiny::Finally'),
- @rest,
- );
- }
-
- {
- package # hide from PAUSE
- Try::Tiny::ScopeGuard;
-
- sub _new {
- shift;
- bless [ @_ ];
- }
-
- sub DESTROY {
- my @guts = @{ shift() };
- my $code = shift @guts;
- $code->(@guts);
- }
- }
-
- __PACKAGE__
-
- __END__
-
-TRY_TINY
+$fatpacked{"String/ShellQuote.pm"} = <<'STRING_SHELLQUOTE';
+ package String::ShellQuote;use strict;use vars qw($VERSION @ISA @EXPORT);require Exporter;$VERSION='1.04';@ISA=qw(Exporter);@EXPORT=qw(shell_quote shell_quote_best_effort shell_comment_quote);sub croak {require Carp;goto&Carp::croak}sub _shell_quote_backend {my@in=@_;my@err=();if (0){require RS::Handy;print RS::Handy::data_dump(\@in)}return \@err,'' unless@in;my$ret='';my$saw_non_equal=0;for (@in){if (!defined $_ or $_ eq ''){$_="''";next}if (s/\x00//g){push@err,"No way to quote string containing null (\\000) bytes"}my$escape=0;if (/=/){if (!$saw_non_equal){$escape=1}}else {$saw_non_equal=1}if (m|[^\w!%+,\-./:=@^]|){$escape=1}if ($escape || (!$saw_non_equal && /=/)){s/'/'\\''/g;s|((?:'\\''){2,})|q{'"} . (q{'} x (length($1) / 4)) . q{"'}|ge;$_="'$_'";s/^''//;s/''$//}}continue {$ret .= "$_ "}chop$ret;return \@err,$ret}sub shell_quote {my ($rerr,$s)=_shell_quote_backend @_;if (@$rerr){my%seen;@$rerr=grep {!$seen{$_}++}@$rerr;my$s=join '',map {"shell_quote(): $_\n"}@$rerr;chomp$s;croak$s}return$s}sub shell_quote_best_effort {my ($rerr,$s)=_shell_quote_backend @_;return$s}sub shell_comment_quote {return '' unless @_;unless (@_==1){croak "Too many arguments to shell_comment_quote " ."(got " .@_ ." expected 1)"}local $_=shift;s/\n/\n#/g;return $_}1;
+STRING_SHELLQUOTE
+
+$fatpacked{"aliased.pm"} = <<'ALIASED';
+ package aliased;our$VERSION='0.31';$VERSION=eval$VERSION;require Exporter;@ISA=qw(Exporter);@EXPORT=qw(alias prefix);use strict;sub _croak {require Carp;Carp::croak(@_)}sub import {my ($class,$package,$alias,@import)=@_;if (@_ <= 1){$class->export_to_level(1);return}my$callpack=caller(0);_load_alias($package,$callpack,@import);_make_alias($package,$callpack,$alias)}sub _get_alias {my$package=shift;$package =~ s/.*(?:::|')//;return$package}sub _make_alias {my ($package,$callpack,$alias)=@_;$alias ||=_get_alias($package);my$destination=$alias =~ /::/ ? $alias : "$callpack\::$alias";no strict 'refs';*{$destination}=sub () {$package}}sub _load_alias {my ($package,$callpack,@import)=@_;my$sigdie=$SIG{__DIE__};{my$code=@import==0 ? "package $callpack; use $package;" : "package $callpack; use $package (\@import)";eval$code;if (my$error=$@){$SIG{__DIE__}=$sigdie;_croak($error)}$sigdie=$SIG{__DIE__}if defined$SIG{__DIE__}}$SIG{__DIE__}=$sigdie if defined$sigdie;return$package}sub alias {my ($package,@import)=@_;my$callpack=scalar caller(0);return _load_alias($package,$callpack,@import)}sub prefix {my ($class)=@_;return sub {my ($name)=@_;my$callpack=caller(0);if (not @_){return _load_alias($class,$callpack)}elsif (@_==1 && defined$name){return _load_alias("${class}::$name",$callpack)}else {_croak("Too many arguments to prefix('$class')")}}}1;
+ALIASED
$fatpacked{"lib/core/only.pm"} = <<'LIB_CORE_ONLY';
- package lib::core::only;
-
- use strict;
- use warnings FATAL => 'all';
- use Config;
-
- sub import {
- @INC = @Config{qw(privlibexp archlibexp)};
- return
- }
-
- 1;
+ package lib::core::only;use strict;use warnings FATAL=>'all';use Config;sub import {@INC=@Config{qw(privlibexp archlibexp)};return}1;
LIB_CORE_ONLY
$fatpacked{"local/lib.pm"} = <<'LOCAL_LIB';
- use strict;
- use warnings;
-
- package local::lib;
-
- use 5.008001; # probably works with earlier versions but I'm not supporting them
- # (patches would, of course, be welcome)
-
- use File::Spec ();
- use File::Path ();
- use Carp ();
- use Config;
-
- our $VERSION = '1.008001'; # 1.8.1
-
- our @KNOWN_FLAGS = qw(--self-contained);
-
- sub import {
- my ($class, @args) = @_;
-
- # Remember what PERL5LIB was when we started
- my $perl5lib = $ENV{PERL5LIB} || '';
-
- my %arg_store;
- for my $arg (@args) {
- # check for lethal dash first to stop processing before causing problems
- if ($arg =~ /−/) {
- die <<'DEATH';
+ use strict;use warnings;package local::lib;use 5.008001;use File::Spec ();use File::Path ();use Config;our$VERSION='1.008011';our@KNOWN_FLAGS=qw(--self-contained --deactivate --deactivate-all);sub DEACTIVATE_ONE () {1}sub DEACTIVATE_ALL () {2}sub INTERPOLATE_ENV () {1}sub LITERAL_ENV () {0}sub import {my ($class,@args)=@_;my$perl5lib=$ENV{PERL5LIB}|| '';my%arg_store;for my$arg (@args){if ($arg =~ /−/){die <<'DEATH'}elsif(grep {$arg eq $_}@KNOWN_FLAGS){(my$flag=$arg)=~ s/--//;$arg_store{$flag}=1}elsif($arg =~ /^--/){die "Unknown import argument: $arg"}else {$arg_store{path}=$arg}}if($arg_store{'self-contained'}){die "FATAL: The local::lib --self-contained flag has never worked reliably and the original author, Mark Stosberg, was unable or unwilling to maintain it. As such, this flag has been removed from the local::lib codebase in order to prevent misunderstandings and potentially broken builds. The local::lib authors recommend that you look at the lib::core::only module shipped with this distribution in order to create a more robust environment that is equivalent to what --self-contained provided (although quite possibly not what you originally thought it provided due to the poor quality of the documentation, for which we apologise).\n"}my$deactivating=0;if ($arg_store{deactivate}){$deactivating=DEACTIVATE_ONE}if ($arg_store{'deactivate-all'}){$deactivating=DEACTIVATE_ALL}$arg_store{path}=$class->resolve_path($arg_store{path});$class->setup_local_lib_for($arg_store{path},$deactivating);for (@INC){next if ref;m/(.*)/ and $_=$1}}sub pipeline;sub pipeline {my@methods=@_;my$last=pop(@methods);if (@methods){\sub {my ($obj,@args)=@_;$obj->${pipeline@methods}($obj->$last(@args))}}else {\sub {shift->$last(@_)}}}sub _uniq {my%seen;grep {!$seen{$_}++}@_}sub resolve_path {my ($class,$path)=@_;$class->${pipeline qw(resolve_relative_path resolve_home_path resolve_empty_path)}($path)}sub resolve_empty_path {my ($class,$path)=@_;if (defined$path){$path}else {'~/perl5'}}sub resolve_home_path {my ($class,$path)=@_;return$path unless ($path =~ /^~/);my ($user)=($path =~ /^~([^\/]+)/);my$tried_file_homedir;my$homedir=do {if (eval {require File::HomeDir}&& $File::HomeDir::VERSION >= 0.65){$tried_file_homedir=1;if (defined$user){File::HomeDir->users_home($user)}else {File::HomeDir->my_home}}else {if (defined$user){(getpwnam$user)[7]}else {if (defined$ENV{HOME}){$ENV{HOME}}else {(getpwuid $<)[7]}}}};unless (defined$homedir){require Carp;Carp::croak("Couldn't resolve homedir for " .(defined$user ? $user : 'current user').($tried_file_homedir ? '' : ' - consider installing File::HomeDir'))}$path =~ s/^~[^\/]*/$homedir/;$path}sub resolve_relative_path {my ($class,$path)=@_;$path=File::Spec->rel2abs($path)}sub setup_local_lib_for {my ($class,$path,$deactivating)=@_;my$interpolate=LITERAL_ENV;my@active_lls=$class->active_paths;$class->ensure_dir_structure_for($path);$path=Win32::GetShortPathName($path)if $^O eq 'MSWin32';if (!$deactivating){if (@active_lls && $active_lls[-1]eq $path){exit 0 if $0 eq '-';return}elsif (grep {$_ eq $path}@active_lls){$class->setup_env_hash_for($path,DEACTIVATE_ONE);$interpolate=INTERPOLATE_ENV}}if ($0 eq '-'){$class->print_environment_vars_for($path,$deactivating,$interpolate);exit 0}else {$class->setup_env_hash_for($path,$deactivating);my$arch_dir=$Config{archname};@INC=_uniq((map {(File::Spec->catdir($_,$arch_dir),$_)}split($Config{path_sep},$ENV{PERL5LIB})),@INC)}}sub install_base_bin_path {my ($class,$path)=@_;File::Spec->catdir($path,'bin')}sub install_base_perl_path {my ($class,$path)=@_;File::Spec->catdir($path,'lib','perl5')}sub install_base_arch_path {my ($class,$path)=@_;File::Spec->catdir($class->install_base_perl_path($path),$Config{archname})}sub ensure_dir_structure_for {my ($class,$path)=@_;unless (-d $path){warn "Attempting to create directory ${path}\n"}File::Path::mkpath($path);return}sub guess_shelltype {my$shellbin='sh';if(defined$ENV{'SHELL'}){my@shell_bin_path_parts=File::Spec->splitpath($ENV{'SHELL'});$shellbin=$shell_bin_path_parts[-1]}my$shelltype=do {local $_=$shellbin;if(/csh/){'csh'}else {'bourne'}};if (defined$ENV{'COMSPEC'}&& $^O ne 'cygwin'){my@shell_bin_path_parts=File::Spec->splitpath($ENV{'COMSPEC'});$shellbin=$shell_bin_path_parts[-1];$shelltype=do {local $_=$shellbin;if(/command\.com/){'win32'}elsif(/cmd\.exe/){'win32'}elsif(/4nt\.exe/){'win32'}else {$shelltype}}}return$shelltype}sub print_environment_vars_for {my ($class,$path,$deactivating,$interpolate)=@_;print$class->environment_vars_string_for($path,$deactivating,$interpolate)}sub environment_vars_string_for {my ($class,$path,$deactivating,$interpolate)=@_;my@envs=$class->build_environment_vars_for($path,$deactivating,$interpolate);my$out='';my$shelltype=$class->guess_shelltype;while (@envs){my ($name,$value)=(shift(@envs),shift(@envs));$value =~ s/(\\")/\\$1/g if defined$value;$out .= $class->${\"build_${shelltype}_env_declaration"}($name,$value)}return$out}sub build_bourne_env_declaration {my$class=shift;my($name,$value)=@_;return defined($value)? qq{export ${name}="${value}";\n} : qq{unset ${name};\n}}sub build_csh_env_declaration {my$class=shift;my($name,$value)=@_;return defined($value)? qq{setenv ${name} "${value}"\n} : qq{unsetenv ${name}\n}}sub build_win32_env_declaration {my$class=shift;my($name,$value)=@_;return defined($value)? qq{set ${name}=${value}\n} : qq{set ${name}=\n}}sub setup_env_hash_for {my ($class,$path,$deactivating)=@_;my%envs=$class->build_environment_vars_for($path,$deactivating,INTERPOLATE_ENV);@ENV{keys%envs}=values%envs}sub build_environment_vars_for {my ($class,$path,$deactivating,$interpolate)=@_;if ($deactivating==DEACTIVATE_ONE){return$class->build_deactivate_environment_vars_for($path,$interpolate)}elsif ($deactivating==DEACTIVATE_ALL){return$class->build_deact_all_environment_vars_for($path,$interpolate)}else {return$class->build_activate_environment_vars_for($path,$interpolate)}}my%ENV_LIST_VALUE_DEFAULTS=(interpolate=>INTERPOLATE_ENV,exists=>undef,filter=>sub {1},empty=>undef,);sub _env_list_value {my$options=shift;die(sprintf "unknown option '$_' at %s line %u\n",(caller)[1..2])for grep {!exists$ENV_LIST_VALUE_DEFAULTS{$_}}keys %$options;my%options=(%ENV_LIST_VALUE_DEFAULTS,%{$options});$options{exists}=$options{interpolate}==INTERPOLATE_ENV unless defined$options{exists};my%seen;my$value=join($Config{path_sep},map {ref $_ ? ($^O eq 'MSWin32' ? "%${$_}%" : "\$${$_}"): $_}grep {ref $_ || (defined $_ && length($_)> 0 &&!$seen{$_}++ && $options{filter}->($_)&& (!$options{exists}|| -e $_))}map {if (ref $_ eq 'SCALAR' && $options{interpolate}==INTERPOLATE_ENV){defined$ENV{${$_}}? (split /\Q$Config{path_sep}/,$ENV{${$_}}): ()}else {$_}}@_);return length($value)? $value : $options{empty}}sub build_activate_environment_vars_for {my ($class,$path,$interpolate)=@_;return (PERL_LOCAL_LIB_ROOT=>_env_list_value({interpolate=>$interpolate,exists=>0,empty=>'' },\'PERL_LOCAL_LIB_ROOT',$path,),PERL_MB_OPT=>"--install_base ${path}",PERL_MM_OPT=>"INSTALL_BASE=${path}",PERL5LIB=>_env_list_value({interpolate=>$interpolate,exists=>0,empty=>'' },$class->install_base_perl_path($path),\'PERL5LIB',),PATH=>_env_list_value({interpolate=>$interpolate,exists=>0,empty=>'' },$class->install_base_bin_path($path),\'PATH',),)}sub active_paths {my ($class)=@_;return ()unless defined$ENV{PERL_LOCAL_LIB_ROOT};return grep {$_ ne ''}split /\Q$Config{path_sep}/,$ENV{PERL_LOCAL_LIB_ROOT}}sub build_deactivate_environment_vars_for {my ($class,$path,$interpolate)=@_;my@active_lls=$class->active_paths;if (!grep {$_ eq $path}@active_lls){warn "Tried to deactivate inactive local::lib '$path'\n";return ()}my$perl_path=$class->install_base_perl_path($path);my$arch_path=$class->install_base_arch_path($path);my$bin_path=$class->install_base_bin_path($path);my%env=(PERL_LOCAL_LIB_ROOT=>_env_list_value({exists=>0,},grep {$_ ne $path}@active_lls),PERL5LIB=>_env_list_value({exists=>0,filter=>sub {$_ ne $perl_path && $_ ne $arch_path},},\'PERL5LIB',),PATH=>_env_list_value({exists=>0,filter=>sub {$_ ne $bin_path},},\'PATH',),);if ($active_lls[-1]eq $path){my$new_top=$active_lls[-2];$env{PERL_MB_OPT}=defined($new_top)? "--install_base ${new_top}" : undef;$env{PERL_MM_OPT}=defined($new_top)? "INSTALL_BASE=${new_top}" : undef}return%env}sub build_deact_all_environment_vars_for {my ($class,$path,$interpolate)=@_;my@active_lls=$class->active_paths;my%perl_paths=map {($class->install_base_perl_path($_)=>1,$class->install_base_arch_path($_)=>1)}@active_lls;my%bin_paths=map {($class->install_base_bin_path($_)=>1,)}@active_lls;my%env=(PERL_LOCAL_LIB_ROOT=>undef,PERL_MM_OPT=>undef,PERL_MB_OPT=>undef,PERL5LIB=>_env_list_value({exists=>0,filter=>sub {!scalar grep {exists$perl_paths{$_}}$_[0]},},\'PERL5LIB'),PATH=>_env_list_value({exists=>0,filter=>sub {!scalar grep {exists$bin_paths{$_}}$_[0]},},\'PATH'),);return%env}1;
WHOA THERE! It looks like you've got some fancy dashes in your commandline!
These are *not* the traditional -- dashes that software recognizes. You
probably got these by copy-pasting from the perldoc for this module as
@@ -9088,1855 +415,40 @@ $fatpacked{"local/lib.pm"} = <<'LOCAL_LIB';
terminal, but can happen elsewhere too. Please try again after replacing the
dashes with normal minus signs.
DEATH
- }
- elsif(grep { $arg eq $_ } @KNOWN_FLAGS) {
- (my $flag = $arg) =~ s/--//;
- $arg_store{$flag} = 1;
- }
- elsif($arg =~ /^--/) {
- die "Unknown import argument: $arg";
- }
- else {
- # assume that what's left is a path
- $arg_store{path} = $arg;
- }
- }
-
- if($arg_store{'self-contained'}) {
- die "FATAL: The local::lib --self-contained flag has never worked reliably and the original author, Mark Stosberg, was unable or unwilling to maintain it. As such, this flag has been removed from the local::lib codebase in order to prevent misunderstandings and potentially broken builds. The local::lib authors recommend that you look at the lib::core::only module shipped with this distribution in order to create a more robust environment that is equivalent to what --self-contained provided (although quite possibly not what you originally thought it provided due to the poor quality of the documentation, for which we apologise).\n";
- }
-
- $arg_store{path} = $class->resolve_path($arg_store{path});
- $class->setup_local_lib_for($arg_store{path});
-
- for (@INC) { # Untaint @INC
- next if ref; # Skip entry if it is an ARRAY, CODE, blessed, etc.
- m/(.*)/ and $_ = $1;
- }
- }
-
- sub pipeline;
-
- sub pipeline {
- my @methods = @_;
- my $last = pop(@methods);
- if (@methods) {
- \sub {
- my ($obj, @args) = @_;
- $obj->${pipeline @methods}(
- $obj->$last(@args)
- );
- };
- } else {
- \sub {
- shift->$last(@_);
- };
- }
- }
-
- sub _uniq {
- my %seen;
- grep { ! $seen{$_}++ } @_;
- }
-
- sub resolve_path {
- my ($class, $path) = @_;
- $class->${pipeline qw(
- resolve_relative_path
- resolve_home_path
- resolve_empty_path
- )}($path);
- }
-
- sub resolve_empty_path {
- my ($class, $path) = @_;
- if (defined $path) {
- $path;
- } else {
- '~/perl5';
- }
- }
-
- sub resolve_home_path {
- my ($class, $path) = @_;
- return $path unless ($path =~ /^~/);
- my ($user) = ($path =~ /^~([^\/]+)/); # can assume ^~ so undef for 'us'
- my $tried_file_homedir;
- my $homedir = do {
- if (eval { require File::HomeDir } && $File::HomeDir::VERSION >= 0.65) {
- $tried_file_homedir = 1;
- if (defined $user) {
- File::HomeDir->users_home($user);
- } else {
- File::HomeDir->my_home;
- }
- } else {
- if (defined $user) {
- (getpwnam $user)[7];
- } else {
- if (defined $ENV{HOME}) {
- $ENV{HOME};
- } else {
- (getpwuid $<)[7];
- }
- }
- }
- };
- unless (defined $homedir) {
- Carp::croak(
- "Couldn't resolve homedir for "
- .(defined $user ? $user : 'current user')
- .($tried_file_homedir ? '' : ' - consider installing File::HomeDir')
- );
- }
- $path =~ s/^~[^\/]*/$homedir/;
- $path;
- }
-
- sub resolve_relative_path {
- my ($class, $path) = @_;
- $path = File::Spec->rel2abs($path);
- }
-
- sub setup_local_lib_for {
- my ($class, $path) = @_;
- $path = $class->ensure_dir_structure_for($path);
- if ($0 eq '-') {
- $class->print_environment_vars_for($path);
- exit 0;
- } else {
- $class->setup_env_hash_for($path);
- @INC = _uniq(split($Config{path_sep}, $ENV{PERL5LIB}), @INC);
- }
- }
-
- sub install_base_bin_path {
- my ($class, $path) = @_;
- File::Spec->catdir($path, 'bin');
- }
-
- sub install_base_perl_path {
- my ($class, $path) = @_;
- File::Spec->catdir($path, 'lib', 'perl5');
- }
-
- sub install_base_arch_path {
- my ($class, $path) = @_;
- File::Spec->catdir($class->install_base_perl_path($path), $Config{archname});
- }
-
- sub ensure_dir_structure_for {
- my ($class, $path) = @_;
- unless (-d $path) {
- warn "Attempting to create directory ${path}\n";
- }
- File::Path::mkpath($path);
- # Need to have the path exist to make a short name for it, so
- # converting to a short name here.
- $path = Win32::GetShortPathName($path) if $^O eq 'MSWin32';
-
- return $path;
- }
-
- sub INTERPOLATE_ENV () { 1 }
- sub LITERAL_ENV () { 0 }
-
- sub guess_shelltype {
- my $shellbin = 'sh';
- if(defined $ENV{'SHELL'}) {
- my @shell_bin_path_parts = File::Spec->splitpath($ENV{'SHELL'});
- $shellbin = $shell_bin_path_parts[-1];
- }
- my $shelltype = do {
- local $_ = $shellbin;
- if(/csh/) {
- 'csh'
- } else {
- 'bourne'
- }
- };
-
- # Both Win32 and Cygwin have $ENV{COMSPEC} set.
- if (defined $ENV{'COMSPEC'} && $^O ne 'cygwin') {
- my @shell_bin_path_parts = File::Spec->splitpath($ENV{'COMSPEC'});
- $shellbin = $shell_bin_path_parts[-1];
- $shelltype = do {
- local $_ = $shellbin;
- if(/command\.com/) {
- 'win32'
- } elsif(/cmd\.exe/) {
- 'win32'
- } elsif(/4nt\.exe/) {
- 'win32'
- } else {
- $shelltype
- }
- };
- }
- return $shelltype;
- }
-
- sub print_environment_vars_for {
- my ($class, $path) = @_;
- print $class->environment_vars_string_for($path);
- }
-
- sub environment_vars_string_for {
- my ($class, $path) = @_;
- my @envs = $class->build_environment_vars_for($path, LITERAL_ENV);
- my $out = '';
-
- # rather basic csh detection, goes on the assumption that something won't
- # call itself csh unless it really is. also, default to bourne in the
- # pathological situation where a user doesn't have $ENV{SHELL} defined.
- # note also that shells with funny names, like zoid, are assumed to be
- # bourne.
-
- my $shelltype = $class->guess_shelltype;
-
- while (@envs) {
- my ($name, $value) = (shift(@envs), shift(@envs));
- $value =~ s/(\\")/\\$1/g;
- $out .= $class->${\"build_${shelltype}_env_declaration"}($name, $value);
- }
- return $out;
- }
-
- # simple routines that take two arguments: an %ENV key and a value. return
- # strings that are suitable for passing directly to the relevant shell to set
- # said key to said value.
- sub build_bourne_env_declaration {
- my $class = shift;
- my($name, $value) = @_;
- return qq{export ${name}="${value}"\n};
- }
-
- sub build_csh_env_declaration {
- my $class = shift;
- my($name, $value) = @_;
- return qq{setenv ${name} "${value}"\n};
- }
-
- sub build_win32_env_declaration {
- my $class = shift;
- my($name, $value) = @_;
- return qq{set ${name}=${value}\n};
- }
-
- sub setup_env_hash_for {
- my ($class, $path) = @_;
- my %envs = $class->build_environment_vars_for($path, INTERPOLATE_ENV);
- @ENV{keys %envs} = values %envs;
- }
-
- sub build_environment_vars_for {
- my ($class, $path, $interpolate) = @_;
- return (
- PERL_LOCAL_LIB_ROOT => $path,
- PERL_MB_OPT => "--install_base ${path}",
- PERL_MM_OPT => "INSTALL_BASE=${path}",
- PERL5LIB => join($Config{path_sep},
- $class->install_base_arch_path($path),
- $class->install_base_perl_path($path),
- (($ENV{PERL5LIB}||()) ?
- ($interpolate == INTERPOLATE_ENV
- ? ($ENV{PERL5LIB})
- : (($^O ne 'MSWin32') ? '$PERL5LIB' : '%PERL5LIB%' ))
- : ())
- ),
- PATH => join($Config{path_sep},
- $class->install_base_bin_path($path),
- ($interpolate == INTERPOLATE_ENV
- ? ($ENV{PATH}||())
- : (($^O ne 'MSWin32') ? '$PATH' : '%PATH%' ))
- ),
- )
- }
-
- 1;
LOCAL_LIB
-$fatpacked{"parent.pm"} = <<'PARENT';
- package parent;
- use strict;
- use vars qw($VERSION);
- $VERSION = '0.225';
-
- sub import {
- my $class = shift;
-
- my $inheritor = caller(0);
-
- if ( @_ and $_[0] eq '-norequire' ) {
- shift @_;
- } else {
- for ( my @filename = @_ ) {
- if ( $_ eq $inheritor ) {
- warn "Class '$inheritor' tried to inherit from itself\n";
- };
-
- s{::|'}{/}g;
- require "$_.pm"; # dies if the file is not found
- }
- }
-
- {
- no strict 'refs';
- push @{"$inheritor\::ISA"}, @_;
- };
- };
-
- "All your base are belong to us"
-
- __END__
-
-PARENT
-
$fatpacked{"version.pm"} = <<'VERSION';
- #!perl -w
- package version;
-
- use 5.005_04;
- use strict;
-
- use vars qw(@ISA $VERSION $CLASS $STRICT $LAX *declare *qv);
-
- $VERSION = 0.88;
-
- $CLASS = 'version';
-
- #--------------------------------------------------------------------------#
- # Version regexp components
- #--------------------------------------------------------------------------#
-
- # Fraction part of a decimal version number. This is a common part of
- # both strict and lax decimal versions
-
- my $FRACTION_PART = qr/\.[0-9]+/;
-
- # First part of either decimal or dotted-decimal strict version number.
- # Unsigned integer with no leading zeroes (except for zero itself) to
- # avoid confusion with octal.
-
- my $STRICT_INTEGER_PART = qr/0|[1-9][0-9]*/;
-
- # First part of either decimal or dotted-decimal lax version number.
- # Unsigned integer, but allowing leading zeros. Always interpreted
- # as decimal. However, some forms of the resulting syntax give odd
- # results if used as ordinary Perl expressions, due to how perl treats
- # octals. E.g.
- # version->new("010" ) == 10
- # version->new( 010 ) == 8
- # version->new( 010.2) == 82 # "8" . "2"
-
- my $LAX_INTEGER_PART = qr/[0-9]+/;
-
- # Second and subsequent part of a strict dotted-decimal version number.
- # Leading zeroes are permitted, and the number is always decimal.
- # Limited to three digits to avoid overflow when converting to decimal
- # form and also avoid problematic style with excessive leading zeroes.
-
- my $STRICT_DOTTED_DECIMAL_PART = qr/\.[0-9]{1,3}/;
-
- # Second and subsequent part of a lax dotted-decimal version number.
- # Leading zeroes are permitted, and the number is always decimal. No
- # limit on the numerical value or number of digits, so there is the
- # possibility of overflow when converting to decimal form.
-
- my $LAX_DOTTED_DECIMAL_PART = qr/\.[0-9]+/;
-
- # Alpha suffix part of lax version number syntax. Acts like a
- # dotted-decimal part.
-
- my $LAX_ALPHA_PART = qr/_[0-9]+/;
-
- #--------------------------------------------------------------------------#
- # Strict version regexp definitions
- #--------------------------------------------------------------------------#
-
- # Strict decimal version number.
-
- my $STRICT_DECIMAL_VERSION =
- qr/ $STRICT_INTEGER_PART $FRACTION_PART? /x;
-
- # Strict dotted-decimal version number. Must have both leading "v" and
- # at least three parts, to avoid confusion with decimal syntax.
-
- my $STRICT_DOTTED_DECIMAL_VERSION =
- qr/ v $STRICT_INTEGER_PART $STRICT_DOTTED_DECIMAL_PART{2,} /x;
-
- # Complete strict version number syntax -- should generally be used
- # anchored: qr/ \A $STRICT \z /x
-
- $STRICT =
- qr/ $STRICT_DECIMAL_VERSION | $STRICT_DOTTED_DECIMAL_VERSION /x;
-
- #--------------------------------------------------------------------------#
- # Lax version regexp definitions
- #--------------------------------------------------------------------------#
-
- # Lax decimal version number. Just like the strict one except for
- # allowing an alpha suffix or allowing a leading or trailing
- # decimal-point
-
- my $LAX_DECIMAL_VERSION =
- qr/ $LAX_INTEGER_PART (?: \. | $FRACTION_PART $LAX_ALPHA_PART? )?
+ package version;use 5.005_04;use strict;use vars qw(@ISA $VERSION $CLASS $STRICT $LAX *declare *qv);$VERSION=0.9902;$CLASS='version';my$FRACTION_PART=qr/\.[0-9]+/;my$STRICT_INTEGER_PART=qr/0|[1-9][0-9]*/;my$LAX_INTEGER_PART=qr/[0-9]+/;my$STRICT_DOTTED_DECIMAL_PART=qr/\.[0-9]{1,3}/;my$LAX_DOTTED_DECIMAL_PART=qr/\.[0-9]+/;my$LAX_ALPHA_PART=qr/_[0-9]+/;my$STRICT_DECIMAL_VERSION=qr/ $STRICT_INTEGER_PART $FRACTION_PART? /x;my$STRICT_DOTTED_DECIMAL_VERSION=qr/ v $STRICT_INTEGER_PART $STRICT_DOTTED_DECIMAL_PART{2,} /x;$STRICT=qr/ $STRICT_DECIMAL_VERSION | $STRICT_DOTTED_DECIMAL_VERSION /x;my$LAX_DECIMAL_VERSION=qr/ $LAX_INTEGER_PART (?: \. | $FRACTION_PART $LAX_ALPHA_PART? )?
|
$FRACTION_PART $LAX_ALPHA_PART?
- /x;
-
- # Lax dotted-decimal version number. Distinguished by having either
- # leading "v" or at least three non-alpha parts. Alpha part is only
- # permitted if there are at least two non-alpha parts. Strangely
- # enough, without the leading "v", Perl takes .1.2 to mean v0.1.2,
- # so when there is no "v", the leading part is optional
-
- my $LAX_DOTTED_DECIMAL_VERSION =
- qr/
+ /x;my$LAX_DOTTED_DECIMAL_VERSION=qr/
v $LAX_INTEGER_PART (?: $LAX_DOTTED_DECIMAL_PART+ $LAX_ALPHA_PART? )?
|
$LAX_INTEGER_PART? $LAX_DOTTED_DECIMAL_PART{2,} $LAX_ALPHA_PART?
- /x;
-
- # Complete lax version number syntax -- should generally be used
- # anchored: qr/ \A $LAX \z /x
- #
- # The string 'undef' is a special case to make for easier handling
- # of return values from ExtUtils::MM->parse_version
-
- $LAX =
- qr/ undef | $LAX_DECIMAL_VERSION | $LAX_DOTTED_DECIMAL_VERSION /x;
-
- #--------------------------------------------------------------------------#
-
- eval "use version::vxs $VERSION";
- if ( $@ ) { # don't have the XS version installed
- eval "use version::vpp $VERSION"; # don't tempt fate
- die "$@" if ( $@ );
- push @ISA, "version::vpp";
- local $^W;
- *version::qv = \&version::vpp::qv;
- *version::declare = \&version::vpp::declare;
- *version::_VERSION = \&version::vpp::_VERSION;
- if ($] >= 5.009000 && $] < 5.011004) {
- no strict 'refs';
- *version::stringify = \&version::vpp::stringify;
- *{'version::(""'} = \&version::vpp::stringify;
- *version::new = \&version::vpp::new;
- *version::parse = \&version::vpp::parse;
- }
- }
- else { # use XS module
- push @ISA, "version::vxs";
- local $^W;
- *version::declare = \&version::vxs::declare;
- *version::qv = \&version::vxs::qv;
- *version::_VERSION = \&version::vxs::_VERSION;
- *version::vcmp = \&version::vxs::VCMP;
- if ($] >= 5.009000 && $] < 5.011004) {
- no strict 'refs';
- *version::stringify = \&version::vxs::stringify;
- *{'version::(""'} = \&version::vxs::stringify;
- *version::new = \&version::vxs::new;
- *version::parse = \&version::vxs::parse;
- }
-
- }
-
- # Preloaded methods go here.
- sub import {
- no strict 'refs';
- my ($class) = shift;
-
- # Set up any derived class
- unless ($class eq 'version') {
- local $^W;
- *{$class.'::declare'} = \&version::declare;
- *{$class.'::qv'} = \&version::qv;
- }
-
- my %args;
- if (@_) { # any remaining terms are arguments
- map { $args{$_} = 1 } @_
- }
- else { # no parameters at all on use line
- %args =
- (
- qv => 1,
- 'UNIVERSAL::VERSION' => 1,
- );
- }
-
- my $callpkg = caller();
-
- if (exists($args{declare})) {
- *{$callpkg.'::declare'} =
- sub {return $class->declare(shift) }
- unless defined(&{$callpkg.'::declare'});
- }
-
- if (exists($args{qv})) {
- *{$callpkg.'::qv'} =
- sub {return $class->qv(shift) }
- unless defined(&{$callpkg.'::qv'});
- }
-
- if (exists($args{'UNIVERSAL::VERSION'})) {
- local $^W;
- *UNIVERSAL::VERSION
- = \&version::_VERSION;
- }
-
- if (exists($args{'VERSION'})) {
- *{$callpkg.'::VERSION'} = \&version::_VERSION;
- }
-
- if (exists($args{'is_strict'})) {
- *{$callpkg.'::is_strict'} = \&version::is_strict
- unless defined(&{$callpkg.'::is_strict'});
- }
-
- if (exists($args{'is_lax'})) {
- *{$callpkg.'::is_lax'} = \&version::is_lax
- unless defined(&{$callpkg.'::is_lax'});
- }
- }
-
- sub is_strict { defined $_[0] && $_[0] =~ qr/ \A $STRICT \z /x }
- sub is_lax { defined $_[0] && $_[0] =~ qr/ \A $LAX \z /x }
-
- 1;
+ /x;$LAX=qr/ undef | $LAX_DECIMAL_VERSION | $LAX_DOTTED_DECIMAL_VERSION /x;{local$SIG{'__DIE__'};eval "use version::vxs $VERSION";if ($@){eval "use version::vpp $VERSION";die "$@" if ($@);push@ISA,"version::vpp";local $^W;*version::qv=\&version::vpp::qv;*version::declare=\&version::vpp::declare;*version::_VERSION=\&version::vpp::_VERSION;*version::vcmp=\&version::vpp::vcmp;*version::new=\&version::vpp::new;if ($] >= 5.009000){no strict 'refs';*version::stringify=\&version::vpp::stringify;*{'version::(""'}=\&version::vpp::stringify;*{'version::(<=>'}=\&version::vpp::vcmp;*version::parse=\&version::vpp::parse}}else {push@ISA,"version::vxs";local $^W;*version::declare=\&version::vxs::declare;*version::qv=\&version::vxs::qv;*version::_VERSION=\&version::vxs::_VERSION;*version::vcmp=\&version::vxs::VCMP;*version::new=\&version::vxs::new;if ($] >= 5.009000){no strict 'refs';*version::stringify=\&version::vxs::stringify;*{'version::(""'}=\&version::vxs::stringify;*{'version::(<=>'}=\&version::vxs::VCMP;*version::parse=\&version::vxs::parse}}}sub import {no strict 'refs';my ($class)=shift;unless ($class eq 'version'){local $^W;*{$class.'::declare'}=\&version::declare;*{$class.'::qv'}=\&version::qv}my%args;if (@_){map {$args{$_}=1}@_}else {%args=(qv=>1,'UNIVERSAL::VERSION'=>1,)}my$callpkg=caller();if (exists($args{declare})){*{$callpkg.'::declare'}=sub {return$class->declare(shift)}unless defined(&{$callpkg.'::declare'})}if (exists($args{qv})){*{$callpkg.'::qv'}=sub {return$class->qv(shift)}unless defined(&{$callpkg.'::qv'})}if (exists($args{'UNIVERSAL::VERSION'})){local $^W;*UNIVERSAL::VERSION =\&version::_VERSION}if (exists($args{'VERSION'})){*{$callpkg.'::VERSION'}=\&version::_VERSION}if (exists($args{'is_strict'})){*{$callpkg.'::is_strict'}=\&version::is_strict unless defined(&{$callpkg.'::is_strict'})}if (exists($args{'is_lax'})){*{$callpkg.'::is_lax'}=\&version::is_lax unless defined(&{$callpkg.'::is_lax'})}}sub is_strict {defined $_[0]&& $_[0]=~ qr/ \A $STRICT \z /x}sub is_lax {defined $_[0]&& $_[0]=~ qr/ \A $LAX \z /x}1;
VERSION
-$fatpacked{"Version/Requirements.pm"} = <<'VERSION_REQUIREMENTS';
- use strict;
- use warnings;
- package Version::Requirements;
- BEGIN {
- $Version::Requirements::VERSION = '0.101020';
- }
- # ABSTRACT: a set of version requirements for a CPAN dist
-
-
- use Carp ();
- use Scalar::Util ();
- use version 0.77 (); # the ->parse method
-
-
- sub new {
- my ($class) = @_;
- return bless {} => $class;
- }
-
- sub _version_object {
- my ($self, $version) = @_;
-
- $version = (! defined $version) ? version->parse(0)
- : (! Scalar::Util::blessed($version)) ? version->parse($version)
- : $version;
-
- return $version;
- }
-
-
- BEGIN {
- for my $type (qw(minimum maximum exclusion exact_version)) {
- my $method = "with_$type";
- my $to_add = $type eq 'exact_version' ? $type : "add_$type";
-
- my $code = sub {
- my ($self, $name, $version) = @_;
-
- $version = $self->_version_object( $version );
-
- $self->__modify_entry_for($name, $method, $version);
-
- return $self;
- };
-
- no strict 'refs';
- *$to_add = $code;
- }
- }
-
-
- sub add_requirements {
- my ($self, $req) = @_;
-
- for my $module ($req->required_modules) {
- my $modifiers = $req->__entry_for($module)->as_modifiers;
- for my $modifier (@$modifiers) {
- my ($method, @args) = @$modifier;
- $self->$method($module => @args);
- };
- }
-
- return $self;
- }
-
-
- sub accepts_module {
- my ($self, $module, $version) = @_;
-
- $version = $self->_version_object( $version );
-
- return 1 unless my $range = $self->__entry_for($module);
- return $range->_accepts($version);
- }
-
-
- sub clear_requirement {
- my ($self, $module) = @_;
-
- return $self unless $self->__entry_for($module);
-
- Carp::confess("can't clear requirements on finalized requirements")
- if $self->is_finalized;
-
- delete $self->{requirements}{ $module };
-
- return $self;
- }
-
-
- sub required_modules { keys %{ $_[0]{requirements} } }
-
-
- sub clone {
- my ($self) = @_;
- my $new = (ref $self)->new;
-
- return $new->add_requirements($self);
- }
-
- sub __entry_for { $_[0]{requirements}{ $_[1] } }
-
- sub __modify_entry_for {
- my ($self, $name, $method, $version) = @_;
-
- my $fin = $self->is_finalized;
- my $old = $self->__entry_for($name);
-
- Carp::confess("can't add new requirements to finalized requirements")
- if $fin and not $old;
-
- my $new = ($old || 'Version::Requirements::_Range::Range')
- ->$method($version);
-
- Carp::confess("can't modify finalized requirements")
- if $fin and $old->as_string ne $new->as_string;
-
- $self->{requirements}{ $name } = $new;
- }
-
-
- sub is_simple {
- my ($self) = @_;
- for my $module ($self->required_modules) {
- # XXX: This is a complete hack, but also entirely correct.
- return if $self->__entry_for($module)->as_string =~ /\s/;
- }
-
- return 1;
- }
-
-
- sub is_finalized { $_[0]{finalized} }
-
-
- sub finalize { $_[0]{finalized} = 1 }
-
-
- sub as_string_hash {
- my ($self) = @_;
-
- my %hash = map {; $_ => $self->{requirements}{$_}->as_string }
- $self->required_modules;
-
- return \%hash;
- }
-
-
- my %methods_for_op = (
- '==' => [ qw(exact_version) ],
- '!=' => [ qw(add_exclusion) ],
- '>=' => [ qw(add_minimum) ],
- '<=' => [ qw(add_maximum) ],
- '>' => [ qw(add_minimum add_exclusion) ],
- '<' => [ qw(add_maximum add_exclusion) ],
- );
-
- sub from_string_hash {
- my ($class, $hash) = @_;
-
- my $self = $class->new;
-
- for my $module (keys %$hash) {
- my @parts = split qr{\s*,\s*}, $hash->{ $module };
- for my $part (@parts) {
- my ($op, $ver) = split /\s+/, $part, 2;
-
- if (! defined $ver) {
- $self->add_minimum($module => $op);
- } else {
- Carp::confess("illegal requirement string: $hash->{ $module }")
- unless my $methods = $methods_for_op{ $op };
-
- $self->$_($module => $ver) for @$methods;
- }
- }
- }
-
- return $self;
- }
-
- ##############################################################
-
- {
- package
- Version::Requirements::_Range::Exact;
- BEGIN {
- $Version::Requirements::_Range::Exact::VERSION = '0.101020';
- }
- sub _new { bless { version => $_[1] } => $_[0] }
-
- sub _accepts { return $_[0]{version} == $_[1] }
-
- sub as_string { return "== $_[0]{version}" }
-
- sub as_modifiers { return [ [ exact_version => $_[0]{version} ] ] }
-
- sub _clone {
- (ref $_[0])->_new( version->new( $_[0]{version} ) )
- }
-
- sub with_exact_version {
- my ($self, $version) = @_;
-
- return $self->_clone if $self->_accepts($version);
-
- Carp::confess("illegal requirements: unequal exact version specified");
- }
-
- sub with_minimum {
- my ($self, $minimum) = @_;
- return $self->_clone if $self->{version} >= $minimum;
- Carp::confess("illegal requirements: minimum above exact specification");
- }
-
- sub with_maximum {
- my ($self, $maximum) = @_;
- return $self->_clone if $self->{version} <= $maximum;
- Carp::confess("illegal requirements: maximum below exact specification");
- }
-
- sub with_exclusion {
- my ($self, $exclusion) = @_;
- return $self->_clone unless $exclusion == $self->{version};
- Carp::confess("illegal requirements: excluded exact specification");
- }
- }
-
- ##############################################################
-
- {
- package
- Version::Requirements::_Range::Range;
- BEGIN {
- $Version::Requirements::_Range::Range::VERSION = '0.101020';
- }
-
- sub _self { ref($_[0]) ? $_[0] : (bless { } => $_[0]) }
-
- sub _clone {
- return (bless { } => $_[0]) unless ref $_[0];
-
- my ($s) = @_;
- my %guts = (
- (exists $s->{minimum} ? (minimum => version->new($s->{minimum})) : ()),
- (exists $s->{maximum} ? (maximum => version->new($s->{maximum})) : ()),
-
- (exists $s->{exclusions}
- ? (exclusions => [ map { version->new($_) } @{ $s->{exclusions} } ])
- : ()),
- );
-
- bless \%guts => ref($s);
- }
-
- sub as_modifiers {
- my ($self) = @_;
- my @mods;
- push @mods, [ add_minimum => $self->{minimum} ] if exists $self->{minimum};
- push @mods, [ add_maximum => $self->{maximum} ] if exists $self->{maximum};
- push @mods, map {; [ add_exclusion => $_ ] } @{$self->{exclusions} || []};
- return \@mods;
- }
-
- sub as_string {
- my ($self) = @_;
-
- return 0 if ! keys %$self;
-
- return "$self->{minimum}" if (keys %$self) == 1 and exists $self->{minimum};
-
- my @exclusions = @{ $self->{exclusions} || [] };
-
- my @parts;
-
- for my $pair (
- [ qw( >= > minimum ) ],
- [ qw( <= < maximum ) ],
- ) {
- my ($op, $e_op, $k) = @$pair;
- if (exists $self->{$k}) {
- my @new_exclusions = grep { $_ != $self->{ $k } } @exclusions;
- if (@new_exclusions == @exclusions) {
- push @parts, "$op $self->{ $k }";
- } else {
- push @parts, "$e_op $self->{ $k }";
- @exclusions = @new_exclusions;
- }
- }
- }
-
- push @parts, map {; "!= $_" } @exclusions;
-
- return join q{, }, @parts;
- }
-
- sub with_exact_version {
- my ($self, $version) = @_;
- $self = $self->_clone;
-
- Carp::confess("illegal requirements: exact specification outside of range")
- unless $self->_accepts($version);
-
- return Version::Requirements::_Range::Exact->_new($version);
- }
-
- sub _simplify {
- my ($self) = @_;
-
- if (defined $self->{minimum} and defined $self->{maximum}) {
- if ($self->{minimum} == $self->{maximum}) {
- Carp::confess("illegal requirements: excluded all values")
- if grep { $_ == $self->{minimum} } @{ $self->{exclusions} || [] };
-
- return Version::Requirements::_Range::Exact->_new($self->{minimum})
- }
-
- Carp::confess("illegal requirements: minimum exceeds maximum")
- if $self->{minimum} > $self->{maximum};
- }
-
- # eliminate irrelevant exclusions
- if ($self->{exclusions}) {
- my %seen;
- @{ $self->{exclusions} } = grep {
- (! defined $self->{minimum} or $_ >= $self->{minimum})
- and
- (! defined $self->{maximum} or $_ <= $self->{maximum})
- and
- ! $seen{$_}++
- } @{ $self->{exclusions} };
- }
-
- return $self;
- }
-
- sub with_minimum {
- my ($self, $minimum) = @_;
- $self = $self->_clone;
-
- if (defined (my $old_min = $self->{minimum})) {
- $self->{minimum} = (sort { $b cmp $a } ($minimum, $old_min))[0];
- } else {
- $self->{minimum} = $minimum;
- }
-
- return $self->_simplify;
- }
-
- sub with_maximum {
- my ($self, $maximum) = @_;
- $self = $self->_clone;
-
- if (defined (my $old_max = $self->{maximum})) {
- $self->{maximum} = (sort { $a cmp $b } ($maximum, $old_max))[0];
- } else {
- $self->{maximum} = $maximum;
- }
-
- return $self->_simplify;
- }
-
- sub with_exclusion {
- my ($self, $exclusion) = @_;
- $self = $self->_clone;
-
- push @{ $self->{exclusions} ||= [] }, $exclusion;
-
- return $self->_simplify;
- }
-
- sub _accepts {
- my ($self, $version) = @_;
-
- return if defined $self->{minimum} and $version < $self->{minimum};
- return if defined $self->{maximum} and $version > $self->{maximum};
- return if defined $self->{exclusions}
- and grep { $version == $_ } @{ $self->{exclusions} };
-
- return 1;
- }
- }
-
- 1;
-
- __END__
- =pod
-
-VERSION_REQUIREMENTS
-
$fatpacked{"version/vpp.pm"} = <<'VERSION_VPP';
- package charstar;
- # a little helper class to emulate C char* semantics in Perl
- # so that prescan_version can use the same code as in C
-
- use overload (
- '""' => \&thischar,
- '0+' => \&thischar,
- '++' => \&increment,
- '--' => \&decrement,
- '+' => \&plus,
- '-' => \&minus,
- '*' => \&multiply,
- 'cmp' => \&cmp,
- '<=>' => \&spaceship,
- 'bool' => \&thischar,
- '=' => \&clone,
- );
-
- sub new {
- my ($self, $string) = @_;
- my $class = ref($self) || $self;
-
- my $obj = {
- string => [split(//,$string)],
- current => 0,
- };
- return bless $obj, $class;
- }
-
- sub thischar {
- my ($self) = @_;
- my $last = $#{$self->{string}};
- my $curr = $self->{current};
- if ($curr >= 0 && $curr <= $last) {
- return $self->{string}->[$curr];
- }
- else {
- return '';
- }
- }
-
- sub increment {
- my ($self) = @_;
- $self->{current}++;
- }
-
- sub decrement {
- my ($self) = @_;
- $self->{current}--;
- }
-
- sub plus {
- my ($self, $offset) = @_;
- my $rself = $self->clone;
- $rself->{current} += $offset;
- return $rself;
- }
-
- sub minus {
- my ($self, $offset) = @_;
- my $rself = $self->clone;
- $rself->{current} -= $offset;
- return $rself;
- }
-
- sub multiply {
- my ($left, $right, $swapped) = @_;
- my $char = $left->thischar();
- return $char * $right;
- }
-
- sub spaceship {
- my ($left, $right, $swapped) = @_;
- unless (ref($right)) { # not an object already
- $right = $left->new($right);
- }
- return $left->{current} <=> $right->{current};
- }
-
- sub cmp {
- my ($left, $right, $swapped) = @_;
- unless (ref($right)) { # not an object already
- if (length($right) == 1) { # comparing single character only
- return $left->thischar cmp $right;
- }
- $right = $left->new($right);
- }
- return $left->currstr cmp $right->currstr;
- }
-
- sub bool {
- my ($self) = @_;
- my $char = $self->thischar;
- return ($char ne '');
- }
-
- sub clone {
- my ($left, $right, $swapped) = @_;
- $right = {
- string => [@{$left->{string}}],
- current => $left->{current},
- };
- return bless $right, ref($left);
- }
-
- sub currstr {
- my ($self, $s) = @_;
- my $curr = $self->{current};
- my $last = $#{$self->{string}};
- if (defined($s) && $s->{current} < $last) {
- $last = $s->{current};
- }
-
- my $string = join('', @{$self->{string}}[$curr..$last]);
- return $string;
- }
-
- package version::vpp;
- use strict;
-
- use POSIX qw/locale_h/;
- use locale;
- use vars qw ($VERSION @ISA @REGEXS);
- $VERSION = 0.88;
-
- use overload (
- '""' => \&stringify,
- '0+' => \&numify,
- 'cmp' => \&vcmp,
- '<=>' => \&vcmp,
- 'bool' => \&vbool,
- 'nomethod' => \&vnoop,
- );
-
- eval "use warnings";
- if ($@) {
- eval '
- package warnings;
+ package charstar;use overload ('""'=>\&thischar,'0+'=>\&thischar,'++'=>\&increment,'--'=>\&decrement,'+'=>\&plus,'-'=>\&minus,'*'=>\&multiply,'cmp'=>\&cmp,'<=>'=>\&spaceship,'bool'=>\&thischar,'='=>\&clone,);sub new {my ($self,$string)=@_;my$class=ref($self)|| $self;my$obj={string=>[split(//,$string)],current=>0,};return bless$obj,$class}sub thischar {my ($self)=@_;my$last=$#{$self->{string}};my$curr=$self->{current};if ($curr >= 0 && $curr <= $last){return$self->{string}->[$curr]}else {return ''}}sub increment {my ($self)=@_;$self->{current}++}sub decrement {my ($self)=@_;$self->{current}--}sub plus {my ($self,$offset)=@_;my$rself=$self->clone;$rself->{current}+= $offset;return$rself}sub minus {my ($self,$offset)=@_;my$rself=$self->clone;$rself->{current}-= $offset;return$rself}sub multiply {my ($left,$right,$swapped)=@_;my$char=$left->thischar();return$char * $right}sub spaceship {my ($left,$right,$swapped)=@_;unless (ref($right)){$right=$left->new($right)}return$left->{current}<=> $right->{current}}sub cmp {my ($left,$right,$swapped)=@_;unless (ref($right)){if (length($right)==1){return$left->thischar cmp $right}$right=$left->new($right)}return$left->currstr cmp $right->currstr}sub bool {my ($self)=@_;my$char=$self->thischar;return ($char ne '')}sub clone {my ($left,$right,$swapped)=@_;$right={string=>[@{$left->{string}}],current=>$left->{current},};return bless$right,ref($left)}sub currstr {my ($self,$s)=@_;my$curr=$self->{current};my$last=$#{$self->{string}};if (defined($s)&& $s->{current}< $last){$last=$s->{current}}my$string=join('',@{$self->{string}}[$curr..$last]);return$string}package version::vpp;use strict;use POSIX qw/locale_h/;use locale;use vars qw ($VERSION @ISA @REGEXS);$VERSION=0.9902;use overload ('""'=>\&stringify,'0+'=>\&numify,'cmp'=>\&vcmp,'<=>'=>\&vcmp,'bool'=>\&vbool,'+'=>\&vnoop,'-'=>\&vnoop,'*'=>\&vnoop,'/'=>\&vnoop,'+='=>\&vnoop,'-='=>\&vnoop,'*='=>\&vnoop,'/='=>\&vnoop,'abs'=>\&vnoop,);eval "use warnings";if ($@){eval '
+ package
+ warnings;
sub enabled {return $^W;}
1;
- ';
- }
-
- my $VERSION_MAX = 0x7FFFFFFF;
-
- # implement prescan_version as closely to the C version as possible
- use constant TRUE => 1;
- use constant FALSE => 0;
-
- sub isDIGIT {
- my ($char) = shift->thischar();
- return ($char =~ /\d/);
- }
-
- sub isALPHA {
- my ($char) = shift->thischar();
- return ($char =~ /[a-zA-Z]/);
- }
-
- sub isSPACE {
- my ($char) = shift->thischar();
- return ($char =~ /\s/);
- }
-
- sub BADVERSION {
- my ($s, $errstr, $error) = @_;
- if ($errstr) {
- $$errstr = $error;
- }
- return $s;
- }
-
- sub prescan_version {
- my ($s, $strict, $errstr, $sqv, $ssaw_decimal, $swidth, $salpha) = @_;
- my $qv = defined $sqv ? $$sqv : FALSE;
- my $saw_decimal = defined $ssaw_decimal ? $$ssaw_decimal : 0;
- my $width = defined $swidth ? $$swidth : 3;
- my $alpha = defined $salpha ? $$salpha : FALSE;
-
- my $d = $s;
-
- if ($qv && isDIGIT($d)) {
- goto dotted_decimal_version;
- }
-
- if ($d eq 'v') { # explicit v-string
- $d++;
- if (isDIGIT($d)) {
- $qv = TRUE;
- }
- else { # degenerate v-string
- # requires v1.2.3
- return BADVERSION($s,$errstr,"Invalid version format (dotted-decimal versions require at least three parts)");
- }
-
- dotted_decimal_version:
- if ($strict && $d eq '0' && isDIGIT($d+1)) {
- # no leading zeros allowed
- return BADVERSION($s,$errstr,"Invalid version format (no leading zeros)");
- }
-
- while (isDIGIT($d)) { # integer part
- $d++;
- }
-
- if ($d eq '.')
- {
- $saw_decimal++;
- $d++; # decimal point
- }
- else
- {
- if ($strict) {
- # require v1.2.3
- return BADVERSION($s,$errstr,"Invalid version format (dotted-decimal versions require at least three parts)");
- }
- else {
- goto version_prescan_finish;
- }
- }
-
- {
- my $i = 0;
- my $j = 0;
- while (isDIGIT($d)) { # just keep reading
- $i++;
- while (isDIGIT($d)) {
- $d++; $j++;
- # maximum 3 digits between decimal
- if ($strict && $j > 3) {
- return BADVERSION($s,$errstr,"Invalid version format (maximum 3 digits between decimals)");
- }
- }
- if ($d eq '_') {
- if ($strict) {
- return BADVERSION($s,$errstr,"Invalid version format (no underscores)");
- }
- if ( $alpha ) {
- return BADVERSION($s,$errstr,"Invalid version format (multiple underscores)");
- }
- $d++;
- $alpha = TRUE;
- }
- elsif ($d eq '.') {
- if ($alpha) {
- return BADVERSION($s,$errstr,"Invalid version format (underscores before decimal)");
- }
- $saw_decimal++;
- $d++;
- }
- elsif (!isDIGIT($d)) {
- last;
- }
- $j = 0;
- }
-
- if ($strict && $i < 2) {
- # requires v1.2.3
- return BADVERSION($s,$errstr,"Invalid version format (dotted-decimal versions require at least three parts)");
- }
- }
- } # end if dotted-decimal
- else
- { # decimal versions
- # special $strict case for leading '.' or '0'
- if ($strict) {
- if ($d eq '.') {
- return BADVERSION($s,$errstr,"Invalid version format (0 before decimal required)");
- }
- if ($d eq '0' && isDIGIT($d+1)) {
- return BADVERSION($s,$errstr,"Invalid version format (no leading zeros)");
- }
- }
-
- # consume all of the integer part
- while (isDIGIT($d)) {
- $d++;
- }
-
- # look for a fractional part
- if ($d eq '.') {
- # we found it, so consume it
- $saw_decimal++;
- $d++;
- }
- elsif (!$d || $d eq ';' || isSPACE($d) || $d eq '}') {
- if ( $d == $s ) {
- # found nothing
- return BADVERSION($s,$errstr,"Invalid version format (version required)");
- }
- # found just an integer
- goto version_prescan_finish;
- }
- elsif ( $d == $s ) {
- # didn't find either integer or period
- return BADVERSION($s,$errstr,"Invalid version format (non-numeric data)");
- }
- elsif ($d eq '_') {
- # underscore can't come after integer part
- if ($strict) {
- return BADVERSION($s,$errstr,"Invalid version format (no underscores)");
- }
- elsif (isDIGIT($d+1)) {
- return BADVERSION($s,$errstr,"Invalid version format (alpha without decimal)");
- }
- else {
- return BADVERSION($s,$errstr,"Invalid version format (misplaced underscore)");
- }
- }
- elsif ($d) {
- # anything else after integer part is just invalid data
- return BADVERSION($s,$errstr,"Invalid version format (non-numeric data)");
- }
-
- # scan the fractional part after the decimal point
- if ($d && !isDIGIT($d) && ($strict || ! ($d eq ';' || isSPACE($d) || $d eq '}') )) {
- # $strict or lax-but-not-the-end
- return BADVERSION($s,$errstr,"Invalid version format (fractional part required)");
- }
-
- while (isDIGIT($d)) {
- $d++;
- if ($d eq '.' && isDIGIT($d-1)) {
- if ($alpha) {
- return BADVERSION($s,$errstr,"Invalid version format (underscores before decimal)");
- }
- if ($strict) {
- return BADVERSION($s,$errstr,"Invalid version format (dotted-decimal versions must begin with 'v')");
- }
- $d = $s; # start all over again
- $qv = TRUE;
- goto dotted_decimal_version;
- }
- if ($d eq '_') {
- if ($strict) {
- return BADVERSION($s,$errstr,"Invalid version format (no underscores)");
- }
- if ( $alpha ) {
- return BADVERSION($s,$errstr,"Invalid version format (multiple underscores)");
- }
- if ( ! isDIGIT($d+1) ) {
- return BADVERSION($s,$errstr,"Invalid version format (misplaced underscore)");
- }
- $d++;
- $alpha = TRUE;
- }
- }
- }
-
- version_prescan_finish:
- while (isSPACE($d)) {
- $d++;
- }
-
- if ($d && !isDIGIT($d) && (! ($d eq ';' || $d eq '}') )) {
- # trailing non-numeric data
- return BADVERSION($s,$errstr,"Invalid version format (non-numeric data)");
- }
-
- if (defined $sqv) {
- $$sqv = $qv;
- }
- if (defined $swidth) {
- $$swidth = $width;
- }
- if (defined $ssaw_decimal) {
- $$ssaw_decimal = $saw_decimal;
- }
- if (defined $salpha) {
- $$salpha = $alpha;
- }
- return $d;
- }
-
- sub scan_version {
- my ($s, $rv, $qv) = @_;
- my $start;
- my $pos;
- my $last;
- my $errstr;
- my $saw_decimal = 0;
- my $width = 3;
- my $alpha = FALSE;
- my $vinf = FALSE;
- my @av;
-
- $s = new charstar $s;
-
- while (isSPACE($s)) { # leading whitespace is OK
- $s++;
- }
-
- $last = prescan_version($s, FALSE, \$errstr, \$qv, \$saw_decimal,
- \$width, \$alpha);
-
- if ($errstr) {
- # 'undef' is a special case and not an error
- if ( $s ne 'undef') {
- use Carp;
- Carp::croak($errstr);
- }
- }
-
- $start = $s;
- if ($s eq 'v') {
- $s++;
- }
- $pos = $s;
-
- if ( $qv ) {
- $$rv->{qv} = $qv;
- }
- if ( $alpha ) {
- $$rv->{alpha} = $alpha;
- }
- if ( !$qv && $width < 3 ) {
- $$rv->{width} = $width;
- }
-
- while (isDIGIT($pos)) {
- $pos++;
- }
- if (!isALPHA($pos)) {
- my $rev;
-
- for (;;) {
- $rev = 0;
- {
- # this is atoi() that delimits on underscores
- my $end = $pos;
- my $mult = 1;
- my $orev;
-
- # the following if() will only be true after the decimal
- # point of a version originally created with a bare
- # floating point number, i.e. not quoted in any way
- #
- if ( !$qv && $s > $start && $saw_decimal == 1 ) {
- $mult *= 100;
- while ( $s < $end ) {
- $orev = $rev;
- $rev += $s * $mult;
- $mult /= 10;
- if ( (abs($orev) > abs($rev))
- || (abs($rev) > $VERSION_MAX )) {
- warn("Integer overflow in version %d",
- $VERSION_MAX);
- $s = $end - 1;
- $rev = $VERSION_MAX;
- $vinf = 1;
- }
- $s++;
- if ( $s eq '_' ) {
- $s++;
- }
- }
- }
- else {
- while (--$end >= $s) {
- $orev = $rev;
- $rev += $end * $mult;
- $mult *= 10;
- if ( (abs($orev) > abs($rev))
- || (abs($rev) > $VERSION_MAX )) {
- warn("Integer overflow in version");
- $end = $s - 1;
- $rev = $VERSION_MAX;
- $vinf = 1;
- }
- }
- }
- }
-
- # Append revision
- push @av, $rev;
- if ( $vinf ) {
- $s = $last;
- last;
- }
- elsif ( $pos eq '.' ) {
- $s = ++$pos;
- }
- elsif ( $pos eq '_' && isDIGIT($pos+1) ) {
- $s = ++$pos;
- }
- elsif ( $pos eq ',' && isDIGIT($pos+1) ) {
- $s = ++$pos;
- }
- elsif ( isDIGIT($pos) ) {
- $s = $pos;
- }
- else {
- $s = $pos;
- last;
- }
- if ( $qv ) {
- while ( isDIGIT($pos) ) {
- $pos++;
- }
- }
- else {
- my $digits = 0;
- while ( ( isDIGIT($pos) || $pos eq '_' ) && $digits < 3 ) {
- if ( $pos ne '_' ) {
- $digits++;
- }
- $pos++;
- }
- }
- }
- }
- if ( $qv ) { # quoted versions always get at least three terms
- my $len = $#av;
- # This for loop appears to trigger a compiler bug on OS X, as it
- # loops infinitely. Yes, len is negative. No, it makes no sense.
- # Compiler in question is:
- # gcc version 3.3 20030304 (Apple Computer, Inc. build 1640)
- # for ( len = 2 - len; len > 0; len-- )
- # av_push(MUTABLE_AV(sv), newSViv(0));
- #
- $len = 2 - $len;
- while ($len-- > 0) {
- push @av, 0;
- }
- }
-
- # need to save off the current version string for later
- if ( $vinf ) {
- $$rv->{original} = "v.Inf";
- $$rv->{vinf} = 1;
- }
- elsif ( $s > $start ) {
- $$rv->{original} = $start->currstr($s);
- if ( $qv && $saw_decimal == 1 && $start ne 'v' ) {
- # need to insert a v to be consistent
- $$rv->{original} = 'v' . $$rv->{original};
- }
- }
- else {
- $$rv->{original} = '0';
- push(@av, 0);
- }
-
- # And finally, store the AV in the hash
- $$rv->{version} = \@av;
-
- # fix RT#19517 - special case 'undef' as string
- if ($s eq 'undef') {
- $s += 5;
- }
-
- return $s;
- }
-
- sub new
- {
- my ($class, $value) = @_;
- my $self = bless ({}, ref ($class) || $class);
- my $qv = FALSE;
-
- if ( ref($value) && eval('$value->isa("version")') ) {
- # Can copy the elements directly
- $self->{version} = [ @{$value->{version} } ];
- $self->{qv} = 1 if $value->{qv};
- $self->{alpha} = 1 if $value->{alpha};
- $self->{original} = ''.$value->{original};
- return $self;
- }
-
- my $currlocale = setlocale(LC_ALL);
-
- # if the current locale uses commas for decimal points, we
- # just replace commas with decimal places, rather than changing
- # locales
- if ( localeconv()->{decimal_point} eq ',' ) {
- $value =~ tr/,/./;
- }
-
- if ( not defined $value or $value =~ /^undef$/ ) {
- # RT #19517 - special case for undef comparison
- # or someone forgot to pass a value
- push @{$self->{version}}, 0;
- $self->{original} = "0";
- return ($self);
- }
-
- if ( $#_ == 2 ) { # must be CVS-style
- $value = $_[2];
- $qv = TRUE;
- }
-
- $value = _un_vstring($value);
-
- # exponential notation
- if ( $value =~ /\d+.?\d*e[-+]?\d+/ ) {
- $value = sprintf("%.9f",$value);
- $value =~ s/(0+)$//; # trim trailing zeros
- }
-
- my $s = scan_version($value, \$self, $qv);
-
- if ($s) { # must be something left over
- warn("Version string '%s' contains invalid data; "
- ."ignoring: '%s'", $value, $s);
- }
-
- return ($self);
- }
-
- *parse = \&new;
-
- sub numify
- {
- my ($self) = @_;
- unless (_verify($self)) {
- require Carp;
- Carp::croak("Invalid version object");
- }
- my $width = $self->{width} || 3;
- my $alpha = $self->{alpha} || "";
- my $len = $#{$self->{version}};
- my $digit = $self->{version}[0];
- my $string = sprintf("%d.", $digit );
-
- for ( my $i = 1 ; $i < $len ; $i++ ) {
- $digit = $self->{version}[$i];
- if ( $width < 3 ) {
- my $denom = 10**(3-$width);
- my $quot = int($digit/$denom);
- my $rem = $digit - ($quot * $denom);
- $string .= sprintf("%0".$width."d_%d", $quot, $rem);
- }
- else {
- $string .= sprintf("%03d", $digit);
- }
- }
-
- if ( $len > 0 ) {
- $digit = $self->{version}[$len];
- if ( $alpha && $width == 3 ) {
- $string .= "_";
- }
- $string .= sprintf("%0".$width."d", $digit);
- }
- else # $len = 0
- {
- $string .= sprintf("000");
- }
-
- return $string;
- }
-
- sub normal
- {
- my ($self) = @_;
- unless (_verify($self)) {
- require Carp;
- Carp::croak("Invalid version object");
- }
- my $alpha = $self->{alpha} || "";
- my $len = $#{$self->{version}};
- my $digit = $self->{version}[0];
- my $string = sprintf("v%d", $digit );
-
- for ( my $i = 1 ; $i < $len ; $i++ ) {
- $digit = $self->{version}[$i];
- $string .= sprintf(".%d", $digit);
- }
-
- if ( $len > 0 ) {
- $digit = $self->{version}[$len];
- if ( $alpha ) {
- $string .= sprintf("_%0d", $digit);
- }
- else {
- $string .= sprintf(".%0d", $digit);
- }
- }
-
- if ( $len <= 2 ) {
- for ( $len = 2 - $len; $len != 0; $len-- ) {
- $string .= sprintf(".%0d", 0);
- }
- }
-
- return $string;
- }
-
- sub stringify
- {
- my ($self) = @_;
- unless (_verify($self)) {
- require Carp;
- Carp::croak("Invalid version object");
- }
- return exists $self->{original}
- ? $self->{original}
- : exists $self->{qv}
- ? $self->normal
- : $self->numify;
- }
-
- sub vcmp
- {
- require UNIVERSAL;
- my ($left,$right,$swap) = @_;
- my $class = ref($left);
- unless ( UNIVERSAL::isa($right, $class) ) {
- $right = $class->new($right);
- }
-
- if ( $swap ) {
- ($left, $right) = ($right, $left);
- }
- unless (_verify($left)) {
- require Carp;
- Carp::croak("Invalid version object");
- }
- unless (_verify($right)) {
- require Carp;
- Carp::croak("Invalid version object");
- }
- my $l = $#{$left->{version}};
- my $r = $#{$right->{version}};
- my $m = $l < $r ? $l : $r;
- my $lalpha = $left->is_alpha;
- my $ralpha = $right->is_alpha;
- my $retval = 0;
- my $i = 0;
- while ( $i <= $m && $retval == 0 ) {
- $retval = $left->{version}[$i] <=> $right->{version}[$i];
- $i++;
- }
-
- # tiebreaker for alpha with identical terms
- if ( $retval == 0
- && $l == $r
- && $left->{version}[$m] == $right->{version}[$m]
- && ( $lalpha || $ralpha ) ) {
-
- if ( $lalpha && !$ralpha ) {
- $retval = -1;
- }
- elsif ( $ralpha && !$lalpha) {
- $retval = +1;
- }
- }
-
- # possible match except for trailing 0's
- if ( $retval == 0 && $l != $r ) {
- if ( $l < $r ) {
- while ( $i <= $r && $retval == 0 ) {
- if ( $right->{version}[$i] != 0 ) {
- $retval = -1; # not a match after all
- }
- $i++;
- }
- }
- else {
- while ( $i <= $l && $retval == 0 ) {
- if ( $left->{version}[$i] != 0 ) {
- $retval = +1; # not a match after all
- }
- $i++;
- }
- }
- }
-
- return $retval;
- }
-
- sub vbool {
- my ($self) = @_;
- return vcmp($self,$self->new("0"),1);
- }
-
- sub vnoop {
- require Carp;
- Carp::croak("operation not supported with version object");
- }
-
- sub is_alpha {
- my ($self) = @_;
- return (exists $self->{alpha});
- }
-
- sub qv {
- my $value = shift;
- my $class = 'version';
- if (@_) {
- $class = ref($value) || $value;
- $value = shift;
- }
-
- $value = _un_vstring($value);
- $value = 'v'.$value unless $value =~ /(^v|\d+\.\d+\.\d)/;
- my $version = $class->new($value);
- return $version;
- }
-
- *declare = \&qv;
-
- sub is_qv {
- my ($self) = @_;
- return (exists $self->{qv});
- }
-
-
- sub _verify {
- my ($self) = @_;
- if ( ref($self)
- && eval { exists $self->{version} }
- && ref($self->{version}) eq 'ARRAY'
- ) {
- return 1;
- }
- else {
- return 0;
- }
- }
-
- sub _is_non_alphanumeric {
- my $s = shift;
- $s = new charstar $s;
- while ($s) {
- return 0 if isSPACE($s); # early out
- return 1 unless (isALPHA($s) || isDIGIT($s) || $s =~ /[.-]/);
- $s++;
- }
- return 0;
- }
-
- sub _un_vstring {
- my $value = shift;
- # may be a v-string
- if ( length($value) >= 3 && $value !~ /[._]/
- && _is_non_alphanumeric($value)) {
- my $tvalue;
- if ( $] ge 5.008_001 ) {
- $tvalue = _find_magic_vstring($value);
- $value = $tvalue if length $tvalue;
- }
- elsif ( $] ge 5.006_000 ) {
- $tvalue = sprintf("v%vd",$value);
- if ( $tvalue =~ /^v\d+(\.\d+){2,}$/ ) {
- # must be a v-string
- $value = $tvalue;
- }
- }
- }
- return $value;
- }
-
- sub _find_magic_vstring {
- my $value = shift;
- my $tvalue = '';
- require B;
- my $sv = B::svref_2object(\$value);
- my $magic = ref($sv) eq 'B::PVMG' ? $sv->MAGIC : undef;
- while ( $magic ) {
- if ( $magic->TYPE eq 'V' ) {
- $tvalue = $magic->PTR;
- $tvalue =~ s/^v?(.+)$/v$1/;
- last;
- }
- else {
- $magic = $magic->MOREMAGIC;
- }
- }
- return $tvalue;
- }
-
- sub _VERSION {
- my ($obj, $req) = @_;
- my $class = ref($obj) || $obj;
-
- no strict 'refs';
- if ( exists $INC{"$class.pm"} and not %{"$class\::"} and $] >= 5.008) {
- # file but no package
- require Carp;
- Carp::croak( "$class defines neither package nor VERSION"
- ."--version check failed");
- }
-
- my $version = eval "\$$class\::VERSION";
- if ( defined $version ) {
- local $^W if $] <= 5.008;
- $version = version::vpp->new($version);
- }
-
- if ( defined $req ) {
- unless ( defined $version ) {
- require Carp;
- my $msg = $] < 5.006
- ? "$class version $req required--this is only version "
- : "$class does not define \$$class\::VERSION"
- ."--version check failed";
-
- if ( $ENV{VERSION_DEBUG} ) {
- Carp::confess($msg);
- }
- else {
- Carp::croak($msg);
- }
- }
-
- $req = version::vpp->new($req);
-
- if ( $req > $version ) {
- require Carp;
- if ( $req->is_qv ) {
- Carp::croak(
- sprintf ("%s version %s required--".
- "this is only version %s", $class,
- $req->normal, $version->normal)
- );
- }
- else {
- Carp::croak(
- sprintf ("%s version %s required--".
- "this is only version %s", $class,
- $req->stringify, $version->stringify)
- );
- }
- }
- }
-
- return defined $version ? $version->stringify : undef;
- }
-
- 1; #this line is important and will help the module return a true value
+ '}my$VERSION_MAX=0x7FFFFFFF;use constant TRUE=>1;use constant FALSE=>0;sub isDIGIT {my ($char)=shift->thischar();return ($char =~ /\d/)}sub isALPHA {my ($char)=shift->thischar();return ($char =~ /[a-zA-Z]/)}sub isSPACE {my ($char)=shift->thischar();return ($char =~ /\s/)}sub BADVERSION {my ($s,$errstr,$error)=@_;if ($errstr){$$errstr=$error}return$s}sub prescan_version {my ($s,$strict,$errstr,$sqv,$ssaw_decimal,$swidth,$salpha)=@_;my$qv=defined$sqv ? $$sqv : FALSE;my$saw_decimal=defined$ssaw_decimal ? $$ssaw_decimal : 0;my$width=defined$swidth ? $$swidth : 3;my$alpha=defined$salpha ? $$salpha : FALSE;my$d=$s;if ($qv && isDIGIT($d)){goto dotted_decimal_version}if ($d eq 'v'){$d++;if (isDIGIT($d)){$qv=TRUE}else {return BADVERSION($s,$errstr,"Invalid version format (dotted-decimal versions require at least three parts)")}dotted_decimal_version: if ($strict && $d eq '0' && isDIGIT($d+1)){return BADVERSION($s,$errstr,"Invalid version format (no leading zeros)")}while (isDIGIT($d)){$d++}if ($d eq '.'){$saw_decimal++;$d++}else {if ($strict){return BADVERSION($s,$errstr,"Invalid version format (dotted-decimal versions require at least three parts)")}else {goto version_prescan_finish}}{my$i=0;my$j=0;while (isDIGIT($d)){$i++;while (isDIGIT($d)){$d++;$j++;if ($strict && $j > 3){return BADVERSION($s,$errstr,"Invalid version format (maximum 3 digits between decimals)")}}if ($d eq '_'){if ($strict){return BADVERSION($s,$errstr,"Invalid version format (no underscores)")}if ($alpha){return BADVERSION($s,$errstr,"Invalid version format (multiple underscores)")}$d++;$alpha=TRUE}elsif ($d eq '.'){if ($alpha){return BADVERSION($s,$errstr,"Invalid version format (underscores before decimal)")}$saw_decimal++;$d++}elsif (!isDIGIT($d)){last}$j=0}if ($strict && $i < 2){return BADVERSION($s,$errstr,"Invalid version format (dotted-decimal versions require at least three parts)")}}}else {my$j=0;if ($strict){if ($d eq '.'){return BADVERSION($s,$errstr,"Invalid version format (0 before decimal required)")}if ($d eq '0' && isDIGIT($d+1)){return BADVERSION($s,$errstr,"Invalid version format (no leading zeros)")}}if ($d eq '-'){return BADVERSION($s,$errstr,"Invalid version format (negative version number)")}while (isDIGIT($d)){$d++}if ($d eq '.'){$saw_decimal++;$d++}elsif (!$d || $d eq ';' || isSPACE($d)|| $d eq '}'){if ($d==$s){return BADVERSION($s,$errstr,"Invalid version format (version required)")}goto version_prescan_finish}elsif ($d==$s){return BADVERSION($s,$errstr,"Invalid version format (non-numeric data)")}elsif ($d eq '_'){if ($strict){return BADVERSION($s,$errstr,"Invalid version format (no underscores)")}elsif (isDIGIT($d+1)){return BADVERSION($s,$errstr,"Invalid version format (alpha without decimal)")}else {return BADVERSION($s,$errstr,"Invalid version format (misplaced underscore)")}}elsif ($d){return BADVERSION($s,$errstr,"Invalid version format (non-numeric data)")}if ($d &&!isDIGIT($d)&& ($strict ||!($d eq ';' || isSPACE($d)|| $d eq '}'))){return BADVERSION($s,$errstr,"Invalid version format (fractional part required)")}while (isDIGIT($d)){$d++;$j++;if ($d eq '.' && isDIGIT($d-1)){if ($alpha){return BADVERSION($s,$errstr,"Invalid version format (underscores before decimal)")}if ($strict){return BADVERSION($s,$errstr,"Invalid version format (dotted-decimal versions must begin with 'v')")}$d=$s;$qv=TRUE;goto dotted_decimal_version}if ($d eq '_'){if ($strict){return BADVERSION($s,$errstr,"Invalid version format (no underscores)")}if ($alpha){return BADVERSION($s,$errstr,"Invalid version format (multiple underscores)")}if (!isDIGIT($d+1)){return BADVERSION($s,$errstr,"Invalid version format (misplaced underscore)")}$width=$j;$d++;$alpha=TRUE}}}version_prescan_finish: while (isSPACE($d)){$d++}if ($d &&!isDIGIT($d)&& (!($d eq ';' || $d eq '}'))){return BADVERSION($s,$errstr,"Invalid version format (non-numeric data)")}if (defined$sqv){$$sqv=$qv}if (defined$swidth){$$swidth=$width}if (defined$ssaw_decimal){$$ssaw_decimal=$saw_decimal}if (defined$salpha){$$salpha=$alpha}return$d}sub scan_version {my ($s,$rv,$qv)=@_;my$start;my$pos;my$last;my$errstr;my$saw_decimal=0;my$width=3;my$alpha=FALSE;my$vinf=FALSE;my@av;$s=new charstar$s;while (isSPACE($s)){$s++}$last=prescan_version($s,FALSE,\$errstr,\$qv,\$saw_decimal,\$width,\$alpha);if ($errstr){if ($s ne 'undef'){use Carp;Carp::croak($errstr)}}$start=$s;if ($s eq 'v'){$s++}$pos=$s;if ($qv){$$rv->{qv}=$qv}if ($alpha){$$rv->{alpha}=$alpha}if (!$qv && $width < 3){$$rv->{width}=$width}while (isDIGIT($pos)){$pos++}if (!isALPHA($pos)){my$rev;for (;;){$rev=0;{my$end=$pos;my$mult=1;my$orev;if (!$qv && $s > $start && $saw_decimal==1){$mult *= 100;while ($s < $end){$orev=$rev;$rev += $s * $mult;$mult /= 10;if ((abs($orev)> abs($rev))|| (abs($rev)> $VERSION_MAX)){warn("Integer overflow in version %d",$VERSION_MAX);$s=$end - 1;$rev=$VERSION_MAX;$vinf=1}$s++;if ($s eq '_'){$s++}}}else {while (--$end >= $s){$orev=$rev;$rev += $end * $mult;$mult *= 10;if ((abs($orev)> abs($rev))|| (abs($rev)> $VERSION_MAX)){warn("Integer overflow in version");$end=$s - 1;$rev=$VERSION_MAX;$vinf=1}}}}push@av,$rev;if ($vinf){$s=$last;last}elsif ($pos eq '.'){$s=++$pos}elsif ($pos eq '_' && isDIGIT($pos+1)){$s=++$pos}elsif ($pos eq ',' && isDIGIT($pos+1)){$s=++$pos}elsif (isDIGIT($pos)){$s=$pos}else {$s=$pos;last}if ($qv){while (isDIGIT($pos)){$pos++}}else {my$digits=0;while ((isDIGIT($pos)|| $pos eq '_')&& $digits < 3){if ($pos ne '_'){$digits++}$pos++}}}}if ($qv){my$len=$#av;$len=2 - $len;while ($len-- > 0){push@av,0}}if ($vinf){$$rv->{original}="v.Inf";$$rv->{vinf}=1}elsif ($s > $start){$$rv->{original}=$start->currstr($s);if ($qv && $saw_decimal==1 && $start ne 'v'){$$rv->{original}='v' .$$rv->{original}}}else {$$rv->{original}='0';push(@av,0)}$$rv->{version}=\@av;if ($s eq 'undef'){$s += 5}return$s}sub new {my ($class,$value)=@_;unless (defined$class){require Carp;Carp::croak('Usage: version::new(class, version)')}my$self=bless ({},ref ($class)|| $class);my$qv=FALSE;if (ref($value)&& eval('$value->isa("version")')){$self->{version}=[@{$value->{version}}];$self->{qv}=1 if$value->{qv};$self->{alpha}=1 if$value->{alpha};$self->{original}=''.$value->{original};return$self}my$currlocale=setlocale(LC_ALL);if (localeconv()->{decimal_point}eq ','){$value =~ tr/,/./}if (not defined$value or $value =~ /^undef$/){push @{$self->{version}},0;$self->{original}="0";return ($self)}if ($#_==2){$value=$_[2];$qv=TRUE}$value=_un_vstring($value);if ($value =~ /\d+.?\d*e[-+]?\d+/){$value=sprintf("%.9f",$value);$value =~ s/(0+)$//}my$s=scan_version($value,\$self,$qv);if ($s){warn("Version string '%s' contains invalid data; " ."ignoring: '%s'",$value,$s)}return ($self)}*parse=\&new;sub numify {my ($self)=@_;unless (_verify($self)){require Carp;Carp::croak("Invalid version object")}my$width=$self->{width}|| 3;my$alpha=$self->{alpha}|| "";my$len=$#{$self->{version}};my$digit=$self->{version}[0];my$string=sprintf("%d.",$digit);for (my$i=1 ;$i < $len ;$i++ ){$digit=$self->{version}[$i];if ($width < 3){my$denom=10**(3-$width);my$quot=int($digit/$denom);my$rem=$digit - ($quot * $denom);$string .= sprintf("%0".$width."d_%d",$quot,$rem)}else {$string .= sprintf("%03d",$digit)}}if ($len > 0){$digit=$self->{version}[$len];if ($alpha && $width==3){$string .= "_"}$string .= sprintf("%0".$width."d",$digit)}else {$string .= sprintf("000")}return$string}sub normal {my ($self)=@_;unless (_verify($self)){require Carp;Carp::croak("Invalid version object")}my$alpha=$self->{alpha}|| "";my$len=$#{$self->{version}};my$digit=$self->{version}[0];my$string=sprintf("v%d",$digit);for (my$i=1 ;$i < $len ;$i++ ){$digit=$self->{version}[$i];$string .= sprintf(".%d",$digit)}if ($len > 0){$digit=$self->{version}[$len];if ($alpha){$string .= sprintf("_%0d",$digit)}else {$string .= sprintf(".%0d",$digit)}}if ($len <= 2){for ($len=2 - $len;$len!=0;$len-- ){$string .= sprintf(".%0d",0)}}return$string}sub stringify {my ($self)=@_;unless (_verify($self)){require Carp;Carp::croak("Invalid version object")}return exists$self->{original}? $self->{original}: exists$self->{qv}? $self->normal : $self->numify}sub vcmp {require UNIVERSAL;my ($left,$right,$swap)=@_;my$class=ref($left);unless (UNIVERSAL::isa($right,$class)){$right=$class->new($right)}if ($swap){($left,$right)=($right,$left)}unless (_verify($left)){require Carp;Carp::croak("Invalid version object")}unless (_verify($right)){require Carp;Carp::croak("Invalid version format")}my$l=$#{$left->{version}};my$r=$#{$right->{version}};my$m=$l < $r ? $l : $r;my$lalpha=$left->is_alpha;my$ralpha=$right->is_alpha;my$retval=0;my$i=0;while ($i <= $m && $retval==0){$retval=$left->{version}[$i]<=> $right->{version}[$i];$i++}if ($retval==0 && $l==$r && $left->{version}[$m]==$right->{version}[$m]&& ($lalpha || $ralpha)){if ($lalpha &&!$ralpha){$retval=-1}elsif ($ralpha &&!$lalpha){$retval=+1}}if ($retval==0 && $l!=$r){if ($l < $r){while ($i <= $r && $retval==0){if ($right->{version}[$i]!=0){$retval=-1}$i++}}else {while ($i <= $l && $retval==0){if ($left->{version}[$i]!=0){$retval=+1}$i++}}}return$retval}sub vbool {my ($self)=@_;return vcmp($self,$self->new("0"),1)}sub vnoop {require Carp;Carp::croak("operation not supported with version object")}sub is_alpha {my ($self)=@_;return (exists$self->{alpha})}sub qv {my$value=shift;my$class='version';if (@_){$class=ref($value)|| $value;$value=shift}$value=_un_vstring($value);$value='v'.$value unless$value =~ /(^v|\d+\.\d+\.\d)/;my$obj=version->new($value);return bless$obj,$class}*declare=\&qv;sub is_qv {my ($self)=@_;return (exists$self->{qv})}sub _verify {my ($self)=@_;if (ref($self)&& eval {exists$self->{version}}&& ref($self->{version})eq 'ARRAY'){return 1}else {return 0}}sub _is_non_alphanumeric {my$s=shift;$s=new charstar$s;while ($s){return 0 if isSPACE($s);return 1 unless (isALPHA($s)|| isDIGIT($s)|| $s =~ /[.-]/);$s++}return 0}sub _un_vstring {my$value=shift;if (length($value)>= 3 && $value !~ /[._]/ && _is_non_alphanumeric($value)){my$tvalue;if ($] ge 5.008_001){$tvalue=_find_magic_vstring($value);$value=$tvalue if length$tvalue}elsif ($] ge 5.006_000){$tvalue=sprintf("v%vd",$value);if ($tvalue =~ /^v\d+(\.\d+){2,}$/){$value=$tvalue}}}return$value}sub _find_magic_vstring {my$value=shift;my$tvalue='';require B;my$sv=B::svref_2object(\$value);my$magic=ref($sv)eq 'B::PVMG' ? $sv->MAGIC : undef;while ($magic){if ($magic->TYPE eq 'V'){$tvalue=$magic->PTR;$tvalue =~ s/^v?(.+)$/v$1/;last}else {$magic=$magic->MOREMAGIC}}return$tvalue}sub _VERSION {my ($obj,$req)=@_;my$class=ref($obj)|| $obj;no strict 'refs';if (exists$INC{"$class.pm"}and not %{"$class\::"}and $] >= 5.008){require Carp;Carp::croak("$class defines neither package nor VERSION" ."--version check failed")}my$version=eval "\$$class\::VERSION";if (defined$version){local $^W if $] <= 5.008;$version=version::vpp->new($version)}if (defined$req){unless (defined$version){require Carp;my$msg=$] < 5.006 ? "$class version $req required--this is only version " : "$class does not define \$$class\::VERSION" ."--version check failed";if ($ENV{VERSION_DEBUG}){Carp::confess($msg)}else {Carp::croak($msg)}}$req=version::vpp->new($req);if ($req > $version){require Carp;if ($req->is_qv){Carp::croak(sprintf ("%s version %s required--"."this is only version %s",$class,$req->normal,$version->normal))}else {Carp::croak(sprintf ("%s version %s required--"."this is only version %s",$class,$req->stringify,$version->stringify))}}}return defined$version ? $version->stringify : undef}1;
VERSION_VPP
s/^ //mg for values %fatpacked;
unshift @INC, sub {
if (my $fat = $fatpacked{$_[1]}) {
+ if ($] < 5.008) {
+ return sub {
+ return 0 unless length $fat;
+ $fat =~ s/^([^\n]*\n?)//;
+ $_ = $1;
+ return 1;
+ };
+ }
open my $fh, '<', \$fat
or die "FatPacker error loading $_[1] (could be a perl installation issue?)";
return $fh;
@@ -10946,13 +458,16 @@ unshift @INC, sub {
} # END OF FATPACK CODE
+
+
use strict;
use App::cpanminus::script;
+
unless (caller) {
my $app = App::cpanminus::script->new;
$app->parse_options(@ARGV);
- $app->doit or exit(1);
+ exit $app->doit;
}
__END__
@@ -10963,21 +478,53 @@ cpanm - get, unpack build and install modules from CPAN
=head1 SYNOPSIS
- cpanm Test::More # install Test::More
- cpanm MIYAGAWA/Plack-0.99_05.tar.gz # full distribution path
- cpanm http://example.org/LDS/CGI.pm-3.20.tar.gz # install from URL
- cpanm ~/dists/MyCompany-Enterprise-1.00.tar.gz # install from a local file
- cpanm --interactive Task::Kensho # Configure interactively
- cpanm . # install from local directory
- cpanm --installdeps . # install all the deps for the current directory
- cpanm -L extlib Plack # install Plack and all non-core deps into extlib
- cpanm --mirror http://cpan.cpantesters.org/ DBI # use the fast-syncing mirror
- cpanm --scandeps Moose # See what modules will be installed for Moose
+ cpanm Test::More # install Test::More
+ cpanm MIYAGAWA/Plack-0.99_05.tar.gz # full distribution path
+ cpanm http://example.org/LDS/CGI.pm-3.20.tar.gz # install from URL
+ cpanm ~/dists/MyCompany-Enterprise-1.00.tar.gz # install from a local file
+ cpanm --interactive Task::Kensho # Configure interactively
+ cpanm . # install from local directory
+ cpanm --installdeps . # install all the deps for the current directory
+ cpanm -L extlib Plack # install Plack and all non-core deps into extlib
+ cpanm --mirror http://cpan.cpantesters.org/ DBI # use the fast-syncing mirror
=head1 COMMANDS
=over 4
+=item (arguments)
+
+Command line arguments can be either a module name, distribution file,
+local file path, HTTP URL or git repository URL. Following commands
+will all work as you expect.
+
+ cpanm Plack
+ cpanm Plack/Request.pm
+ cpanm MIYAGAWA/Plack-1.0000.tar.gz
+ cpanm /path/to/Plack-1.0000.tar.gz
+ cpanm http://cpan.metacpan.org/authors/id/M/MI/MIYAGAWA/Plack-0.9990.tar.gz
+ cpanm git://github.com/plack/Plack.git
+
+Additionally, you can use the notation using C<~> and C<@> to specify
+version for a given module. C<~> specifies the version requirement in
+the L<CPAN::Meta::Spec> format, while C<@> pins the exact version, and
+is a shortcut for C<~"== VERSION">.
+
+ cpanm Plack~1.0000 # 1.0000 or later
+ cpanm Plack~">= 1.0000, < 2.0000" # latest of 1.xxxx
+ cpanm Plack@0.9990 # specific version. same as Plack~"== 0.9990"
+
+The version query including specific version or range will be sent to
+L<MetaCPAN> to search for previous releases. The query will search for
+BackPAN archives by default, unless you specify C<--dev> option, in
+which case, archived versions will be filtered out.
+
+For a git repository, you can specify a branch, tag, or commit SHA to
+build. The default is C<master>
+
+ cpanm git://github.com/plack/Plack.git@1.0000 # tag
+ cpanm git://github.com/plack/Plack.git@devel # branch
+
=item -i, --install
Installs the modules. This is a default behavior and this is just a
@@ -11008,6 +555,23 @@ Download and unpack the distribution and then open the directory with
your shell. Handy to poke around the source code or do manual
testing.
+=item -U, --uninstall
+
+B<EXPERIMENTAL>: Uninstalls the modules. Will remove the distribution
+files from your library path using the C<.packlist> file.
+
+When used with C<-l> or C<-L>, only the files under the local::lib
+directory will be removed.
+
+B<NOTE>: If you have the "dual-life" module in multiple locations
+(i.e. C<site_perl> and C<perl> library path, with perl 5.12 or later),
+only the files in C<site_perl> will be deleted.
+
+If the distribution has bin scripts and man, they will be kept in case
+the core installation still references that, although there's no
+guarantee that the script will continue working as expected with the
+older version of .pm files.
+
=item -h, --help
Displays the help message.
@@ -11037,6 +601,16 @@ architecture you've already tested to make sure it builds fine.
Defaults to false, and you can say C<--no-notest> to override when it
is set in the default options in C<PERL_CPANM_OPT>.
+=item --test-only
+
+Run the tests only, and do not install the specified module or
+distributions. Handy if you want to verify the new (or even old)
+releases pass its unit tests without installing the module.
+
+Note that if you specify this option with a module or distribution
+that has dependencies, these dependencies will be installed if you
+don't currently have them.
+
=item -S, --sudo
Switch to the root user with C<sudo> when installing modules. Use this
@@ -11052,8 +626,8 @@ configuration. (See --interactive)
=item -q, --quiet
-Makes the output even more quiet than the default. It doesn't print
-anything to the STDERR.
+Makes the output even more quiet than the default. It only shows the
+successful/failed dependencies to the output.
=item -l, --local-lib
@@ -11064,10 +638,9 @@ as well.
=item -L, --local-lib-contained
-Same with C<--local-lib> but when examining the dependencies, it
-assumes no non-core modules are installed on the system. It's handy if
-you want to bundle application dependencies in one directory so you
-can distribute to other machines.
+Same with C<--local-lib> but with L<--self-contained> set. All
+non-core dependencies will be installed even if they're already
+installed.
For instance,
@@ -11078,19 +651,34 @@ directory C<extlib>, which can be loaded from your application with:
use local::lib '/path/to/extlib';
+=item --self-contained
+
+When examining the dependencies, assume no non-core modules are
+installed on the system. Handy if you want to bundle application
+dependencies in one directory so you can distribute to other machines.
+
=item --mirror
Specifies the base URL for the CPAN mirror to use, such as
C<http://cpan.cpantesters.org/> (you can omit the trailing slash). You
can specify multiple mirror URLs by repeating the command line option.
-Defaults to C<http://search.cpan.org/CPAN> which is a geo location
-aware redirector.
+You can use a local directory that has a CPAN mirror structure
+(created by tools such as L<OrePAN> or L<Pinto>) by using a special
+URL scheme C<file://>. If the given URL begins with `/` (without any
+scheme), it is considered as a file scheme as well.
+
+ cpanm --mirror file:///path/to/mirror
+ cpanm --mirror ~/minicpan # Because shell expands ~ to /home/user
+
+Defaults to C<http://www.cpan.org/>.
=item --mirror-only
Download the mirror's 02packages.details.txt.gz index file instead of
-querying the CPAN Meta DB.
+querying the CPAN Meta DB. This will also effectively opt out sending
+your local perl versions to backend database servers such as CPAN Meta
+DB and MetaCPAN.
Select this option if you are using a local mirror of CPAN, such as
minicpan when you're offline, or your own CPAN index (a.k.a darkpan).
@@ -11106,11 +694,15 @@ shell aliases, like:
B<EXPERIMENTAL>: Specifies the file path to C<02packages.details.txt>
for module search index.
-=item --metacpan
+=item --cpanmetadb
+
+B<EXPERIMENTAL>: Specifies an alternate URI for CPAN MetaDB index lookups.
+
+=item --cpanfile
+
+B<EXPERIMENTAL>: Specified an alternate path for cpanfile to search for,
+when C<--installdeps> command is in use. Defaults to C<cpanfile>.
-B<EXPERIMENTAL>: Use L<http://api.metacpan.org/> API for module lookup instead of
-L<http://cpanmetadb.plackperl.org/>.
-
=item --prompt
Prompts when a test fails so that you can skip, force install, retry
@@ -11120,6 +712,10 @@ one of the dependency failed if you want to proceed the installation.
Defaults to false, and you can say C<--no-prompt> to override if it's
set in the default options in C<PERL_CPANM_OPT>.
+=item --dev
+
+B<EXPERIMENTAL>: search for a newer developer release as well. Defaults to false.
+
=item --reinstall
cpanm, when given a module name in the command line (i.e. C<cpanm
@@ -11143,10 +739,67 @@ requires custom configuration or Task:: distributions.
Defaults to false, and you can say C<--no-interactive> to override
when it's set in the default options in C<PERL_CPANM_OPT>.
+=item --pp, --pureperl
+
+Prefer Pure perl build of modules by setting C<PUREPERL_ONLY=1> for
+MakeMaker and C<--pureperl-only> for Build.PL based
+distributions. Note that not all of the CPAN modules support this
+convention yet.
+
+=item --with-recommends, --with-suggests
+
+B<EXPERIMENTAL>: Installs dependencies declared as C<recommends> and
+C<suggests> respectively, per META spec. When these dependencies fail
+to install, cpanm continues the installation, since they're just
+recommendation/suggestion.
+
+Enabling this could potentially make a circular dependency for a few
+modules on CPAN, when C<recommends> adds a module that C<recommends>
+back the module in return.
+
+There's also C<--without-recommend> and C<--without-suggests> to
+override the default decision made earlier in C<PERL_CPANM_OPT>.
+
+Defaults to false for both.
+
+=item --with-develop
+
+B<EXPERIMENTAL>: Installs develop phase dependencies in META files or
+C<cpanfile> when used with C<--installdeps>. Defaults to false.
+
+=item --with-feature, --without-feature, --with-all-features
+
+B<EXPERIMENTAL>: Specifies the feature to enable, if a module supports
+optional features per META spec 2.0.
+
+ cpanm --with-feature=opt_csv Spreadsheet::Read
+
+the features can also be interactively chosen when C<--interactive>
+option is enabled.
+
+C<--with-all-features> enables all the optional features, and
+C<--without-feature> can select a feature to disable.
+
+=item --configure-timeout, --build-timeout, --test-timeout
+
+Specify the timeout length (in seconds) to wait for the configure,
+build and test process. Current default values are: 60 for configure,
+3600 for build and 1800 for test.
+
+=item --configure-args, --build-args, --test-args, --install-args
+
+B<EXPERIMENTAL>: Pass arguments for configure/build/test/install
+commands respectively, for a given module to install.
+
+ cpanm DBD::mysql --configure-args="--cflags=... --libs=..."
+
+The argument is only enabled for the module passed as a command line
+argument, not dependencies.
+
=item --scandeps
-Scans the depencencies of given modules and output the tree in a text
-format. (See C<--format> below for more options)
+B<DEPRECATED>: Scans the depencencies of given modules and output the
+tree in a text format. (See C<--format> below for more options)
Because this command doesn't actually install any distributions, it
will be useful that by typing:
@@ -11162,8 +815,9 @@ combine it with C<-L> option.
=item --format
-Determines what format to display the scanned dependency
-tree. Available options are C<tree>, C<json>, C<yaml> and C<dists>.
+B<DEPRECATED>: Determines what format to display the scanned
+dependency tree. Available options are C<tree>, C<json>, C<yaml> and
+C<dists>.
=over 8
@@ -11207,6 +861,10 @@ Specifies the optional directory path to copy downloaded tarballs in
the CPAN mirror compatible directory structure
i.e. I<authors/id/A/AU/AUTHORS/Foo-Bar-version.tar.gz>
+If the distro tarball did not come from CPAN, for example from a local
+file or from GitHub, then it will be saved under
+I<vendor/Foo-Bar-version.tar.gz>.
+
=item --uninst-shadows
Uninstalls the shadow files of the distribution that you're
@@ -11229,19 +887,36 @@ I<before> the perl core library path, and uninstalling shadows is not
necessary anymore and does more harm by deleting files from the core
library path.
+=item --uninstall, -U
+
+Uninstalls a module from the library path. It finds a packlist for
+given modules, and removes all the files included in the same
+distribution.
+
+If you enable local::lib, it only removes files from the local::lib
+directory.
+
+If you try to uninstall a module in C<perl> directory (i.e. core
+module), an error will be thrown.
+
+A dialog wil be prompted to confirm the files to be deleted. If you pass
+C<-f> option as well, the dialog will be skipped and uninstallation
+will be forced.
+
=item --cascade-search
B<EXPERIMENTAL>: Specifies whether to cascade search when you specify
-multiple mirrors and a mirror has a lower version of the module than
-requested. Defaults to false.
+multiple mirrors and a mirror doesn't have a module or has a lower
+version of the module than requested. Defaults to false.
=item --skip-installed
Specifies whether a module given in the command line is skipped if its latest
version is already installed. Defaults to true.
-B<NOTE>: The C<PERL5LIB> environment variable have to be correctly set for this
-to work with modules installed using L<local::lib>.
+B<NOTE>: The C<PERL5LIB> environment variable have to be correctly set
+for this to work with modules installed using L<local::lib>, unless
+you always use the C<-l> option.
=item --skip-satisfied
@@ -11258,8 +933,18 @@ C<--skip-installed> but while C<--skip-installed> checks if the
I<latest> version of CPAN is installed, C<--skip-satisfied> checks if
a requested version (or not, which means any version) is installed.
-Defaults to false for bare module names, but if you specify versions
-with C<~>, it will always skip satisfied requirements.
+Defaults to false.
+
+=item --verify
+
+Verify the integrity of distribution files retrieved from PAUSE using
+CHECKSUMS and SIGNATURES (if found). Defaults to false.
+
+=item --report-perl-version
+
+Whether it report the locally installed perl version to the various
+web server as part of User-Agent. Defaults to true, and you can disable
+it by using C<--no-report-perl-version>.
=item --auto-cleanup
@@ -11274,9 +959,9 @@ directories.
Generates man pages for executables (man1) and libraries (man3).
-Defaults to false (no man pages generated) if
-C<-L|--local-lib-contained> option is supplied. Otherwise, defaults to
-true, and you can disable it with C<--no-man-pages>.
+Defaults to true (man pages generated) unless C<-L|--local-lib-contained>
+option is supplied in which case it's set to false. You can disable
+it with C<--no-man-pages>.
=item --lwp
diff --git a/bin/site-specific-install.sh b/bin/site-specific-install.sh
index 3cc84007a..2bf8e3e90 100644
--- a/bin/site-specific-install.sh
+++ b/bin/site-specific-install.sh
@@ -1,7 +1,7 @@
#!/bin/sh
# Set this to the version we want to check out
-VERSION=${VERSION_OVERRIDE:-v1.3}
+VERSION=${VERSION_OVERRIDE:-v1.4.1}
PARENT_SCRIPT_URL=https://github.com/mysociety/commonlib/blob/master/bin/install-site.sh
diff --git a/bin/zurich-overdue-alert b/bin/zurich-overdue-alert
index 4e81b3263..e7c23b493 100755
--- a/bin/zurich-overdue-alert
+++ b/bin/zurich-overdue-alert
@@ -29,10 +29,12 @@ loop_through( 'alert-overdue.txt', 0, 6, ['confirmed', 'planned'] );
sub loop_through {
my ( $template, $include_parent, $days, $states ) = @_;
+ my $dtf = FixMyStreet::App->model("DB")->storage->datetime_parser;
+ my $date_threshold = $dtf->format_datetime(FixMyStreet::Cobrand::Zurich::sub_days( $now, $days ));
my $reports = FixMyStreet::App->model("DB::Problem")->search( {
state => $states,
- created => { '<', FixMyStreet::Cobrand::Zurich::sub_days( $now, $days ) },
+ created => { '<', $date_threshold },
bodies_str => { '!=', undef },
} );
diff --git a/conf/crontab-example b/conf/crontab-example
index 47c018573..a7f540eaf 100644
--- a/conf/crontab-example
+++ b/conf/crontab-example
@@ -16,12 +16,14 @@ PATH=/usr/local/bin:/usr/bin:/bin
0 8 * * * "$FMS/commonlib/bin/run-with-lockfile.sh" -n "$LOCK_DIR/send-reports.lock" "$FMS/bin/cron-wrapper send-reports --verbose" || echo "stalled?"
2 * * * * "$FMS/commonlib/bin/run-with-lockfile.sh" -n "$LOCK_DIR/send-alerts.lock" "$FMS/bin/cron-wrapper send-alerts" || echo "stalled?"
-0,30 * * * * "$FMS/commonlib/bin/run-with-lockfile.sh" -n "$LOCK_DIR/send-questionnaires.lock" "$FMS/bin/cron-wrapper send-questionnaires" || echo "stalled?"
-5,10,15,20,25,30,35,40,45,50,55 * * * * "$FMS/commonlib/bin/run-with-lockfile.sh" -n "$LOCK_DIR/send-comments.lock" "$FMS/bin/cron-wrapper send-comments" || echo "stalled?"
-5,10,15,20,25,30,35,40,45,50,55 * * * * "$FMS/commonlib/bin/run-with-lockfile.sh" -n "$LOCK_DIR/fetch-comments.lock" "$FMS/bin/cron-wrapper fetch-comments" || echo "stalled?"
+22,52 * * * * "$FMS/commonlib/bin/run-with-lockfile.sh" -n "$LOCK_DIR/send-questionnaires.lock" "$FMS/bin/cron-wrapper send-questionnaires" || echo "stalled?"
-0 0-7,9-23 * * * "$FMS/commonlib/bin/run-with-lockfile.sh" -n "$LOCK_DIR/open311-populate-service-list.lock" "$FMS/bin/cron-wrapper open311-populate-service-list" || echo "stalled?"
-0 8 * * * "$FMS/commonlib/bin/run-with-lockfile.sh" -n "$LOCK_DIR/open311-populate-service-list.lock" "$FMS/bin/cron-wrapper open311-populate-service-list --warn" || echo "stalled?"
+# If you utilise Open311 and the updates extension, you will need to run these scripts
+#*/5 * * * * "$FMS/commonlib/bin/run-with-lockfile.sh" -n "$LOCK_DIR/send-comments.lock" "$FMS/bin/cron-wrapper send-comments" || echo "stalled?"
+#*/5 * * * * "$FMS/commonlib/bin/run-with-lockfile.sh" -n "$LOCK_DIR/fetch-comments.lock" "$FMS/bin/cron-wrapper fetch-comments" || echo "stalled?"
+
+47 0-7,9-23 * * * "$FMS/commonlib/bin/run-with-lockfile.sh" -n "$LOCK_DIR/open311-populate-service-list.lock" "$FMS/bin/cron-wrapper open311-populate-service-list" || echo "stalled?"
+47 8 * * * "$FMS/commonlib/bin/run-with-lockfile.sh" -n "$LOCK_DIR/open311-populate-service-list.lock" "$FMS/bin/cron-wrapper open311-populate-service-list --warn" || echo "stalled?"
# Once an hour, update the all reports stats
13 * * * * "$FMS/bin/cron-wrapper" update-all-reports
diff --git a/conf/general.yml-example b/conf/general.yml-example
index f5fb89b64..0704fdb52 100644
--- a/conf/general.yml-example
+++ b/conf/general.yml-example
@@ -74,9 +74,12 @@ MAPIT_TYPES: [ 'ZZZ' ]
# If you are using global MapIt, you might want to restrict FixMyStreet usage
# to only one or more areas, rather than all O04, for example. Provide MapIt
-# IDs here in a list that FixMyStreet should recognise.
+# IDs here in a list that FixMyStreet should recognise, along with the MapIt
+# generation those IDs are in.
# MAPIT_ID_WHITELIST: [ 240838, 246176, 246733 ]
+# MAPIT_GENERATION: 2
MAPIT_ID_WHITELIST: []
+MAPIT_GENERATION: 0
# If your MapIt has the concept of council wards (subareas of councils, where
# people can sign up for alerts, but not report things), then you can give the
diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po
index 6b1cb8a13..478965440 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: 2013-11-12 13:15+0000\n"
+"POT-Creation-Date: 2014-05-16 17:30+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <team@fixmystreet.com>\n"
@@ -17,15 +17,15 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602 perllib/FixMyStreet/DB/ResultSet/Problem.pm:373
+#: perllib/FixMyStreet/DB/Result/Problem.pm:604 perllib/FixMyStreet/DB/ResultSet/Problem.pm:383
msgid " and "
msgstr ""
-#: templates/web/default/tokens/confirm_problem.html:14 templates/web/default/tokens/confirm_problem.html:17
+#: templates/web/default/tokens/confirm_problem.html:15 templates/web/default/tokens/confirm_problem.html:17
msgid " and <strong>we will now send it to the council</strong>"
msgstr ""
-#: templates/web/default/report/new/councils_text_all.html:11 templates/web/default/report/new/councils_text_all.html:18 templates/web/default/report/new/councils_text_all.html:4 templates/web/default/report/new/councils_text_none.html:11 templates/web/default/report/new/councils_text_none.html:14 templates/web/default/report/new/councils_text_some.html:20 templates/web/default/report/new/councils_text_some.html:23 templates/web/default/report/new/councils_text_some.html:5 templates/web/emptyhomes/report/new/councils_text_all.html:2
+#: templates/web/default/report/new/councils_text_all.html:12 templates/web/default/report/new/councils_text_all.html:19 templates/web/default/report/new/councils_text_all.html:5 templates/web/default/report/new/councils_text_none.html:19 templates/web/default/report/new/councils_text_none.html:21 templates/web/default/report/new/councils_text_some.html:21 templates/web/default/report/new/councils_text_some.html:23 templates/web/default/report/new/councils_text_some.html:5 templates/web/emptyhomes/report/new/councils_text_all.html:3
msgid " or "
msgstr ""
@@ -61,19 +61,19 @@ msgstr ""
msgid "%s - Summary reports"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:653
msgid "%s ref:&nbsp;%s"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
msgid "%s ward, %s"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:538
+#: perllib/FixMyStreet/DB/Result/Problem.pm:540
msgid "%s, reported at %s"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/UK.pm:303 perllib/FixMyStreet/Cobrand/UK.pm:315
+#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:309
msgid "%s, within %s ward"
msgstr ""
@@ -101,19 +101,19 @@ msgstr ""
msgid "(alternatively the RSS feed can be customised, within"
msgstr ""
-#: templates/web/bromley/report/_item.html:22 templates/web/default/around/around_map_list_items.html:12 templates/web/default/around/on_map_list_items.html:9 templates/web/fixmystreet/report/_item.html:22 templates/web/zurich/report/_item.html:21
+#: templates/web/default/around/around_map_list_items.html:12 templates/web/default/around/on_map_list_items.html:9 templates/web/fixmystreet/report/_item.html:27 templates/web/zurich/report/_item.html:21
msgid "(closed)"
msgstr ""
-#: templates/web/bromley/report/_item.html:20 templates/web/default/around/around_map_list_items.html:10 templates/web/default/around/on_map_list_items.html:7 templates/web/fixmystreet/report/_item.html:20 templates/web/zurich/report/_item.html:19
+#: templates/web/default/around/around_map_list_items.html:10 templates/web/default/around/on_map_list_items.html:7 templates/web/fixmystreet/report/_item.html:25 templates/web/zurich/report/_item.html:19
msgid "(fixed)"
msgstr ""
-#: templates/web/default/index.html:12 templates/web/default/index.html:8 templates/web/fixmystreet/around/intro.html:2
+#: templates/web/default/index.html:12 templates/web/default/index.html:9 templates/web/fixmystreet/around/intro.html:2
msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
msgstr ""
-#: templates/web/bromley/report/_item.html:16 templates/web/default/reports/_list-entry.html:4 templates/web/fixmystreet/report/_item.html:16
+#: templates/web/default/reports/_list-entry.html:4 templates/web/fixmystreet/report/_item.html:21
msgid "(not sent to council)"
msgstr ""
@@ -121,7 +121,7 @@ msgstr ""
msgid "(optional)"
msgstr ""
-#: templates/web/bromley/report/_item.html:15 templates/web/default/reports/_list-entry.html:2 templates/web/fixmystreet/report/_item.html:15
+#: templates/web/default/reports/_list-entry.html:2 templates/web/fixmystreet/report/_item.html:20
msgid "(sent to both)"
msgstr ""
@@ -133,7 +133,7 @@ msgstr ""
msgid "(we never show your email)"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:637 perllib/FixMyStreet/App/Controller/Report/New.pm:664 perllib/FixMyStreet/DB/Result/Problem.pm:379
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 perllib/FixMyStreet/App/Controller/Report/New.pm:662 perllib/FixMyStreet/DB/Result/Problem.pm:379
msgid "-- Pick a category --"
msgstr ""
@@ -166,7 +166,7 @@ msgid ""
"</p>"
msgstr ""
-#: templates/web/fixmystreet/questionnaire/completed-open.html:6
+#: templates/web/fixmystreet/questionnaire/completed-open.html:25
msgid ""
"<p style=\"font-size:150%\">We&rsquo;re sorry to hear that. We have two\n"
"suggestions: why not try <a href=\"http://www.writetothem.com/\">writing direct\n"
@@ -216,7 +216,7 @@ msgid ""
"site and leave an update.</p>"
msgstr ""
-#: templates/web/default/around/_report_banner.html:3 templates/web/default/around/_report_banner.html:5
+#: templates/web/default/around/_report_banner.html:4 templates/web/default/around/_report_banner.html:5
msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>"
msgstr ""
@@ -256,7 +256,7 @@ msgstr ""
msgid "About us"
msgstr ""
-#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:81 templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:39 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:31 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:29
+#: templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:39 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:31 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:29
msgid "Action Scheduled"
msgstr ""
@@ -283,7 +283,7 @@ msgstr ""
msgid "Add user"
msgstr ""
-#: templates/web/default/my/my.html:56 templates/web/fixmystreet/my/my.html:60
+#: templates/web/default/my/my.html:61 templates/web/fixmystreet/my/my.html:67
msgid "Added %s"
msgstr ""
@@ -299,7 +299,7 @@ msgstr ""
msgid "Alert %d disabled (created %s)"
msgstr ""
-#: templates/web/bromley/report/display.html:209 templates/web/default/report/update-form.html:163 templates/web/fixmystreet/report/update-form.html:148
+#: templates/web/default/report/update-form.html:163 templates/web/fixmystreet/report/update-form.html:148
msgid "Alert me to future updates"
msgstr ""
@@ -307,7 +307,7 @@ msgstr ""
msgid "All Reports"
msgstr ""
-#: templates/web/barnet/footer.html:20 templates/web/bromley/footer.html:21 templates/web/bromley/header.html:77 templates/web/default/footer.html:11 templates/web/emptyhomes/header.html:32 templates/web/fiksgatami/footer.html:7 templates/web/fiksgatami/nn/footer.html:7 templates/web/fixmindelo/footer.html:41 templates/web/fixmybarangay/footer.html:20 templates/web/fixmystreet/footer.html:48 templates/web/oxfordshire/footer.html:23 templates/web/oxfordshire/header.html:67 templates/web/reading/footer.html:8 templates/web/stevenage/footer.html:43 templates/web/zurich/admin/index-dm.html:12 templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:19 templates/web/zurich/nav_over_content.html:6
+#: templates/web/default/footer.html:11 templates/web/emptyhomes/header.html:32 templates/web/fiksgatami/footer.html:7 templates/web/fiksgatami/nn/footer.html:7 templates/web/fixmybarangay/footer.html:20 templates/web/fixmystreet/footer.html:51 templates/web/zurich/admin/index-dm.html:12 templates/web/zurich/admin/stats.html:13 templates/web/zurich/footer.html:19 templates/web/zurich/nav_over_content.html:6
msgid "All reports"
msgstr ""
@@ -319,15 +319,15 @@ msgstr ""
msgid "All the information you provide here will be sent to"
msgstr ""
-#: templates/web/default/report/new/councils_text_all.html:11 templates/web/default/report/new/councils_text_all.html:13
+#: templates/web/default/report/new/councils_text_all.html:12 templates/web/default/report/new/councils_text_all.html:13
msgid "All the information you provide here will be sent to <strong>%s</strong> or <strong>Roads Service</strong>."
msgstr ""
-#: templates/web/default/report/new/councils_text_all.html:4 templates/web/default/report/new/councils_text_all.html:6
+#: templates/web/default/report/new/councils_text_all.html:5 templates/web/default/report/new/councils_text_all.html:6
msgid "All the information you provide here will be sent to <strong>%s</strong> or a relevant local body such as <strong>TfL</strong>, via the London Report-It system."
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:4 templates/web/bromley/report/new/fill_in_details_form.html:6 templates/web/default/report/new/councils_text_all.html:18 templates/web/default/report/new/councils_text_all.html:20 templates/web/default/report/new/fill_in_details_form.html:11 templates/web/default/report/new/fill_in_details_form.html:13 templates/web/emptyhomes/report/new/councils_text_all.html:2 templates/web/emptyhomes/report/new/councils_text_all.html:4 templates/web/emptyhomes/report/new/fill_in_details_form.html:11 templates/web/emptyhomes/report/new/fill_in_details_form.html:13 templates/web/fixmystreet/report/new/fill_in_details_form.html:6 templates/web/fixmystreet/report/new/fill_in_details_form.html:8
+#: templates/web/default/report/new/councils_text_all.html:19 templates/web/default/report/new/councils_text_all.html:20 templates/web/default/report/new/fill_in_details_form.html:12 templates/web/default/report/new/fill_in_details_form.html:13 templates/web/emptyhomes/report/new/councils_text_all.html:3 templates/web/emptyhomes/report/new/councils_text_all.html:4 templates/web/emptyhomes/report/new/fill_in_details_form.html:12 templates/web/emptyhomes/report/new/fill_in_details_form.html:13 templates/web/fixmystreet/report/new/fill_in_details_form.html:7 templates/web/fixmystreet/report/new/fill_in_details_form.html:8
msgid "All the information you provide here will be sent to <strong>%s</strong>."
msgstr ""
@@ -347,11 +347,11 @@ msgstr ""
msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?"
msgstr ""
-#: templates/web/fixmystreet/footer.html:16 templates/web/stevenage/footer.html:17
+#: templates/web/fixmystreet/footer.html:19
msgid "Are you a developer?"
msgstr ""
-#: templates/web/fixmystreet/footer.html:20 templates/web/stevenage/footer.html:21
+#: templates/web/fixmystreet/footer.html:23
msgid "Are you from a council?"
msgstr ""
@@ -371,7 +371,7 @@ msgstr ""
msgid "Assign to subdivision:"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 templates/web/zurich/report/updates.html:11
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:163 templates/web/zurich/report/updates.html:11
msgid "Assigned to %s"
msgstr ""
@@ -387,7 +387,7 @@ msgstr ""
msgid "Awaiting moderation"
msgstr ""
-#: templates/web/default/js/translation_strings.html:32 templates/web/oxfordshire/js/translation_strings.html:26
+#: templates/web/default/js/translation_strings.html:32
msgid "Back"
msgstr ""
@@ -399,7 +399,7 @@ msgstr ""
msgid "Be sure to choose the right category, because we use that to determine to whom the report is sent."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1176 perllib/FixMyStreet/Cobrand/Zurich.pm:249 templates/web/default/admin/bodies.html:1 templates/web/zurich/header.html:64
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1185 perllib/FixMyStreet/Cobrand/Zurich.pm:297 templates/web/default/admin/bodies.html:1 templates/web/zurich/header.html:64
msgid "Bodies"
msgstr ""
@@ -419,11 +419,11 @@ msgstr ""
msgid "By Date"
msgstr ""
-#: templates/web/fixmystreet/around/_report_banner.html:10 templates/web/fixmystreet/around/_report_banner.html:8
+#: templates/web/fixmystreet/around/_report_banner.html:10 templates/web/fixmystreet/around/_report_banner.html:9
msgid "Can't see the map? <a href='%s' rel='nofollow'>Skip this step</a>"
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:68 templates/web/default/admin/bodies.html:20 templates/web/default/admin/body.html:53 templates/web/default/admin/index.html:44 templates/web/default/report/new/category.html:10 templates/web/fixmystreet/report/new/fill_in_details_form.html:74 templates/web/seesomething/report/new/category.html:6 templates/web/southampton/report/new/category.html:3 templates/web/zurich/admin/body.html:13 templates/web/zurich/admin/index-dm.html:23 templates/web/zurich/admin/index-sdm.html:21 templates/web/zurich/admin/reports.html:13 templates/web/zurich/admin/stats.html:50 templates/web/zurich/report/new/fill_in_details_form.html:50
+#: templates/web/default/admin/bodies.html:20 templates/web/default/admin/body.html:53 templates/web/default/admin/index.html:44 templates/web/default/report/new/category.html:10 templates/web/fixmystreet/report/new/fill_in_details_form.html:74 templates/web/zurich/admin/body.html:13 templates/web/zurich/admin/index-dm.html:23 templates/web/zurich/admin/index-sdm.html:21 templates/web/zurich/admin/reports.html:13 templates/web/zurich/admin/stats.html:50 templates/web/zurich/report/new/fill_in_details_form.html:50
msgid "Category"
msgstr ""
@@ -435,7 +435,7 @@ msgstr ""
msgid "Category:"
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:366
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374
msgid "Category: %s"
msgstr ""
@@ -480,19 +480,15 @@ msgstr ""
msgid "Click map to report a problem"
msgstr ""
-#: templates/web/oxfordshire/js/translation_strings.html:39
-msgid "Click on the map to report a problem"
-msgstr ""
-
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:118 templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:45 templates/web/default/admin/report_edit.html:47 templates/web/default/dashboard/index.html:142 templates/web/default/dashboard/index.html:144 templates/web/fixmystreet/report/banner.html:15 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:10 templates/web/zurich/admin/header.html:12 templates/web/zurich/admin/report_edit.html:100 templates/web/zurich/admin/report_edit.html:98 templates/web/zurich/admin/stats.html:31 templates/web/zurich/report/banner.html:13
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:45 templates/web/default/admin/report_edit.html:47 templates/web/default/dashboard/index.html:142 templates/web/default/dashboard/index.html:144 templates/web/fixmystreet/report/banner.html:15 templates/web/zurich/admin/header.html:10 templates/web/zurich/admin/header.html:12 templates/web/zurich/admin/header.html:2 templates/web/zurich/admin/report_edit.html:100 templates/web/zurich/admin/report_edit.html:98 templates/web/zurich/admin/stats.html:31 templates/web/zurich/report/banner.html:13
msgid "Closed"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:744
+#: perllib/FixMyStreet/DB/Result/Problem.pm:748
msgid "Closed by council"
msgstr ""
-#: templates/web/default/my/my.html:32 templates/web/fixmystreet/my/my.html:36
+#: templates/web/default/my/my.html:37 templates/web/fixmystreet/my/my.html:43
msgid "Closed reports"
msgstr ""
@@ -500,7 +496,7 @@ msgstr ""
msgid "Closed:"
msgstr ""
-#: templates/web/default/around/tabbed_lists.html:10 templates/web/default/around/tabbed_lists.html:12
+#: templates/web/default/around/tabbed_lists.html:11 templates/web/default/around/tabbed_lists.html:12
msgid "Closest nearby problems <small>(within&nbsp;%skm)</small>"
msgstr ""
@@ -544,7 +540,7 @@ msgstr ""
msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated."
msgstr ""
-#: templates/web/default/questionnaire/creator_fixed.html:1 templates/web/default/tokens/confirm_problem.html:1 templates/web/default/tokens/confirm_problem.html:3 templates/web/default/tokens/confirm_update.html:1 templates/web/default/tokens/confirm_update.html:3 templates/web/emptyhomes/tokens/confirm_problem.html:1 templates/web/emptyhomes/tokens/confirm_problem.html:3 templates/web/southampton/tokens/confirm_problem.html:1 templates/web/southampton/tokens/confirm_problem.html:3 templates/web/zurich/tokens/confirm_problem.html:1 templates/web/zurich/tokens/confirm_problem.html:3
+#: templates/web/default/questionnaire/creator_fixed.html:1 templates/web/default/tokens/confirm_problem.html:1 templates/web/default/tokens/confirm_problem.html:3 templates/web/default/tokens/confirm_update.html:1 templates/web/default/tokens/confirm_update.html:3 templates/web/emptyhomes/tokens/confirm_problem.html:1 templates/web/emptyhomes/tokens/confirm_problem.html:3 templates/web/zurich/tokens/confirm_problem.html:1 templates/web/zurich/tokens/confirm_problem.html:3
msgid "Confirmation"
msgstr ""
@@ -568,19 +564,19 @@ msgstr ""
msgid "Contact FixMyStreet"
msgstr ""
-#: templates/web/bromley/contact/submit.html:1 templates/web/default/contact/index.html:1 templates/web/default/contact/index.html:2 templates/web/default/contact/submit.html:1 templates/web/fixmystreet/contact/index.html:1 templates/web/fixmystreet/contact/index.html:2
+#: templates/web/default/contact/index.html:1 templates/web/default/contact/index.html:2 templates/web/default/contact/submit.html:1 templates/web/fixmystreet/contact/index.html:1 templates/web/fixmystreet/contact/index.html:2
msgid "Contact Us"
msgstr ""
-#: templates/web/bromley/contact/submit.html:3 templates/web/default/contact/index.html:6 templates/web/default/contact/submit.html:3 templates/web/fixmystreet/contact/index.html:19
+#: templates/web/default/contact/index.html:6 templates/web/default/contact/submit.html:3 templates/web/fixmystreet/contact/index.html:22
msgid "Contact the team"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1310 perllib/FixMyStreet/App/Controller/Admin.pm:1338
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1319 perllib/FixMyStreet/App/Controller/Admin.pm:1347
msgid "Could not find user"
msgstr ""
-#: templates/web/default/js/translation_strings.html:37 templates/web/oxfordshire/js/translation_strings.html:31
+#: templates/web/default/js/translation_strings.html:37
msgid "Could not look up location"
msgstr ""
@@ -624,7 +620,7 @@ msgstr ""
msgid "Currently no bodies have been created."
msgstr ""
-#: templates/web/default/dashboard/index.html:5 templates/web/default/dashboard/index.html:7
+#: templates/web/default/dashboard/index.html:6 templates/web/default/dashboard/index.html:7
msgid "Dashboard"
msgstr ""
@@ -640,7 +636,7 @@ msgstr ""
msgid "Description"
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:54 templates/web/default/js/translation_strings.html:34 templates/web/fixmystreet/report/new/fill_in_details_form.html:66 templates/web/oxfordshire/js/translation_strings.html:28 templates/web/seesomething/report/new/fill_in_details_form.html:16 templates/web/zurich/report/new/fill_in_details_form.html:42
+#: templates/web/default/js/translation_strings.html:34 templates/web/fixmystreet/report/new/fill_in_details_form.html:66 templates/web/zurich/report/new/fill_in_details_form.html:42
msgid "Details"
msgstr ""
@@ -668,7 +664,11 @@ msgstr ""
msgid "Don&rsquo;t know"
msgstr ""
-#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:82 templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:47 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:32 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:30
+#: templates/web/fixmystreet/contact/index.html:115
+msgid "Don't like forms?"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:47 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:32 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:30
msgid "Duplicate"
msgstr ""
@@ -688,7 +688,7 @@ msgstr ""
msgid "Edit body details"
msgstr ""
-#: templates/web/default/admin/report_edit.html:1 templates/web/zurich/admin/report_edit-sdm.html:1 templates/web/zurich/admin/report_edit-sdm.html:4 templates/web/zurich/admin/report_edit.html:1 templates/web/zurich/admin/report_edit.html:5
+#: templates/web/default/admin/report_edit.html:1 templates/web/zurich/admin/report_edit-sdm.html:2 templates/web/zurich/admin/report_edit-sdm.html:4 templates/web/zurich/admin/report_edit.html:2 templates/web/zurich/admin/report_edit.html:5
msgid "Editing problem %d"
msgstr ""
@@ -704,11 +704,11 @@ msgstr ""
msgid "Editor"
msgstr ""
-#: templates/web/bromley/report/display.html:128 templates/web/default/admin/bodies.html:18 templates/web/default/admin/body.html:54 templates/web/default/admin/body_edit.html:83 templates/web/default/admin/flagged.html:38 templates/web/default/admin/users.html:16 templates/web/fixmystreet/auth/general.html:20 templates/web/fixmystreet/report/update-form.html:76 templates/web/seesomething/auth/general.html:20 templates/web/zurich/admin/body-form.html:9 templates/web/zurich/admin/body.html:14 templates/web/zurich/auth/general.html:24 templates/web/zurich/auth/general.html:54
+#: templates/web/default/admin/bodies.html:18 templates/web/default/admin/body.html:54 templates/web/default/admin/body_edit.html:83 templates/web/default/admin/flagged.html:38 templates/web/default/admin/users.html:16 templates/web/fixmystreet/auth/general.html:20 templates/web/fixmystreet/report/update-form.html:76 templates/web/zurich/admin/body-form.html:9 templates/web/zurich/admin/body.html:14 templates/web/zurich/auth/general.html:24 templates/web/zurich/auth/general.html:54
msgid "Email"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1286
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1295
msgid "Email added to abuse list"
msgstr ""
@@ -716,7 +716,7 @@ msgstr ""
msgid "Email address:"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1283
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1292
msgid "Email already in abuse list"
msgstr ""
@@ -732,7 +732,7 @@ msgstr ""
msgid "Email:"
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:318
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:323
msgid "Email: %s"
msgstr ""
@@ -783,7 +783,7 @@ msgstr ""
msgid "Endpoint"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:71
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:72
msgid "Enter a Z&uuml;rich street name"
msgstr ""
@@ -791,19 +791,23 @@ msgstr ""
msgid "Enter a nearby UK postcode, or street name and area"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:25
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:25 perllib/FixMyStreet/Cobrand/FixaMinGata.pm:37
msgid "Enter a nearby postcode, or street name and area"
msgstr ""
-#: templates/web/default/around/postcode_form.html:1 templates/web/default/around/postcode_form.html:2 templates/web/fixmystreet/around/postcode_form.html:10 templates/web/fixmystreet/around/postcode_form.html:11 templates/web/seesomething/around/postcode_form.html:3 templates/web/seesomething/around/postcode_form.html:4
+#: templates/web/default/around/postcode_form.html:2 templates/web/fixmystreet/around/postcode_form.html:11
msgid "Enter a nearby street name and area"
msgstr ""
+#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:9
+msgid "Enter a nearby street name and area, postal code or district in Delhi"
+msgstr ""
+
#: templates/web/default/auth/general.html:64 templates/web/default/report/new/fill_in_details_form.html:169 templates/web/default/report/update-form.html:124
msgid "Enter a new password:"
msgstr ""
-#: templates/web/bromley/report/display.html:150 templates/web/bromley/report/new/fill_in_details_form.html:189 templates/web/fixmystreet/auth/general.html:61 templates/web/fixmystreet/report/new/fill_in_details_form.html:211 templates/web/fixmystreet/report/update-form.html:122 templates/web/zurich/auth/general.html:65
+#: templates/web/fixmystreet/auth/general.html:61 templates/web/fixmystreet/report/new/fill_in_details_form.html:211 templates/web/fixmystreet/report/update-form.html:122 templates/web/zurich/auth/general.html:65
msgid "Enter a password"
msgstr ""
@@ -827,7 +831,7 @@ msgstr ""
msgid "Extra data:"
msgstr ""
-#: templates/web/bromley/contact/submit.html:14 templates/web/default/contact/submit.html:15
+#: templates/web/default/contact/submit.html:15
msgid "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>."
msgstr ""
@@ -839,10 +843,6 @@ msgstr ""
msgid "Find latest local and national news"
msgstr ""
-#: templates/web/bromley/report/display.html:191 templates/web/bromley/report/new/fill_in_details_form.html:113 templates/web/bromley/report/new/fill_in_details_form.html:160
-msgid "First Name"
-msgstr ""
-
#: templates/web/default/questionnaire/index.html:79 templates/web/fixmystreet/questionnaire/index.html:73
msgid "First time"
msgstr ""
@@ -880,7 +880,7 @@ msgid ""
"for the county council."
msgstr ""
-#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:84 templates/web/default/admin/index.html:44 templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:41 templates/web/default/admin/report_edit.html:42 templates/web/default/dashboard/index.html:142 templates/web/default/dashboard/index.html:144 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:34 templates/web/fixmystreet/report/banner.html:12 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:32
+#: templates/web/default/admin/index.html:44 templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:41 templates/web/default/admin/report_edit.html:42 templates/web/default/dashboard/index.html:142 templates/web/default/dashboard/index.html:144 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:34 templates/web/fixmystreet/report/banner.html:12 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:32
msgid "Fixed"
msgstr ""
@@ -892,7 +892,7 @@ msgstr ""
msgid "Fixed - User"
msgstr ""
-#: templates/web/default/my/my.html:27 templates/web/fixmystreet/my/my.html:31
+#: templates/web/default/my/my.html:32 templates/web/fixmystreet/my/my.html:38
msgid "Fixed reports"
msgstr ""
@@ -908,7 +908,7 @@ msgstr ""
msgid "Flag user"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1181 templates/web/default/admin/users.html:19
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1190 templates/web/default/admin/users.html:19
msgid "Flagged"
msgstr ""
@@ -944,7 +944,7 @@ msgstr ""
msgid "Forgotten your password?"
msgstr ""
-#: templates/web/default/faq/faq-en-gb.html:1 templates/web/emptyhomes/faq/faq-cy.html:1 templates/web/emptyhomes/faq/faq-en-gb.html:1 templates/web/fiksgatami/faq/faq-nb.html:1 templates/web/fiksgatami/nn/faq/faq-nn.html:1 templates/web/fixmindelo/faq/faq-pt-cv.html:1 templates/web/fixmybarangay/faq/faq-en-gb.html:1 templates/web/fixmystreet/faq/faq-en-gb.html:1 templates/web/fixmystreet/static/privacy.html:1 templates/web/oxfordshire/faq/faq-en-gb.html:1
+#: templates/web/default/faq/faq-en-gb.html:1 templates/web/emptyhomes/faq/faq-cy.html:1 templates/web/emptyhomes/faq/faq-en-gb.html:1 templates/web/fiksgatami/faq/faq-nb.html:1 templates/web/fiksgatami/nn/faq/faq-nn.html:1 templates/web/fixmybarangay/faq/faq-en-gb.html:1 templates/web/fixmystreet/faq/faq-en-gb.html:1 templates/web/fixmystreet/static/privacy.html:1
msgid "Frequently Asked Questions"
msgstr ""
@@ -952,15 +952,15 @@ msgstr ""
msgid "GeoRSS on Google Maps"
msgstr ""
-#: templates/web/bromley/report/display.html:30 templates/web/fixmystreet/around/_updates.html:3 templates/web/fixmystreet/report/display.html:38
+#: templates/web/fixmystreet/around/_updates.html:3 templates/web/fixmystreet/report/display.html:38
msgid "Get updates"
msgstr ""
-#: templates/web/fixmystreet/reports/_rss.html:3 templates/web/fixmystreet/reports/_rss.html:9
+#: templates/web/fixmystreet/reports/_rss.html:4 templates/web/fixmystreet/reports/_rss.html:9
msgid "Get updates of %s problems"
msgstr ""
-#: templates/web/fixmystreet/reports/_rss.html:11 templates/web/fixmystreet/reports/_rss.html:3
+#: templates/web/fixmystreet/reports/_rss.html:11 templates/web/fixmystreet/reports/_rss.html:4
msgid "Get updates of problems in this %s"
msgstr ""
@@ -968,7 +968,7 @@ msgstr ""
msgid "Give me an RSS feed"
msgstr ""
-#: templates/web/default/alert/index.html:34 templates/web/default/around/postcode_form.html:8 templates/web/fixmystreet/around/postcode_form.html:21 templates/web/seesomething/around/postcode_form.html:10 templates/web/zurich/admin/stats.html:26
+#: templates/web/default/alert/index.html:34 templates/web/default/around/postcode_form.html:8 templates/web/fixmystreet/around/postcode_form.html:21 templates/web/zurich/admin/stats.html:26
msgid "Go"
msgstr ""
@@ -992,7 +992,7 @@ msgstr ""
msgid "Have you ever reported a problem to a council before, or is this your first time?"
msgstr ""
-#: templates/web/barnet/footer.html:24 templates/web/bromley/footer.html:25 templates/web/bromley/header.html:81 templates/web/default/footer.html:15 templates/web/emptyhomes/header.html:33 templates/web/fiksgatami/footer.html:9 templates/web/fiksgatami/nn/footer.html:9 templates/web/fixmindelo/footer.html:45 templates/web/fixmybarangay/footer.html:24 templates/web/fixmystreet/footer.html:52 templates/web/oxfordshire/footer.html:27 templates/web/oxfordshire/header.html:75 templates/web/reading/footer.html:10 templates/web/seesomething/footer.html:13 templates/web/stevenage/footer.html:47 templates/web/zurich/faq/faq-de-ch.html:1 templates/web/zurich/footer.html:21 templates/web/zurich/nav_over_content.html:8
+#: templates/web/default/footer.html:15 templates/web/emptyhomes/header.html:33 templates/web/fiksgatami/footer.html:9 templates/web/fiksgatami/nn/footer.html:9 templates/web/fixmybarangay/footer.html:24 templates/web/fixmystreet/footer.html:55 templates/web/zurich/faq/faq-de-ch.html:1 templates/web/zurich/footer.html:21 templates/web/zurich/nav_over_content.html:8
msgid "Help"
msgstr ""
@@ -1000,11 +1000,11 @@ msgstr ""
msgid "Here are the types of local problem alerts for &lsquo;%s&rsquo;."
msgstr ""
-#: templates/web/barnet/header.html:70 templates/web/bromley/header.html:64 templates/web/bromley/header.html:99 templates/web/fixmybarangay/header.html:66 templates/web/fixmystreet/header.html:50 templates/web/oxfordshire/header.html:111 templates/web/oxfordshire/header.html:47 templates/web/stevenage/header.html:97 templates/web/zurich/footer.html:11
+#: templates/web/fixmybarangay/header.html:66 templates/web/fixmystreet/header.html:53 templates/web/zurich/footer.html:11
msgid "Hi %s"
msgstr ""
-#: templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:50 templates/web/default/admin/report_edit.html:51 templates/web/default/admin/update_edit.html:28 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:11 templates/web/zurich/admin/report_edit.html:89 templates/web/zurich/admin/report_edit.html:93 templates/web/zurich/admin/stats.html:32 templates/web/zurich/admin/update_edit.html:18
+#: templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:50 templates/web/default/admin/report_edit.html:51 templates/web/default/admin/update_edit.html:28 templates/web/zurich/admin/header.html:11 templates/web/zurich/admin/header.html:2 templates/web/zurich/admin/report_edit.html:89 templates/web/zurich/admin/report_edit.html:93 templates/web/zurich/admin/stats.html:32 templates/web/zurich/admin/update_edit.html:18
msgid "Hidden"
msgstr ""
@@ -1020,7 +1020,7 @@ msgstr ""
msgid "History"
msgstr ""
-#: templates/web/default/js/translation_strings.html:31 templates/web/oxfordshire/js/translation_strings.html:25
+#: templates/web/default/js/translation_strings.html:31
msgid "Home"
msgstr ""
@@ -1028,7 +1028,7 @@ msgstr ""
msgid "How to report a problem"
msgstr ""
-#: templates/web/default/js/translation_strings.html:33 templates/web/oxfordshire/js/translation_strings.html:27
+#: templates/web/default/js/translation_strings.html:33
msgid "How to send successful reports"
msgstr ""
@@ -1044,7 +1044,7 @@ msgstr ""
msgid "I'm afraid we couldn't validate that token, as the report was made too long ago."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Tokens.pm:259
+#: perllib/FixMyStreet/App/Controller/Tokens.pm:260
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 ""
@@ -1076,7 +1076,7 @@ msgstr ""
msgid "If you do not, your update will not be posted."
msgstr ""
-#: templates/web/default/report/new/councils_text_none.html:8 templates/web/default/report/new/councils_text_none.html:9
+#: templates/web/default/report/new/councils_text_none.html:9
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 ""
@@ -1119,7 +1119,7 @@ msgid ""
" when they are shown on the site. Enter the ID (number) of that user."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Contact.pm:111
+#: perllib/FixMyStreet/App/Controller/Contact.pm:116
msgid "Illegal ID"
msgstr ""
@@ -1127,7 +1127,7 @@ msgstr ""
msgid "Illegal feed selection"
msgstr ""
-#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:82 templates/web/default/dashboard/index.html:142 templates/web/default/dashboard/index.html:144 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:32 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:30
+#: templates/web/default/dashboard/index.html:142 templates/web/default/dashboard/index.html:144 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:32 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:30
msgid "In Progress"
msgstr ""
@@ -1139,14 +1139,10 @@ msgstr ""
msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:121 templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:38 templates/web/fixmystreet/report/banner.html:19 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:8 templates/web/zurich/admin/report_edit.html:102 templates/web/zurich/report/banner.html:15
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:38 templates/web/fixmystreet/report/banner.html:19 templates/web/zurich/admin/header.html:2 templates/web/zurich/admin/header.html:8 templates/web/zurich/admin/report_edit.html:102 templates/web/zurich/report/banner.html:15
msgid "In progress"
msgstr ""
-#: templates/web/seesomething/report/new/fill_in_details_form.html:38
-msgid "Incident Category"
-msgstr ""
-
#: templates/web/zurich/admin/report_edit.html:163
msgid "Include reporter personal details"
msgstr ""
@@ -1171,7 +1167,7 @@ msgstr ""
msgid "Invalid agency_responsible value %s"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1096
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1105
msgid "Invalid end date"
msgstr ""
@@ -1179,24 +1175,24 @@ msgstr ""
msgid "Invalid format %s specified."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1092
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1101
msgid "Invalid start date"
msgstr ""
-#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:81 templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:37 templates/web/default/dashboard/index.html:142 templates/web/default/dashboard/index.html:143 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:31 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:29
+#: templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:37 templates/web/default/dashboard/index.html:142 templates/web/default/dashboard/index.html:143 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:31 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:29
msgid "Investigating"
msgstr ""
-#: templates/web/emptyhomes/tokens/confirm_problem.html:12 templates/web/emptyhomes/tokens/confirm_problem.html:14
+#: templates/web/emptyhomes/tokens/confirm_problem.html:13 templates/web/emptyhomes/tokens/confirm_problem.html:14
msgid "It is worth noting however that the process can sometimes be slow, especially if the property is in very poor repair or the owner is unwilling to act. In most cases it can take six months or more before you can expect to see anything change and sometimes there may be considerable barries to a property being brought back into use. This doesn&rsquo;t mean the council isn&rsquo;t doing anything. We encourage councils to update the website so you can see what is happening. It may be a long process, but you reporting your concerns about this property to the council is a valuable first step."
msgstr ""
-#: templates/web/bromley/report/display.html:168 templates/web/bromley/report/new/fill_in_details_form.html:209 templates/web/default/auth/general.html:44 templates/web/default/report/new/fill_in_details_form.html:149 templates/web/default/report/update-form.html:104 templates/web/fixmystreet/auth/general.html:46 templates/web/fixmystreet/report/new/fill_in_details_form.html:172 templates/web/fixmystreet/report/update-form.html:100 templates/web/seesomething/auth/general.html:35 templates/web/zurich/auth/general.html:40
-msgid "Keep me signed in on this computer"
+#: templates/web/fixmystreet/contact/blurb.html:8
+msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there."
msgstr ""
-#: templates/web/bromley/report/display.html:197 templates/web/bromley/report/new/fill_in_details_form.html:119 templates/web/bromley/report/new/fill_in_details_form.html:166
-msgid "Last Name"
+#: templates/web/default/auth/general.html:44 templates/web/default/report/new/fill_in_details_form.html:149 templates/web/default/report/update-form.html:104 templates/web/fixmystreet/auth/general.html:46 templates/web/fixmystreet/report/new/fill_in_details_form.html:172 templates/web/fixmystreet/report/update-form.html:100 templates/web/zurich/auth/general.html:40
+msgid "Keep me signed in on this computer"
msgstr ""
#: templates/web/default/admin/body.html:58 templates/web/zurich/admin/body.html:15
@@ -1219,19 +1215,19 @@ msgstr ""
msgid "List all reported problems"
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:69 templates/web/default/report/new/fill_in_details_form.html:68 templates/web/emptyhomes/report/new/fill_in_details_form.html:51 templates/web/fixmystreet/report/new/fill_in_details_form.html:75 templates/web/seesomething/report/new/fill_in_details_form.html:25 templates/web/zurich/report/new/fill_in_details_form.html:51
+#: templates/web/default/report/new/fill_in_details_form.html:68 templates/web/emptyhomes/report/new/fill_in_details_form.html:51 templates/web/fixmystreet/report/new/fill_in_details_form.html:75 templates/web/zurich/report/new/fill_in_details_form.html:51
msgid "Loading..."
msgstr ""
-#: templates/web/default/alert/choose.html:1 templates/web/default/alert/choose.html:3 templates/web/default/alert/index.html:1 templates/web/default/alert/index.html:3 templates/web/default/alert/list.html:1 templates/web/default/alert/list.html:5 templates/web/default/alert/updates.html:1 templates/web/default/tokens/confirm_alert.html:1 templates/web/default/tokens/confirm_alert.html:3 templates/web/emptyhomes/alert/index.html:1 templates/web/emptyhomes/alert/index.html:3 templates/web/fixmybarangay/alert/index.html:1 templates/web/fixmybarangay/alert/index.html:3 templates/web/fixmystreet/alert/updates.html:1
+#: templates/web/default/alert/choose.html:1 templates/web/default/alert/choose.html:3 templates/web/default/alert/index.html:1 templates/web/default/alert/index.html:3 templates/web/default/alert/list.html:2 templates/web/default/alert/list.html:5 templates/web/default/alert/updates.html:1 templates/web/default/tokens/confirm_alert.html:1 templates/web/default/tokens/confirm_alert.html:3 templates/web/emptyhomes/alert/index.html:1 templates/web/emptyhomes/alert/index.html:3 templates/web/fixmybarangay/alert/index.html:1 templates/web/fixmybarangay/alert/index.html:3 templates/web/fixmystreet/alert/updates.html:1
msgid "Local RSS feeds and email alerts"
msgstr ""
-#: templates/web/default/alert/list.html:1 templates/web/default/alert/list.html:12 templates/web/default/alert/list.html:14 templates/web/default/alert/list.html:3
+#: templates/web/default/alert/list.html:13 templates/web/default/alert/list.html:14 templates/web/default/alert/list.html:2 templates/web/default/alert/list.html:3
msgid "Local RSS feeds and email alerts for ‘%s’"
msgstr ""
-#: templates/web/barnet/footer.html:22 templates/web/bromley/footer.html:23 templates/web/bromley/header.html:79 templates/web/default/footer.html:13 templates/web/fiksgatami/footer.html:8 templates/web/fiksgatami/nn/footer.html:8 templates/web/fixmindelo/footer.html:43 templates/web/fixmybarangay/footer.html:22 templates/web/fixmystreet/footer.html:50 templates/web/oxfordshire/footer.html:25 templates/web/oxfordshire/header.html:71 templates/web/reading/footer.html:9 templates/web/stevenage/footer.html:45
+#: templates/web/default/footer.html:13 templates/web/fiksgatami/footer.html:8 templates/web/fiksgatami/nn/footer.html:8 templates/web/fixmybarangay/footer.html:22 templates/web/fixmystreet/footer.html:53
msgid "Local alerts"
msgstr ""
@@ -1239,7 +1235,7 @@ msgstr ""
msgid "Locate the problem on a map of the area"
msgstr ""
-#: templates/web/default/js/translation_strings.html:43 templates/web/oxfordshire/js/translation_strings.html:37
+#: templates/web/default/js/translation_strings.html:43
msgid "MAP"
msgstr ""
@@ -1251,11 +1247,11 @@ msgstr ""
msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
msgstr ""
-#: templates/web/fixmystreet/contact/index.html:98
+#: templates/web/fixmystreet/contact/index.html:103
msgid "Message"
msgstr ""
-#: templates/web/default/contact/index.html:90
+#: templates/web/default/contact/index.html:92
msgid "Message:"
msgstr ""
@@ -1279,35 +1275,31 @@ msgstr ""
msgid "Name"
msgstr ""
-#: templates/web/seesomething/report/new/fill_in_details_form.html:74
-msgid "Name (optional)"
-msgstr ""
-
#: templates/web/default/admin/report_edit.html:66 templates/web/default/admin/update_edit.html:32 templates/web/default/admin/user-form.html:18 templates/web/zurich/admin/report_edit-sdm.html:46 templates/web/zurich/admin/report_edit.html:59 templates/web/zurich/admin/stats.html:41
msgid "Name:"
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:317
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:322
msgid "Name: %s"
msgstr ""
-#: templates/web/fiksgatami/footer.html:3 templates/web/fiksgatami/nn/footer.html:3 templates/web/reading/footer.html:4
+#: templates/web/fiksgatami/footer.html:3 templates/web/fiksgatami/nn/footer.html:3
msgid "Navigation"
msgstr ""
-#: perllib/FixMyStreet/Geocode/OSM.pm:166
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:188 perllib/FixMyStreet/Geocode/OSM.pm:166
msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/UK.pm:148
+#: perllib/FixMyStreet/Cobrand/UK.pm:142
msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:418 perllib/FixMyStreet/Cobrand/Default.pm:458
+#: perllib/FixMyStreet/Cobrand/Default.pm:421 perllib/FixMyStreet/Cobrand/Default.pm:461
msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:273
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:297
msgid ""
"Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
"\n"
@@ -1445,7 +1437,7 @@ msgstr ""
msgid "No problems have been reported yet."
msgstr ""
-#: templates/web/default/js/translation_strings.html:38 templates/web/oxfordshire/js/translation_strings.html:32
+#: templates/web/default/js/translation_strings.html:38
msgid "No result returned"
msgstr ""
@@ -1455,7 +1447,7 @@ msgid ""
" your config file is not pointing to a live MapIt service."
msgstr ""
-#: templates/web/default/report/_support.html:2 templates/web/default/report/_support.html:4
+#: templates/web/default/report/_support.html:3 templates/web/default/report/_support.html:4
msgid "No supporters"
msgstr ""
@@ -1475,7 +1467,7 @@ msgid ""
" activity across their body), the ability to hide reports or set special report statuses."
msgstr ""
-#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:83 templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:46 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:33 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:31
+#: templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:46 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:33 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:31
msgid "Not Responsible"
msgstr ""
@@ -1523,7 +1515,7 @@ msgstr ""
msgid "Now to submit your update&hellip; do you have a FixMyStreet password?"
msgstr ""
-#: templates/web/default/js/translation_strings.html:42 templates/web/oxfordshire/js/translation_strings.html:36
+#: templates/web/default/js/translation_strings.html:42
msgid "OK"
msgstr ""
@@ -1559,11 +1551,11 @@ msgstr ""
msgid "Older problems"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:115 templates/web/bromley/report/display.html:80 templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:36 templates/web/default/admin/report_edit.html:37 templates/web/default/admin/update_edit.html:28 templates/web/default/dashboard/index.html:142 templates/web/default/report/update-form.html:30 templates/web/fixmystreet/report/update-form.html:28 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:7 templates/web/zurich/admin/report_edit.html:89 templates/web/zurich/admin/report_edit.html:91 templates/web/zurich/admin/update_edit.html:18 templates/web/zurich/report/banner.html:11
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:137 templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:36 templates/web/default/admin/report_edit.html:37 templates/web/default/admin/update_edit.html:28 templates/web/default/dashboard/index.html:142 templates/web/default/report/update-form.html:30 templates/web/fixmystreet/report/update-form.html:28 templates/web/zurich/admin/header.html:2 templates/web/zurich/admin/header.html:7 templates/web/zurich/admin/report_edit.html:89 templates/web/zurich/admin/report_edit.html:91 templates/web/zurich/admin/update_edit.html:18 templates/web/zurich/report/banner.html:11
msgid "Open"
msgstr ""
-#: templates/web/default/my/my.html:22 templates/web/fixmystreet/my/my.html:26
+#: templates/web/default/my/my.html:27 templates/web/fixmystreet/my/my.html:33
msgid "Open reports"
msgstr ""
@@ -1587,7 +1579,7 @@ msgstr ""
msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1053 perllib/FixMyStreet/App/Controller/Report/New.pm:664 perllib/FixMyStreet/App/Controller/Report/New.pm:665 perllib/FixMyStreet/DB/Result/Problem.pm:544 perllib/FixMyStreet/DB/Result/Problem.pm:554 perllib/FixMyStreet/DB/Result/Problem.pm:564 perllib/FixMyStreet/DB/Result/Problem.pm:576 perllib/FixMyStreet/DB/ResultSet/Problem.pm:361 perllib/FixMyStreet/DB/ResultSet/Problem.pm:374
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1057 perllib/FixMyStreet/App/Controller/Report/New.pm:662 perllib/FixMyStreet/App/Controller/Report/New.pm:663 perllib/FixMyStreet/DB/Result/Problem.pm:546 perllib/FixMyStreet/DB/Result/Problem.pm:556 perllib/FixMyStreet/DB/Result/Problem.pm:566 perllib/FixMyStreet/DB/Result/Problem.pm:578 perllib/FixMyStreet/DB/ResultSet/Problem.pm:369 perllib/FixMyStreet/DB/ResultSet/Problem.pm:384
msgid "Other"
msgstr ""
@@ -1611,7 +1603,7 @@ msgstr ""
msgid "Partial"
msgstr ""
-#: templates/web/bromley/report/display.html:147 templates/web/bromley/report/new/fill_in_details_form.html:186 templates/web/fixmystreet/auth/general.html:59 templates/web/fixmystreet/report/new/fill_in_details_form.html:208 templates/web/fixmystreet/report/update-form.html:119 templates/web/zurich/auth/general.html:32 templates/web/zurich/auth/general.html:63
+#: templates/web/fixmystreet/auth/general.html:59 templates/web/fixmystreet/report/new/fill_in_details_form.html:208 templates/web/fixmystreet/report/update-form.html:119 templates/web/zurich/auth/general.html:32 templates/web/zurich/auth/general.html:63
msgid "Password (optional)"
msgstr ""
@@ -1627,15 +1619,15 @@ msgstr ""
msgid "Phone number"
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:136 templates/web/bromley/report/new/fill_in_details_form.html:183 templates/web/fixmystreet/report/new/fill_in_details_form.html:138 templates/web/fixmystreet/report/new/fill_in_details_form.html:205 templates/web/seesomething/report/new/fill_in_details_form.html:89
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:138 templates/web/fixmystreet/report/new/fill_in_details_form.html:205
msgid "Phone number (optional)"
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:282 templates/web/default/admin/report_edit.html:68 templates/web/default/report/new/fill_in_details_form.html:215 templates/web/emptyhomes/report/new/fill_in_details_form.html:138 templates/web/zurich/admin/report_edit-sdm.html:49 templates/web/zurich/admin/report_edit.html:63 templates/web/zurich/admin/stats.html:39
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:287 templates/web/default/admin/report_edit.html:68 templates/web/default/report/new/fill_in_details_form.html:215 templates/web/emptyhomes/report/new/fill_in_details_form.html:138 templates/web/zurich/admin/report_edit-sdm.html:49 templates/web/zurich/admin/report_edit.html:63 templates/web/zurich/admin/stats.html:39
msgid "Phone:"
msgstr ""
-#: templates/web/bromley/report/display.html:111 templates/web/bromley/report/new/fill_in_details_form.html:104 templates/web/fixmystreet/report/new/fill_in_details_form.html:92 templates/web/fixmystreet/report/update-form.html:59 templates/web/seesomething/report/new/fill_in_details_form.html:52 templates/web/zurich/admin/index-dm.html:29 templates/web/zurich/admin/index-sdm.html:24 templates/web/zurich/admin/reports.html:16 templates/web/zurich/admin/stats.html:37 templates/web/zurich/report/new/fill_in_details_form.html:68
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:92 templates/web/fixmystreet/report/update-form.html:59 templates/web/zurich/admin/index-dm.html:29 templates/web/zurich/admin/index-sdm.html:24 templates/web/zurich/admin/reports.html:16 templates/web/zurich/admin/stats.html:37 templates/web/zurich/report/new/fill_in_details_form.html:68
msgid "Photo"
msgstr ""
@@ -1647,11 +1639,11 @@ msgstr ""
msgid "Photos of recent nearby reports"
msgstr ""
-#: templates/web/default/js/translation_strings.html:30 templates/web/oxfordshire/js/translation_strings.html:24
+#: templates/web/default/js/translation_strings.html:30
msgid "Place pin on map"
msgstr ""
-#: templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:38 templates/web/default/dashboard/index.html:142 templates/web/default/dashboard/index.html:143 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:9 templates/web/zurich/admin/index-dm.html:9 templates/web/zurich/admin/report_edit.html:89 templates/web/zurich/admin/report_edit.html:92
+#: templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:38 templates/web/default/dashboard/index.html:142 templates/web/default/dashboard/index.html:143 templates/web/zurich/admin/header.html:2 templates/web/zurich/admin/header.html:9 templates/web/zurich/admin/index-dm.html:9 templates/web/zurich/admin/report_edit.html:89 templates/web/zurich/admin/report_edit.html:92
msgid "Planned"
msgstr ""
@@ -1659,7 +1651,7 @@ msgstr ""
msgid "Please <a class=\"tab_link\" href=\"#report\">take a look</a> at the updates that have been left."
msgstr ""
-#: templates/web/default/report/new/notes.html:6 templates/web/fixmystreet/report/new/notes.html:6 templates/web/oxfordshire/report/new/notes.html:5
+#: templates/web/default/report/new/notes.html:6 templates/web/fixmystreet/report/new/notes.html:6
msgid "Please be polite, concise and to the point."
msgstr ""
@@ -1671,11 +1663,11 @@ msgstr ""
msgid "Please check your email"
msgstr ""
-#: templates/web/default/auth/general.html:14 templates/web/default/auth/general.html:8 templates/web/fixmystreet/auth/general.html:15 templates/web/fixmystreet/auth/general.html:9 templates/web/seesomething/auth/general.html:15 templates/web/seesomething/auth/general.html:9 templates/web/zurich/auth/general.html:3 templates/web/zurich/auth/general.html:9
+#: templates/web/default/auth/general.html:14 templates/web/default/auth/general.html:8 templates/web/fixmystreet/auth/general.html:15 templates/web/fixmystreet/auth/general.html:9 templates/web/zurich/auth/general.html:3 templates/web/zurich/auth/general.html:9
msgid "Please check your email address is correct"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:848 perllib/FixMyStreet/App/Controller/Report/New.pm:855 perllib/FixMyStreet/App/Controller/Report/New.pm:874 perllib/FixMyStreet/App/Controller/Report/New.pm:917 perllib/FixMyStreet/DB/Result/Problem.pm:381 templates/web/default/js/translation_strings.html:9 templates/web/oxfordshire/js/translation_strings.html:9
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:859 perllib/FixMyStreet/App/Controller/Report/New.pm:878 perllib/FixMyStreet/App/Controller/Report/New.pm:921 perllib/FixMyStreet/DB/Result/Problem.pm:381 templates/web/default/js/translation_strings.html:9
msgid "Please choose a category"
msgstr ""
@@ -1683,26 +1675,14 @@ msgstr ""
msgid "Please choose a property type"
msgstr ""
-#: templates/web/seesomething/js/translation_strings.html:6
-msgid "Please choose a transport category"
-msgstr ""
-
-#: templates/web/seesomething/js/translation_strings.html:7
-msgid "Please choose an incident category"
-msgstr ""
-
-#: templates/web/bromley/report/new/fill_in_details_form.html:64
-msgid "Please describe the exact location of the report. Example: “2 dumped mattresses outside Number 19 Stockwell Close”"
-msgstr ""
-
-#: templates/web/default/contact/blurb.html:2
+#: templates/web/default/contact/blurb.html:2 templates/web/fixmystreet/contact/blurb.html:12
msgid ""
"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 ""
-#: templates/web/default/report/new/notes.html:7 templates/web/fixmystreet/report/new/notes.html:7 templates/web/oxfordshire/report/new/notes.html:6
+#: templates/web/default/report/new/notes.html:7 templates/web/fixmystreet/report/new/notes.html:7
msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the service for all users."
msgstr ""
@@ -1710,7 +1690,7 @@ msgstr ""
msgid "Please do not give address or personal information in this section."
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Comment.pm:126 templates/web/default/js/translation_strings.html:2 templates/web/oxfordshire/js/translation_strings.html:2
+#: perllib/FixMyStreet/DB/Result/Comment.pm:126 templates/web/default/js/translation_strings.html:2
msgid "Please enter a message"
msgstr ""
@@ -1718,11 +1698,11 @@ msgstr ""
msgid "Please enter a password"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Contact.pm:97 perllib/FixMyStreet/DB/Result/Problem.pm:356 templates/web/default/js/translation_strings.html:3 templates/web/oxfordshire/js/translation_strings.html:3
+#: perllib/FixMyStreet/App/Controller/Contact.pm:97 perllib/FixMyStreet/DB/Result/Problem.pm:356 templates/web/default/js/translation_strings.html:3
msgid "Please enter a subject"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1032 perllib/FixMyStreet/App/Controller/Admin.pm:979 perllib/FixMyStreet/DB/Result/User.pm:115 templates/web/default/js/translation_strings.html:12 templates/web/default/js/translation_strings.html:16 templates/web/oxfordshire/js/translation_strings.html:12 templates/web/oxfordshire/js/translation_strings.html:16 templates/web/seesomething/js/translation_strings.html:10 templates/web/seesomething/js/translation_strings.html:13
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1041 perllib/FixMyStreet/App/Controller/Admin.pm:988 perllib/FixMyStreet/DB/Result/User.pm:115 templates/web/default/js/translation_strings.html:12 templates/web/default/js/translation_strings.html:16
msgid "Please enter a valid email"
msgstr ""
@@ -1730,27 +1710,27 @@ msgstr ""
msgid "Please enter a valid email address"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:359 templates/web/default/js/translation_strings.html:4 templates/web/oxfordshire/js/translation_strings.html:4 templates/web/seesomething/js/translation_strings.html:2
+#: perllib/FixMyStreet/DB/Result/Problem.pm:359 templates/web/default/js/translation_strings.html:4
msgid "Please enter some details"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Contact.pm:96 perllib/FixMyStreet/DB/Result/User.pm:112 templates/web/default/auth/general.html:13 templates/web/default/auth/general.html:8 templates/web/default/js/translation_strings.html:11 templates/web/default/js/translation_strings.html:15 templates/web/fixmystreet/auth/general.html:14 templates/web/fixmystreet/auth/general.html:9 templates/web/oxfordshire/js/translation_strings.html:11 templates/web/oxfordshire/js/translation_strings.html:15 templates/web/seesomething/auth/general.html:14 templates/web/seesomething/auth/general.html:9 templates/web/seesomething/js/translation_strings.html:9 templates/web/zurich/auth/general.html:3 templates/web/zurich/auth/general.html:8
+#: perllib/FixMyStreet/App/Controller/Contact.pm:96 perllib/FixMyStreet/DB/Result/User.pm:112 templates/web/default/auth/general.html:13 templates/web/default/auth/general.html:8 templates/web/default/js/translation_strings.html:11 templates/web/default/js/translation_strings.html:15 templates/web/fixmystreet/auth/general.html:14 templates/web/fixmystreet/auth/general.html:9 templates/web/zurich/auth/general.html:3 templates/web/zurich/auth/general.html:8
msgid "Please enter your email"
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:149 templates/web/fixmystreet/report/new/fill_in_details_form.html:151 templates/web/seesomething/report/new/fill_in_details_form.html:85 templates/web/zurich/report/new/fill_in_details_form.html:92
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:151 templates/web/zurich/report/new/fill_in_details_form.html:92
msgid "Please enter your email address"
msgstr ""
-#: templates/web/default/js/translation_strings.html:25 templates/web/oxfordshire/js/translation_strings.html:19
+#: templates/web/default/js/translation_strings.html:25
msgid "Please enter your first name"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:374 templates/web/default/js/translation_strings.html:7 templates/web/oxfordshire/js/translation_strings.html:7 templates/web/seesomething/js/translation_strings.html:4
+#: perllib/FixMyStreet/DB/Result/Problem.pm:374 templates/web/default/js/translation_strings.html:7
msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Contact.pm:95 perllib/FixMyStreet/DB/Result/Comment.pm:123 perllib/FixMyStreet/DB/Result/Problem.pm:367 perllib/FixMyStreet/DB/Result/User.pm:108 templates/web/default/js/translation_strings.html:6 templates/web/oxfordshire/js/translation_strings.html:6
+#: perllib/FixMyStreet/App/Controller/Contact.pm:95 perllib/FixMyStreet/DB/Result/Comment.pm:123 perllib/FixMyStreet/DB/Result/Problem.pm:367 perllib/FixMyStreet/DB/Result/User.pm:108 templates/web/default/js/translation_strings.html:6
msgid "Please enter your name"
msgstr ""
@@ -1758,11 +1738,11 @@ msgstr ""
msgid "Please enter your phone number"
msgstr ""
-#: templates/web/default/js/translation_strings.html:26 templates/web/oxfordshire/js/translation_strings.html:20
+#: templates/web/default/js/translation_strings.html:26
msgid "Please enter your second name"
msgstr ""
-#: templates/web/default/js/translation_strings.html:24 templates/web/oxfordshire/js/translation_strings.html:18
+#: templates/web/default/js/translation_strings.html:24
msgid "Please enter your title"
msgstr ""
@@ -1780,18 +1760,18 @@ msgid ""
"to read, as does a lack of punctuation."
msgstr ""
-#: templates/web/default/report/new/fill_in_details_text.html:1 templates/web/default/report/new/fill_in_details_text.html:11 templates/web/fixmybarangay/report/new/fill_in_details_text.html:1 templates/web/fixmybarangay/report/new/fill_in_details_text.html:10 templates/web/fixmystreet/report/new/fill_in_details_text.html:1 templates/web/fixmystreet/report/new/fill_in_details_text.html:8
+#: templates/web/default/report/new/fill_in_details_text.html:11 templates/web/default/report/new/fill_in_details_text.html:2 templates/web/fixmybarangay/report/new/fill_in_details_text.html:10 templates/web/fixmybarangay/report/new/fill_in_details_text.html:2 templates/web/fixmystreet/report/new/fill_in_details_text.html:2 templates/web/fixmystreet/report/new/fill_in_details_text.html:8
msgid "Please fill in details of the problem below."
msgstr ""
-#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1 templates/web/fixmybarangay/report/new/fill_in_details_text.html:3
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:2 templates/web/fixmybarangay/report/new/fill_in_details_text.html:3
msgid ""
"Please fill in details of the problem below. Leave as much detail as you can, \n"
"and if possible describe the exact location of\n"
"the problem (e.g. if there is a streetlight number or road name)."
msgstr ""
-#: templates/web/default/report/new/fill_in_details_text.html:1 templates/web/default/report/new/fill_in_details_text.html:3
+#: templates/web/default/report/new/fill_in_details_text.html:2 templates/web/default/report/new/fill_in_details_text.html:3
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"
@@ -1799,11 +1779,11 @@ msgid ""
"photo of the problem if you have one), etc."
msgstr ""
-#: templates/web/fixmystreet/report/new/fill_in_details_form.html:70 templates/web/seesomething/report/new/fill_in_details_form.html:20 templates/web/zurich/report/new/fill_in_details_form.html:46
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:70 templates/web/zurich/report/new/fill_in_details_form.html:46
msgid "Please fill in details of the problem."
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:28 templates/web/default/report/new/fill_in_details_form.html:27 templates/web/emptyhomes/report/new/fill_in_details_form.html:26 templates/web/fixmystreet/report/new/fill_in_details_form.html:35 templates/web/zurich/report/new/fill_in_details_form.html:20
+#: templates/web/default/report/new/fill_in_details_form.html:27 templates/web/emptyhomes/report/new/fill_in_details_form.html:26 templates/web/fixmystreet/report/new/fill_in_details_form.html:35 templates/web/zurich/report/new/fill_in_details_form.html:20
msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box."
msgstr ""
@@ -1811,7 +1791,7 @@ msgstr ""
msgid "Please indicate whether you'd like to receive another questionnaire"
msgstr ""
-#: templates/web/fixmystreet/report/updates-sidebar-notes.html:3
+#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4
msgid "Please note that updates are not sent to the council."
msgstr ""
@@ -1819,15 +1799,11 @@ msgstr ""
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 ""
-#: templates/web/barnet/report/updates-sidebar-notes.html:1
-msgid "Please note that updates are not sent to the relevant department. 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 ""
-
-#: templates/web/bromley/report/new/fill_in_details_form.html:23 templates/web/default/report/new/fill_in_details_form.html:5 templates/web/emptyhomes/report/new/fill_in_details_form.html:5 templates/web/fixmystreet/report/new/fill_in_details_form.html:26 templates/web/zurich/report/new/fill_in_details_form.html:11
+#: templates/web/default/report/new/fill_in_details_form.html:5 templates/web/emptyhomes/report/new/fill_in_details_form.html:5 templates/web/fixmystreet/report/new/fill_in_details_form.html:26 templates/web/zurich/report/new/fill_in_details_form.html:11
msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit."
msgstr ""
-#: templates/web/default/report/new/notes.html:1 templates/web/fixmybarangay/report/new/notes.html:1 templates/web/fixmystreet/report/new/notes.html:1 templates/web/oxfordshire/report/new/notes.html:1
+#: templates/web/default/report/new/notes.html:1 templates/web/fixmybarangay/report/new/notes.html:1 templates/web/fixmystreet/report/new/notes.html:1
msgid "Please note:"
msgstr ""
@@ -1871,11 +1847,11 @@ msgstr ""
msgid "Please write a message"
msgstr ""
-#: templates/web/bromley/report/display.html:70 templates/web/fixmystreet/report/update-form.html:23
+#: templates/web/fixmystreet/report/update-form.html:23
msgid "Please write your update here"
msgstr ""
-#: templates/web/bromley/report/display.html:123 templates/web/bromley/report/display.html:151 templates/web/bromley/report/display.html:163 templates/web/default/contact/index.html:93 templates/web/default/report/update-form.html:109 templates/web/default/report/update-form.html:131 templates/web/default/report/update-form.html:72 templates/web/fixmystreet/contact/index.html:105 templates/web/fixmystreet/report/update-form.html:123 templates/web/fixmystreet/report/update-form.html:71 templates/web/fixmystreet/report/update-form.html:95
+#: templates/web/default/contact/index.html:95 templates/web/default/report/update-form.html:109 templates/web/default/report/update-form.html:131 templates/web/default/report/update-form.html:72 templates/web/fixmystreet/contact/index.html:110 templates/web/fixmystreet/report/update-form.html:123 templates/web/fixmystreet/report/update-form.html:71 templates/web/fixmystreet/report/update-form.html:95
msgid "Post"
msgstr ""
@@ -1903,7 +1879,7 @@ msgstr ""
msgid "Private information (not shown on site)"
msgstr ""
-#: templates/web/default/maps/openlayers.html:85
+#: templates/web/default/maps/openlayers.html:86
msgid "Problem"
msgstr ""
@@ -1923,7 +1899,7 @@ msgstr ""
msgid "Problem breakdown by state"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:950
+#: perllib/FixMyStreet/App/Controller/Admin.pm:959
msgid "Problem marked as open."
msgstr ""
@@ -1939,7 +1915,7 @@ msgstr ""
msgid "Problems in this area"
msgstr ""
-#: templates/web/bromley/report/display.html:31 templates/web/fixmystreet/around/tabbed_lists.html:4 templates/web/fixmystreet/report/display.html:46
+#: templates/web/fixmystreet/around/tabbed_lists.html:4 templates/web/fixmystreet/report/display.html:46
msgid "Problems nearby"
msgstr ""
@@ -1955,11 +1931,11 @@ msgstr ""
msgid "Problems within %.1fkm of this location"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:626 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:109 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155 perllib/FixMyStreet/Cobrand/UK.pm:228
+#: perllib/FixMyStreet/Cobrand/Default.pm:629 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:109 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155 perllib/FixMyStreet/Cobrand/FixaMinGata.pm:184 perllib/FixMyStreet/Cobrand/UK.pm:222
msgid "Problems within %s"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 perllib/FixMyStreet/Cobrand/UK.pm:242
+#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117 perllib/FixMyStreet/Cobrand/UK.pm:236
msgid "Problems within %s ward"
msgstr ""
@@ -1983,11 +1959,11 @@ msgstr ""
msgid "Property type:"
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:52 templates/web/fixmystreet/report/new/fill_in_details_form.html:64
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:64
msgid "Provide a title"
msgstr ""
-#: templates/web/bromley/report/display.html:57 templates/web/default/report/update-form.html:3 templates/web/fixmystreet/report/update-form.html:4
+#: templates/web/default/report/update-form.html:3 templates/web/fixmystreet/report/update-form.html:4
msgid "Provide an update"
msgstr ""
@@ -1995,11 +1971,7 @@ msgstr ""
msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:180
-msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
-msgstr ""
-
-#: templates/web/bromley/report/display.html:144 templates/web/default/report/new/fill_in_details_form.html:173 templates/web/default/report/update-form.html:128 templates/web/fixmystreet/report/new/fill_in_details_form.html:202 templates/web/fixmystreet/report/update-form.html:116
+#: templates/web/default/report/new/fill_in_details_form.html:173 templates/web/default/report/update-form.html:128 templates/web/fixmystreet/report/new/fill_in_details_form.html:202 templates/web/fixmystreet/report/update-form.html:116
msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
msgstr ""
@@ -2023,7 +1995,7 @@ msgstr ""
msgid "Publish the response"
msgstr ""
-#: templates/web/default/questionnaire/completed.html:1 templates/web/default/questionnaire/completed.html:2 templates/web/default/questionnaire/index.html:0 templates/web/default/questionnaire/index.html:14 templates/web/default/questionnaire/index.html:4 templates/web/fixmystreet/questionnaire/index.html:0 templates/web/fixmystreet/questionnaire/index.html:14 templates/web/fixmystreet/questionnaire/index.html:32 templates/web/fixmystreet/questionnaire/index.html:4
+#: templates/web/default/questionnaire/completed.html:2 templates/web/default/questionnaire/index.html:0 templates/web/default/questionnaire/index.html:14 templates/web/default/questionnaire/index.html:4 templates/web/fixmystreet/questionnaire/index.html:0 templates/web/fixmystreet/questionnaire/index.html:14 templates/web/fixmystreet/questionnaire/index.html:32 templates/web/fixmystreet/questionnaire/index.html:4
msgid "Questionnaire"
msgstr ""
@@ -2039,23 +2011,23 @@ msgstr ""
msgid "Questionnaire filled in by problem reporter"
msgstr ""
-#: templates/web/bromley/report/display.html:37 templates/web/default/alert/_list.html:21 templates/web/default/around/display_location.html:1 templates/web/default/around/display_location.html:3 templates/web/default/report/display.html:46 templates/web/default/reports/_rss.html:1 templates/web/fixmystreet/alert/_list.html:22 templates/web/fixmystreet/alert/updates.html:9 templates/web/fixmystreet/report/display.html:61
+#: templates/web/default/alert/_list.html:21 templates/web/default/around/display_location.html:3 templates/web/default/report/display.html:46 templates/web/default/reports/_rss.html:1 templates/web/fixmystreet/alert/_list.html:22 templates/web/fixmystreet/alert/updates.html:9 templates/web/fixmystreet/report/display.html:61
msgid "RSS feed"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:265 perllib/FixMyStreet/Cobrand/UK.pm:277
msgid "RSS feed for %s"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289
+#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
msgid "RSS feed for %s ward, %s"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:189 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:197 perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:309
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:189 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:197 perllib/FixMyStreet/Cobrand/FixaMinGata.pm:200 perllib/FixMyStreet/Cobrand/FixaMinGata.pm:208 perllib/FixMyStreet/Cobrand/FixaMinGata.pm:218 perllib/FixMyStreet/Cobrand/FixaMinGata.pm:226 perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303
msgid "RSS feed of %s"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:314
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:308
msgid "RSS feed of %s, within %s ward"
msgstr ""
@@ -2067,23 +2039,23 @@ msgstr ""
msgid "RSS feed of problems in this %s"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:627 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:110 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:154 perllib/FixMyStreet/Cobrand/UK.pm:235
+#: perllib/FixMyStreet/Cobrand/Default.pm:630 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:110 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:154 perllib/FixMyStreet/Cobrand/FixaMinGata.pm:183 perllib/FixMyStreet/Cobrand/UK.pm:229
msgid "RSS feed of problems within %s"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:116 perllib/FixMyStreet/Cobrand/UK.pm:241
+#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:116 perllib/FixMyStreet/Cobrand/UK.pm:235
msgid "RSS feed of problems within %s ward"
msgstr ""
-#: templates/web/default/around/display_location.html:1 templates/web/default/around/display_location.html:4
+#: templates/web/default/around/display_location.html:3 templates/web/default/around/display_location.html:4
msgid "RSS feed of recent local problems"
msgstr ""
-#: templates/web/bromley/report/display.html:37 templates/web/default/report/display.html:46 templates/web/fixmystreet/alert/updates.html:9 templates/web/fixmystreet/report/display.html:61
+#: templates/web/default/report/display.html:46 templates/web/fixmystreet/alert/updates.html:9 templates/web/fixmystreet/report/display.html:61
msgid "RSS feed of updates to this problem"
msgstr ""
-#: templates/web/bromley/report/display.html:39 templates/web/default/alert/updates.html:9 templates/web/default/report/display.html:37 templates/web/fixmystreet/alert/updates.html:14 templates/web/fixmystreet/report/display.html:63
+#: templates/web/default/alert/updates.html:9 templates/web/default/report/display.html:37 templates/web/fixmystreet/alert/updates.html:14 templates/web/fixmystreet/report/display.html:63
msgid "Receive email when updates are left on this problem."
msgstr ""
@@ -2099,7 +2071,7 @@ msgstr ""
msgid "Recently fixed"
msgstr ""
-#: templates/web/default/index.html:35 templates/web/emptyhomes/index.html:24 templates/web/fixmystreet/index.html:45
+#: templates/web/default/index.html:35 templates/web/emptyhomes/index.html:24 templates/web/fixmystreet/index.html:49
msgid "Recently reported problems"
msgstr ""
@@ -2115,7 +2087,7 @@ msgstr ""
msgid "Remove flag"
msgstr ""
-#: templates/web/default/admin/report_edit.html:89 templates/web/default/admin/update_edit.html:57 templates/web/zurich/admin/update_edit.html:35
+#: templates/web/default/admin/report_edit.html:94 templates/web/default/admin/update_edit.html:62 templates/web/zurich/admin/update_edit.html:35
msgid "Remove photo (can't be undone!)"
msgstr ""
@@ -2123,15 +2095,15 @@ msgstr ""
msgid "Report Empty Homes"
msgstr ""
-#: templates/web/barnet/footer.html:16 templates/web/bromley/footer.html:17 templates/web/default/footer.html:7 templates/web/emptyhomes/header.html:31 templates/web/fiksgatami/footer.html:5 templates/web/fiksgatami/nn/footer.html:5 templates/web/fixmindelo/footer.html:37 templates/web/fixmystreet/footer.html:44 templates/web/oxfordshire/footer.html:19 templates/web/reading/footer.html:6 templates/web/seesomething/footer.html:11 templates/web/stevenage/footer.html:39 templates/web/zurich/footer.html:17 templates/web/zurich/nav_over_content.html:4
+#: templates/web/default/footer.html:7 templates/web/emptyhomes/header.html:31 templates/web/fiksgatami/footer.html:5 templates/web/fiksgatami/nn/footer.html:5 templates/web/fixmystreet/footer.html:47 templates/web/zurich/footer.html:17 templates/web/zurich/nav_over_content.html:4
msgid "Report a problem"
msgstr ""
-#: templates/web/bromley/report/display.html:28 templates/web/fixmystreet/report/display.html:35
+#: templates/web/fixmystreet/report/display.html:35
msgid "Report abuse"
msgstr ""
-#: templates/web/default/report_created.html:1 templates/web/default/report_created.html:3 templates/web/seesomething/report_created.html:0 templates/web/seesomething/report_created.html:8
+#: templates/web/default/report_created.html:1 templates/web/default/report_created.html:3
msgid "Report created"
msgstr ""
@@ -2139,19 +2111,19 @@ msgstr ""
msgid "Report on %s"
msgstr ""
-#: templates/web/default/index.html:14 templates/web/emptyhomes/index.html:5 templates/web/fixmystreet/around/intro.html:1 templates/web/stevenage/around/intro.html:1 templates/web/zurich/around/intro.html:1
+#: templates/web/default/index.html:14 templates/web/emptyhomes/index.html:5 templates/web/fixmystreet/around/intro.html:1 templates/web/zurich/around/intro.html:1
msgid "Report, view, or discuss local problems"
msgstr ""
-#: templates/web/default/my/my.html:74
+#: templates/web/default/my/my.html:79
msgid "Reported %s"
msgstr ""
-#: templates/web/default/my/my.html:72
+#: templates/web/default/my/my.html:77
msgid "Reported %s, to %s"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:559 templates/web/default/contact/index.html:45 templates/web/fixmystreet/contact/index.html:58
+#: perllib/FixMyStreet/DB/Result/Problem.pm:561 templates/web/default/contact/index.html:45 templates/web/fixmystreet/contact/index.html:62
msgid "Reported anonymously at %s"
msgstr ""
@@ -2159,7 +2131,7 @@ msgstr ""
msgid "Reported before"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:582 templates/web/default/contact/index.html:47 templates/web/fixmystreet/contact/index.html:60
+#: perllib/FixMyStreet/DB/Result/Problem.pm:584 templates/web/default/contact/index.html:47 templates/web/fixmystreet/contact/index.html:64
msgid "Reported by %s at %s"
msgstr ""
@@ -2167,39 +2139,39 @@ msgstr ""
msgid "Reported in the %s category"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:555
+#: perllib/FixMyStreet/DB/Result/Problem.pm:557
msgid "Reported in the %s category anonymously at %s"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:577
+#: perllib/FixMyStreet/DB/Result/Problem.pm:579
msgid "Reported in the %s category by %s at %s"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:551
+#: perllib/FixMyStreet/DB/Result/Problem.pm:553
msgid "Reported via %s anonymously at %s"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:573
+#: perllib/FixMyStreet/DB/Result/Problem.pm:575
msgid "Reported via %s by %s at %s"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:547
+#: perllib/FixMyStreet/DB/Result/Problem.pm:549
msgid "Reported via %s in the %s category anonymously at %s"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:567
+#: perllib/FixMyStreet/DB/Result/Problem.pm:569
msgid "Reported via %s in the %s category by %s at %s"
msgstr ""
-#: templates/web/default/around/around_index.html:1 templates/web/default/js/translation_strings.html:41 templates/web/default/report/new/fill_in_details.html:0 templates/web/default/report/new/fill_in_details.html:3 templates/web/default/report/new/fill_in_details_form.html:1 templates/web/emptyhomes/report/new/fill_in_details_form.html:1 templates/web/fixmystreet/around/around_index.html:2 templates/web/fixmystreet/report/new/fill_in_details.html:0 templates/web/fixmystreet/report/new/fill_in_details.html:5 templates/web/fixmystreet/report/new/fill_in_details_form.html:2 templates/web/oxfordshire/js/translation_strings.html:35 templates/web/seesomething/around/around_index.html:1 templates/web/seesomething/report/new/fill_in_details_form.html:3 templates/web/zurich/report/new/fill_in_details_form.html:2
+#: templates/web/default/around/around_index.html:1 templates/web/default/js/translation_strings.html:41 templates/web/default/report/new/fill_in_details.html:0 templates/web/default/report/new/fill_in_details.html:3 templates/web/default/report/new/fill_in_details_form.html:1 templates/web/emptyhomes/report/new/fill_in_details_form.html:1 templates/web/fixmystreet/around/around_index.html:2 templates/web/fixmystreet/report/new/fill_in_details.html:0 templates/web/fixmystreet/report/new/fill_in_details.html:5 templates/web/fixmystreet/report/new/fill_in_details_form.html:2 templates/web/zurich/report/new/fill_in_details_form.html:2
msgid "Reporting a problem"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1177 perllib/FixMyStreet/Cobrand/Zurich.pm:242 templates/web/seesomething/admin/stats.html:1 templates/web/zurich/header.html:60
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1186 perllib/FixMyStreet/Cobrand/Zurich.pm:290 templates/web/zurich/header.html:60
msgid "Reports"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:393 perllib/FixMyStreet/DB/Result/Problem.pm:397
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395 perllib/FixMyStreet/DB/Result/Problem.pm:399
msgid "Reports are limited to %s characters in length. Please shorten your report"
msgstr ""
@@ -2219,23 +2191,23 @@ msgstr ""
msgid "Resend report"
msgstr ""
-#: templates/web/default/js/translation_strings.html:28 templates/web/oxfordshire/js/translation_strings.html:22
+#: templates/web/default/js/translation_strings.html:28
msgid "Right place?"
msgstr ""
-#: perllib/FixMyStreet/Geocode/OSM.pm:173
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:195 perllib/FixMyStreet/Geocode/OSM.pm:173
msgid "Road operator for this named road (derived from road reference number and type): %s"
msgstr ""
-#: perllib/FixMyStreet/Geocode/OSM.pm:170
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:192 perllib/FixMyStreet/Geocode/OSM.pm:170
msgid "Road operator for this named road (from OpenStreetMap): %s"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1377 perllib/FixMyStreet/App/Controller/Admin.pm:1388 templates/web/default/admin/report_edit.html:85 templates/web/zurich/admin/report_edit.html:76
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1386 perllib/FixMyStreet/App/Controller/Admin.pm:1397 templates/web/default/admin/report_edit.html:90 templates/web/zurich/admin/report_edit.html:76
msgid "Rotate Left"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1377 templates/web/default/admin/report_edit.html:86 templates/web/zurich/admin/report_edit.html:77
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1386 templates/web/default/admin/report_edit.html:91 templates/web/zurich/admin/report_edit.html:77
msgid "Rotate Right"
msgstr ""
@@ -2279,7 +2251,7 @@ msgstr ""
msgid "Select which type of alert you'd like and click the button for an RSS feed, or enter your email address to subscribe to an email alert."
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:664
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
msgid "Sent to %s %s later"
msgstr ""
@@ -2295,7 +2267,7 @@ msgstr ""
msgid "Share"
msgstr ""
-#: templates/web/bromley/report/display.html:205 templates/web/bromley/report/new/fill_in_details_form.html:129 templates/web/bromley/report/new/fill_in_details_form.html:175 templates/web/default/report/new/fill_in_details_form.html:210 templates/web/default/report/update-form.html:157 templates/web/fixmystreet/report/new/fill_in_details_form.html:129 templates/web/fixmystreet/report/new/fill_in_details_form.html:197 templates/web/fixmystreet/report/update-form.html:144
+#: templates/web/default/report/new/fill_in_details_form.html:210 templates/web/default/report/update-form.html:157 templates/web/fixmystreet/report/new/fill_in_details_form.html:129 templates/web/fixmystreet/report/new/fill_in_details_form.html:197 templates/web/fixmystreet/report/update-form.html:144
msgid "Show my name publicly"
msgstr ""
@@ -2307,7 +2279,7 @@ msgstr ""
msgid "Show pins"
msgstr ""
-#: templates/web/default/auth/general.html:3 templates/web/default/auth/general.html:49 templates/web/fixmybarangay/header.html:70 templates/web/fixmystreet/auth/general.html:3 templates/web/fixmystreet/auth/general.html:42 templates/web/fixmystreet/auth/general.html:62 templates/web/fixmystreet/header.html:54 templates/web/oxfordshire/header.html:115 templates/web/seesomething/auth/general.html:3 templates/web/seesomething/auth/general.html:39 templates/web/stevenage/header.html:101 templates/web/zurich/auth/general.html:18 templates/web/zurich/auth/general.html:35
+#: templates/web/default/auth/general.html:3 templates/web/default/auth/general.html:49 templates/web/fixmybarangay/header.html:70 templates/web/fixmystreet/auth/general.html:3 templates/web/fixmystreet/auth/general.html:42 templates/web/fixmystreet/auth/general.html:62 templates/web/fixmystreet/header.html:57 templates/web/zurich/auth/general.html:18 templates/web/zurich/auth/general.html:35
msgid "Sign in"
msgstr ""
@@ -2315,19 +2287,19 @@ msgstr ""
msgid "Sign in by email"
msgstr ""
-#: templates/web/default/auth/general.html:1 templates/web/fixmystreet/auth/general.html:1 templates/web/seesomething/auth/general.html:1 templates/web/zurich/auth/general.html:1
+#: templates/web/default/auth/general.html:1 templates/web/fixmystreet/auth/general.html:1 templates/web/zurich/auth/general.html:1
msgid "Sign in or create an account"
msgstr ""
-#: templates/web/bromley/auth/sign_out.html:1 templates/web/default/auth/sign_out.html:1 templates/web/default/header.html:30 templates/web/emptyhomes/header.html:46 templates/web/fiksgatami/header.html:22 templates/web/fiksgatami/nn/header.html:22 templates/web/lichfielddc/header.html:177 templates/web/reading/header.html:33 templates/web/seesomething/auth/sign_out.html:1 templates/web/zurich/auth/sign_out.html:1
+#: templates/web/default/auth/sign_out.html:1 templates/web/default/header.html:30 templates/web/emptyhomes/header.html:46 templates/web/fiksgatami/header.html:22 templates/web/fiksgatami/nn/header.html:22 templates/web/zurich/auth/sign_out.html:1
msgid "Sign out"
msgstr ""
-#: templates/web/default/header.html:29 templates/web/emptyhomes/header.html:45 templates/web/fiksgatami/header.html:21 templates/web/fiksgatami/nn/header.html:21 templates/web/lichfielddc/header.html:177 templates/web/reading/header.html:32
+#: templates/web/default/header.html:29 templates/web/emptyhomes/header.html:45 templates/web/fiksgatami/header.html:21 templates/web/fiksgatami/nn/header.html:21
msgid "Signed in as %s"
msgstr ""
-#: templates/web/default/report/new/fill_in_details_text.html:1 templates/web/fixmybarangay/report/new/fill_in_details_text.html:1 templates/web/fixmystreet/report/new/fill_in_details_text.html:1
+#: templates/web/default/report/new/fill_in_details_text.html:2 templates/web/fixmybarangay/report/new/fill_in_details_text.html:2 templates/web/fixmystreet/report/new/fill_in_details_text.html:2
msgid "Some categories may require additional information."
msgstr ""
@@ -2353,11 +2325,11 @@ msgstr ""
msgid "Sorry, there has been an error confirming your problem."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:215 perllib/FixMyStreet/Geocode.pm:28 perllib/FixMyStreet/Geocode/Bing.pm:58 perllib/FixMyStreet/Geocode/Google.pm:74 perllib/FixMyStreet/Geocode/OSM.pm:66
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:215 perllib/FixMyStreet/Geocode.pm:28 perllib/FixMyStreet/Geocode/Bing.pm:58 perllib/FixMyStreet/Geocode/FixaMinGata.pm:75 perllib/FixMyStreet/Geocode/FixaMinGata.pm:95 perllib/FixMyStreet/Geocode/Google.pm:74 perllib/FixMyStreet/Geocode/OSM.pm:66
msgid "Sorry, we could not find that location."
msgstr ""
-#: perllib/FixMyStreet/Geocode/Bing.pm:53 perllib/FixMyStreet/Geocode/Google.pm:69 perllib/FixMyStreet/Geocode/Zurich.pm:87
+#: perllib/FixMyStreet/Geocode/Bing.pm:53 perllib/FixMyStreet/Geocode/Google.pm:69 perllib/FixMyStreet/Geocode/Zurich.pm:88
msgid "Sorry, we could not parse that location. Please try again."
msgstr ""
@@ -2369,7 +2341,7 @@ msgstr ""
msgid "Start Date:"
msgstr ""
-#: templates/web/bromley/report/display.html:78 templates/web/default/admin/flagged.html:18 templates/web/default/admin/list_updates.html:11 templates/web/default/admin/reports.html:15 templates/web/fixmystreet/report/update-form.html:26
+#: templates/web/default/admin/flagged.html:18 templates/web/default/admin/list_updates.html:11 templates/web/default/admin/reports.html:15 templates/web/fixmystreet/report/update-form.html:26
msgid "State"
msgstr ""
@@ -2377,7 +2349,7 @@ msgstr ""
msgid "State:"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1182 perllib/FixMyStreet/Cobrand/Zurich.pm:257 templates/web/default/admin/stats.html:1 templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1191 perllib/FixMyStreet/Cobrand/Zurich.pm:305 templates/web/default/admin/stats.html:1 templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72
msgid "Stats"
msgstr ""
@@ -2389,7 +2361,7 @@ msgstr ""
msgid "Still open, via questionnaire, %s"
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:370
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378
msgid "Subcategory: %s"
msgstr ""
@@ -2397,7 +2369,7 @@ msgstr ""
msgid "Subdivision/Body"
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:48 templates/web/fixmystreet/contact/index.html:91 templates/web/fixmystreet/report/new/fill_in_details_form.html:60
+#: templates/web/fixmystreet/contact/index.html:95 templates/web/fixmystreet/report/new/fill_in_details_form.html:60
msgid "Subject"
msgstr ""
@@ -2405,11 +2377,11 @@ msgstr ""
msgid "Subject:"
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:140 templates/web/bromley/report/new/fill_in_details_form.html:190 templates/web/bromley/report/new/fill_in_details_form.html:204 templates/web/default/questionnaire/creator_fixed.html:19 templates/web/default/report/new/fill_in_details_form.html:114 templates/web/default/report/new/fill_in_details_form.html:154 templates/web/default/report/new/fill_in_details_form.html:176 templates/web/emptyhomes/report/new/fill_in_details_form.html:144 templates/web/fixmystreet/report/new/fill_in_details_form.html:142 templates/web/fixmystreet/report/new/fill_in_details_form.html:167 templates/web/fixmystreet/report/new/fill_in_details_form.html:212 templates/web/seesomething/report/new/fill_in_details_form.html:93 templates/web/zurich/report/new/fill_in_details_form.html:114
+#: templates/web/default/questionnaire/creator_fixed.html:19 templates/web/default/report/new/fill_in_details_form.html:114 templates/web/default/report/new/fill_in_details_form.html:154 templates/web/default/report/new/fill_in_details_form.html:176 templates/web/emptyhomes/report/new/fill_in_details_form.html:144 templates/web/fixmystreet/report/new/fill_in_details_form.html:142 templates/web/fixmystreet/report/new/fill_in_details_form.html:167 templates/web/fixmystreet/report/new/fill_in_details_form.html:212 templates/web/zurich/report/new/fill_in_details_form.html:114
msgid "Submit"
msgstr ""
-#: templates/web/default/admin/report_edit.html:92 templates/web/default/admin/update_edit.html:60 templates/web/default/admin/user-form.html:55 templates/web/zurich/admin/report_edit-sdm.html:67 templates/web/zurich/admin/report_edit.html:224 templates/web/zurich/admin/update_edit.html:38
+#: templates/web/default/admin/report_edit.html:97 templates/web/default/admin/update_edit.html:65 templates/web/default/admin/user-form.html:55 templates/web/zurich/admin/report_edit-sdm.html:67 templates/web/zurich/admin/report_edit.html:224 templates/web/zurich/admin/update_edit.html:38
msgid "Submit changes"
msgstr ""
@@ -2417,11 +2389,11 @@ msgstr ""
msgid "Submit questionnaire"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:111 templates/web/zurich/admin/header.html:1 templates/web/zurich/admin/header.html:6 templates/web/zurich/admin/index-dm.html:23 templates/web/zurich/admin/index-dm.html:6 templates/web/zurich/admin/index-sdm.html:21 templates/web/zurich/admin/report_edit.html:89 templates/web/zurich/admin/report_edit.html:90 templates/web/zurich/admin/reports.html:13 templates/web/zurich/report/banner.html:9
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:133 templates/web/zurich/admin/header.html:2 templates/web/zurich/admin/header.html:6 templates/web/zurich/admin/index-dm.html:23 templates/web/zurich/admin/index-dm.html:6 templates/web/zurich/admin/index-sdm.html:21 templates/web/zurich/admin/report_edit.html:89 templates/web/zurich/admin/report_edit.html:90 templates/web/zurich/admin/reports.html:13 templates/web/zurich/report/banner.html:9
msgid "Submitted"
msgstr ""
-#: templates/web/bromley/report/display.html:44 templates/web/default/alert/updates.html:17 templates/web/default/report/display.html:42 templates/web/fixmystreet/alert/updates.html:23 templates/web/fixmystreet/report/display.html:68
+#: templates/web/default/alert/updates.html:17 templates/web/default/report/display.html:42 templates/web/fixmystreet/alert/updates.html:23 templates/web/fixmystreet/report/display.html:68
msgid "Subscribe"
msgstr ""
@@ -2433,7 +2405,7 @@ msgstr ""
msgid "Subscribe to an alert based upon what baranagay you&rsquo;re in:"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1175 perllib/FixMyStreet/Cobrand/Zurich.pm:241 templates/web/default/admin/index.html:1 templates/web/zurich/admin/index-dm.html:1 templates/web/zurich/admin/index-sdm.html:1 templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12 templates/web/zurich/header.html:57
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1184 perllib/FixMyStreet/Cobrand/Zurich.pm:289 templates/web/default/admin/index.html:1 templates/web/zurich/admin/index-dm.html:1 templates/web/zurich/admin/index-sdm.html:1 templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12 templates/web/zurich/header.html:57
msgid "Summary"
msgstr ""
@@ -2441,7 +2413,7 @@ msgstr ""
msgid "Summary reports"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1179
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1188
msgid "Survey"
msgstr ""
@@ -2461,15 +2433,15 @@ msgstr ""
msgid "Text:"
msgstr ""
-#: templates/web/default/tokens/confirm_update.html:7 templates/web/default/tokens/confirm_update.html:8
+#: templates/web/default/tokens/confirm_update.html:8
msgid "Thank you &mdash; you can <a href=\"%s\">view your updated problem</a> on the site."
msgstr ""
-#: templates/web/emptyhomes/tokens/confirm_problem.html:6 templates/web/emptyhomes/tokens/confirm_problem.html:8
+#: templates/web/emptyhomes/tokens/confirm_problem.html:7 templates/web/emptyhomes/tokens/confirm_problem.html:8
msgid "Thank you for reporting an empty property on ReportEmptyHomes.com. We have emailed the lead officer for empty homes in the council responsible with details, and asked them to do whatever they can to get the empty property back into use as soon as possible."
msgstr ""
-#: templates/web/emptyhomes/tokens/confirm_problem.html:30 templates/web/emptyhomes/tokens/confirm_problem.html:31
+#: templates/web/emptyhomes/tokens/confirm_problem.html:31
msgid ""
"Thank you for reporting this empty property on ReportEmptyHomes.com.\n"
"At present the report cannot be sent through to the council for this area. We\n"
@@ -2481,7 +2453,7 @@ msgstr ""
msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it."
msgstr ""
-#: templates/web/emptyhomes/tokens/confirm_problem.html:24 templates/web/emptyhomes/tokens/confirm_problem.html:26
+#: templates/web/emptyhomes/tokens/confirm_problem.html:25 templates/web/emptyhomes/tokens/confirm_problem.html:26
msgid "Thank you for using ReportEmptyHomes.com. Your action is already helping to resolve the UK&rsquo;s empty homes crisis."
msgstr ""
@@ -2501,15 +2473,15 @@ msgstr ""
msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Council.pm:90
+#: perllib/FixMyStreet/App/Controller/Council.pm:100
msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Location.pm:123
+#: perllib/FixMyStreet/App/Controller/Location.pm:124
msgid "That location does not appear to be in the UK; please try again."
msgstr ""
-#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:63 perllib/FixMyStreet/Cobrand/UK.pm:86
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:63 perllib/FixMyStreet/Cobrand/FixaMinGata.pm:79 perllib/FixMyStreet/Cobrand/UK.pm:86
msgid "That postcode was not recognised, sorry."
msgstr ""
@@ -2563,7 +2535,7 @@ msgstr ""
msgid "The confirmation email <strong>may</strong> take a few minutes to arrive &mdash; <em>please</em> be patient."
msgstr ""
-#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1 templates/web/fixmystreet/report/new/fill_in_details_text.html:3
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:2 templates/web/fixmystreet/report/new/fill_in_details_text.html:3
msgid "The council won&rsquo;t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc."
msgstr ""
@@ -2587,7 +2559,7 @@ msgstr ""
msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
msgstr ""
-#: perllib/FixMyStreet/Geocode/OSM.pm:165
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:187 perllib/FixMyStreet/Geocode/OSM.pm:165
msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
msgstr ""
@@ -2643,7 +2615,7 @@ msgstr ""
msgid "The passwords do not match"
msgstr ""
-#: templates/web/default/errors/page_error_404_not_found.html:10 templates/web/default/errors/page_error_404_not_found.html:12
+#: templates/web/default/errors/page_error_404_not_found.html:11 templates/web/default/errors/page_error_404_not_found.html:12
msgid "The requested URL '%s' was not found on this server"
msgstr ""
@@ -2651,11 +2623,11 @@ msgstr ""
msgid "The simplest alert is our geographic one:"
msgstr ""
-#: templates/web/barnet/report/new/councils_text_all.html:3 templates/web/default/report/new/councils_extra_text.html:1 templates/web/default/report/new/councils_text_some.html:10 templates/web/default/report/new/councils_text_some.html:11 templates/web/default/report/new/fill_in_details_form.html:17 templates/web/fixmystreet/report/new/fill_in_details_form.html:12
+#: templates/web/default/report/new/councils_extra_text.html:1 templates/web/default/report/new/councils_text_some.html:11 templates/web/default/report/new/fill_in_details_form.html:17 templates/web/fixmystreet/report/new/fill_in_details_form.html:12
msgid "The subject and details of the problem will be public, plus your name if you give us permission."
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:291
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:296
msgid "The user could not locate the problem on a map, but to see the area around the location they entered"
msgstr ""
@@ -2669,11 +2641,11 @@ msgstr ""
msgid "There was a problem showing the All Reports page. Please try again later."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Contact.pm:116 perllib/FixMyStreet/App/Controller/Dashboard.pm:59
+#: perllib/FixMyStreet/App/Controller/Contact.pm:121 perllib/FixMyStreet/App/Controller/Dashboard.pm:59
msgid "There was a problem showing this page. Please try again later."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 perllib/FixMyStreet/App/Controller/Report/Update.pm:134 templates/web/default/auth/general.html:23 templates/web/fixmystreet/auth/general.html:24 templates/web/seesomething/auth/general.html:24 templates/web/zurich/auth/general.html:28
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:755 perllib/FixMyStreet/App/Controller/Report/Update.pm:134 templates/web/default/auth/general.html:23 templates/web/fixmystreet/auth/general.html:24 templates/web/zurich/auth/general.html:28
msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the &lsquo;sign in by email&rsquo; section of the form."
msgstr ""
@@ -2685,7 +2657,7 @@ msgstr ""
msgid "There was a problem with your update. Please try again."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Contact.pm:120
+#: perllib/FixMyStreet/App/Controller/Contact.pm:125
msgid "There were problems with your report. Please see below."
msgstr ""
@@ -2723,15 +2695,15 @@ msgid ""
" A body will not receive any reports unless it covers at least one area."
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:375
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:385
msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system."
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:388
msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:894 perllib/FixMyStreet/App/Controller/Report/New.pm:964 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:131 perllib/FixMyStreet/Cobrand/UK.pm:58
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 perllib/FixMyStreet/App/Controller/Report/New.pm:968 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:131 perllib/FixMyStreet/Cobrand/UK.pm:58
msgid "This information is required"
msgstr ""
@@ -2759,11 +2731,11 @@ msgstr ""
msgid "This problem has been closed"
msgstr ""
-#: templates/web/bromley/report/display.html:98 templates/web/default/report/banner.html:12 templates/web/default/report/update-form.html:48 templates/web/emptyhomes/report/banner.html:3 templates/web/fixmystreet/report/update-form.html:46
+#: templates/web/default/report/banner.html:12 templates/web/default/report/update-form.html:48 templates/web/emptyhomes/report/banner.html:3 templates/web/fixmystreet/report/update-form.html:46
msgid "This problem has been fixed"
msgstr ""
-#: templates/web/bromley/report/display.html:92 templates/web/default/report/update-form.html:43 templates/web/fixmystreet/report/update-form.html:40
+#: templates/web/default/report/update-form.html:43 templates/web/fixmystreet/report/update-form.html:40
msgid "This problem has not been fixed"
msgstr ""
@@ -2775,31 +2747,31 @@ msgstr ""
msgid "This problem is old and of unknown status."
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:108 perllib/FixMyStreet/Cobrand/Zurich.pm:109 templates/web/zurich/report/_main.html:14
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:130 perllib/FixMyStreet/Cobrand/Zurich.pm:131 templates/web/zurich/report/_main.html:14
msgid "This report is awaiting moderation."
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88
msgid "This report is currently marked as closed."
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86
msgid "This report is currently marked as fixed."
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:90
msgid "This report is currently marked as open."
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:320
msgid "This report was submitted anonymously"
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:284
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:289
msgid "This web page also contains a photo of the problem, provided by the user."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1178 templates/web/default/admin/timeline.html:1
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1187 templates/web/default/admin/timeline.html:1
msgid "Timeline"
msgstr ""
@@ -2815,7 +2787,7 @@ msgstr ""
msgid "To find out what local alerts we have for you, please enter your postcode or street name and area"
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:290
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:295
msgid "To view a map of the precise location of this issue"
msgstr ""
@@ -2823,15 +2795,11 @@ msgstr ""
msgid "Total"
msgstr ""
-#: templates/web/seesomething/report/new/fill_in_details_form.html:24
-msgid "Transport Category"
-msgstr ""
-
-#: templates/web/default/js/translation_strings.html:29 templates/web/oxfordshire/js/translation_strings.html:23
+#: templates/web/default/js/translation_strings.html:29
msgid "Try again"
msgstr ""
-#: templates/web/bromley/report/display.html:80 templates/web/bromley/report/display.html:83 templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:46 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:33 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:31
+#: templates/web/default/admin/report_edit.html:35 templates/web/default/admin/report_edit.html:46 templates/web/default/report/update-form.html:30 templates/web/default/report/update-form.html:33 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:31
msgid "Unable to fix"
msgstr ""
@@ -2847,7 +2815,7 @@ msgstr ""
msgid "Unknown alert type"
msgstr ""
-#: templates/web/default/js/translation_strings.html:39 templates/web/oxfordshire/js/translation_strings.html:33
+#: templates/web/default/js/translation_strings.html:39
msgid "Unknown error"
msgstr ""
@@ -2855,7 +2823,7 @@ msgstr ""
msgid "Unknown problem ID"
msgstr ""
-#: templates/web/bromley/report/display.html:66 templates/web/fixmystreet/report/update-form.html:19
+#: templates/web/fixmystreet/report/update-form.html:19
msgid "Update"
msgstr ""
@@ -2863,11 +2831,11 @@ msgstr ""
msgid "Update %s created for problem %d; by %s"
msgstr ""
-#: templates/web/default/contact/index.html:21 templates/web/fixmystreet/contact/index.html:34
+#: templates/web/default/contact/index.html:21 templates/web/fixmystreet/contact/index.html:38
msgid "Update below added anonymously at %s"
msgstr ""
-#: templates/web/default/contact/index.html:23 templates/web/fixmystreet/contact/index.html:36
+#: templates/web/default/contact/index.html:23 templates/web/fixmystreet/contact/index.html:40
msgid "Update below added by %s at %s"
msgstr ""
@@ -2907,7 +2875,7 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1042 perllib/FixMyStreet/App/Controller/Admin.pm:796 perllib/FixMyStreet/App/Controller/Admin.pm:940 perllib/FixMyStreet/App/Controller/Admin.pm:998 perllib/FixMyStreet/Cobrand/Zurich.pm:487 perllib/FixMyStreet/Cobrand/Zurich.pm:556
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1007 perllib/FixMyStreet/App/Controller/Admin.pm:1051 perllib/FixMyStreet/App/Controller/Admin.pm:801 perllib/FixMyStreet/App/Controller/Admin.pm:949 perllib/FixMyStreet/Cobrand/Zurich.pm:550 perllib/FixMyStreet/Cobrand/Zurich.pm:619
msgid "Updated!"
msgstr ""
@@ -2915,15 +2883,15 @@ msgstr ""
msgid "Updates"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Comment.pm:131
-msgid "Updates are limited to 2000 characters in length. Please shorten your update"
+#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+msgid "Updates are limited to %s characters in length. Please shorten your update"
msgstr ""
#: db/alert_types.pl:5 db/alert_types.pl:6
msgid "Updates on {{title}}"
msgstr ""
-#: templates/web/bromley/report/display.html:0 templates/web/bromley/report/display.html:8 templates/web/default/report/display.html:0 templates/web/default/report/display.html:5 templates/web/fixmystreet/report/display.html:0 templates/web/fixmystreet/report/display.html:8
+#: templates/web/default/report/display.html:0 templates/web/default/report/display.html:5 templates/web/fixmystreet/report/display.html:0 templates/web/fixmystreet/report/display.html:8
msgid "Updates to this problem, FixMyStreet"
msgstr ""
@@ -2935,11 +2903,11 @@ msgstr ""
msgid "User"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1342
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1351
msgid "User flag removed"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1314
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1323
msgid "User flagged"
msgstr ""
@@ -2947,7 +2915,7 @@ msgstr ""
msgid "User search finds matches in users' names and email addresses."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1180 perllib/FixMyStreet/Cobrand/Zurich.pm:256 templates/web/default/admin/flagged.html:29 templates/web/zurich/header.html:69
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1189 perllib/FixMyStreet/Cobrand/Zurich.pm:304 templates/web/default/admin/flagged.html:29 templates/web/zurich/header.html:69
msgid "Users"
msgstr ""
@@ -2967,11 +2935,11 @@ msgstr ""
msgid "View your report"
msgstr ""
-#: templates/web/default/around/display_location.html:0 templates/web/default/around/display_location.html:34 templates/web/seesomething/around/display_location.html:0 templates/web/seesomething/around/display_location.html:16
+#: templates/web/default/around/display_location.html:0 templates/web/default/around/display_location.html:34
msgid "Viewing a location"
msgstr ""
-#: templates/web/bromley/report/display.html:0 templates/web/default/report/display.html:0 templates/web/fixmystreet/report/display.html:0
+#: templates/web/default/report/display.html:0 templates/web/fixmystreet/report/display.html:0
msgid "Viewing a problem"
msgstr ""
@@ -2979,7 +2947,7 @@ msgstr ""
msgid "Wards of this council"
msgstr ""
-#: templates/web/default/alert/choose.html:6 templates/web/default/around/around_index.html:13 templates/web/fixmystreet/around/around_index.html:16 templates/web/seesomething/around/around_index.html:13
+#: templates/web/default/alert/choose.html:6 templates/web/default/around/around_index.html:13 templates/web/fixmystreet/around/around_index.html:16
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 ""
@@ -2991,19 +2959,19 @@ msgstr ""
msgid "We have sent you an email containing a link to confirm your account."
msgstr ""
-#: templates/web/emptyhomes/tokens/confirm_problem.html:18 templates/web/emptyhomes/tokens/confirm_problem.html:20
+#: templates/web/emptyhomes/tokens/confirm_problem.html:19 templates/web/emptyhomes/tokens/confirm_problem.html:20
msgid "We may contact you periodically to ask if anything has changed with the property you reported."
msgstr ""
-#: templates/web/bromley/report/display.html:143 templates/web/fixmystreet/report/update-form.html:115
+#: templates/web/fixmystreet/report/update-form.html:115
msgid "We never show your email"
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:133 templates/web/bromley/report/new/fill_in_details_form.html:179 templates/web/fixmystreet/report/new/fill_in_details_form.html:134 templates/web/fixmystreet/report/new/fill_in_details_form.html:201 templates/web/zurich/report/new/fill_in_details_form.html:96
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:134 templates/web/fixmystreet/report/new/fill_in_details_form.html:201 templates/web/zurich/report/new/fill_in_details_form.html:96
msgid "We never show your email address or phone number."
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:384
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:394
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 ""
@@ -3011,11 +2979,11 @@ msgstr ""
msgid "We send it to the council on your behalf"
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:217 templates/web/default/report/new/notes.html:5 templates/web/fixmybarangay/report/new/notes.html:5
+#: templates/web/default/report/new/notes.html:5 templates/web/fixmybarangay/report/new/notes.html:5
msgid "We will only use your personal information in accordance with our <a href=\"/faq#privacy\">privacy policy.</a>"
msgstr ""
-#: templates/web/fixmystreet/report/new/notes.html:4 templates/web/oxfordshire/report/new/notes.html:4
+#: templates/web/fixmystreet/report/new/notes.html:4
msgid "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>"
msgstr ""
@@ -3043,11 +3011,11 @@ msgstr ""
msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>."
msgstr ""
-#: templates/web/fixmystreet/footer.html:21 templates/web/stevenage/footer.html:22
+#: templates/web/fixmystreet/footer.html:24
msgid "Would you like better integration with FixMyStreet? <a href=\"http://www.mysociety.org/for-councils/fixmystreet/\">Find out about FixMyStreet for councils</a>."
msgstr ""
-#: templates/web/fixmystreet/footer.html:17 templates/web/stevenage/footer.html:18
+#: templates/web/fixmystreet/footer.html:20
msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>."
msgstr ""
@@ -3055,7 +3023,7 @@ msgstr ""
msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
msgstr ""
-#: templates/web/default/report/new/notes.html:8 templates/web/fixmybarangay/report/new/notes.html:8 templates/web/fixmystreet/report/new/notes.html:8 templates/web/oxfordshire/report/new/notes.html:7
+#: templates/web/default/report/new/notes.html:8 templates/web/fixmybarangay/report/new/notes.html:8 templates/web/fixmystreet/report/new/notes.html:8
msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
msgstr ""
@@ -3067,19 +3035,19 @@ msgstr ""
msgid "Yes"
msgstr ""
-#: templates/web/bromley/report/display.html:157 templates/web/bromley/report/new/fill_in_details_form.html:198 templates/web/fixmystreet/report/new/fill_in_details_form.html:161 templates/web/fixmystreet/report/update-form.html:89
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:161 templates/web/fixmystreet/report/update-form.html:89
msgid "Yes I have a password"
msgstr ""
-#: templates/web/default/contact/index.html:37 templates/web/fixmystreet/contact/index.html:50
+#: templates/web/default/contact/index.html:37 templates/web/fixmystreet/contact/index.html:54
msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:"
msgstr ""
-#: templates/web/default/contact/index.html:15 templates/web/fixmystreet/contact/index.html:28
+#: templates/web/default/contact/index.html:15 templates/web/fixmystreet/contact/index.html:32
msgid "You are reporting the following update for being abusive, containing personal information, or similar:"
msgstr ""
-#: templates/web/default/tokens/confirm_problem.html:19 templates/web/default/tokens/confirm_problem.html:21 templates/web/zurich/tokens/confirm_problem.html:5 templates/web/zurich/tokens/confirm_problem.html:8
+#: templates/web/default/tokens/confirm_problem.html:20 templates/web/default/tokens/confirm_problem.html:21 templates/web/zurich/tokens/confirm_problem.html:6 templates/web/zurich/tokens/confirm_problem.html:8
msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
msgstr ""
@@ -3087,6 +3055,10 @@ msgstr ""
msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
msgstr ""
+#: templates/web/fixmystreet/contact/index.html:118
+msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
+msgstr ""
+
#: templates/web/default/admin/flagged.html:5
msgid ""
"You can flag any report or user by editing them, and they will be listed on this page.\n"
@@ -3094,7 +3066,7 @@ msgid ""
" reports in the past."
msgstr ""
-#: templates/web/default/report/new/councils_text_none.html:11 templates/web/default/report/new/councils_text_none.html:13 templates/web/default/report/new/councils_text_some.html:20 templates/web/default/report/new/councils_text_some.html:22
+#: templates/web/default/report/new/councils_text_none.html:19 templates/web/default/report/new/councils_text_none.html:20 templates/web/default/report/new/councils_text_some.html:21 templates/web/default/report/new/councils_text_some.html:22
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 ""
@@ -3102,7 +3074,7 @@ msgstr ""
msgid "You can mark a body as deleted if you do not want it to be active on the site."
msgstr ""
-#: templates/web/default/js/translation_strings.html:36 templates/web/oxfordshire/js/translation_strings.html:30
+#: templates/web/default/js/translation_strings.html:36
msgid "You declined; please fill in the box above"
msgstr ""
@@ -3110,19 +3082,19 @@ msgstr ""
msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:97 templates/web/default/questionnaire/index.html:96 templates/web/default/report/new/fill_in_details_form.html:93 templates/web/emptyhomes/report/new/fill_in_details_form.html:90 templates/web/fixmystreet/questionnaire/index.html:87 templates/web/fixmystreet/report/new/fill_in_details_form.html:99 templates/web/seesomething/report/new/fill_in_details_form.html:59 templates/web/zurich/report/new/fill_in_details_form.html:75
+#: templates/web/default/questionnaire/index.html:96 templates/web/default/report/new/fill_in_details_form.html:93 templates/web/emptyhomes/report/new/fill_in_details_form.html:90 templates/web/fixmystreet/questionnaire/index.html:87 templates/web/fixmystreet/report/new/fill_in_details_form.html:99 templates/web/zurich/report/new/fill_in_details_form.html:75
msgid "You have already attached a photo to this report, attaching another one will replace it."
msgstr ""
-#: templates/web/bromley/report/display.html:108 templates/web/default/report/update-form.html:59 templates/web/fixmystreet/report/update-form.html:56
+#: templates/web/default/report/update-form.html:59 templates/web/fixmystreet/report/update-form.html:56
msgid "You have already attached a photo to this update, attaching another one will replace it."
msgstr ""
-#: templates/web/default/auth/sign_out.html:3 templates/web/seesomething/auth/sign_out.html:3 templates/web/zurich/auth/sign_out.html:3
+#: templates/web/default/auth/sign_out.html:3 templates/web/zurich/auth/sign_out.html:3
msgid "You have been signed out"
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:25 templates/web/default/report/new/fill_in_details_form.html:7 templates/web/emptyhomes/report/new/fill_in_details_form.html:7 templates/web/fixmystreet/report/new/fill_in_details_form.html:28 templates/web/zurich/report/new/fill_in_details_form.html:13
+#: templates/web/default/report/new/fill_in_details_form.html:7 templates/web/emptyhomes/report/new/fill_in_details_form.html:7 templates/web/fixmystreet/report/new/fill_in_details_form.html:28 templates/web/zurich/report/new/fill_in_details_form.html:13
msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. "
msgstr ""
@@ -3130,15 +3102,15 @@ msgstr ""
msgid "You have successfully confirmed your alert."
msgstr ""
-#: templates/web/zurich/tokens/confirm_problem.html:5 templates/web/zurich/tokens/confirm_problem.html:6
+#: templates/web/zurich/tokens/confirm_problem.html:6
msgid "You have successfully confirmed your email address."
msgstr ""
-#: templates/web/default/tokens/confirm_problem.html:14 templates/web/default/tokens/confirm_problem.html:15
+#: templates/web/default/tokens/confirm_problem.html:15
msgid "You have successfully confirmed your problem"
msgstr ""
-#: templates/web/default/tokens/confirm_update.html:11 templates/web/default/tokens/confirm_update.html:12
+#: templates/web/default/tokens/confirm_update.html:12
msgid "You have successfully confirmed your update and you can now <a href=\"%s\">view it on the site</a>."
msgstr ""
@@ -3150,10 +3122,14 @@ msgstr ""
msgid "You have successfully deleted your alert."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:754 perllib/FixMyStreet/App/Controller/Report/Update.pm:140
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:762 perllib/FixMyStreet/App/Controller/Report/Update.pm:140
msgid "You have successfully signed in; please check and confirm your details are accurate:"
msgstr ""
+#: templates/web/default/my/my.html:17 templates/web/fixmystreet/my/my.html:17
+msgid "You haven&rsquo;t created any reports yet. <a href=\"%s\">Report a problem now.</a>"
+msgstr ""
+
#: templates/web/default/email_sent.html:13
msgid "You must now click the link in the email we've just sent you."
msgstr ""
@@ -3177,15 +3153,11 @@ msgstr ""
msgid "Your Reports"
msgstr ""
-#: templates/web/bromley/report/display.html:41 templates/web/bromley/report/display.html:43 templates/web/bromley/report/new/fill_in_details_form.html:145 templates/web/fixmystreet/alert/_list.html:89 templates/web/fixmystreet/alert/updates.html:19 templates/web/fixmystreet/alert/updates.html:22 templates/web/fixmystreet/contact/index.html:84 templates/web/fixmystreet/report/display.html:65 templates/web/fixmystreet/report/display.html:67 templates/web/fixmystreet/report/new/fill_in_details_form.html:115 templates/web/fixmystreet/report/new/fill_in_details_form.html:147 templates/web/zurich/report/new/fill_in_details_form.html:88
+#: templates/web/fixmystreet/alert/_list.html:89 templates/web/fixmystreet/alert/updates.html:19 templates/web/fixmystreet/alert/updates.html:22 templates/web/fixmystreet/contact/index.html:88 templates/web/fixmystreet/report/display.html:65 templates/web/fixmystreet/report/display.html:67 templates/web/fixmystreet/report/new/fill_in_details_form.html:115 templates/web/fixmystreet/report/new/fill_in_details_form.html:147 templates/web/zurich/report/new/fill_in_details_form.html:88
msgid "Your email"
msgstr ""
-#: templates/web/seesomething/report/new/fill_in_details_form.html:81
-msgid "Your email (optional)"
-msgstr ""
-
-#: templates/web/bromley/report/display.html:132 templates/web/fixmystreet/auth/general.html:26 templates/web/fixmystreet/report/update-form.html:80 templates/web/seesomething/auth/general.html:26 templates/web/zurich/auth/general.html:30 templates/web/zurich/auth/general.html:58
+#: templates/web/fixmystreet/auth/general.html:26 templates/web/fixmystreet/report/update-form.html:80 templates/web/zurich/auth/general.html:30 templates/web/zurich/auth/general.html:58
msgid "Your email address"
msgstr ""
@@ -3197,19 +3169,11 @@ msgstr ""
msgid "Your email:"
msgstr ""
-#: templates/web/bromley/report/display.html:195 templates/web/bromley/report/new/fill_in_details_form.html:117 templates/web/bromley/report/new/fill_in_details_form.html:164
-msgid "Your first name"
-msgstr ""
-
-#: templates/web/fixmystreet/report/updates-sidebar-notes.html:5
+#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7
msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>"
msgstr ""
-#: templates/web/bromley/report/display.html:201 templates/web/bromley/report/new/fill_in_details_form.html:123 templates/web/bromley/report/new/fill_in_details_form.html:170
-msgid "Your last name"
-msgstr ""
-
-#: templates/web/fixmystreet/auth/general.html:57 templates/web/fixmystreet/contact/index.html:77 templates/web/fixmystreet/report/new/fill_in_details_form.html:124 templates/web/fixmystreet/report/new/fill_in_details_form.html:192 templates/web/fixmystreet/report/update-form.html:140 templates/web/seesomething/report/new/fill_in_details_form.html:79 templates/web/zurich/auth/general.html:61 templates/web/zurich/report/new/fill_in_details_form.html:104
+#: templates/web/fixmystreet/auth/general.html:57 templates/web/fixmystreet/contact/index.html:81 templates/web/fixmystreet/report/new/fill_in_details_form.html:124 templates/web/fixmystreet/report/new/fill_in_details_form.html:192 templates/web/fixmystreet/report/update-form.html:140 templates/web/zurich/auth/general.html:61 templates/web/zurich/report/new/fill_in_details_form.html:104
msgid "Your name"
msgstr ""
@@ -3217,7 +3181,7 @@ msgstr ""
msgid "Your name:"
msgstr ""
-#: templates/web/bromley/report/display.html:162 templates/web/bromley/report/new/fill_in_details_form.html:203 templates/web/fixmystreet/auth/general.html:41 templates/web/fixmystreet/report/new/fill_in_details_form.html:166 templates/web/fixmystreet/report/update-form.html:94 templates/web/seesomething/auth/general.html:30 templates/web/zurich/auth/general.html:34
+#: templates/web/fixmystreet/auth/general.html:41 templates/web/fixmystreet/report/new/fill_in_details_form.html:166 templates/web/fixmystreet/report/update-form.html:94 templates/web/zurich/auth/general.html:34
msgid "Your password"
msgstr ""
@@ -3225,7 +3189,7 @@ msgstr ""
msgid "Your password has been changed"
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:137 templates/web/bromley/report/new/fill_in_details_form.html:184 templates/web/fixmystreet/report/new/fill_in_details_form.html:139 templates/web/fixmystreet/report/new/fill_in_details_form.html:206 templates/web/seesomething/report/new/fill_in_details_form.html:90 templates/web/zurich/report/new/fill_in_details_form.html:110
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:139 templates/web/fixmystreet/report/new/fill_in_details_form.html:206 templates/web/zurich/report/new/fill_in_details_form.html:110
msgid "Your phone number"
msgstr ""
@@ -3237,11 +3201,11 @@ msgstr ""
msgid "Your report has been created and will shortly be sent."
msgstr ""
-#: templates/web/barnet/footer.html:18 templates/web/bromley/footer.html:19 templates/web/bromley/header.html:75 templates/web/default/footer.html:9 templates/web/fiksgatami/footer.html:6 templates/web/fiksgatami/nn/footer.html:6 templates/web/fixmindelo/footer.html:39 templates/web/fixmystreet/footer.html:46 templates/web/oxfordshire/footer.html:21 templates/web/oxfordshire/header.html:63 templates/web/reading/footer.html:7 templates/web/stevenage/footer.html:41
+#: templates/web/default/footer.html:9 templates/web/fiksgatami/footer.html:6 templates/web/fiksgatami/nn/footer.html:6 templates/web/fixmystreet/footer.html:49
msgid "Your reports"
msgstr ""
-#: templates/web/default/my/my.html:45 templates/web/fixmystreet/my/my.html:49
+#: templates/web/default/my/my.html:50 templates/web/fixmystreet/my/my.html:56
msgid "Your updates"
msgstr ""
@@ -3257,7 +3221,7 @@ msgstr ""
msgid "council"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
msgid "council ref:&nbsp;%s"
msgstr ""
@@ -3265,7 +3229,7 @@ msgstr ""
msgid "didn't use map"
msgstr ""
-#: templates/web/default/alert/index.html:33 templates/web/fixmystreet/around/postcode_form.html:20 templates/web/seesomething/around/postcode_form.html:9
+#: templates/web/default/alert/index.html:33 templates/web/fixmystreet/around/postcode_form.html:20
msgid "e.g. ‘%s’ or ‘%s’"
msgstr ""
@@ -3277,11 +3241,11 @@ msgstr ""
msgid "from %d different users"
msgstr ""
-#: templates/web/bromley/report/_item.html:12 templates/web/fixmystreet/report/_item.html:12 templates/web/zurich/report/_item.html:16
+#: templates/web/fixmystreet/report/_item.html:17 templates/web/zurich/report/_item.html:16
msgid "last updated %s"
msgstr ""
-#: perllib/Utils.pm:263
+#: perllib/Utils.pm:265
msgid "less than a minute"
msgstr ""
@@ -3333,11 +3297,11 @@ msgstr ""
msgid "or"
msgstr ""
-#: templates/web/default/js/translation_strings.html:27 templates/web/oxfordshire/js/translation_strings.html:21
+#: templates/web/default/js/translation_strings.html:27
msgid "or locate me automatically"
msgstr ""
-#: templates/web/default/admin/report_edit.html:24 templates/web/default/admin/report_edit.html:26 templates/web/zurich/admin/report_edit-sdm.html:30 templates/web/zurich/admin/report_edit-sdm.html:32 templates/web/zurich/admin/report_edit-sdm.html:39 templates/web/zurich/admin/report_edit-sdm.html:41 templates/web/zurich/admin/report_edit.html:30 templates/web/zurich/admin/report_edit.html:32 templates/web/zurich/admin/report_edit.html:41 templates/web/zurich/admin/report_edit.html:43 templates/web/zurich/admin/report_edit.html:53 templates/web/zurich/admin/report_edit.html:55
+#: templates/web/default/admin/report_edit.html:25 templates/web/default/admin/report_edit.html:26 templates/web/zurich/admin/report_edit-sdm.html:31 templates/web/zurich/admin/report_edit-sdm.html:32 templates/web/zurich/admin/report_edit-sdm.html:40 templates/web/zurich/admin/report_edit-sdm.html:41 templates/web/zurich/admin/report_edit.html:31 templates/web/zurich/admin/report_edit.html:32 templates/web/zurich/admin/report_edit.html:42 templates/web/zurich/admin/report_edit.html:43 templates/web/zurich/admin/report_edit.html:54 templates/web/zurich/admin/report_edit.html:55
msgid "originally entered: &ldquo;%s&rdquo;"
msgstr ""
@@ -3349,11 +3313,11 @@ msgstr ""
msgid "reopened"
msgstr ""
-#: templates/web/barnet/header.html:71 templates/web/bromley/header.html:100 templates/web/bromley/header.html:65 templates/web/fixmybarangay/header.html:67 templates/web/fixmystreet/header.html:51 templates/web/oxfordshire/header.html:112 templates/web/oxfordshire/header.html:48 templates/web/stevenage/header.html:98 templates/web/zurich/footer.html:12
+#: templates/web/fixmybarangay/header.html:67 templates/web/fixmystreet/header.html:54 templates/web/zurich/footer.html:12
msgid "sign out"
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:4 templates/web/bromley/report/new/fill_in_details_form.html:7 templates/web/default/report/new/fill_in_details_form.html:11 templates/web/default/report/new/fill_in_details_form.html:14 templates/web/emptyhomes/report/new/fill_in_details_form.html:11 templates/web/emptyhomes/report/new/fill_in_details_form.html:14 templates/web/fixmystreet/report/new/fill_in_details_form.html:6 templates/web/fixmystreet/report/new/fill_in_details_form.html:9
+#: templates/web/default/report/new/fill_in_details_form.html:12 templates/web/default/report/new/fill_in_details_form.html:14 templates/web/emptyhomes/report/new/fill_in_details_form.html:12 templates/web/emptyhomes/report/new/fill_in_details_form.html:14 templates/web/fixmystreet/report/new/fill_in_details_form.html:7 templates/web/fixmystreet/report/new/fill_in_details_form.html:9
msgid "the local council"
msgstr ""
@@ -3361,11 +3325,11 @@ msgstr ""
msgid "there is no pin shown as the user did not use the map"
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:362
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:370
msgid "this type of local problem"
msgstr ""
-#: perllib/Utils.pm:235
+#: perllib/Utils.pm:237
msgid "today"
msgstr ""
@@ -3392,7 +3356,7 @@ msgid_plural "<big>%s</big> reports recently"
msgstr[0] ""
msgstr[1] ""
-#: perllib/Utils.pm:282
+#: perllib/Utils.pm:284
#, perl-format
msgid "%d hour"
msgid_plural "%d hours"
@@ -3406,7 +3370,7 @@ msgid_plural "%d supporters"
msgstr[0] ""
msgstr[1] ""
-#: perllib/Utils.pm:284
+#: perllib/Utils.pm:286
#, perl-format
msgid "%d minute"
msgid_plural "%d minutes"
@@ -3427,7 +3391,7 @@ msgid_plural "We do not yet have details for the councils that cover this locati
msgstr[0] ""
msgstr[1] ""
-#: perllib/Utils.pm:278
+#: perllib/Utils.pm:280
#, perl-format
msgid "%d week"
msgid_plural "%d weeks"
@@ -3448,16 +3412,16 @@ msgid_plural "<big>%s</big> fixed in past month"
msgstr[0] ""
msgstr[1] ""
-#: templates/web/default/report/new/councils_text_some.html:14
+#: perllib/Utils.pm:282
#, perl-format
-msgid "We do <strong>not</strong> yet have details for the other council that covers this location."
-msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location."
+msgid "%d day"
+msgid_plural "%d days"
msgstr[0] ""
msgstr[1] ""
-#: perllib/Utils.pm:280
+#: templates/web/default/report/new/councils_text_some.html:14
#, perl-format
-msgid "%d day"
-msgid_plural "%d days"
+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] ""
diff --git a/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po b/locale/cy_GB.UTF-8/LC_MESSAGES/EmptyHomes.po
index 36b2f3546..491acbee9 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: 2013-11-12 13:15+0000\n"
+"POT-Creation-Date: 2014-05-16 17:30+0100\n"
"PO-Revision-Date: 2013-05-03 09:41-0000\n"
"Last-Translator: Mark Smith <Mark.Smith@trosol.co.uk>\n"
"Language-Team: mySociety\n"
@@ -21,25 +21,25 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Poedit 1.5.5\n"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:373
+#: perllib/FixMyStreet/DB/Result/Problem.pm:604
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383
msgid " and "
msgstr " and "
-#: templates/web/default/tokens/confirm_problem.html:14
+#: templates/web/default/tokens/confirm_problem.html:15
#: templates/web/default/tokens/confirm_problem.html:17
msgid " and <strong>we will now send it to the council</strong>"
msgstr " a <strong>byddwn nawr yn ei anfon at y cyngor</strong>"
-#: templates/web/default/report/new/councils_text_all.html:11
-#: templates/web/default/report/new/councils_text_all.html:18
-#: templates/web/default/report/new/councils_text_all.html:4
-#: templates/web/default/report/new/councils_text_none.html:11
-#: templates/web/default/report/new/councils_text_none.html:14
-#: templates/web/default/report/new/councils_text_some.html:20
+#: templates/web/default/report/new/councils_text_all.html:12
+#: templates/web/default/report/new/councils_text_all.html:19
+#: templates/web/default/report/new/councils_text_all.html:5
+#: templates/web/default/report/new/councils_text_none.html:19
+#: templates/web/default/report/new/councils_text_none.html:21
+#: templates/web/default/report/new/councils_text_some.html:21
#: templates/web/default/report/new/councils_text_some.html:23
#: templates/web/default/report/new/councils_text_some.html:5
-#: templates/web/emptyhomes/report/new/councils_text_all.html:2
+#: templates/web/emptyhomes/report/new/councils_text_all.html:3
msgid " or "
msgstr "neu"
@@ -77,19 +77,19 @@ msgstr "%d to %d of %d"
msgid "%s - Summary reports"
msgstr "%s - Adroddiadau cryno"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:653
msgid "%s ref:&nbsp;%s"
msgstr "%s ref:&nbsp;%s"
-#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
msgid "%s ward, %s"
msgstr "%s ward, %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:538
+#: perllib/FixMyStreet/DB/Result/Problem.pm:540
msgid "%s, reported at %s"
msgstr "%s, reported at %s"
-#: perllib/FixMyStreet/Cobrand/UK.pm:303 perllib/FixMyStreet/Cobrand/UK.pm:315
+#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:309
msgid "%s, within %s ward"
msgstr "%s, within %s ward"
@@ -120,30 +120,27 @@ msgstr "(pellter rhagosodedig sy'n cynnwys tua 200,000 o bobl)"
msgid "(alternatively the RSS feed can be customised, within"
msgstr "(fel arall, gellir addasu'r porthiant RSS yn bersonol, o fewn"
-#: templates/web/bromley/report/_item.html:22
#: templates/web/default/around/around_map_list_items.html:12
#: templates/web/default/around/on_map_list_items.html:9
-#: templates/web/fixmystreet/report/_item.html:22
+#: templates/web/fixmystreet/report/_item.html:27
#: templates/web/zurich/report/_item.html:21
msgid "(closed)"
msgstr "(closed)"
-#: templates/web/bromley/report/_item.html:20
#: templates/web/default/around/around_map_list_items.html:10
#: templates/web/default/around/on_map_list_items.html:7
-#: templates/web/fixmystreet/report/_item.html:20
+#: templates/web/fixmystreet/report/_item.html:25
#: templates/web/zurich/report/_item.html:19
msgid "(returned to use)"
msgstr "(wedi'i adfer i'w ddefnyddio)"
-#: templates/web/default/index.html:12 templates/web/default/index.html:8
+#: templates/web/default/index.html:12 templates/web/default/index.html:9
#: templates/web/fixmystreet/around/intro.html:2
msgid " "
msgstr " "
-#: templates/web/bromley/report/_item.html:16
#: templates/web/default/reports/_list-entry.html:4
-#: templates/web/fixmystreet/report/_item.html:16
+#: templates/web/fixmystreet/report/_item.html:21
msgid "(not sent to council)"
msgstr "(not sent to council)"
@@ -153,9 +150,8 @@ msgstr "(not sent to council)"
msgid "(optional)"
msgstr "(dewisol)"
-#: templates/web/bromley/report/_item.html:15
#: templates/web/default/reports/_list-entry.html:2
-#: templates/web/fixmystreet/report/_item.html:15
+#: templates/web/fixmystreet/report/_item.html:20
msgid "(sent to both)"
msgstr "(sent to both)"
@@ -167,8 +163,8 @@ msgstr "(nid ydym byth yn dangos eich cyfeiriad e-bost na'ch rhif ffôn)"
msgid "(we never show your email)"
msgstr "(we never show your email)"
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:637
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:664
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:635
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:662
#: perllib/FixMyStreet/DB/Result/Problem.pm:379
msgid "-- Pick a category --"
msgstr "-- Pick a category --"
@@ -210,7 +206,7 @@ msgstr ""
"<a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n"
"</p>"
-#: templates/web/fixmystreet/questionnaire/completed-open.html:6
+#: templates/web/fixmystreet/questionnaire/completed-open.html:25
msgid ""
"<p style=\"font-size:150%\">We&rsquo;re sorry to hear that. We have two\n"
"suggestions: why not try <a href=\"http://www.writetothem.com/\">writing direct\n"
@@ -290,7 +286,7 @@ msgstr ""
"get some more information about the status of your empty property, please come back to the\n"
"site and leave an update.</p>"
-#: templates/web/default/around/_report_banner.html:3
+#: templates/web/default/around/_report_banner.html:4
#: templates/web/default/around/_report_banner.html:5
msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>"
msgstr "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>"
@@ -345,8 +341,6 @@ msgstr "<strong>Yes</strong> I have a password"
msgid "About us"
msgstr "Amdanom ni"
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:81
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:39
#: templates/web/default/report/update-form.html:30
@@ -384,7 +378,7 @@ msgstr "Add new category"
msgid "Add user"
msgstr "Add user"
-#: templates/web/default/my/my.html:56 templates/web/fixmystreet/my/my.html:60
+#: templates/web/default/my/my.html:61 templates/web/fixmystreet/my/my.html:67
msgid "Added %s"
msgstr "Added %s"
@@ -400,7 +394,6 @@ msgstr "Alert %d created for %s, type %s, parameters %s / %s"
msgid "Alert %d disabled (created %s)"
msgstr "Alert %d disabled (created %s)"
-#: templates/web/bromley/report/display.html:209
#: templates/web/default/report/update-form.html:163
#: templates/web/fixmystreet/report/update-form.html:148
msgid "Alert me to future updates"
@@ -413,17 +406,12 @@ msgstr "Rhowch wybod i mi am ddiweddariadau yn y dyfodol"
msgid "All Reports"
msgstr "All Reports"
-#: templates/web/barnet/footer.html:20 templates/web/bromley/footer.html:21
-#: templates/web/bromley/header.html:77 templates/web/default/footer.html:11
+#: templates/web/default/footer.html:11
#: templates/web/emptyhomes/header.html:32
#: templates/web/fiksgatami/footer.html:7
#: templates/web/fiksgatami/nn/footer.html:7
-#: templates/web/fixmindelo/footer.html:41
#: templates/web/fixmybarangay/footer.html:20
-#: templates/web/fixmystreet/footer.html:48
-#: templates/web/oxfordshire/footer.html:23
-#: templates/web/oxfordshire/header.html:67
-#: templates/web/reading/footer.html:8 templates/web/stevenage/footer.html:43
+#: templates/web/fixmystreet/footer.html:51
#: templates/web/zurich/admin/index-dm.html:12
#: templates/web/zurich/admin/stats.html:13
#: templates/web/zurich/footer.html:19
@@ -440,27 +428,25 @@ msgstr "All reports between %s and %s"
msgid "All the information you provide here will be sent to"
msgstr "All the information you provide here will be sent to"
-#: templates/web/default/report/new/councils_text_all.html:11
+#: templates/web/default/report/new/councils_text_all.html:12
#: templates/web/default/report/new/councils_text_all.html:13
msgid "All the information you provide here will be sent to <strong>%s</strong> or <strong>Roads Service</strong>."
msgstr "All the information you provide here will be sent to <strong>%s</strong> or <strong>Roads Service</strong>."
-#: templates/web/default/report/new/councils_text_all.html:4
+#: templates/web/default/report/new/councils_text_all.html:5
#: templates/web/default/report/new/councils_text_all.html:6
msgid "All the information you provide here will be sent to <strong>%s</strong> or a relevant local body such as <strong>TfL</strong>, via the London Report-It system."
msgstr "All the information you provide here will be sent to <strong>%s</strong> or a relevant local body such as <strong>TfL</strong>, via the London Report-It system."
-#: templates/web/bromley/report/new/fill_in_details_form.html:4
-#: templates/web/bromley/report/new/fill_in_details_form.html:6
-#: templates/web/default/report/new/councils_text_all.html:18
+#: templates/web/default/report/new/councils_text_all.html:19
#: templates/web/default/report/new/councils_text_all.html:20
-#: templates/web/default/report/new/fill_in_details_form.html:11
+#: templates/web/default/report/new/fill_in_details_form.html:12
#: templates/web/default/report/new/fill_in_details_form.html:13
-#: templates/web/emptyhomes/report/new/councils_text_all.html:2
+#: templates/web/emptyhomes/report/new/councils_text_all.html:3
#: templates/web/emptyhomes/report/new/councils_text_all.html:4
-#: templates/web/emptyhomes/report/new/fill_in_details_form.html:11
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:12
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:13
-#: templates/web/fixmystreet/report/new/fill_in_details_form.html:6
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:7
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:8
msgid "All the information you provide here will be sent to <strong>%s</strong>."
msgstr "Bydd yr holl wybodaeth a ddarparwch fan hyn yn cael ei hanfon at <strong>%s</strong>."
@@ -484,13 +470,11 @@ msgstr "Anonymous:"
msgid "Are you a <strong>developer</strong>? Would you like to contribute to reportemptyhomes.com?"
msgstr "Are you a <strong>developer</strong>? Would you like to contribute to reportemptyhomes.com?"
-#: templates/web/fixmystreet/footer.html:16
-#: templates/web/stevenage/footer.html:17
+#: templates/web/fixmystreet/footer.html:19
msgid "Are you a developer?"
msgstr "Are you a developer?"
-#: templates/web/fixmystreet/footer.html:20
-#: templates/web/stevenage/footer.html:21
+#: templates/web/fixmystreet/footer.html:23
msgid "Are you from a council?"
msgstr "Are you from a council?"
@@ -513,7 +497,7 @@ msgstr "Assign to external body:"
msgid "Assign to subdivision:"
msgstr "Assign to subdivision:"
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:141
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:163
#: templates/web/zurich/report/updates.html:11
msgid "Assigned to %s"
msgstr "Assigned to %s"
@@ -532,7 +516,6 @@ msgid "Awaiting moderation"
msgstr "Awaiting moderation"
#: templates/web/default/js/translation_strings.html:32
-#: templates/web/oxfordshire/js/translation_strings.html:26
msgid "Back"
msgstr "Back"
@@ -544,8 +527,8 @@ msgstr "Ban email address"
msgid "Be sure to choose the right category, because we use that to determine to whom the report is sent."
msgstr "Be sure to choose the right category, because we use that to determine to whom the report is sent."
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1176
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:249
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1185
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:297
#: templates/web/default/admin/bodies.html:1
#: templates/web/zurich/header.html:64
msgid "Bodies"
@@ -571,18 +554,15 @@ msgid "By Date"
msgstr "By Date"
#: templates/web/fixmystreet/around/_report_banner.html:10
-#: templates/web/fixmystreet/around/_report_banner.html:8
+#: templates/web/fixmystreet/around/_report_banner.html:9
msgid "Can't see the map? <a href='%s' rel='nofollow'>Skip this step</a>"
msgstr "Os na allwch weld y map, gallwch <a href='%s' rel='nofollow'>hepgor y cam hwn</a>"
-#: templates/web/bromley/report/new/fill_in_details_form.html:68
#: templates/web/default/admin/bodies.html:20
#: templates/web/default/admin/body.html:53
#: templates/web/default/admin/index.html:44
#: templates/web/default/report/new/category.html:10
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:74
-#: templates/web/seesomething/report/new/category.html:6
-#: templates/web/southampton/report/new/category.html:3
#: templates/web/zurich/admin/body.html:13
#: templates/web/zurich/admin/index-dm.html:23
#: templates/web/zurich/admin/index-sdm.html:21
@@ -607,7 +587,7 @@ msgstr "Category fix rate for empty properties > 4 weeks old"
msgid "Category:"
msgstr "Categori:"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:366
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374
msgid "Category: %s"
msgstr "Category: %s"
@@ -656,21 +636,16 @@ msgstr ""
msgid "Click map to report an empty property"
msgstr "Sut i roi gwybod am eiddo gwag"
-#: templates/web/oxfordshire/js/translation_strings.html:39
-#, fuzzy
-msgid "Click on the map to report an empty property"
-msgstr "Sut i roi gwybod am eiddo gwag"
-
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:118
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:140
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:45
#: templates/web/default/admin/report_edit.html:47
#: templates/web/default/dashboard/index.html:142
#: templates/web/default/dashboard/index.html:144
#: templates/web/fixmystreet/report/banner.html:15
-#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:10
#: templates/web/zurich/admin/header.html:12
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/report_edit.html:100
#: templates/web/zurich/admin/report_edit.html:98
#: templates/web/zurich/admin/stats.html:31
@@ -678,11 +653,11 @@ msgstr "Sut i roi gwybod am eiddo gwag"
msgid "Closed"
msgstr "Closed"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:744
+#: perllib/FixMyStreet/DB/Result/Problem.pm:748
msgid "Closed by council"
msgstr "Closed by council"
-#: templates/web/default/my/my.html:32 templates/web/fixmystreet/my/my.html:36
+#: templates/web/default/my/my.html:37 templates/web/fixmystreet/my/my.html:43
msgid "Closed reports"
msgstr "Closed reports"
@@ -690,7 +665,7 @@ msgstr "Closed reports"
msgid "Closed:"
msgstr "Closed:"
-#: templates/web/default/around/tabbed_lists.html:10
+#: templates/web/default/around/tabbed_lists.html:11
#: templates/web/default/around/tabbed_lists.html:12
msgid "Closest nearby empty properties <small>(within&nbsp;%skm)</small>"
msgstr "Yr eiddo gwag cyfagos agosaf <small>(within&nbsp;%skm)</small>"
@@ -748,8 +723,6 @@ msgstr "Confirm by email below, providing a new password at that point. When you
#: templates/web/default/tokens/confirm_update.html:3
#: templates/web/emptyhomes/tokens/confirm_problem.html:1
#: templates/web/emptyhomes/tokens/confirm_problem.html:3
-#: templates/web/southampton/tokens/confirm_problem.html:1
-#: templates/web/southampton/tokens/confirm_problem.html:3
#: templates/web/zurich/tokens/confirm_problem.html:1
#: templates/web/zurich/tokens/confirm_problem.html:3
msgid "Confirmation"
@@ -782,7 +755,6 @@ msgstr "Cysylltu"
msgid "Contact reportemptyhomes.com"
msgstr "Cysylltwch â reportemptyhomes.com"
-#: templates/web/bromley/contact/submit.html:1
#: templates/web/default/contact/index.html:1
#: templates/web/default/contact/index.html:2
#: templates/web/default/contact/submit.html:1
@@ -791,20 +763,18 @@ msgstr "Cysylltwch â reportemptyhomes.com"
msgid "Contact Us"
msgstr "Cysylltwch â Ni"
-#: templates/web/bromley/contact/submit.html:3
#: templates/web/default/contact/index.html:6
#: templates/web/default/contact/submit.html:3
-#: templates/web/fixmystreet/contact/index.html:19
+#: templates/web/fixmystreet/contact/index.html:22
msgid "Contact the team"
msgstr "Cysylltu â'r tîm"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1310
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1338
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1319
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1347
msgid "Could not find user"
msgstr "Could not find user"
#: templates/web/default/js/translation_strings.html:37
-#: templates/web/oxfordshire/js/translation_strings.html:31
msgid "Could not look up location"
msgstr "Could not look up location"
@@ -863,7 +833,7 @@ msgstr "Current state"
msgid "Currently no bodies have been created."
msgstr "Ni roddwyd gwybod eto am unrhyw eiddo gwag."
-#: templates/web/default/dashboard/index.html:5
+#: templates/web/default/dashboard/index.html:6
#: templates/web/default/dashboard/index.html:7
msgid "Dashboard"
msgstr "Dashboard"
@@ -886,11 +856,8 @@ msgstr "Deleted"
msgid "Description"
msgstr "Description"
-#: templates/web/bromley/report/new/fill_in_details_form.html:54
#: templates/web/default/js/translation_strings.html:34
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66
-#: templates/web/oxfordshire/js/translation_strings.html:28
-#: templates/web/seesomething/report/new/fill_in_details_form.html:16
#: templates/web/zurich/report/new/fill_in_details_form.html:42
msgid "Details"
msgstr "Manylion"
@@ -928,8 +895,10 @@ msgstr "Do you have a reportemptyhomes.com password?"
msgid "Don&rsquo;t know"
msgstr "Ddim yn gwybod"
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:82
+#: templates/web/fixmystreet/contact/index.html:115
+msgid "Don't like forms?"
+msgstr ""
+
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:47
#: templates/web/default/report/update-form.html:30
@@ -960,9 +929,9 @@ msgid "Edit body details"
msgstr "Edit body details"
#: templates/web/default/admin/report_edit.html:1
-#: templates/web/zurich/admin/report_edit-sdm.html:1
+#: templates/web/zurich/admin/report_edit-sdm.html:2
#: templates/web/zurich/admin/report_edit-sdm.html:4
-#: templates/web/zurich/admin/report_edit.html:1
+#: templates/web/zurich/admin/report_edit.html:2
#: templates/web/zurich/admin/report_edit.html:5
msgid "Editing empty property %d"
msgstr "Editing empty property %d"
@@ -980,7 +949,6 @@ msgstr "Editing user %d"
msgid "Editor"
msgstr "Editor"
-#: templates/web/bromley/report/display.html:128
#: templates/web/default/admin/bodies.html:18
#: templates/web/default/admin/body.html:54
#: templates/web/default/admin/body_edit.html:83
@@ -988,7 +956,6 @@ msgstr "Editor"
#: templates/web/default/admin/users.html:16
#: templates/web/fixmystreet/auth/general.html:20
#: templates/web/fixmystreet/report/update-form.html:76
-#: templates/web/seesomething/auth/general.html:20
#: templates/web/zurich/admin/body-form.html:9
#: templates/web/zurich/admin/body.html:14
#: templates/web/zurich/auth/general.html:24
@@ -996,7 +963,7 @@ msgstr "Editor"
msgid "Email"
msgstr "Email"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1286
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1295
msgid "Email added to abuse list"
msgstr "Email added to abuse list"
@@ -1005,7 +972,7 @@ msgstr "Email added to abuse list"
msgid "Email address:"
msgstr "Your email address:"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1283
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1292
msgid "Email already in abuse list"
msgstr "Email already in abuse list"
@@ -1029,7 +996,7 @@ msgstr "Anfonwch ddiweddariadau ataf i drwy'r e-bost"
msgid "Email:"
msgstr "E-bost:"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:318
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:323
msgid "Email: %s"
msgstr "Email: %s"
@@ -1083,7 +1050,7 @@ msgstr "End day:"
msgid "Endpoint"
msgstr "Endpoint"
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:71
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:72
msgid "Enter a Z&uuml;rich street name"
msgstr "Enter a Z&uuml;rich street name"
@@ -1092,26 +1059,26 @@ msgid "Enter a nearby UK postcode, or street name and area"
msgstr "Cofnodwch god post gerllaw yn y DU, neu enw stryd ac ardal"
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:25
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:37
msgid "Enter a nearby postcode, or street name and area"
msgstr "Enter a nearby postcode, or street name and area"
-#: templates/web/default/around/postcode_form.html:1
#: templates/web/default/around/postcode_form.html:2
-#: templates/web/fixmystreet/around/postcode_form.html:10
#: templates/web/fixmystreet/around/postcode_form.html:11
-#: templates/web/seesomething/around/postcode_form.html:3
-#: templates/web/seesomething/around/postcode_form.html:4
msgid "Enter a nearby street name and area"
msgstr "Cofnodwch god post gerllaw yn y DU, neu enw stryd ac ardal"
+#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:9
+#, fuzzy
+msgid "Enter a nearby street name and area, postal code or district in Delhi"
+msgstr "Cofnodwch god post gerllaw yn y DU, neu enw stryd ac ardal"
+
#: templates/web/default/auth/general.html:64
#: templates/web/default/report/new/fill_in_details_form.html:169
#: templates/web/default/report/update-form.html:124
msgid "Enter a new password:"
msgstr "Enter a new password:"
-#: templates/web/bromley/report/display.html:150
-#: templates/web/bromley/report/new/fill_in_details_form.html:189
#: templates/web/fixmystreet/auth/general.html:61
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:211
#: templates/web/fixmystreet/report/update-form.html:122
@@ -1146,7 +1113,6 @@ msgstr "Examples:"
msgid "Extra data:"
msgstr "Extra data:"
-#: templates/web/bromley/contact/submit.html:14
#: templates/web/default/contact/submit.html:15
msgid "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>."
msgstr "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>."
@@ -1160,12 +1126,6 @@ msgstr "Filter report list"
msgid "Find latest local and national news"
msgstr "Dod o hyd i’r newyddion lleol a chenedlaethol diweddaraf"
-#: templates/web/bromley/report/display.html:191
-#: templates/web/bromley/report/new/fill_in_details_form.html:113
-#: templates/web/bromley/report/new/fill_in_details_form.html:160
-msgid "First Name"
-msgstr "First Name"
-
#: templates/web/default/questionnaire/index.html:79
#: templates/web/fixmystreet/questionnaire/index.html:73
msgid "First time"
@@ -1215,8 +1175,6 @@ msgstr ""
"rhanbarth a'r cyngor, ond dim ond yn yr hysbysiad \"O fewn y ffin\" \n"
"y bydd yn ymddangos yn achos y cyngor sir."
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:84
#: templates/web/default/admin/index.html:44
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:41
@@ -1241,7 +1199,7 @@ msgstr "Fixed - Council"
msgid "Fixed - User"
msgstr "Fixed - User"
-#: templates/web/default/my/my.html:27 templates/web/fixmystreet/my/my.html:31
+#: templates/web/default/my/my.html:32 templates/web/fixmystreet/my/my.html:38
msgid "Fixed reports"
msgstr "Fixed reports"
@@ -1258,7 +1216,7 @@ msgstr ""
msgid "Flag user"
msgstr "Flag user"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1181
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1190
#: templates/web/default/admin/users.html:19
msgid "Flagged"
msgstr "Flagged"
@@ -1303,11 +1261,9 @@ msgstr "Forgotten your password?"
#: templates/web/emptyhomes/faq/faq-en-gb.html:1
#: templates/web/fiksgatami/faq/faq-nb.html:1
#: templates/web/fiksgatami/nn/faq/faq-nn.html:1
-#: templates/web/fixmindelo/faq/faq-pt-cv.html:1
#: templates/web/fixmybarangay/faq/faq-en-gb.html:1
#: templates/web/fixmystreet/faq/faq-en-gb.html:1
#: templates/web/fixmystreet/static/privacy.html:1
-#: templates/web/oxfordshire/faq/faq-en-gb.html:1
msgid "Frequently Asked Questions"
msgstr "Cwestiynau Cyffredin"
@@ -1315,19 +1271,18 @@ msgstr "Cwestiynau Cyffredin"
msgid "GeoRSS on Google Maps"
msgstr "GeoRSS on Google Maps"
-#: templates/web/bromley/report/display.html:30
#: templates/web/fixmystreet/around/_updates.html:3
#: templates/web/fixmystreet/report/display.html:38
msgid "Get updates"
msgstr "Get updates"
-#: templates/web/fixmystreet/reports/_rss.html:3
+#: templates/web/fixmystreet/reports/_rss.html:4
#: templates/web/fixmystreet/reports/_rss.html:9
msgid "Get updates of %s empty properties"
msgstr "Get updates of %s empty properties"
#: templates/web/fixmystreet/reports/_rss.html:11
-#: templates/web/fixmystreet/reports/_rss.html:3
+#: templates/web/fixmystreet/reports/_rss.html:4
msgid "Get updates of empty properties in this %s"
msgstr "Get updates of empty properties in this %s"
@@ -1340,7 +1295,6 @@ msgstr "Rhowch borthiant RSS i mi"
#: templates/web/default/alert/index.html:34
#: templates/web/default/around/postcode_form.html:8
#: templates/web/fixmystreet/around/postcode_form.html:21
-#: templates/web/seesomething/around/postcode_form.html:10
#: templates/web/zurich/admin/stats.html:26
msgid "Go"
msgstr "Ewch"
@@ -1367,19 +1321,12 @@ msgstr "A yw'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio?"
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?"
-#: templates/web/barnet/footer.html:24 templates/web/bromley/footer.html:25
-#: templates/web/bromley/header.html:81 templates/web/default/footer.html:15
+#: templates/web/default/footer.html:15
#: templates/web/emptyhomes/header.html:33
#: templates/web/fiksgatami/footer.html:9
#: templates/web/fiksgatami/nn/footer.html:9
-#: templates/web/fixmindelo/footer.html:45
#: templates/web/fixmybarangay/footer.html:24
-#: templates/web/fixmystreet/footer.html:52
-#: templates/web/oxfordshire/footer.html:27
-#: templates/web/oxfordshire/header.html:75
-#: templates/web/reading/footer.html:10
-#: templates/web/seesomething/footer.html:13
-#: templates/web/stevenage/footer.html:47
+#: templates/web/fixmystreet/footer.html:55
#: templates/web/zurich/faq/faq-de-ch.html:1
#: templates/web/zurich/footer.html:21
#: templates/web/zurich/nav_over_content.html:8
@@ -1391,13 +1338,9 @@ msgstr "Cwestiynau Cyffredin"
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;."
-#: templates/web/barnet/header.html:70 templates/web/bromley/header.html:64
-#: templates/web/bromley/header.html:99
#: templates/web/fixmybarangay/header.html:66
-#: templates/web/fixmystreet/header.html:50
-#: templates/web/oxfordshire/header.html:111
-#: templates/web/oxfordshire/header.html:47
-#: templates/web/stevenage/header.html:97 templates/web/zurich/footer.html:11
+#: templates/web/fixmystreet/header.html:53
+#: templates/web/zurich/footer.html:11
msgid "Hi %s"
msgstr "Hi %s"
@@ -1405,8 +1348,8 @@ msgstr "Hi %s"
#: templates/web/default/admin/report_edit.html:50
#: templates/web/default/admin/report_edit.html:51
#: templates/web/default/admin/update_edit.html:28
-#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:11
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/report_edit.html:89
#: templates/web/zurich/admin/report_edit.html:93
#: templates/web/zurich/admin/stats.html:32
@@ -1427,7 +1370,6 @@ msgid "History"
msgstr "History"
#: templates/web/default/js/translation_strings.html:31
-#: templates/web/oxfordshire/js/translation_strings.html:25
msgid "Home"
msgstr "Home"
@@ -1436,7 +1378,6 @@ msgid "How to report an empty property"
msgstr "Sut i roi gwybod am eiddo gwag"
#: templates/web/default/js/translation_strings.html:33
-#: templates/web/oxfordshire/js/translation_strings.html:27
msgid "How to send successful reports"
msgstr "How to send successful reports"
@@ -1452,7 +1393,7 @@ msgstr "Yn anffodus ni fu modd i ni ddod o hyd i'ch eiddo gwag yn y gronfa ddata
msgid "I'm afraid we couldn't validate that token, as the report was made too long ago."
msgstr "I'm afraid we couldn't validate that token, as the report was made too long ago."
-#: perllib/FixMyStreet/App/Controller/Tokens.pm:259
+#: perllib/FixMyStreet/App/Controller/Tokens.pm:260
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"
@@ -1492,7 +1433,6 @@ msgstr "Os na wnewch chi hyn, ni fydd eich problem yn cael ei phostio."
msgid "If you do not, your update will not be posted."
msgstr "If you do not, your update will not be posted."
-#: templates/web/default/report/new/councils_text_none.html:8
#: templates/web/default/report/new/councils_text_none.html:9
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 "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."
@@ -1548,7 +1488,7 @@ msgid ""
" when they are shown on the site. Enter the ID (number) of that user."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Contact.pm:111
+#: perllib/FixMyStreet/App/Controller/Contact.pm:116
msgid "Illegal ID"
msgstr "ID Anghyfreithlon"
@@ -1556,8 +1496,6 @@ msgstr "ID Anghyfreithlon"
msgid "Illegal feed selection"
msgstr "Dewis porthiant annilys"
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:82
#: templates/web/default/dashboard/index.html:142
#: templates/web/default/dashboard/index.html:144
#: templates/web/default/report/update-form.html:30
@@ -1576,21 +1514,17 @@ msgstr "(Email in abuse table)"
msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
msgstr "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:121
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:143
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:38
#: templates/web/fixmystreet/report/banner.html:19
-#: templates/web/zurich/admin/header.html:1
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/header.html:8
#: templates/web/zurich/admin/report_edit.html:102
#: templates/web/zurich/report/banner.html:15
msgid "In progress"
msgstr "In progress"
-#: templates/web/seesomething/report/new/fill_in_details_form.html:38
-msgid "Incident Category"
-msgstr "Incident Category"
-
#: templates/web/zurich/admin/report_edit.html:163
msgid "Include reporter personal details"
msgstr "Include reporter personal details"
@@ -1618,7 +1552,7 @@ msgstr "Internal notes:"
msgid "Invalid agency_responsible value %s"
msgstr "Invalid agency_responsible value %s"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1096
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1105
msgid "Invalid end date"
msgstr "Invalid end date"
@@ -1626,12 +1560,10 @@ msgstr "Invalid end date"
msgid "Invalid format %s specified."
msgstr "Invalid format %s specified."
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1092
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1101
msgid "Invalid start date"
msgstr "Invalid start date"
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:81
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:37
#: templates/web/default/dashboard/index.html:142
@@ -1643,32 +1575,27 @@ msgstr "Invalid start date"
msgid "Investigating"
msgstr "Investigating"
-#: templates/web/emptyhomes/tokens/confirm_problem.html:12
+#: templates/web/emptyhomes/tokens/confirm_problem.html:13
#: templates/web/emptyhomes/tokens/confirm_problem.html:14
msgid "It is worth noting however that the process can sometimes be slow, especially if the property is in very poor repair or the owner is unwilling to act. In most cases it can take six months or more before you can expect to see anything change and sometimes there may be considerable barries to a property being brought back into use. This doesn&rsquo;t mean the council isn&rsquo;t doing anything. We encourage councils to update the website so you can see what is happening. It may be a long process, but you reporting your 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 ddrwg iawn neu os nad yw'r perchennog yn barod i weithredu. Gan amlaf, mae'n cymryd tua chwe miscyn y gallwch ddisgwyl gweld unrhyw beth yn newid. Nid yw hyn yn golygu nad yw'r cyngor yn gwneud unrhyw beth. Rydym yn annog cynghorau i ddiweddaru'r wefan fel y gallwch weld beth sy'n digwydd."
-#: templates/web/bromley/report/display.html:168
-#: templates/web/bromley/report/new/fill_in_details_form.html:209
+#: templates/web/fixmystreet/contact/blurb.html:8
+msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there."
+msgstr ""
+
#: templates/web/default/auth/general.html:44
#: templates/web/default/report/new/fill_in_details_form.html:149
#: templates/web/default/report/update-form.html:104
#: templates/web/fixmystreet/auth/general.html:46
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:172
#: templates/web/fixmystreet/report/update-form.html:100
-#: templates/web/seesomething/auth/general.html:35
#: templates/web/zurich/auth/general.html:40
msgid "Keep me signed in on this computer"
msgstr "Keep me signed in on this computer"
-#: templates/web/bromley/report/display.html:197
-#: templates/web/bromley/report/new/fill_in_details_form.html:119
-#: templates/web/bromley/report/new/fill_in_details_form.html:166
-msgid "Last Name"
-msgstr "Last Name"
-
#: templates/web/default/admin/body.html:58
#: templates/web/zurich/admin/body.html:15
msgid "Last editor"
@@ -1691,11 +1618,9 @@ msgstr ""
msgid "List all reported empty properties"
msgstr "List all reported empty properties"
-#: templates/web/bromley/report/new/fill_in_details_form.html:69
#: templates/web/default/report/new/fill_in_details_form.html:68
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:51
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:75
-#: templates/web/seesomething/report/new/fill_in_details_form.html:25
#: templates/web/zurich/report/new/fill_in_details_form.html:51
msgid "Loading..."
msgstr "Llwytho…"
@@ -1704,7 +1629,7 @@ msgstr "Llwytho…"
#: templates/web/default/alert/choose.html:3
#: templates/web/default/alert/index.html:1
#: templates/web/default/alert/index.html:3
-#: templates/web/default/alert/list.html:1
+#: templates/web/default/alert/list.html:2
#: templates/web/default/alert/list.html:5
#: templates/web/default/alert/updates.html:1
#: templates/web/default/tokens/confirm_alert.html:1
@@ -1717,23 +1642,17 @@ msgstr "Llwytho…"
msgid "Local RSS feeds and email alerts"
msgstr "Porthiannau RSS a hysbysiadau e-bost lleol"
-#: templates/web/default/alert/list.html:1
-#: templates/web/default/alert/list.html:12
+#: templates/web/default/alert/list.html:13
#: templates/web/default/alert/list.html:14
+#: templates/web/default/alert/list.html:2
#: templates/web/default/alert/list.html:3
msgid "Local RSS feeds and email alerts for ‘%s’"
msgstr "Local RSS feeds and email alerts for ‘%s’"
-#: templates/web/barnet/footer.html:22 templates/web/bromley/footer.html:23
-#: templates/web/bromley/header.html:79 templates/web/default/footer.html:13
-#: templates/web/fiksgatami/footer.html:8
+#: templates/web/default/footer.html:13 templates/web/fiksgatami/footer.html:8
#: templates/web/fiksgatami/nn/footer.html:8
-#: templates/web/fixmindelo/footer.html:43
#: templates/web/fixmybarangay/footer.html:22
-#: templates/web/fixmystreet/footer.html:50
-#: templates/web/oxfordshire/footer.html:25
-#: templates/web/oxfordshire/header.html:71
-#: templates/web/reading/footer.html:9 templates/web/stevenage/footer.html:45
+#: templates/web/fixmystreet/footer.html:53
msgid "Get local reports"
msgstr "Gweld adroddiadau lleol"
@@ -1742,7 +1661,6 @@ msgid "Locate the empty property on a map of the area"
msgstr "Chwiliwch am leoliad yr eiddo gwag ar fap o'r ardal"
#: templates/web/default/js/translation_strings.html:43
-#: templates/web/oxfordshire/js/translation_strings.html:37
msgid "MAP"
msgstr "MAP"
@@ -1754,11 +1672,11 @@ msgstr "Map &copy; <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\">Ope
msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
msgstr ""
-#: templates/web/fixmystreet/contact/index.html:98
+#: templates/web/fixmystreet/contact/index.html:103
msgid "Message"
msgstr "Message"
-#: templates/web/default/contact/index.html:90
+#: templates/web/default/contact/index.html:92
msgid "Message:"
msgstr "Neges:"
@@ -1800,10 +1718,6 @@ msgstr "Mwy o eiddo gwag cyfagos"
msgid "Name"
msgstr "Enw"
-#: templates/web/seesomething/report/new/fill_in_details_form.html:74
-msgid "Name (optional)"
-msgstr "Name (optional)"
-
#: templates/web/default/admin/report_edit.html:66
#: templates/web/default/admin/update_edit.html:32
#: templates/web/default/admin/user-form.html:18
@@ -1813,30 +1727,30 @@ msgstr "Name (optional)"
msgid "Name:"
msgstr "Enw:"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:317
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:322
msgid "Name: %s"
msgstr "Enw: %s"
#: templates/web/fiksgatami/footer.html:3
#: templates/web/fiksgatami/nn/footer.html:3
-#: templates/web/reading/footer.html:4
msgid "Navigation"
msgstr "Mordwyo "
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:188
#: perllib/FixMyStreet/Geocode/OSM.pm:166
msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
msgstr "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
-#: perllib/FixMyStreet/Cobrand/UK.pm:148
+#: perllib/FixMyStreet/Cobrand/UK.pm:142
msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
msgstr "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
-#: perllib/FixMyStreet/Cobrand/Default.pm:418
-#: perllib/FixMyStreet/Cobrand/Default.pm:458
+#: perllib/FixMyStreet/Cobrand/Default.pm:421
+#: perllib/FixMyStreet/Cobrand/Default.pm:461
msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
msgstr "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:273
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:297
msgid ""
"Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
"\n"
@@ -2003,7 +1917,6 @@ msgid "No empty properties have been reported yet."
msgstr "Ni roddwyd gwybod eto am unrhyw eiddo gwag."
#: templates/web/default/js/translation_strings.html:38
-#: templates/web/oxfordshire/js/translation_strings.html:32
msgid "No result returned"
msgstr "No result returned"
@@ -2014,7 +1927,7 @@ msgid ""
" your config file is not pointing to a live MapIt service."
msgstr ""
-#: templates/web/default/report/_support.html:2
+#: templates/web/default/report/_support.html:3
#: templates/web/default/report/_support.html:4
msgid "No supporters"
msgstr "No supporters"
@@ -2038,8 +1951,6 @@ msgid ""
" activity across their body), the ability to hide reports or set special report statuses."
msgstr ""
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:83
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:46
#: templates/web/default/report/update-form.html:30
@@ -2098,7 +2009,6 @@ msgid "Now to submit your update&hellip; do you have a reportemptyhomes.com pass
msgstr "Now to submit your update&hellip; do you have a reportemptyhomes.com password?"
#: templates/web/default/js/translation_strings.html:42
-#: templates/web/oxfordshire/js/translation_strings.html:36
msgid "OK"
msgstr "OK"
@@ -2142,8 +2052,7 @@ msgstr "Wedi'u hadfer i'w defnyddio ers amser"
msgid "Older empty property reports"
msgstr "Adroddiadau hŷn o eiddo gwag"
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:115
-#: templates/web/bromley/report/display.html:80
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:137
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:36
#: templates/web/default/admin/report_edit.html:37
@@ -2151,7 +2060,7 @@ msgstr "Adroddiadau hŷn o eiddo gwag"
#: templates/web/default/dashboard/index.html:142
#: templates/web/default/report/update-form.html:30
#: templates/web/fixmystreet/report/update-form.html:28
-#: templates/web/zurich/admin/header.html:1
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/header.html:7
#: templates/web/zurich/admin/report_edit.html:89
#: templates/web/zurich/admin/report_edit.html:91
@@ -2160,7 +2069,7 @@ msgstr "Adroddiadau hŷn o eiddo gwag"
msgid "Open"
msgstr "Open"
-#: templates/web/default/my/my.html:22 templates/web/fixmystreet/my/my.html:26
+#: templates/web/default/my/my.html:27 templates/web/fixmystreet/my/my.html:33
msgid "Open reports"
msgstr "Open reports"
@@ -2186,15 +2095,15 @@ msgstr "Neu eiddo gwag y rhoddwyd gwybod amdanynt i:"
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:"
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1053
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:664
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:665
-#: perllib/FixMyStreet/DB/Result/Problem.pm:544
-#: perllib/FixMyStreet/DB/Result/Problem.pm:554
-#: perllib/FixMyStreet/DB/Result/Problem.pm:564
-#: perllib/FixMyStreet/DB/Result/Problem.pm:576
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:361
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1057
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:662
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:663
+#: perllib/FixMyStreet/DB/Result/Problem.pm:546
+#: perllib/FixMyStreet/DB/Result/Problem.pm:556
+#: perllib/FixMyStreet/DB/Result/Problem.pm:566
+#: perllib/FixMyStreet/DB/Result/Problem.pm:578
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:369
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:384
msgid "Other"
msgstr "Arall"
@@ -2221,8 +2130,6 @@ msgstr "Parent"
msgid "Partial"
msgstr "Partial"
-#: templates/web/bromley/report/display.html:147
-#: templates/web/bromley/report/new/fill_in_details_form.html:186
#: templates/web/fixmystreet/auth/general.html:59
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:208
#: templates/web/fixmystreet/report/update-form.html:119
@@ -2244,15 +2151,12 @@ msgstr ""
msgid "Phone number"
msgstr "Your phone number"
-#: templates/web/bromley/report/new/fill_in_details_form.html:136
-#: templates/web/bromley/report/new/fill_in_details_form.html:183
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:138
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:205
-#: templates/web/seesomething/report/new/fill_in_details_form.html:89
msgid "Phone number (optional)"
msgstr "Phone number (optional)"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:282
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:287
#: templates/web/default/admin/report_edit.html:68
#: templates/web/default/report/new/fill_in_details_form.html:215
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:138
@@ -2262,11 +2166,8 @@ msgstr "Phone number (optional)"
msgid "Phone:"
msgstr "Rhif ffôn:"
-#: templates/web/bromley/report/display.html:111
-#: templates/web/bromley/report/new/fill_in_details_form.html:104
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:92
#: templates/web/fixmystreet/report/update-form.html:59
-#: templates/web/seesomething/report/new/fill_in_details_form.html:52
#: templates/web/zurich/admin/index-dm.html:29
#: templates/web/zurich/admin/index-sdm.html:24
#: templates/web/zurich/admin/reports.html:16
@@ -2288,7 +2189,6 @@ msgid "Photos of recent nearby reports"
msgstr "Ffotograffau o adroddiadau cyfagos diweddar"
#: templates/web/default/js/translation_strings.html:30
-#: templates/web/oxfordshire/js/translation_strings.html:24
msgid "Place pin on map"
msgstr "Place pin on map"
@@ -2296,7 +2196,7 @@ msgstr "Place pin on map"
#: templates/web/default/admin/report_edit.html:38
#: templates/web/default/dashboard/index.html:142
#: templates/web/default/dashboard/index.html:143
-#: templates/web/zurich/admin/header.html:1
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/header.html:9
#: templates/web/zurich/admin/index-dm.html:9
#: templates/web/zurich/admin/report_edit.html:89
@@ -2310,7 +2210,6 @@ msgstr "<a class=\"tab_link\" href=\"#report\">Ewch i fwrw golwg</a> ar y diwedd
#: templates/web/default/report/new/notes.html:6
#: templates/web/fixmystreet/report/new/notes.html:6
-#: templates/web/oxfordshire/report/new/notes.html:5
msgid "Please be polite, concise and to the point."
msgstr "Please be polite, concise and to the point."
@@ -2327,20 +2226,16 @@ msgstr "Rhowch eich cyfeiriad e-bost"
#: templates/web/default/auth/general.html:8
#: templates/web/fixmystreet/auth/general.html:15
#: templates/web/fixmystreet/auth/general.html:9
-#: templates/web/seesomething/auth/general.html:15
-#: templates/web/seesomething/auth/general.html:9
#: templates/web/zurich/auth/general.html:3
#: templates/web/zurich/auth/general.html:9
msgid "Please check your email address is correct"
msgstr "Rhowch gyfeiriad e-bost dilys"
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:848
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:855
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:874
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:917
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:859
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:878
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:921
#: perllib/FixMyStreet/DB/Result/Problem.pm:381
#: templates/web/default/js/translation_strings.html:9
-#: templates/web/oxfordshire/js/translation_strings.html:9
msgid "Please choose a category"
msgstr "Dewiswch gategori"
@@ -2348,19 +2243,8 @@ msgstr "Dewiswch gategori"
msgid "Please choose a property type"
msgstr "Dewiswch fath o eiddo"
-#: templates/web/seesomething/js/translation_strings.html:6
-msgid "Please choose a transport category"
-msgstr "Please choose a transport category"
-
-#: templates/web/seesomething/js/translation_strings.html:7
-msgid "Please choose an incident category"
-msgstr "Please choose an incident category"
-
-#: templates/web/bromley/report/new/fill_in_details_form.html:64
-msgid "Please describe the exact location of the report. Example: “2 dumped mattresses outside Number 19 Stockwell Close”"
-msgstr "Please describe the exact location of the report. Example: “2 dumped mattresses outside Number 19 Stockwell Close”"
-
#: templates/web/default/contact/blurb.html:2
+#: templates/web/fixmystreet/contact/blurb.html:12
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"
@@ -2372,7 +2256,6 @@ msgstr ""
#: templates/web/default/report/new/notes.html:7
#: templates/web/fixmystreet/report/new/notes.html:7
-#: templates/web/oxfordshire/report/new/notes.html:6
msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the service for all users."
msgstr "Please do not be abusive&nbsp;&mdash; abusing your council devalues the service for all users."
@@ -2382,7 +2265,6 @@ msgstr "Peidiwch â rhoi cyfeiriad na gwybodaeth bersonol yn yr adran hon"
#: perllib/FixMyStreet/DB/Result/Comment.pm:126
#: templates/web/default/js/translation_strings.html:2
-#: templates/web/oxfordshire/js/translation_strings.html:2
msgid "Please enter a message"
msgstr "Ychwanegwch neges"
@@ -2395,19 +2277,14 @@ msgstr "Please enter a password"
#: perllib/FixMyStreet/App/Controller/Contact.pm:97
#: perllib/FixMyStreet/DB/Result/Problem.pm:356
#: templates/web/default/js/translation_strings.html:3
-#: templates/web/oxfordshire/js/translation_strings.html:3
msgid "Please enter a subject"
msgstr "Rhowch enw'r pwnc"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1032
-#: perllib/FixMyStreet/App/Controller/Admin.pm:979
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1041
+#: perllib/FixMyStreet/App/Controller/Admin.pm:988
#: perllib/FixMyStreet/DB/Result/User.pm:115
#: templates/web/default/js/translation_strings.html:12
#: templates/web/default/js/translation_strings.html:16
-#: templates/web/oxfordshire/js/translation_strings.html:12
-#: templates/web/oxfordshire/js/translation_strings.html:16
-#: templates/web/seesomething/js/translation_strings.html:10
-#: templates/web/seesomething/js/translation_strings.html:13
msgid "Please enter a valid email"
msgstr "Cofnodwch gyfeiriad e-bost dilys"
@@ -2418,8 +2295,6 @@ msgstr "Cofnodwch gyfeiriad e-bost dilys"
#: perllib/FixMyStreet/DB/Result/Problem.pm:359
#: templates/web/default/js/translation_strings.html:4
-#: templates/web/oxfordshire/js/translation_strings.html:4
-#: templates/web/seesomething/js/translation_strings.html:2
msgid "Please enter some details"
msgstr "Cofnodwch fanylion"
@@ -2431,32 +2306,22 @@ msgstr "Cofnodwch fanylion"
#: templates/web/default/js/translation_strings.html:15
#: templates/web/fixmystreet/auth/general.html:14
#: templates/web/fixmystreet/auth/general.html:9
-#: templates/web/oxfordshire/js/translation_strings.html:11
-#: templates/web/oxfordshire/js/translation_strings.html:15
-#: templates/web/seesomething/auth/general.html:14
-#: templates/web/seesomething/auth/general.html:9
-#: templates/web/seesomething/js/translation_strings.html:9
#: templates/web/zurich/auth/general.html:3
#: templates/web/zurich/auth/general.html:8
msgid "Please enter your email"
msgstr "Cofnodwch eich cyfeiriad e-bost"
-#: templates/web/bromley/report/new/fill_in_details_form.html:149
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:151
-#: templates/web/seesomething/report/new/fill_in_details_form.html:85
#: templates/web/zurich/report/new/fill_in_details_form.html:92
msgid "Please enter your email address"
msgstr "Cofnodwch eich cyfeiriad e-bost"
#: templates/web/default/js/translation_strings.html:25
-#: templates/web/oxfordshire/js/translation_strings.html:19
msgid "Please enter your first name"
msgstr "Cofnodwch eich enw"
#: perllib/FixMyStreet/DB/Result/Problem.pm:374
#: templates/web/default/js/translation_strings.html:7
-#: templates/web/oxfordshire/js/translation_strings.html:7
-#: templates/web/seesomething/js/translation_strings.html:4
msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
msgstr "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"
@@ -2465,7 +2330,6 @@ msgstr "Cofnodwch eich enw llawn - os nad ydych yn dymuno bod eich enw'n cael ei
#: perllib/FixMyStreet/DB/Result/Problem.pm:367
#: perllib/FixMyStreet/DB/Result/User.pm:108
#: templates/web/default/js/translation_strings.html:6
-#: templates/web/oxfordshire/js/translation_strings.html:6
msgid "Please enter your name"
msgstr "Cofnodwch eich enw"
@@ -2475,12 +2339,10 @@ msgid "Please enter your phone number"
msgstr "Please enter your second name"
#: templates/web/default/js/translation_strings.html:26
-#: templates/web/oxfordshire/js/translation_strings.html:20
msgid "Please enter your second name"
msgstr "Please enter your second name"
#: templates/web/default/js/translation_strings.html:24
-#: templates/web/oxfordshire/js/translation_strings.html:18
msgid "Please enter your title"
msgstr "Please enter your title"
@@ -2505,16 +2367,16 @@ msgstr ""
" neges gyfan gan ddefnyddio priflythrennau yn ei gwneud hi’n anodd ei darllen, felly \n"
" hefyd diffyg atalnodi."
-#: templates/web/default/report/new/fill_in_details_text.html:1
#: templates/web/default/report/new/fill_in_details_text.html:11
-#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1
+#: templates/web/default/report/new/fill_in_details_text.html:2
#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:10
-#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:2
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:2
#: templates/web/fixmystreet/report/new/fill_in_details_text.html:8
msgid "Please fill in details of the empty property below."
msgstr "Llenwch fanylion yr eiddo gwag isod."
-#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:2
#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:3
msgid ""
"Please fill in details of the empty property below. Leave as much detail as you can, \n"
@@ -2525,7 +2387,7 @@ msgstr ""
"and if possible describe the exact location of\n"
"the empty property (e.g. if there is a streetlight number or road name)."
-#: templates/web/default/report/new/fill_in_details_text.html:1
+#: templates/web/default/report/new/fill_in_details_text.html:2
#: templates/web/default/report/new/fill_in_details_text.html:3
msgid ""
"Please fill in details of the empty property below. The council won't be able\n"
@@ -2539,12 +2401,10 @@ msgstr ""
"photo of the empty property if you have one), etc."
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:70
-#: templates/web/seesomething/report/new/fill_in_details_form.html:20
#: templates/web/zurich/report/new/fill_in_details_form.html:46
msgid "Please fill in details of the empty property."
msgstr "Llenwch fanylion yr eiddo gwag isod"
-#: templates/web/bromley/report/new/fill_in_details_form.html:28
#: templates/web/default/report/new/fill_in_details_form.html:27
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:26
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:35
@@ -2556,7 +2416,7 @@ msgstr "Llenwch y ffurflen isod gyda manylion yr eiddo gwag, a disgrifiwch y lle
msgid "Please indicate whether you'd like to receive another questionnaire"
msgstr "Nodwch a fyddech chi'n hoffi derbyn holiadur arall"
-#: templates/web/fixmystreet/report/updates-sidebar-notes.html:3
+#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4
msgid "Please note that updates are not sent to the council."
msgstr "Sylwer nad yw diweddariadau'n cael eu hanfon at y cyngor."
@@ -2564,11 +2424,6 @@ msgstr "Sylwer nad yw diweddariadau'n cael eu hanfon at y cyngor."
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 "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>"
-#: templates/web/barnet/report/updates-sidebar-notes.html:1
-msgid "Please note that updates are not sent to the relevant department. 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 "Please note that updates are not sent to the relevant department. 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>"
-
-#: templates/web/bromley/report/new/fill_in_details_form.html:23
#: templates/web/default/report/new/fill_in_details_form.html:5
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:5
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:26
@@ -2579,7 +2434,6 @@ msgstr "Sylwch, <strong>nid yw eich adroddiad wedi’i anfon eto.</strong> Dewis
#: templates/web/default/report/new/notes.html:1
#: templates/web/fixmybarangay/report/new/notes.html:1
#: templates/web/fixmystreet/report/new/notes.html:1
-#: templates/web/oxfordshire/report/new/notes.html:1
msgid "Please note:"
msgstr "Please note:"
@@ -2624,19 +2478,15 @@ msgstr "Please upload a JPEG image only\n"
msgid "Please write a message"
msgstr "Ysgrifennwch neges"
-#: templates/web/bromley/report/display.html:70
#: templates/web/fixmystreet/report/update-form.html:23
msgid "Please write your update here"
msgstr "Please write your update here"
-#: templates/web/bromley/report/display.html:123
-#: templates/web/bromley/report/display.html:151
-#: templates/web/bromley/report/display.html:163
-#: templates/web/default/contact/index.html:93
+#: templates/web/default/contact/index.html:95
#: templates/web/default/report/update-form.html:109
#: templates/web/default/report/update-form.html:131
#: templates/web/default/report/update-form.html:72
-#: templates/web/fixmystreet/contact/index.html:105
+#: templates/web/fixmystreet/contact/index.html:110
#: templates/web/fixmystreet/report/update-form.html:123
#: templates/web/fixmystreet/report/update-form.html:71
#: templates/web/fixmystreet/report/update-form.html:95
@@ -2669,7 +2519,7 @@ msgstr "Private"
msgid "Private information (not shown on site)"
msgstr "Gwybodaeth breifat (ni chaiff ei dangos ar y safle)"
-#: templates/web/default/maps/openlayers.html:85
+#: templates/web/default/maps/openlayers.html:86
msgid "Empty property"
msgstr "Eiddo gwag"
@@ -2690,7 +2540,7 @@ msgstr "Empty property %s sent to council %s"
msgid "Empty property breakdown by state"
msgstr "Empty property breakdown by state"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:950
+#: perllib/FixMyStreet/App/Controller/Admin.pm:959
msgid "Empty property marked as open."
msgstr "Ewch i fwrw golwg "
@@ -2706,7 +2556,6 @@ msgstr "Eiddo gwag"
msgid "Empty properties in this area"
msgstr "Eiddo gwag yn yr ardal hon"
-#: templates/web/bromley/report/display.html:31
#: templates/web/fixmystreet/around/tabbed_lists.html:4
#: templates/web/fixmystreet/report/display.html:46
msgid "Empty properties nearby"
@@ -2726,15 +2575,16 @@ msgstr "Eiddo y cafwyd adroddiadau diweddar ar reportemptyhomes.com eu bod wedi
msgid "Empty properties within %.1fkm of this location"
msgstr "Empty properties within %.1fkm of this location"
-#: perllib/FixMyStreet/Cobrand/Default.pm:626
+#: perllib/FixMyStreet/Cobrand/Default.pm:629
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:109
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155
-#: perllib/FixMyStreet/Cobrand/UK.pm:228
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:184
+#: perllib/FixMyStreet/Cobrand/UK.pm:222
msgid "Empty properties within %s"
msgstr "Eiddo gwag yn %s"
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117
-#: perllib/FixMyStreet/Cobrand/UK.pm:242
+#: perllib/FixMyStreet/Cobrand/UK.pm:236
msgid "Empty properties within %s ward"
msgstr "Eiddo gwag yn ward %s"
@@ -2762,12 +2612,10 @@ msgstr "Cyfeiriad yr eiddo:"
msgid "Property type:"
msgstr "Math o eiddo:"
-#: templates/web/bromley/report/new/fill_in_details_form.html:52
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:64
msgid "Provide a title"
msgstr "Provide a title"
-#: templates/web/bromley/report/display.html:57
#: templates/web/default/report/update-form.html:3
#: templates/web/fixmystreet/report/update-form.html:4
msgid "Provide an update"
@@ -2778,11 +2626,6 @@ msgstr "Rhowch ddiweddariad"
msgid "Providing a name and password is optional, but doing so will allow you to more easily report empty properties, leave updates and manage your reports."
msgstr "Providing a password is optional, but doing so will allow you to more easily report empty properties, leave updates and manage your reports."
-#: templates/web/bromley/report/new/fill_in_details_form.html:180
-msgid "Providing a password is optional, but doing so will allow you to more easily report future empty properties, leave updates and manage your reports."
-msgstr "Providing a password is optional, but doing so will allow you to more easily report future empty properties, leave updates and manage your reports."
-
-#: templates/web/bromley/report/display.html:144
#: templates/web/default/report/new/fill_in_details_form.html:173
#: templates/web/default/report/update-form.html:128
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:202
@@ -2813,7 +2656,6 @@ msgstr "Publish photo"
msgid "Publish the response"
msgstr "Publish the response"
-#: templates/web/default/questionnaire/completed.html:1
#: templates/web/default/questionnaire/completed.html:2
#: templates/web/default/questionnaire/index.html:0
#: templates/web/default/questionnaire/index.html:14
@@ -2837,9 +2679,7 @@ msgstr "Questionnaire %d sent for empty property %d"
msgid "Questionnaire filled in by empty property reporter"
msgstr "Llenwyd yr holiadur gan yr unigolyn a roddodd wybod am yr eiddo gwag"
-#: templates/web/bromley/report/display.html:37
#: templates/web/default/alert/_list.html:21
-#: templates/web/default/around/display_location.html:1
#: templates/web/default/around/display_location.html:3
#: templates/web/default/report/display.html:46
#: templates/web/default/reports/_rss.html:1
@@ -2849,11 +2689,11 @@ msgstr "Llenwyd yr holiadur gan yr unigolyn a roddodd wybod am yr eiddo gwag"
msgid "RSS feed"
msgstr "Porthiant RSS"
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:265 perllib/FixMyStreet/Cobrand/UK.pm:277
msgid "RSS feed for %s"
msgstr "RSS feed for %s"
-#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289
+#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
msgid "RSS feed for %s ward, %s"
msgstr "RSS feed for %s ward, %s"
@@ -2861,11 +2701,15 @@ msgstr "RSS feed for %s ward, %s"
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:189
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:197
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:309
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:200
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:208
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:218
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:226
+#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303
msgid "RSS feed of %s"
msgstr "Porthiant RSS %s"
-#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:314
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:308
msgid "RSS feed of %s, within %s ward"
msgstr "RSS feed of %s, within %s ward"
@@ -2878,31 +2722,30 @@ msgstr "Porthiant RSS o eiddo gwag sydd gerllaw"
msgid "RSS feed of empty properties in this %s"
msgstr "Porthiant RSS o eiddo gwag yn yr %s hwn"
-#: perllib/FixMyStreet/Cobrand/Default.pm:627
+#: perllib/FixMyStreet/Cobrand/Default.pm:630
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:110
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:154
-#: perllib/FixMyStreet/Cobrand/UK.pm:235
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:183
+#: perllib/FixMyStreet/Cobrand/UK.pm:229
msgid "RSS feed of empty properties within %s"
msgstr "Porthiant RSS o eiddo gwag yn yr %s hwn"
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:116
-#: perllib/FixMyStreet/Cobrand/UK.pm:241
+#: perllib/FixMyStreet/Cobrand/UK.pm:235
msgid "RSS feed of empty properties within %s ward"
msgstr "Porthiant RSS o eiddo gwag yn yr %s hwn"
-#: templates/web/default/around/display_location.html:1
+#: templates/web/default/around/display_location.html:3
#: templates/web/default/around/display_location.html:4
msgid "RSS feed of recent local empty properties"
msgstr "Porthiant RSS o eiddo gwag lleol diweddar"
-#: templates/web/bromley/report/display.html:37
#: templates/web/default/report/display.html:46
#: templates/web/fixmystreet/alert/updates.html:9
#: templates/web/fixmystreet/report/display.html:61
msgid "RSS feed of updates to this empty property"
msgstr "Porthiant RSS o ddiweddariadau i'r eiddo gwag hwn"
-#: templates/web/bromley/report/display.html:39
#: templates/web/default/alert/updates.html:9
#: templates/web/default/report/display.html:37
#: templates/web/fixmystreet/alert/updates.html:14
@@ -2926,7 +2769,7 @@ msgid "Recently returned to use"
msgstr "Wedi'u hadfer i'w defnyddio'n ddiweddar"
#: templates/web/default/index.html:35 templates/web/emptyhomes/index.html:24
-#: templates/web/fixmystreet/index.html:45
+#: templates/web/fixmystreet/index.html:49
msgid "Recently reported empty properties"
msgstr "Eiddo gwag yr adroddwyd amdanynt yn ddiweddar"
@@ -2943,8 +2786,8 @@ msgstr "Remember that, for the pilot project, FixMyBarangay is only for reportin
msgid "Remove flag"
msgstr "Remove flag"
-#: templates/web/default/admin/report_edit.html:89
-#: templates/web/default/admin/update_edit.html:57
+#: templates/web/default/admin/report_edit.html:94
+#: templates/web/default/admin/update_edit.html:62
#: templates/web/zurich/admin/update_edit.html:35
msgid "Remove photo (can't be undone!)"
msgstr "Remove photo (can't be undone!)"
@@ -2953,29 +2796,21 @@ msgstr "Remove photo (can't be undone!)"
msgid "Report Empty Homes"
msgstr "Rhoi gwybod am eiddo gwag"
-#: templates/web/barnet/footer.html:16 templates/web/bromley/footer.html:17
#: templates/web/default/footer.html:7 templates/web/emptyhomes/header.html:31
#: templates/web/fiksgatami/footer.html:5
#: templates/web/fiksgatami/nn/footer.html:5
-#: templates/web/fixmindelo/footer.html:37
-#: templates/web/fixmystreet/footer.html:44
-#: templates/web/oxfordshire/footer.html:19
-#: templates/web/reading/footer.html:6
-#: templates/web/seesomething/footer.html:11
-#: templates/web/stevenage/footer.html:39 templates/web/zurich/footer.html:17
+#: templates/web/fixmystreet/footer.html:47
+#: templates/web/zurich/footer.html:17
#: templates/web/zurich/nav_over_content.html:4
msgid "Report a property"
msgstr "Rhoi gwybod am eiddo gwag"
-#: templates/web/bromley/report/display.html:28
#: templates/web/fixmystreet/report/display.html:35
msgid "Report abuse"
msgstr "Report abuse"
#: templates/web/default/report_created.html:1
#: templates/web/default/report_created.html:3
-#: templates/web/seesomething/report_created.html:0
-#: templates/web/seesomething/report_created.html:8
msgid "Report created"
msgstr "Report created"
@@ -2985,22 +2820,21 @@ msgstr "Report on %s"
#: templates/web/default/index.html:14 templates/web/emptyhomes/index.html:5
#: templates/web/fixmystreet/around/intro.html:1
-#: templates/web/stevenage/around/intro.html:1
#: templates/web/zurich/around/intro.html:1
msgid "Report and view empty properties"
msgstr "Adrodd am eiddo gwag a gweld y rhain"
-#: templates/web/default/my/my.html:74
+#: templates/web/default/my/my.html:79
msgid "Reported %s"
msgstr "Reported %s"
-#: templates/web/default/my/my.html:72
+#: templates/web/default/my/my.html:77
msgid "Reported %s, to %s"
msgstr "Reported %s, to %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:559
+#: perllib/FixMyStreet/DB/Result/Problem.pm:561
#: templates/web/default/contact/index.html:45
-#: templates/web/fixmystreet/contact/index.html:58
+#: templates/web/fixmystreet/contact/index.html:62
msgid "Reported anonymously at %s"
msgstr "Adroddwyd yn ddi-enw am %s"
@@ -3010,9 +2844,9 @@ msgstr "Adroddwyd yn ddi-enw am %s"
msgid "Reported before"
msgstr "Wedi adrodd o'r blaen"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:582
+#: perllib/FixMyStreet/DB/Result/Problem.pm:584
#: templates/web/default/contact/index.html:47
-#: templates/web/fixmystreet/contact/index.html:60
+#: templates/web/fixmystreet/contact/index.html:64
msgid "Reported by %s at %s"
msgstr "Adroddwyd gan %s am %s"
@@ -3020,27 +2854,27 @@ msgstr "Adroddwyd gan %s am %s"
msgid "Reported in the %s category"
msgstr "Reported in the %s category"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:555
+#: perllib/FixMyStreet/DB/Result/Problem.pm:557
msgid "Reported in the %s category anonymously at %s"
msgstr "Adroddiwyd yn y categori %s yn ddi-enw am %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:577
+#: perllib/FixMyStreet/DB/Result/Problem.pm:579
msgid "Reported in the %s category by %s at %s"
msgstr "Adroddwyd yn y categori %s gan %s am %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:551
+#: perllib/FixMyStreet/DB/Result/Problem.pm:553
msgid "Reported via %s anonymously at %s"
msgstr "Adroddwyd gan %s yn ddi-enw am %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:573
+#: perllib/FixMyStreet/DB/Result/Problem.pm:575
msgid "Reported via %s by %s at %s"
msgstr "Adroddwyd gan %s trwy %s am %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:547
+#: perllib/FixMyStreet/DB/Result/Problem.pm:549
msgid "Reported via %s in the %s category anonymously at %s"
msgstr "Adroddwyd am hyn gan %s yn y categori %s yn ddi-enw, am %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:567
+#: perllib/FixMyStreet/DB/Result/Problem.pm:569
msgid "Reported via %s in the %s category by %s at %s"
msgstr "Adroddwyd gan %s yn y categori %s trwy %s am %s"
@@ -3054,22 +2888,18 @@ msgstr "Adroddwyd gan %s yn y categori %s trwy %s am %s"
#: templates/web/fixmystreet/report/new/fill_in_details.html:0
#: templates/web/fixmystreet/report/new/fill_in_details.html:5
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2
-#: templates/web/oxfordshire/js/translation_strings.html:35
-#: templates/web/seesomething/around/around_index.html:1
-#: templates/web/seesomething/report/new/fill_in_details_form.html:3
#: templates/web/zurich/report/new/fill_in_details_form.html:2
msgid "Reporting an empty property"
msgstr "Adrodd am eiddo gwag"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1177
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:242
-#: templates/web/seesomething/admin/stats.html:1
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1186
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:290
#: templates/web/zurich/header.html:60
msgid "Reports"
msgstr "Adroddiadau"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:393
-#: perllib/FixMyStreet/DB/Result/Problem.pm:397
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
+#: perllib/FixMyStreet/DB/Result/Problem.pm:399
#, fuzzy
msgid "Reports are limited to %s characters in length. Please shorten your report"
msgstr "Reports are limited to 2000 characters in length. Please shorten your report"
@@ -3091,27 +2921,28 @@ msgid "Resend report"
msgstr "Resend report"
#: templates/web/default/js/translation_strings.html:28
-#: templates/web/oxfordshire/js/translation_strings.html:22
msgid "Right place?"
msgstr "Right place?"
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:195
#: perllib/FixMyStreet/Geocode/OSM.pm:173
msgid "Road operator for this named road (derived from road reference number and type): %s"
msgstr "Road operator for this named road (derived from road reference number and type): %s"
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:192
#: perllib/FixMyStreet/Geocode/OSM.pm:170
msgid "Road operator for this named road (from OpenStreetMap): %s"
msgstr "Road operator for this named road (from OpenStreetMap): %s"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1377
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1388
-#: templates/web/default/admin/report_edit.html:85
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1386
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1397
+#: templates/web/default/admin/report_edit.html:90
#: templates/web/zurich/admin/report_edit.html:76
msgid "Rotate Left"
msgstr "Rotate Left"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1377
-#: templates/web/default/admin/report_edit.html:86
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1386
+#: templates/web/default/admin/report_edit.html:91
#: templates/web/zurich/admin/report_edit.html:77
msgid "Rotate Right"
msgstr "Rotate Right"
@@ -3163,7 +2994,7 @@ msgstr "Select an area"
msgid "Select which type of alert you'd like and click the button for an RSS feed, or enter your email address to subscribe to an email alert."
msgstr "Dewiswch y math o hysbysiad yr hoffech ei gael a chliciwch y botwm ar gyfer porthiant RSS,neu rhowch eich cyfeiriad e-bost i danysgrifio am hysbysiad e-bost."
-#: perllib/FixMyStreet/DB/Result/Problem.pm:664
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
msgid "Sent to %s %s later"
msgstr "Anfonwyd at %s %s yn ddiweddarach"
@@ -3180,9 +3011,6 @@ msgstr "Service:"
msgid "Share"
msgstr "Share"
-#: templates/web/bromley/report/display.html:205
-#: templates/web/bromley/report/new/fill_in_details_form.html:129
-#: templates/web/bromley/report/new/fill_in_details_form.html:175
#: templates/web/default/report/new/fill_in_details_form.html:210
#: templates/web/default/report/update-form.html:157
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:129
@@ -3205,11 +3033,7 @@ msgstr "Dangos pinnau"
#: templates/web/fixmystreet/auth/general.html:3
#: templates/web/fixmystreet/auth/general.html:42
#: templates/web/fixmystreet/auth/general.html:62
-#: templates/web/fixmystreet/header.html:54
-#: templates/web/oxfordshire/header.html:115
-#: templates/web/seesomething/auth/general.html:3
-#: templates/web/seesomething/auth/general.html:39
-#: templates/web/stevenage/header.html:101
+#: templates/web/fixmystreet/header.html:57
#: templates/web/zurich/auth/general.html:18
#: templates/web/zurich/auth/general.html:35
msgid "Sign in"
@@ -3221,20 +3045,15 @@ msgstr "Sign in by email"
#: templates/web/default/auth/general.html:1
#: templates/web/fixmystreet/auth/general.html:1
-#: templates/web/seesomething/auth/general.html:1
#: templates/web/zurich/auth/general.html:1
msgid "Sign in or create an account"
msgstr "Sign in or create an account"
-#: templates/web/bromley/auth/sign_out.html:1
#: templates/web/default/auth/sign_out.html:1
#: templates/web/default/header.html:30
#: templates/web/emptyhomes/header.html:46
#: templates/web/fiksgatami/header.html:22
#: templates/web/fiksgatami/nn/header.html:22
-#: templates/web/lichfielddc/header.html:177
-#: templates/web/reading/header.html:33
-#: templates/web/seesomething/auth/sign_out.html:1
#: templates/web/zurich/auth/sign_out.html:1
msgid "Sign out"
msgstr "Allgofnodi"
@@ -3243,14 +3062,12 @@ msgstr "Allgofnodi"
#: templates/web/emptyhomes/header.html:45
#: templates/web/fiksgatami/header.html:21
#: templates/web/fiksgatami/nn/header.html:21
-#: templates/web/lichfielddc/header.html:177
-#: templates/web/reading/header.html:32
msgid "Signed in as %s"
msgstr "Rydych chi wedi mewngofnodi fel"
-#: templates/web/default/report/new/fill_in_details_text.html:1
-#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1
-#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1
+#: templates/web/default/report/new/fill_in_details_text.html:2
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:2
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:2
msgid "Some categories may require additional information."
msgstr "Some categories may require additional information."
@@ -3281,6 +3098,8 @@ msgstr "Sori, bu gwall wrth gadarnhau eich eiddo gwag."
#: perllib/FixMyStreet/App/Controller/Report/New.pm:215
#: perllib/FixMyStreet/Geocode.pm:28 perllib/FixMyStreet/Geocode/Bing.pm:58
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:75
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:95
#: perllib/FixMyStreet/Geocode/Google.pm:74
#: perllib/FixMyStreet/Geocode/OSM.pm:66
msgid "Sorry, we could not find that location."
@@ -3288,7 +3107,7 @@ msgstr "Sori, ni fu modd i ni ddod o hyd i'r lleoliad hwnnw."
#: perllib/FixMyStreet/Geocode/Bing.pm:53
#: perllib/FixMyStreet/Geocode/Google.pm:69
-#: perllib/FixMyStreet/Geocode/Zurich.pm:87
+#: perllib/FixMyStreet/Geocode/Zurich.pm:88
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."
@@ -3302,7 +3121,6 @@ msgstr "Source code"
msgid "Start Date:"
msgstr "Start day:"
-#: templates/web/bromley/report/display.html:78
#: templates/web/default/admin/flagged.html:18
#: templates/web/default/admin/list_updates.html:11
#: templates/web/default/admin/reports.html:15
@@ -3319,8 +3137,8 @@ msgstr "State"
msgid "State:"
msgstr "State:"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1182
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:257
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1191
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:305
#: templates/web/default/admin/stats.html:1
#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72
msgid "Stats"
@@ -3336,7 +3154,7 @@ msgstr "Status"
msgid "Still open, via questionnaire, %s"
msgstr "Still open, via questionnaire, %s"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:370
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378
msgid "Subcategory: %s"
msgstr "Subcategory: %s"
@@ -3344,8 +3162,7 @@ msgstr "Subcategory: %s"
msgid "Subdivision/Body"
msgstr "Subdivision/Body"
-#: templates/web/bromley/report/new/fill_in_details_form.html:48
-#: templates/web/fixmystreet/contact/index.html:91
+#: templates/web/fixmystreet/contact/index.html:95
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:60
msgid "Subject"
msgstr "Subject"
@@ -3358,9 +3175,6 @@ msgstr "Subject"
msgid "Subject:"
msgstr "Pwnc:"
-#: templates/web/bromley/report/new/fill_in_details_form.html:140
-#: templates/web/bromley/report/new/fill_in_details_form.html:190
-#: templates/web/bromley/report/new/fill_in_details_form.html:204
#: templates/web/default/questionnaire/creator_fixed.html:19
#: templates/web/default/report/new/fill_in_details_form.html:114
#: templates/web/default/report/new/fill_in_details_form.html:154
@@ -3369,13 +3183,12 @@ msgstr "Pwnc:"
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:142
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:167
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:212
-#: templates/web/seesomething/report/new/fill_in_details_form.html:93
#: templates/web/zurich/report/new/fill_in_details_form.html:114
msgid "Submit"
msgstr "Anfon"
-#: templates/web/default/admin/report_edit.html:92
-#: templates/web/default/admin/update_edit.html:60
+#: templates/web/default/admin/report_edit.html:97
+#: templates/web/default/admin/update_edit.html:65
#: templates/web/default/admin/user-form.html:55
#: templates/web/zurich/admin/report_edit-sdm.html:67
#: templates/web/zurich/admin/report_edit.html:224
@@ -3388,8 +3201,8 @@ msgstr "Submit changes"
msgid "Submit questionnaire"
msgstr "Anfon yr holiadur"
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:111
-#: templates/web/zurich/admin/header.html:1
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:133
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/header.html:6
#: templates/web/zurich/admin/index-dm.html:23
#: templates/web/zurich/admin/index-dm.html:6
@@ -3401,7 +3214,6 @@ msgstr "Anfon yr holiadur"
msgid "Submitted"
msgstr "Submitted"
-#: templates/web/bromley/report/display.html:44
#: templates/web/default/alert/updates.html:17
#: templates/web/default/report/display.html:42
#: templates/web/fixmystreet/alert/updates.html:23
@@ -3419,8 +3231,8 @@ msgstr "Dymunaf danysgrifio i rybuddion drwy e-bost"
msgid "Subscribe to an alert based upon what baranagay you&rsquo;re in:"
msgstr "Subscribe to an alert based upon what baranagay you&rsquo;re in:"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1175
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:241
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1184
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:289
#: templates/web/default/admin/index.html:1
#: templates/web/zurich/admin/index-dm.html:1
#: templates/web/zurich/admin/index-sdm.html:1
@@ -3439,7 +3251,7 @@ msgstr "Summary"
msgid "Summary reports"
msgstr "Adroddiadau cryno"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1179
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1188
msgid "Survey"
msgstr "Survey"
@@ -3462,12 +3274,11 @@ msgstr "Text only version"
msgid "Text:"
msgstr "Text:"
-#: templates/web/default/tokens/confirm_update.html:7
#: templates/web/default/tokens/confirm_update.html:8
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."
-#: templates/web/emptyhomes/tokens/confirm_problem.html:6
+#: templates/web/emptyhomes/tokens/confirm_problem.html:7
#: templates/web/emptyhomes/tokens/confirm_problem.html:8
msgid "Thank you for reporting an empty property on ReportEmptyHomes.com. We have emailed the lead officer for empty homes in the council responsible with details, and asked them to do whatever they can to get the empty property back into use as soon as possible."
msgstr ""
@@ -3476,7 +3287,6 @@ msgstr ""
"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."
-#: templates/web/emptyhomes/tokens/confirm_problem.html:30
#: templates/web/emptyhomes/tokens/confirm_problem.html:31
msgid ""
"Thank you for reporting this empty property on ReportEmptyHomes.com.\n"
@@ -3492,7 +3302,7 @@ msgstr ""
"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."
-#: templates/web/emptyhomes/tokens/confirm_problem.html:24
+#: templates/web/emptyhomes/tokens/confirm_problem.html:25
#: templates/web/emptyhomes/tokens/confirm_problem.html:26
msgid "Thank you for using ReportEmptyHomes.com. Your action is already helping to resolve the UK&rsquo;s empty homes crisis."
msgstr ""
@@ -3515,15 +3325,16 @@ msgstr "Diolch, falch o glywed ei fod wedi cael ei adfer i'w ddefnyddio! Fyddai
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."
-#: perllib/FixMyStreet/App/Controller/Council.pm:90
+#: perllib/FixMyStreet/App/Controller/Council.pm:100
msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
msgstr "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
-#: perllib/FixMyStreet/App/Controller/Location.pm:123
+#: perllib/FixMyStreet/App/Controller/Location.pm:124
msgid "That location does not appear to be in the UK; please try again."
msgstr "That location does not appear to be in the UK; please try again."
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:63
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:79
#: perllib/FixMyStreet/Cobrand/UK.pm:86
msgid "That postcode was not recognised, sorry."
msgstr "Ni chafodd y cod post hwnnw ei gydnabod, sori."
@@ -3583,7 +3394,7 @@ msgstr ""
msgid "The confirmation email <strong>may</strong> take a few minutes to arrive &mdash; <em>please</em> be patient."
msgstr "<strong>Gall</strong> y neges e-bost o gadarnhad gymryd ychydig funudau i gyrraedd &mdash; byddwch yn amyneddgar, <em>os gwelwch yn dda</em>."
-#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:2
#: templates/web/fixmystreet/report/new/fill_in_details_text.html:3
msgid "The council won&rsquo;t be able to help unless you leave as much detail as you can. Please describe the exact location of the empty property (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the empty property if you have one), etc."
msgstr "The council won&rsquo;t be able to help unless you leave as much detail as you can. Please describe the exact location of the empty property (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the empty property if you have one), etc."
@@ -3610,6 +3421,7 @@ msgstr "The error was: %s"
msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
msgstr "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:187
#: perllib/FixMyStreet/Geocode/OSM.pm:165
msgid "The following information about the nearest road might be inaccurate or irrelevant, if the empty property is close to several roads or close to a road without a name registered in OpenStreetMap."
msgstr "The following information about the nearest road might be inaccurate or irrelevant, if the empty property is close to several roads or close to a road without a name registered in OpenStreetMap."
@@ -3668,7 +3480,7 @@ msgstr ""
msgid "The passwords do not match"
msgstr "The passwords do not match"
-#: templates/web/default/errors/page_error_404_not_found.html:10
+#: templates/web/default/errors/page_error_404_not_found.html:11
#: templates/web/default/errors/page_error_404_not_found.html:12
msgid "The requested URL '%s' was not found on this server"
msgstr "The requested URL '%s' was not found on this server"
@@ -3678,16 +3490,14 @@ msgstr "The requested URL '%s' was not found on this server"
msgid "The simplest alert is our geographic one:"
msgstr "Yr hysbysiad symlaf yw ein hysbysiad daearyddol:"
-#: templates/web/barnet/report/new/councils_text_all.html:3
#: templates/web/default/report/new/councils_extra_text.html:1
-#: templates/web/default/report/new/councils_text_some.html:10
#: templates/web/default/report/new/councils_text_some.html:11
#: templates/web/default/report/new/fill_in_details_form.html:17
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12
msgid "The subject and details of the empty property will be public, plus your name if you give us permission."
msgstr "The subject and details of the empty property will be public, plus your name if you give us permission."
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:291
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:296
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 "
@@ -3702,16 +3512,15 @@ msgstr ""
msgid "There was an empty property showing the All Reports page. Please try again later."
msgstr "There was an empty property showing the All Reports page. Please try again later."
-#: perllib/FixMyStreet/App/Controller/Contact.pm:116
+#: perllib/FixMyStreet/App/Controller/Contact.pm:121
#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59
msgid "There was an empty property showing this page. Please try again later."
msgstr "There was an empty property showing this page. Please try again later."
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:747
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:755
#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134
#: templates/web/default/auth/general.html:23
#: templates/web/fixmystreet/auth/general.html:24
-#: templates/web/seesomething/auth/general.html:24
#: templates/web/zurich/auth/general.html:28
msgid "There was an empty property with your email/password combination. If you cannot remember your password, or do not have one, please fill in the &lsquo;sign in by email&rsquo; section of the form."
msgstr "There was an empty property with your email/password combination. If you cannot remember your password, or do not have one, please fill in the &lsquo;sign in by email&rsquo; section of the form."
@@ -3724,7 +3533,7 @@ msgstr "There was an empty property with your email/password combination. Please
msgid "There was an empty property with your update. Please try again."
msgstr "There was an empty property with your update. Please try again."
-#: perllib/FixMyStreet/App/Controller/Contact.pm:120
+#: perllib/FixMyStreet/App/Controller/Contact.pm:125
msgid "There were problems with your report. Please see below."
msgstr "Cafwyd anhawsterau gyda'ch adroddiad. Gweler isod."
@@ -3764,16 +3573,16 @@ msgid ""
" A body will not receive any reports unless it covers at least one area."
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:375
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:385
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 "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."
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:388
msgid "This email has been sent to several councils covering the location of the empty property, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue."
msgstr "This email has been sent to several councils covering the location of the empty property, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue."
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:894
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:964
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:898
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:968
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:131
#: perllib/FixMyStreet/Cobrand/UK.pm:58
msgid "This information is required"
@@ -3806,7 +3615,6 @@ msgstr "This may be because the link is too old or already used, or the address
msgid "This empty property has been closed"
msgstr "This empty property has been closed"
-#: templates/web/bromley/report/display.html:98
#: templates/web/default/report/banner.html:12
#: templates/web/default/report/update-form.html:48
#: templates/web/emptyhomes/report/banner.html:3
@@ -3814,7 +3622,6 @@ msgstr "This empty property has been closed"
msgid "This empty property has been returned to use"
msgstr "Mae'r eiddo gwag hwn wedi cael ei adfer i'w ddefnyddio"
-#: templates/web/bromley/report/display.html:92
#: templates/web/default/report/update-form.html:43
#: templates/web/fixmystreet/report/update-form.html:40
msgid "This empty property has not been returned to use"
@@ -3828,33 +3635,33 @@ msgstr "This empty property is in progress"
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."
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:108
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:109
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:130
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:131
#: templates/web/zurich/report/_main.html:14
msgid "This report is awaiting moderation."
msgstr "This report is awaiting moderation."
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88
msgid "This report is currently marked as closed."
msgstr "This report is currently marked as closed."
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86
msgid "This report is currently marked as returned to use."
msgstr "This report is currently marked as returned to use."
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:90
msgid "This report is currently marked as open."
msgstr "This report is currently marked as open."
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:320
msgid "This report was submitted anonymously"
msgstr "Cyflwynwyd yr adroddiad hwn yn ddi-enw"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:284
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:289
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."
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1178
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1187
#: templates/web/default/admin/timeline.html:1
msgid "Timeline"
msgstr "Timeline"
@@ -3872,7 +3679,7 @@ msgstr "I <strong> roi gwybod am broblem</strong>, cliciwch ar y lleoliad cywir
msgid "To find out what local alerts we have in your area, council or ward, please enter your postcode or street name and area"
msgstr "To find out what local alerts we have in your area, council or ward, please enter your postcode or street name and area"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:290
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:295
msgid "To view a map of the precise location of this issue"
msgstr "Gweld map o union leoliad y broblem hon"
@@ -3884,17 +3691,10 @@ msgstr "Gweld map o union leoliad y broblem hon"
msgid "Total"
msgstr "Total"
-#: templates/web/seesomething/report/new/fill_in_details_form.html:24
-msgid "Transport Category"
-msgstr "Transport Category"
-
#: templates/web/default/js/translation_strings.html:29
-#: templates/web/oxfordshire/js/translation_strings.html:23
msgid "Try again"
msgstr "Try again"
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:83
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:46
#: templates/web/default/report/update-form.html:30
@@ -3922,7 +3722,6 @@ msgid "Unknown alert type"
msgstr "Unknown alert type"
#: templates/web/default/js/translation_strings.html:39
-#: templates/web/oxfordshire/js/translation_strings.html:33
msgid "Unknown error"
msgstr "Unknown error"
@@ -3930,7 +3729,6 @@ msgstr "Unknown error"
msgid "Unknown empty property ID"
msgstr "ID eiddo gwag anhysbys"
-#: templates/web/bromley/report/display.html:66
#: templates/web/fixmystreet/report/update-form.html:19
msgid "Update"
msgstr "Update"
@@ -3940,12 +3738,12 @@ msgid "Update %s created for empty property %d; by %s"
msgstr "Update %s created for empty property %d; by %s"
#: templates/web/default/contact/index.html:21
-#: templates/web/fixmystreet/contact/index.html:34
+#: templates/web/fixmystreet/contact/index.html:38
msgid "Update below added anonymously at %s"
msgstr "Update below added anonymously at %s"
#: templates/web/default/contact/index.html:23
-#: templates/web/fixmystreet/contact/index.html:36
+#: templates/web/fixmystreet/contact/index.html:40
msgid "Update below added by %s at %s"
msgstr "Update below added by %s at %s"
@@ -3989,12 +3787,12 @@ msgstr "Diweddariad:"
msgid "Updated"
msgstr "Updated"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1042
-#: perllib/FixMyStreet/App/Controller/Admin.pm:796
-#: perllib/FixMyStreet/App/Controller/Admin.pm:940
-#: perllib/FixMyStreet/App/Controller/Admin.pm:998
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:487
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:556
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1007
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1051
+#: perllib/FixMyStreet/App/Controller/Admin.pm:801
+#: perllib/FixMyStreet/App/Controller/Admin.pm:949
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:550
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:619
msgid "Updated!"
msgstr "Updated!"
@@ -4006,16 +3804,15 @@ msgstr "Updated!"
msgid "Updates"
msgstr "Diweddariadau"
-#: perllib/FixMyStreet/DB/Result/Comment.pm:131
-msgid "Updates are limited to 2000 characters in length. Please shorten your update"
+#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+#, fuzzy
+msgid "Updates are limited to %s characters in length. Please shorten your update"
msgstr "Updates are limited to 2000 characters in length. Please shorten your update"
#: db/alert_types.pl:5 db/alert_types.pl:6
msgid "Updates on {{title}}"
msgstr "Diweddariadau am {{title}}"
-#: templates/web/bromley/report/display.html:0
-#: templates/web/bromley/report/display.html:8
#: templates/web/default/report/display.html:0
#: templates/web/default/report/display.html:5
#: templates/web/fixmystreet/report/display.html:0
@@ -4033,11 +3830,11 @@ msgstr ""
msgid "User"
msgstr "Users"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1342
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1351
msgid "User flag removed"
msgstr "User flag removed"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1314
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1323
msgid "User flagged"
msgstr "User flagged"
@@ -4045,8 +3842,8 @@ msgstr "User flagged"
msgid "User search finds matches in users' names and email addresses."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:256
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1189
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:304
#: templates/web/default/admin/flagged.html:29
#: templates/web/zurich/header.html:69
msgid "Users"
@@ -4075,12 +3872,9 @@ msgstr "Gweld eich adroddiad"
#: templates/web/default/around/display_location.html:0
#: templates/web/default/around/display_location.html:34
-#: templates/web/seesomething/around/display_location.html:0
-#: templates/web/seesomething/around/display_location.html:16
msgid "Viewing a location"
msgstr "Gweld lleoliad"
-#: templates/web/bromley/report/display.html:0
#: templates/web/default/report/display.html:0
#: templates/web/fixmystreet/report/display.html:0
msgid "Viewing an empty property"
@@ -4093,7 +3887,6 @@ msgstr "Wards of this council"
#: templates/web/default/alert/choose.html:6
#: templates/web/default/around/around_index.html:13
#: templates/web/fixmystreet/around/around_index.html:16
-#: templates/web/seesomething/around/around_index.html:13
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."
@@ -4105,25 +3898,22 @@ msgstr "We have not been able to confirm your account - sorry."
msgid "We have sent you an email containing a link to confirm your account."
msgstr "We have sent you an email containing a link to confirm your account."
-#: templates/web/emptyhomes/tokens/confirm_problem.html:18
+#: templates/web/emptyhomes/tokens/confirm_problem.html:19
#: templates/web/emptyhomes/tokens/confirm_problem.html:20
msgid "We may contact you periodically to ask if anything has changed with the property you reported."
msgstr "Efallai y cysylltwn â chi o bryd i’w gilydd i ofyn a fu unrhyw newid i sefyllfa’r eiddo rydych chi wedi rhoi gwybod amdano."
-#: templates/web/bromley/report/display.html:143
#: templates/web/fixmystreet/report/update-form.html:115
msgid "We never show your email"
msgstr "We never show your email"
-#: templates/web/bromley/report/new/fill_in_details_form.html:133
-#: templates/web/bromley/report/new/fill_in_details_form.html:179
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:134
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:201
#: templates/web/zurich/report/new/fill_in_details_form.html:96
msgid "We never show your email address or phone number."
msgstr "We never show your email address or phone number."
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:384
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:394
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 "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."
@@ -4131,14 +3921,12 @@ msgstr "We realise this empty property might be the responsibility of %s; howeve
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"
-#: templates/web/bromley/report/new/fill_in_details_form.html:217
#: templates/web/default/report/new/notes.html:5
#: templates/web/fixmybarangay/report/new/notes.html:5
msgid "We will only use your personal information in accordance with our <a href=\"/faq#privacy\">privacy policy.</a>"
msgstr "We will only use your personal information in accordance with our <a href=\"/faq#privacy\">privacy policy.</a>"
#: templates/web/fixmystreet/report/new/notes.html:4
-#: templates/web/oxfordshire/report/new/notes.html:4
msgid "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>"
msgstr "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>"
@@ -4171,13 +3959,11 @@ msgstr "Bloc cyfan o fflatiau gwag"
msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>."
msgstr "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>."
-#: templates/web/fixmystreet/footer.html:21
-#: templates/web/stevenage/footer.html:22
+#: templates/web/fixmystreet/footer.html:24
msgid "Would you like better integration with reportemptyhomes.com? <a href=\"http://www.mysociety.org/for-councils/fixmystreet/\">Find out about reportemptyhomes.com for councils</a>."
msgstr "Would you like better integration with reportemptyhomes.com? <a href=\"http://www.mysociety.org/for-councils/fixmystreet/\">Find out about reportemptyhomes.com for councils</a>."
-#: templates/web/fixmystreet/footer.html:17
-#: templates/web/stevenage/footer.html:18
+#: templates/web/fixmystreet/footer.html:20
msgid "Would you like to contribute to reportemptyhomes.com? Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>."
msgstr "Would you like to contribute to reportemptyhomes.com? Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>."
@@ -4189,7 +3975,6 @@ msgstr "Would you like to receive another questionnaire in 4 weeks, reminding yo
#: templates/web/default/report/new/notes.html:8
#: templates/web/fixmybarangay/report/new/notes.html:8
#: templates/web/fixmystreet/report/new/notes.html:8
-#: templates/web/oxfordshire/report/new/notes.html:7
msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
msgstr "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
@@ -4219,26 +4004,24 @@ msgstr "Year"
msgid "Yes"
msgstr "Ydw"
-#: templates/web/bromley/report/display.html:157
-#: templates/web/bromley/report/new/fill_in_details_form.html:198
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:161
#: templates/web/fixmystreet/report/update-form.html:89
msgid "Yes I have a password"
msgstr "Yes I have a password"
#: templates/web/default/contact/index.html:37
-#: templates/web/fixmystreet/contact/index.html:50
+#: templates/web/fixmystreet/contact/index.html:54
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:"
#: templates/web/default/contact/index.html:15
-#: templates/web/fixmystreet/contact/index.html:28
+#: templates/web/fixmystreet/contact/index.html:32
msgid "You are reporting the following update for being abusive, containing personal information, or similar:"
msgstr "You are reporting the following update for being abusive, containing personal information, or similar:"
-#: templates/web/default/tokens/confirm_problem.html:19
+#: templates/web/default/tokens/confirm_problem.html:20
#: templates/web/default/tokens/confirm_problem.html:21
-#: templates/web/zurich/tokens/confirm_problem.html:5
+#: templates/web/zurich/tokens/confirm_problem.html:6
#: templates/web/zurich/tokens/confirm_problem.html:8
msgid "You can <a href=\"%s%s\">view the empty property on this site</a>."
msgstr "Gallwch <a href=\"%s\">weld yr eiddo gwag ar y safle hwn</a>."
@@ -4247,6 +4030,10 @@ msgstr "Gallwch <a href=\"%s\">weld yr eiddo gwag ar y safle hwn</a>."
msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
msgstr ""
+#: templates/web/fixmystreet/contact/index.html:118
+msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
+msgstr ""
+
#: templates/web/default/admin/flagged.html:5
msgid ""
"You can flag any report or user by editing them, and they will be listed on this page.\n"
@@ -4254,9 +4041,9 @@ msgid ""
" reports in the past."
msgstr ""
-#: templates/web/default/report/new/councils_text_none.html:11
-#: templates/web/default/report/new/councils_text_none.html:13
-#: templates/web/default/report/new/councils_text_some.html:20
+#: templates/web/default/report/new/councils_text_none.html:19
+#: templates/web/default/report/new/councils_text_none.html:20
+#: templates/web/default/report/new/councils_text_some.html:21
#: templates/web/default/report/new/councils_text_some.html:22
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 "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>."
@@ -4266,7 +4053,6 @@ msgid "You can mark a body as deleted if you do not want it to be active on the
msgstr ""
#: templates/web/default/js/translation_strings.html:36
-#: templates/web/oxfordshire/js/translation_strings.html:30
msgid "You declined; please fill in the box above"
msgstr "You declined; please fill in the box above"
@@ -4274,30 +4060,25 @@ msgstr "You declined; please fill in the box above"
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"
-#: templates/web/bromley/report/new/fill_in_details_form.html:97
#: templates/web/default/questionnaire/index.html:96
#: templates/web/default/report/new/fill_in_details_form.html:93
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:90
#: templates/web/fixmystreet/questionnaire/index.html:87
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:99
-#: templates/web/seesomething/report/new/fill_in_details_form.html:59
#: templates/web/zurich/report/new/fill_in_details_form.html:75
msgid "You have already attached a photo to this report, attaching another one will replace it."
msgstr "Rydych chi eisoes wedi atodi ffotograff wrth yr adroddiad hwn. Bydd atodi llun arall yn disodli’r ffotograff hwnnw."
-#: templates/web/bromley/report/display.html:108
#: templates/web/default/report/update-form.html:59
#: templates/web/fixmystreet/report/update-form.html:56
msgid "You have already attached a photo to this update, attaching another one will replace it."
msgstr "You have already attached a photo to this update, attaching another one will replace it."
#: templates/web/default/auth/sign_out.html:3
-#: templates/web/seesomething/auth/sign_out.html:3
#: templates/web/zurich/auth/sign_out.html:3
msgid "You have been signed out"
msgstr "You have been signed out"
-#: templates/web/bromley/report/new/fill_in_details_form.html:25
#: templates/web/default/report/new/fill_in_details_form.html:7
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:7
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:28
@@ -4309,17 +4090,14 @@ msgstr "Rydych wedi dangos lleoliad y broblem wrth y pin gwyrdd ar y map. Os nad
msgid "You have successfully confirmed your alert."
msgstr "Rydych wedi cadarnhau'ch hysbysiad yn llwyddiannus."
-#: templates/web/zurich/tokens/confirm_problem.html:5
#: templates/web/zurich/tokens/confirm_problem.html:6
msgid "You have successfully confirmed your email address."
msgstr "You have successfully confirmed your email address."
-#: templates/web/default/tokens/confirm_problem.html:14
#: templates/web/default/tokens/confirm_problem.html:15
msgid "You have successfully confirmed your empty property"
msgstr "Rydych wedi cadarnhau eich eiddo gwag yn llwyddiannus"
-#: templates/web/default/tokens/confirm_update.html:11
#: templates/web/default/tokens/confirm_update.html:12
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>."
@@ -4332,11 +4110,15 @@ msgstr "You have successfully created your alert."
msgid "You have successfully deleted your alert."
msgstr "Rydych wedi dileu'ch hysbysiad yn llwyddiannus."
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:754
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:762
#: perllib/FixMyStreet/App/Controller/Report/Update.pm:140
msgid "You have successfully signed in; please check and confirm your details are accurate:"
msgstr "You have successfully signed in; please check and confirm your details are accurate:"
+#: templates/web/default/my/my.html:17 templates/web/fixmystreet/my/my.html:17
+msgid "You haven&rsquo;t created any reports yet. <a href=\"%s\">Report a property now.</a>"
+msgstr ""
+
#: templates/web/default/email_sent.html:13
msgid "You must now click the link in the email we've just sent you."
msgstr "Rhaid i chi nawr glicio ar y ddolen yn y neges e-bost rydym newydd ei hanfon atoch chi."
@@ -4363,13 +4145,10 @@ msgstr "You really want to resend?"
msgid "Your Reports"
msgstr "Your Reports"
-#: templates/web/bromley/report/display.html:41
-#: templates/web/bromley/report/display.html:43
-#: templates/web/bromley/report/new/fill_in_details_form.html:145
#: templates/web/fixmystreet/alert/_list.html:89
#: templates/web/fixmystreet/alert/updates.html:19
#: templates/web/fixmystreet/alert/updates.html:22
-#: templates/web/fixmystreet/contact/index.html:84
+#: templates/web/fixmystreet/contact/index.html:88
#: templates/web/fixmystreet/report/display.html:65
#: templates/web/fixmystreet/report/display.html:67
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:115
@@ -4378,14 +4157,8 @@ msgstr "Your Reports"
msgid "Your email"
msgstr "Your email"
-#: templates/web/seesomething/report/new/fill_in_details_form.html:81
-msgid "Your email (optional)"
-msgstr "Your email (optional)"
-
-#: templates/web/bromley/report/display.html:132
#: templates/web/fixmystreet/auth/general.html:26
#: templates/web/fixmystreet/report/update-form.html:80
-#: templates/web/seesomething/auth/general.html:26
#: templates/web/zurich/auth/general.html:30
#: templates/web/zurich/auth/general.html:58
msgid "Your email address"
@@ -4403,28 +4176,15 @@ msgstr "Your email address:"
msgid "Your email:"
msgstr "Eich cyfeiriad e-bost:"
-#: templates/web/bromley/report/display.html:195
-#: templates/web/bromley/report/new/fill_in_details_form.html:117
-#: templates/web/bromley/report/new/fill_in_details_form.html:164
-msgid "Your first name"
-msgstr "Your first name"
-
-#: templates/web/fixmystreet/report/updates-sidebar-notes.html:5
+#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7
msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>"
msgstr "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>"
-#: templates/web/bromley/report/display.html:201
-#: templates/web/bromley/report/new/fill_in_details_form.html:123
-#: templates/web/bromley/report/new/fill_in_details_form.html:170
-msgid "Your last name"
-msgstr "Your last name"
-
#: templates/web/fixmystreet/auth/general.html:57
-#: templates/web/fixmystreet/contact/index.html:77
+#: templates/web/fixmystreet/contact/index.html:81
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:124
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:192
#: templates/web/fixmystreet/report/update-form.html:140
-#: templates/web/seesomething/report/new/fill_in_details_form.html:79
#: templates/web/zurich/auth/general.html:61
#: templates/web/zurich/report/new/fill_in_details_form.html:104
msgid "Your name"
@@ -4438,12 +4198,9 @@ msgstr "Your name"
msgid "Your name:"
msgstr "Eich enw:"
-#: templates/web/bromley/report/display.html:162
-#: templates/web/bromley/report/new/fill_in_details_form.html:203
#: templates/web/fixmystreet/auth/general.html:41
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:166
#: templates/web/fixmystreet/report/update-form.html:94
-#: templates/web/seesomething/auth/general.html:30
#: templates/web/zurich/auth/general.html:34
msgid "Your password"
msgstr "Your password"
@@ -4452,11 +4209,8 @@ msgstr "Your password"
msgid "Your password has been changed"
msgstr "Your password has been changed"
-#: templates/web/bromley/report/new/fill_in_details_form.html:137
-#: templates/web/bromley/report/new/fill_in_details_form.html:184
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:139
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:206
-#: templates/web/seesomething/report/new/fill_in_details_form.html:90
#: templates/web/zurich/report/new/fill_in_details_form.html:110
msgid "Your phone number"
msgstr "Your phone number"
@@ -4469,19 +4223,13 @@ msgstr "Your report"
msgid "Your report has been created and will shortly be sent."
msgstr "Your report has been created and will shortly be sent."
-#: templates/web/barnet/footer.html:18 templates/web/bromley/footer.html:19
-#: templates/web/bromley/header.html:75 templates/web/default/footer.html:9
-#: templates/web/fiksgatami/footer.html:6
+#: templates/web/default/footer.html:9 templates/web/fiksgatami/footer.html:6
#: templates/web/fiksgatami/nn/footer.html:6
-#: templates/web/fixmindelo/footer.html:39
-#: templates/web/fixmystreet/footer.html:46
-#: templates/web/oxfordshire/footer.html:21
-#: templates/web/oxfordshire/header.html:63
-#: templates/web/reading/footer.html:7 templates/web/stevenage/footer.html:41
+#: templates/web/fixmystreet/footer.html:49
msgid "Your reports"
msgstr "Your reports"
-#: templates/web/default/my/my.html:45 templates/web/fixmystreet/my/my.html:49
+#: templates/web/default/my/my.html:50 templates/web/fixmystreet/my/my.html:56
msgid "Your updates"
msgstr "Your updates"
@@ -4498,7 +4246,7 @@ msgstr "by %s"
msgid "council"
msgstr "cyngor"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
msgid "council ref:&nbsp;%s"
msgstr "council ref:&nbsp;%s"
@@ -4510,7 +4258,6 @@ msgstr "didn't use map"
#: templates/web/default/alert/index.html:33
#: templates/web/fixmystreet/around/postcode_form.html:20
-#: templates/web/seesomething/around/postcode_form.html:9
msgid "e.g. ‘%s’ or ‘%s’"
msgstr "e.g. ‘%s’ or ‘%s’"
@@ -4524,13 +4271,12 @@ msgstr "Add user"
msgid "from %d different users"
msgstr "from %d different users"
-#: templates/web/bromley/report/_item.html:12
-#: templates/web/fixmystreet/report/_item.html:12
+#: templates/web/fixmystreet/report/_item.html:17
#: templates/web/zurich/report/_item.html:16
msgid "last updated %s"
msgstr "last updated %s"
-#: perllib/Utils.pm:263
+#: perllib/Utils.pm:265
msgid "less than a minute"
msgstr "llai na munud"
@@ -4597,21 +4343,20 @@ msgid "or"
msgstr "neu"
#: templates/web/default/js/translation_strings.html:27
-#: templates/web/oxfordshire/js/translation_strings.html:21
msgid "or locate me automatically"
msgstr "neu dewch o hyd i mi’n awtomatig"
-#: templates/web/default/admin/report_edit.html:24
+#: templates/web/default/admin/report_edit.html:25
#: templates/web/default/admin/report_edit.html:26
-#: templates/web/zurich/admin/report_edit-sdm.html:30
+#: templates/web/zurich/admin/report_edit-sdm.html:31
#: templates/web/zurich/admin/report_edit-sdm.html:32
-#: templates/web/zurich/admin/report_edit-sdm.html:39
+#: templates/web/zurich/admin/report_edit-sdm.html:40
#: templates/web/zurich/admin/report_edit-sdm.html:41
-#: templates/web/zurich/admin/report_edit.html:30
+#: templates/web/zurich/admin/report_edit.html:31
#: templates/web/zurich/admin/report_edit.html:32
-#: templates/web/zurich/admin/report_edit.html:41
+#: templates/web/zurich/admin/report_edit.html:42
#: templates/web/zurich/admin/report_edit.html:43
-#: templates/web/zurich/admin/report_edit.html:53
+#: templates/web/zurich/admin/report_edit.html:54
#: templates/web/zurich/admin/report_edit.html:55
msgid "originally entered: &ldquo;%s&rdquo;"
msgstr "originally entered: &ldquo;%s&rdquo;"
@@ -4625,23 +4370,17 @@ msgstr "other areas:"
msgid "reopened"
msgstr "wedi'i ailagor"
-#: templates/web/barnet/header.html:71 templates/web/bromley/header.html:100
-#: templates/web/bromley/header.html:65
#: templates/web/fixmybarangay/header.html:67
-#: templates/web/fixmystreet/header.html:51
-#: templates/web/oxfordshire/header.html:112
-#: templates/web/oxfordshire/header.html:48
-#: templates/web/stevenage/header.html:98 templates/web/zurich/footer.html:12
+#: templates/web/fixmystreet/header.html:54
+#: templates/web/zurich/footer.html:12
msgid "sign out"
msgstr "sign out"
-#: templates/web/bromley/report/new/fill_in_details_form.html:4
-#: templates/web/bromley/report/new/fill_in_details_form.html:7
-#: templates/web/default/report/new/fill_in_details_form.html:11
+#: templates/web/default/report/new/fill_in_details_form.html:12
#: templates/web/default/report/new/fill_in_details_form.html:14
-#: templates/web/emptyhomes/report/new/fill_in_details_form.html:11
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:12
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:14
-#: templates/web/fixmystreet/report/new/fill_in_details_form.html:6
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:7
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:9
msgid "the local council"
msgstr "y cyngor lleol"
@@ -4651,11 +4390,11 @@ msgstr "y cyngor lleol"
msgid "there is no pin shown as the user did not use the map"
msgstr "there is no pin shown as the user did not use the map"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:362
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:370
msgid "this type of local empty property"
msgstr "math hwn o eiddo gwag lleol"
-#: perllib/Utils.pm:235
+#: perllib/Utils.pm:237
msgid "today"
msgstr "heddiw"
@@ -4685,7 +4424,7 @@ 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/Utils.pm:282
+#: perllib/Utils.pm:284
#, perl-format
msgid "%d hour"
msgid_plural "%d hours"
@@ -4699,7 +4438,7 @@ msgid_plural "%d supporters"
msgstr[0] "%d supporter"
msgstr[1] "%d supporters"
-#: perllib/Utils.pm:284
+#: perllib/Utils.pm:286
#, perl-format
msgid "%d minute"
msgid_plural "%d minutes"
@@ -4720,7 +4459,7 @@ msgid_plural "We do not yet have details for the councils that cover this locati
msgstr[0] "Ar hyn o bryd, nid oes gennym fanylion y cyngor sy’n gyfrifol am y lleoliad hwn. Os byddwch yn cyflwyno adroddiad fan hyn, caiff ei adael ar y safle, ond ni fydd y cyngor yn cael gwybod amdano – gadewch eich adroddiad serch hynny, fel y gallwn ddangos i’r cyngor pa weithgarwch sydd yn ei ardal."
msgstr[1] "Ar hyn o bryd, nid oes gennym fanylion y cyngor sy’n gyfrifol am y lleoliad hwn. Os byddwch yn cyflwyno adroddiad fan hyn, caiff ei adael ar y safle, ond ni fydd y cyngor yn cael gwybod amdano – gadewch eich adroddiad serch hynny, fel y gallwn ddangos i’r cyngor pa weithgarwch sydd yn ei ardal."
-#: perllib/Utils.pm:278
+#: perllib/Utils.pm:280
#, perl-format
msgid "%d week"
msgid_plural "%d weeks"
@@ -4741,6 +4480,13 @@ 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/Utils.pm:282
+#, perl-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d diwrnod"
+msgstr[1] "%d diwrnod"
+
#: templates/web/default/report/new/councils_text_some.html:14
#, perl-format
msgid "We do <strong>not</strong> yet have details for the other council that covers this location."
@@ -4748,12 +4494,48 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils
msgstr[0] "We do <strong>not</strong> yet have details for the other council that covers this location."
msgstr[1] "We do <strong>not</strong> yet have details for the other councils that cover this location."
-#: perllib/Utils.pm:280
-#, perl-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d diwrnod"
-msgstr[1] "%d diwrnod"
+#, fuzzy
+#~ msgid "Click on the map to report an empty property"
+#~ msgstr "Sut i roi gwybod am eiddo gwag"
+
+#~ msgid "First Name"
+#~ msgstr "First Name"
+
+#~ msgid "Incident Category"
+#~ msgstr "Incident Category"
+
+#~ msgid "Last Name"
+#~ msgstr "Last Name"
+
+#~ msgid "Name (optional)"
+#~ msgstr "Name (optional)"
+
+#~ msgid "Please choose a transport category"
+#~ msgstr "Please choose a transport category"
+
+#~ msgid "Please choose an incident category"
+#~ msgstr "Please choose an incident category"
+
+#~ msgid "Please describe the exact location of the report. Example: “2 dumped mattresses outside Number 19 Stockwell Close”"
+#~ msgstr "Please describe the exact location of the report. Example: “2 dumped mattresses outside Number 19 Stockwell Close”"
+
+#~ msgid "Please note that updates are not sent to the relevant department. 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 "Please note that updates are not sent to the relevant department. 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>"
+
+#~ msgid "Providing a password is optional, but doing so will allow you to more easily report future empty properties, leave updates and manage your reports."
+#~ msgstr "Providing a password is optional, but doing so will allow you to more easily report future empty properties, leave updates and manage your reports."
+
+#~ msgid "Transport Category"
+#~ msgstr "Transport Category"
+
+#~ msgid "Your email (optional)"
+#~ msgstr "Your email (optional)"
+
+#~ msgid "Your first name"
+#~ msgstr "Your first name"
+
+#~ msgid "Your last name"
+#~ msgstr "Your last name"
#, fuzzy
#~ msgid "The email field is required"
diff --git a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po
index 56539f994..288102870 100644
--- a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: fixmystreet\n"
"Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2013-11-12 13:15+0000\n"
-"PO-Revision-Date: 2013-09-05 16:55+0000\n"
+"POT-Creation-Date: 2014-05-16 17:30+0100\n"
+"PO-Revision-Date: 2013-11-20 13:29+0000\n"
"Last-Translator: mysociety <transifex@mysociety.org>\n"
"Language-Team: German (Switzerland) (http://www.transifex.com/projects/p/fixmystreet/language/de_CH/)\n"
"Language: de_CH\n"
@@ -18,25 +18,25 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:373
+#: perllib/FixMyStreet/DB/Result/Problem.pm:604
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383
msgid " and "
msgstr "und"
-#: templates/web/default/tokens/confirm_problem.html:14
+#: templates/web/default/tokens/confirm_problem.html:15
#: templates/web/default/tokens/confirm_problem.html:17
msgid " and <strong>we will now send it to the council</strong>"
msgstr ""
-#: templates/web/default/report/new/councils_text_all.html:11
-#: templates/web/default/report/new/councils_text_all.html:18
-#: templates/web/default/report/new/councils_text_all.html:4
-#: templates/web/default/report/new/councils_text_none.html:11
-#: templates/web/default/report/new/councils_text_none.html:14
-#: templates/web/default/report/new/councils_text_some.html:20
+#: templates/web/default/report/new/councils_text_all.html:12
+#: templates/web/default/report/new/councils_text_all.html:19
+#: templates/web/default/report/new/councils_text_all.html:5
+#: templates/web/default/report/new/councils_text_none.html:19
+#: templates/web/default/report/new/councils_text_none.html:21
+#: templates/web/default/report/new/councils_text_some.html:21
#: templates/web/default/report/new/councils_text_some.html:23
#: templates/web/default/report/new/councils_text_some.html:5
-#: templates/web/emptyhomes/report/new/councils_text_all.html:2
+#: templates/web/emptyhomes/report/new/councils_text_all.html:3
msgid " or "
msgstr "oder"
@@ -74,19 +74,19 @@ msgstr "%d bis %d von %d"
msgid "%s - Summary reports"
msgstr "Alle Meldungen"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:653
msgid "%s ref:&nbsp;%s"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
msgid "%s ward, %s"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:538
+#: perllib/FixMyStreet/DB/Result/Problem.pm:540
msgid "%s, reported at %s"
msgstr "Gemeldet von %s um %s"
-#: perllib/FixMyStreet/Cobrand/UK.pm:303 perllib/FixMyStreet/Cobrand/UK.pm:315
+#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:309
msgid "%s, within %s ward"
msgstr ""
@@ -117,30 +117,27 @@ msgstr ""
msgid "(alternatively the RSS feed can be customised, within"
msgstr ""
-#: templates/web/bromley/report/_item.html:22
#: templates/web/default/around/around_map_list_items.html:12
#: templates/web/default/around/on_map_list_items.html:9
-#: templates/web/fixmystreet/report/_item.html:22
+#: templates/web/fixmystreet/report/_item.html:27
#: templates/web/zurich/report/_item.html:21
msgid "(closed)"
msgstr "(beantwortet)"
-#: templates/web/bromley/report/_item.html:20
#: templates/web/default/around/around_map_list_items.html:10
#: templates/web/default/around/on_map_list_items.html:7
-#: templates/web/fixmystreet/report/_item.html:20
+#: templates/web/fixmystreet/report/_item.html:25
#: templates/web/zurich/report/_item.html:19
msgid "(fixed)"
msgstr "(beantwortet)"
-#: templates/web/default/index.html:12 templates/web/default/index.html:8
+#: templates/web/default/index.html:12 templates/web/default/index.html:9
#: templates/web/fixmystreet/around/intro.html:2
msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
msgstr "(z.B. illegale Deponien, Strassensch&auml;den, Graffitis usw.)"
-#: templates/web/bromley/report/_item.html:16
#: templates/web/default/reports/_list-entry.html:4
-#: templates/web/fixmystreet/report/_item.html:16
+#: templates/web/fixmystreet/report/_item.html:21
msgid "(not sent to council)"
msgstr ""
@@ -150,9 +147,8 @@ msgstr ""
msgid "(optional)"
msgstr "(optional)"
-#: templates/web/bromley/report/_item.html:15
#: templates/web/default/reports/_list-entry.html:2
-#: templates/web/fixmystreet/report/_item.html:15
+#: templates/web/fixmystreet/report/_item.html:20
msgid "(sent to both)"
msgstr ""
@@ -164,8 +160,8 @@ msgstr "(Ihre E-Mail Adresse und Telefonnummer werden nie angezeigt)"
msgid "(we never show your email)"
msgstr "(Ihre E-Mail Adresse wird nie angezeigt)"
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:637
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:664
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:635
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:662
#: perllib/FixMyStreet/DB/Result/Problem.pm:379
msgid "-- Pick a category --"
msgstr "-- Wählen Sie eine Kategorie --"
@@ -201,7 +197,7 @@ msgid ""
"</p>"
msgstr ""
-#: templates/web/fixmystreet/questionnaire/completed-open.html:6
+#: templates/web/fixmystreet/questionnaire/completed-open.html:25
msgid ""
"<p style=\"font-size:150%\">We&rsquo;re sorry to hear that. We have two\n"
"suggestions: why not try <a href=\"http://www.writetothem.com/\">writing direct\n"
@@ -251,7 +247,7 @@ msgid ""
"site and leave an update.</p>"
msgstr ""
-#: templates/web/default/around/_report_banner.html:3
+#: templates/web/default/around/_report_banner.html:4
#: templates/web/default/around/_report_banner.html:5
msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>"
msgstr "Karte nicht sichtbar? <a href='%s' rel='nofollow'>&Uuml;berspringen</a>.</small>"
@@ -306,8 +302,6 @@ msgstr "Passwort"
msgid "About us"
msgstr "&Uuml;ber uns"
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:81
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:39
#: templates/web/default/report/update-form.html:30
@@ -345,7 +339,7 @@ msgstr "F&uuml;ge neue Kategorie hinzu"
msgid "Add user"
msgstr "User hinzuf&uuml;gen"
-#: templates/web/default/my/my.html:56 templates/web/fixmystreet/my/my.html:60
+#: templates/web/default/my/my.html:61 templates/web/fixmystreet/my/my.html:67
msgid "Added %s"
msgstr ""
@@ -361,7 +355,6 @@ msgstr ""
msgid "Alert %d disabled (created %s)"
msgstr ""
-#: templates/web/bromley/report/display.html:209
#: templates/web/default/report/update-form.html:163
#: templates/web/fixmystreet/report/update-form.html:148
msgid "Alert me to future updates"
@@ -374,17 +367,12 @@ msgstr ""
msgid "All Reports"
msgstr "Alle Meldungen"
-#: templates/web/barnet/footer.html:20 templates/web/bromley/footer.html:21
-#: templates/web/bromley/header.html:77 templates/web/default/footer.html:11
+#: templates/web/default/footer.html:11
#: templates/web/emptyhomes/header.html:32
#: templates/web/fiksgatami/footer.html:7
#: templates/web/fiksgatami/nn/footer.html:7
-#: templates/web/fixmindelo/footer.html:41
#: templates/web/fixmybarangay/footer.html:20
-#: templates/web/fixmystreet/footer.html:48
-#: templates/web/oxfordshire/footer.html:23
-#: templates/web/oxfordshire/header.html:67
-#: templates/web/reading/footer.html:8 templates/web/stevenage/footer.html:43
+#: templates/web/fixmystreet/footer.html:51
#: templates/web/zurich/admin/index-dm.html:12
#: templates/web/zurich/admin/stats.html:13
#: templates/web/zurich/footer.html:19
@@ -401,27 +389,25 @@ msgstr "Alle Meldungen von %s bis %s"
msgid "All the information you provide here will be sent to"
msgstr ""
-#: templates/web/default/report/new/councils_text_all.html:11
+#: templates/web/default/report/new/councils_text_all.html:12
#: templates/web/default/report/new/councils_text_all.html:13
msgid "All the information you provide here will be sent to <strong>%s</strong> or <strong>Roads Service</strong>."
msgstr ""
-#: templates/web/default/report/new/councils_text_all.html:4
+#: templates/web/default/report/new/councils_text_all.html:5
#: templates/web/default/report/new/councils_text_all.html:6
msgid "All the information you provide here will be sent to <strong>%s</strong> or a relevant local body such as <strong>TfL</strong>, via the London Report-It system."
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:4
-#: templates/web/bromley/report/new/fill_in_details_form.html:6
-#: templates/web/default/report/new/councils_text_all.html:18
+#: templates/web/default/report/new/councils_text_all.html:19
#: templates/web/default/report/new/councils_text_all.html:20
-#: templates/web/default/report/new/fill_in_details_form.html:11
+#: templates/web/default/report/new/fill_in_details_form.html:12
#: templates/web/default/report/new/fill_in_details_form.html:13
-#: templates/web/emptyhomes/report/new/councils_text_all.html:2
+#: templates/web/emptyhomes/report/new/councils_text_all.html:3
#: templates/web/emptyhomes/report/new/councils_text_all.html:4
-#: templates/web/emptyhomes/report/new/fill_in_details_form.html:11
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:12
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:13
-#: templates/web/fixmystreet/report/new/fill_in_details_form.html:6
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:7
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:8
msgid "All the information you provide here will be sent to <strong>%s</strong>."
msgstr ""
@@ -445,13 +431,11 @@ msgstr "Anonym:"
msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?"
msgstr ""
-#: templates/web/fixmystreet/footer.html:16
-#: templates/web/stevenage/footer.html:17
+#: templates/web/fixmystreet/footer.html:19
msgid "Are you a developer?"
msgstr ""
-#: templates/web/fixmystreet/footer.html:20
-#: templates/web/stevenage/footer.html:21
+#: templates/web/fixmystreet/footer.html:23
msgid "Are you from a council?"
msgstr ""
@@ -474,7 +458,7 @@ msgstr "Einer externen Stelle zuweisen:"
msgid "Assign to subdivision:"
msgstr "An Fachbereich zuweisen:"
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:141
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:163
#: templates/web/zurich/report/updates.html:11
msgid "Assigned to %s"
msgstr "Besten Dank f&uuml;r Ihre Meldung. Wir haben Ihr Anliegen an %s weitergeleitet, da es nicht in den Zust&auml;ndigkeitsbereich der am Pilot beteiligten Fachbereiche f&auml;llt.<br/>Freundliche Gr&uuml;sse <br/>Ihre Stadt Z&uuml;rich"
@@ -493,7 +477,6 @@ msgid "Awaiting moderation"
msgstr "Überprüfung ausstehend"
#: templates/web/default/js/translation_strings.html:32
-#: templates/web/oxfordshire/js/translation_strings.html:26
msgid "Back"
msgstr "Zur&uuml;ck"
@@ -505,8 +488,8 @@ msgstr ""
msgid "Be sure to choose the right category, because we use that to determine to whom the report is sent."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1176
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:249
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1185
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:297
#: templates/web/default/admin/bodies.html:1
#: templates/web/zurich/header.html:64
msgid "Bodies"
@@ -532,18 +515,15 @@ msgid "By Date"
msgstr ""
#: templates/web/fixmystreet/around/_report_banner.html:10
-#: templates/web/fixmystreet/around/_report_banner.html:8
+#: templates/web/fixmystreet/around/_report_banner.html:9
msgid "Can't see the map? <a href='%s' rel='nofollow'>Skip this step</a>"
msgstr "Karte nicht sichtbar? <a href='%s' rel='nofollow'>&Uuml;berspringen Sie diesen Schritt</a>"
-#: templates/web/bromley/report/new/fill_in_details_form.html:68
#: templates/web/default/admin/bodies.html:20
#: templates/web/default/admin/body.html:53
#: templates/web/default/admin/index.html:44
#: templates/web/default/report/new/category.html:10
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:74
-#: templates/web/seesomething/report/new/category.html:6
-#: templates/web/southampton/report/new/category.html:3
#: templates/web/zurich/admin/body.html:13
#: templates/web/zurich/admin/index-dm.html:23
#: templates/web/zurich/admin/index-sdm.html:21
@@ -568,7 +548,7 @@ msgstr ""
msgid "Category:"
msgstr "Kategorie:"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:366
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374
msgid "Category: %s"
msgstr "Kategorie: %s"
@@ -617,21 +597,16 @@ msgstr ""
msgid "Click map to report a problem"
msgstr "Mangel lokalisieren"
-#: templates/web/oxfordshire/js/translation_strings.html:39
-#, fuzzy
-msgid "Click on the map to report a problem"
-msgstr "Mangel lokalisieren"
-
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:118
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:140
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:45
#: templates/web/default/admin/report_edit.html:47
#: templates/web/default/dashboard/index.html:142
#: templates/web/default/dashboard/index.html:144
#: templates/web/fixmystreet/report/banner.html:15
-#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:10
#: templates/web/zurich/admin/header.html:12
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/report_edit.html:100
#: templates/web/zurich/admin/report_edit.html:98
#: templates/web/zurich/admin/stats.html:31
@@ -639,11 +614,11 @@ msgstr "Mangel lokalisieren"
msgid "Closed"
msgstr "Beantwortet"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:744
+#: perllib/FixMyStreet/DB/Result/Problem.pm:748
msgid "Closed by council"
msgstr ""
-#: templates/web/default/my/my.html:32 templates/web/fixmystreet/my/my.html:36
+#: templates/web/default/my/my.html:37 templates/web/fixmystreet/my/my.html:43
msgid "Closed reports"
msgstr ""
@@ -651,7 +626,7 @@ msgstr ""
msgid "Closed:"
msgstr "Beantwortet:"
-#: templates/web/default/around/tabbed_lists.html:10
+#: templates/web/default/around/tabbed_lists.html:11
#: templates/web/default/around/tabbed_lists.html:12
msgid "Closest nearby problems <small>(within&nbsp;%skm)</small>"
msgstr ""
@@ -708,8 +683,6 @@ msgstr ""
#: templates/web/default/tokens/confirm_update.html:3
#: templates/web/emptyhomes/tokens/confirm_problem.html:1
#: templates/web/emptyhomes/tokens/confirm_problem.html:3
-#: templates/web/southampton/tokens/confirm_problem.html:1
-#: templates/web/southampton/tokens/confirm_problem.html:3
#: templates/web/zurich/tokens/confirm_problem.html:1
#: templates/web/zurich/tokens/confirm_problem.html:3
msgid "Confirmation"
@@ -742,7 +715,6 @@ msgstr "Kontakt"
msgid "Contact FixMyStreet"
msgstr ""
-#: templates/web/bromley/contact/submit.html:1
#: templates/web/default/contact/index.html:1
#: templates/web/default/contact/index.html:2
#: templates/web/default/contact/submit.html:1
@@ -751,20 +723,18 @@ msgstr ""
msgid "Contact Us"
msgstr ""
-#: templates/web/bromley/contact/submit.html:3
#: templates/web/default/contact/index.html:6
#: templates/web/default/contact/submit.html:3
-#: templates/web/fixmystreet/contact/index.html:19
+#: templates/web/fixmystreet/contact/index.html:22
msgid "Contact the team"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1310
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1338
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1319
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1347
msgid "Could not find user"
msgstr ""
#: templates/web/default/js/translation_strings.html:37
-#: templates/web/oxfordshire/js/translation_strings.html:31
msgid "Could not look up location"
msgstr ""
@@ -822,7 +792,7 @@ msgstr "Aktueller Status"
msgid "Currently no bodies have been created."
msgstr "Bisher wurden noch keine Organisationseinheiten erfasst."
-#: templates/web/default/dashboard/index.html:5
+#: templates/web/default/dashboard/index.html:6
#: templates/web/default/dashboard/index.html:7
msgid "Dashboard"
msgstr ""
@@ -845,11 +815,8 @@ msgstr "Gel&ouml;scht"
msgid "Description"
msgstr "Beschreibung"
-#: templates/web/bromley/report/new/fill_in_details_form.html:54
#: templates/web/default/js/translation_strings.html:34
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66
-#: templates/web/oxfordshire/js/translation_strings.html:28
-#: templates/web/seesomething/report/new/fill_in_details_form.html:16
#: templates/web/zurich/report/new/fill_in_details_form.html:42
msgid "Details"
msgstr "Beschreibung"
@@ -887,8 +854,10 @@ msgstr ""
msgid "Don&rsquo;t know"
msgstr ""
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:82
+#: templates/web/fixmystreet/contact/index.html:115
+msgid "Don't like forms?"
+msgstr ""
+
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:47
#: templates/web/default/report/update-form.html:30
@@ -919,9 +888,9 @@ msgid "Edit body details"
msgstr "Details editieren"
#: templates/web/default/admin/report_edit.html:1
-#: templates/web/zurich/admin/report_edit-sdm.html:1
+#: templates/web/zurich/admin/report_edit-sdm.html:2
#: templates/web/zurich/admin/report_edit-sdm.html:4
-#: templates/web/zurich/admin/report_edit.html:1
+#: templates/web/zurich/admin/report_edit.html:2
#: templates/web/zurich/admin/report_edit.html:5
msgid "Editing problem %d"
msgstr "Meldung %d bearbeiten"
@@ -939,7 +908,6 @@ msgstr ""
msgid "Editor"
msgstr ""
-#: templates/web/bromley/report/display.html:128
#: templates/web/default/admin/bodies.html:18
#: templates/web/default/admin/body.html:54
#: templates/web/default/admin/body_edit.html:83
@@ -947,7 +915,6 @@ msgstr ""
#: templates/web/default/admin/users.html:16
#: templates/web/fixmystreet/auth/general.html:20
#: templates/web/fixmystreet/report/update-form.html:76
-#: templates/web/seesomething/auth/general.html:20
#: templates/web/zurich/admin/body-form.html:9
#: templates/web/zurich/admin/body.html:14
#: templates/web/zurich/auth/general.html:24
@@ -955,16 +922,15 @@ msgstr ""
msgid "Email"
msgstr "E-Mail"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1286
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1295
msgid "Email added to abuse list"
msgstr ""
#: templates/web/default/admin/body.html:126
-#, fuzzy
msgid "Email address:"
-msgstr "Ihre E-Mail Adresse:"
+msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1283
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1292
msgid "Email already in abuse list"
msgstr ""
@@ -988,7 +954,7 @@ msgstr "Schicken Sie mir Aktualisierungen"
msgid "Email:"
msgstr "E-mail:"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:318
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:323
msgid "Email: %s"
msgstr "E-mail:"
@@ -1041,7 +1007,7 @@ msgstr ""
msgid "Endpoint"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:71
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:72
msgid "Enter a Z&uuml;rich street name"
msgstr "Ungef&auml;hre Adresse des Mangels"
@@ -1050,26 +1016,26 @@ msgid "Enter a nearby UK postcode, or street name and area"
msgstr "Geben Sie eine Adresse an"
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:25
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:37
msgid "Enter a nearby postcode, or street name and area"
msgstr "Ungef&auml;hre Adresse des Mangels"
-#: templates/web/default/around/postcode_form.html:1
#: templates/web/default/around/postcode_form.html:2
-#: templates/web/fixmystreet/around/postcode_form.html:10
#: templates/web/fixmystreet/around/postcode_form.html:11
-#: templates/web/seesomething/around/postcode_form.html:3
-#: templates/web/seesomething/around/postcode_form.html:4
msgid "Enter a nearby street name and area"
msgstr "Ungef&auml;hre Adresse des Mangels"
+#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:9
+#, fuzzy
+msgid "Enter a nearby street name and area, postal code or district in Delhi"
+msgstr "Ungef&auml;hre Adresse des Mangels"
+
#: templates/web/default/auth/general.html:64
#: templates/web/default/report/new/fill_in_details_form.html:169
#: templates/web/default/report/update-form.html:124
msgid "Enter a new password:"
msgstr ""
-#: templates/web/bromley/report/display.html:150
-#: templates/web/bromley/report/new/fill_in_details_form.html:189
#: templates/web/fixmystreet/auth/general.html:61
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:211
#: templates/web/fixmystreet/report/update-form.html:122
@@ -1104,7 +1070,6 @@ msgstr "Beispiele:"
msgid "Extra data:"
msgstr ""
-#: templates/web/bromley/contact/submit.html:14
#: templates/web/default/contact/submit.html:15
msgid "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>."
msgstr ""
@@ -1118,12 +1083,6 @@ msgstr "Alle Meldungen"
msgid "Find latest local and national news"
msgstr ""
-#: templates/web/bromley/report/display.html:191
-#: templates/web/bromley/report/new/fill_in_details_form.html:113
-#: templates/web/bromley/report/new/fill_in_details_form.html:160
-msgid "First Name"
-msgstr ""
-
#: templates/web/default/questionnaire/index.html:79
#: templates/web/fixmystreet/questionnaire/index.html:73
msgid "First time"
@@ -1164,8 +1123,6 @@ msgid ""
"for the county council."
msgstr ""
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:84
#: templates/web/default/admin/index.html:44
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:41
@@ -1190,7 +1147,7 @@ msgstr ""
msgid "Fixed - User"
msgstr ""
-#: templates/web/default/my/my.html:27 templates/web/fixmystreet/my/my.html:31
+#: templates/web/default/my/my.html:32 templates/web/fixmystreet/my/my.html:38
msgid "Fixed reports"
msgstr ""
@@ -1207,7 +1164,7 @@ msgstr "Als gel&#246;scht markieren"
msgid "Flag user"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1181
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1190
#: templates/web/default/admin/users.html:19
msgid "Flagged"
msgstr ""
@@ -1252,11 +1209,9 @@ msgstr "Ihr Passwort"
#: templates/web/emptyhomes/faq/faq-en-gb.html:1
#: templates/web/fiksgatami/faq/faq-nb.html:1
#: templates/web/fiksgatami/nn/faq/faq-nn.html:1
-#: templates/web/fixmindelo/faq/faq-pt-cv.html:1
#: templates/web/fixmybarangay/faq/faq-en-gb.html:1
#: templates/web/fixmystreet/faq/faq-en-gb.html:1
#: templates/web/fixmystreet/static/privacy.html:1
-#: templates/web/oxfordshire/faq/faq-en-gb.html:1
msgid "Frequently Asked Questions"
msgstr "Hilfe"
@@ -1264,19 +1219,18 @@ msgstr "Hilfe"
msgid "GeoRSS on Google Maps"
msgstr ""
-#: templates/web/bromley/report/display.html:30
#: templates/web/fixmystreet/around/_updates.html:3
#: templates/web/fixmystreet/report/display.html:38
msgid "Get updates"
msgstr ""
-#: templates/web/fixmystreet/reports/_rss.html:3
+#: templates/web/fixmystreet/reports/_rss.html:4
#: templates/web/fixmystreet/reports/_rss.html:9
msgid "Get updates of %s problems"
msgstr "Beschreiben Sie den Mangel"
#: templates/web/fixmystreet/reports/_rss.html:11
-#: templates/web/fixmystreet/reports/_rss.html:3
+#: templates/web/fixmystreet/reports/_rss.html:4
msgid "Get updates of problems in this %s"
msgstr ""
@@ -1289,7 +1243,6 @@ msgstr ""
#: templates/web/default/alert/index.html:34
#: templates/web/default/around/postcode_form.html:8
#: templates/web/fixmystreet/around/postcode_form.html:21
-#: templates/web/seesomething/around/postcode_form.html:10
#: templates/web/zurich/admin/stats.html:26
msgid "Go"
msgstr "Los"
@@ -1316,19 +1269,12 @@ msgstr ""
msgid "Have you ever reported a problem to a council before, or is this your first time?"
msgstr ""
-#: templates/web/barnet/footer.html:24 templates/web/bromley/footer.html:25
-#: templates/web/bromley/header.html:81 templates/web/default/footer.html:15
+#: templates/web/default/footer.html:15
#: templates/web/emptyhomes/header.html:33
#: templates/web/fiksgatami/footer.html:9
#: templates/web/fiksgatami/nn/footer.html:9
-#: templates/web/fixmindelo/footer.html:45
#: templates/web/fixmybarangay/footer.html:24
-#: templates/web/fixmystreet/footer.html:52
-#: templates/web/oxfordshire/footer.html:27
-#: templates/web/oxfordshire/header.html:75
-#: templates/web/reading/footer.html:10
-#: templates/web/seesomething/footer.html:13
-#: templates/web/stevenage/footer.html:47
+#: templates/web/fixmystreet/footer.html:55
#: templates/web/zurich/faq/faq-de-ch.html:1
#: templates/web/zurich/footer.html:21
#: templates/web/zurich/nav_over_content.html:8
@@ -1340,13 +1286,9 @@ msgstr "Hilfe"
msgid "Here are the types of local problem alerts for &lsquo;%s&rsquo;."
msgstr ""
-#: templates/web/barnet/header.html:70 templates/web/bromley/header.html:64
-#: templates/web/bromley/header.html:99
#: templates/web/fixmybarangay/header.html:66
-#: templates/web/fixmystreet/header.html:50
-#: templates/web/oxfordshire/header.html:111
-#: templates/web/oxfordshire/header.html:47
-#: templates/web/stevenage/header.html:97 templates/web/zurich/footer.html:11
+#: templates/web/fixmystreet/header.html:53
+#: templates/web/zurich/footer.html:11
msgid "Hi %s"
msgstr "Hallo %s"
@@ -1354,8 +1296,8 @@ msgstr "Hallo %s"
#: templates/web/default/admin/report_edit.html:50
#: templates/web/default/admin/report_edit.html:51
#: templates/web/default/admin/update_edit.html:28
-#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:11
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/report_edit.html:89
#: templates/web/zurich/admin/report_edit.html:93
#: templates/web/zurich/admin/stats.html:32
@@ -1376,7 +1318,6 @@ msgid "History"
msgstr "History"
#: templates/web/default/js/translation_strings.html:31
-#: templates/web/oxfordshire/js/translation_strings.html:25
msgid "Home"
msgstr ""
@@ -1385,7 +1326,6 @@ msgid "How to report a problem"
msgstr "Erfassen Sie eine neue Meldung:"
#: templates/web/default/js/translation_strings.html:33
-#: templates/web/oxfordshire/js/translation_strings.html:27
msgid "How to send successful reports"
msgstr "Anleitung"
@@ -1401,7 +1341,7 @@ msgstr ""
msgid "I'm afraid we couldn't validate that token, as the report was made too long ago."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Tokens.pm:259
+#: perllib/FixMyStreet/App/Controller/Tokens.pm:260
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 "Leider konnte Ihre URL nicht aufgel&ouml;st werden. Falls Sie die URL aus einer Mail kopiert haben, &uuml;berpr&uuml;fen Sie bitte ob Sie die gesamte URL kopiert haben.\n"
@@ -1441,7 +1381,6 @@ msgstr ""
msgid "If you do not, your update will not be posted."
msgstr ""
-#: templates/web/default/report/new/councils_text_none.html:8
#: templates/web/default/report/new/councils_text_none.html:9
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 ""
@@ -1490,7 +1429,7 @@ msgid ""
" when they are shown on the site. Enter the ID (number) of that user."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Contact.pm:111
+#: perllib/FixMyStreet/App/Controller/Contact.pm:116
msgid "Illegal ID"
msgstr "Unbekannt ID"
@@ -1498,8 +1437,6 @@ msgstr "Unbekannt ID"
msgid "Illegal feed selection"
msgstr ""
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:82
#: templates/web/default/dashboard/index.html:142
#: templates/web/default/dashboard/index.html:144
#: templates/web/default/report/update-form.html:30
@@ -1517,21 +1454,17 @@ msgstr ""
msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:121
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:143
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:38
#: templates/web/fixmystreet/report/banner.html:19
-#: templates/web/zurich/admin/header.html:1
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/header.html:8
#: templates/web/zurich/admin/report_edit.html:102
#: templates/web/zurich/report/banner.html:15
msgid "In progress"
msgstr "In Bearbeitung"
-#: templates/web/seesomething/report/new/fill_in_details_form.html:38
-msgid "Incident Category"
-msgstr "Kategorie"
-
#: templates/web/zurich/admin/report_edit.html:163
msgid "Include reporter personal details"
msgstr "Pers&ouml;nliche Angaben des Meldenden mitsenden"
@@ -1557,7 +1490,7 @@ msgstr ""
msgid "Invalid agency_responsible value %s"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1096
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1105
msgid "Invalid end date"
msgstr "Ung&ultiges Enddatum"
@@ -1565,12 +1498,10 @@ msgstr "Ung&ultiges Enddatum"
msgid "Invalid format %s specified."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1092
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1101
msgid "Invalid start date"
msgstr "Ung&ultiges Startdatum"
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:81
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:37
#: templates/web/default/dashboard/index.html:142
@@ -1582,30 +1513,25 @@ msgstr "Ung&ultiges Startdatum"
msgid "Investigating"
msgstr ""
-#: templates/web/emptyhomes/tokens/confirm_problem.html:12
+#: templates/web/emptyhomes/tokens/confirm_problem.html:13
#: templates/web/emptyhomes/tokens/confirm_problem.html:14
msgid "It is worth noting however that the process can sometimes be slow, especially if the property is in very poor repair or the owner is unwilling to act. In most cases it can take six months or more before you can expect to see anything change and sometimes there may be considerable barries to a property being brought back into use. This doesn&rsquo;t mean the council isn&rsquo;t doing anything. We encourage councils to update the website so you can see what is happening. It may be a long process, but you reporting your concerns about this property to the council is a valuable first step."
msgstr ""
-#: templates/web/bromley/report/display.html:168
-#: templates/web/bromley/report/new/fill_in_details_form.html:209
+#: templates/web/fixmystreet/contact/blurb.html:8
+msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there."
+msgstr ""
+
#: templates/web/default/auth/general.html:44
#: templates/web/default/report/new/fill_in_details_form.html:149
#: templates/web/default/report/update-form.html:104
#: templates/web/fixmystreet/auth/general.html:46
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:172
#: templates/web/fixmystreet/report/update-form.html:100
-#: templates/web/seesomething/auth/general.html:35
#: templates/web/zurich/auth/general.html:40
msgid "Keep me signed in on this computer"
msgstr "Angemeldet bleiben"
-#: templates/web/bromley/report/display.html:197
-#: templates/web/bromley/report/new/fill_in_details_form.html:119
-#: templates/web/bromley/report/new/fill_in_details_form.html:166
-msgid "Last Name"
-msgstr "Letzte Bearbeitung"
-
#: templates/web/default/admin/body.html:58
#: templates/web/zurich/admin/body.html:15
msgid "Last editor"
@@ -1628,11 +1554,9 @@ msgstr ""
msgid "List all reported problems"
msgstr "Liste aller Meldungen"
-#: templates/web/bromley/report/new/fill_in_details_form.html:69
#: templates/web/default/report/new/fill_in_details_form.html:68
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:51
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:75
-#: templates/web/seesomething/report/new/fill_in_details_form.html:25
#: templates/web/zurich/report/new/fill_in_details_form.html:51
msgid "Loading..."
msgstr ""
@@ -1641,7 +1565,7 @@ msgstr ""
#: templates/web/default/alert/choose.html:3
#: templates/web/default/alert/index.html:1
#: templates/web/default/alert/index.html:3
-#: templates/web/default/alert/list.html:1
+#: templates/web/default/alert/list.html:2
#: templates/web/default/alert/list.html:5
#: templates/web/default/alert/updates.html:1
#: templates/web/default/tokens/confirm_alert.html:1
@@ -1654,23 +1578,17 @@ msgstr ""
msgid "Local RSS feeds and email alerts"
msgstr ""
-#: templates/web/default/alert/list.html:1
-#: templates/web/default/alert/list.html:12
+#: templates/web/default/alert/list.html:13
#: templates/web/default/alert/list.html:14
+#: templates/web/default/alert/list.html:2
#: templates/web/default/alert/list.html:3
msgid "Local RSS feeds and email alerts for ‘%s’"
msgstr ""
-#: templates/web/barnet/footer.html:22 templates/web/bromley/footer.html:23
-#: templates/web/bromley/header.html:79 templates/web/default/footer.html:13
-#: templates/web/fiksgatami/footer.html:8
+#: templates/web/default/footer.html:13 templates/web/fiksgatami/footer.html:8
#: templates/web/fiksgatami/nn/footer.html:8
-#: templates/web/fixmindelo/footer.html:43
#: templates/web/fixmybarangay/footer.html:22
-#: templates/web/fixmystreet/footer.html:50
-#: templates/web/oxfordshire/footer.html:25
-#: templates/web/oxfordshire/header.html:71
-#: templates/web/reading/footer.html:9 templates/web/stevenage/footer.html:45
+#: templates/web/fixmystreet/footer.html:53
msgid "Local alerts"
msgstr "RSS"
@@ -1679,7 +1597,6 @@ msgid "Locate the problem on a map of the area"
msgstr "Lokalisieren Sie den Mangel auf der Karte"
#: templates/web/default/js/translation_strings.html:43
-#: templates/web/oxfordshire/js/translation_strings.html:37
msgid "MAP"
msgstr ""
@@ -1691,11 +1608,11 @@ msgstr ""
msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
msgstr ""
-#: templates/web/fixmystreet/contact/index.html:98
+#: templates/web/fixmystreet/contact/index.html:103
msgid "Message"
msgstr "Nachricht"
-#: templates/web/default/contact/index.html:90
+#: templates/web/default/contact/index.html:92
msgid "Message:"
msgstr "Nachricht:"
@@ -1737,10 +1654,6 @@ msgstr "Meldungen in der Nähe"
msgid "Name"
msgstr "Name"
-#: templates/web/seesomething/report/new/fill_in_details_form.html:74
-msgid "Name (optional)"
-msgstr "(optional)"
-
#: templates/web/default/admin/report_edit.html:66
#: templates/web/default/admin/update_edit.html:32
#: templates/web/default/admin/user-form.html:18
@@ -1750,30 +1663,30 @@ msgstr "(optional)"
msgid "Name:"
msgstr "Name:"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:317
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:322
msgid "Name: %s"
msgstr "Name: %s"
#: templates/web/fiksgatami/footer.html:3
#: templates/web/fiksgatami/nn/footer.html:3
-#: templates/web/reading/footer.html:4
msgid "Navigation"
msgstr "Navigation"
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:188
#: perllib/FixMyStreet/Geocode/OSM.pm:166
msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/UK.pm:148
+#: perllib/FixMyStreet/Cobrand/UK.pm:142
msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:418
-#: perllib/FixMyStreet/Cobrand/Default.pm:458
+#: perllib/FixMyStreet/Cobrand/Default.pm:421
+#: perllib/FixMyStreet/Cobrand/Default.pm:461
msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:273
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:297
msgid ""
"Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
"\n"
@@ -1913,14 +1826,12 @@ msgid "No edits have yet been made."
msgstr "Noch keine Antwort"
#: templates/web/default/admin/flagged.html:25
-#, fuzzy
msgid "No flagged problems found."
-msgstr "Keine Meldungen gefunden."
+msgstr ""
#: templates/web/default/admin/flagged.html:58
-#, fuzzy
msgid "No flagged users found."
-msgstr "Keine Meldungen gefunden."
+msgstr ""
#: templates/web/zurich/admin/report_edit-sdm.html:68
msgid "No further updates"
@@ -1937,7 +1848,6 @@ msgid "No problems have been reported yet."
msgstr "Bisher wurden noch keine Meldungen erfasst."
#: templates/web/default/js/translation_strings.html:38
-#: templates/web/oxfordshire/js/translation_strings.html:32
msgid "No result returned"
msgstr ""
@@ -1948,7 +1858,7 @@ msgid ""
" your config file is not pointing to a live MapIt service."
msgstr ""
-#: templates/web/default/report/_support.html:2
+#: templates/web/default/report/_support.html:3
#: templates/web/default/report/_support.html:4
msgid "No supporters"
msgstr ""
@@ -1972,8 +1882,6 @@ msgid ""
" activity across their body), the ability to hide reports or set special report statuses."
msgstr ""
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:83
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:46
#: templates/web/default/report/update-form.html:30
@@ -2032,7 +1940,6 @@ msgid "Now to submit your update&hellip; do you have a FixMyStreet password?"
msgstr ""
#: templates/web/default/js/translation_strings.html:42
-#: templates/web/oxfordshire/js/translation_strings.html:36
msgid "OK"
msgstr ""
@@ -2076,8 +1983,7 @@ msgstr ""
msgid "Older problems"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:115
-#: templates/web/bromley/report/display.html:80
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:137
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:36
#: templates/web/default/admin/report_edit.html:37
@@ -2085,7 +1991,7 @@ msgstr ""
#: templates/web/default/dashboard/index.html:142
#: templates/web/default/report/update-form.html:30
#: templates/web/fixmystreet/report/update-form.html:28
-#: templates/web/zurich/admin/header.html:1
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/header.html:7
#: templates/web/zurich/admin/report_edit.html:89
#: templates/web/zurich/admin/report_edit.html:91
@@ -2094,7 +2000,7 @@ msgstr ""
msgid "Open"
msgstr "Aufgenommen"
-#: templates/web/default/my/my.html:22 templates/web/fixmystreet/my/my.html:26
+#: templates/web/default/my/my.html:27 templates/web/fixmystreet/my/my.html:33
msgid "Open reports"
msgstr "Offene Meldungen"
@@ -2120,15 +2026,15 @@ msgstr ""
msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1053
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:664
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:665
-#: perllib/FixMyStreet/DB/Result/Problem.pm:544
-#: perllib/FixMyStreet/DB/Result/Problem.pm:554
-#: perllib/FixMyStreet/DB/Result/Problem.pm:564
-#: perllib/FixMyStreet/DB/Result/Problem.pm:576
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:361
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1057
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:662
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:663
+#: perllib/FixMyStreet/DB/Result/Problem.pm:546
+#: perllib/FixMyStreet/DB/Result/Problem.pm:556
+#: perllib/FixMyStreet/DB/Result/Problem.pm:566
+#: perllib/FixMyStreet/DB/Result/Problem.pm:578
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:369
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:384
msgid "Other"
msgstr ""
@@ -2155,8 +2061,6 @@ msgstr "Geh&ouml;rt zu"
msgid "Partial"
msgstr ""
-#: templates/web/bromley/report/display.html:147
-#: templates/web/bromley/report/new/fill_in_details_form.html:186
#: templates/web/fixmystreet/auth/general.html:59
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:208
#: templates/web/fixmystreet/report/update-form.html:119
@@ -2177,15 +2081,12 @@ msgstr ""
msgid "Phone number"
msgstr "Telefonnummer"
-#: templates/web/bromley/report/new/fill_in_details_form.html:136
-#: templates/web/bromley/report/new/fill_in_details_form.html:183
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:138
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:205
-#: templates/web/seesomething/report/new/fill_in_details_form.html:89
msgid "Phone number (optional)"
msgstr "Telefonnummer (optional)"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:282
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:287
#: templates/web/default/admin/report_edit.html:68
#: templates/web/default/report/new/fill_in_details_form.html:215
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:138
@@ -2195,11 +2096,8 @@ msgstr "Telefonnummer (optional)"
msgid "Phone:"
msgstr "Telefonnummer:"
-#: templates/web/bromley/report/display.html:111
-#: templates/web/bromley/report/new/fill_in_details_form.html:104
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:92
#: templates/web/fixmystreet/report/update-form.html:59
-#: templates/web/seesomething/report/new/fill_in_details_form.html:52
#: templates/web/zurich/admin/index-dm.html:29
#: templates/web/zurich/admin/index-sdm.html:24
#: templates/web/zurich/admin/reports.html:16
@@ -2221,7 +2119,6 @@ msgid "Photos of recent nearby reports"
msgstr "Fotos von neuen Meldungen in der N&auml;he"
#: templates/web/default/js/translation_strings.html:30
-#: templates/web/oxfordshire/js/translation_strings.html:24
msgid "Place pin on map"
msgstr "Pin auf der Karte absetzen"
@@ -2229,7 +2126,7 @@ msgstr "Pin auf der Karte absetzen"
#: templates/web/default/admin/report_edit.html:38
#: templates/web/default/dashboard/index.html:142
#: templates/web/default/dashboard/index.html:143
-#: templates/web/zurich/admin/header.html:1
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/header.html:9
#: templates/web/zurich/admin/index-dm.html:9
#: templates/web/zurich/admin/report_edit.html:89
@@ -2243,7 +2140,6 @@ msgstr ""
#: templates/web/default/report/new/notes.html:6
#: templates/web/fixmystreet/report/new/notes.html:6
-#: templates/web/oxfordshire/report/new/notes.html:5
msgid "Please be polite, concise and to the point."
msgstr "Bitte seien Sie freundlich und pr&auml;gnant."
@@ -2260,20 +2156,16 @@ msgstr "Bitte &uuml;berpr&uuml;fen Sie Ihr E-Mail"
#: templates/web/default/auth/general.html:8
#: templates/web/fixmystreet/auth/general.html:15
#: templates/web/fixmystreet/auth/general.html:9
-#: templates/web/seesomething/auth/general.html:15
-#: templates/web/seesomething/auth/general.html:9
#: templates/web/zurich/auth/general.html:3
#: templates/web/zurich/auth/general.html:9
msgid "Please check your email address is correct"
msgstr "Bitte &uuml;berpr&uuml;fen Sie ob Ihre E-Mail Adresse korrekt ist"
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:848
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:855
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:874
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:917
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:859
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:878
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:921
#: perllib/FixMyStreet/DB/Result/Problem.pm:381
#: templates/web/default/js/translation_strings.html:9
-#: templates/web/oxfordshire/js/translation_strings.html:9
msgid "Please choose a category"
msgstr "Bitte w&auml;hlen Sie eine Kategorie"
@@ -2281,19 +2173,8 @@ msgstr "Bitte w&auml;hlen Sie eine Kategorie"
msgid "Please choose a property type"
msgstr ""
-#: templates/web/seesomething/js/translation_strings.html:6
-msgid "Please choose a transport category"
-msgstr ""
-
-#: templates/web/seesomething/js/translation_strings.html:7
-msgid "Please choose an incident category"
-msgstr ""
-
-#: templates/web/bromley/report/new/fill_in_details_form.html:64
-msgid "Please describe the exact location of the report. Example: “2 dumped mattresses outside Number 19 Stockwell Close”"
-msgstr ""
-
#: templates/web/default/contact/blurb.html:2
+#: templates/web/fixmystreet/contact/blurb.html:12
msgid ""
"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"
@@ -2302,7 +2183,6 @@ msgstr ""
#: templates/web/default/report/new/notes.html:7
#: templates/web/fixmystreet/report/new/notes.html:7
-#: templates/web/oxfordshire/report/new/notes.html:6
msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the service for all users."
msgstr ""
@@ -2312,7 +2192,6 @@ msgstr ""
#: perllib/FixMyStreet/DB/Result/Comment.pm:126
#: templates/web/default/js/translation_strings.html:2
-#: templates/web/oxfordshire/js/translation_strings.html:2
msgid "Please enter a message"
msgstr ""
@@ -2325,19 +2204,14 @@ msgstr "Obligatorisches Feld"
#: perllib/FixMyStreet/App/Controller/Contact.pm:97
#: perllib/FixMyStreet/DB/Result/Problem.pm:356
#: templates/web/default/js/translation_strings.html:3
-#: templates/web/oxfordshire/js/translation_strings.html:3
msgid "Please enter a subject"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1032
-#: perllib/FixMyStreet/App/Controller/Admin.pm:979
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1041
+#: perllib/FixMyStreet/App/Controller/Admin.pm:988
#: perllib/FixMyStreet/DB/Result/User.pm:115
#: templates/web/default/js/translation_strings.html:12
#: templates/web/default/js/translation_strings.html:16
-#: templates/web/oxfordshire/js/translation_strings.html:12
-#: templates/web/oxfordshire/js/translation_strings.html:16
-#: templates/web/seesomething/js/translation_strings.html:10
-#: templates/web/seesomething/js/translation_strings.html:13
msgid "Please enter a valid email"
msgstr "Bitte geben Sie eine g&uuml;ltige E-Mail Adresse an"
@@ -2348,8 +2222,6 @@ msgstr "Bitte geben Sie eine g&uuml;ltige E-Mail Adresse an"
#: perllib/FixMyStreet/DB/Result/Problem.pm:359
#: templates/web/default/js/translation_strings.html:4
-#: templates/web/oxfordshire/js/translation_strings.html:4
-#: templates/web/seesomething/js/translation_strings.html:2
msgid "Please enter some details"
msgstr "Bitte geben Sie einige Details an"
@@ -2361,32 +2233,22 @@ msgstr "Bitte geben Sie einige Details an"
#: templates/web/default/js/translation_strings.html:15
#: templates/web/fixmystreet/auth/general.html:14
#: templates/web/fixmystreet/auth/general.html:9
-#: templates/web/oxfordshire/js/translation_strings.html:11
-#: templates/web/oxfordshire/js/translation_strings.html:15
-#: templates/web/seesomething/auth/general.html:14
-#: templates/web/seesomething/auth/general.html:9
-#: templates/web/seesomething/js/translation_strings.html:9
#: templates/web/zurich/auth/general.html:3
#: templates/web/zurich/auth/general.html:8
msgid "Please enter your email"
msgstr "Ihre E-Mail Adresse"
-#: templates/web/bromley/report/new/fill_in_details_form.html:149
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:151
-#: templates/web/seesomething/report/new/fill_in_details_form.html:85
#: templates/web/zurich/report/new/fill_in_details_form.html:92
msgid "Please enter your email address"
msgstr "Ihre E-Mail Adresse"
#: templates/web/default/js/translation_strings.html:25
-#: templates/web/oxfordshire/js/translation_strings.html:19
msgid "Please enter your first name"
msgstr "Bitte geben Sie Ihren Namen an"
#: perllib/FixMyStreet/DB/Result/Problem.pm:374
#: templates/web/default/js/translation_strings.html:7
-#: templates/web/oxfordshire/js/translation_strings.html:7
-#: templates/web/seesomething/js/translation_strings.html:4
msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
msgstr ""
@@ -2395,7 +2257,6 @@ msgstr ""
#: perllib/FixMyStreet/DB/Result/Problem.pm:367
#: perllib/FixMyStreet/DB/Result/User.pm:108
#: templates/web/default/js/translation_strings.html:6
-#: templates/web/oxfordshire/js/translation_strings.html:6
msgid "Please enter your name"
msgstr "Bitte geben Sie Ihren Namen an"
@@ -2404,12 +2265,10 @@ msgid "Please enter your phone number"
msgstr "Obligatorisches Feld"
#: templates/web/default/js/translation_strings.html:26
-#: templates/web/oxfordshire/js/translation_strings.html:20
msgid "Please enter your second name"
msgstr "Bitte geben Sie Ihren Namen an"
#: templates/web/default/js/translation_strings.html:24
-#: templates/web/oxfordshire/js/translation_strings.html:18
msgid "Please enter your title"
msgstr "Bitte geben Sie Ihre E-Mail-Adresse an"
@@ -2428,16 +2287,16 @@ msgid ""
"to read, as does a lack of punctuation."
msgstr ""
-#: templates/web/default/report/new/fill_in_details_text.html:1
#: templates/web/default/report/new/fill_in_details_text.html:11
-#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1
+#: templates/web/default/report/new/fill_in_details_text.html:2
#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:10
-#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:2
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:2
#: templates/web/fixmystreet/report/new/fill_in_details_text.html:8
msgid "Please fill in details of the problem below."
msgstr ""
-#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:2
#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:3
msgid ""
"Please fill in details of the problem below. Leave as much detail as you can, \n"
@@ -2445,7 +2304,7 @@ msgid ""
"the problem (e.g. if there is a streetlight number or road name)."
msgstr "Bitte beschreiben Sie Ihre Meldung weiter unten. Wir k&ouml;nnen den Mangel nur beheben, wenn Sie soviel Details wie m&ouml;glich angeben: Beschreiben Sie die exakte Lage (z.B. An der Wand Richtung Strasse), was genau der Mangel ist, wie lange dieser schon da ist und laden Sie wenn m&ouml;glich ein Photo des Mangels hoch."
-#: templates/web/default/report/new/fill_in_details_text.html:1
+#: templates/web/default/report/new/fill_in_details_text.html:2
#: templates/web/default/report/new/fill_in_details_text.html:3
msgid ""
"Please fill in details of the problem below. The council won't be able\n"
@@ -2455,12 +2314,10 @@ msgid ""
msgstr "Bitte beschreiben Sie Ihre Meldung weiter unten. Wir k&ouml;nnen den Mangel nur beheben, wenn Sie soviel Details wie m&ouml;glich angeben: Beschreiben Sie die exakte Lage (z.B. An der Wand Richtung Strasse), was genau der Mangel ist, wie lange dieser schon da ist und laden Sie wenn m&ouml;glich ein Photo des Mangels hoch."
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:70
-#: templates/web/seesomething/report/new/fill_in_details_form.html:20
#: templates/web/zurich/report/new/fill_in_details_form.html:46
msgid "Please fill in details of the problem."
msgstr "Beschreiben Sie den Mangel."
-#: templates/web/bromley/report/new/fill_in_details_form.html:28
#: templates/web/default/report/new/fill_in_details_form.html:27
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:26
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:35
@@ -2472,7 +2329,7 @@ msgstr "F&uuml;llen Sie das Formular mit den Details des Mangels aus und beschre
msgid "Please indicate whether you'd like to receive another questionnaire"
msgstr ""
-#: templates/web/fixmystreet/report/updates-sidebar-notes.html:3
+#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4
msgid "Please note that updates are not sent to the council."
msgstr ""
@@ -2480,11 +2337,6 @@ msgstr ""
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 ""
-#: templates/web/barnet/report/updates-sidebar-notes.html:1
-msgid "Please note that updates are not sent to the relevant department. 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 "Wir verwenden Ihre pers&ouml;nlichen Daten nur entsprechend unserer <a href=\"/faq#privacy\">Datenschutzrichtlinien.</a>"
-
-#: templates/web/bromley/report/new/fill_in_details_form.html:23
#: templates/web/default/report/new/fill_in_details_form.html:5
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:5
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:26
@@ -2495,7 +2347,6 @@ msgstr ""
#: templates/web/default/report/new/notes.html:1
#: templates/web/fixmybarangay/report/new/notes.html:1
#: templates/web/fixmystreet/report/new/notes.html:1
-#: templates/web/oxfordshire/report/new/notes.html:1
msgid "Please note:"
msgstr "Hinweise:"
@@ -2540,19 +2391,15 @@ msgstr "Bitte laden Sie nur JPEG Bilder hoch\n"
msgid "Please write a message"
msgstr ""
-#: templates/web/bromley/report/display.html:70
#: templates/web/fixmystreet/report/update-form.html:23
msgid "Please write your update here"
msgstr ""
-#: templates/web/bromley/report/display.html:123
-#: templates/web/bromley/report/display.html:151
-#: templates/web/bromley/report/display.html:163
-#: templates/web/default/contact/index.html:93
+#: templates/web/default/contact/index.html:95
#: templates/web/default/report/update-form.html:109
#: templates/web/default/report/update-form.html:131
#: templates/web/default/report/update-form.html:72
-#: templates/web/fixmystreet/contact/index.html:105
+#: templates/web/fixmystreet/contact/index.html:110
#: templates/web/fixmystreet/report/update-form.html:123
#: templates/web/fixmystreet/report/update-form.html:71
#: templates/web/fixmystreet/report/update-form.html:95
@@ -2585,7 +2432,7 @@ msgstr ""
msgid "Private information (not shown on site)"
msgstr ""
-#: templates/web/default/maps/openlayers.html:85
+#: templates/web/default/maps/openlayers.html:86
msgid "Problem"
msgstr "Meldung"
@@ -2606,7 +2453,7 @@ msgstr ""
msgid "Problem breakdown by state"
msgstr "Meldungen nach Status sortiert"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:950
+#: perllib/FixMyStreet/App/Controller/Admin.pm:959
msgid "Problem marked as open."
msgstr ""
@@ -2622,7 +2469,6 @@ msgstr "Meldungen"
msgid "Problems in this area"
msgstr "Meldungen in dieser Gegend"
-#: templates/web/bromley/report/display.html:31
#: templates/web/fixmystreet/around/tabbed_lists.html:4
#: templates/web/fixmystreet/report/display.html:46
msgid "Problems nearby"
@@ -2642,15 +2488,16 @@ msgstr "Meldungen, welche k&uuml;rzlich beantwortet wurden"
msgid "Problems within %.1fkm of this location"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:626
+#: perllib/FixMyStreet/Cobrand/Default.pm:629
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:109
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155
-#: perllib/FixMyStreet/Cobrand/UK.pm:228
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:184
+#: perllib/FixMyStreet/Cobrand/UK.pm:222
msgid "Problems within %s"
msgstr "Meldungen innerhalb %s"
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117
-#: perllib/FixMyStreet/Cobrand/UK.pm:242
+#: perllib/FixMyStreet/Cobrand/UK.pm:236
msgid "Problems within %s ward"
msgstr ""
@@ -2678,12 +2525,10 @@ msgstr ""
msgid "Property type:"
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:52
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:64
msgid "Provide a title"
msgstr ""
-#: templates/web/bromley/report/display.html:57
#: templates/web/default/report/update-form.html:3
#: templates/web/fixmystreet/report/update-form.html:4
msgid "Provide an update"
@@ -2693,11 +2538,6 @@ msgstr "Meldung aktualisieren"
msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:180
-msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
-msgstr ""
-
-#: templates/web/bromley/report/display.html:144
#: templates/web/default/report/new/fill_in_details_form.html:173
#: templates/web/default/report/update-form.html:128
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:202
@@ -2728,7 +2568,6 @@ msgstr "Foto ver&ouml;ffentlichen"
msgid "Publish the response"
msgstr "Antwort ver&ouml;ffentlichen"
-#: templates/web/default/questionnaire/completed.html:1
#: templates/web/default/questionnaire/completed.html:2
#: templates/web/default/questionnaire/index.html:0
#: templates/web/default/questionnaire/index.html:14
@@ -2752,9 +2591,7 @@ msgstr ""
msgid "Questionnaire filled in by problem reporter"
msgstr ""
-#: templates/web/bromley/report/display.html:37
#: templates/web/default/alert/_list.html:21
-#: templates/web/default/around/display_location.html:1
#: templates/web/default/around/display_location.html:3
#: templates/web/default/report/display.html:46
#: templates/web/default/reports/_rss.html:1
@@ -2764,11 +2601,11 @@ msgstr ""
msgid "RSS feed"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:265 perllib/FixMyStreet/Cobrand/UK.pm:277
msgid "RSS feed for %s"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289
+#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
msgid "RSS feed for %s ward, %s"
msgstr ""
@@ -2776,11 +2613,15 @@ msgstr ""
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:189
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:197
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:309
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:200
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:208
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:218
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:226
+#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303
msgid "RSS feed of %s"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:314
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:308
msgid "RSS feed of %s, within %s ward"
msgstr ""
@@ -2793,31 +2634,30 @@ msgstr ""
msgid "RSS feed of problems in this %s"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:627
+#: perllib/FixMyStreet/Cobrand/Default.pm:630
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:110
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:154
-#: perllib/FixMyStreet/Cobrand/UK.pm:235
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:183
+#: perllib/FixMyStreet/Cobrand/UK.pm:229
msgid "RSS feed of problems within %s"
msgstr ""
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:116
-#: perllib/FixMyStreet/Cobrand/UK.pm:241
+#: perllib/FixMyStreet/Cobrand/UK.pm:235
msgid "RSS feed of problems within %s ward"
msgstr ""
-#: templates/web/default/around/display_location.html:1
+#: templates/web/default/around/display_location.html:3
#: templates/web/default/around/display_location.html:4
msgid "RSS feed of recent local problems"
msgstr ""
-#: templates/web/bromley/report/display.html:37
#: templates/web/default/report/display.html:46
#: templates/web/fixmystreet/alert/updates.html:9
#: templates/web/fixmystreet/report/display.html:61
msgid "RSS feed of updates to this problem"
msgstr ""
-#: templates/web/bromley/report/display.html:39
#: templates/web/default/alert/updates.html:9
#: templates/web/default/report/display.html:37
#: templates/web/fixmystreet/alert/updates.html:14
@@ -2841,7 +2681,7 @@ msgid "Recently fixed"
msgstr "K&uuml;rzlich beantwortet"
#: templates/web/default/index.html:35 templates/web/emptyhomes/index.html:24
-#: templates/web/fixmystreet/index.html:45
+#: templates/web/fixmystreet/index.html:49
msgid "Recently reported problems"
msgstr "K&uuml;rzlich erfasste Meldungen:"
@@ -2858,8 +2698,8 @@ msgstr ""
msgid "Remove flag"
msgstr ""
-#: templates/web/default/admin/report_edit.html:89
-#: templates/web/default/admin/update_edit.html:57
+#: templates/web/default/admin/report_edit.html:94
+#: templates/web/default/admin/update_edit.html:62
#: templates/web/zurich/admin/update_edit.html:35
msgid "Remove photo (can't be undone!)"
msgstr ""
@@ -2868,29 +2708,21 @@ msgstr ""
msgid "Report Empty Homes"
msgstr ""
-#: templates/web/barnet/footer.html:16 templates/web/bromley/footer.html:17
#: templates/web/default/footer.html:7 templates/web/emptyhomes/header.html:31
#: templates/web/fiksgatami/footer.html:5
#: templates/web/fiksgatami/nn/footer.html:5
-#: templates/web/fixmindelo/footer.html:37
-#: templates/web/fixmystreet/footer.html:44
-#: templates/web/oxfordshire/footer.html:19
-#: templates/web/reading/footer.html:6
-#: templates/web/seesomething/footer.html:11
-#: templates/web/stevenage/footer.html:39 templates/web/zurich/footer.html:17
+#: templates/web/fixmystreet/footer.html:47
+#: templates/web/zurich/footer.html:17
#: templates/web/zurich/nav_over_content.html:4
msgid "Report a problem"
msgstr "Eine Meldung erfassen"
-#: templates/web/bromley/report/display.html:28
#: templates/web/fixmystreet/report/display.html:35
msgid "Report abuse"
msgstr "Missbrauch melden"
#: templates/web/default/report_created.html:1
#: templates/web/default/report_created.html:3
-#: templates/web/seesomething/report_created.html:0
-#: templates/web/seesomething/report_created.html:8
msgid "Report created"
msgstr ""
@@ -2900,22 +2732,21 @@ msgstr ""
#: templates/web/default/index.html:14 templates/web/emptyhomes/index.html:5
#: templates/web/fixmystreet/around/intro.html:1
-#: templates/web/stevenage/around/intro.html:1
#: templates/web/zurich/around/intro.html:1
msgid "Report, view, or discuss local problems"
msgstr "Melden Sie M&auml;ngel an der Infrastruktur von Z&uuml;rich"
-#: templates/web/default/my/my.html:74
+#: templates/web/default/my/my.html:79
msgid "Reported %s"
msgstr ""
-#: templates/web/default/my/my.html:72
+#: templates/web/default/my/my.html:77
msgid "Reported %s, to %s"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:559
+#: perllib/FixMyStreet/DB/Result/Problem.pm:561
#: templates/web/default/contact/index.html:45
-#: templates/web/fixmystreet/contact/index.html:58
+#: templates/web/fixmystreet/contact/index.html:62
msgid "Reported anonymously at %s"
msgstr "Anonym gemeldet um"
@@ -2925,9 +2756,9 @@ msgstr "Anonym gemeldet um"
msgid "Reported before"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:582
+#: perllib/FixMyStreet/DB/Result/Problem.pm:584
#: templates/web/default/contact/index.html:47
-#: templates/web/fixmystreet/contact/index.html:60
+#: templates/web/fixmystreet/contact/index.html:64
msgid "Reported by %s at %s"
msgstr "Gemeldet von %s um %s"
@@ -2935,27 +2766,27 @@ msgstr "Gemeldet von %s um %s"
msgid "Reported in the %s category"
msgstr "In der Kategorie %s gemeldet"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:555
+#: perllib/FixMyStreet/DB/Result/Problem.pm:557
msgid "Reported in the %s category anonymously at %s"
msgstr "In der Kategorie %s um %s gemeldet"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:577
+#: perllib/FixMyStreet/DB/Result/Problem.pm:579
msgid "Reported in the %s category by %s at %s"
msgstr "Gemeldet in der Kategorie %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:551
+#: perllib/FixMyStreet/DB/Result/Problem.pm:553
msgid "Reported via %s anonymously at %s"
msgstr "Anonym gemeldet von %s um %s "
-#: perllib/FixMyStreet/DB/Result/Problem.pm:573
+#: perllib/FixMyStreet/DB/Result/Problem.pm:575
msgid "Reported via %s by %s at %s"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:547
+#: perllib/FixMyStreet/DB/Result/Problem.pm:549
msgid "Reported via %s in the %s category anonymously at %s"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:567
+#: perllib/FixMyStreet/DB/Result/Problem.pm:569
msgid "Reported via %s in the %s category by %s at %s"
msgstr ""
@@ -2969,22 +2800,18 @@ msgstr ""
#: templates/web/fixmystreet/report/new/fill_in_details.html:0
#: templates/web/fixmystreet/report/new/fill_in_details.html:5
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2
-#: templates/web/oxfordshire/js/translation_strings.html:35
-#: templates/web/seesomething/around/around_index.html:1
-#: templates/web/seesomething/report/new/fill_in_details_form.html:3
#: templates/web/zurich/report/new/fill_in_details_form.html:2
msgid "Reporting a problem"
msgstr "Ihre Meldung"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1177
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:242
-#: templates/web/seesomething/admin/stats.html:1
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1186
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:290
#: templates/web/zurich/header.html:60
msgid "Reports"
msgstr "Meldungen"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:393
-#: perllib/FixMyStreet/DB/Result/Problem.pm:397
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
+#: perllib/FixMyStreet/DB/Result/Problem.pm:399
msgid "Reports are limited to %s characters in length. Please shorten your report"
msgstr ""
@@ -3005,27 +2832,28 @@ msgid "Resend report"
msgstr ""
#: templates/web/default/js/translation_strings.html:28
-#: templates/web/oxfordshire/js/translation_strings.html:22
msgid "Right place?"
msgstr "Richtiger Ort?"
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:195
#: perllib/FixMyStreet/Geocode/OSM.pm:173
msgid "Road operator for this named road (derived from road reference number and type): %s"
msgstr ""
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:192
#: perllib/FixMyStreet/Geocode/OSM.pm:170
msgid "Road operator for this named road (from OpenStreetMap): %s"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1377
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1388
-#: templates/web/default/admin/report_edit.html:85
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1386
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1397
+#: templates/web/default/admin/report_edit.html:90
#: templates/web/zurich/admin/report_edit.html:76
msgid "Rotate Left"
msgstr "Links drehen"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1377
-#: templates/web/default/admin/report_edit.html:86
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1386
+#: templates/web/default/admin/report_edit.html:91
#: templates/web/zurich/admin/report_edit.html:77
msgid "Rotate Right"
msgstr "Rechts drehen"
@@ -3054,9 +2882,8 @@ msgid "Search:"
msgstr "Suchen:"
#: templates/web/default/admin/reports.html:26
-#, fuzzy
msgid "Searching found no reports."
-msgstr "Meldungen suchen"
+msgstr ""
#: templates/web/default/admin/users.html:39
msgid "Searching found no users."
@@ -3077,7 +2904,7 @@ msgstr "Gebiet wählen"
msgid "Select which type of alert you'd like and click the button for an RSS feed, or enter your email address to subscribe to an email alert."
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:664
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
msgid "Sent to %s %s later"
msgstr ""
@@ -3094,9 +2921,6 @@ msgstr ""
msgid "Share"
msgstr ""
-#: templates/web/bromley/report/display.html:205
-#: templates/web/bromley/report/new/fill_in_details_form.html:129
-#: templates/web/bromley/report/new/fill_in_details_form.html:175
#: templates/web/default/report/new/fill_in_details_form.html:210
#: templates/web/default/report/update-form.html:157
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:129
@@ -3119,11 +2943,7 @@ msgstr "Zeige Stecknadeln"
#: templates/web/fixmystreet/auth/general.html:3
#: templates/web/fixmystreet/auth/general.html:42
#: templates/web/fixmystreet/auth/general.html:62
-#: templates/web/fixmystreet/header.html:54
-#: templates/web/oxfordshire/header.html:115
-#: templates/web/seesomething/auth/general.html:3
-#: templates/web/seesomething/auth/general.html:39
-#: templates/web/stevenage/header.html:101
+#: templates/web/fixmystreet/header.html:57
#: templates/web/zurich/auth/general.html:18
#: templates/web/zurich/auth/general.html:35
msgid "Sign in"
@@ -3135,20 +2955,15 @@ msgstr ""
#: templates/web/default/auth/general.html:1
#: templates/web/fixmystreet/auth/general.html:1
-#: templates/web/seesomething/auth/general.html:1
#: templates/web/zurich/auth/general.html:1
msgid "Sign in or create an account"
msgstr ""
-#: templates/web/bromley/auth/sign_out.html:1
#: templates/web/default/auth/sign_out.html:1
#: templates/web/default/header.html:30
#: templates/web/emptyhomes/header.html:46
#: templates/web/fiksgatami/header.html:22
#: templates/web/fiksgatami/nn/header.html:22
-#: templates/web/lichfielddc/header.html:177
-#: templates/web/reading/header.html:33
-#: templates/web/seesomething/auth/sign_out.html:1
#: templates/web/zurich/auth/sign_out.html:1
msgid "Sign out"
msgstr "Ausloggen"
@@ -3157,14 +2972,12 @@ msgstr "Ausloggen"
#: templates/web/emptyhomes/header.html:45
#: templates/web/fiksgatami/header.html:21
#: templates/web/fiksgatami/nn/header.html:21
-#: templates/web/lichfielddc/header.html:177
-#: templates/web/reading/header.html:32
msgid "Signed in as %s"
msgstr ""
-#: templates/web/default/report/new/fill_in_details_text.html:1
-#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1
-#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1
+#: templates/web/default/report/new/fill_in_details_text.html:2
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:2
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:2
msgid "Some categories may require additional information."
msgstr ""
@@ -3195,6 +3008,8 @@ msgstr ""
#: perllib/FixMyStreet/App/Controller/Report/New.pm:215
#: perllib/FixMyStreet/Geocode.pm:28 perllib/FixMyStreet/Geocode/Bing.pm:58
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:75
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:95
#: perllib/FixMyStreet/Geocode/Google.pm:74
#: perllib/FixMyStreet/Geocode/OSM.pm:66
msgid "Sorry, we could not find that location."
@@ -3202,7 +3017,7 @@ msgstr "Diese Adresse wurde nicht gefunden."
#: perllib/FixMyStreet/Geocode/Bing.pm:53
#: perllib/FixMyStreet/Geocode/Google.pm:69
-#: perllib/FixMyStreet/Geocode/Zurich.pm:87
+#: perllib/FixMyStreet/Geocode/Zurich.pm:88
msgid "Sorry, we could not parse that location. Please try again."
msgstr "Diese Adresse wurde nicht gefunden."
@@ -3212,11 +3027,9 @@ msgid "Source code"
msgstr ""
#: templates/web/default/admin/stats.html:64
-#, fuzzy
msgid "Start Date:"
-msgstr "Status:"
+msgstr ""
-#: templates/web/bromley/report/display.html:78
#: templates/web/default/admin/flagged.html:18
#: templates/web/default/admin/list_updates.html:11
#: templates/web/default/admin/reports.html:15
@@ -3233,8 +3046,8 @@ msgstr "Status"
msgid "State:"
msgstr "Status:"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1182
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:257
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1191
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:305
#: templates/web/default/admin/stats.html:1
#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72
msgid "Stats"
@@ -3250,7 +3063,7 @@ msgstr ""
msgid "Still open, via questionnaire, %s"
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:370
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378
msgid "Subcategory: %s"
msgstr ""
@@ -3258,8 +3071,7 @@ msgstr ""
msgid "Subdivision/Body"
msgstr "FB/Externe"
-#: templates/web/bromley/report/new/fill_in_details_form.html:48
-#: templates/web/fixmystreet/contact/index.html:91
+#: templates/web/fixmystreet/contact/index.html:95
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:60
msgid "Subject"
msgstr "Titel"
@@ -3272,9 +3084,6 @@ msgstr "Titel"
msgid "Subject:"
msgstr "Titel:"
-#: templates/web/bromley/report/new/fill_in_details_form.html:140
-#: templates/web/bromley/report/new/fill_in_details_form.html:190
-#: templates/web/bromley/report/new/fill_in_details_form.html:204
#: templates/web/default/questionnaire/creator_fixed.html:19
#: templates/web/default/report/new/fill_in_details_form.html:114
#: templates/web/default/report/new/fill_in_details_form.html:154
@@ -3283,13 +3092,12 @@ msgstr "Titel:"
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:142
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:167
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:212
-#: templates/web/seesomething/report/new/fill_in_details_form.html:93
#: templates/web/zurich/report/new/fill_in_details_form.html:114
msgid "Submit"
msgstr "Abschicken"
-#: templates/web/default/admin/report_edit.html:92
-#: templates/web/default/admin/update_edit.html:60
+#: templates/web/default/admin/report_edit.html:97
+#: templates/web/default/admin/update_edit.html:65
#: templates/web/default/admin/user-form.html:55
#: templates/web/zurich/admin/report_edit-sdm.html:67
#: templates/web/zurich/admin/report_edit.html:224
@@ -3302,8 +3110,8 @@ msgstr "Speichern"
msgid "Submit questionnaire"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:111
-#: templates/web/zurich/admin/header.html:1
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:133
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/header.html:6
#: templates/web/zurich/admin/index-dm.html:23
#: templates/web/zurich/admin/index-dm.html:6
@@ -3315,7 +3123,6 @@ msgstr ""
msgid "Submitted"
msgstr "Erfasst"
-#: templates/web/bromley/report/display.html:44
#: templates/web/default/alert/updates.html:17
#: templates/web/default/report/display.html:42
#: templates/web/fixmystreet/alert/updates.html:23
@@ -3333,8 +3140,8 @@ msgstr ""
msgid "Subscribe to an alert based upon what baranagay you&rsquo;re in:"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1175
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:241
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1184
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:289
#: templates/web/default/admin/index.html:1
#: templates/web/zurich/admin/index-dm.html:1
#: templates/web/zurich/admin/index-sdm.html:1
@@ -3353,7 +3160,7 @@ msgstr "Zusammenfassung"
msgid "Summary reports"
msgstr "Alle Meldungen"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1179
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1188
msgid "Survey"
msgstr ""
@@ -3376,17 +3183,15 @@ msgstr ""
msgid "Text:"
msgstr ""
-#: templates/web/default/tokens/confirm_update.html:7
#: templates/web/default/tokens/confirm_update.html:8
msgid "Thank you &mdash; you can <a href=\"%s\">view your updated problem</a> on the site."
msgstr "Danke &mdash; Sie k&ouml;nnen Ihre aktualisierte Meldung <a href=\"%s\">auf der Webseite anschauen</a>."
-#: templates/web/emptyhomes/tokens/confirm_problem.html:6
+#: templates/web/emptyhomes/tokens/confirm_problem.html:7
#: templates/web/emptyhomes/tokens/confirm_problem.html:8
msgid "Thank you for reporting an empty property on ReportEmptyHomes.com. We have emailed the lead officer for empty homes in the council responsible with details, and asked them to do whatever they can to get the empty property back into use as soon as possible."
msgstr ""
-#: templates/web/emptyhomes/tokens/confirm_problem.html:30
#: templates/web/emptyhomes/tokens/confirm_problem.html:31
msgid ""
"Thank you for reporting this empty property on ReportEmptyHomes.com.\n"
@@ -3399,7 +3204,7 @@ msgstr ""
msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it."
msgstr ""
-#: templates/web/emptyhomes/tokens/confirm_problem.html:24
+#: templates/web/emptyhomes/tokens/confirm_problem.html:25
#: templates/web/emptyhomes/tokens/confirm_problem.html:26
msgid "Thank you for using ReportEmptyHomes.com. Your action is already helping to resolve the UK&rsquo;s empty homes crisis."
msgstr ""
@@ -3420,15 +3225,16 @@ msgstr ""
msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Council.pm:90
+#: perllib/FixMyStreet/App/Controller/Council.pm:100
msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
msgstr "Sie k&ouml;nnen M&auml;ngel nur innerhalb der Stadt Z&uuml;rich melden. Verwenden Sie daf&uuml;r die Adressuche."
-#: perllib/FixMyStreet/App/Controller/Location.pm:123
+#: perllib/FixMyStreet/App/Controller/Location.pm:124
msgid "That location does not appear to be in the UK; please try again."
msgstr ""
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:63
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:79
#: perllib/FixMyStreet/Cobrand/UK.pm:86
msgid "That postcode was not recognised, sorry."
msgstr ""
@@ -3488,7 +3294,7 @@ msgstr ""
msgid "The confirmation email <strong>may</strong> take a few minutes to arrive &mdash; <em>please</em> be patient."
msgstr ""
-#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:2
#: templates/web/fixmystreet/report/new/fill_in_details_text.html:3
msgid "The council won&rsquo;t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc."
msgstr "Bitte machen Sie so genaue Angaben wie m&ouml;glich: Beschreiben Sie die Art des Mangels und wo er sich befindet (z.B. an der Wand). Senden Sie uns ein Foto des Mangels (inkl. Umgebung). <br/>Beschreiben Sie nur einen Mangel pro Meldung."
@@ -3515,6 +3321,7 @@ msgstr ""
msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
msgstr ""
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:187
#: perllib/FixMyStreet/Geocode/OSM.pm:165
msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
msgstr ""
@@ -3573,7 +3380,7 @@ msgstr ""
msgid "The passwords do not match"
msgstr ""
-#: templates/web/default/errors/page_error_404_not_found.html:10
+#: templates/web/default/errors/page_error_404_not_found.html:11
#: templates/web/default/errors/page_error_404_not_found.html:12
msgid "The requested URL '%s' was not found on this server"
msgstr ""
@@ -3583,16 +3390,14 @@ msgstr ""
msgid "The simplest alert is our geographic one:"
msgstr ""
-#: templates/web/barnet/report/new/councils_text_all.html:3
#: templates/web/default/report/new/councils_extra_text.html:1
-#: templates/web/default/report/new/councils_text_some.html:10
#: templates/web/default/report/new/councils_text_some.html:11
#: templates/web/default/report/new/fill_in_details_form.html:17
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12
msgid "The subject and details of the problem will be public, plus your name if you give us permission."
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:291
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:296
msgid "The user could not locate the problem on a map, but to see the area around the location they entered"
msgstr ""
@@ -3607,16 +3412,15 @@ msgstr ""
msgid "There was a problem showing the All Reports page. Please try again later."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Contact.pm:116
+#: perllib/FixMyStreet/App/Controller/Contact.pm:121
#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59
msgid "There was a problem showing this page. Please try again later."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:747
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:755
#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134
#: templates/web/default/auth/general.html:23
#: templates/web/fixmystreet/auth/general.html:24
-#: templates/web/seesomething/auth/general.html:24
#: templates/web/zurich/auth/general.html:28
msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the &lsquo;sign in by email&rsquo; section of the form."
msgstr "Ihre E-Mail/Passwort Kombination war ung&uuml;ltig. Bitte versuchen Sie es erneut oder wenden Sie sich an den Administrator."
@@ -3629,7 +3433,7 @@ msgstr ""
msgid "There was a problem with your update. Please try again."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Contact.pm:120
+#: perllib/FixMyStreet/App/Controller/Contact.pm:125
msgid "There were problems with your report. Please see below."
msgstr ""
@@ -3669,16 +3473,16 @@ msgid ""
" A body will not receive any reports unless it covers at least one area."
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:375
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:385
msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system."
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:388
msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:894
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:964
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:898
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:968
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:131
#: perllib/FixMyStreet/Cobrand/UK.pm:58
msgid "This information is required"
@@ -3710,7 +3514,6 @@ msgstr ""
msgid "This problem has been closed"
msgstr ""
-#: templates/web/bromley/report/display.html:98
#: templates/web/default/report/banner.html:12
#: templates/web/default/report/update-form.html:48
#: templates/web/emptyhomes/report/banner.html:3
@@ -3718,7 +3521,6 @@ msgstr ""
msgid "This problem has been fixed"
msgstr "Dieser Mangel wurde behoben"
-#: templates/web/bromley/report/display.html:92
#: templates/web/default/report/update-form.html:43
#: templates/web/fixmystreet/report/update-form.html:40
msgid "This problem has not been fixed"
@@ -3732,33 +3534,33 @@ msgstr "Dieser Mangel ist in Bearbeitung"
msgid "This problem is old and of unknown status."
msgstr "Dieses Problem ist alt und hat einen unbekannten Status"
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:108
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:109
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:130
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:131
#: templates/web/zurich/report/_main.html:14
msgid "This report is awaiting moderation."
msgstr "&Uuml;berpr&uuml;fung ausstehend"
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88
msgid "This report is currently marked as closed."
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86
msgid "This report is currently marked as fixed."
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:90
msgid "This report is currently marked as open."
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:320
msgid "This report was submitted anonymously"
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:284
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:289
msgid "This web page also contains a photo of the problem, provided by the user."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1178
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1187
#: templates/web/default/admin/timeline.html:1
msgid "Timeline"
msgstr ""
@@ -3776,7 +3578,7 @@ msgstr ""
msgid "To find out what local alerts we have for you, please enter your postcode or street name and area"
msgstr "Geben Sie eine Adresse an"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:290
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:295
msgid "To view a map of the precise location of this issue"
msgstr ""
@@ -3788,17 +3590,10 @@ msgstr ""
msgid "Total"
msgstr "Total"
-#: templates/web/seesomething/report/new/fill_in_details_form.html:24
-msgid "Transport Category"
-msgstr "Kategorie"
-
#: templates/web/default/js/translation_strings.html:29
-#: templates/web/oxfordshire/js/translation_strings.html:23
msgid "Try again"
msgstr "Erneut versuchen"
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:83
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:46
#: templates/web/default/report/update-form.html:30
@@ -3826,7 +3621,6 @@ msgid "Unknown alert type"
msgstr ""
#: templates/web/default/js/translation_strings.html:39
-#: templates/web/oxfordshire/js/translation_strings.html:33
msgid "Unknown error"
msgstr "Unbekannter Fehler"
@@ -3834,7 +3628,6 @@ msgstr "Unbekannter Fehler"
msgid "Unknown problem ID"
msgstr ""
-#: templates/web/bromley/report/display.html:66
#: templates/web/fixmystreet/report/update-form.html:19
msgid "Update"
msgstr "Speichern"
@@ -3844,12 +3637,12 @@ msgid "Update %s created for problem %d; by %s"
msgstr ""
#: templates/web/default/contact/index.html:21
-#: templates/web/fixmystreet/contact/index.html:34
+#: templates/web/fixmystreet/contact/index.html:38
msgid "Update below added anonymously at %s"
msgstr ""
#: templates/web/default/contact/index.html:23
-#: templates/web/fixmystreet/contact/index.html:36
+#: templates/web/fixmystreet/contact/index.html:40
msgid "Update below added by %s at %s"
msgstr ""
@@ -3893,12 +3686,12 @@ msgstr ""
msgid "Updated"
msgstr "Aktualisiert"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1042
-#: perllib/FixMyStreet/App/Controller/Admin.pm:796
-#: perllib/FixMyStreet/App/Controller/Admin.pm:940
-#: perllib/FixMyStreet/App/Controller/Admin.pm:998
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:487
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:556
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1007
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1051
+#: perllib/FixMyStreet/App/Controller/Admin.pm:801
+#: perllib/FixMyStreet/App/Controller/Admin.pm:949
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:550
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:619
msgid "Updated!"
msgstr "Aktualisiert!"
@@ -3910,16 +3703,14 @@ msgstr "Aktualisiert!"
msgid "Updates"
msgstr "Antwort"
-#: perllib/FixMyStreet/DB/Result/Comment.pm:131
-msgid "Updates are limited to 2000 characters in length. Please shorten your update"
+#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+msgid "Updates are limited to %s characters in length. Please shorten your update"
msgstr ""
#: db/alert_types.pl:5 db/alert_types.pl:6
msgid "Updates on {{title}}"
msgstr ""
-#: templates/web/bromley/report/display.html:0
-#: templates/web/bromley/report/display.html:8
#: templates/web/default/report/display.html:0
#: templates/web/default/report/display.html:5
#: templates/web/fixmystreet/report/display.html:0
@@ -3936,11 +3727,11 @@ msgstr ""
msgid "User"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1342
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1351
msgid "User flag removed"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1314
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1323
msgid "User flagged"
msgstr ""
@@ -3948,8 +3739,8 @@ msgstr ""
msgid "User search finds matches in users' names and email addresses."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:256
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1189
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:304
#: templates/web/default/admin/flagged.html:29
#: templates/web/zurich/header.html:69
msgid "Users"
@@ -3978,12 +3769,9 @@ msgstr ""
#: templates/web/default/around/display_location.html:0
#: templates/web/default/around/display_location.html:34
-#: templates/web/seesomething/around/display_location.html:0
-#: templates/web/seesomething/around/display_location.html:16
msgid "Viewing a location"
msgstr "Meldung erfassen"
-#: templates/web/bromley/report/display.html:0
#: templates/web/default/report/display.html:0
#: templates/web/fixmystreet/report/display.html:0
msgid "Viewing a problem"
@@ -3996,7 +3784,6 @@ msgstr ""
#: templates/web/default/alert/choose.html:6
#: templates/web/default/around/around_index.html:13
#: templates/web/fixmystreet/around/around_index.html:16
-#: templates/web/seesomething/around/around_index.html:13
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 "Ihre Anfrage ergab mehr als eine m&ouml;gliche Adresse. Die ersten zehn Treffer werden unten aufgelistet."
@@ -4008,25 +3795,22 @@ msgstr ""
msgid "We have sent you an email containing a link to confirm your account."
msgstr "Sie werden in K&uuml;rze ein E-Mail erhalten um Ihren Account zu best&auml;tigen."
-#: templates/web/emptyhomes/tokens/confirm_problem.html:18
+#: templates/web/emptyhomes/tokens/confirm_problem.html:19
#: templates/web/emptyhomes/tokens/confirm_problem.html:20
msgid "We may contact you periodically to ask if anything has changed with the property you reported."
msgstr ""
-#: templates/web/bromley/report/display.html:143
#: templates/web/fixmystreet/report/update-form.html:115
msgid "We never show your email"
msgstr "Ihr E-Mail wird nie angezeigt"
-#: templates/web/bromley/report/new/fill_in_details_form.html:133
-#: templates/web/bromley/report/new/fill_in_details_form.html:179
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:134
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:201
#: templates/web/zurich/report/new/fill_in_details_form.html:96
msgid "We never show your email address or phone number."
msgstr "Ihre E-Mail Adresse oder Telefonnummer werden nie angezeigt"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:384
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:394
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 ""
@@ -4034,14 +3818,12 @@ msgstr ""
msgid "We send it to the council on your behalf"
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:217
#: templates/web/default/report/new/notes.html:5
#: templates/web/fixmybarangay/report/new/notes.html:5
msgid "We will only use your personal information in accordance with our <a href=\"/faq#privacy\">privacy policy.</a>"
msgstr "Wir verwenden Ihre pers&ouml;nlichen Daten nur entsprechend unserer <a href=\"/faq#privacy\">Datenschutzrichtlinien.</a>"
#: templates/web/fixmystreet/report/new/notes.html:4
-#: templates/web/oxfordshire/report/new/notes.html:4
msgid "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>"
msgstr "Ihre pers&ouml;nlichen Angaben werden nur f&uuml;r interne Zwecke verwendet und nicht ver&ouml;ffentlicht."
@@ -4071,13 +3853,11 @@ msgstr ""
msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>."
msgstr ""
-#: templates/web/fixmystreet/footer.html:21
-#: templates/web/stevenage/footer.html:22
+#: templates/web/fixmystreet/footer.html:24
msgid "Would you like better integration with FixMyStreet? <a href=\"http://www.mysociety.org/for-councils/fixmystreet/\">Find out about FixMyStreet for councils</a>."
msgstr ""
-#: templates/web/fixmystreet/footer.html:17
-#: templates/web/stevenage/footer.html:18
+#: templates/web/fixmystreet/footer.html:20
msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>."
msgstr ""
@@ -4089,7 +3869,6 @@ msgstr ""
#: templates/web/default/report/new/notes.html:8
#: templates/web/fixmybarangay/report/new/notes.html:8
#: templates/web/fixmystreet/report/new/notes.html:8
-#: templates/web/oxfordshire/report/new/notes.html:7
msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
msgstr "Meldungen g&auml;nzlich in Grossbuchstaben zu schreiben macht diese unleserlich. Ebenso wenn keine Satzzeichen verwendet werden."
@@ -4119,26 +3898,24 @@ msgstr "Jahr"
msgid "Yes"
msgstr "Ja"
-#: templates/web/bromley/report/display.html:157
-#: templates/web/bromley/report/new/fill_in_details_form.html:198
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:161
#: templates/web/fixmystreet/report/update-form.html:89
msgid "Yes I have a password"
msgstr ""
#: templates/web/default/contact/index.html:37
-#: templates/web/fixmystreet/contact/index.html:50
+#: templates/web/fixmystreet/contact/index.html:54
msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:"
msgstr ""
#: templates/web/default/contact/index.html:15
-#: templates/web/fixmystreet/contact/index.html:28
+#: templates/web/fixmystreet/contact/index.html:32
msgid "You are reporting the following update for being abusive, containing personal information, or similar:"
msgstr ""
-#: templates/web/default/tokens/confirm_problem.html:19
+#: templates/web/default/tokens/confirm_problem.html:20
#: templates/web/default/tokens/confirm_problem.html:21
-#: templates/web/zurich/tokens/confirm_problem.html:5
+#: templates/web/zurich/tokens/confirm_problem.html:6
#: templates/web/zurich/tokens/confirm_problem.html:8
msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
msgstr "Danke! Sie k&ouml;nnen Ihre aktualisierte Meldung <a href=\"%s%s\">auf der Webseite anschauen</a>."
@@ -4147,6 +3924,10 @@ msgstr "Danke! Sie k&ouml;nnen Ihre aktualisierte Meldung <a href=\"%s%s\">auf d
msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
msgstr ""
+#: templates/web/fixmystreet/contact/index.html:118
+msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
+msgstr ""
+
#: templates/web/default/admin/flagged.html:5
msgid ""
"You can flag any report or user by editing them, and they will be listed on this page.\n"
@@ -4154,9 +3935,9 @@ msgid ""
" reports in the past."
msgstr ""
-#: templates/web/default/report/new/councils_text_none.html:11
-#: templates/web/default/report/new/councils_text_none.html:13
-#: templates/web/default/report/new/councils_text_some.html:20
+#: templates/web/default/report/new/councils_text_none.html:19
+#: templates/web/default/report/new/councils_text_none.html:20
+#: templates/web/default/report/new/councils_text_some.html:21
#: templates/web/default/report/new/councils_text_some.html:22
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 ""
@@ -4166,7 +3947,6 @@ msgid "You can mark a body as deleted if you do not want it to be active on the
msgstr ""
#: templates/web/default/js/translation_strings.html:36
-#: templates/web/oxfordshire/js/translation_strings.html:30
msgid "You declined; please fill in the box above"
msgstr "Nicht freigeschaltet; Bitte geben Sie eine Adresse an"
@@ -4174,30 +3954,25 @@ msgstr "Nicht freigeschaltet; Bitte geben Sie eine Adresse an"
msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:97
#: templates/web/default/questionnaire/index.html:96
#: templates/web/default/report/new/fill_in_details_form.html:93
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:90
#: templates/web/fixmystreet/questionnaire/index.html:87
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:99
-#: templates/web/seesomething/report/new/fill_in_details_form.html:59
#: templates/web/zurich/report/new/fill_in_details_form.html:75
msgid "You have already attached a photo to this report, attaching another one will replace it."
msgstr "Sie haben bereits ein Photo angeh&auml;ngt. Laden Sie ein neues hoch um es zu ersetzen."
-#: templates/web/bromley/report/display.html:108
#: templates/web/default/report/update-form.html:59
#: templates/web/fixmystreet/report/update-form.html:56
msgid "You have already attached a photo to this update, attaching another one will replace it."
msgstr ""
#: templates/web/default/auth/sign_out.html:3
-#: templates/web/seesomething/auth/sign_out.html:3
#: templates/web/zurich/auth/sign_out.html:3
msgid "You have been signed out"
msgstr "Sie haben sich abgemeldet"
-#: templates/web/bromley/report/new/fill_in_details_form.html:25
#: templates/web/default/report/new/fill_in_details_form.html:7
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:7
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:28
@@ -4209,17 +3984,14 @@ msgstr "Der gr&uuml;ne Punkt lokalisiert Ihre Meldung auf der Karte. Falls diese
msgid "You have successfully confirmed your alert."
msgstr ""
-#: templates/web/zurich/tokens/confirm_problem.html:5
#: templates/web/zurich/tokens/confirm_problem.html:6
msgid "You have successfully confirmed your email address."
msgstr "Sie haben Ihre Meldung erfolgreich best&auml;tigt. "
-#: templates/web/default/tokens/confirm_problem.html:14
#: templates/web/default/tokens/confirm_problem.html:15
msgid "You have successfully confirmed your problem"
msgstr "Sie haben Ihre Meldung erfolgreich best&auml;tigt"
-#: templates/web/default/tokens/confirm_update.html:11
#: templates/web/default/tokens/confirm_update.html:12
msgid "You have successfully confirmed your update and you can now <a href=\"%s\">view it on the site</a>."
msgstr ""
@@ -4232,11 +4004,15 @@ msgstr ""
msgid "You have successfully deleted your alert."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:754
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:762
#: perllib/FixMyStreet/App/Controller/Report/Update.pm:140
msgid "You have successfully signed in; please check and confirm your details are accurate:"
msgstr ""
+#: templates/web/default/my/my.html:17 templates/web/fixmystreet/my/my.html:17
+msgid "You haven&rsquo;t created any reports yet. <a href=\"%s\">Report a problem now.</a>"
+msgstr ""
+
#: templates/web/default/email_sent.html:13
msgid "You must now click the link in the email we've just sent you."
msgstr "Sie k&ouml;nnen Ihre Meldung best&auml;tigen, indem Sie auf den Link im E-Mail klicken."
@@ -4263,13 +4039,10 @@ msgstr ""
msgid "Your Reports"
msgstr "Ihre Meldungen"
-#: templates/web/bromley/report/display.html:41
-#: templates/web/bromley/report/display.html:43
-#: templates/web/bromley/report/new/fill_in_details_form.html:145
#: templates/web/fixmystreet/alert/_list.html:89
#: templates/web/fixmystreet/alert/updates.html:19
#: templates/web/fixmystreet/alert/updates.html:22
-#: templates/web/fixmystreet/contact/index.html:84
+#: templates/web/fixmystreet/contact/index.html:88
#: templates/web/fixmystreet/report/display.html:65
#: templates/web/fixmystreet/report/display.html:67
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:115
@@ -4278,14 +4051,8 @@ msgstr "Ihre Meldungen"
msgid "Your email"
msgstr "E-Mail Adresse"
-#: templates/web/seesomething/report/new/fill_in_details_form.html:81
-msgid "Your email (optional)"
-msgstr ""
-
-#: templates/web/bromley/report/display.html:132
#: templates/web/fixmystreet/auth/general.html:26
#: templates/web/fixmystreet/report/update-form.html:80
-#: templates/web/seesomething/auth/general.html:26
#: templates/web/zurich/auth/general.html:30
#: templates/web/zurich/auth/general.html:58
msgid "Your email address"
@@ -4303,28 +4070,15 @@ msgstr "Ihre E-Mail Adresse:"
msgid "Your email:"
msgstr "Ihre E-Mail:"
-#: templates/web/bromley/report/display.html:195
-#: templates/web/bromley/report/new/fill_in_details_form.html:117
-#: templates/web/bromley/report/new/fill_in_details_form.html:164
-msgid "Your first name"
-msgstr "Ihr Name"
-
-#: templates/web/fixmystreet/report/updates-sidebar-notes.html:5
+#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7
msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>"
msgstr "Wir verwenden Ihre pers&ouml;nlichen Daten nur entsprechend unserer <a href=\"/faq#privacy\">Datenschutzrichtlinien.</a>"
-#: templates/web/bromley/report/display.html:201
-#: templates/web/bromley/report/new/fill_in_details_form.html:123
-#: templates/web/bromley/report/new/fill_in_details_form.html:170
-msgid "Your last name"
-msgstr "Ihr Name"
-
#: templates/web/fixmystreet/auth/general.html:57
-#: templates/web/fixmystreet/contact/index.html:77
+#: templates/web/fixmystreet/contact/index.html:81
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:124
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:192
#: templates/web/fixmystreet/report/update-form.html:140
-#: templates/web/seesomething/report/new/fill_in_details_form.html:79
#: templates/web/zurich/auth/general.html:61
#: templates/web/zurich/report/new/fill_in_details_form.html:104
msgid "Your name"
@@ -4338,12 +4092,9 @@ msgstr "Ihr Name"
msgid "Your name:"
msgstr "Ihr Name:"
-#: templates/web/bromley/report/display.html:162
-#: templates/web/bromley/report/new/fill_in_details_form.html:203
#: templates/web/fixmystreet/auth/general.html:41
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:166
#: templates/web/fixmystreet/report/update-form.html:94
-#: templates/web/seesomething/auth/general.html:30
#: templates/web/zurich/auth/general.html:34
msgid "Your password"
msgstr "Ihr Passwort"
@@ -4352,11 +4103,8 @@ msgstr "Ihr Passwort"
msgid "Your password has been changed"
msgstr "Ihr Passwort wurde ge&auml;ndert"
-#: templates/web/bromley/report/new/fill_in_details_form.html:137
-#: templates/web/bromley/report/new/fill_in_details_form.html:184
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:139
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:206
-#: templates/web/seesomething/report/new/fill_in_details_form.html:90
#: templates/web/zurich/report/new/fill_in_details_form.html:110
msgid "Your phone number"
msgstr "Ihre Telefonnummer"
@@ -4369,19 +4117,13 @@ msgstr "Ihre Meldung"
msgid "Your report has been created and will shortly be sent."
msgstr ""
-#: templates/web/barnet/footer.html:18 templates/web/bromley/footer.html:19
-#: templates/web/bromley/header.html:75 templates/web/default/footer.html:9
-#: templates/web/fiksgatami/footer.html:6
+#: templates/web/default/footer.html:9 templates/web/fiksgatami/footer.html:6
#: templates/web/fiksgatami/nn/footer.html:6
-#: templates/web/fixmindelo/footer.html:39
-#: templates/web/fixmystreet/footer.html:46
-#: templates/web/oxfordshire/footer.html:21
-#: templates/web/oxfordshire/header.html:63
-#: templates/web/reading/footer.html:7 templates/web/stevenage/footer.html:41
+#: templates/web/fixmystreet/footer.html:49
msgid "Your reports"
msgstr "Ihre Meldungen"
-#: templates/web/default/my/my.html:45 templates/web/fixmystreet/my/my.html:49
+#: templates/web/default/my/my.html:50 templates/web/fixmystreet/my/my.html:56
msgid "Your updates"
msgstr ""
@@ -4398,7 +4140,7 @@ msgstr ""
msgid "council"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
msgid "council ref:&nbsp;%s"
msgstr ""
@@ -4410,27 +4152,24 @@ msgstr "hat Karte nicht verwendet"
#: templates/web/default/alert/index.html:33
#: templates/web/fixmystreet/around/postcode_form.html:20
-#: templates/web/seesomething/around/postcode_form.html:9
msgid "e.g. ‘%s’ or ‘%s’"
msgstr "z.B. ‘%s’ oder ‘%s’"
#: templates/web/default/admin/flagged.html:51
-#, fuzzy
msgid "edit user"
-msgstr "User hinzuf&uuml;gen"
+msgstr ""
#: templates/web/default/admin/index.html:23
#: templates/web/zurich/admin/index.html:5
msgid "from %d different users"
msgstr "von %d verschiedenen Personen"
-#: templates/web/bromley/report/_item.html:12
-#: templates/web/fixmystreet/report/_item.html:12
+#: templates/web/fixmystreet/report/_item.html:17
#: templates/web/zurich/report/_item.html:16
msgid "last updated %s"
msgstr "letzte Bearbeitung %s"
-#: perllib/Utils.pm:263
+#: perllib/Utils.pm:265
msgid "less than a minute"
msgstr "weniger als einer Minute"
@@ -4488,21 +4227,20 @@ msgid "or"
msgstr "oder"
#: templates/web/default/js/translation_strings.html:27
-#: templates/web/oxfordshire/js/translation_strings.html:21
msgid "or locate me automatically"
msgstr "oder automatisch lokalisieren"
-#: templates/web/default/admin/report_edit.html:24
+#: templates/web/default/admin/report_edit.html:25
#: templates/web/default/admin/report_edit.html:26
-#: templates/web/zurich/admin/report_edit-sdm.html:30
+#: templates/web/zurich/admin/report_edit-sdm.html:31
#: templates/web/zurich/admin/report_edit-sdm.html:32
-#: templates/web/zurich/admin/report_edit-sdm.html:39
+#: templates/web/zurich/admin/report_edit-sdm.html:40
#: templates/web/zurich/admin/report_edit-sdm.html:41
-#: templates/web/zurich/admin/report_edit.html:30
+#: templates/web/zurich/admin/report_edit.html:31
#: templates/web/zurich/admin/report_edit.html:32
-#: templates/web/zurich/admin/report_edit.html:41
+#: templates/web/zurich/admin/report_edit.html:42
#: templates/web/zurich/admin/report_edit.html:43
-#: templates/web/zurich/admin/report_edit.html:53
+#: templates/web/zurich/admin/report_edit.html:54
#: templates/web/zurich/admin/report_edit.html:55
msgid "originally entered: &ldquo;%s&rdquo;"
msgstr "Originaltext: &ldquo;%s&rdquo;"
@@ -4516,23 +4254,17 @@ msgstr ""
msgid "reopened"
msgstr ""
-#: templates/web/barnet/header.html:71 templates/web/bromley/header.html:100
-#: templates/web/bromley/header.html:65
#: templates/web/fixmybarangay/header.html:67
-#: templates/web/fixmystreet/header.html:51
-#: templates/web/oxfordshire/header.html:112
-#: templates/web/oxfordshire/header.html:48
-#: templates/web/stevenage/header.html:98 templates/web/zurich/footer.html:12
+#: templates/web/fixmystreet/header.html:54
+#: templates/web/zurich/footer.html:12
msgid "sign out"
msgstr "ausloggen"
-#: templates/web/bromley/report/new/fill_in_details_form.html:4
-#: templates/web/bromley/report/new/fill_in_details_form.html:7
-#: templates/web/default/report/new/fill_in_details_form.html:11
+#: templates/web/default/report/new/fill_in_details_form.html:12
#: templates/web/default/report/new/fill_in_details_form.html:14
-#: templates/web/emptyhomes/report/new/fill_in_details_form.html:11
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:12
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:14
-#: templates/web/fixmystreet/report/new/fill_in_details_form.html:6
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:7
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:9
msgid "the local council"
msgstr ""
@@ -4542,11 +4274,11 @@ msgstr ""
msgid "there is no pin shown as the user did not use the map"
msgstr "Es wird keine Stecknadel angezeigt, da der User die Karte nicht ben&uuml;tzt hat"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:362
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:370
msgid "this type of local problem"
msgstr ""
-#: perllib/Utils.pm:235
+#: perllib/Utils.pm:237
msgid "today"
msgstr "heute"
@@ -4576,7 +4308,7 @@ msgid_plural "<big>%s</big> reports recently"
msgstr[0] "<big>%s</big> Meldung in letzter Zeit"
msgstr[1] "<big>%s</big> Meldungen in letzter Zeit"
-#: perllib/Utils.pm:282
+#: perllib/Utils.pm:284
#, perl-format
msgid "%d hour"
msgid_plural "%d hours"
@@ -4590,7 +4322,7 @@ msgid_plural "%d supporters"
msgstr[0] ""
msgstr[1] ""
-#: perllib/Utils.pm:284
+#: perllib/Utils.pm:286
#, perl-format
msgid "%d minute"
msgid_plural "%d minutes"
@@ -4611,7 +4343,7 @@ msgid_plural "We do not yet have details for the councils that cover this locati
msgstr[0] ""
msgstr[1] ""
-#: perllib/Utils.pm:278
+#: perllib/Utils.pm:280
#, perl-format
msgid "%d week"
msgid_plural "%d weeks"
@@ -4632,6 +4364,13 @@ msgid_plural "<big>%s</big> fixed in past month"
msgstr[0] "<big>%s</big> bearbeitete Meldung im letzten Monat"
msgstr[1] "<big>%s</big> bearbeitete Meldungen im letzten Monat"
+#: perllib/Utils.pm:282
+#, perl-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d Tag"
+msgstr[1] "%d Tage"
+
#: templates/web/default/report/new/councils_text_some.html:14
#, perl-format
msgid "We do <strong>not</strong> yet have details for the other council that covers this location."
@@ -4639,13 +4378,23 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils
msgstr[0] ""
msgstr[1] ""
-#: perllib/Utils.pm:280
-#, perl-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d Tag"
-msgstr[1] "%d Tage"
+#~ msgid "Incident Category"
+#~ msgstr "Kategorie"
-#, fuzzy
-#~ msgid "The email field is required"
-#~ msgstr "Diese Information wird ben&ouml;tigt"
+#~ msgid "Last Name"
+#~ msgstr "Letzte Bearbeitung"
+
+#~ msgid "Name (optional)"
+#~ msgstr "(optional)"
+
+#~ msgid "Please note that updates are not sent to the relevant department. 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 "Wir verwenden Ihre pers&ouml;nlichen Daten nur entsprechend unserer <a href=\"/faq#privacy\">Datenschutzrichtlinien.</a>"
+
+#~ msgid "Transport Category"
+#~ msgstr "Kategorie"
+
+#~ msgid "Your first name"
+#~ msgstr "Ihr Name"
+
+#~ msgid "Your last name"
+#~ msgstr "Ihr Name"
diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po
index 14f994ebb..2d1e89fd9 100644
--- a/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -4,13 +4,14 @@
# Matthew Somerville <matthew@mysociety.org>, 2011-06-03.
#
# Translators:
+# MatHut <mathias.huter@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: fixmystreet\n"
"Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2013-11-12 13:15+0000\n"
-"PO-Revision-Date: 2013-09-05 16:55+0000\n"
-"Last-Translator: mysociety <transifex@mysociety.org>\n"
+"POT-Creation-Date: 2014-05-16 17:30+0100\n"
+"PO-Revision-Date: 2014-01-08 16:52+0000\n"
+"Last-Translator: MatHut <mathias.huter@gmail.com>\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/fixmystreet/language/de_DE/)\n"
"Language: de_DE\n"
"MIME-Version: 1.0\n"
@@ -18,25 +19,25 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:373
+#: perllib/FixMyStreet/DB/Result/Problem.pm:604
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383
msgid " and "
msgstr "und"
-#: templates/web/default/tokens/confirm_problem.html:14
+#: templates/web/default/tokens/confirm_problem.html:15
#: templates/web/default/tokens/confirm_problem.html:17
msgid " and <strong>we will now send it to the council</strong>"
-msgstr ""
-
-#: templates/web/default/report/new/councils_text_all.html:11
-#: templates/web/default/report/new/councils_text_all.html:18
-#: templates/web/default/report/new/councils_text_all.html:4
-#: templates/web/default/report/new/councils_text_none.html:11
-#: templates/web/default/report/new/councils_text_none.html:14
-#: templates/web/default/report/new/councils_text_some.html:20
+msgstr "und <strong> wir werden es nun an die Gemeinde senden</strong>"
+
+#: templates/web/default/report/new/councils_text_all.html:12
+#: templates/web/default/report/new/councils_text_all.html:19
+#: templates/web/default/report/new/councils_text_all.html:5
+#: templates/web/default/report/new/councils_text_none.html:19
+#: templates/web/default/report/new/councils_text_none.html:21
+#: templates/web/default/report/new/councils_text_some.html:21
#: templates/web/default/report/new/councils_text_some.html:23
#: templates/web/default/report/new/councils_text_some.html:5
-#: templates/web/emptyhomes/report/new/councils_text_all.html:2
+#: templates/web/emptyhomes/report/new/councils_text_all.html:3
msgid " or "
msgstr "oder"
@@ -55,15 +56,15 @@ msgstr ""
#: templates/web/default/admin/edit-league.html:12
msgid "%d edits by %s"
-msgstr ""
+msgstr "%d bearbeitet von %s"
#: templates/web/default/admin/index.html:24
msgid "%d live updates"
-msgstr ""
+msgstr "%d Aktualisierungen in Echtzeit"
#: templates/web/default/admin/index.html:26
msgid "%d questionnaires sent &ndash; %d answered (%s%%)"
-msgstr ""
+msgstr "%d Fragebögen versandt &ndash; %d beantwortet (%s%%)"
#: templates/web/default/pagination.html:10
msgid "%d to %d of %d"
@@ -72,21 +73,21 @@ msgstr ""
#: templates/web/default/reports/body.html:0
#: templates/web/default/reports/body.html:22
msgid "%s - Summary reports"
-msgstr ""
+msgstr "%s - Zusammenfassungen"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:653
msgid "%s ref:&nbsp;%s"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
msgid "%s ward, %s"
-msgstr ""
+msgstr "%s Stadtteil, %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:538
+#: perllib/FixMyStreet/DB/Result/Problem.pm:540
msgid "%s, reported at %s"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/UK.pm:303 perllib/FixMyStreet/Cobrand/UK.pm:315
+#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:309
msgid "%s, within %s ward"
msgstr ""
@@ -117,30 +118,27 @@ msgstr ""
msgid "(alternatively the RSS feed can be customised, within"
msgstr ""
-#: templates/web/bromley/report/_item.html:22
#: templates/web/default/around/around_map_list_items.html:12
#: templates/web/default/around/on_map_list_items.html:9
-#: templates/web/fixmystreet/report/_item.html:22
+#: templates/web/fixmystreet/report/_item.html:27
#: templates/web/zurich/report/_item.html:21
msgid "(closed)"
msgstr ""
-#: templates/web/bromley/report/_item.html:20
#: templates/web/default/around/around_map_list_items.html:10
#: templates/web/default/around/on_map_list_items.html:7
-#: templates/web/fixmystreet/report/_item.html:20
+#: templates/web/fixmystreet/report/_item.html:25
#: templates/web/zurich/report/_item.html:19
msgid "(fixed)"
msgstr "(gel&ouml;st)"
-#: templates/web/default/index.html:12 templates/web/default/index.html:8
+#: templates/web/default/index.html:12 templates/web/default/index.html:9
#: templates/web/fixmystreet/around/intro.html:2
msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
msgstr "(z.B. illegale Deponien, Strassensch&auml;den, Graffitis usw.)"
-#: templates/web/bromley/report/_item.html:16
#: templates/web/default/reports/_list-entry.html:4
-#: templates/web/fixmystreet/report/_item.html:16
+#: templates/web/fixmystreet/report/_item.html:21
msgid "(not sent to council)"
msgstr ""
@@ -150,9 +148,8 @@ msgstr ""
msgid "(optional)"
msgstr "(optional)"
-#: templates/web/bromley/report/_item.html:15
#: templates/web/default/reports/_list-entry.html:2
-#: templates/web/fixmystreet/report/_item.html:15
+#: templates/web/fixmystreet/report/_item.html:20
msgid "(sent to both)"
msgstr ""
@@ -164,8 +161,8 @@ msgstr "(ihre eMail-Adresse oder Telefonnummer werden nie angezeigt)"
msgid "(we never show your email)"
msgstr "(ihre eMail-Adresse wird nie angezeigt)"
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:637
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:664
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:635
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:662
#: perllib/FixMyStreet/DB/Result/Problem.pm:379
msgid "-- Pick a category --"
msgstr "-- W&auml;hlen Sie eine Kategorie --"
@@ -201,7 +198,7 @@ msgid ""
"</p>"
msgstr ""
-#: templates/web/fixmystreet/questionnaire/completed-open.html:6
+#: templates/web/fixmystreet/questionnaire/completed-open.html:25
msgid ""
"<p style=\"font-size:150%\">We&rsquo;re sorry to hear that. We have two\n"
"suggestions: why not try <a href=\"http://www.writetothem.com/\">writing direct\n"
@@ -251,7 +248,7 @@ msgid ""
"site and leave an update.</p>"
msgstr ""
-#: templates/web/default/around/_report_banner.html:3
+#: templates/web/default/around/_report_banner.html:4
#: templates/web/default/around/_report_banner.html:5
msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>"
msgstr ""
@@ -306,8 +303,6 @@ msgstr ""
msgid "About us"
msgstr "&Uuml;ber uns"
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:81
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:39
#: templates/web/default/report/update-form.html:30
@@ -345,7 +340,7 @@ msgstr "F&uuml;ge neue Kategorie hinzu"
msgid "Add user"
msgstr ""
-#: templates/web/default/my/my.html:56 templates/web/fixmystreet/my/my.html:60
+#: templates/web/default/my/my.html:61 templates/web/fixmystreet/my/my.html:67
msgid "Added %s"
msgstr ""
@@ -361,7 +356,6 @@ msgstr ""
msgid "Alert %d disabled (created %s)"
msgstr ""
-#: templates/web/bromley/report/display.html:209
#: templates/web/default/report/update-form.html:163
#: templates/web/fixmystreet/report/update-form.html:148
msgid "Alert me to future updates"
@@ -374,17 +368,12 @@ msgstr ""
msgid "All Reports"
msgstr "Alle Meldungen"
-#: templates/web/barnet/footer.html:20 templates/web/bromley/footer.html:21
-#: templates/web/bromley/header.html:77 templates/web/default/footer.html:11
+#: templates/web/default/footer.html:11
#: templates/web/emptyhomes/header.html:32
#: templates/web/fiksgatami/footer.html:7
#: templates/web/fiksgatami/nn/footer.html:7
-#: templates/web/fixmindelo/footer.html:41
#: templates/web/fixmybarangay/footer.html:20
-#: templates/web/fixmystreet/footer.html:48
-#: templates/web/oxfordshire/footer.html:23
-#: templates/web/oxfordshire/header.html:67
-#: templates/web/reading/footer.html:8 templates/web/stevenage/footer.html:43
+#: templates/web/fixmystreet/footer.html:51
#: templates/web/zurich/admin/index-dm.html:12
#: templates/web/zurich/admin/stats.html:13
#: templates/web/zurich/footer.html:19
@@ -401,27 +390,25 @@ msgstr ""
msgid "All the information you provide here will be sent to"
msgstr ""
-#: templates/web/default/report/new/councils_text_all.html:11
+#: templates/web/default/report/new/councils_text_all.html:12
#: templates/web/default/report/new/councils_text_all.html:13
msgid "All the information you provide here will be sent to <strong>%s</strong> or <strong>Roads Service</strong>."
msgstr ""
-#: templates/web/default/report/new/councils_text_all.html:4
+#: templates/web/default/report/new/councils_text_all.html:5
#: templates/web/default/report/new/councils_text_all.html:6
msgid "All the information you provide here will be sent to <strong>%s</strong> or a relevant local body such as <strong>TfL</strong>, via the London Report-It system."
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:4
-#: templates/web/bromley/report/new/fill_in_details_form.html:6
-#: templates/web/default/report/new/councils_text_all.html:18
+#: templates/web/default/report/new/councils_text_all.html:19
#: templates/web/default/report/new/councils_text_all.html:20
-#: templates/web/default/report/new/fill_in_details_form.html:11
+#: templates/web/default/report/new/fill_in_details_form.html:12
#: templates/web/default/report/new/fill_in_details_form.html:13
-#: templates/web/emptyhomes/report/new/councils_text_all.html:2
+#: templates/web/emptyhomes/report/new/councils_text_all.html:3
#: templates/web/emptyhomes/report/new/councils_text_all.html:4
-#: templates/web/emptyhomes/report/new/fill_in_details_form.html:11
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:12
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:13
-#: templates/web/fixmystreet/report/new/fill_in_details_form.html:6
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:7
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:8
msgid "All the information you provide here will be sent to <strong>%s</strong>."
msgstr ""
@@ -445,13 +432,11 @@ msgstr "Anonym:"
msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?"
msgstr ""
-#: templates/web/fixmystreet/footer.html:16
-#: templates/web/stevenage/footer.html:17
+#: templates/web/fixmystreet/footer.html:19
msgid "Are you a developer?"
msgstr ""
-#: templates/web/fixmystreet/footer.html:20
-#: templates/web/stevenage/footer.html:21
+#: templates/web/fixmystreet/footer.html:23
msgid "Are you from a council?"
msgstr ""
@@ -474,7 +459,7 @@ msgstr ""
msgid "Assign to subdivision:"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:141
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:163
#: templates/web/zurich/report/updates.html:11
msgid "Assigned to %s"
msgstr ""
@@ -493,7 +478,6 @@ msgid "Awaiting moderation"
msgstr ""
#: templates/web/default/js/translation_strings.html:32
-#: templates/web/oxfordshire/js/translation_strings.html:26
msgid "Back"
msgstr ""
@@ -505,8 +489,8 @@ msgstr ""
msgid "Be sure to choose the right category, because we use that to determine to whom the report is sent."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1176
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:249
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1185
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:297
#: templates/web/default/admin/bodies.html:1
#: templates/web/zurich/header.html:64
msgid "Bodies"
@@ -532,18 +516,15 @@ msgid "By Date"
msgstr ""
#: templates/web/fixmystreet/around/_report_banner.html:10
-#: templates/web/fixmystreet/around/_report_banner.html:8
+#: templates/web/fixmystreet/around/_report_banner.html:9
msgid "Can't see the map? <a href='%s' rel='nofollow'>Skip this step</a>"
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:68
#: templates/web/default/admin/bodies.html:20
#: templates/web/default/admin/body.html:53
#: templates/web/default/admin/index.html:44
#: templates/web/default/report/new/category.html:10
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:74
-#: templates/web/seesomething/report/new/category.html:6
-#: templates/web/southampton/report/new/category.html:3
#: templates/web/zurich/admin/body.html:13
#: templates/web/zurich/admin/index-dm.html:23
#: templates/web/zurich/admin/index-sdm.html:21
@@ -568,7 +549,7 @@ msgstr ""
msgid "Category:"
msgstr "Kategorie:"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:366
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374
msgid "Category: %s"
msgstr "Kategorie: %s"
@@ -617,21 +598,16 @@ msgstr ""
msgid "Click map to report a problem"
msgstr "Klicken Sie in die Karte um eine Meldung zu erfassen"
-#: templates/web/oxfordshire/js/translation_strings.html:39
-#, fuzzy
-msgid "Click on the map to report a problem"
-msgstr "Klicken Sie in die Karte um eine Meldung zu erfassen"
-
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:118
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:140
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:45
#: templates/web/default/admin/report_edit.html:47
#: templates/web/default/dashboard/index.html:142
#: templates/web/default/dashboard/index.html:144
#: templates/web/fixmystreet/report/banner.html:15
-#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:10
#: templates/web/zurich/admin/header.html:12
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/report_edit.html:100
#: templates/web/zurich/admin/report_edit.html:98
#: templates/web/zurich/admin/stats.html:31
@@ -639,11 +615,11 @@ msgstr "Klicken Sie in die Karte um eine Meldung zu erfassen"
msgid "Closed"
msgstr "Geschlossen"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:744
+#: perllib/FixMyStreet/DB/Result/Problem.pm:748
msgid "Closed by council"
msgstr ""
-#: templates/web/default/my/my.html:32 templates/web/fixmystreet/my/my.html:36
+#: templates/web/default/my/my.html:37 templates/web/fixmystreet/my/my.html:43
msgid "Closed reports"
msgstr ""
@@ -651,7 +627,7 @@ msgstr ""
msgid "Closed:"
msgstr "Geschlossen:"
-#: templates/web/default/around/tabbed_lists.html:10
+#: templates/web/default/around/tabbed_lists.html:11
#: templates/web/default/around/tabbed_lists.html:12
msgid "Closest nearby problems <small>(within&nbsp;%skm)</small>"
msgstr ""
@@ -677,9 +653,8 @@ msgid "Cobrand:"
msgstr ""
#: templates/web/default/admin/config_page.html:1
-#, fuzzy
msgid "Configuration"
-msgstr "Best&auml;tigung"
+msgstr ""
#: perllib/FixMyStreet/App/Controller/Admin.pm:421
msgid "Configuration updated - contacts will be generated automatically later"
@@ -709,8 +684,6 @@ msgstr ""
#: templates/web/default/tokens/confirm_update.html:3
#: templates/web/emptyhomes/tokens/confirm_problem.html:1
#: templates/web/emptyhomes/tokens/confirm_problem.html:3
-#: templates/web/southampton/tokens/confirm_problem.html:1
-#: templates/web/southampton/tokens/confirm_problem.html:3
#: templates/web/zurich/tokens/confirm_problem.html:1
#: templates/web/zurich/tokens/confirm_problem.html:3
msgid "Confirmation"
@@ -743,7 +716,6 @@ msgstr "Kontakt"
msgid "Contact FixMyStreet"
msgstr ""
-#: templates/web/bromley/contact/submit.html:1
#: templates/web/default/contact/index.html:1
#: templates/web/default/contact/index.html:2
#: templates/web/default/contact/submit.html:1
@@ -752,20 +724,18 @@ msgstr ""
msgid "Contact Us"
msgstr ""
-#: templates/web/bromley/contact/submit.html:3
#: templates/web/default/contact/index.html:6
#: templates/web/default/contact/submit.html:3
-#: templates/web/fixmystreet/contact/index.html:19
+#: templates/web/fixmystreet/contact/index.html:22
msgid "Contact the team"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1310
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1338
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1319
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1347
msgid "Could not find user"
msgstr ""
#: templates/web/default/js/translation_strings.html:37
-#: templates/web/oxfordshire/js/translation_strings.html:31
msgid "Could not look up location"
msgstr ""
@@ -820,11 +790,10 @@ msgstr ""
#: templates/web/default/admin/bodies.html:7
#: templates/web/default/admin/index.html:5
-#, fuzzy
msgid "Currently no bodies have been created."
-msgstr "Bisher wurden noch keine Meldungen erfasst."
+msgstr ""
-#: templates/web/default/dashboard/index.html:5
+#: templates/web/default/dashboard/index.html:6
#: templates/web/default/dashboard/index.html:7
msgid "Dashboard"
msgstr ""
@@ -847,11 +816,8 @@ msgstr "Gel&ouml;scht"
msgid "Description"
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:54
#: templates/web/default/js/translation_strings.html:34
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66
-#: templates/web/oxfordshire/js/translation_strings.html:28
-#: templates/web/seesomething/report/new/fill_in_details_form.html:16
#: templates/web/zurich/report/new/fill_in_details_form.html:42
msgid "Details"
msgstr "Beschreibung"
@@ -889,8 +855,10 @@ msgstr ""
msgid "Don&rsquo;t know"
msgstr ""
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:82
+#: templates/web/fixmystreet/contact/index.html:115
+msgid "Don't like forms?"
+msgstr ""
+
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:47
#: templates/web/default/report/update-form.html:30
@@ -921,9 +889,9 @@ msgid "Edit body details"
msgstr ""
#: templates/web/default/admin/report_edit.html:1
-#: templates/web/zurich/admin/report_edit-sdm.html:1
+#: templates/web/zurich/admin/report_edit-sdm.html:2
#: templates/web/zurich/admin/report_edit-sdm.html:4
-#: templates/web/zurich/admin/report_edit.html:1
+#: templates/web/zurich/admin/report_edit.html:2
#: templates/web/zurich/admin/report_edit.html:5
msgid "Editing problem %d"
msgstr ""
@@ -941,7 +909,6 @@ msgstr ""
msgid "Editor"
msgstr ""
-#: templates/web/bromley/report/display.html:128
#: templates/web/default/admin/bodies.html:18
#: templates/web/default/admin/body.html:54
#: templates/web/default/admin/body_edit.html:83
@@ -949,7 +916,6 @@ msgstr ""
#: templates/web/default/admin/users.html:16
#: templates/web/fixmystreet/auth/general.html:20
#: templates/web/fixmystreet/report/update-form.html:76
-#: templates/web/seesomething/auth/general.html:20
#: templates/web/zurich/admin/body-form.html:9
#: templates/web/zurich/admin/body.html:14
#: templates/web/zurich/auth/general.html:24
@@ -957,16 +923,15 @@ msgstr ""
msgid "Email"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1286
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1295
msgid "Email added to abuse list"
msgstr ""
#: templates/web/default/admin/body.html:126
-#, fuzzy
msgid "Email address:"
-msgstr "Ihre eMail-Adresse:"
+msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1283
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1292
msgid "Email already in abuse list"
msgstr ""
@@ -990,7 +955,7 @@ msgstr "Schicken sie mir Aktualisierungen"
msgid "Email:"
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:318
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:323
msgid "Email: %s"
msgstr ""
@@ -1043,7 +1008,7 @@ msgstr ""
msgid "Endpoint"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:71
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:72
msgid "Enter a Z&uuml;rich street name"
msgstr ""
@@ -1052,26 +1017,26 @@ msgid "Enter a nearby UK postcode, or street name and area"
msgstr ""
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:25
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:37
msgid "Enter a nearby postcode, or street name and area"
msgstr "Geben Sie eine Adresse an"
-#: templates/web/default/around/postcode_form.html:1
#: templates/web/default/around/postcode_form.html:2
-#: templates/web/fixmystreet/around/postcode_form.html:10
#: templates/web/fixmystreet/around/postcode_form.html:11
-#: templates/web/seesomething/around/postcode_form.html:3
-#: templates/web/seesomething/around/postcode_form.html:4
msgid "Enter a nearby street name and area"
msgstr "Geben Sie eine Adresse an"
+#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:9
+#, fuzzy
+msgid "Enter a nearby street name and area, postal code or district in Delhi"
+msgstr "Geben Sie eine Adresse an"
+
#: templates/web/default/auth/general.html:64
#: templates/web/default/report/new/fill_in_details_form.html:169
#: templates/web/default/report/update-form.html:124
msgid "Enter a new password:"
msgstr ""
-#: templates/web/bromley/report/display.html:150
-#: templates/web/bromley/report/new/fill_in_details_form.html:189
#: templates/web/fixmystreet/auth/general.html:61
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:211
#: templates/web/fixmystreet/report/update-form.html:122
@@ -1106,7 +1071,6 @@ msgstr "Beispiele:"
msgid "Extra data:"
msgstr ""
-#: templates/web/bromley/contact/submit.html:14
#: templates/web/default/contact/submit.html:15
msgid "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>."
msgstr ""
@@ -1120,12 +1084,6 @@ msgstr ""
msgid "Find latest local and national news"
msgstr ""
-#: templates/web/bromley/report/display.html:191
-#: templates/web/bromley/report/new/fill_in_details_form.html:113
-#: templates/web/bromley/report/new/fill_in_details_form.html:160
-msgid "First Name"
-msgstr ""
-
#: templates/web/default/questionnaire/index.html:79
#: templates/web/fixmystreet/questionnaire/index.html:73
msgid "First time"
@@ -1166,8 +1124,6 @@ msgid ""
"for the county council."
msgstr ""
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:84
#: templates/web/default/admin/index.html:44
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:41
@@ -1192,7 +1148,7 @@ msgstr ""
msgid "Fixed - User"
msgstr ""
-#: templates/web/default/my/my.html:27 templates/web/fixmystreet/my/my.html:31
+#: templates/web/default/my/my.html:32 templates/web/fixmystreet/my/my.html:38
msgid "Fixed reports"
msgstr ""
@@ -1209,7 +1165,7 @@ msgstr ""
msgid "Flag user"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1181
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1190
#: templates/web/default/admin/users.html:19
msgid "Flagged"
msgstr ""
@@ -1254,11 +1210,9 @@ msgstr ""
#: templates/web/emptyhomes/faq/faq-en-gb.html:1
#: templates/web/fiksgatami/faq/faq-nb.html:1
#: templates/web/fiksgatami/nn/faq/faq-nn.html:1
-#: templates/web/fixmindelo/faq/faq-pt-cv.html:1
#: templates/web/fixmybarangay/faq/faq-en-gb.html:1
#: templates/web/fixmystreet/faq/faq-en-gb.html:1
#: templates/web/fixmystreet/static/privacy.html:1
-#: templates/web/oxfordshire/faq/faq-en-gb.html:1
msgid "Frequently Asked Questions"
msgstr ""
@@ -1266,19 +1220,18 @@ msgstr ""
msgid "GeoRSS on Google Maps"
msgstr ""
-#: templates/web/bromley/report/display.html:30
#: templates/web/fixmystreet/around/_updates.html:3
#: templates/web/fixmystreet/report/display.html:38
msgid "Get updates"
msgstr ""
-#: templates/web/fixmystreet/reports/_rss.html:3
+#: templates/web/fixmystreet/reports/_rss.html:4
#: templates/web/fixmystreet/reports/_rss.html:9
msgid "Get updates of %s problems"
msgstr ""
#: templates/web/fixmystreet/reports/_rss.html:11
-#: templates/web/fixmystreet/reports/_rss.html:3
+#: templates/web/fixmystreet/reports/_rss.html:4
msgid "Get updates of problems in this %s"
msgstr ""
@@ -1291,7 +1244,6 @@ msgstr ""
#: templates/web/default/alert/index.html:34
#: templates/web/default/around/postcode_form.html:8
#: templates/web/fixmystreet/around/postcode_form.html:21
-#: templates/web/seesomething/around/postcode_form.html:10
#: templates/web/zurich/admin/stats.html:26
msgid "Go"
msgstr "Los"
@@ -1318,19 +1270,12 @@ msgstr ""
msgid "Have you ever reported a problem to a council before, or is this your first time?"
msgstr ""
-#: templates/web/barnet/footer.html:24 templates/web/bromley/footer.html:25
-#: templates/web/bromley/header.html:81 templates/web/default/footer.html:15
+#: templates/web/default/footer.html:15
#: templates/web/emptyhomes/header.html:33
#: templates/web/fiksgatami/footer.html:9
#: templates/web/fiksgatami/nn/footer.html:9
-#: templates/web/fixmindelo/footer.html:45
#: templates/web/fixmybarangay/footer.html:24
-#: templates/web/fixmystreet/footer.html:52
-#: templates/web/oxfordshire/footer.html:27
-#: templates/web/oxfordshire/header.html:75
-#: templates/web/reading/footer.html:10
-#: templates/web/seesomething/footer.html:13
-#: templates/web/stevenage/footer.html:47
+#: templates/web/fixmystreet/footer.html:55
#: templates/web/zurich/faq/faq-de-ch.html:1
#: templates/web/zurich/footer.html:21
#: templates/web/zurich/nav_over_content.html:8
@@ -1342,13 +1287,9 @@ msgstr "Hilfe"
msgid "Here are the types of local problem alerts for &lsquo;%s&rsquo;."
msgstr ""
-#: templates/web/barnet/header.html:70 templates/web/bromley/header.html:64
-#: templates/web/bromley/header.html:99
#: templates/web/fixmybarangay/header.html:66
-#: templates/web/fixmystreet/header.html:50
-#: templates/web/oxfordshire/header.html:111
-#: templates/web/oxfordshire/header.html:47
-#: templates/web/stevenage/header.html:97 templates/web/zurich/footer.html:11
+#: templates/web/fixmystreet/header.html:53
+#: templates/web/zurich/footer.html:11
msgid "Hi %s"
msgstr "Hallo %s"
@@ -1356,8 +1297,8 @@ msgstr "Hallo %s"
#: templates/web/default/admin/report_edit.html:50
#: templates/web/default/admin/report_edit.html:51
#: templates/web/default/admin/update_edit.html:28
-#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:11
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/report_edit.html:89
#: templates/web/zurich/admin/report_edit.html:93
#: templates/web/zurich/admin/stats.html:32
@@ -1378,7 +1319,6 @@ msgid "History"
msgstr "History"
#: templates/web/default/js/translation_strings.html:31
-#: templates/web/oxfordshire/js/translation_strings.html:25
msgid "Home"
msgstr ""
@@ -1387,7 +1327,6 @@ msgid "How to report a problem"
msgstr "Erfasse eine neue Meldung:"
#: templates/web/default/js/translation_strings.html:33
-#: templates/web/oxfordshire/js/translation_strings.html:27
msgid "How to send successful reports"
msgstr ""
@@ -1403,7 +1342,7 @@ msgstr ""
msgid "I'm afraid we couldn't validate that token, as the report was made too long ago."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Tokens.pm:259
+#: perllib/FixMyStreet/App/Controller/Tokens.pm:260
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 "Leider konnte ihre URL nicht aufgel&ouml;st werden. Falls sie die URL aus einer Mail kopiert haben, &uuml;berpr&uuml;fen sie bitte ob sie die gesamte URL kopiert haben.\n"
@@ -1443,7 +1382,6 @@ msgstr ""
msgid "If you do not, your update will not be posted."
msgstr ""
-#: templates/web/default/report/new/councils_text_none.html:8
#: templates/web/default/report/new/councils_text_none.html:9
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 ""
@@ -1492,7 +1430,7 @@ msgid ""
" when they are shown on the site. Enter the ID (number) of that user."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Contact.pm:111
+#: perllib/FixMyStreet/App/Controller/Contact.pm:116
msgid "Illegal ID"
msgstr "Unbekannt ID"
@@ -1500,8 +1438,6 @@ msgstr "Unbekannt ID"
msgid "Illegal feed selection"
msgstr ""
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:82
#: templates/web/default/dashboard/index.html:142
#: templates/web/default/dashboard/index.html:144
#: templates/web/default/report/update-form.html:30
@@ -1519,21 +1455,17 @@ msgstr ""
msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:121
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:143
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:38
#: templates/web/fixmystreet/report/banner.html:19
-#: templates/web/zurich/admin/header.html:1
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/header.html:8
#: templates/web/zurich/admin/report_edit.html:102
#: templates/web/zurich/report/banner.html:15
msgid "In progress"
msgstr "In Bearbeitung"
-#: templates/web/seesomething/report/new/fill_in_details_form.html:38
-msgid "Incident Category"
-msgstr ""
-
#: templates/web/zurich/admin/report_edit.html:163
msgid "Include reporter personal details"
msgstr ""
@@ -1559,7 +1491,7 @@ msgstr ""
msgid "Invalid agency_responsible value %s"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1096
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1105
msgid "Invalid end date"
msgstr "Ung&ultiges Enddatum"
@@ -1567,12 +1499,10 @@ msgstr "Ung&ultiges Enddatum"
msgid "Invalid format %s specified."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1092
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1101
msgid "Invalid start date"
msgstr "Ung&ultiges Startdatum"
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:81
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:37
#: templates/web/default/dashboard/index.html:142
@@ -1584,30 +1514,25 @@ msgstr "Ung&ultiges Startdatum"
msgid "Investigating"
msgstr ""
-#: templates/web/emptyhomes/tokens/confirm_problem.html:12
+#: templates/web/emptyhomes/tokens/confirm_problem.html:13
#: templates/web/emptyhomes/tokens/confirm_problem.html:14
msgid "It is worth noting however that the process can sometimes be slow, especially if the property is in very poor repair or the owner is unwilling to act. In most cases it can take six months or more before you can expect to see anything change and sometimes there may be considerable barries to a property being brought back into use. This doesn&rsquo;t mean the council isn&rsquo;t doing anything. We encourage councils to update the website so you can see what is happening. It may be a long process, but you reporting your concerns about this property to the council is a valuable first step."
msgstr ""
-#: templates/web/bromley/report/display.html:168
-#: templates/web/bromley/report/new/fill_in_details_form.html:209
+#: templates/web/fixmystreet/contact/blurb.html:8
+msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there."
+msgstr ""
+
#: templates/web/default/auth/general.html:44
#: templates/web/default/report/new/fill_in_details_form.html:149
#: templates/web/default/report/update-form.html:104
#: templates/web/fixmystreet/auth/general.html:46
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:172
#: templates/web/fixmystreet/report/update-form.html:100
-#: templates/web/seesomething/auth/general.html:35
#: templates/web/zurich/auth/general.html:40
msgid "Keep me signed in on this computer"
msgstr ""
-#: templates/web/bromley/report/display.html:197
-#: templates/web/bromley/report/new/fill_in_details_form.html:119
-#: templates/web/bromley/report/new/fill_in_details_form.html:166
-msgid "Last Name"
-msgstr ""
-
#: templates/web/default/admin/body.html:58
#: templates/web/zurich/admin/body.html:15
msgid "Last editor"
@@ -1630,11 +1555,9 @@ msgstr ""
msgid "List all reported problems"
msgstr "Liste aller Meldungen"
-#: templates/web/bromley/report/new/fill_in_details_form.html:69
#: templates/web/default/report/new/fill_in_details_form.html:68
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:51
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:75
-#: templates/web/seesomething/report/new/fill_in_details_form.html:25
#: templates/web/zurich/report/new/fill_in_details_form.html:51
msgid "Loading..."
msgstr ""
@@ -1643,7 +1566,7 @@ msgstr ""
#: templates/web/default/alert/choose.html:3
#: templates/web/default/alert/index.html:1
#: templates/web/default/alert/index.html:3
-#: templates/web/default/alert/list.html:1
+#: templates/web/default/alert/list.html:2
#: templates/web/default/alert/list.html:5
#: templates/web/default/alert/updates.html:1
#: templates/web/default/tokens/confirm_alert.html:1
@@ -1656,23 +1579,17 @@ msgstr ""
msgid "Local RSS feeds and email alerts"
msgstr ""
-#: templates/web/default/alert/list.html:1
-#: templates/web/default/alert/list.html:12
+#: templates/web/default/alert/list.html:13
#: templates/web/default/alert/list.html:14
+#: templates/web/default/alert/list.html:2
#: templates/web/default/alert/list.html:3
msgid "Local RSS feeds and email alerts for ‘%s’"
msgstr ""
-#: templates/web/barnet/footer.html:22 templates/web/bromley/footer.html:23
-#: templates/web/bromley/header.html:79 templates/web/default/footer.html:13
-#: templates/web/fiksgatami/footer.html:8
+#: templates/web/default/footer.html:13 templates/web/fiksgatami/footer.html:8
#: templates/web/fiksgatami/nn/footer.html:8
-#: templates/web/fixmindelo/footer.html:43
#: templates/web/fixmybarangay/footer.html:22
-#: templates/web/fixmystreet/footer.html:50
-#: templates/web/oxfordshire/footer.html:25
-#: templates/web/oxfordshire/header.html:71
-#: templates/web/reading/footer.html:9 templates/web/stevenage/footer.html:45
+#: templates/web/fixmystreet/footer.html:53
msgid "Local alerts"
msgstr "RSS"
@@ -1681,7 +1598,6 @@ msgid "Locate the problem on a map of the area"
msgstr "Identifizieren Sie den Mangel auf der Karte"
#: templates/web/default/js/translation_strings.html:43
-#: templates/web/oxfordshire/js/translation_strings.html:37
msgid "MAP"
msgstr ""
@@ -1693,11 +1609,11 @@ msgstr ""
msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
msgstr ""
-#: templates/web/fixmystreet/contact/index.html:98
+#: templates/web/fixmystreet/contact/index.html:103
msgid "Message"
msgstr "Nachricht"
-#: templates/web/default/contact/index.html:90
+#: templates/web/default/contact/index.html:92
msgid "Message:"
msgstr "Nachricht:"
@@ -1739,10 +1655,6 @@ msgstr "Meldungen in der Nähe"
msgid "Name"
msgstr "Name"
-#: templates/web/seesomething/report/new/fill_in_details_form.html:74
-msgid "Name (optional)"
-msgstr ""
-
#: templates/web/default/admin/report_edit.html:66
#: templates/web/default/admin/update_edit.html:32
#: templates/web/default/admin/user-form.html:18
@@ -1752,30 +1664,30 @@ msgstr ""
msgid "Name:"
msgstr "Name:"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:317
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:322
msgid "Name: %s"
msgstr ""
#: templates/web/fiksgatami/footer.html:3
#: templates/web/fiksgatami/nn/footer.html:3
-#: templates/web/reading/footer.html:4
msgid "Navigation"
msgstr "Navigation"
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:188
#: perllib/FixMyStreet/Geocode/OSM.pm:166
msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/UK.pm:148
+#: perllib/FixMyStreet/Cobrand/UK.pm:142
msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:418
-#: perllib/FixMyStreet/Cobrand/Default.pm:458
+#: perllib/FixMyStreet/Cobrand/Default.pm:421
+#: perllib/FixMyStreet/Cobrand/Default.pm:461
msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:273
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:297
msgid ""
"Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
"\n"
@@ -1915,14 +1827,12 @@ msgid "No edits have yet been made."
msgstr "Noch keine Antwort"
#: templates/web/default/admin/flagged.html:25
-#, fuzzy
msgid "No flagged problems found."
-msgstr "Keine Meldungen gefunden."
+msgstr ""
#: templates/web/default/admin/flagged.html:58
-#, fuzzy
msgid "No flagged users found."
-msgstr "Keine Meldungen gefunden."
+msgstr ""
#: templates/web/zurich/admin/report_edit-sdm.html:68
msgid "No further updates"
@@ -1939,7 +1849,6 @@ msgid "No problems have been reported yet."
msgstr "Bisher wurden noch keine Meldungen erfasst."
#: templates/web/default/js/translation_strings.html:38
-#: templates/web/oxfordshire/js/translation_strings.html:32
msgid "No result returned"
msgstr ""
@@ -1950,7 +1859,7 @@ msgid ""
" your config file is not pointing to a live MapIt service."
msgstr ""
-#: templates/web/default/report/_support.html:2
+#: templates/web/default/report/_support.html:3
#: templates/web/default/report/_support.html:4
msgid "No supporters"
msgstr ""
@@ -1974,8 +1883,6 @@ msgid ""
" activity across their body), the ability to hide reports or set special report statuses."
msgstr ""
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:83
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:46
#: templates/web/default/report/update-form.html:30
@@ -2034,7 +1941,6 @@ msgid "Now to submit your update&hellip; do you have a FixMyStreet password?"
msgstr ""
#: templates/web/default/js/translation_strings.html:42
-#: templates/web/oxfordshire/js/translation_strings.html:36
msgid "OK"
msgstr ""
@@ -2078,8 +1984,7 @@ msgstr ""
msgid "Older problems"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:115
-#: templates/web/bromley/report/display.html:80
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:137
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:36
#: templates/web/default/admin/report_edit.html:37
@@ -2087,7 +1992,7 @@ msgstr ""
#: templates/web/default/dashboard/index.html:142
#: templates/web/default/report/update-form.html:30
#: templates/web/fixmystreet/report/update-form.html:28
-#: templates/web/zurich/admin/header.html:1
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/header.html:7
#: templates/web/zurich/admin/report_edit.html:89
#: templates/web/zurich/admin/report_edit.html:91
@@ -2096,7 +2001,7 @@ msgstr ""
msgid "Open"
msgstr "&Ouml;ffnen"
-#: templates/web/default/my/my.html:22 templates/web/fixmystreet/my/my.html:26
+#: templates/web/default/my/my.html:27 templates/web/fixmystreet/my/my.html:33
msgid "Open reports"
msgstr ""
@@ -2122,15 +2027,15 @@ msgstr ""
msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1053
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:664
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:665
-#: perllib/FixMyStreet/DB/Result/Problem.pm:544
-#: perllib/FixMyStreet/DB/Result/Problem.pm:554
-#: perllib/FixMyStreet/DB/Result/Problem.pm:564
-#: perllib/FixMyStreet/DB/Result/Problem.pm:576
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:361
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1057
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:662
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:663
+#: perllib/FixMyStreet/DB/Result/Problem.pm:546
+#: perllib/FixMyStreet/DB/Result/Problem.pm:556
+#: perllib/FixMyStreet/DB/Result/Problem.pm:566
+#: perllib/FixMyStreet/DB/Result/Problem.pm:578
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:369
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:384
msgid "Other"
msgstr ""
@@ -2157,8 +2062,6 @@ msgstr ""
msgid "Partial"
msgstr ""
-#: templates/web/bromley/report/display.html:147
-#: templates/web/bromley/report/new/fill_in_details_form.html:186
#: templates/web/fixmystreet/auth/general.html:59
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:208
#: templates/web/fixmystreet/report/update-form.html:119
@@ -2176,19 +2079,15 @@ msgid "Permalink"
msgstr ""
#: templates/web/zurich/report/new/fill_in_details_form.html:106
-#, fuzzy
msgid "Phone number"
-msgstr "Ihre Telefonnummer"
+msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:136
-#: templates/web/bromley/report/new/fill_in_details_form.html:183
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:138
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:205
-#: templates/web/seesomething/report/new/fill_in_details_form.html:89
msgid "Phone number (optional)"
msgstr "Telefonnummer (optional)"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:282
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:287
#: templates/web/default/admin/report_edit.html:68
#: templates/web/default/report/new/fill_in_details_form.html:215
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:138
@@ -2198,11 +2097,8 @@ msgstr "Telefonnummer (optional)"
msgid "Phone:"
msgstr "Telefonnummer:"
-#: templates/web/bromley/report/display.html:111
-#: templates/web/bromley/report/new/fill_in_details_form.html:104
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:92
#: templates/web/fixmystreet/report/update-form.html:59
-#: templates/web/seesomething/report/new/fill_in_details_form.html:52
#: templates/web/zurich/admin/index-dm.html:29
#: templates/web/zurich/admin/index-sdm.html:24
#: templates/web/zurich/admin/reports.html:16
@@ -2224,7 +2120,6 @@ msgid "Photos of recent nearby reports"
msgstr "Fotos von neuen Meldungen in der N&auml;he"
#: templates/web/default/js/translation_strings.html:30
-#: templates/web/oxfordshire/js/translation_strings.html:24
msgid "Place pin on map"
msgstr ""
@@ -2232,7 +2127,7 @@ msgstr ""
#: templates/web/default/admin/report_edit.html:38
#: templates/web/default/dashboard/index.html:142
#: templates/web/default/dashboard/index.html:143
-#: templates/web/zurich/admin/header.html:1
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/header.html:9
#: templates/web/zurich/admin/index-dm.html:9
#: templates/web/zurich/admin/report_edit.html:89
@@ -2246,7 +2141,6 @@ msgstr ""
#: templates/web/default/report/new/notes.html:6
#: templates/web/fixmystreet/report/new/notes.html:6
-#: templates/web/oxfordshire/report/new/notes.html:5
msgid "Please be polite, concise and to the point."
msgstr "Bitte seien Sie freundlich und pr&auml;gnant."
@@ -2263,20 +2157,16 @@ msgstr "Bitte &uuml;berpr&uuml;fen sie ihre eMail"
#: templates/web/default/auth/general.html:8
#: templates/web/fixmystreet/auth/general.html:15
#: templates/web/fixmystreet/auth/general.html:9
-#: templates/web/seesomething/auth/general.html:15
-#: templates/web/seesomething/auth/general.html:9
#: templates/web/zurich/auth/general.html:3
#: templates/web/zurich/auth/general.html:9
msgid "Please check your email address is correct"
msgstr "Bitte &uuml;berpr&uuml;fen Sie ob Ihre eMail-Adresse korrekt ist"
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:848
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:855
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:874
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:917
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:859
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:878
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:921
#: perllib/FixMyStreet/DB/Result/Problem.pm:381
#: templates/web/default/js/translation_strings.html:9
-#: templates/web/oxfordshire/js/translation_strings.html:9
msgid "Please choose a category"
msgstr "Bitte w&auml;hlen Sie eine Kategorie"
@@ -2284,19 +2174,8 @@ msgstr "Bitte w&auml;hlen Sie eine Kategorie"
msgid "Please choose a property type"
msgstr ""
-#: templates/web/seesomething/js/translation_strings.html:6
-msgid "Please choose a transport category"
-msgstr ""
-
-#: templates/web/seesomething/js/translation_strings.html:7
-msgid "Please choose an incident category"
-msgstr ""
-
-#: templates/web/bromley/report/new/fill_in_details_form.html:64
-msgid "Please describe the exact location of the report. Example: “2 dumped mattresses outside Number 19 Stockwell Close”"
-msgstr ""
-
#: templates/web/default/contact/blurb.html:2
+#: templates/web/fixmystreet/contact/blurb.html:12
msgid ""
"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"
@@ -2305,7 +2184,6 @@ msgstr ""
#: templates/web/default/report/new/notes.html:7
#: templates/web/fixmystreet/report/new/notes.html:7
-#: templates/web/oxfordshire/report/new/notes.html:6
msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the service for all users."
msgstr ""
@@ -2315,7 +2193,6 @@ msgstr ""
#: perllib/FixMyStreet/DB/Result/Comment.pm:126
#: templates/web/default/js/translation_strings.html:2
-#: templates/web/oxfordshire/js/translation_strings.html:2
msgid "Please enter a message"
msgstr ""
@@ -2328,19 +2205,14 @@ msgstr ""
#: perllib/FixMyStreet/App/Controller/Contact.pm:97
#: perllib/FixMyStreet/DB/Result/Problem.pm:356
#: templates/web/default/js/translation_strings.html:3
-#: templates/web/oxfordshire/js/translation_strings.html:3
msgid "Please enter a subject"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1032
-#: perllib/FixMyStreet/App/Controller/Admin.pm:979
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1041
+#: perllib/FixMyStreet/App/Controller/Admin.pm:988
#: perllib/FixMyStreet/DB/Result/User.pm:115
#: templates/web/default/js/translation_strings.html:12
#: templates/web/default/js/translation_strings.html:16
-#: templates/web/oxfordshire/js/translation_strings.html:12
-#: templates/web/oxfordshire/js/translation_strings.html:16
-#: templates/web/seesomething/js/translation_strings.html:10
-#: templates/web/seesomething/js/translation_strings.html:13
msgid "Please enter a valid email"
msgstr "Bitte geben Sie eine g&uuml;ltige eMail-Adresse an"
@@ -2351,8 +2223,6 @@ msgstr "Bitte geben Sie eine g&uuml;ltige eMail-Adresse an"
#: perllib/FixMyStreet/DB/Result/Problem.pm:359
#: templates/web/default/js/translation_strings.html:4
-#: templates/web/oxfordshire/js/translation_strings.html:4
-#: templates/web/seesomething/js/translation_strings.html:2
msgid "Please enter some details"
msgstr "Bitte geben Sie einiges Details an"
@@ -2364,32 +2234,22 @@ msgstr "Bitte geben Sie einiges Details an"
#: templates/web/default/js/translation_strings.html:15
#: templates/web/fixmystreet/auth/general.html:14
#: templates/web/fixmystreet/auth/general.html:9
-#: templates/web/oxfordshire/js/translation_strings.html:11
-#: templates/web/oxfordshire/js/translation_strings.html:15
-#: templates/web/seesomething/auth/general.html:14
-#: templates/web/seesomething/auth/general.html:9
-#: templates/web/seesomething/js/translation_strings.html:9
#: templates/web/zurich/auth/general.html:3
#: templates/web/zurich/auth/general.html:8
msgid "Please enter your email"
msgstr "Bitte geben Sie Ihre eMail-Adresse an"
-#: templates/web/bromley/report/new/fill_in_details_form.html:149
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:151
-#: templates/web/seesomething/report/new/fill_in_details_form.html:85
#: templates/web/zurich/report/new/fill_in_details_form.html:92
msgid "Please enter your email address"
msgstr "Bitte geben Sie eine Ihre eMail-Adresse an"
#: templates/web/default/js/translation_strings.html:25
-#: templates/web/oxfordshire/js/translation_strings.html:19
msgid "Please enter your first name"
msgstr ""
#: perllib/FixMyStreet/DB/Result/Problem.pm:374
#: templates/web/default/js/translation_strings.html:7
-#: templates/web/oxfordshire/js/translation_strings.html:7
-#: templates/web/seesomething/js/translation_strings.html:4
msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
msgstr ""
@@ -2398,22 +2258,18 @@ msgstr ""
#: perllib/FixMyStreet/DB/Result/Problem.pm:367
#: perllib/FixMyStreet/DB/Result/User.pm:108
#: templates/web/default/js/translation_strings.html:6
-#: templates/web/oxfordshire/js/translation_strings.html:6
msgid "Please enter your name"
msgstr "Bitte geben Sie Ihren Namen an"
#: templates/web/default/js/translation_strings.html:22
-#, fuzzy
msgid "Please enter your phone number"
-msgstr "Bitte geben Sie Ihren Namen an"
+msgstr ""
#: templates/web/default/js/translation_strings.html:26
-#: templates/web/oxfordshire/js/translation_strings.html:20
msgid "Please enter your second name"
msgstr ""
#: templates/web/default/js/translation_strings.html:24
-#: templates/web/oxfordshire/js/translation_strings.html:18
msgid "Please enter your title"
msgstr ""
@@ -2432,16 +2288,16 @@ msgid ""
"to read, as does a lack of punctuation."
msgstr ""
-#: templates/web/default/report/new/fill_in_details_text.html:1
#: templates/web/default/report/new/fill_in_details_text.html:11
-#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1
+#: templates/web/default/report/new/fill_in_details_text.html:2
#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:10
-#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:2
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:2
#: templates/web/fixmystreet/report/new/fill_in_details_text.html:8
msgid "Please fill in details of the problem below."
msgstr ""
-#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:2
#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:3
msgid ""
"Please fill in details of the problem below. Leave as much detail as you can, \n"
@@ -2449,7 +2305,7 @@ msgid ""
"the problem (e.g. if there is a streetlight number or road name)."
msgstr ""
-#: templates/web/default/report/new/fill_in_details_text.html:1
+#: templates/web/default/report/new/fill_in_details_text.html:2
#: templates/web/default/report/new/fill_in_details_text.html:3
msgid ""
"Please fill in details of the problem below. The council won't be able\n"
@@ -2459,12 +2315,10 @@ msgid ""
msgstr "Bitte beschreiben sie Ihre Meldung weiter unten. Wir k&ouml;nnen den Mangel nur beheben, wenn Sie soviel Details wie m&ouml;glich angeben: Beschreiben sie die exakte Lage (z.B. An der Wand Richtung Strasse), was genau der Mangel ist, wie lange dieser schon da ist und laden sie wenn m&ouml;glich ein Photo des Mangels hoch."
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:70
-#: templates/web/seesomething/report/new/fill_in_details_form.html:20
#: templates/web/zurich/report/new/fill_in_details_form.html:46
msgid "Please fill in details of the problem."
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:28
#: templates/web/default/report/new/fill_in_details_form.html:27
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:26
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:35
@@ -2476,7 +2330,7 @@ msgstr ""
msgid "Please indicate whether you'd like to receive another questionnaire"
msgstr ""
-#: templates/web/fixmystreet/report/updates-sidebar-notes.html:3
+#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4
msgid "Please note that updates are not sent to the council."
msgstr ""
@@ -2484,11 +2338,6 @@ msgstr ""
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 ""
-#: templates/web/barnet/report/updates-sidebar-notes.html:1
-msgid "Please note that updates are not sent to the relevant department. 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 ""
-
-#: templates/web/bromley/report/new/fill_in_details_form.html:23
#: templates/web/default/report/new/fill_in_details_form.html:5
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:5
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:26
@@ -2499,7 +2348,6 @@ msgstr ""
#: templates/web/default/report/new/notes.html:1
#: templates/web/fixmybarangay/report/new/notes.html:1
#: templates/web/fixmystreet/report/new/notes.html:1
-#: templates/web/oxfordshire/report/new/notes.html:1
msgid "Please note:"
msgstr "Hinweise:"
@@ -2544,19 +2392,15 @@ msgstr ""
msgid "Please write a message"
msgstr ""
-#: templates/web/bromley/report/display.html:70
#: templates/web/fixmystreet/report/update-form.html:23
msgid "Please write your update here"
msgstr ""
-#: templates/web/bromley/report/display.html:123
-#: templates/web/bromley/report/display.html:151
-#: templates/web/bromley/report/display.html:163
-#: templates/web/default/contact/index.html:93
+#: templates/web/default/contact/index.html:95
#: templates/web/default/report/update-form.html:109
#: templates/web/default/report/update-form.html:131
#: templates/web/default/report/update-form.html:72
-#: templates/web/fixmystreet/contact/index.html:105
+#: templates/web/fixmystreet/contact/index.html:110
#: templates/web/fixmystreet/report/update-form.html:123
#: templates/web/fixmystreet/report/update-form.html:71
#: templates/web/fixmystreet/report/update-form.html:95
@@ -2589,7 +2433,7 @@ msgstr ""
msgid "Private information (not shown on site)"
msgstr ""
-#: templates/web/default/maps/openlayers.html:85
+#: templates/web/default/maps/openlayers.html:86
msgid "Problem"
msgstr "Meldung"
@@ -2610,7 +2454,7 @@ msgstr ""
msgid "Problem breakdown by state"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:950
+#: perllib/FixMyStreet/App/Controller/Admin.pm:959
msgid "Problem marked as open."
msgstr ""
@@ -2626,7 +2470,6 @@ msgstr "Meldungen"
msgid "Problems in this area"
msgstr "Meldungen in dieser Gegend"
-#: templates/web/bromley/report/display.html:31
#: templates/web/fixmystreet/around/tabbed_lists.html:4
#: templates/web/fixmystreet/report/display.html:46
msgid "Problems nearby"
@@ -2646,15 +2489,16 @@ msgstr "Meldungen, welche k&uuml;rzlich gel&ouml;st wurden"
msgid "Problems within %.1fkm of this location"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:626
+#: perllib/FixMyStreet/Cobrand/Default.pm:629
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:109
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155
-#: perllib/FixMyStreet/Cobrand/UK.pm:228
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:184
+#: perllib/FixMyStreet/Cobrand/UK.pm:222
msgid "Problems within %s"
msgstr "Meldungen innerhalb %s"
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117
-#: perllib/FixMyStreet/Cobrand/UK.pm:242
+#: perllib/FixMyStreet/Cobrand/UK.pm:236
msgid "Problems within %s ward"
msgstr ""
@@ -2682,12 +2526,10 @@ msgstr ""
msgid "Property type:"
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:52
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:64
msgid "Provide a title"
msgstr ""
-#: templates/web/bromley/report/display.html:57
#: templates/web/default/report/update-form.html:3
#: templates/web/fixmystreet/report/update-form.html:4
msgid "Provide an update"
@@ -2697,11 +2539,6 @@ msgstr "Meldung aktualisieren"
msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:180
-msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
-msgstr ""
-
-#: templates/web/bromley/report/display.html:144
#: templates/web/default/report/new/fill_in_details_form.html:173
#: templates/web/default/report/update-form.html:128
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:202
@@ -2732,7 +2569,6 @@ msgstr ""
msgid "Publish the response"
msgstr ""
-#: templates/web/default/questionnaire/completed.html:1
#: templates/web/default/questionnaire/completed.html:2
#: templates/web/default/questionnaire/index.html:0
#: templates/web/default/questionnaire/index.html:14
@@ -2756,9 +2592,7 @@ msgstr ""
msgid "Questionnaire filled in by problem reporter"
msgstr ""
-#: templates/web/bromley/report/display.html:37
#: templates/web/default/alert/_list.html:21
-#: templates/web/default/around/display_location.html:1
#: templates/web/default/around/display_location.html:3
#: templates/web/default/report/display.html:46
#: templates/web/default/reports/_rss.html:1
@@ -2768,11 +2602,11 @@ msgstr ""
msgid "RSS feed"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:265 perllib/FixMyStreet/Cobrand/UK.pm:277
msgid "RSS feed for %s"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289
+#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
msgid "RSS feed for %s ward, %s"
msgstr ""
@@ -2780,11 +2614,15 @@ msgstr ""
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:189
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:197
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:309
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:200
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:208
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:218
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:226
+#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303
msgid "RSS feed of %s"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:314
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:308
msgid "RSS feed of %s, within %s ward"
msgstr ""
@@ -2797,31 +2635,30 @@ msgstr ""
msgid "RSS feed of problems in this %s"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Default.pm:627
+#: perllib/FixMyStreet/Cobrand/Default.pm:630
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:110
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:154
-#: perllib/FixMyStreet/Cobrand/UK.pm:235
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:183
+#: perllib/FixMyStreet/Cobrand/UK.pm:229
msgid "RSS feed of problems within %s"
msgstr ""
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:116
-#: perllib/FixMyStreet/Cobrand/UK.pm:241
+#: perllib/FixMyStreet/Cobrand/UK.pm:235
msgid "RSS feed of problems within %s ward"
msgstr ""
-#: templates/web/default/around/display_location.html:1
+#: templates/web/default/around/display_location.html:3
#: templates/web/default/around/display_location.html:4
msgid "RSS feed of recent local problems"
msgstr ""
-#: templates/web/bromley/report/display.html:37
#: templates/web/default/report/display.html:46
#: templates/web/fixmystreet/alert/updates.html:9
#: templates/web/fixmystreet/report/display.html:61
msgid "RSS feed of updates to this problem"
msgstr ""
-#: templates/web/bromley/report/display.html:39
#: templates/web/default/alert/updates.html:9
#: templates/web/default/report/display.html:37
#: templates/web/fixmystreet/alert/updates.html:14
@@ -2845,7 +2682,7 @@ msgid "Recently fixed"
msgstr "K&uuml;rzlich gel&ouml;st"
#: templates/web/default/index.html:35 templates/web/emptyhomes/index.html:24
-#: templates/web/fixmystreet/index.html:45
+#: templates/web/fixmystreet/index.html:49
msgid "Recently reported problems"
msgstr "K&uuml;rzlich erfasste Meldungen"
@@ -2862,8 +2699,8 @@ msgstr ""
msgid "Remove flag"
msgstr ""
-#: templates/web/default/admin/report_edit.html:89
-#: templates/web/default/admin/update_edit.html:57
+#: templates/web/default/admin/report_edit.html:94
+#: templates/web/default/admin/update_edit.html:62
#: templates/web/zurich/admin/update_edit.html:35
msgid "Remove photo (can't be undone!)"
msgstr ""
@@ -2872,29 +2709,21 @@ msgstr ""
msgid "Report Empty Homes"
msgstr ""
-#: templates/web/barnet/footer.html:16 templates/web/bromley/footer.html:17
#: templates/web/default/footer.html:7 templates/web/emptyhomes/header.html:31
#: templates/web/fiksgatami/footer.html:5
#: templates/web/fiksgatami/nn/footer.html:5
-#: templates/web/fixmindelo/footer.html:37
-#: templates/web/fixmystreet/footer.html:44
-#: templates/web/oxfordshire/footer.html:19
-#: templates/web/reading/footer.html:6
-#: templates/web/seesomething/footer.html:11
-#: templates/web/stevenage/footer.html:39 templates/web/zurich/footer.html:17
+#: templates/web/fixmystreet/footer.html:47
+#: templates/web/zurich/footer.html:17
#: templates/web/zurich/nav_over_content.html:4
msgid "Report a problem"
msgstr "Eine Meldung erfassen"
-#: templates/web/bromley/report/display.html:28
#: templates/web/fixmystreet/report/display.html:35
msgid "Report abuse"
msgstr "Missbrauch melden"
#: templates/web/default/report_created.html:1
#: templates/web/default/report_created.html:3
-#: templates/web/seesomething/report_created.html:0
-#: templates/web/seesomething/report_created.html:8
msgid "Report created"
msgstr ""
@@ -2904,22 +2733,21 @@ msgstr ""
#: templates/web/default/index.html:14 templates/web/emptyhomes/index.html:5
#: templates/web/fixmystreet/around/intro.html:1
-#: templates/web/stevenage/around/intro.html:1
#: templates/web/zurich/around/intro.html:1
msgid "Report, view, or discuss local problems"
msgstr "Melden sie M&auml;ngel an der Infrastruktur von Z&uuml;rich"
-#: templates/web/default/my/my.html:74
+#: templates/web/default/my/my.html:79
msgid "Reported %s"
msgstr ""
-#: templates/web/default/my/my.html:72
+#: templates/web/default/my/my.html:77
msgid "Reported %s, to %s"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:559
+#: perllib/FixMyStreet/DB/Result/Problem.pm:561
#: templates/web/default/contact/index.html:45
-#: templates/web/fixmystreet/contact/index.html:58
+#: templates/web/fixmystreet/contact/index.html:62
msgid "Reported anonymously at %s"
msgstr "Anonym gemeldet um"
@@ -2929,9 +2757,9 @@ msgstr "Anonym gemeldet um"
msgid "Reported before"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:582
+#: perllib/FixMyStreet/DB/Result/Problem.pm:584
#: templates/web/default/contact/index.html:47
-#: templates/web/fixmystreet/contact/index.html:60
+#: templates/web/fixmystreet/contact/index.html:64
msgid "Reported by %s at %s"
msgstr "Gemeldet von %s um %s"
@@ -2939,27 +2767,27 @@ msgstr "Gemeldet von %s um %s"
msgid "Reported in the %s category"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:555
+#: perllib/FixMyStreet/DB/Result/Problem.pm:557
msgid "Reported in the %s category anonymously at %s"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:577
+#: perllib/FixMyStreet/DB/Result/Problem.pm:579
msgid "Reported in the %s category by %s at %s"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:551
+#: perllib/FixMyStreet/DB/Result/Problem.pm:553
msgid "Reported via %s anonymously at %s"
msgstr "Anonym gemeldet von %s um %s "
-#: perllib/FixMyStreet/DB/Result/Problem.pm:573
+#: perllib/FixMyStreet/DB/Result/Problem.pm:575
msgid "Reported via %s by %s at %s"
msgstr "Gemeldet von %s um %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:547
+#: perllib/FixMyStreet/DB/Result/Problem.pm:549
msgid "Reported via %s in the %s category anonymously at %s"
msgstr "Anonym gemeldet von %s um %s "
-#: perllib/FixMyStreet/DB/Result/Problem.pm:567
+#: perllib/FixMyStreet/DB/Result/Problem.pm:569
msgid "Reported via %s in the %s category by %s at %s"
msgstr "Gemeldet von %s um %s"
@@ -2973,22 +2801,18 @@ msgstr "Gemeldet von %s um %s"
#: templates/web/fixmystreet/report/new/fill_in_details.html:0
#: templates/web/fixmystreet/report/new/fill_in_details.html:5
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2
-#: templates/web/oxfordshire/js/translation_strings.html:35
-#: templates/web/seesomething/around/around_index.html:1
-#: templates/web/seesomething/report/new/fill_in_details_form.html:3
#: templates/web/zurich/report/new/fill_in_details_form.html:2
msgid "Reporting a problem"
msgstr "Verfassen Sie eine Meldung"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1177
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:242
-#: templates/web/seesomething/admin/stats.html:1
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1186
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:290
#: templates/web/zurich/header.html:60
msgid "Reports"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:393
-#: perllib/FixMyStreet/DB/Result/Problem.pm:397
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
+#: perllib/FixMyStreet/DB/Result/Problem.pm:399
msgid "Reports are limited to %s characters in length. Please shorten your report"
msgstr ""
@@ -3009,27 +2833,28 @@ msgid "Resend report"
msgstr ""
#: templates/web/default/js/translation_strings.html:28
-#: templates/web/oxfordshire/js/translation_strings.html:22
msgid "Right place?"
msgstr ""
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:195
#: perllib/FixMyStreet/Geocode/OSM.pm:173
msgid "Road operator for this named road (derived from road reference number and type): %s"
msgstr ""
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:192
#: perllib/FixMyStreet/Geocode/OSM.pm:170
msgid "Road operator for this named road (from OpenStreetMap): %s"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1377
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1388
-#: templates/web/default/admin/report_edit.html:85
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1386
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1397
+#: templates/web/default/admin/report_edit.html:90
#: templates/web/zurich/admin/report_edit.html:76
msgid "Rotate Left"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1377
-#: templates/web/default/admin/report_edit.html:86
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1386
+#: templates/web/default/admin/report_edit.html:91
#: templates/web/zurich/admin/report_edit.html:77
msgid "Rotate Right"
msgstr ""
@@ -3080,7 +2905,7 @@ msgstr ""
msgid "Select which type of alert you'd like and click the button for an RSS feed, or enter your email address to subscribe to an email alert."
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:664
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
msgid "Sent to %s %s later"
msgstr ""
@@ -3097,9 +2922,6 @@ msgstr ""
msgid "Share"
msgstr ""
-#: templates/web/bromley/report/display.html:205
-#: templates/web/bromley/report/new/fill_in_details_form.html:129
-#: templates/web/bromley/report/new/fill_in_details_form.html:175
#: templates/web/default/report/new/fill_in_details_form.html:210
#: templates/web/default/report/update-form.html:157
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:129
@@ -3122,11 +2944,7 @@ msgstr "Zeige Stecknadeln"
#: templates/web/fixmystreet/auth/general.html:3
#: templates/web/fixmystreet/auth/general.html:42
#: templates/web/fixmystreet/auth/general.html:62
-#: templates/web/fixmystreet/header.html:54
-#: templates/web/oxfordshire/header.html:115
-#: templates/web/seesomething/auth/general.html:3
-#: templates/web/seesomething/auth/general.html:39
-#: templates/web/stevenage/header.html:101
+#: templates/web/fixmystreet/header.html:57
#: templates/web/zurich/auth/general.html:18
#: templates/web/zurich/auth/general.html:35
msgid "Sign in"
@@ -3138,20 +2956,15 @@ msgstr ""
#: templates/web/default/auth/general.html:1
#: templates/web/fixmystreet/auth/general.html:1
-#: templates/web/seesomething/auth/general.html:1
#: templates/web/zurich/auth/general.html:1
msgid "Sign in or create an account"
msgstr ""
-#: templates/web/bromley/auth/sign_out.html:1
#: templates/web/default/auth/sign_out.html:1
#: templates/web/default/header.html:30
#: templates/web/emptyhomes/header.html:46
#: templates/web/fiksgatami/header.html:22
#: templates/web/fiksgatami/nn/header.html:22
-#: templates/web/lichfielddc/header.html:177
-#: templates/web/reading/header.html:33
-#: templates/web/seesomething/auth/sign_out.html:1
#: templates/web/zurich/auth/sign_out.html:1
msgid "Sign out"
msgstr ""
@@ -3160,14 +2973,12 @@ msgstr ""
#: templates/web/emptyhomes/header.html:45
#: templates/web/fiksgatami/header.html:21
#: templates/web/fiksgatami/nn/header.html:21
-#: templates/web/lichfielddc/header.html:177
-#: templates/web/reading/header.html:32
msgid "Signed in as %s"
msgstr ""
-#: templates/web/default/report/new/fill_in_details_text.html:1
-#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1
-#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1
+#: templates/web/default/report/new/fill_in_details_text.html:2
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:2
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:2
msgid "Some categories may require additional information."
msgstr ""
@@ -3198,6 +3009,8 @@ msgstr ""
#: perllib/FixMyStreet/App/Controller/Report/New.pm:215
#: perllib/FixMyStreet/Geocode.pm:28 perllib/FixMyStreet/Geocode/Bing.pm:58
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:75
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:95
#: perllib/FixMyStreet/Geocode/Google.pm:74
#: perllib/FixMyStreet/Geocode/OSM.pm:66
msgid "Sorry, we could not find that location."
@@ -3205,7 +3018,7 @@ msgstr ""
#: perllib/FixMyStreet/Geocode/Bing.pm:53
#: perllib/FixMyStreet/Geocode/Google.pm:69
-#: perllib/FixMyStreet/Geocode/Zurich.pm:87
+#: perllib/FixMyStreet/Geocode/Zurich.pm:88
msgid "Sorry, we could not parse that location. Please try again."
msgstr ""
@@ -3215,11 +3028,9 @@ msgid "Source code"
msgstr ""
#: templates/web/default/admin/stats.html:64
-#, fuzzy
msgid "Start Date:"
-msgstr "Letzte Bearbeitung"
+msgstr ""
-#: templates/web/bromley/report/display.html:78
#: templates/web/default/admin/flagged.html:18
#: templates/web/default/admin/list_updates.html:11
#: templates/web/default/admin/reports.html:15
@@ -3236,8 +3047,8 @@ msgstr ""
msgid "State:"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1182
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:257
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1191
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:305
#: templates/web/default/admin/stats.html:1
#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72
msgid "Stats"
@@ -3253,7 +3064,7 @@ msgstr ""
msgid "Still open, via questionnaire, %s"
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:370
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378
msgid "Subcategory: %s"
msgstr ""
@@ -3261,8 +3072,7 @@ msgstr ""
msgid "Subdivision/Body"
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:48
-#: templates/web/fixmystreet/contact/index.html:91
+#: templates/web/fixmystreet/contact/index.html:95
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:60
msgid "Subject"
msgstr "Titel"
@@ -3275,9 +3085,6 @@ msgstr "Titel"
msgid "Subject:"
msgstr "Titel:"
-#: templates/web/bromley/report/new/fill_in_details_form.html:140
-#: templates/web/bromley/report/new/fill_in_details_form.html:190
-#: templates/web/bromley/report/new/fill_in_details_form.html:204
#: templates/web/default/questionnaire/creator_fixed.html:19
#: templates/web/default/report/new/fill_in_details_form.html:114
#: templates/web/default/report/new/fill_in_details_form.html:154
@@ -3286,13 +3093,12 @@ msgstr "Titel:"
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:142
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:167
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:212
-#: templates/web/seesomething/report/new/fill_in_details_form.html:93
#: templates/web/zurich/report/new/fill_in_details_form.html:114
msgid "Submit"
msgstr "Abschicken"
-#: templates/web/default/admin/report_edit.html:92
-#: templates/web/default/admin/update_edit.html:60
+#: templates/web/default/admin/report_edit.html:97
+#: templates/web/default/admin/update_edit.html:65
#: templates/web/default/admin/user-form.html:55
#: templates/web/zurich/admin/report_edit-sdm.html:67
#: templates/web/zurich/admin/report_edit.html:224
@@ -3305,8 +3111,8 @@ msgstr ""
msgid "Submit questionnaire"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:111
-#: templates/web/zurich/admin/header.html:1
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:133
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/header.html:6
#: templates/web/zurich/admin/index-dm.html:23
#: templates/web/zurich/admin/index-dm.html:6
@@ -3318,7 +3124,6 @@ msgstr ""
msgid "Submitted"
msgstr ""
-#: templates/web/bromley/report/display.html:44
#: templates/web/default/alert/updates.html:17
#: templates/web/default/report/display.html:42
#: templates/web/fixmystreet/alert/updates.html:23
@@ -3336,8 +3141,8 @@ msgstr ""
msgid "Subscribe to an alert based upon what baranagay you&rsquo;re in:"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1175
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:241
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1184
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:289
#: templates/web/default/admin/index.html:1
#: templates/web/zurich/admin/index-dm.html:1
#: templates/web/zurich/admin/index-sdm.html:1
@@ -3356,7 +3161,7 @@ msgstr "Zusammenfassung"
msgid "Summary reports"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1179
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1188
msgid "Survey"
msgstr ""
@@ -3379,17 +3184,15 @@ msgstr ""
msgid "Text:"
msgstr ""
-#: templates/web/default/tokens/confirm_update.html:7
#: templates/web/default/tokens/confirm_update.html:8
msgid "Thank you &mdash; you can <a href=\"%s\">view your updated problem</a> on the site."
msgstr ""
-#: templates/web/emptyhomes/tokens/confirm_problem.html:6
+#: templates/web/emptyhomes/tokens/confirm_problem.html:7
#: templates/web/emptyhomes/tokens/confirm_problem.html:8
msgid "Thank you for reporting an empty property on ReportEmptyHomes.com. We have emailed the lead officer for empty homes in the council responsible with details, and asked them to do whatever they can to get the empty property back into use as soon as possible."
msgstr ""
-#: templates/web/emptyhomes/tokens/confirm_problem.html:30
#: templates/web/emptyhomes/tokens/confirm_problem.html:31
msgid ""
"Thank you for reporting this empty property on ReportEmptyHomes.com.\n"
@@ -3402,7 +3205,7 @@ msgstr ""
msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it."
msgstr ""
-#: templates/web/emptyhomes/tokens/confirm_problem.html:24
+#: templates/web/emptyhomes/tokens/confirm_problem.html:25
#: templates/web/emptyhomes/tokens/confirm_problem.html:26
msgid "Thank you for using ReportEmptyHomes.com. Your action is already helping to resolve the UK&rsquo;s empty homes crisis."
msgstr ""
@@ -3423,15 +3226,16 @@ msgstr ""
msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Council.pm:90
+#: perllib/FixMyStreet/App/Controller/Council.pm:100
msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Location.pm:123
+#: perllib/FixMyStreet/App/Controller/Location.pm:124
msgid "That location does not appear to be in the UK; please try again."
msgstr ""
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:63
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:79
#: perllib/FixMyStreet/Cobrand/UK.pm:86
msgid "That postcode was not recognised, sorry."
msgstr ""
@@ -3491,7 +3295,7 @@ msgstr ""
msgid "The confirmation email <strong>may</strong> take a few minutes to arrive &mdash; <em>please</em> be patient."
msgstr ""
-#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:2
#: templates/web/fixmystreet/report/new/fill_in_details_text.html:3
msgid "The council won&rsquo;t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc."
msgstr ""
@@ -3518,6 +3322,7 @@ msgstr ""
msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
msgstr ""
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:187
#: perllib/FixMyStreet/Geocode/OSM.pm:165
msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
msgstr ""
@@ -3576,7 +3381,7 @@ msgstr ""
msgid "The passwords do not match"
msgstr ""
-#: templates/web/default/errors/page_error_404_not_found.html:10
+#: templates/web/default/errors/page_error_404_not_found.html:11
#: templates/web/default/errors/page_error_404_not_found.html:12
msgid "The requested URL '%s' was not found on this server"
msgstr ""
@@ -3586,16 +3391,14 @@ msgstr ""
msgid "The simplest alert is our geographic one:"
msgstr ""
-#: templates/web/barnet/report/new/councils_text_all.html:3
#: templates/web/default/report/new/councils_extra_text.html:1
-#: templates/web/default/report/new/councils_text_some.html:10
#: templates/web/default/report/new/councils_text_some.html:11
#: templates/web/default/report/new/fill_in_details_form.html:17
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12
msgid "The subject and details of the problem will be public, plus your name if you give us permission."
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:291
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:296
msgid "The user could not locate the problem on a map, but to see the area around the location they entered"
msgstr ""
@@ -3610,16 +3413,15 @@ msgstr ""
msgid "There was a problem showing the All Reports page. Please try again later."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Contact.pm:116
+#: perllib/FixMyStreet/App/Controller/Contact.pm:121
#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59
msgid "There was a problem showing this page. Please try again later."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:747
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:755
#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134
#: templates/web/default/auth/general.html:23
#: templates/web/fixmystreet/auth/general.html:24
-#: templates/web/seesomething/auth/general.html:24
#: templates/web/zurich/auth/general.html:28
msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the &lsquo;sign in by email&rsquo; section of the form."
msgstr ""
@@ -3632,7 +3434,7 @@ msgstr ""
msgid "There was a problem with your update. Please try again."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Contact.pm:120
+#: perllib/FixMyStreet/App/Controller/Contact.pm:125
msgid "There were problems with your report. Please see below."
msgstr ""
@@ -3672,16 +3474,16 @@ msgid ""
" A body will not receive any reports unless it covers at least one area."
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:375
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:385
msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system."
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:388
msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:894
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:964
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:898
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:968
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:131
#: perllib/FixMyStreet/Cobrand/UK.pm:58
msgid "This information is required"
@@ -3713,7 +3515,6 @@ msgstr ""
msgid "This problem has been closed"
msgstr ""
-#: templates/web/bromley/report/display.html:98
#: templates/web/default/report/banner.html:12
#: templates/web/default/report/update-form.html:48
#: templates/web/emptyhomes/report/banner.html:3
@@ -3721,7 +3522,6 @@ msgstr ""
msgid "This problem has been fixed"
msgstr "Dieser Mangel wurde behoben"
-#: templates/web/bromley/report/display.html:92
#: templates/web/default/report/update-form.html:43
#: templates/web/fixmystreet/report/update-form.html:40
msgid "This problem has not been fixed"
@@ -3735,33 +3535,33 @@ msgstr "Dieser Mangel ist in Bearbeitung"
msgid "This problem is old and of unknown status."
msgstr "Dieses Problem ist alt und hat einen unbekannten Status"
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:108
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:109
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:130
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:131
#: templates/web/zurich/report/_main.html:14
msgid "This report is awaiting moderation."
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88
msgid "This report is currently marked as closed."
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86
msgid "This report is currently marked as fixed."
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:90
msgid "This report is currently marked as open."
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:320
msgid "This report was submitted anonymously"
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:284
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:289
msgid "This web page also contains a photo of the problem, provided by the user."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1178
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1187
#: templates/web/default/admin/timeline.html:1
msgid "Timeline"
msgstr ""
@@ -3779,7 +3579,7 @@ msgstr ""
msgid "To find out what local alerts we have for you, please enter your postcode or street name and area"
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:290
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:295
msgid "To view a map of the precise location of this issue"
msgstr ""
@@ -3791,17 +3591,10 @@ msgstr ""
msgid "Total"
msgstr "Total"
-#: templates/web/seesomething/report/new/fill_in_details_form.html:24
-msgid "Transport Category"
-msgstr ""
-
#: templates/web/default/js/translation_strings.html:29
-#: templates/web/oxfordshire/js/translation_strings.html:23
msgid "Try again"
msgstr ""
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:83
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:46
#: templates/web/default/report/update-form.html:30
@@ -3829,7 +3622,6 @@ msgid "Unknown alert type"
msgstr ""
#: templates/web/default/js/translation_strings.html:39
-#: templates/web/oxfordshire/js/translation_strings.html:33
msgid "Unknown error"
msgstr ""
@@ -3837,7 +3629,6 @@ msgstr ""
msgid "Unknown problem ID"
msgstr ""
-#: templates/web/bromley/report/display.html:66
#: templates/web/fixmystreet/report/update-form.html:19
msgid "Update"
msgstr "Beschreibung"
@@ -3847,12 +3638,12 @@ msgid "Update %s created for problem %d; by %s"
msgstr ""
#: templates/web/default/contact/index.html:21
-#: templates/web/fixmystreet/contact/index.html:34
+#: templates/web/fixmystreet/contact/index.html:38
msgid "Update below added anonymously at %s"
msgstr ""
#: templates/web/default/contact/index.html:23
-#: templates/web/fixmystreet/contact/index.html:36
+#: templates/web/fixmystreet/contact/index.html:40
msgid "Update below added by %s at %s"
msgstr ""
@@ -3896,12 +3687,12 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1042
-#: perllib/FixMyStreet/App/Controller/Admin.pm:796
-#: perllib/FixMyStreet/App/Controller/Admin.pm:940
-#: perllib/FixMyStreet/App/Controller/Admin.pm:998
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:487
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:556
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1007
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1051
+#: perllib/FixMyStreet/App/Controller/Admin.pm:801
+#: perllib/FixMyStreet/App/Controller/Admin.pm:949
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:550
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:619
msgid "Updated!"
msgstr ""
@@ -3913,16 +3704,14 @@ msgstr ""
msgid "Updates"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Comment.pm:131
-msgid "Updates are limited to 2000 characters in length. Please shorten your update"
+#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+msgid "Updates are limited to %s characters in length. Please shorten your update"
msgstr ""
#: db/alert_types.pl:5 db/alert_types.pl:6
msgid "Updates on {{title}}"
msgstr ""
-#: templates/web/bromley/report/display.html:0
-#: templates/web/bromley/report/display.html:8
#: templates/web/default/report/display.html:0
#: templates/web/default/report/display.html:5
#: templates/web/fixmystreet/report/display.html:0
@@ -3939,11 +3728,11 @@ msgstr ""
msgid "User"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1342
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1351
msgid "User flag removed"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1314
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1323
msgid "User flagged"
msgstr ""
@@ -3951,8 +3740,8 @@ msgstr ""
msgid "User search finds matches in users' names and email addresses."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:256
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1189
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:304
#: templates/web/default/admin/flagged.html:29
#: templates/web/zurich/header.html:69
msgid "Users"
@@ -3981,12 +3770,9 @@ msgstr ""
#: templates/web/default/around/display_location.html:0
#: templates/web/default/around/display_location.html:34
-#: templates/web/seesomething/around/display_location.html:0
-#: templates/web/seesomething/around/display_location.html:16
msgid "Viewing a location"
msgstr ""
-#: templates/web/bromley/report/display.html:0
#: templates/web/default/report/display.html:0
#: templates/web/fixmystreet/report/display.html:0
msgid "Viewing a problem"
@@ -3999,7 +3785,6 @@ msgstr ""
#: templates/web/default/alert/choose.html:6
#: templates/web/default/around/around_index.html:13
#: templates/web/fixmystreet/around/around_index.html:16
-#: templates/web/seesomething/around/around_index.html:13
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 ""
@@ -4011,25 +3796,22 @@ msgstr ""
msgid "We have sent you an email containing a link to confirm your account."
msgstr ""
-#: templates/web/emptyhomes/tokens/confirm_problem.html:18
+#: templates/web/emptyhomes/tokens/confirm_problem.html:19
#: templates/web/emptyhomes/tokens/confirm_problem.html:20
msgid "We may contact you periodically to ask if anything has changed with the property you reported."
msgstr ""
-#: templates/web/bromley/report/display.html:143
#: templates/web/fixmystreet/report/update-form.html:115
msgid "We never show your email"
msgstr "Ihre eMail wird nie angezeigt"
-#: templates/web/bromley/report/new/fill_in_details_form.html:133
-#: templates/web/bromley/report/new/fill_in_details_form.html:179
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:134
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:201
#: templates/web/zurich/report/new/fill_in_details_form.html:96
msgid "We never show your email address or phone number."
msgstr "Ihre eMail-Adresse oder Telefonnummer werden nie angezeigt"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:384
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:394
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 ""
@@ -4037,14 +3819,12 @@ msgstr ""
msgid "We send it to the council on your behalf"
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:217
#: templates/web/default/report/new/notes.html:5
#: templates/web/fixmybarangay/report/new/notes.html:5
msgid "We will only use your personal information in accordance with our <a href=\"/faq#privacy\">privacy policy.</a>"
msgstr ""
#: templates/web/fixmystreet/report/new/notes.html:4
-#: templates/web/oxfordshire/report/new/notes.html:4
msgid "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>"
msgstr ""
@@ -4074,13 +3854,11 @@ msgstr ""
msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>."
msgstr ""
-#: templates/web/fixmystreet/footer.html:21
-#: templates/web/stevenage/footer.html:22
+#: templates/web/fixmystreet/footer.html:24
msgid "Would you like better integration with FixMyStreet? <a href=\"http://www.mysociety.org/for-councils/fixmystreet/\">Find out about FixMyStreet for councils</a>."
msgstr ""
-#: templates/web/fixmystreet/footer.html:17
-#: templates/web/stevenage/footer.html:18
+#: templates/web/fixmystreet/footer.html:20
msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>."
msgstr ""
@@ -4092,7 +3870,6 @@ msgstr ""
#: templates/web/default/report/new/notes.html:8
#: templates/web/fixmybarangay/report/new/notes.html:8
#: templates/web/fixmystreet/report/new/notes.html:8
-#: templates/web/oxfordshire/report/new/notes.html:7
msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
msgstr "Meldungen g&auml;nzlich in Grossbuchstaben zu schreiben macht diese unleserlich. Ebenso wenn keine Satzzeichen verwendet werden."
@@ -4122,26 +3899,24 @@ msgstr "Jahr"
msgid "Yes"
msgstr "Ja"
-#: templates/web/bromley/report/display.html:157
-#: templates/web/bromley/report/new/fill_in_details_form.html:198
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:161
#: templates/web/fixmystreet/report/update-form.html:89
msgid "Yes I have a password"
msgstr ""
#: templates/web/default/contact/index.html:37
-#: templates/web/fixmystreet/contact/index.html:50
+#: templates/web/fixmystreet/contact/index.html:54
msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:"
msgstr ""
#: templates/web/default/contact/index.html:15
-#: templates/web/fixmystreet/contact/index.html:28
+#: templates/web/fixmystreet/contact/index.html:32
msgid "You are reporting the following update for being abusive, containing personal information, or similar:"
msgstr ""
-#: templates/web/default/tokens/confirm_problem.html:19
+#: templates/web/default/tokens/confirm_problem.html:20
#: templates/web/default/tokens/confirm_problem.html:21
-#: templates/web/zurich/tokens/confirm_problem.html:5
+#: templates/web/zurich/tokens/confirm_problem.html:6
#: templates/web/zurich/tokens/confirm_problem.html:8
msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
msgstr ""
@@ -4150,6 +3925,10 @@ msgstr ""
msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
msgstr ""
+#: templates/web/fixmystreet/contact/index.html:118
+msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
+msgstr ""
+
#: templates/web/default/admin/flagged.html:5
msgid ""
"You can flag any report or user by editing them, and they will be listed on this page.\n"
@@ -4157,9 +3936,9 @@ msgid ""
" reports in the past."
msgstr ""
-#: templates/web/default/report/new/councils_text_none.html:11
-#: templates/web/default/report/new/councils_text_none.html:13
-#: templates/web/default/report/new/councils_text_some.html:20
+#: templates/web/default/report/new/councils_text_none.html:19
+#: templates/web/default/report/new/councils_text_none.html:20
+#: templates/web/default/report/new/councils_text_some.html:21
#: templates/web/default/report/new/councils_text_some.html:22
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 ""
@@ -4169,7 +3948,6 @@ msgid "You can mark a body as deleted if you do not want it to be active on the
msgstr ""
#: templates/web/default/js/translation_strings.html:36
-#: templates/web/oxfordshire/js/translation_strings.html:30
msgid "You declined; please fill in the box above"
msgstr ""
@@ -4177,30 +3955,25 @@ msgstr ""
msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:97
#: templates/web/default/questionnaire/index.html:96
#: templates/web/default/report/new/fill_in_details_form.html:93
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:90
#: templates/web/fixmystreet/questionnaire/index.html:87
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:99
-#: templates/web/seesomething/report/new/fill_in_details_form.html:59
#: templates/web/zurich/report/new/fill_in_details_form.html:75
msgid "You have already attached a photo to this report, attaching another one will replace it."
msgstr ""
-#: templates/web/bromley/report/display.html:108
#: templates/web/default/report/update-form.html:59
#: templates/web/fixmystreet/report/update-form.html:56
msgid "You have already attached a photo to this update, attaching another one will replace it."
msgstr ""
#: templates/web/default/auth/sign_out.html:3
-#: templates/web/seesomething/auth/sign_out.html:3
#: templates/web/zurich/auth/sign_out.html:3
msgid "You have been signed out"
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:25
#: templates/web/default/report/new/fill_in_details_form.html:7
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:7
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:28
@@ -4212,17 +3985,14 @@ msgstr "Der gr&uml;ne Pin auf der Karte repr&auml;sentiert ihre Meldung. Falls d
msgid "You have successfully confirmed your alert."
msgstr ""
-#: templates/web/zurich/tokens/confirm_problem.html:5
#: templates/web/zurich/tokens/confirm_problem.html:6
msgid "You have successfully confirmed your email address."
msgstr ""
-#: templates/web/default/tokens/confirm_problem.html:14
#: templates/web/default/tokens/confirm_problem.html:15
msgid "You have successfully confirmed your problem"
msgstr "Sie haben Ihre Meldung erfolgreich best&auml;tigt"
-#: templates/web/default/tokens/confirm_update.html:11
#: templates/web/default/tokens/confirm_update.html:12
msgid "You have successfully confirmed your update and you can now <a href=\"%s\">view it on the site</a>."
msgstr ""
@@ -4235,11 +4005,15 @@ msgstr ""
msgid "You have successfully deleted your alert."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:754
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:762
#: perllib/FixMyStreet/App/Controller/Report/Update.pm:140
msgid "You have successfully signed in; please check and confirm your details are accurate:"
msgstr ""
+#: templates/web/default/my/my.html:17 templates/web/fixmystreet/my/my.html:17
+msgid "You haven&rsquo;t created any reports yet. <a href=\"%s\">Report a problem now.</a>"
+msgstr ""
+
#: templates/web/default/email_sent.html:13
msgid "You must now click the link in the email we've just sent you."
msgstr ""
@@ -4266,13 +4040,10 @@ msgstr ""
msgid "Your Reports"
msgstr ""
-#: templates/web/bromley/report/display.html:41
-#: templates/web/bromley/report/display.html:43
-#: templates/web/bromley/report/new/fill_in_details_form.html:145
#: templates/web/fixmystreet/alert/_list.html:89
#: templates/web/fixmystreet/alert/updates.html:19
#: templates/web/fixmystreet/alert/updates.html:22
-#: templates/web/fixmystreet/contact/index.html:84
+#: templates/web/fixmystreet/contact/index.html:88
#: templates/web/fixmystreet/report/display.html:65
#: templates/web/fixmystreet/report/display.html:67
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:115
@@ -4281,14 +4052,8 @@ msgstr ""
msgid "Your email"
msgstr "Ihre eMail"
-#: templates/web/seesomething/report/new/fill_in_details_form.html:81
-msgid "Your email (optional)"
-msgstr ""
-
-#: templates/web/bromley/report/display.html:132
#: templates/web/fixmystreet/auth/general.html:26
#: templates/web/fixmystreet/report/update-form.html:80
-#: templates/web/seesomething/auth/general.html:26
#: templates/web/zurich/auth/general.html:30
#: templates/web/zurich/auth/general.html:58
msgid "Your email address"
@@ -4306,28 +4071,15 @@ msgstr "Ihre eMail-Adresse:"
msgid "Your email:"
msgstr "Ihre eMail:"
-#: templates/web/bromley/report/display.html:195
-#: templates/web/bromley/report/new/fill_in_details_form.html:117
-#: templates/web/bromley/report/new/fill_in_details_form.html:164
-msgid "Your first name"
-msgstr ""
-
-#: templates/web/fixmystreet/report/updates-sidebar-notes.html:5
+#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7
msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>"
msgstr ""
-#: templates/web/bromley/report/display.html:201
-#: templates/web/bromley/report/new/fill_in_details_form.html:123
-#: templates/web/bromley/report/new/fill_in_details_form.html:170
-msgid "Your last name"
-msgstr ""
-
#: templates/web/fixmystreet/auth/general.html:57
-#: templates/web/fixmystreet/contact/index.html:77
+#: templates/web/fixmystreet/contact/index.html:81
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:124
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:192
#: templates/web/fixmystreet/report/update-form.html:140
-#: templates/web/seesomething/report/new/fill_in_details_form.html:79
#: templates/web/zurich/auth/general.html:61
#: templates/web/zurich/report/new/fill_in_details_form.html:104
msgid "Your name"
@@ -4341,12 +4093,9 @@ msgstr "Ihr Name"
msgid "Your name:"
msgstr "Ihr Name:"
-#: templates/web/bromley/report/display.html:162
-#: templates/web/bromley/report/new/fill_in_details_form.html:203
#: templates/web/fixmystreet/auth/general.html:41
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:166
#: templates/web/fixmystreet/report/update-form.html:94
-#: templates/web/seesomething/auth/general.html:30
#: templates/web/zurich/auth/general.html:34
msgid "Your password"
msgstr "Ihr Passwort"
@@ -4355,11 +4104,8 @@ msgstr "Ihr Passwort"
msgid "Your password has been changed"
msgstr "Ihr Passwort wurde ge&auml;ndert"
-#: templates/web/bromley/report/new/fill_in_details_form.html:137
-#: templates/web/bromley/report/new/fill_in_details_form.html:184
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:139
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:206
-#: templates/web/seesomething/report/new/fill_in_details_form.html:90
#: templates/web/zurich/report/new/fill_in_details_form.html:110
msgid "Your phone number"
msgstr "Ihre Telefonnummer"
@@ -4372,19 +4118,13 @@ msgstr "Ihre Meldung"
msgid "Your report has been created and will shortly be sent."
msgstr ""
-#: templates/web/barnet/footer.html:18 templates/web/bromley/footer.html:19
-#: templates/web/bromley/header.html:75 templates/web/default/footer.html:9
-#: templates/web/fiksgatami/footer.html:6
+#: templates/web/default/footer.html:9 templates/web/fiksgatami/footer.html:6
#: templates/web/fiksgatami/nn/footer.html:6
-#: templates/web/fixmindelo/footer.html:39
-#: templates/web/fixmystreet/footer.html:46
-#: templates/web/oxfordshire/footer.html:21
-#: templates/web/oxfordshire/header.html:63
-#: templates/web/reading/footer.html:7 templates/web/stevenage/footer.html:41
+#: templates/web/fixmystreet/footer.html:49
msgid "Your reports"
msgstr "Ihre Meldungen"
-#: templates/web/default/my/my.html:45 templates/web/fixmystreet/my/my.html:49
+#: templates/web/default/my/my.html:50 templates/web/fixmystreet/my/my.html:56
msgid "Your updates"
msgstr ""
@@ -4401,7 +4141,7 @@ msgstr ""
msgid "council"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
msgid "council ref:&nbsp;%s"
msgstr ""
@@ -4413,27 +4153,24 @@ msgstr "hat Karte nicht verwendet"
#: templates/web/default/alert/index.html:33
#: templates/web/fixmystreet/around/postcode_form.html:20
-#: templates/web/seesomething/around/postcode_form.html:9
msgid "e.g. ‘%s’ or ‘%s’"
msgstr ""
#: templates/web/default/admin/flagged.html:51
-#, fuzzy
msgid "edit user"
-msgstr "hat Karte nicht verwendet"
+msgstr ""
#: templates/web/default/admin/index.html:23
#: templates/web/zurich/admin/index.html:5
msgid "from %d different users"
msgstr ""
-#: templates/web/bromley/report/_item.html:12
-#: templates/web/fixmystreet/report/_item.html:12
+#: templates/web/fixmystreet/report/_item.html:17
#: templates/web/zurich/report/_item.html:16
msgid "last updated %s"
msgstr ""
-#: perllib/Utils.pm:263
+#: perllib/Utils.pm:265
msgid "less than a minute"
msgstr "weniger als einer Minute"
@@ -4491,21 +4228,20 @@ msgid "or"
msgstr "oder"
#: templates/web/default/js/translation_strings.html:27
-#: templates/web/oxfordshire/js/translation_strings.html:21
msgid "or locate me automatically"
msgstr ""
-#: templates/web/default/admin/report_edit.html:24
+#: templates/web/default/admin/report_edit.html:25
#: templates/web/default/admin/report_edit.html:26
-#: templates/web/zurich/admin/report_edit-sdm.html:30
+#: templates/web/zurich/admin/report_edit-sdm.html:31
#: templates/web/zurich/admin/report_edit-sdm.html:32
-#: templates/web/zurich/admin/report_edit-sdm.html:39
+#: templates/web/zurich/admin/report_edit-sdm.html:40
#: templates/web/zurich/admin/report_edit-sdm.html:41
-#: templates/web/zurich/admin/report_edit.html:30
+#: templates/web/zurich/admin/report_edit.html:31
#: templates/web/zurich/admin/report_edit.html:32
-#: templates/web/zurich/admin/report_edit.html:41
+#: templates/web/zurich/admin/report_edit.html:42
#: templates/web/zurich/admin/report_edit.html:43
-#: templates/web/zurich/admin/report_edit.html:53
+#: templates/web/zurich/admin/report_edit.html:54
#: templates/web/zurich/admin/report_edit.html:55
msgid "originally entered: &ldquo;%s&rdquo;"
msgstr ""
@@ -4519,23 +4255,17 @@ msgstr ""
msgid "reopened"
msgstr ""
-#: templates/web/barnet/header.html:71 templates/web/bromley/header.html:100
-#: templates/web/bromley/header.html:65
#: templates/web/fixmybarangay/header.html:67
-#: templates/web/fixmystreet/header.html:51
-#: templates/web/oxfordshire/header.html:112
-#: templates/web/oxfordshire/header.html:48
-#: templates/web/stevenage/header.html:98 templates/web/zurich/footer.html:12
+#: templates/web/fixmystreet/header.html:54
+#: templates/web/zurich/footer.html:12
msgid "sign out"
msgstr "ausloggen"
-#: templates/web/bromley/report/new/fill_in_details_form.html:4
-#: templates/web/bromley/report/new/fill_in_details_form.html:7
-#: templates/web/default/report/new/fill_in_details_form.html:11
+#: templates/web/default/report/new/fill_in_details_form.html:12
#: templates/web/default/report/new/fill_in_details_form.html:14
-#: templates/web/emptyhomes/report/new/fill_in_details_form.html:11
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:12
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:14
-#: templates/web/fixmystreet/report/new/fill_in_details_form.html:6
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:7
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:9
msgid "the local council"
msgstr ""
@@ -4545,11 +4275,11 @@ msgstr ""
msgid "there is no pin shown as the user did not use the map"
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:362
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:370
msgid "this type of local problem"
msgstr ""
-#: perllib/Utils.pm:235
+#: perllib/Utils.pm:237
msgid "today"
msgstr "heute"
@@ -4579,7 +4309,7 @@ msgid_plural "<big>%s</big> reports recently"
msgstr[0] ""
msgstr[1] ""
-#: perllib/Utils.pm:282
+#: perllib/Utils.pm:284
#, perl-format
msgid "%d hour"
msgid_plural "%d hours"
@@ -4593,7 +4323,7 @@ msgid_plural "%d supporters"
msgstr[0] ""
msgstr[1] ""
-#: perllib/Utils.pm:284
+#: perllib/Utils.pm:286
#, perl-format
msgid "%d minute"
msgid_plural "%d minutes"
@@ -4614,7 +4344,7 @@ msgid_plural "We do not yet have details for the councils that cover this locati
msgstr[0] ""
msgstr[1] ""
-#: perllib/Utils.pm:278
+#: perllib/Utils.pm:280
#, perl-format
msgid "%d week"
msgid_plural "%d weeks"
@@ -4635,20 +4365,16 @@ msgid_plural "<big>%s</big> fixed in past month"
msgstr[0] "<big>%s</big> im letzten Monat behoben"
msgstr[1] "<big>%s</big> im letzten Monat gehoben"
-#: templates/web/default/report/new/councils_text_some.html:14
+#: perllib/Utils.pm:282
#, perl-format
-msgid "We do <strong>not</strong> yet have details for the other council that covers this location."
-msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location."
+msgid "%d day"
+msgid_plural "%d days"
msgstr[0] ""
msgstr[1] ""
-#: perllib/Utils.pm:280
+#: templates/web/default/report/new/councils_text_some.html:14
#, perl-format
-msgid "%d day"
-msgid_plural "%d days"
+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] ""
-
-#, fuzzy
-#~ msgid "The email field is required"
-#~ msgstr "Diese Information wird ben&ouml;tigt"
diff --git a/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po
index 8533f6c21..af7285df9 100644
--- a/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -4,13 +4,14 @@
# Matthew Somerville <matthew@mysociety.org>, 2011-06-03.
#
# Translators:
+# Luis Felipe Álvarez Burgos <luisfelipealvarez@gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: fixmystreet\n"
"Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2013-11-12 13:15+0000\n"
-"PO-Revision-Date: 2013-09-05 16:55+0000\n"
-"Last-Translator: mysociety <transifex@mysociety.org>\n"
+"POT-Creation-Date: 2014-05-16 17:30+0100\n"
+"PO-Revision-Date: 2014-03-13 14:53+0000\n"
+"Last-Translator: Luis Felipe Álvarez Burgos <luisfelipealvarez@gmail.com>\n"
"Language-Team: Spanish (http://www.transifex.com/projects/p/fixmystreet/language/es/)\n"
"Language: es\n"
"MIME-Version: 1.0\n"
@@ -18,25 +19,25 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:373
+#: perllib/FixMyStreet/DB/Result/Problem.pm:604
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383
msgid " and "
msgstr " y "
-#: templates/web/default/tokens/confirm_problem.html:14
+#: templates/web/default/tokens/confirm_problem.html:15
#: templates/web/default/tokens/confirm_problem.html:17
msgid " and <strong>we will now send it to the council</strong>"
msgstr " y <strong>ahora lo enviaremos al Ayuntamiento </ strong>"
-#: templates/web/default/report/new/councils_text_all.html:11
-#: templates/web/default/report/new/councils_text_all.html:18
-#: templates/web/default/report/new/councils_text_all.html:4
-#: templates/web/default/report/new/councils_text_none.html:11
-#: templates/web/default/report/new/councils_text_none.html:14
-#: templates/web/default/report/new/councils_text_some.html:20
+#: templates/web/default/report/new/councils_text_all.html:12
+#: templates/web/default/report/new/councils_text_all.html:19
+#: templates/web/default/report/new/councils_text_all.html:5
+#: templates/web/default/report/new/councils_text_none.html:19
+#: templates/web/default/report/new/councils_text_none.html:21
+#: templates/web/default/report/new/councils_text_some.html:21
#: templates/web/default/report/new/councils_text_some.html:23
#: templates/web/default/report/new/councils_text_some.html:5
-#: templates/web/emptyhomes/report/new/councils_text_all.html:2
+#: templates/web/emptyhomes/report/new/councils_text_all.html:3
msgid " or "
msgstr " o "
@@ -67,40 +68,40 @@ msgstr "%d cuestionarios enviados &ndash; %d respondidos (%s%%)"
#: templates/web/default/pagination.html:10
msgid "%d to %d of %d"
-msgstr ""
+msgstr "%d a %d de %d"
#: templates/web/default/reports/body.html:0
#: templates/web/default/reports/body.html:22
msgid "%s - Summary reports"
msgstr "%s - Informes de notificación"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:653
msgid "%s ref:&nbsp;%s"
msgstr "%s ref:&nbsp;%s"
-#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
msgid "%s ward, %s"
msgstr "%s barrio, %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:538
+#: perllib/FixMyStreet/DB/Result/Problem.pm:540
msgid "%s, reported at %s"
-msgstr ""
+msgstr "%s, reportado el %s"
-#: perllib/FixMyStreet/Cobrand/UK.pm:303 perllib/FixMyStreet/Cobrand/UK.pm:315
+#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:309
msgid "%s, within %s ward"
msgstr "%s , en %s barrio"
#: templates/web/default/email_sent.html:29
msgid "(Don't worry &mdash; we'll hang on to your alert while you're checking your email.)"
-msgstr ""
+msgstr "(No se preocupe &mdash; nosotors mantendremos su alerta mientras usted revisa su email.)"
#: templates/web/default/email_sent.html:25
msgid "(Don't worry &mdash; we'll hang on to your problem report while you're checking your email.)"
-msgstr ""
+msgstr "(No se preocupe &mdash; nosotros mantendremos su reporte mientras usted revisa su email.)"
#: templates/web/default/email_sent.html:27
msgid "(Don't worry &mdash; we'll hang on to your update while you're checking your email.)"
-msgstr ""
+msgstr "(No se preocupe &mdash; nosotros mantendremos su actualización mientras usted revisa su email.)"
#: templates/web/default/admin/report_blocks.html:11
#: templates/web/default/admin/users.html:29
@@ -117,30 +118,27 @@ msgstr "(Una distancia predeterminada que cubre aproximadamente 200.000 personas
msgid "(alternatively the RSS feed can be customised, within"
msgstr "(O bien la fuente RSS se pueden personalizar, dentro de"
-#: templates/web/bromley/report/_item.html:22
#: templates/web/default/around/around_map_list_items.html:12
#: templates/web/default/around/on_map_list_items.html:9
-#: templates/web/fixmystreet/report/_item.html:22
+#: templates/web/fixmystreet/report/_item.html:27
#: templates/web/zurich/report/_item.html:21
msgid "(closed)"
msgstr "(cerrado)"
-#: templates/web/bromley/report/_item.html:20
#: templates/web/default/around/around_map_list_items.html:10
#: templates/web/default/around/on_map_list_items.html:7
-#: templates/web/fixmystreet/report/_item.html:20
+#: templates/web/fixmystreet/report/_item.html:25
#: templates/web/zurich/report/_item.html:19
msgid "(fixed)"
msgstr "(arreglado)"
-#: templates/web/default/index.html:12 templates/web/default/index.html:8
+#: templates/web/default/index.html:12 templates/web/default/index.html:9
#: templates/web/fixmystreet/around/intro.html:2
msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
msgstr "(como graffitis, basura ilegal, pavimentación o alumbrado roto)"
-#: templates/web/bromley/report/_item.html:16
#: templates/web/default/reports/_list-entry.html:4
-#: templates/web/fixmystreet/report/_item.html:16
+#: templates/web/fixmystreet/report/_item.html:21
msgid "(not sent to council)"
msgstr "(sin enviar al Ayuntamiento)"
@@ -150,9 +148,8 @@ msgstr "(sin enviar al Ayuntamiento)"
msgid "(optional)"
msgstr "(opcional)"
-#: templates/web/bromley/report/_item.html:15
#: templates/web/default/reports/_list-entry.html:2
-#: templates/web/fixmystreet/report/_item.html:15
+#: templates/web/fixmystreet/report/_item.html:20
msgid "(sent to both)"
msgstr "(enviado a ambos)"
@@ -164,8 +161,8 @@ msgstr "(nunca se muestra su dirección de correo electrónico o número de tel
msgid "(we never show your email)"
msgstr "(nunca se muestra su dirección de correo electrónico)"
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:637
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:664
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:635
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:662
#: perllib/FixMyStreet/DB/Result/Problem.pm:379
msgid "-- Pick a category --"
msgstr "-- Elige una categoría --"
@@ -177,7 +174,7 @@ msgstr "-- Escoja un tipo de propiedad --"
#: templates/web/emptyhomes/front/stats.html:5
msgid "<big>%s</big> reports"
-msgstr ""
+msgstr "<big>%s</big> reportes"
#: templates/web/default/admin/body-form.html:42
#: templates/web/default/admin/body-form.html:43
@@ -207,7 +204,7 @@ msgstr ""
"<a href=\"http://www.pledgebank.com/new\">comprometerse y darlo a conocer</ a>?\n"
"</p>"
-#: templates/web/fixmystreet/questionnaire/completed-open.html:6
+#: templates/web/fixmystreet/questionnaire/completed-open.html:25
msgid ""
"<p style=\"font-size:150%\">We&rsquo;re sorry to hear that. We have two\n"
"suggestions: why not try <a href=\"http://www.writetothem.com/\">writing direct\n"
@@ -286,7 +283,7 @@ msgstr ""
"descubre más información sobre el estado de su notificación, por favor vuelva\n"
" y realice una actualización.</p>"
-#: templates/web/default/around/_report_banner.html:3
+#: templates/web/default/around/_report_banner.html:4
#: templates/web/default/around/_report_banner.html:5
msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>"
msgstr "<small>Si no puede ver el mapa, <a href='%s' rel='nofollow'> omita este paso</ a>.</small>"
@@ -341,8 +338,6 @@ msgstr "<strong>Sí</strong> tengo una contraseña"
msgid "About us"
msgstr "¿Quiénes somos?"
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:81
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:39
#: templates/web/default/report/update-form.html:30
@@ -350,7 +345,7 @@ msgstr "¿Quiénes somos?"
#: templates/web/fixmystreet/report/update-form.html:28
#: templates/web/fixmystreet/report/update-form.html:29
msgid "Action Scheduled"
-msgstr ""
+msgstr "Acción programada"
#: templates/web/default/admin/body-form.html:3
#: templates/web/default/admin/body-form.html:4
@@ -359,17 +354,20 @@ msgid ""
" to which problem reports can be sent. You can add one or more contacts (for different\n"
" categories of problem) to each body."
msgstr ""
+"Agregue un <strong>órgano</strong> para cada órgano administrativo, por ejemplo una municipalidad o departamento\n"
+"al cual se le puedan enviar los reportes. Se pueden agregar uno o más contactos (para diferentes\n"
+"categorias de problemas) a cada órgano."
#: templates/web/default/admin/body.html:45
msgid "Add a contact using the form below."
-msgstr ""
+msgstr "Añada un contacto usando el siguiente formulario"
#: templates/web/default/admin/bodies.html:65
#: templates/web/default/admin/bodies.html:70
#: templates/web/default/admin/body-form.html:233
#: templates/web/zurich/admin/body-form.html:51
msgid "Add body"
-msgstr ""
+msgstr "Agregue un órgano"
#: templates/web/default/admin/body.html:88
#: templates/web/zurich/admin/body.html:30
@@ -378,9 +376,9 @@ msgstr "Agregar nueva categoría"
#: templates/web/default/admin/users.html:45
msgid "Add user"
-msgstr ""
+msgstr "Añade un usuario"
-#: templates/web/default/my/my.html:56 templates/web/fixmystreet/my/my.html:60
+#: templates/web/default/my/my.html:61 templates/web/fixmystreet/my/my.html:67
msgid "Added %s"
msgstr "Añadido %s"
@@ -396,7 +394,6 @@ msgstr "Alerta %d creada por %s , tipo %s , los parámetros %s / %s"
msgid "Alert %d disabled (created %s)"
msgstr "Alerta %d desactivada (creada %s)"
-#: templates/web/bromley/report/display.html:209
#: templates/web/default/report/update-form.html:163
#: templates/web/fixmystreet/report/update-form.html:148
msgid "Alert me to future updates"
@@ -409,17 +406,12 @@ msgstr "Avisarme de las actualizaciones futuras"
msgid "All Reports"
msgstr "Todas las notificaciones"
-#: templates/web/barnet/footer.html:20 templates/web/bromley/footer.html:21
-#: templates/web/bromley/header.html:77 templates/web/default/footer.html:11
+#: templates/web/default/footer.html:11
#: templates/web/emptyhomes/header.html:32
#: templates/web/fiksgatami/footer.html:7
#: templates/web/fiksgatami/nn/footer.html:7
-#: templates/web/fixmindelo/footer.html:41
#: templates/web/fixmybarangay/footer.html:20
-#: templates/web/fixmystreet/footer.html:48
-#: templates/web/oxfordshire/footer.html:23
-#: templates/web/oxfordshire/header.html:67
-#: templates/web/reading/footer.html:8 templates/web/stevenage/footer.html:43
+#: templates/web/fixmystreet/footer.html:51
#: templates/web/zurich/admin/index-dm.html:12
#: templates/web/zurich/admin/stats.html:13
#: templates/web/zurich/footer.html:19
@@ -430,33 +422,31 @@ msgstr "Todas las notificaciones"
#: templates/web/default/admin/stats.html:5
#: templates/web/zurich/admin/stats.html:8
msgid "All reports between %s and %s"
-msgstr ""
+msgstr "Todos los reportes entre %s y %s"
#: templates/web/default/report/new/councils_text_some.html:2
msgid "All the information you provide here will be sent to"
msgstr "Toda la información proporcionada será enviada a"
-#: templates/web/default/report/new/councils_text_all.html:11
+#: templates/web/default/report/new/councils_text_all.html:12
#: templates/web/default/report/new/councils_text_all.html:13
msgid "All the information you provide here will be sent to <strong>%s</strong> or <strong>Roads Service</strong>."
msgstr "Toda la información proporcionada será enviada a <strong>%s</strong> o al <strong>Servicio de Carreteras</strong>."
-#: templates/web/default/report/new/councils_text_all.html:4
+#: templates/web/default/report/new/councils_text_all.html:5
#: templates/web/default/report/new/councils_text_all.html:6
msgid "All the information you provide here will be sent to <strong>%s</strong> or a relevant local body such as <strong>TfL</strong>, via the London Report-It system."
msgstr "Toda la información proporcionada será enviada a <strong>%s</strong> o al órgano competente local, como <strong>TfL</strong>, a través del Informe de Londres-It sistema."
-#: templates/web/bromley/report/new/fill_in_details_form.html:4
-#: templates/web/bromley/report/new/fill_in_details_form.html:6
-#: templates/web/default/report/new/councils_text_all.html:18
+#: templates/web/default/report/new/councils_text_all.html:19
#: templates/web/default/report/new/councils_text_all.html:20
-#: templates/web/default/report/new/fill_in_details_form.html:11
+#: templates/web/default/report/new/fill_in_details_form.html:12
#: templates/web/default/report/new/fill_in_details_form.html:13
-#: templates/web/emptyhomes/report/new/councils_text_all.html:2
+#: templates/web/emptyhomes/report/new/councils_text_all.html:3
#: templates/web/emptyhomes/report/new/councils_text_all.html:4
-#: templates/web/emptyhomes/report/new/fill_in_details_form.html:11
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:12
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:13
-#: templates/web/fixmystreet/report/new/fill_in_details_form.html:6
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:7
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:8
msgid "All the information you provide here will be sent to <strong>%s</strong>."
msgstr "Toda la información proporcionada será enviada a <strong>%s</strong>."
@@ -480,13 +470,11 @@ msgstr "Anónimo:"
msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?"
msgstr "¿Eres strong>programador</strong>? ¿Te gustaría contribuir a FixMyStreet?"
-#: templates/web/fixmystreet/footer.html:16
-#: templates/web/stevenage/footer.html:17
+#: templates/web/fixmystreet/footer.html:19
msgid "Are you a developer?"
msgstr "¿Eres programador?"
-#: templates/web/fixmystreet/footer.html:20
-#: templates/web/stevenage/footer.html:21
+#: templates/web/fixmystreet/footer.html:23
msgid "Are you from a council?"
msgstr "¿Pertenece al Ayuntamiento?"
@@ -502,14 +490,14 @@ msgstr ""
#: templates/web/zurich/admin/report_edit.html:153
msgid "Assign to external body:"
-msgstr ""
+msgstr "Asignar a un órgano externo:"
#: templates/web/zurich/admin/report_edit.html:133
#: templates/web/zurich/admin/report_edit.html:190
msgid "Assign to subdivision:"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:141
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:163
#: templates/web/zurich/report/updates.html:11
msgid "Assigned to %s"
msgstr ""
@@ -528,7 +516,6 @@ msgid "Awaiting moderation"
msgstr ""
#: templates/web/default/js/translation_strings.html:32
-#: templates/web/oxfordshire/js/translation_strings.html:26
msgid "Back"
msgstr ""
@@ -540,8 +527,8 @@ msgstr "Prohibir dirección de email"
msgid "Be sure to choose the right category, because we use that to determine to whom the report is sent."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1176
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:249
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1185
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:297
#: templates/web/default/admin/bodies.html:1
#: templates/web/zurich/header.html:64
msgid "Bodies"
@@ -551,11 +538,11 @@ msgstr ""
#: templates/web/default/admin/reports.html:14
#: templates/web/default/admin/users.html:17
msgid "Body"
-msgstr ""
+msgstr "Órgano"
#: templates/web/default/admin/user-form.html:32
msgid "Body:"
-msgstr ""
+msgstr "Órgano:"
#: templates/web/fiksgatami/footer.html:16
#: templates/web/fiksgatami/nn/footer.html:16
@@ -567,18 +554,15 @@ msgid "By Date"
msgstr "Por Fecha"
#: templates/web/fixmystreet/around/_report_banner.html:10
-#: templates/web/fixmystreet/around/_report_banner.html:8
+#: templates/web/fixmystreet/around/_report_banner.html:9
msgid "Can't see the map? <a href='%s' rel='nofollow'>Skip this step</a>"
msgstr "¿No puedes ver el mapa? <a href='%s' rel='nofollow'>Salte este paso</a>"
-#: templates/web/bromley/report/new/fill_in_details_form.html:68
#: templates/web/default/admin/bodies.html:20
#: templates/web/default/admin/body.html:53
#: templates/web/default/admin/index.html:44
#: templates/web/default/report/new/category.html:10
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:74
-#: templates/web/seesomething/report/new/category.html:6
-#: templates/web/southampton/report/new/category.html:3
#: templates/web/zurich/admin/body.html:13
#: templates/web/zurich/admin/index-dm.html:23
#: templates/web/zurich/admin/index-sdm.html:21
@@ -603,7 +587,7 @@ msgstr "Categoría ratio de arreglo de problemas > 4 semanas"
msgid "Category:"
msgstr "Categoría:"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:366
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374
msgid "Category: %s"
msgstr "Categoría: %s"
@@ -635,6 +619,13 @@ msgid ""
" interest in displaying the report. In the UK, we've used this for services like requesting an extra rubbish bin\n"
" at a specific address."
msgstr ""
+"Check <strong>privado</strong> si los reportes en esta categoría <strong>no deben ser desplegados en el sitio</strong>.\n"
+"\n"
+"Normalmente, las categorías no son privadas.\n"
+"\n"
+"Esto resulta útil para los problemas que se pueden ser reportados por un usuario a un órgano, pero para los cuales\n"
+"no hay mayor interés en ser desplegados. En el Reino Unido, hemos utilizado esto para servicios como requerir un\n"
+"basurero extra en una dirección específica"
#: templates/web/default/admin/body.html:101
msgid ""
@@ -652,21 +643,16 @@ msgstr ""
msgid "Click map to report a problem"
msgstr "Haga clic en el mapa para notificar un problema"
-#: templates/web/oxfordshire/js/translation_strings.html:39
-#, fuzzy
-msgid "Click on the map to report a problem"
-msgstr "Haga clic en el mapa para notificar un problema"
-
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:118
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:140
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:45
#: templates/web/default/admin/report_edit.html:47
#: templates/web/default/dashboard/index.html:142
#: templates/web/default/dashboard/index.html:144
#: templates/web/fixmystreet/report/banner.html:15
-#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:10
#: templates/web/zurich/admin/header.html:12
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/report_edit.html:100
#: templates/web/zurich/admin/report_edit.html:98
#: templates/web/zurich/admin/stats.html:31
@@ -674,11 +660,11 @@ msgstr "Haga clic en el mapa para notificar un problema"
msgid "Closed"
msgstr "Cerrada"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:744
+#: perllib/FixMyStreet/DB/Result/Problem.pm:748
msgid "Closed by council"
msgstr "Cerrado por el Ayuntamiento"
-#: templates/web/default/my/my.html:32 templates/web/fixmystreet/my/my.html:36
+#: templates/web/default/my/my.html:37 templates/web/fixmystreet/my/my.html:43
msgid "Closed reports"
msgstr "Informes cerrados"
@@ -686,7 +672,7 @@ msgstr "Informes cerrados"
msgid "Closed:"
msgstr "Cerrado:"
-#: templates/web/default/around/tabbed_lists.html:10
+#: templates/web/default/around/tabbed_lists.html:11
#: templates/web/default/around/tabbed_lists.html:12
msgid "Closest nearby problems <small>(within&nbsp;%skm)</small>"
msgstr "Problemas cercanos <small>(dentro de %%s km)</small>"
@@ -712,9 +698,8 @@ msgid "Cobrand:"
msgstr "Cobrand:"
#: templates/web/default/admin/config_page.html:1
-#, fuzzy
msgid "Configuration"
-msgstr "Confirmación"
+msgstr ""
#: perllib/FixMyStreet/App/Controller/Admin.pm:421
msgid "Configuration updated - contacts will be generated automatically later"
@@ -744,8 +729,6 @@ msgstr ""
#: templates/web/default/tokens/confirm_update.html:3
#: templates/web/emptyhomes/tokens/confirm_problem.html:1
#: templates/web/emptyhomes/tokens/confirm_problem.html:3
-#: templates/web/southampton/tokens/confirm_problem.html:1
-#: templates/web/southampton/tokens/confirm_problem.html:3
#: templates/web/zurich/tokens/confirm_problem.html:1
#: templates/web/zurich/tokens/confirm_problem.html:3
msgid "Confirmation"
@@ -778,7 +761,6 @@ msgstr "Contacto"
msgid "Contact FixMyStreet"
msgstr "Contactar FixMyStreet"
-#: templates/web/bromley/contact/submit.html:1
#: templates/web/default/contact/index.html:1
#: templates/web/default/contact/index.html:2
#: templates/web/default/contact/submit.html:1
@@ -787,20 +769,18 @@ msgstr "Contactar FixMyStreet"
msgid "Contact Us"
msgstr "Contáctenos"
-#: templates/web/bromley/contact/submit.html:3
#: templates/web/default/contact/index.html:6
#: templates/web/default/contact/submit.html:3
-#: templates/web/fixmystreet/contact/index.html:19
+#: templates/web/fixmystreet/contact/index.html:22
msgid "Contact the team"
msgstr "Contactar con el equipo"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1310
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1338
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1319
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1347
msgid "Could not find user"
msgstr "No se pudo encontrar usuario"
#: templates/web/default/js/translation_strings.html:37
-#: templates/web/oxfordshire/js/translation_strings.html:31
msgid "Could not look up location"
msgstr ""
@@ -855,11 +835,10 @@ msgstr "Estado actual"
#: templates/web/default/admin/bodies.html:7
#: templates/web/default/admin/index.html:5
-#, fuzzy
msgid "Currently no bodies have been created."
-msgstr "No se han notificado problemas todavía."
+msgstr ""
-#: templates/web/default/dashboard/index.html:5
+#: templates/web/default/dashboard/index.html:6
#: templates/web/default/dashboard/index.html:7
msgid "Dashboard"
msgstr "Cuadro de mando"
@@ -882,11 +861,8 @@ msgstr "Eliminado"
msgid "Description"
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:54
#: templates/web/default/js/translation_strings.html:34
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66
-#: templates/web/oxfordshire/js/translation_strings.html:28
-#: templates/web/seesomething/report/new/fill_in_details_form.html:16
#: templates/web/zurich/report/new/fill_in_details_form.html:42
msgid "Details"
msgstr "Detalles"
@@ -924,8 +900,10 @@ msgstr "¿Tiene una contraseña FixMyStreet?"
msgid "Don&rsquo;t know"
msgstr "No lo se"
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:82
+#: templates/web/fixmystreet/contact/index.html:115
+msgid "Don't like forms?"
+msgstr ""
+
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:47
#: templates/web/default/report/update-form.html:30
@@ -942,6 +920,9 @@ msgid ""
" This means you can add many categories even if you only have one contact for the body.\n"
" "
msgstr ""
+"Cada contacto para el órgano tiene una categoría, el cual es desplegado al público.\n"
+"Diferentes categorías <strong>pueden tener el mismo contacto</strong> (email).\n"
+"Esto significa que puede agregar muchas categorías incluso si tiene un solo contacto para el órgano."
#: templates/web/default/admin/list_updates.html:42
#: templates/web/default/admin/problem_row.html:41
@@ -953,12 +934,12 @@ msgstr "Editar"
#: templates/web/default/admin/body.html:189
#: templates/web/zurich/admin/body.html:64
msgid "Edit body details"
-msgstr ""
+msgstr "Editar los detalles del órgano"
#: templates/web/default/admin/report_edit.html:1
-#: templates/web/zurich/admin/report_edit-sdm.html:1
+#: templates/web/zurich/admin/report_edit-sdm.html:2
#: templates/web/zurich/admin/report_edit-sdm.html:4
-#: templates/web/zurich/admin/report_edit.html:1
+#: templates/web/zurich/admin/report_edit.html:2
#: templates/web/zurich/admin/report_edit.html:5
msgid "Editing problem %d"
msgstr "Editando problema %d"
@@ -976,7 +957,6 @@ msgstr "Editando usuario %d"
msgid "Editor"
msgstr "Editor"
-#: templates/web/bromley/report/display.html:128
#: templates/web/default/admin/bodies.html:18
#: templates/web/default/admin/body.html:54
#: templates/web/default/admin/body_edit.html:83
@@ -984,7 +964,6 @@ msgstr "Editor"
#: templates/web/default/admin/users.html:16
#: templates/web/fixmystreet/auth/general.html:20
#: templates/web/fixmystreet/report/update-form.html:76
-#: templates/web/seesomething/auth/general.html:20
#: templates/web/zurich/admin/body-form.html:9
#: templates/web/zurich/admin/body.html:14
#: templates/web/zurich/auth/general.html:24
@@ -992,16 +971,15 @@ msgstr "Editor"
msgid "Email"
msgstr "Email:"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1286
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1295
msgid "Email added to abuse list"
msgstr "Email añadido a lista de abusos"
#: templates/web/default/admin/body.html:126
-#, fuzzy
msgid "Email address:"
-msgstr "Su dirección de email:"
+msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1283
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1292
msgid "Email already in abuse list"
msgstr "Email ya incluido en lista de abusos"
@@ -1025,7 +1003,7 @@ msgstr "Recibir por email actualizaciones"
msgid "Email:"
msgstr "Email:"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:318
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:323
msgid "Email: %s"
msgstr ""
@@ -1071,15 +1049,14 @@ msgid ""
msgstr ""
#: templates/web/default/admin/stats.html:70
-#, fuzzy
msgid "End Date:"
-msgstr "Día de fin:"
+msgstr ""
#: templates/web/default/admin/body-form.html:126
msgid "Endpoint"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:71
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:72
msgid "Enter a Z&uuml;rich street name"
msgstr ""
@@ -1088,26 +1065,26 @@ msgid "Enter a nearby UK postcode, or street name and area"
msgstr "Introduzca un código postal cercano de su región, o nombre de la calle y el área"
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:25
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:37
msgid "Enter a nearby postcode, or street name and area"
msgstr "Introduzca un código postal cercano, o nombre de la calle y el área"
-#: templates/web/default/around/postcode_form.html:1
#: templates/web/default/around/postcode_form.html:2
-#: templates/web/fixmystreet/around/postcode_form.html:10
#: templates/web/fixmystreet/around/postcode_form.html:11
-#: templates/web/seesomething/around/postcode_form.html:3
-#: templates/web/seesomething/around/postcode_form.html:4
msgid "Enter a nearby street name and area"
msgstr "Introduzca un nombre de la calle y la zona cercana"
+#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:9
+#, fuzzy
+msgid "Enter a nearby street name and area, postal code or district in Delhi"
+msgstr "Introduzca un nombre de la calle y la zona cercana"
+
#: templates/web/default/auth/general.html:64
#: templates/web/default/report/new/fill_in_details_form.html:169
#: templates/web/default/report/update-form.html:124
msgid "Enter a new password:"
msgstr "Introduzca una nueva contraseña:"
-#: templates/web/bromley/report/display.html:150
-#: templates/web/bromley/report/new/fill_in_details_form.html:189
#: templates/web/fixmystreet/auth/general.html:61
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:211
#: templates/web/fixmystreet/report/update-form.html:122
@@ -1142,7 +1119,6 @@ msgstr "Ejemplos:"
msgid "Extra data:"
msgstr "Datos adicionales:"
-#: templates/web/bromley/contact/submit.html:14
#: templates/web/default/contact/submit.html:15
msgid "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>."
msgstr "No se ha podido enviar el mensaje. Por favor, inténtelo de nuevo, o <a href=\"mailto: %s\">envíenos un correo electrónico</a>."
@@ -1156,12 +1132,6 @@ msgstr ""
msgid "Find latest local and national news"
msgstr ""
-#: templates/web/bromley/report/display.html:191
-#: templates/web/bromley/report/new/fill_in_details_form.html:113
-#: templates/web/bromley/report/new/fill_in_details_form.html:160
-msgid "First Name"
-msgstr "Nombre"
-
#: templates/web/default/questionnaire/index.html:79
#: templates/web/fixmystreet/questionnaire/index.html:73
msgid "First time"
@@ -1211,8 +1181,6 @@ msgstr ""
" council, pero sólo aparecerán en la carpeta \"Dentro del límite\" alerta \n"
" para la Diputación Provincial."
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:84
#: templates/web/default/admin/index.html:44
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:41
@@ -1237,7 +1205,7 @@ msgstr "Arreglado - Ayuntamiento"
msgid "Fixed - User"
msgstr "Arreglado - Usuario"
-#: templates/web/default/my/my.html:27 templates/web/fixmystreet/my/my.html:31
+#: templates/web/default/my/my.html:32 templates/web/fixmystreet/my/my.html:38
msgid "Fixed reports"
msgstr "Notificaciones arregladas"
@@ -1254,7 +1222,7 @@ msgstr ""
msgid "Flag user"
msgstr "Marca usuario"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1181
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1190
#: templates/web/default/admin/users.html:19
msgid "Flagged"
msgstr "Marcado"
@@ -1299,11 +1267,9 @@ msgstr ""
#: templates/web/emptyhomes/faq/faq-en-gb.html:1
#: templates/web/fiksgatami/faq/faq-nb.html:1
#: templates/web/fiksgatami/nn/faq/faq-nn.html:1
-#: templates/web/fixmindelo/faq/faq-pt-cv.html:1
#: templates/web/fixmybarangay/faq/faq-en-gb.html:1
#: templates/web/fixmystreet/faq/faq-en-gb.html:1
#: templates/web/fixmystreet/static/privacy.html:1
-#: templates/web/oxfordshire/faq/faq-en-gb.html:1
msgid "Frequently Asked Questions"
msgstr "Preguntas frecuentes"
@@ -1311,19 +1277,18 @@ msgstr "Preguntas frecuentes"
msgid "GeoRSS on Google Maps"
msgstr "GeoRSS en Google Maps"
-#: templates/web/bromley/report/display.html:30
#: templates/web/fixmystreet/around/_updates.html:3
#: templates/web/fixmystreet/report/display.html:38
msgid "Get updates"
msgstr "Recibe actualizaciones"
-#: templates/web/fixmystreet/reports/_rss.html:3
+#: templates/web/fixmystreet/reports/_rss.html:4
#: templates/web/fixmystreet/reports/_rss.html:9
msgid "Get updates of %s problems"
msgstr "Recibe actualizaciones de %s problemas"
#: templates/web/fixmystreet/reports/_rss.html:11
-#: templates/web/fixmystreet/reports/_rss.html:3
+#: templates/web/fixmystreet/reports/_rss.html:4
msgid "Get updates of problems in this %s"
msgstr "Recibe actualizaciones de los problemas en este %s"
@@ -1336,7 +1301,6 @@ msgstr "Dame un feed RSS"
#: templates/web/default/alert/index.html:34
#: templates/web/default/around/postcode_form.html:8
#: templates/web/fixmystreet/around/postcode_form.html:21
-#: templates/web/seesomething/around/postcode_form.html:10
#: templates/web/zurich/admin/stats.html:26
msgid "Go"
msgstr "Ir"
@@ -1363,19 +1327,12 @@ msgstr "¿Ha sido corregido este problema?"
msgid "Have you ever reported a problem to a council before, or is this your first time?"
msgstr "¿Alguna vez informó de un problema a un Ayuntamiento antes, o es tu primera vez?"
-#: templates/web/barnet/footer.html:24 templates/web/bromley/footer.html:25
-#: templates/web/bromley/header.html:81 templates/web/default/footer.html:15
+#: templates/web/default/footer.html:15
#: templates/web/emptyhomes/header.html:33
#: templates/web/fiksgatami/footer.html:9
#: templates/web/fiksgatami/nn/footer.html:9
-#: templates/web/fixmindelo/footer.html:45
#: templates/web/fixmybarangay/footer.html:24
-#: templates/web/fixmystreet/footer.html:52
-#: templates/web/oxfordshire/footer.html:27
-#: templates/web/oxfordshire/header.html:75
-#: templates/web/reading/footer.html:10
-#: templates/web/seesomething/footer.html:13
-#: templates/web/stevenage/footer.html:47
+#: templates/web/fixmystreet/footer.html:55
#: templates/web/zurich/faq/faq-de-ch.html:1
#: templates/web/zurich/footer.html:21
#: templates/web/zurich/nav_over_content.html:8
@@ -1387,13 +1344,9 @@ msgstr "Ayuda"
msgid "Here are the types of local problem alerts for &lsquo;%s&rsquo;."
msgstr "Estos son los tipos de alertas de problemas locales para '%s'."
-#: templates/web/barnet/header.html:70 templates/web/bromley/header.html:64
-#: templates/web/bromley/header.html:99
#: templates/web/fixmybarangay/header.html:66
-#: templates/web/fixmystreet/header.html:50
-#: templates/web/oxfordshire/header.html:111
-#: templates/web/oxfordshire/header.html:47
-#: templates/web/stevenage/header.html:97 templates/web/zurich/footer.html:11
+#: templates/web/fixmystreet/header.html:53
+#: templates/web/zurich/footer.html:11
msgid "Hi %s"
msgstr "Hola %s"
@@ -1401,8 +1354,8 @@ msgstr "Hola %s"
#: templates/web/default/admin/report_edit.html:50
#: templates/web/default/admin/report_edit.html:51
#: templates/web/default/admin/update_edit.html:28
-#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:11
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/report_edit.html:89
#: templates/web/zurich/admin/report_edit.html:93
#: templates/web/zurich/admin/stats.html:32
@@ -1423,7 +1376,6 @@ msgid "History"
msgstr "Historial"
#: templates/web/default/js/translation_strings.html:31
-#: templates/web/oxfordshire/js/translation_strings.html:25
msgid "Home"
msgstr ""
@@ -1432,7 +1384,6 @@ msgid "How to report a problem"
msgstr "Cómo notificar un problema"
#: templates/web/default/js/translation_strings.html:33
-#: templates/web/oxfordshire/js/translation_strings.html:27
msgid "How to send successful reports"
msgstr ""
@@ -1448,7 +1399,7 @@ msgstr "Me temo que no se ha podido localizar su problema en la base de datos.\n
msgid "I'm afraid we couldn't validate that token, as the report was made too long ago."
msgstr "Me temo que no ha podido verificar token, ya que el informe se hizo hace mucho tiempo."
-#: perllib/FixMyStreet/App/Controller/Tokens.pm:259
+#: perllib/FixMyStreet/App/Controller/Tokens.pm:260
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 "Me temo que no ha podido verificar token. Si ha copiado la URL de un correo electrónico, por favor compruebe que lo copió correctamente.\n"
@@ -1488,7 +1439,6 @@ msgstr ""
msgid "If you do not, your update will not be posted."
msgstr ""
-#: templates/web/default/report/new/councils_text_none.html:8
#: templates/web/default/report/new/councils_text_none.html:9
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 "Si envía un problema, el título y detalles serán públicos pero el problema <strong>no</ strong> se informará al Ayuntamiento."
@@ -1540,7 +1490,7 @@ msgid ""
" when they are shown on the site. Enter the ID (number) of that user."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Contact.pm:111
+#: perllib/FixMyStreet/App/Controller/Contact.pm:116
msgid "Illegal ID"
msgstr "ID ilegal"
@@ -1548,8 +1498,6 @@ msgstr "ID ilegal"
msgid "Illegal feed selection"
msgstr "Selección de feed ilegal"
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:82
#: templates/web/default/dashboard/index.html:142
#: templates/web/default/dashboard/index.html:144
#: templates/web/default/report/update-form.html:30
@@ -1560,29 +1508,24 @@ msgid "In Progress"
msgstr "En Progreso"
#: templates/web/default/admin/flagged.html:39
-#, fuzzy
msgid "In abuse table?"
-msgstr "(Correo electrónico en el cuadro abuso)"
+msgstr ""
#: templates/web/default/open311/index.html:90
msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
msgstr "Además, los siguientes atributos que no forman parte de la especificación Open311 v2 son devueltos: agency_sent_datetime, título (también se devuelve como parte de la descripción), interface_used, comment_count, requestor_name (sólo presente si solicitante permitió que el nombre que se mostrará en el sitio)."
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:121
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:143
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:38
#: templates/web/fixmystreet/report/banner.html:19
-#: templates/web/zurich/admin/header.html:1
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/header.html:8
#: templates/web/zurich/admin/report_edit.html:102
#: templates/web/zurich/report/banner.html:15
msgid "In progress"
msgstr "En Progreso"
-#: templates/web/seesomething/report/new/fill_in_details_form.html:38
-msgid "Incident Category"
-msgstr ""
-
#: templates/web/zurich/admin/report_edit.html:163
msgid "Include reporter personal details"
msgstr ""
@@ -1608,7 +1551,7 @@ msgstr ""
msgid "Invalid agency_responsible value %s"
msgstr "Valor inválido para agency_responsible %s"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1096
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1105
msgid "Invalid end date"
msgstr "Fecha de fin inválida"
@@ -1616,12 +1559,10 @@ msgstr "Fecha de fin inválida"
msgid "Invalid format %s specified."
msgstr "Formato no válido %s especificado."
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1092
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1101
msgid "Invalid start date"
msgstr "Fecha de inicio no válida"
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:81
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:37
#: templates/web/default/dashboard/index.html:142
@@ -1633,30 +1574,25 @@ msgstr "Fecha de inicio no válida"
msgid "Investigating"
msgstr "Investigando"
-#: templates/web/emptyhomes/tokens/confirm_problem.html:12
+#: templates/web/emptyhomes/tokens/confirm_problem.html:13
#: templates/web/emptyhomes/tokens/confirm_problem.html:14
msgid "It is worth noting however that the process can sometimes be slow, especially if the property is in very poor repair or the owner is unwilling to act. In most cases it can take six months or more before you can expect to see anything change and sometimes there may be considerable barries to a property being brought back into use. This doesn&rsquo;t mean the council isn&rsquo;t doing anything. We encourage councils to update the website so you can see what is happening. It may be a long process, but you reporting your concerns about this property to the council is a valuable first step."
msgstr "Cabe señalar sin embargo que el proceso puede ser lento, especialmente si la propiedad está en muy mal estado o el propietario no está dispuesto a actuar. En la mayoría de los casos puede tomar seis meses o más antes de que usted pueda ver cualquier cambio y a veces puede haber una propiedad comprada de nuevo para ser usada. Esto no significa que el Ayuntamiento no esté haciendo nada. Animamos a los Ayuntamientos a actualizar la web para que pueda ver lo que está sucediendo. Puede ser un proceso largo, pero notificar sus preocupaciones sobre esta propiedad al Ayuntamiento es un primer paso valioso."
-#: templates/web/bromley/report/display.html:168
-#: templates/web/bromley/report/new/fill_in_details_form.html:209
+#: templates/web/fixmystreet/contact/blurb.html:8
+msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there."
+msgstr ""
+
#: templates/web/default/auth/general.html:44
#: templates/web/default/report/new/fill_in_details_form.html:149
#: templates/web/default/report/update-form.html:104
#: templates/web/fixmystreet/auth/general.html:46
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:172
#: templates/web/fixmystreet/report/update-form.html:100
-#: templates/web/seesomething/auth/general.html:35
#: templates/web/zurich/auth/general.html:40
msgid "Keep me signed in on this computer"
msgstr "Recordar mi contraseña en este ordenador"
-#: templates/web/bromley/report/display.html:197
-#: templates/web/bromley/report/new/fill_in_details_form.html:119
-#: templates/web/bromley/report/new/fill_in_details_form.html:166
-msgid "Last Name"
-msgstr "Apellido"
-
#: templates/web/default/admin/body.html:58
#: templates/web/zurich/admin/body.html:15
msgid "Last editor"
@@ -1679,11 +1615,9 @@ msgstr ""
msgid "List all reported problems"
msgstr "Listar todos los problemas notificados"
-#: templates/web/bromley/report/new/fill_in_details_form.html:69
#: templates/web/default/report/new/fill_in_details_form.html:68
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:51
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:75
-#: templates/web/seesomething/report/new/fill_in_details_form.html:25
#: templates/web/zurich/report/new/fill_in_details_form.html:51
msgid "Loading..."
msgstr "Cargando..."
@@ -1692,7 +1626,7 @@ msgstr "Cargando..."
#: templates/web/default/alert/choose.html:3
#: templates/web/default/alert/index.html:1
#: templates/web/default/alert/index.html:3
-#: templates/web/default/alert/list.html:1
+#: templates/web/default/alert/list.html:2
#: templates/web/default/alert/list.html:5
#: templates/web/default/alert/updates.html:1
#: templates/web/default/tokens/confirm_alert.html:1
@@ -1705,23 +1639,17 @@ msgstr "Cargando..."
msgid "Local RSS feeds and email alerts"
msgstr "Feeds RSS locales y alertas por email"
-#: templates/web/default/alert/list.html:1
-#: templates/web/default/alert/list.html:12
+#: templates/web/default/alert/list.html:13
#: templates/web/default/alert/list.html:14
+#: templates/web/default/alert/list.html:2
#: templates/web/default/alert/list.html:3
msgid "Local RSS feeds and email alerts for ‘%s’"
msgstr "Feeds RSS locales y alertas por email para '%s'"
-#: templates/web/barnet/footer.html:22 templates/web/bromley/footer.html:23
-#: templates/web/bromley/header.html:79 templates/web/default/footer.html:13
-#: templates/web/fiksgatami/footer.html:8
+#: templates/web/default/footer.html:13 templates/web/fiksgatami/footer.html:8
#: templates/web/fiksgatami/nn/footer.html:8
-#: templates/web/fixmindelo/footer.html:43
#: templates/web/fixmybarangay/footer.html:22
-#: templates/web/fixmystreet/footer.html:50
-#: templates/web/oxfordshire/footer.html:25
-#: templates/web/oxfordshire/header.html:71
-#: templates/web/reading/footer.html:9 templates/web/stevenage/footer.html:45
+#: templates/web/fixmystreet/footer.html:53
msgid "Local alerts"
msgstr "Alertas locales"
@@ -1730,7 +1658,6 @@ msgid "Locate the problem on a map of the area"
msgstr "Busque el problema en un mapa de la zona"
#: templates/web/default/js/translation_strings.html:43
-#: templates/web/oxfordshire/js/translation_strings.html:37
msgid "MAP"
msgstr ""
@@ -1742,11 +1669,11 @@ msgstr "Mapa © <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\">OpenSt
msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
msgstr ""
-#: templates/web/fixmystreet/contact/index.html:98
+#: templates/web/fixmystreet/contact/index.html:103
msgid "Message"
msgstr "Mensaje:"
-#: templates/web/default/contact/index.html:90
+#: templates/web/default/contact/index.html:92
msgid "Message:"
msgstr "Mensaje:"
@@ -1788,10 +1715,6 @@ msgstr "Más problemas cercanos"
msgid "Name"
msgstr "Nombre"
-#: templates/web/seesomething/report/new/fill_in_details_form.html:74
-msgid "Name (optional)"
-msgstr ""
-
#: templates/web/default/admin/report_edit.html:66
#: templates/web/default/admin/update_edit.html:32
#: templates/web/default/admin/user-form.html:18
@@ -1801,30 +1724,30 @@ msgstr ""
msgid "Name:"
msgstr "Nombre:"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:317
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:322
msgid "Name: %s"
msgstr ""
#: templates/web/fiksgatami/footer.html:3
#: templates/web/fiksgatami/nn/footer.html:3
-#: templates/web/reading/footer.html:4
msgid "Navigation"
msgstr "Navegación"
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:188
#: perllib/FixMyStreet/Geocode/OSM.pm:166
msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
msgstr "Camino más cercano al pin colocado en el mapa (se genera automáticamente utilizando OpenStreetMap): %s%s"
-#: perllib/FixMyStreet/Cobrand/UK.pm:148
+#: perllib/FixMyStreet/Cobrand/UK.pm:142
msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
msgstr "Código postal más cercano al pin colocado en el mapa (generado automáticamente): %s (%sm de distancia)"
-#: perllib/FixMyStreet/Cobrand/Default.pm:418
-#: perllib/FixMyStreet/Cobrand/Default.pm:458
+#: perllib/FixMyStreet/Cobrand/Default.pm:421
+#: perllib/FixMyStreet/Cobrand/Default.pm:461
msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
msgstr "Camino más cercano al pin colocado en el mapa (generado automáticamente por Bing Maps): %s"
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:273
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:297
msgid ""
"Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
"\n"
@@ -1951,7 +1874,7 @@ msgstr "No"
#: templates/web/default/admin/user-form.html:33
msgid "No body"
-msgstr ""
+msgstr "Sin órgano"
#: templates/web/default/admin/stats.html:85
msgid "No council"
@@ -1966,14 +1889,12 @@ msgid "No edits have yet been made."
msgstr "No se han hecho ediciones aún-"
#: templates/web/default/admin/flagged.html:25
-#, fuzzy
msgid "No flagged problems found."
-msgstr "No se encontraron problemas marcados"
+msgstr ""
#: templates/web/default/admin/flagged.html:58
-#, fuzzy
msgid "No flagged users found."
-msgstr "No se encontraron usuarios marcados"
+msgstr ""
#: templates/web/zurich/admin/report_edit-sdm.html:68
msgid "No further updates"
@@ -1990,7 +1911,6 @@ msgid "No problems have been reported yet."
msgstr "No se han notificado problemas todavía."
#: templates/web/default/js/translation_strings.html:38
-#: templates/web/oxfordshire/js/translation_strings.html:32
msgid "No result returned"
msgstr ""
@@ -2001,7 +1921,7 @@ msgid ""
" your config file is not pointing to a live MapIt service."
msgstr ""
-#: templates/web/default/report/_support.html:2
+#: templates/web/default/report/_support.html:3
#: templates/web/default/report/_support.html:4
msgid "No supporters"
msgstr "No hay seguidores"
@@ -2025,8 +1945,6 @@ msgid ""
" activity across their body), the ability to hide reports or set special report statuses."
msgstr ""
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:83
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:46
#: templates/web/default/report/update-form.html:30
@@ -2085,7 +2003,6 @@ msgid "Now to submit your update&hellip; do you have a FixMyStreet password?"
msgstr "Y ahora a enviar tu actualización ... no tienes contraseña en FixMyStreet?"
#: templates/web/default/js/translation_strings.html:42
-#: templates/web/oxfordshire/js/translation_strings.html:36
msgid "OK"
msgstr ""
@@ -2129,8 +2046,7 @@ msgstr "Antiguo arreglado"
msgid "Older problems"
msgstr "Problemas antiguos"
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:115
-#: templates/web/bromley/report/display.html:80
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:137
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:36
#: templates/web/default/admin/report_edit.html:37
@@ -2138,7 +2054,7 @@ msgstr "Problemas antiguos"
#: templates/web/default/dashboard/index.html:142
#: templates/web/default/report/update-form.html:30
#: templates/web/fixmystreet/report/update-form.html:28
-#: templates/web/zurich/admin/header.html:1
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/header.html:7
#: templates/web/zurich/admin/report_edit.html:89
#: templates/web/zurich/admin/report_edit.html:91
@@ -2147,7 +2063,7 @@ msgstr "Problemas antiguos"
msgid "Open"
msgstr "Abierto"
-#: templates/web/default/my/my.html:22 templates/web/fixmystreet/my/my.html:26
+#: templates/web/default/my/my.html:27 templates/web/fixmystreet/my/my.html:33
msgid "Open reports"
msgstr "Notificaciones abiertas"
@@ -2173,15 +2089,15 @@ msgstr "O problemas notificados a:"
msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
msgstr "O puede suscribirse a una alerta basada en el barrio o Ayuntamiento en el que estás:"
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1053
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:664
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:665
-#: perllib/FixMyStreet/DB/Result/Problem.pm:544
-#: perllib/FixMyStreet/DB/Result/Problem.pm:554
-#: perllib/FixMyStreet/DB/Result/Problem.pm:564
-#: perllib/FixMyStreet/DB/Result/Problem.pm:576
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:361
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1057
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:662
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:663
+#: perllib/FixMyStreet/DB/Result/Problem.pm:546
+#: perllib/FixMyStreet/DB/Result/Problem.pm:556
+#: perllib/FixMyStreet/DB/Result/Problem.pm:566
+#: perllib/FixMyStreet/DB/Result/Problem.pm:578
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:369
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:384
msgid "Other"
msgstr "Otros"
@@ -2208,8 +2124,6 @@ msgstr ""
msgid "Partial"
msgstr "Parcial"
-#: templates/web/bromley/report/display.html:147
-#: templates/web/bromley/report/new/fill_in_details_form.html:186
#: templates/web/fixmystreet/auth/general.html:59
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:208
#: templates/web/fixmystreet/report/update-form.html:119
@@ -2227,19 +2141,15 @@ msgid "Permalink"
msgstr ""
#: templates/web/zurich/report/new/fill_in_details_form.html:106
-#, fuzzy
msgid "Phone number"
-msgstr "Su número de teléfono"
+msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:136
-#: templates/web/bromley/report/new/fill_in_details_form.html:183
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:138
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:205
-#: templates/web/seesomething/report/new/fill_in_details_form.html:89
msgid "Phone number (optional)"
msgstr "Número de teléfono (opcional)"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:282
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:287
#: templates/web/default/admin/report_edit.html:68
#: templates/web/default/report/new/fill_in_details_form.html:215
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:138
@@ -2249,11 +2159,8 @@ msgstr "Número de teléfono (opcional)"
msgid "Phone:"
msgstr "Teléfono:"
-#: templates/web/bromley/report/display.html:111
-#: templates/web/bromley/report/new/fill_in_details_form.html:104
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:92
#: templates/web/fixmystreet/report/update-form.html:59
-#: templates/web/seesomething/report/new/fill_in_details_form.html:52
#: templates/web/zurich/admin/index-dm.html:29
#: templates/web/zurich/admin/index-sdm.html:24
#: templates/web/zurich/admin/reports.html:16
@@ -2275,7 +2182,6 @@ msgid "Photos of recent nearby reports"
msgstr "Fotos notificaciones cercanas recientes"
#: templates/web/default/js/translation_strings.html:30
-#: templates/web/oxfordshire/js/translation_strings.html:24
msgid "Place pin on map"
msgstr ""
@@ -2283,7 +2189,7 @@ msgstr ""
#: templates/web/default/admin/report_edit.html:38
#: templates/web/default/dashboard/index.html:142
#: templates/web/default/dashboard/index.html:143
-#: templates/web/zurich/admin/header.html:1
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/header.html:9
#: templates/web/zurich/admin/index-dm.html:9
#: templates/web/zurich/admin/report_edit.html:89
@@ -2297,7 +2203,6 @@ msgstr "Por favor, <a class=\"tab_link\" href=\"#report\"> eche un vistazo</a> a
#: templates/web/default/report/new/notes.html:6
#: templates/web/fixmystreet/report/new/notes.html:6
-#: templates/web/oxfordshire/report/new/notes.html:5
msgid "Please be polite, concise and to the point."
msgstr "Por favor, sea cortés, conciso y vaya al grano."
@@ -2314,20 +2219,16 @@ msgstr "Por favor, consulte su email"
#: templates/web/default/auth/general.html:8
#: templates/web/fixmystreet/auth/general.html:15
#: templates/web/fixmystreet/auth/general.html:9
-#: templates/web/seesomething/auth/general.html:15
-#: templates/web/seesomething/auth/general.html:9
#: templates/web/zurich/auth/general.html:3
#: templates/web/zurich/auth/general.html:9
msgid "Please check your email address is correct"
msgstr "Por favor, compruebe que su dirección de email es correcta"
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:848
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:855
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:874
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:917
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:859
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:878
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:921
#: perllib/FixMyStreet/DB/Result/Problem.pm:381
#: templates/web/default/js/translation_strings.html:9
-#: templates/web/oxfordshire/js/translation_strings.html:9
msgid "Please choose a category"
msgstr "Por favor, elija una categoría"
@@ -2335,19 +2236,8 @@ msgstr "Por favor, elija una categoría"
msgid "Please choose a property type"
msgstr "Por favor, elija un tipo de propiedad"
-#: templates/web/seesomething/js/translation_strings.html:6
-msgid "Please choose a transport category"
-msgstr ""
-
-#: templates/web/seesomething/js/translation_strings.html:7
-msgid "Please choose an incident category"
-msgstr ""
-
-#: templates/web/bromley/report/new/fill_in_details_form.html:64
-msgid "Please describe the exact location of the report. Example: “2 dumped mattresses outside Number 19 Stockwell Close”"
-msgstr "Por favor, describa la ubicación exacta de la notificación. Ejemplo: \"2 colchones vertidos en la calle en el número 19 de la Calle Bellavista\""
-
#: templates/web/default/contact/blurb.html:2
+#: templates/web/fixmystreet/contact/blurb.html:12
msgid ""
"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"
@@ -2359,7 +2249,6 @@ msgstr ""
#: templates/web/default/report/new/notes.html:7
#: templates/web/fixmystreet/report/new/notes.html:7
-#: templates/web/oxfordshire/report/new/notes.html:6
msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the service for all users."
msgstr ""
@@ -2369,7 +2258,6 @@ msgstr ""
#: perllib/FixMyStreet/DB/Result/Comment.pm:126
#: templates/web/default/js/translation_strings.html:2
-#: templates/web/oxfordshire/js/translation_strings.html:2
msgid "Please enter a message"
msgstr "Por favor, rellene un mensaje."
@@ -2382,19 +2270,14 @@ msgstr "Por favor, introduzca una contraseña"
#: perllib/FixMyStreet/App/Controller/Contact.pm:97
#: perllib/FixMyStreet/DB/Result/Problem.pm:356
#: templates/web/default/js/translation_strings.html:3
-#: templates/web/oxfordshire/js/translation_strings.html:3
msgid "Please enter a subject"
msgstr "Por favor, introduzca un título"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1032
-#: perllib/FixMyStreet/App/Controller/Admin.pm:979
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1041
+#: perllib/FixMyStreet/App/Controller/Admin.pm:988
#: perllib/FixMyStreet/DB/Result/User.pm:115
#: templates/web/default/js/translation_strings.html:12
#: templates/web/default/js/translation_strings.html:16
-#: templates/web/oxfordshire/js/translation_strings.html:12
-#: templates/web/oxfordshire/js/translation_strings.html:16
-#: templates/web/seesomething/js/translation_strings.html:10
-#: templates/web/seesomething/js/translation_strings.html:13
msgid "Please enter a valid email"
msgstr "Por favor, introduce una dirección de email válida"
@@ -2405,8 +2288,6 @@ msgstr "Por favor, introduzca una dirección válida de email"
#: perllib/FixMyStreet/DB/Result/Problem.pm:359
#: templates/web/default/js/translation_strings.html:4
-#: templates/web/oxfordshire/js/translation_strings.html:4
-#: templates/web/seesomething/js/translation_strings.html:2
msgid "Please enter some details"
msgstr "Por favor, introduzca algunos detalles"
@@ -2418,32 +2299,22 @@ msgstr "Por favor, introduzca algunos detalles"
#: templates/web/default/js/translation_strings.html:15
#: templates/web/fixmystreet/auth/general.html:14
#: templates/web/fixmystreet/auth/general.html:9
-#: templates/web/oxfordshire/js/translation_strings.html:11
-#: templates/web/oxfordshire/js/translation_strings.html:15
-#: templates/web/seesomething/auth/general.html:14
-#: templates/web/seesomething/auth/general.html:9
-#: templates/web/seesomething/js/translation_strings.html:9
#: templates/web/zurich/auth/general.html:3
#: templates/web/zurich/auth/general.html:8
msgid "Please enter your email"
msgstr "Por favor, introduzca su dirección de email"
-#: templates/web/bromley/report/new/fill_in_details_form.html:149
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:151
-#: templates/web/seesomething/report/new/fill_in_details_form.html:85
#: templates/web/zurich/report/new/fill_in_details_form.html:92
msgid "Please enter your email address"
msgstr "Email"
#: templates/web/default/js/translation_strings.html:25
-#: templates/web/oxfordshire/js/translation_strings.html:19
msgid "Please enter your first name"
msgstr "Por favor, indica tu nombre."
#: perllib/FixMyStreet/DB/Result/Problem.pm:374
#: templates/web/default/js/translation_strings.html:7
-#: templates/web/oxfordshire/js/translation_strings.html:7
-#: templates/web/seesomething/js/translation_strings.html:4
msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
msgstr "Por favor escriba su nombre completo, los Ayuntamientos necesitan esta información - si usted no desea que su nombre aparecerá en la página, desactive la casilla de abajo"
@@ -2452,22 +2323,18 @@ msgstr "Por favor escriba su nombre completo, los Ayuntamientos necesitan esta i
#: perllib/FixMyStreet/DB/Result/Problem.pm:367
#: perllib/FixMyStreet/DB/Result/User.pm:108
#: templates/web/default/js/translation_strings.html:6
-#: templates/web/oxfordshire/js/translation_strings.html:6
msgid "Please enter your name"
msgstr "Por favor, introduzca su nombre"
#: templates/web/default/js/translation_strings.html:22
-#, fuzzy
msgid "Please enter your phone number"
-msgstr "Introduzca su segundo nombre"
+msgstr ""
#: templates/web/default/js/translation_strings.html:26
-#: templates/web/oxfordshire/js/translation_strings.html:20
msgid "Please enter your second name"
msgstr "Introduzca su segundo nombre"
#: templates/web/default/js/translation_strings.html:24
-#: templates/web/oxfordshire/js/translation_strings.html:18
msgid "Please enter your title"
msgstr "Por favor, introduzca su título"
@@ -2492,16 +2359,16 @@ msgstr ""
"y al grano; al escribir su mensaje en mayúsculas hace que sea difícil\n"
" su lectura, al igual que la falta de puntuación correcta."
-#: templates/web/default/report/new/fill_in_details_text.html:1
#: templates/web/default/report/new/fill_in_details_text.html:11
-#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1
+#: templates/web/default/report/new/fill_in_details_text.html:2
#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:10
-#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:2
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:2
#: templates/web/fixmystreet/report/new/fill_in_details_text.html:8
msgid "Please fill in details of the problem below."
msgstr "Por favor, rellene los datos del siguiente problema."
-#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:2
#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:3
msgid ""
"Please fill in details of the problem below. Leave as much detail as you can, \n"
@@ -2509,7 +2376,7 @@ msgid ""
"the problem (e.g. if there is a streetlight number or road name)."
msgstr ""
-#: templates/web/default/report/new/fill_in_details_text.html:1
+#: templates/web/default/report/new/fill_in_details_text.html:2
#: templates/web/default/report/new/fill_in_details_text.html:3
msgid ""
"Please fill in details of the problem below. The council won't be able\n"
@@ -2523,12 +2390,10 @@ msgstr ""
"foto del problema, si tuviera una), etc."
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:70
-#: templates/web/seesomething/report/new/fill_in_details_form.html:20
#: templates/web/zurich/report/new/fill_in_details_form.html:46
msgid "Please fill in details of the problem."
msgstr "Por favor, rellene los datos del problema."
-#: templates/web/bromley/report/new/fill_in_details_form.html:28
#: templates/web/default/report/new/fill_in_details_form.html:27
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:26
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:35
@@ -2540,7 +2405,7 @@ msgstr "Por favor, complete el siguiente formulario con los detalles del problem
msgid "Please indicate whether you'd like to receive another questionnaire"
msgstr "Por favor, indique si desea otro cuestionario"
-#: templates/web/fixmystreet/report/updates-sidebar-notes.html:3
+#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4
msgid "Please note that updates are not sent to the council."
msgstr "Tenga en cuenta que las actualizaciones no se envían al Ayuntamiento."
@@ -2548,11 +2413,6 @@ msgstr "Tenga en cuenta que las actualizaciones no se envían al Ayuntamiento."
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 "Tenga en cuenta que las actualizaciones no se envían al Ayuntamiento. Si usted deja su nombre será público. Su información sólo será usada de acuerdo con nuestra <a href=\"/faq#privacy\">política de privacidad</ a>"
-#: templates/web/barnet/report/updates-sidebar-notes.html:1
-msgid "Please note that updates are not sent to the relevant department. 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 "Tenga en cuenta que las actualizaciones no se envían al departamento pertinente. Si usted deja su nombre será público. Su información sólo será usada de acuerdo con nuestra <a href=\"/faq#privacy\">política de privacidad</ a>"
-
-#: templates/web/bromley/report/new/fill_in_details_form.html:23
#: templates/web/default/report/new/fill_in_details_form.html:5
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:5
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:26
@@ -2563,7 +2423,6 @@ msgstr "Por favor, tenga en cuenta la notificación <strong>no ha sido enviada a
#: templates/web/default/report/new/notes.html:1
#: templates/web/fixmybarangay/report/new/notes.html:1
#: templates/web/fixmystreet/report/new/notes.html:1
-#: templates/web/oxfordshire/report/new/notes.html:1
msgid "Please note:"
msgstr "Por favor, tenga en cuenta:"
@@ -2608,19 +2467,15 @@ msgstr "Por favor, suba una imagen JPEG\n"
msgid "Please write a message"
msgstr "Por favor, escriba un mensaje"
-#: templates/web/bromley/report/display.html:70
#: templates/web/fixmystreet/report/update-form.html:23
msgid "Please write your update here"
msgstr "Por favor, escriba su actualización aquí"
-#: templates/web/bromley/report/display.html:123
-#: templates/web/bromley/report/display.html:151
-#: templates/web/bromley/report/display.html:163
-#: templates/web/default/contact/index.html:93
+#: templates/web/default/contact/index.html:95
#: templates/web/default/report/update-form.html:109
#: templates/web/default/report/update-form.html:131
#: templates/web/default/report/update-form.html:72
-#: templates/web/fixmystreet/contact/index.html:105
+#: templates/web/fixmystreet/contact/index.html:110
#: templates/web/fixmystreet/report/update-form.html:123
#: templates/web/fixmystreet/report/update-form.html:71
#: templates/web/fixmystreet/report/update-form.html:95
@@ -2653,7 +2508,7 @@ msgstr ""
msgid "Private information (not shown on site)"
msgstr ""
-#: templates/web/default/maps/openlayers.html:85
+#: templates/web/default/maps/openlayers.html:86
msgid "Problem"
msgstr "Problema"
@@ -2674,7 +2529,7 @@ msgstr "Problema %s enviado al Ayuntamiento %s"
msgid "Problem breakdown by state"
msgstr "Desglose de problemas según estado"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:950
+#: perllib/FixMyStreet/App/Controller/Admin.pm:959
msgid "Problem marked as open."
msgstr "Problema marcado como abierto."
@@ -2690,7 +2545,6 @@ msgstr "Problemas"
msgid "Problems in this area"
msgstr "Problemas en este área"
-#: templates/web/bromley/report/display.html:31
#: templates/web/fixmystreet/around/tabbed_lists.html:4
#: templates/web/fixmystreet/report/display.html:46
msgid "Problems nearby"
@@ -2710,15 +2564,16 @@ msgstr "Problemas recientemente notificados como arreglados en FixMyStreet"
msgid "Problems within %.1fkm of this location"
msgstr "Problemas en %.1fkm alrededor"
-#: perllib/FixMyStreet/Cobrand/Default.pm:626
+#: perllib/FixMyStreet/Cobrand/Default.pm:629
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:109
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155
-#: perllib/FixMyStreet/Cobrand/UK.pm:228
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:184
+#: perllib/FixMyStreet/Cobrand/UK.pm:222
msgid "Problems within %s"
msgstr "Problemas en %s"
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117
-#: perllib/FixMyStreet/Cobrand/UK.pm:242
+#: perllib/FixMyStreet/Cobrand/UK.pm:236
msgid "Problems within %s ward"
msgstr "Problemas en el barrio %s"
@@ -2746,12 +2601,10 @@ msgstr ""
msgid "Property type:"
msgstr "Tipo de propiedad:"
-#: templates/web/bromley/report/new/fill_in_details_form.html:52
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:64
msgid "Provide a title"
msgstr "Proporcionar un título"
-#: templates/web/bromley/report/display.html:57
#: templates/web/default/report/update-form.html:3
#: templates/web/fixmystreet/report/update-form.html:4
msgid "Provide an update"
@@ -2761,11 +2614,6 @@ msgstr "Proporcionar una actualización"
msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:180
-msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
-msgstr "Proporcionar una contraseña es opcional, pero al hacerlo le permitirá informar más fácilmente problemas en el futuro, dejar actualizaciones y administrar sus notificaciones."
-
-#: templates/web/bromley/report/display.html:144
#: templates/web/default/report/new/fill_in_details_form.html:173
#: templates/web/default/report/update-form.html:128
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:202
@@ -2796,7 +2644,6 @@ msgstr ""
msgid "Publish the response"
msgstr ""
-#: templates/web/default/questionnaire/completed.html:1
#: templates/web/default/questionnaire/completed.html:2
#: templates/web/default/questionnaire/index.html:0
#: templates/web/default/questionnaire/index.html:14
@@ -2820,9 +2667,7 @@ msgstr "Cuestionario %d enviado para el problema %d"
msgid "Questionnaire filled in by problem reporter"
msgstr "Cuestionario cumplimentado por el notificador problema"
-#: templates/web/bromley/report/display.html:37
#: templates/web/default/alert/_list.html:21
-#: templates/web/default/around/display_location.html:1
#: templates/web/default/around/display_location.html:3
#: templates/web/default/report/display.html:46
#: templates/web/default/reports/_rss.html:1
@@ -2832,11 +2677,11 @@ msgstr "Cuestionario cumplimentado por el notificador problema"
msgid "RSS feed"
msgstr "Feed RSS"
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:265 perllib/FixMyStreet/Cobrand/UK.pm:277
msgid "RSS feed for %s"
msgstr "Feed RSS para %s"
-#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289
+#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
msgid "RSS feed for %s ward, %s"
msgstr "Feed RSS para %s del barrio, %s"
@@ -2844,11 +2689,15 @@ msgstr "Feed RSS para %s del barrio, %s"
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:189
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:197
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:309
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:200
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:208
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:218
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:226
+#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303
msgid "RSS feed of %s"
msgstr "Feed RSS para %s"
-#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:314
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:308
msgid "RSS feed of %s, within %s ward"
msgstr "Feed RSS para %s, en el barrio %s"
@@ -2861,31 +2710,30 @@ msgstr "Feed RSS de los problemas más cercanos"
msgid "RSS feed of problems in this %s"
msgstr "Feed RSS de los problemas en este %s"
-#: perllib/FixMyStreet/Cobrand/Default.pm:627
+#: perllib/FixMyStreet/Cobrand/Default.pm:630
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:110
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:154
-#: perllib/FixMyStreet/Cobrand/UK.pm:235
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:183
+#: perllib/FixMyStreet/Cobrand/UK.pm:229
msgid "RSS feed of problems within %s"
msgstr "Feed RSS de los problemas dentro de %s"
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:116
-#: perllib/FixMyStreet/Cobrand/UK.pm:241
+#: perllib/FixMyStreet/Cobrand/UK.pm:235
msgid "RSS feed of problems within %s ward"
msgstr "Feed RSS feed de los problemas dentro del barrio %s"
-#: templates/web/default/around/display_location.html:1
+#: templates/web/default/around/display_location.html:3
#: templates/web/default/around/display_location.html:4
msgid "RSS feed of recent local problems"
msgstr "Feed RSS de los problemas locales más recientes"
-#: templates/web/bromley/report/display.html:37
#: templates/web/default/report/display.html:46
#: templates/web/fixmystreet/alert/updates.html:9
#: templates/web/fixmystreet/report/display.html:61
msgid "RSS feed of updates to this problem"
msgstr "Feed RSS de actualizaciones sobre este problema"
-#: templates/web/bromley/report/display.html:39
#: templates/web/default/alert/updates.html:9
#: templates/web/default/report/display.html:37
#: templates/web/fixmystreet/alert/updates.html:14
@@ -2909,7 +2757,7 @@ msgid "Recently fixed"
msgstr "Recientemente arreglado"
#: templates/web/default/index.html:35 templates/web/emptyhomes/index.html:24
-#: templates/web/fixmystreet/index.html:45
+#: templates/web/fixmystreet/index.html:49
msgid "Recently reported problems"
msgstr "Problemas recientemente notificados"
@@ -2926,8 +2774,8 @@ msgstr ""
msgid "Remove flag"
msgstr "Eliminar Marca"
-#: templates/web/default/admin/report_edit.html:89
-#: templates/web/default/admin/update_edit.html:57
+#: templates/web/default/admin/report_edit.html:94
+#: templates/web/default/admin/update_edit.html:62
#: templates/web/zurich/admin/update_edit.html:35
msgid "Remove photo (can't be undone!)"
msgstr "Quitar foto (¡no se puede deshacer!)"
@@ -2936,29 +2784,21 @@ msgstr "Quitar foto (¡no se puede deshacer!)"
msgid "Report Empty Homes"
msgstr "Notificar viviendas vacías"
-#: templates/web/barnet/footer.html:16 templates/web/bromley/footer.html:17
#: templates/web/default/footer.html:7 templates/web/emptyhomes/header.html:31
#: templates/web/fiksgatami/footer.html:5
#: templates/web/fiksgatami/nn/footer.html:5
-#: templates/web/fixmindelo/footer.html:37
-#: templates/web/fixmystreet/footer.html:44
-#: templates/web/oxfordshire/footer.html:19
-#: templates/web/reading/footer.html:6
-#: templates/web/seesomething/footer.html:11
-#: templates/web/stevenage/footer.html:39 templates/web/zurich/footer.html:17
+#: templates/web/fixmystreet/footer.html:47
+#: templates/web/zurich/footer.html:17
#: templates/web/zurich/nav_over_content.html:4
msgid "Report a problem"
msgstr "Notificar un problema"
-#: templates/web/bromley/report/display.html:28
#: templates/web/fixmystreet/report/display.html:35
msgid "Report abuse"
msgstr "Denunciar abuso"
#: templates/web/default/report_created.html:1
#: templates/web/default/report_created.html:3
-#: templates/web/seesomething/report_created.html:0
-#: templates/web/seesomething/report_created.html:8
msgid "Report created"
msgstr ""
@@ -2968,22 +2808,21 @@ msgstr "Notificar sobre %s"
#: templates/web/default/index.html:14 templates/web/emptyhomes/index.html:5
#: templates/web/fixmystreet/around/intro.html:1
-#: templates/web/stevenage/around/intro.html:1
#: templates/web/zurich/around/intro.html:1
msgid "Report, view, or discuss local problems"
msgstr "Notifique, vea o discuta problemas locales"
-#: templates/web/default/my/my.html:74
+#: templates/web/default/my/my.html:79
msgid "Reported %s"
msgstr "Notificado %s"
-#: templates/web/default/my/my.html:72
+#: templates/web/default/my/my.html:77
msgid "Reported %s, to %s"
msgstr "Notificados %s, a %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:559
+#: perllib/FixMyStreet/DB/Result/Problem.pm:561
#: templates/web/default/contact/index.html:45
-#: templates/web/fixmystreet/contact/index.html:58
+#: templates/web/fixmystreet/contact/index.html:62
msgid "Reported anonymously at %s"
msgstr "Notificado anónimamente en %s"
@@ -2993,9 +2832,9 @@ msgstr "Notificado anónimamente en %s"
msgid "Reported before"
msgstr "Notificado con anterioridad"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:582
+#: perllib/FixMyStreet/DB/Result/Problem.pm:584
#: templates/web/default/contact/index.html:47
-#: templates/web/fixmystreet/contact/index.html:60
+#: templates/web/fixmystreet/contact/index.html:64
msgid "Reported by %s at %s"
msgstr "Notificado por %s en %s"
@@ -3003,27 +2842,27 @@ msgstr "Notificado por %s en %s"
msgid "Reported in the %s category"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:555
+#: perllib/FixMyStreet/DB/Result/Problem.pm:557
msgid "Reported in the %s category anonymously at %s"
msgstr "Notificado anonimamente en la categoría %s en %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:577
+#: perllib/FixMyStreet/DB/Result/Problem.pm:579
msgid "Reported in the %s category by %s at %s"
msgstr "Notificado en la categoría %s por %s en %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:551
+#: perllib/FixMyStreet/DB/Result/Problem.pm:553
msgid "Reported via %s anonymously at %s"
msgstr "Notificado por %s de forma anónima en %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:573
+#: perllib/FixMyStreet/DB/Result/Problem.pm:575
msgid "Reported via %s by %s at %s"
msgstr "Notificado por %s por %s en %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:547
+#: perllib/FixMyStreet/DB/Result/Problem.pm:549
msgid "Reported via %s in the %s category anonymously at %s"
msgstr "Notificado anonimamente por %s en la categoría %s en %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:567
+#: perllib/FixMyStreet/DB/Result/Problem.pm:569
msgid "Reported via %s in the %s category by %s at %s"
msgstr "Notificado por %s en la categoría %s por %s en %s"
@@ -3037,22 +2876,18 @@ msgstr "Notificado por %s en la categoría %s por %s en %s"
#: templates/web/fixmystreet/report/new/fill_in_details.html:0
#: templates/web/fixmystreet/report/new/fill_in_details.html:5
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2
-#: templates/web/oxfordshire/js/translation_strings.html:35
-#: templates/web/seesomething/around/around_index.html:1
-#: templates/web/seesomething/report/new/fill_in_details_form.html:3
#: templates/web/zurich/report/new/fill_in_details_form.html:2
msgid "Reporting a problem"
msgstr "Notificar un problema"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1177
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:242
-#: templates/web/seesomething/admin/stats.html:1
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1186
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:290
#: templates/web/zurich/header.html:60
msgid "Reports"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:393
-#: perllib/FixMyStreet/DB/Result/Problem.pm:397
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
+#: perllib/FixMyStreet/DB/Result/Problem.pm:399
msgid "Reports are limited to %s characters in length. Please shorten your report"
msgstr ""
@@ -3073,27 +2908,28 @@ msgid "Resend report"
msgstr "Vuelva a enviar la notificación"
#: templates/web/default/js/translation_strings.html:28
-#: templates/web/oxfordshire/js/translation_strings.html:22
msgid "Right place?"
msgstr ""
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:195
#: perllib/FixMyStreet/Geocode/OSM.pm:173
msgid "Road operator for this named road (derived from road reference number and type): %s"
msgstr "Operador de camino operador para este camino (derivado del número de referencia y tipo del camino): %s"
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:192
#: perllib/FixMyStreet/Geocode/OSM.pm:170
msgid "Road operator for this named road (from OpenStreetMap): %s"
msgstr "Operador de ruta para esta ruta con nombre (de OpenStreetMap): %s"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1377
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1388
-#: templates/web/default/admin/report_edit.html:85
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1386
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1397
+#: templates/web/default/admin/report_edit.html:90
#: templates/web/zurich/admin/report_edit.html:76
msgid "Rotate Left"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1377
-#: templates/web/default/admin/report_edit.html:86
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1386
+#: templates/web/default/admin/report_edit.html:91
#: templates/web/zurich/admin/report_edit.html:77
msgid "Rotate Right"
msgstr ""
@@ -3122,9 +2958,8 @@ msgid "Search:"
msgstr "Buscar:"
#: templates/web/default/admin/reports.html:26
-#, fuzzy
msgid "Searching found no reports."
-msgstr "Buscar Notificaciones"
+msgstr ""
#: templates/web/default/admin/users.html:39
msgid "Searching found no users."
@@ -3133,7 +2968,7 @@ msgstr ""
#: templates/web/default/admin/body-form.html:33
#: templates/web/zurich/admin/body-form.html:16
msgid "Select a body"
-msgstr ""
+msgstr "Selecciona un órgano"
#: templates/web/default/admin/body-form.html:71
#: templates/web/zurich/admin/body-form.html:26
@@ -3145,7 +2980,7 @@ msgstr ""
msgid "Select which type of alert you'd like and click the button for an RSS feed, or enter your email address to subscribe to an email alert."
msgstr "Seleccione el tipo de alerta que desea y haga clic en el botón correspondiente a un feed RSS o introduzca su dirección de e-mail para suscribirse a alerta por correo electrónico."
-#: perllib/FixMyStreet/DB/Result/Problem.pm:664
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
msgid "Sent to %s %s later"
msgstr "Enviado a %s %s después"
@@ -3162,9 +2997,6 @@ msgstr "Servicio:"
msgid "Share"
msgstr ""
-#: templates/web/bromley/report/display.html:205
-#: templates/web/bromley/report/new/fill_in_details_form.html:129
-#: templates/web/bromley/report/new/fill_in_details_form.html:175
#: templates/web/default/report/new/fill_in_details_form.html:210
#: templates/web/default/report/update-form.html:157
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:129
@@ -3187,11 +3019,7 @@ msgstr "Mostrar pines"
#: templates/web/fixmystreet/auth/general.html:3
#: templates/web/fixmystreet/auth/general.html:42
#: templates/web/fixmystreet/auth/general.html:62
-#: templates/web/fixmystreet/header.html:54
-#: templates/web/oxfordshire/header.html:115
-#: templates/web/seesomething/auth/general.html:3
-#: templates/web/seesomething/auth/general.html:39
-#: templates/web/stevenage/header.html:101
+#: templates/web/fixmystreet/header.html:57
#: templates/web/zurich/auth/general.html:18
#: templates/web/zurich/auth/general.html:35
msgid "Sign in"
@@ -3203,20 +3031,15 @@ msgstr "Registrarse con email"
#: templates/web/default/auth/general.html:1
#: templates/web/fixmystreet/auth/general.html:1
-#: templates/web/seesomething/auth/general.html:1
#: templates/web/zurich/auth/general.html:1
msgid "Sign in or create an account"
msgstr "Entrar o crear una cuenta"
-#: templates/web/bromley/auth/sign_out.html:1
#: templates/web/default/auth/sign_out.html:1
#: templates/web/default/header.html:30
#: templates/web/emptyhomes/header.html:46
#: templates/web/fiksgatami/header.html:22
#: templates/web/fiksgatami/nn/header.html:22
-#: templates/web/lichfielddc/header.html:177
-#: templates/web/reading/header.html:33
-#: templates/web/seesomething/auth/sign_out.html:1
#: templates/web/zurich/auth/sign_out.html:1
msgid "Sign out"
msgstr "Salir"
@@ -3225,14 +3048,12 @@ msgstr "Salir"
#: templates/web/emptyhomes/header.html:45
#: templates/web/fiksgatami/header.html:21
#: templates/web/fiksgatami/nn/header.html:21
-#: templates/web/lichfielddc/header.html:177
-#: templates/web/reading/header.html:32
msgid "Signed in as %s"
msgstr "Conectado como %s"
-#: templates/web/default/report/new/fill_in_details_text.html:1
-#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1
-#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1
+#: templates/web/default/report/new/fill_in_details_text.html:2
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:2
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:2
msgid "Some categories may require additional information."
msgstr "Algunas categorías pueden requerir información adicional."
@@ -3263,6 +3084,8 @@ msgstr "Lo sentimos, hubo un error confirmando su problema."
#: perllib/FixMyStreet/App/Controller/Report/New.pm:215
#: perllib/FixMyStreet/Geocode.pm:28 perllib/FixMyStreet/Geocode/Bing.pm:58
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:75
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:95
#: perllib/FixMyStreet/Geocode/Google.pm:74
#: perllib/FixMyStreet/Geocode/OSM.pm:66
msgid "Sorry, we could not find that location."
@@ -3270,7 +3093,7 @@ msgstr "Lo sentimos, no hemos podido encontrar ese lugar."
#: perllib/FixMyStreet/Geocode/Bing.pm:53
#: perllib/FixMyStreet/Geocode/Google.pm:69
-#: perllib/FixMyStreet/Geocode/Zurich.pm:87
+#: perllib/FixMyStreet/Geocode/Zurich.pm:88
msgid "Sorry, we could not parse that location. Please try again."
msgstr "Lo sentimos, pero no pudo analizar esa ubicación. Por favor, inténtelo de nuevo."
@@ -3280,11 +3103,9 @@ msgid "Source code"
msgstr "Código fuente"
#: templates/web/default/admin/stats.html:64
-#, fuzzy
msgid "Start Date:"
-msgstr "Día de inicio:"
+msgstr ""
-#: templates/web/bromley/report/display.html:78
#: templates/web/default/admin/flagged.html:18
#: templates/web/default/admin/list_updates.html:11
#: templates/web/default/admin/reports.html:15
@@ -3301,8 +3122,8 @@ msgstr "Estado"
msgid "State:"
msgstr "Estado/Prov.:"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1182
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:257
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1191
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:305
#: templates/web/default/admin/stats.html:1
#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72
msgid "Stats"
@@ -3318,16 +3139,15 @@ msgstr ""
msgid "Still open, via questionnaire, %s"
msgstr "Sigue abierta, a través de cuestionario, %s"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:370
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378
msgid "Subcategory: %s"
msgstr ""
#: templates/web/zurich/admin/index-dm.html:27
msgid "Subdivision/Body"
-msgstr ""
+msgstr "Subdivisión/Órgano"
-#: templates/web/bromley/report/new/fill_in_details_form.html:48
-#: templates/web/fixmystreet/contact/index.html:91
+#: templates/web/fixmystreet/contact/index.html:95
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:60
msgid "Subject"
msgstr "Título:"
@@ -3340,9 +3160,6 @@ msgstr "Título:"
msgid "Subject:"
msgstr "Título:"
-#: templates/web/bromley/report/new/fill_in_details_form.html:140
-#: templates/web/bromley/report/new/fill_in_details_form.html:190
-#: templates/web/bromley/report/new/fill_in_details_form.html:204
#: templates/web/default/questionnaire/creator_fixed.html:19
#: templates/web/default/report/new/fill_in_details_form.html:114
#: templates/web/default/report/new/fill_in_details_form.html:154
@@ -3351,13 +3168,12 @@ msgstr "Título:"
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:142
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:167
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:212
-#: templates/web/seesomething/report/new/fill_in_details_form.html:93
#: templates/web/zurich/report/new/fill_in_details_form.html:114
msgid "Submit"
msgstr "Enviar"
-#: templates/web/default/admin/report_edit.html:92
-#: templates/web/default/admin/update_edit.html:60
+#: templates/web/default/admin/report_edit.html:97
+#: templates/web/default/admin/update_edit.html:65
#: templates/web/default/admin/user-form.html:55
#: templates/web/zurich/admin/report_edit-sdm.html:67
#: templates/web/zurich/admin/report_edit.html:224
@@ -3370,8 +3186,8 @@ msgstr "Enviar Cambios"
msgid "Submit questionnaire"
msgstr "Enviar cuestionario"
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:111
-#: templates/web/zurich/admin/header.html:1
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:133
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/header.html:6
#: templates/web/zurich/admin/index-dm.html:23
#: templates/web/zurich/admin/index-dm.html:6
@@ -3383,7 +3199,6 @@ msgstr "Enviar cuestionario"
msgid "Submitted"
msgstr ""
-#: templates/web/bromley/report/display.html:44
#: templates/web/default/alert/updates.html:17
#: templates/web/default/report/display.html:42
#: templates/web/fixmystreet/alert/updates.html:23
@@ -3401,8 +3216,8 @@ msgstr "Suscríbeme a alertas por email"
msgid "Subscribe to an alert based upon what baranagay you&rsquo;re in:"
msgstr "Suscríbeme a una alerta basada en la baranagay en la que estás:"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1175
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:241
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1184
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:289
#: templates/web/default/admin/index.html:1
#: templates/web/zurich/admin/index-dm.html:1
#: templates/web/zurich/admin/index-sdm.html:1
@@ -3421,7 +3236,7 @@ msgstr "Resumen"
msgid "Summary reports"
msgstr "Resumen de notificaciones"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1179
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1188
msgid "Survey"
msgstr ""
@@ -3444,17 +3259,15 @@ msgstr "Versión solo texto"
msgid "Text:"
msgstr "Texto:"
-#: templates/web/default/tokens/confirm_update.html:7
#: templates/web/default/tokens/confirm_update.html:8
msgid "Thank you &mdash; you can <a href=\"%s\">view your updated problem</a> on the site."
msgstr "Gracias - puede <a href=\"%s\">ver su problema actualizado</a> en el sitio web."
-#: templates/web/emptyhomes/tokens/confirm_problem.html:6
+#: templates/web/emptyhomes/tokens/confirm_problem.html:7
#: templates/web/emptyhomes/tokens/confirm_problem.html:8
msgid "Thank you for reporting an empty property on ReportEmptyHomes.com. We have emailed the lead officer for empty homes in the council responsible with details, and asked them to do whatever they can to get the empty property back into use as soon as possible."
msgstr "Gracias por informarnos de una propiedad vacía en ReportEmptyHomes.com. Hemos escrito a la oficina principal de viviendas vacías en el Ayuntamiento, responsable por los detalles, y les pedimos que hicieran todo lo posible para volver a poner la propiedad vacía en uso lo antes posible."
-#: templates/web/emptyhomes/tokens/confirm_problem.html:30
#: templates/web/emptyhomes/tokens/confirm_problem.html:31
msgid ""
"Thank you for reporting this empty property on ReportEmptyHomes.com.\n"
@@ -3471,7 +3284,7 @@ msgstr ""
msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it."
msgstr "Gracias por tratar de confirmar la actualización o problema. Parece que tenemos un error interno, así que <a href=\"%s\"> por favor, háganos saber lo que pasó </a> y echaremos un vistazo."
-#: templates/web/emptyhomes/tokens/confirm_problem.html:24
+#: templates/web/emptyhomes/tokens/confirm_problem.html:25
#: templates/web/emptyhomes/tokens/confirm_problem.html:26
msgid "Thank you for using ReportEmptyHomes.com. Your action is already helping to resolve the UK&rsquo;s empty homes crisis."
msgstr "Gracias por usar ReportEmptyHomes.com. Su acción ya está ayudando a resolver la crisis de viviendas vacías en UK."
@@ -3492,15 +3305,16 @@ msgstr "Gracias, me alegro de oír que fue arreglado! ¿Podríamos preguntar si
msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
msgstr "Esa imagen no parece que haya cargado correctamente (%s), por favor inténtelo de nuevo."
-#: perllib/FixMyStreet/App/Controller/Council.pm:90
+#: perllib/FixMyStreet/App/Controller/Council.pm:100
msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
msgstr "Esa localización no parece estar cubierta por un Ayuntamiento, tal vez esté en alta mar o fuera del país. Por favor, inténtelo de nuevo."
-#: perllib/FixMyStreet/App/Controller/Location.pm:123
+#: perllib/FixMyStreet/App/Controller/Location.pm:124
msgid "That location does not appear to be in the UK; please try again."
msgstr "Esa localización no parece ser de UK, por favor inténtelo de nuevo."
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:63
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:79
#: perllib/FixMyStreet/Cobrand/UK.pm:86
msgid "That postcode was not recognised, sorry."
msgstr "Ese código postal no fue reconocido, lo siento."
@@ -3522,6 +3336,8 @@ msgid ""
"The <strong>email address</strong> is the destination to which reports about this category will be sent. \n"
" Other categories for this body may have the same email address."
msgstr ""
+"El <strong>email</strong> es el destino al cual serán enviados los reportes en esta categoría.\n"
+"Otras categorías en este mismo órgano pueden tener el mismo email."
#: templates/web/default/admin/body-form.html:119
#: templates/web/default/admin/body-form.html:120
@@ -3560,7 +3376,7 @@ msgstr ""
msgid "The confirmation email <strong>may</strong> take a few minutes to arrive &mdash; <em>please</em> be patient."
msgstr "El email de confirmación <strong>puede</strong> tardar unos minutos en llegar - <em>por favor</em>, se paciente."
-#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:2
#: templates/web/fixmystreet/report/new/fill_in_details_text.html:3
msgid "The council won&rsquo;t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc."
msgstr ""
@@ -3587,6 +3403,7 @@ msgstr "El error fue: %s"
msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
msgstr "Los siguientes atributos Open311 v2 son devueltos para cada petición: service_request_id, descripción, lat, long, media_url, status, requested_datetime, updated_datetime, service_code y service_name."
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:187
#: perllib/FixMyStreet/Geocode/OSM.pm:165
msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
msgstr "La información siguiente sobre la carretera más cercana podría ser incorrecta o irrelevante si el problema se encuentra cerca de varias carreteras o cerca de una carretera sin nombre registrado en OpenStreetMap."
@@ -3645,7 +3462,7 @@ msgstr ""
msgid "The passwords do not match"
msgstr "Las contraseñas no coinciden."
-#: templates/web/default/errors/page_error_404_not_found.html:10
+#: templates/web/default/errors/page_error_404_not_found.html:11
#: templates/web/default/errors/page_error_404_not_found.html:12
msgid "The requested URL '%s' was not found on this server"
msgstr "La URL '%s' solicitada no fue encontrada en el servidor"
@@ -3655,16 +3472,14 @@ msgstr "La URL '%s' solicitada no fue encontrada en el servidor"
msgid "The simplest alert is our geographic one:"
msgstr "La alerta más sencilla es nuestra alerta geográfica:"
-#: templates/web/barnet/report/new/councils_text_all.html:3
#: templates/web/default/report/new/councils_extra_text.html:1
-#: templates/web/default/report/new/councils_text_some.html:10
#: templates/web/default/report/new/councils_text_some.html:11
#: templates/web/default/report/new/fill_in_details_form.html:17
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12
msgid "The subject and details of the problem will be public, plus your name if you give us permission."
msgstr "El título y detalles del problema serán públicos, además de su nombre, si nos da su permiso."
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:291
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:296
msgid "The user could not locate the problem on a map, but to see the area around the location they entered"
msgstr "El usuario no pudo situar el problema en el mapa, salvo para ver el área alrededor de la localización que introdujo."
@@ -3679,16 +3494,15 @@ msgstr ""
msgid "There was a problem showing the All Reports page. Please try again later."
msgstr "Hubo un problema mostrando la página de Todas las Notificaciones. Por favor, inténtelo de nuevo más tarde."
-#: perllib/FixMyStreet/App/Controller/Contact.pm:116
+#: perllib/FixMyStreet/App/Controller/Contact.pm:121
#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59
msgid "There was a problem showing this page. Please try again later."
msgstr "Hubo un problema mostrando esta página. Por favor, inténtelo de nuevo más tarde."
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:747
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:755
#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134
#: templates/web/default/auth/general.html:23
#: templates/web/fixmystreet/auth/general.html:24
-#: templates/web/seesomething/auth/general.html:24
#: templates/web/zurich/auth/general.html:28
msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the &lsquo;sign in by email&rsquo; section of the form."
msgstr "Hubo un problema con su email/contraseña. Si no recuerda, o no tiene, contraseña por favor rellene la sección 'registrarse con email' del formulario."
@@ -3701,7 +3515,7 @@ msgstr "Hubo un problema con su email/contraseña. Por favor, inténtelo de nuev
msgid "There was a problem with your update. Please try again."
msgstr "Hubo un problema con su actualización. Por favor, inténtelo de nuevo."
-#: perllib/FixMyStreet/App/Controller/Contact.pm:120
+#: perllib/FixMyStreet/App/Controller/Contact.pm:125
msgid "There were problems with your report. Please see below."
msgstr "Hubo problemas con su notificación. Por favor, vea más abajo."
@@ -3741,16 +3555,16 @@ msgid ""
" A body will not receive any reports unless it covers at least one area."
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:375
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:385
msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system."
msgstr "Este correo electrónico ha sido enviado a los dos Ayuntamientos que cubren la ubicación del problema, ya que el usuario no lo categorizar, por favor, hacer caso omiso de él si usted no es el consejo correcto para hacer frente al problema, o háganos saber qué clase de problema es por lo que podemos añadir a nuestro sistema."
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:388
msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue."
msgstr "Este correo electrónico ha sido enviado a varios consejos que cubren la ubicación del problema, como la categoría seleccionada se proporciona para todos ellos, por favor, hacer caso omiso de él si usted no es el consejo correcto para hacer frente a la cuestión."
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:894
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:964
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:898
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:968
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:131
#: perllib/FixMyStreet/Cobrand/UK.pm:58
msgid "This information is required"
@@ -3782,7 +3596,6 @@ msgstr ""
msgid "This problem has been closed"
msgstr "Este problema ha sido cerrado"
-#: templates/web/bromley/report/display.html:98
#: templates/web/default/report/banner.html:12
#: templates/web/default/report/update-form.html:48
#: templates/web/emptyhomes/report/banner.html:3
@@ -3790,7 +3603,6 @@ msgstr "Este problema ha sido cerrado"
msgid "This problem has been fixed"
msgstr "Este problema se ha arreglado"
-#: templates/web/bromley/report/display.html:92
#: templates/web/default/report/update-form.html:43
#: templates/web/fixmystreet/report/update-form.html:40
msgid "This problem has not been fixed"
@@ -3804,33 +3616,33 @@ msgstr "Este problema se encuentra en progreso"
msgid "This problem is old and of unknown status."
msgstr "Este problema es antiguo y de estatus desconocido."
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:108
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:109
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:130
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:131
#: templates/web/zurich/report/_main.html:14
msgid "This report is awaiting moderation."
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88
msgid "This report is currently marked as closed."
msgstr "Esta notificación está marcada como cerrada."
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86
msgid "This report is currently marked as fixed."
msgstr "Esta notificación está actualmente marcada como arreglada."
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:90
msgid "This report is currently marked as open."
msgstr "Esta notificación está marcada como abierta."
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:320
msgid "This report was submitted anonymously"
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:284
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:289
msgid "This web page also contains a photo of the problem, provided by the user."
msgstr "Esta página web también contiene una foto del problema, proporcionada por el usuario."
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1178
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1187
#: templates/web/default/admin/timeline.html:1
msgid "Timeline"
msgstr "Cronología"
@@ -3848,7 +3660,7 @@ msgstr "Para <strong>notificar de un problema</strong>, haz clic en el mapa en l
msgid "To find out what local alerts we have for you, please enter your postcode or street name and area"
msgstr "Para saber cuáles son las alertas locales que tenemos para usted, por favor introduzca su código postal o el nombre de la calle y el área"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:290
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:295
msgid "To view a map of the precise location of this issue"
msgstr "Para ver un mapa de la ubicación precisa de este problema"
@@ -3860,17 +3672,10 @@ msgstr "Para ver un mapa de la ubicación precisa de este problema"
msgid "Total"
msgstr "Total"
-#: templates/web/seesomething/report/new/fill_in_details_form.html:24
-msgid "Transport Category"
-msgstr ""
-
#: templates/web/default/js/translation_strings.html:29
-#: templates/web/oxfordshire/js/translation_strings.html:23
msgid "Try again"
msgstr ""
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:83
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:46
#: templates/web/default/report/update-form.html:30
@@ -3898,7 +3703,6 @@ msgid "Unknown alert type"
msgstr "Tipo de alerta desconocida"
#: templates/web/default/js/translation_strings.html:39
-#: templates/web/oxfordshire/js/translation_strings.html:33
msgid "Unknown error"
msgstr ""
@@ -3906,7 +3710,6 @@ msgstr ""
msgid "Unknown problem ID"
msgstr "ID de problema desconocido"
-#: templates/web/bromley/report/display.html:66
#: templates/web/fixmystreet/report/update-form.html:19
msgid "Update"
msgstr "Actualizar"
@@ -3916,19 +3719,19 @@ msgid "Update %s created for problem %d; by %s"
msgstr "Actualización %s creada para el problema %d; por %s"
#: templates/web/default/contact/index.html:21
-#: templates/web/fixmystreet/contact/index.html:34
+#: templates/web/fixmystreet/contact/index.html:38
msgid "Update below added anonymously at %s"
msgstr "La actualización de abajo fue añadida de forma anónima en %s"
#: templates/web/default/contact/index.html:23
-#: templates/web/fixmystreet/contact/index.html:36
+#: templates/web/fixmystreet/contact/index.html:40
msgid "Update below added by %s at %s"
msgstr "La actualización de abajo fue añadida por %s en %s"
#: templates/web/default/admin/body-form.html:233
#: templates/web/zurich/admin/body-form.html:51
msgid "Update body"
-msgstr ""
+msgstr "Actualizar órgano"
#: templates/web/default/admin/index.html:38
msgid "Update breakdown by state"
@@ -3965,12 +3768,12 @@ msgstr "Actualizar:"
msgid "Updated"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1042
-#: perllib/FixMyStreet/App/Controller/Admin.pm:796
-#: perllib/FixMyStreet/App/Controller/Admin.pm:940
-#: perllib/FixMyStreet/App/Controller/Admin.pm:998
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:487
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:556
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1007
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1051
+#: perllib/FixMyStreet/App/Controller/Admin.pm:801
+#: perllib/FixMyStreet/App/Controller/Admin.pm:949
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:550
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:619
msgid "Updated!"
msgstr "¡Actualizado!"
@@ -3982,16 +3785,14 @@ msgstr "¡Actualizado!"
msgid "Updates"
msgstr "Actualizaciones"
-#: perllib/FixMyStreet/DB/Result/Comment.pm:131
-msgid "Updates are limited to 2000 characters in length. Please shorten your update"
+#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+msgid "Updates are limited to %s characters in length. Please shorten your update"
msgstr ""
#: db/alert_types.pl:5 db/alert_types.pl:6
msgid "Updates on {{title}}"
msgstr "Actualizaciones en {{title}}"
-#: templates/web/bromley/report/display.html:0
-#: templates/web/bromley/report/display.html:8
#: templates/web/default/report/display.html:0
#: templates/web/default/report/display.html:5
#: templates/web/fixmystreet/report/display.html:0
@@ -4001,19 +3802,18 @@ msgstr "Actualizaciones para este problema, FixMyStreet"
#: templates/web/default/admin/body.html:153
msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body."
-msgstr ""
+msgstr "Usa la <strong>nota</strong> para guardar detalles que sólo serán desplegados en la sección de administración. Las notas no son mostradas publicamente, y no son enviadas al órgano."
#: templates/web/zurich/admin/list_updates.html:30
#: templates/web/zurich/admin/list_updates.html:9
-#, fuzzy
msgid "User"
-msgstr "Usuarios"
+msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1342
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1351
msgid "User flag removed"
msgstr "Eliminada marca de usuario"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1314
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1323
msgid "User flagged"
msgstr "Usuario marcado"
@@ -4021,8 +3821,8 @@ msgstr "Usuario marcado"
msgid "User search finds matches in users' names and email addresses."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:256
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1189
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:304
#: templates/web/default/admin/flagged.html:29
#: templates/web/zurich/header.html:69
msgid "Users"
@@ -4051,12 +3851,9 @@ msgstr "Ver tus notificaciones"
#: templates/web/default/around/display_location.html:0
#: templates/web/default/around/display_location.html:34
-#: templates/web/seesomething/around/display_location.html:0
-#: templates/web/seesomething/around/display_location.html:16
msgid "Viewing a location"
msgstr "Visualizando una ubicación"
-#: templates/web/bromley/report/display.html:0
#: templates/web/default/report/display.html:0
#: templates/web/fixmystreet/report/display.html:0
msgid "Viewing a problem"
@@ -4069,7 +3866,6 @@ msgstr "Barrios de este Ayuntamiento"
#: templates/web/default/alert/choose.html:6
#: templates/web/default/around/around_index.html:13
#: templates/web/fixmystreet/around/around_index.html:16
-#: templates/web/seesomething/around/around_index.html:13
msgid "We found more than one match for that location. We show up to ten matches, please try a different search if yours is not here."
msgstr "Hemos encontrado más de una coincidencia para esa ubicación. Se muestra un máximo de diez, intenta una búsqueda diferente si no lo encuentra aquí."
@@ -4081,25 +3877,22 @@ msgstr ""
msgid "We have sent you an email containing a link to confirm your account."
msgstr "Te hemos enviado un correo electrónico con un enlace para confirmar tu cuenta."
-#: templates/web/emptyhomes/tokens/confirm_problem.html:18
+#: templates/web/emptyhomes/tokens/confirm_problem.html:19
#: templates/web/emptyhomes/tokens/confirm_problem.html:20
msgid "We may contact you periodically to ask if anything has changed with the property you reported."
msgstr "Podemos comunicarnos con usted periódicamente para preguntar si hay algo que ha cambiado con la propiedad que ha notificado."
-#: templates/web/bromley/report/display.html:143
#: templates/web/fixmystreet/report/update-form.html:115
msgid "We never show your email"
msgstr "Nunca mostramos su dirección de email"
-#: templates/web/bromley/report/new/fill_in_details_form.html:133
-#: templates/web/bromley/report/new/fill_in_details_form.html:179
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:134
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:201
#: templates/web/zurich/report/new/fill_in_details_form.html:96
msgid "We never show your email address or phone number."
msgstr "Nunca mostramos su dirección de email o número de teléfono."
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:384
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:394
msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch."
msgstr "Somos conscientes de este problema podría ser responsabilidad de %s , sin embargo, actualmente no tenemos ningún datos de contacto de ellos. Si sabe de alguna dirección de contacto adecuada, por favor póngase contáctenos."
@@ -4107,14 +3900,12 @@ msgstr "Somos conscientes de este problema podría ser responsabilidad de %s , s
msgid "We send it to the council on your behalf"
msgstr "Se lo enviamos al Ayuntamiento en su nombre"
-#: templates/web/bromley/report/new/fill_in_details_form.html:217
#: templates/web/default/report/new/notes.html:5
#: templates/web/fixmybarangay/report/new/notes.html:5
msgid "We will only use your personal information in accordance with our <a href=\"/faq#privacy\">privacy policy.</a>"
msgstr "Sólo utilizaremos su información personal de acuerdo a nuestra <a href=\"/faq#privacy\">política de privacidad</a>."
#: templates/web/fixmystreet/report/new/notes.html:4
-#: templates/web/oxfordshire/report/new/notes.html:4
msgid "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>"
msgstr "Sólo utilizaremos su información personal de acuerdo a nuestra <a href=\"/faq#privacy\">política de privacidad</a>."
@@ -4144,13 +3935,11 @@ msgstr "Todo el bloque de pisos vacíos"
msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>."
msgstr "En las búsquedas de solicitudes, es también posible buscar por agency_responsible para limitar las solicitudes a las enviados a una sola administración. El término de búsqueda es el ID de administración proporcionada por <a href=\"%s\">MapIT</a>."
-#: templates/web/fixmystreet/footer.html:21
-#: templates/web/stevenage/footer.html:22
+#: templates/web/fixmystreet/footer.html:24
msgid "Would you like better integration with FixMyStreet? <a href=\"http://www.mysociety.org/for-councils/fixmystreet/\">Find out about FixMyStreet for councils</a>."
msgstr "¿Le gustaría una mejor integración con FixMyStreet? <a href=\"http://www.mysociety.org/for-councils/fixmystreet/\">Conozca sobre FixMyStreet para Ayuntamientos</a>."
-#: templates/web/fixmystreet/footer.html:17
-#: templates/web/stevenage/footer.html:18
+#: templates/web/fixmystreet/footer.html:20
msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>."
msgstr "¿Le gustaría contribuir a FixMyStreet? Nuestro código es open source y está <a href=\"http://github.com/mysociety/fixmystreet\">disponible en GitHub</a>."
@@ -4162,7 +3951,6 @@ msgstr "¿Quieres recibir otro cuestionario en 4 semanas, recordándote que debe
#: templates/web/default/report/new/notes.html:8
#: templates/web/fixmybarangay/report/new/notes.html:8
#: templates/web/fixmystreet/report/new/notes.html:8
-#: templates/web/oxfordshire/report/new/notes.html:7
msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
msgstr "Escribir su mensaje completamente en mayúsculas hace que sea difícil de leer, al igual que la falta de puntuacion."
@@ -4192,26 +3980,24 @@ msgstr "Año"
msgid "Yes"
msgstr "SÍ"
-#: templates/web/bromley/report/display.html:157
-#: templates/web/bromley/report/new/fill_in_details_form.html:198
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:161
#: templates/web/fixmystreet/report/update-form.html:89
msgid "Yes I have a password"
msgstr "Sí, tengo una contraseña"
#: templates/web/default/contact/index.html:37
-#: templates/web/fixmystreet/contact/index.html:50
+#: templates/web/fixmystreet/contact/index.html:54
msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:"
msgstr "Estás reportando por abusiva la siguiente notificación, que contiene información personal, o similar:"
#: templates/web/default/contact/index.html:15
-#: templates/web/fixmystreet/contact/index.html:28
+#: templates/web/fixmystreet/contact/index.html:32
msgid "You are reporting the following update for being abusive, containing personal information, or similar:"
msgstr "Estás reportando por abusiva la siguiente actualización, que contiene información personal, o similar:"
-#: templates/web/default/tokens/confirm_problem.html:19
+#: templates/web/default/tokens/confirm_problem.html:20
#: templates/web/default/tokens/confirm_problem.html:21
-#: templates/web/zurich/tokens/confirm_problem.html:5
+#: templates/web/zurich/tokens/confirm_problem.html:6
#: templates/web/zurich/tokens/confirm_problem.html:8
msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
msgstr ""
@@ -4220,6 +4006,10 @@ msgstr ""
msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
msgstr ""
+#: templates/web/fixmystreet/contact/index.html:118
+msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
+msgstr ""
+
#: templates/web/default/admin/flagged.html:5
msgid ""
"You can flag any report or user by editing them, and they will be listed on this page.\n"
@@ -4227,9 +4017,9 @@ msgid ""
" reports in the past."
msgstr ""
-#: templates/web/default/report/new/councils_text_none.html:11
-#: templates/web/default/report/new/councils_text_none.html:13
-#: templates/web/default/report/new/councils_text_some.html:20
+#: templates/web/default/report/new/councils_text_none.html:19
+#: templates/web/default/report/new/councils_text_none.html:20
+#: templates/web/default/report/new/councils_text_some.html:21
#: templates/web/default/report/new/councils_text_some.html:22
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 "Usted puede ayudarnos a encontrar una dirección de correo electrónico de contacto para los problemas locales para %s y enviarlanosla por correo electrónico a <a href='mailto:%s'>%s</a>."
@@ -4239,7 +4029,6 @@ msgid "You can mark a body as deleted if you do not want it to be active on the
msgstr ""
#: templates/web/default/js/translation_strings.html:36
-#: templates/web/oxfordshire/js/translation_strings.html:30
msgid "You declined; please fill in the box above"
msgstr ""
@@ -4247,30 +4036,25 @@ msgstr ""
msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
msgstr "Usted ya respondió a esta encuesta. Si tiene alguna pregunta, por favor, <a href='%s'>póngase en contacto </a>, o <a href ='%s'>vea su problema</a>.\n"
-#: templates/web/bromley/report/new/fill_in_details_form.html:97
#: templates/web/default/questionnaire/index.html:96
#: templates/web/default/report/new/fill_in_details_form.html:93
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:90
#: templates/web/fixmystreet/questionnaire/index.html:87
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:99
-#: templates/web/seesomething/report/new/fill_in_details_form.html:59
#: templates/web/zurich/report/new/fill_in_details_form.html:75
msgid "You have already attached a photo to this report, attaching another one will replace it."
msgstr "Usted ya adjuntó una foto para esta notificación, adjuntando otra la reemplazará."
-#: templates/web/bromley/report/display.html:108
#: templates/web/default/report/update-form.html:59
#: templates/web/fixmystreet/report/update-form.html:56
msgid "You have already attached a photo to this update, attaching another one will replace it."
msgstr "Usted ya ha adjuntado una foto para esta actualización, adjuntando otra la reemplazará."
#: templates/web/default/auth/sign_out.html:3
-#: templates/web/seesomething/auth/sign_out.html:3
#: templates/web/zurich/auth/sign_out.html:3
msgid "You have been signed out"
msgstr "Ha cerrado la sesión correctamente."
-#: templates/web/bromley/report/new/fill_in_details_form.html:25
#: templates/web/default/report/new/fill_in_details_form.html:7
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:7
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:28
@@ -4282,17 +4066,14 @@ msgstr "Has ubicado el problema en el punto marcado con el pin verde en el mapa.
msgid "You have successfully confirmed your alert."
msgstr "Ha confirmado su alerta."
-#: templates/web/zurich/tokens/confirm_problem.html:5
#: templates/web/zurich/tokens/confirm_problem.html:6
msgid "You have successfully confirmed your email address."
msgstr ""
-#: templates/web/default/tokens/confirm_problem.html:14
#: templates/web/default/tokens/confirm_problem.html:15
msgid "You have successfully confirmed your problem"
msgstr "Ha confirmado su problema"
-#: templates/web/default/tokens/confirm_update.html:11
#: templates/web/default/tokens/confirm_update.html:12
msgid "You have successfully confirmed your update and you can now <a href=\"%s\">view it on the site</a>."
msgstr "Ha confirmado su actualización y ahora puede <a href=\"%s\">verla en el site</a>."
@@ -4305,11 +4086,15 @@ msgstr "Ha creado la alerta."
msgid "You have successfully deleted your alert."
msgstr "Ha borrado la alerta."
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:754
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:762
#: perllib/FixMyStreet/App/Controller/Report/Update.pm:140
msgid "You have successfully signed in; please check and confirm your details are accurate:"
msgstr "Ha iniciado sesión correctamente, por favor revise y confirme si sus detalles son precisos:"
+#: templates/web/default/my/my.html:17 templates/web/fixmystreet/my/my.html:17
+msgid "You haven&rsquo;t created any reports yet. <a href=\"%s\">Report a problem now.</a>"
+msgstr ""
+
#: templates/web/default/email_sent.html:13
msgid "You must now click the link in the email we've just sent you."
msgstr ""
@@ -4336,13 +4121,10 @@ msgstr "¿De verdad quiere volver a enviar?"
msgid "Your Reports"
msgstr "Sus notificaciones"
-#: templates/web/bromley/report/display.html:41
-#: templates/web/bromley/report/display.html:43
-#: templates/web/bromley/report/new/fill_in_details_form.html:145
#: templates/web/fixmystreet/alert/_list.html:89
#: templates/web/fixmystreet/alert/updates.html:19
#: templates/web/fixmystreet/alert/updates.html:22
-#: templates/web/fixmystreet/contact/index.html:84
+#: templates/web/fixmystreet/contact/index.html:88
#: templates/web/fixmystreet/report/display.html:65
#: templates/web/fixmystreet/report/display.html:67
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:115
@@ -4351,14 +4133,8 @@ msgstr "Sus notificaciones"
msgid "Your email"
msgstr "Su email:"
-#: templates/web/seesomething/report/new/fill_in_details_form.html:81
-msgid "Your email (optional)"
-msgstr ""
-
-#: templates/web/bromley/report/display.html:132
#: templates/web/fixmystreet/auth/general.html:26
#: templates/web/fixmystreet/report/update-form.html:80
-#: templates/web/seesomething/auth/general.html:26
#: templates/web/zurich/auth/general.html:30
#: templates/web/zurich/auth/general.html:58
msgid "Your email address"
@@ -4376,28 +4152,15 @@ msgstr "Su dirección de email:"
msgid "Your email:"
msgstr "Su email:"
-#: templates/web/bromley/report/display.html:195
-#: templates/web/bromley/report/new/fill_in_details_form.html:117
-#: templates/web/bromley/report/new/fill_in_details_form.html:164
-msgid "Your first name"
-msgstr "Su nombre:"
-
-#: templates/web/fixmystreet/report/updates-sidebar-notes.html:5
+#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7
msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>"
msgstr "Su información sólo será usada de acuerdo con nuestra <a href=\"/privacy\">política de privacidad</a>"
-#: templates/web/bromley/report/display.html:201
-#: templates/web/bromley/report/new/fill_in_details_form.html:123
-#: templates/web/bromley/report/new/fill_in_details_form.html:170
-msgid "Your last name"
-msgstr "Sus Apellidos"
-
#: templates/web/fixmystreet/auth/general.html:57
-#: templates/web/fixmystreet/contact/index.html:77
+#: templates/web/fixmystreet/contact/index.html:81
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:124
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:192
#: templates/web/fixmystreet/report/update-form.html:140
-#: templates/web/seesomething/report/new/fill_in_details_form.html:79
#: templates/web/zurich/auth/general.html:61
#: templates/web/zurich/report/new/fill_in_details_form.html:104
msgid "Your name"
@@ -4411,12 +4174,9 @@ msgstr "Su Nombre"
msgid "Your name:"
msgstr "Su Nombre:"
-#: templates/web/bromley/report/display.html:162
-#: templates/web/bromley/report/new/fill_in_details_form.html:203
#: templates/web/fixmystreet/auth/general.html:41
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:166
#: templates/web/fixmystreet/report/update-form.html:94
-#: templates/web/seesomething/auth/general.html:30
#: templates/web/zurich/auth/general.html:34
msgid "Your password"
msgstr "Su contraseña"
@@ -4425,11 +4185,8 @@ msgstr "Su contraseña"
msgid "Your password has been changed"
msgstr "Su contraseña ha cambiado."
-#: templates/web/bromley/report/new/fill_in_details_form.html:137
-#: templates/web/bromley/report/new/fill_in_details_form.html:184
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:139
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:206
-#: templates/web/seesomething/report/new/fill_in_details_form.html:90
#: templates/web/zurich/report/new/fill_in_details_form.html:110
msgid "Your phone number"
msgstr "Su número de teléfono"
@@ -4442,19 +4199,13 @@ msgstr "Su notificación"
msgid "Your report has been created and will shortly be sent."
msgstr ""
-#: templates/web/barnet/footer.html:18 templates/web/bromley/footer.html:19
-#: templates/web/bromley/header.html:75 templates/web/default/footer.html:9
-#: templates/web/fiksgatami/footer.html:6
+#: templates/web/default/footer.html:9 templates/web/fiksgatami/footer.html:6
#: templates/web/fiksgatami/nn/footer.html:6
-#: templates/web/fixmindelo/footer.html:39
-#: templates/web/fixmystreet/footer.html:46
-#: templates/web/oxfordshire/footer.html:21
-#: templates/web/oxfordshire/header.html:63
-#: templates/web/reading/footer.html:7 templates/web/stevenage/footer.html:41
+#: templates/web/fixmystreet/footer.html:49
msgid "Your reports"
msgstr "Sus notificaciones"
-#: templates/web/default/my/my.html:45 templates/web/fixmystreet/my/my.html:49
+#: templates/web/default/my/my.html:50 templates/web/fixmystreet/my/my.html:56
msgid "Your updates"
msgstr "Sus actualizaciones"
@@ -4471,7 +4222,7 @@ msgstr "por %s"
msgid "council"
msgstr "Ayuntamiento"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
msgid "council ref:&nbsp;%s"
msgstr ""
@@ -4483,27 +4234,24 @@ msgstr "no utilizó mapa"
#: templates/web/default/alert/index.html:33
#: templates/web/fixmystreet/around/postcode_form.html:20
-#: templates/web/seesomething/around/postcode_form.html:9
msgid "e.g. ‘%s’ or ‘%s’"
msgstr "por ejemplo, '%s' o '%s'"
#: templates/web/default/admin/flagged.html:51
-#, fuzzy
msgid "edit user"
-msgstr "Editando usuario %d"
+msgstr ""
#: templates/web/default/admin/index.html:23
#: templates/web/zurich/admin/index.html:5
msgid "from %d different users"
msgstr "de %d usuarios diferentes"
-#: templates/web/bromley/report/_item.html:12
-#: templates/web/fixmystreet/report/_item.html:12
+#: templates/web/fixmystreet/report/_item.html:17
#: templates/web/zurich/report/_item.html:16
msgid "last updated %s"
msgstr ""
-#: perllib/Utils.pm:263
+#: perllib/Utils.pm:265
msgid "less than a minute"
msgstr "menos de un minuto"
@@ -4561,21 +4309,20 @@ msgid "or"
msgstr "o"
#: templates/web/default/js/translation_strings.html:27
-#: templates/web/oxfordshire/js/translation_strings.html:21
msgid "or locate me automatically"
msgstr ""
-#: templates/web/default/admin/report_edit.html:24
+#: templates/web/default/admin/report_edit.html:25
#: templates/web/default/admin/report_edit.html:26
-#: templates/web/zurich/admin/report_edit-sdm.html:30
+#: templates/web/zurich/admin/report_edit-sdm.html:31
#: templates/web/zurich/admin/report_edit-sdm.html:32
-#: templates/web/zurich/admin/report_edit-sdm.html:39
+#: templates/web/zurich/admin/report_edit-sdm.html:40
#: templates/web/zurich/admin/report_edit-sdm.html:41
-#: templates/web/zurich/admin/report_edit.html:30
+#: templates/web/zurich/admin/report_edit.html:31
#: templates/web/zurich/admin/report_edit.html:32
-#: templates/web/zurich/admin/report_edit.html:41
+#: templates/web/zurich/admin/report_edit.html:42
#: templates/web/zurich/admin/report_edit.html:43
-#: templates/web/zurich/admin/report_edit.html:53
+#: templates/web/zurich/admin/report_edit.html:54
#: templates/web/zurich/admin/report_edit.html:55
msgid "originally entered: &ldquo;%s&rdquo;"
msgstr ""
@@ -4589,23 +4336,17 @@ msgstr "otras áreas:"
msgid "reopened"
msgstr "reabierto"
-#: templates/web/barnet/header.html:71 templates/web/bromley/header.html:100
-#: templates/web/bromley/header.html:65
#: templates/web/fixmybarangay/header.html:67
-#: templates/web/fixmystreet/header.html:51
-#: templates/web/oxfordshire/header.html:112
-#: templates/web/oxfordshire/header.html:48
-#: templates/web/stevenage/header.html:98 templates/web/zurich/footer.html:12
+#: templates/web/fixmystreet/header.html:54
+#: templates/web/zurich/footer.html:12
msgid "sign out"
msgstr "Salir"
-#: templates/web/bromley/report/new/fill_in_details_form.html:4
-#: templates/web/bromley/report/new/fill_in_details_form.html:7
-#: templates/web/default/report/new/fill_in_details_form.html:11
+#: templates/web/default/report/new/fill_in_details_form.html:12
#: templates/web/default/report/new/fill_in_details_form.html:14
-#: templates/web/emptyhomes/report/new/fill_in_details_form.html:11
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:12
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:14
-#: templates/web/fixmystreet/report/new/fill_in_details_form.html:6
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:7
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:9
msgid "the local council"
msgstr "el Ayuntamiento local"
@@ -4615,11 +4356,11 @@ msgstr "el Ayuntamiento local"
msgid "there is no pin shown as the user did not use the map"
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:362
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:370
msgid "this type of local problem"
msgstr "este tipo de problema local"
-#: perllib/Utils.pm:235
+#: perllib/Utils.pm:237
msgid "today"
msgstr "hoy"
@@ -4649,7 +4390,7 @@ msgid_plural "<big>%s</big> reports recently"
msgstr[0] "<big>%s</big> notificadas recientemente"
msgstr[1] "<big>%s</big> notificadas recientemente"
-#: perllib/Utils.pm:282
+#: perllib/Utils.pm:284
#, perl-format
msgid "%d hour"
msgid_plural "%d hours"
@@ -4663,7 +4404,7 @@ msgid_plural "%d supporters"
msgstr[0] ""
msgstr[1] ""
-#: perllib/Utils.pm:284
+#: perllib/Utils.pm:286
#, perl-format
msgid "%d minute"
msgid_plural "%d minutes"
@@ -4684,7 +4425,7 @@ msgid_plural "We do not yet have details for the councils that cover this locati
msgstr[0] "Todavía no tenemos detalles para el Ayuntamiento que cubre esta zona."
msgstr[1] "Todavía no tenemos detalles para el Ayuntamiento que cubre esta zona."
-#: perllib/Utils.pm:278
+#: perllib/Utils.pm:280
#, perl-format
msgid "%d week"
msgid_plural "%d weeks"
@@ -4705,6 +4446,13 @@ msgid_plural "<big>%s</big> fixed in past month"
msgstr[0] "<big>%s</big> arregladas la semana pasada"
msgstr[1] "<big>%s</big> arregladas la semana pasada"
+#: perllib/Utils.pm:282
+#, perl-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
+msgstr[1] ""
+
#: templates/web/default/report/new/councils_text_some.html:14
#, perl-format
msgid "We do <strong>not</strong> yet have details for the other council that covers this location."
@@ -4712,25 +4460,23 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils
msgstr[0] "Todavía <strong>no</strong> tenemos detalles para el Ayuntamiento que cubre esta zona."
msgstr[1] "Todavía <strong>no</strong> tenemos detalles para el Ayuntamiento que cubre esta zona."
-#: perllib/Utils.pm:280
-#, perl-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] ""
-msgstr[1] ""
+#~ msgid "First Name"
+#~ msgstr "Nombre"
-#, fuzzy
-#~ msgid "The email field is required"
-#~ msgstr "Esta información es necesaria"
+#~ msgid "Last Name"
+#~ msgstr "Apellido"
+
+#~ msgid "Please describe the exact location of the report. Example: “2 dumped mattresses outside Number 19 Stockwell Close”"
+#~ msgstr "Por favor, describa la ubicación exacta de la notificación. Ejemplo: \"2 colchones vertidos en la calle en el número 19 de la Calle Bellavista\""
-#~ msgid "End Year:"
-#~ msgstr "Año de Fin:"
+#~ msgid "Please note that updates are not sent to the relevant department. 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 "Tenga en cuenta que las actualizaciones no se envían al departamento pertinente. Si usted deja su nombre será público. Su información sólo será usada de acuerdo con nuestra <a href=\"/faq#privacy\">política de privacidad</ a>"
-#~ msgid "End month:"
-#~ msgstr "Mes de fin:"
+#~ msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
+#~ msgstr "Proporcionar una contraseña es opcional, pero al hacerlo le permitirá informar más fácilmente problemas en el futuro, dejar actualizaciones y administrar sus notificaciones."
-#~ msgid "Start Year:"
-#~ msgstr "Año de Inicio:"
+#~ msgid "Your first name"
+#~ msgstr "Su nombre:"
-#~ msgid "Start month:"
-#~ msgstr "Mes de inicio:"
+#~ msgid "Your last name"
+#~ msgstr "Sus Apellidos"
diff --git a/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po
index b3e3514dd..d716fa6a5 100644
--- a/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/fr_FR.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: 2013-11-12 13:15+0000\n"
-"PO-Revision-Date: 2013-09-05 16:55+0000\n"
+"POT-Creation-Date: 2014-05-16 17:30+0100\n"
+"PO-Revision-Date: 2013-11-20 13:29+0000\n"
"Last-Translator: mysociety <transifex@mysociety.org>\n"
"Language-Team: French (France) (http://www.transifex.com/projects/p/fixmystreet/language/fr_FR/)\n"
"Language: fr_FR\n"
@@ -19,25 +19,25 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:373
+#: perllib/FixMyStreet/DB/Result/Problem.pm:604
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383
msgid " and "
msgstr " et "
-#: templates/web/default/tokens/confirm_problem.html:14
+#: templates/web/default/tokens/confirm_problem.html:15
#: templates/web/default/tokens/confirm_problem.html:17
msgid " and <strong>we will now send it to the council</strong>"
msgstr " et <strong>nous allons maintenant l'envoyer à l'administration</strong>"
-#: templates/web/default/report/new/councils_text_all.html:11
-#: templates/web/default/report/new/councils_text_all.html:18
-#: templates/web/default/report/new/councils_text_all.html:4
-#: templates/web/default/report/new/councils_text_none.html:11
-#: templates/web/default/report/new/councils_text_none.html:14
-#: templates/web/default/report/new/councils_text_some.html:20
+#: templates/web/default/report/new/councils_text_all.html:12
+#: templates/web/default/report/new/councils_text_all.html:19
+#: templates/web/default/report/new/councils_text_all.html:5
+#: templates/web/default/report/new/councils_text_none.html:19
+#: templates/web/default/report/new/councils_text_none.html:21
+#: templates/web/default/report/new/councils_text_some.html:21
#: templates/web/default/report/new/councils_text_some.html:23
#: templates/web/default/report/new/councils_text_some.html:5
-#: templates/web/emptyhomes/report/new/councils_text_all.html:2
+#: templates/web/emptyhomes/report/new/councils_text_all.html:3
msgid " or "
msgstr " ou "
@@ -75,19 +75,19 @@ msgstr ""
msgid "%s - Summary reports"
msgstr "%s - Rapports sommaires"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:653
msgid "%s ref:&nbsp;%s"
msgstr "%s réf&nbsp;:&nbsp;%s"
-#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
msgid "%s ward, %s"
msgstr "Localité %s, %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:538
+#: perllib/FixMyStreet/DB/Result/Problem.pm:540
msgid "%s, reported at %s"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/UK.pm:303 perllib/FixMyStreet/Cobrand/UK.pm:315
+#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:309
msgid "%s, within %s ward"
msgstr "%s, dans la localité %s"
@@ -118,30 +118,27 @@ msgstr "(une distance par défaut qui couvre environs 200 000 personnes)"
msgid "(alternatively the RSS feed can be customised, within"
msgstr "(sinon, le flux RSS peut être personnalisé, dans l&rsquo;intervalle de'"
-#: templates/web/bromley/report/_item.html:22
#: templates/web/default/around/around_map_list_items.html:12
#: templates/web/default/around/on_map_list_items.html:9
-#: templates/web/fixmystreet/report/_item.html:22
+#: templates/web/fixmystreet/report/_item.html:27
#: templates/web/zurich/report/_item.html:21
msgid "(closed)"
msgstr "(fermé)"
-#: templates/web/bromley/report/_item.html:20
#: templates/web/default/around/around_map_list_items.html:10
#: templates/web/default/around/on_map_list_items.html:7
-#: templates/web/fixmystreet/report/_item.html:20
+#: templates/web/fixmystreet/report/_item.html:25
#: templates/web/zurich/report/_item.html:19
msgid "(fixed)"
msgstr "(résolu)"
-#: templates/web/default/index.html:12 templates/web/default/index.html:8
+#: templates/web/default/index.html:12 templates/web/default/index.html:9
#: templates/web/fixmystreet/around/intro.html:2
msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
msgstr "(comme des graffitis, immondices, trottoirs abimés ou éclairage public)"
-#: templates/web/bromley/report/_item.html:16
#: templates/web/default/reports/_list-entry.html:4
-#: templates/web/fixmystreet/report/_item.html:16
+#: templates/web/fixmystreet/report/_item.html:21
msgid "(not sent to council)"
msgstr "(non signalé à l&rsquo;administration)"
@@ -151,9 +148,8 @@ msgstr "(non signalé à l&rsquo;administration)"
msgid "(optional)"
msgstr "(facultatif)"
-#: templates/web/bromley/report/_item.html:15
#: templates/web/default/reports/_list-entry.html:2
-#: templates/web/fixmystreet/report/_item.html:15
+#: templates/web/fixmystreet/report/_item.html:20
msgid "(sent to both)"
msgstr "(envoyé aux deux)"
@@ -165,8 +161,8 @@ msgstr "(nous n&rsquo;affichons jamais votre email ou numéro de téléphone)"
msgid "(we never show your email)"
msgstr "(nous n&rsquo;affichons jamais votre email)"
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:637
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:664
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:635
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:662
#: perllib/FixMyStreet/DB/Result/Problem.pm:379
msgid "-- Pick a category --"
msgstr "-- Choisissez une catégorie --"
@@ -202,7 +198,7 @@ msgid ""
"</p>"
msgstr ""
-#: templates/web/fixmystreet/questionnaire/completed-open.html:6
+#: templates/web/fixmystreet/questionnaire/completed-open.html:25
msgid ""
"<p style=\"font-size:150%\">We&rsquo;re sorry to hear that. We have two\n"
"suggestions: why not try <a href=\"http://www.writetothem.com/\">writing direct\n"
@@ -255,7 +251,7 @@ msgstr ""
"recevez plus d'informations sur l'état de votre problème, merci de revenir sur le\n"
"site et de faire une mise à jour.</p>"
-#: templates/web/default/around/_report_banner.html:3
+#: templates/web/default/around/_report_banner.html:4
#: templates/web/default/around/_report_banner.html:5
msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>"
msgstr "<small>Si vous ne pouvez pas voir le plan, <a href='%s' rel='nofollow'>sautez cette étape</a>.</small>"
@@ -310,8 +306,6 @@ msgstr "<strong>Oui</strong>, j'ai un mot de passe :"
msgid "About us"
msgstr "À propos"
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:81
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:39
#: templates/web/default/report/update-form.html:30
@@ -349,7 +343,7 @@ msgstr "Ajouter une catégorie"
msgid "Add user"
msgstr ""
-#: templates/web/default/my/my.html:56 templates/web/fixmystreet/my/my.html:60
+#: templates/web/default/my/my.html:61 templates/web/fixmystreet/my/my.html:67
msgid "Added %s"
msgstr "Ajouté %s"
@@ -365,7 +359,6 @@ msgstr "Alerte %d créée pour %s, type %s, paramètres %s / %s"
msgid "Alert %d disabled (created %s)"
msgstr "Alerte %d désactivée (création %s)"
-#: templates/web/bromley/report/display.html:209
#: templates/web/default/report/update-form.html:163
#: templates/web/fixmystreet/report/update-form.html:148
msgid "Alert me to future updates"
@@ -378,17 +371,12 @@ msgstr "M'alerter de futures mises à jour"
msgid "All Reports"
msgstr "Tous les rapports"
-#: templates/web/barnet/footer.html:20 templates/web/bromley/footer.html:21
-#: templates/web/bromley/header.html:77 templates/web/default/footer.html:11
+#: templates/web/default/footer.html:11
#: templates/web/emptyhomes/header.html:32
#: templates/web/fiksgatami/footer.html:7
#: templates/web/fiksgatami/nn/footer.html:7
-#: templates/web/fixmindelo/footer.html:41
#: templates/web/fixmybarangay/footer.html:20
-#: templates/web/fixmystreet/footer.html:48
-#: templates/web/oxfordshire/footer.html:23
-#: templates/web/oxfordshire/header.html:67
-#: templates/web/reading/footer.html:8 templates/web/stevenage/footer.html:43
+#: templates/web/fixmystreet/footer.html:51
#: templates/web/zurich/admin/index-dm.html:12
#: templates/web/zurich/admin/stats.html:13
#: templates/web/zurich/footer.html:19
@@ -405,27 +393,25 @@ msgstr ""
msgid "All the information you provide here will be sent to"
msgstr "Toutes les informations que vous fournissez ici seront envoyées à"
-#: templates/web/default/report/new/councils_text_all.html:11
+#: templates/web/default/report/new/councils_text_all.html:12
#: templates/web/default/report/new/councils_text_all.html:13
msgid "All the information you provide here will be sent to <strong>%s</strong> or <strong>Roads Service</strong>."
msgstr ""
-#: templates/web/default/report/new/councils_text_all.html:4
+#: templates/web/default/report/new/councils_text_all.html:5
#: templates/web/default/report/new/councils_text_all.html:6
msgid "All the information you provide here will be sent to <strong>%s</strong> or a relevant local body such as <strong>TfL</strong>, via the London Report-It system."
msgstr "Toutes les informations que vous fournissez ici seront envoyées à <strong>%s</strong> ou l'autorité locale compétente, par exemple <strong>TfL</strong>, via le système London Report-It."
-#: templates/web/bromley/report/new/fill_in_details_form.html:4
-#: templates/web/bromley/report/new/fill_in_details_form.html:6
-#: templates/web/default/report/new/councils_text_all.html:18
+#: templates/web/default/report/new/councils_text_all.html:19
#: templates/web/default/report/new/councils_text_all.html:20
-#: templates/web/default/report/new/fill_in_details_form.html:11
+#: templates/web/default/report/new/fill_in_details_form.html:12
#: templates/web/default/report/new/fill_in_details_form.html:13
-#: templates/web/emptyhomes/report/new/councils_text_all.html:2
+#: templates/web/emptyhomes/report/new/councils_text_all.html:3
#: templates/web/emptyhomes/report/new/councils_text_all.html:4
-#: templates/web/emptyhomes/report/new/fill_in_details_form.html:11
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:12
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:13
-#: templates/web/fixmystreet/report/new/fill_in_details_form.html:6
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:7
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:8
msgid "All the information you provide here will be sent to <strong>%s</strong>."
msgstr "Toutes les informations que vous fournissez ici seront envoyées à <strong>%s</strong>."
@@ -449,13 +435,11 @@ msgstr "Anonyme :"
msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?"
msgstr "Vous êtes un <strong>développeur</strong> ? Vous aimeriez contribuer à Fix.lu ?"
-#: templates/web/fixmystreet/footer.html:16
-#: templates/web/stevenage/footer.html:17
+#: templates/web/fixmystreet/footer.html:19
msgid "Are you a developer?"
msgstr "Vous êtes un développeur ?"
-#: templates/web/fixmystreet/footer.html:20
-#: templates/web/stevenage/footer.html:21
+#: templates/web/fixmystreet/footer.html:23
msgid "Are you from a council?"
msgstr "Vous faites partie d'une administration ?"
@@ -478,7 +462,7 @@ msgstr ""
msgid "Assign to subdivision:"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:141
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:163
#: templates/web/zurich/report/updates.html:11
msgid "Assigned to %s"
msgstr ""
@@ -497,7 +481,6 @@ msgid "Awaiting moderation"
msgstr ""
#: templates/web/default/js/translation_strings.html:32
-#: templates/web/oxfordshire/js/translation_strings.html:26
msgid "Back"
msgstr ""
@@ -509,8 +492,8 @@ msgstr "Bannir l'adresse mail"
msgid "Be sure to choose the right category, because we use that to determine to whom the report is sent."
msgstr "Vérifiez bien la catégorie, car nous l'utilisons pour bien choisir le destinataire de votre rapport."
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1176
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:249
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1185
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:297
#: templates/web/default/admin/bodies.html:1
#: templates/web/zurich/header.html:64
msgid "Bodies"
@@ -536,18 +519,15 @@ msgid "By Date"
msgstr "Par Date"
#: templates/web/fixmystreet/around/_report_banner.html:10
-#: templates/web/fixmystreet/around/_report_banner.html:8
+#: templates/web/fixmystreet/around/_report_banner.html:9
msgid "Can't see the map? <a href='%s' rel='nofollow'>Skip this step</a>"
msgstr "Vous ne pouvez pas voir le plan ? <a href='%s' rel='nofollow'>Sautez cette étape</a>"
-#: templates/web/bromley/report/new/fill_in_details_form.html:68
#: templates/web/default/admin/bodies.html:20
#: templates/web/default/admin/body.html:53
#: templates/web/default/admin/index.html:44
#: templates/web/default/report/new/category.html:10
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:74
-#: templates/web/seesomething/report/new/category.html:6
-#: templates/web/southampton/report/new/category.html:3
#: templates/web/zurich/admin/body.html:13
#: templates/web/zurich/admin/index-dm.html:23
#: templates/web/zurich/admin/index-sdm.html:21
@@ -572,7 +552,7 @@ msgstr "Taux de résolution pour problèmes > 4 semaines"
msgid "Category:"
msgstr "Catégorie :"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:366
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374
msgid "Category: %s"
msgstr "Catégorie : %s"
@@ -621,21 +601,16 @@ msgstr ""
msgid "Click map to report a problem"
msgstr "Cliquez sur le plan pour signaler un problème"
-#: templates/web/oxfordshire/js/translation_strings.html:39
-#, fuzzy
-msgid "Click on the map to report a problem"
-msgstr "Cliquez sur le plan pour signaler un problème"
-
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:118
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:140
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:45
#: templates/web/default/admin/report_edit.html:47
#: templates/web/default/dashboard/index.html:142
#: templates/web/default/dashboard/index.html:144
#: templates/web/fixmystreet/report/banner.html:15
-#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:10
#: templates/web/zurich/admin/header.html:12
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/report_edit.html:100
#: templates/web/zurich/admin/report_edit.html:98
#: templates/web/zurich/admin/stats.html:31
@@ -643,11 +618,11 @@ msgstr "Cliquez sur le plan pour signaler un problème"
msgid "Closed"
msgstr "Clos"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:744
+#: perllib/FixMyStreet/DB/Result/Problem.pm:748
msgid "Closed by council"
msgstr "Clos par l'administration"
-#: templates/web/default/my/my.html:32 templates/web/fixmystreet/my/my.html:36
+#: templates/web/default/my/my.html:37 templates/web/fixmystreet/my/my.html:43
msgid "Closed reports"
msgstr "Rapports clos"
@@ -655,7 +630,7 @@ msgstr "Rapports clos"
msgid "Closed:"
msgstr "Clos :"
-#: templates/web/default/around/tabbed_lists.html:10
+#: templates/web/default/around/tabbed_lists.html:11
#: templates/web/default/around/tabbed_lists.html:12
msgid "Closest nearby problems <small>(within&nbsp;%skm)</small>"
msgstr "Problèmes clos à proximité <small>(dans l'intervalle de&nbsp;%skm)</small>"
@@ -681,9 +656,8 @@ msgid "Cobrand:"
msgstr "Collaboration :"
#: templates/web/default/admin/config_page.html:1
-#, fuzzy
msgid "Configuration"
-msgstr "Confirmation"
+msgstr ""
#: perllib/FixMyStreet/App/Controller/Admin.pm:421
msgid "Configuration updated - contacts will be generated automatically later"
@@ -713,8 +687,6 @@ msgstr ""
#: templates/web/default/tokens/confirm_update.html:3
#: templates/web/emptyhomes/tokens/confirm_problem.html:1
#: templates/web/emptyhomes/tokens/confirm_problem.html:3
-#: templates/web/southampton/tokens/confirm_problem.html:1
-#: templates/web/southampton/tokens/confirm_problem.html:3
#: templates/web/zurich/tokens/confirm_problem.html:1
#: templates/web/zurich/tokens/confirm_problem.html:3
msgid "Confirmation"
@@ -747,7 +719,6 @@ msgstr "Contact"
msgid "Contact FixMyStreet"
msgstr "Contacter Fix.lu"
-#: templates/web/bromley/contact/submit.html:1
#: templates/web/default/contact/index.html:1
#: templates/web/default/contact/index.html:2
#: templates/web/default/contact/submit.html:1
@@ -756,20 +727,18 @@ msgstr "Contacter Fix.lu"
msgid "Contact Us"
msgstr "Nous contacter"
-#: templates/web/bromley/contact/submit.html:3
#: templates/web/default/contact/index.html:6
#: templates/web/default/contact/submit.html:3
-#: templates/web/fixmystreet/contact/index.html:19
+#: templates/web/fixmystreet/contact/index.html:22
msgid "Contact the team"
msgstr "Contacter l'équipe"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1310
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1338
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1319
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1347
msgid "Could not find user"
msgstr "Impossible de trouver l'utilisateur"
#: templates/web/default/js/translation_strings.html:37
-#: templates/web/oxfordshire/js/translation_strings.html:31
msgid "Could not look up location"
msgstr ""
@@ -824,11 +793,10 @@ msgstr "État actuel"
#: templates/web/default/admin/bodies.html:7
#: templates/web/default/admin/index.html:5
-#, fuzzy
msgid "Currently no bodies have been created."
-msgstr "Aucun problème n'a encore été signalé."
+msgstr ""
-#: templates/web/default/dashboard/index.html:5
+#: templates/web/default/dashboard/index.html:6
#: templates/web/default/dashboard/index.html:7
msgid "Dashboard"
msgstr ""
@@ -851,11 +819,8 @@ msgstr "Effacé"
msgid "Description"
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:54
#: templates/web/default/js/translation_strings.html:34
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66
-#: templates/web/oxfordshire/js/translation_strings.html:28
-#: templates/web/seesomething/report/new/fill_in_details_form.html:16
#: templates/web/zurich/report/new/fill_in_details_form.html:42
msgid "Details"
msgstr "Détails :"
@@ -893,8 +858,10 @@ msgstr "Avez-vous un mot de passe Fix.lu ?"
msgid "Don&rsquo;t know"
msgstr "Je ne sais pas"
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:82
+#: templates/web/fixmystreet/contact/index.html:115
+msgid "Don't like forms?"
+msgstr ""
+
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:47
#: templates/web/default/report/update-form.html:30
@@ -925,9 +892,9 @@ msgid "Edit body details"
msgstr ""
#: templates/web/default/admin/report_edit.html:1
-#: templates/web/zurich/admin/report_edit-sdm.html:1
+#: templates/web/zurich/admin/report_edit-sdm.html:2
#: templates/web/zurich/admin/report_edit-sdm.html:4
-#: templates/web/zurich/admin/report_edit.html:1
+#: templates/web/zurich/admin/report_edit.html:2
#: templates/web/zurich/admin/report_edit.html:5
msgid "Editing problem %d"
msgstr "Édition du problème %d"
@@ -945,7 +912,6 @@ msgstr "Édition de l'utilisateur %d'"
msgid "Editor"
msgstr "Éditeur"
-#: templates/web/bromley/report/display.html:128
#: templates/web/default/admin/bodies.html:18
#: templates/web/default/admin/body.html:54
#: templates/web/default/admin/body_edit.html:83
@@ -953,7 +919,6 @@ msgstr "Éditeur"
#: templates/web/default/admin/users.html:16
#: templates/web/fixmystreet/auth/general.html:20
#: templates/web/fixmystreet/report/update-form.html:76
-#: templates/web/seesomething/auth/general.html:20
#: templates/web/zurich/admin/body-form.html:9
#: templates/web/zurich/admin/body.html:14
#: templates/web/zurich/auth/general.html:24
@@ -961,16 +926,15 @@ msgstr "Éditeur"
msgid "Email"
msgstr "Email"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1286
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1295
msgid "Email added to abuse list"
msgstr "Email rajouté à la liste des abus"
#: templates/web/default/admin/body.html:126
-#, fuzzy
msgid "Email address:"
-msgstr "Votre adresse mail:"
+msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1283
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1292
msgid "Email already in abuse list"
msgstr "Email déjà présent dans la liste des abus"
@@ -994,7 +958,7 @@ msgstr "Envoyez-moi les mises à jour"
msgid "Email:"
msgstr "Email :"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:318
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:323
msgid "Email: %s"
msgstr ""
@@ -1040,15 +1004,14 @@ msgid ""
msgstr ""
#: templates/web/default/admin/stats.html:70
-#, fuzzy
msgid "End Date:"
-msgstr "Fin jour :"
+msgstr ""
#: templates/web/default/admin/body-form.html:126
msgid "Endpoint"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:71
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:72
msgid "Enter a Z&uuml;rich street name"
msgstr ""
@@ -1057,26 +1020,25 @@ msgid "Enter a nearby UK postcode, or street name and area"
msgstr ""
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:25
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:37
msgid "Enter a nearby postcode, or street name and area"
msgstr "Entrez un code postal proche, ou une rue et une localité"
-#: templates/web/default/around/postcode_form.html:1
#: templates/web/default/around/postcode_form.html:2
-#: templates/web/fixmystreet/around/postcode_form.html:10
#: templates/web/fixmystreet/around/postcode_form.html:11
-#: templates/web/seesomething/around/postcode_form.html:3
-#: templates/web/seesomething/around/postcode_form.html:4
msgid "Enter a nearby street name and area"
msgstr ""
+#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:9
+msgid "Enter a nearby street name and area, postal code or district in Delhi"
+msgstr ""
+
#: templates/web/default/auth/general.html:64
#: templates/web/default/report/new/fill_in_details_form.html:169
#: templates/web/default/report/update-form.html:124
msgid "Enter a new password:"
msgstr "Entrez un nouveau mot de passe :"
-#: templates/web/bromley/report/display.html:150
-#: templates/web/bromley/report/new/fill_in_details_form.html:189
#: templates/web/fixmystreet/auth/general.html:61
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:211
#: templates/web/fixmystreet/report/update-form.html:122
@@ -1111,7 +1073,6 @@ msgstr "Exemples :"
msgid "Extra data:"
msgstr ""
-#: templates/web/bromley/contact/submit.html:14
#: templates/web/default/contact/submit.html:15
msgid "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>."
msgstr "Échec lors de l'envoi du message. Merci de réessayer, ou <a href=\"mailto:%s\">de nous écrire</a>."
@@ -1125,12 +1086,6 @@ msgstr ""
msgid "Find latest local and national news"
msgstr ""
-#: templates/web/bromley/report/display.html:191
-#: templates/web/bromley/report/new/fill_in_details_form.html:113
-#: templates/web/bromley/report/new/fill_in_details_form.html:160
-msgid "First Name"
-msgstr ""
-
#: templates/web/default/questionnaire/index.html:79
#: templates/web/fixmystreet/questionnaire/index.html:73
msgid "First time"
@@ -1179,8 +1134,6 @@ msgstr ""
"nid de poule sur une route nationale sera envoyée aux Ponts et Chausséees et apparaitra\n"
"dans les deux les alertes des Ponts et Chaussées, mais uniquement dans l'alerte « À l'intérieur de » pour la commune."
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:84
#: templates/web/default/admin/index.html:44
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:41
@@ -1205,7 +1158,7 @@ msgstr "Résolu - Administration"
msgid "Fixed - User"
msgstr "Résolu - Usager"
-#: templates/web/default/my/my.html:27 templates/web/fixmystreet/my/my.html:31
+#: templates/web/default/my/my.html:32 templates/web/fixmystreet/my/my.html:38
msgid "Fixed reports"
msgstr "Rapports résolus"
@@ -1222,7 +1175,7 @@ msgstr ""
msgid "Flag user"
msgstr "Signaler l'usager"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1181
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1190
#: templates/web/default/admin/users.html:19
msgid "Flagged"
msgstr "Signalé"
@@ -1267,11 +1220,9 @@ msgstr ""
#: templates/web/emptyhomes/faq/faq-en-gb.html:1
#: templates/web/fiksgatami/faq/faq-nb.html:1
#: templates/web/fiksgatami/nn/faq/faq-nn.html:1
-#: templates/web/fixmindelo/faq/faq-pt-cv.html:1
#: templates/web/fixmybarangay/faq/faq-en-gb.html:1
#: templates/web/fixmystreet/faq/faq-en-gb.html:1
#: templates/web/fixmystreet/static/privacy.html:1
-#: templates/web/oxfordshire/faq/faq-en-gb.html:1
msgid "Frequently Asked Questions"
msgstr "Foire Aux Questions"
@@ -1279,19 +1230,18 @@ msgstr "Foire Aux Questions"
msgid "GeoRSS on Google Maps"
msgstr "GeoRSS sur Google Maps"
-#: templates/web/bromley/report/display.html:30
#: templates/web/fixmystreet/around/_updates.html:3
#: templates/web/fixmystreet/report/display.html:38
msgid "Get updates"
msgstr "Recevoir les mises à jour"
-#: templates/web/fixmystreet/reports/_rss.html:3
+#: templates/web/fixmystreet/reports/_rss.html:4
#: templates/web/fixmystreet/reports/_rss.html:9
msgid "Get updates of %s problems"
msgstr ""
#: templates/web/fixmystreet/reports/_rss.html:11
-#: templates/web/fixmystreet/reports/_rss.html:3
+#: templates/web/fixmystreet/reports/_rss.html:4
msgid "Get updates of problems in this %s"
msgstr "Recevez les mises à jour pour les problèmes dans cette %s"
@@ -1304,7 +1254,6 @@ msgstr "Donnez-moi un flux RSS"
#: templates/web/default/alert/index.html:34
#: templates/web/default/around/postcode_form.html:8
#: templates/web/fixmystreet/around/postcode_form.html:21
-#: templates/web/seesomething/around/postcode_form.html:10
#: templates/web/zurich/admin/stats.html:26
msgid "Go"
msgstr "C'est parti&nbsp;!"
@@ -1331,19 +1280,12 @@ msgstr "Est-ce que le problème a été réglé ?"
msgid "Have you ever reported a problem to a council before, or is this your first time?"
msgstr "Est-ce que vous aviez déjà signalé un problème à une administration, ou est-ce que c'est votre première fois ?"
-#: templates/web/barnet/footer.html:24 templates/web/bromley/footer.html:25
-#: templates/web/bromley/header.html:81 templates/web/default/footer.html:15
+#: templates/web/default/footer.html:15
#: templates/web/emptyhomes/header.html:33
#: templates/web/fiksgatami/footer.html:9
#: templates/web/fiksgatami/nn/footer.html:9
-#: templates/web/fixmindelo/footer.html:45
#: templates/web/fixmybarangay/footer.html:24
-#: templates/web/fixmystreet/footer.html:52
-#: templates/web/oxfordshire/footer.html:27
-#: templates/web/oxfordshire/header.html:75
-#: templates/web/reading/footer.html:10
-#: templates/web/seesomething/footer.html:13
-#: templates/web/stevenage/footer.html:47
+#: templates/web/fixmystreet/footer.html:55
#: templates/web/zurich/faq/faq-de-ch.html:1
#: templates/web/zurich/footer.html:21
#: templates/web/zurich/nav_over_content.html:8
@@ -1355,13 +1297,9 @@ msgstr "Aide"
msgid "Here are the types of local problem alerts for &lsquo;%s&rsquo;."
msgstr "Voici les types de problèmes locaux pour « %s »."
-#: templates/web/barnet/header.html:70 templates/web/bromley/header.html:64
-#: templates/web/bromley/header.html:99
#: templates/web/fixmybarangay/header.html:66
-#: templates/web/fixmystreet/header.html:50
-#: templates/web/oxfordshire/header.html:111
-#: templates/web/oxfordshire/header.html:47
-#: templates/web/stevenage/header.html:97 templates/web/zurich/footer.html:11
+#: templates/web/fixmystreet/header.html:53
+#: templates/web/zurich/footer.html:11
msgid "Hi %s"
msgstr "Moien %s"
@@ -1369,8 +1307,8 @@ msgstr "Moien %s"
#: templates/web/default/admin/report_edit.html:50
#: templates/web/default/admin/report_edit.html:51
#: templates/web/default/admin/update_edit.html:28
-#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:11
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/report_edit.html:89
#: templates/web/zurich/admin/report_edit.html:93
#: templates/web/zurich/admin/stats.html:32
@@ -1391,7 +1329,6 @@ msgid "History"
msgstr "Historique"
#: templates/web/default/js/translation_strings.html:31
-#: templates/web/oxfordshire/js/translation_strings.html:25
msgid "Home"
msgstr ""
@@ -1400,7 +1337,6 @@ msgid "How to report a problem"
msgstr "Comment signaler un problème"
#: templates/web/default/js/translation_strings.html:33
-#: templates/web/oxfordshire/js/translation_strings.html:27
msgid "How to send successful reports"
msgstr ""
@@ -1416,7 +1352,7 @@ msgstr "Je suis désolé, nous n'avons pas trouvé votre problème dans notre ba
msgid "I'm afraid we couldn't validate that token, as the report was made too long ago."
msgstr "Je suis désolé, nous n'avons pas pu valider cet accusé de réception car le rapport a été fait il y a trop longtemps."
-#: perllib/FixMyStreet/App/Controller/Tokens.pm:259
+#: perllib/FixMyStreet/App/Controller/Tokens.pm:260
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 "Je suis désolé, nous n'avons pas pu valider cet accusé de réception. Si vous avez copié cette adresse d'un email, merci de vérifier que vous n'avez pas fait d'erreur.\n"
@@ -1456,7 +1392,6 @@ msgstr ""
msgid "If you do not, your update will not be posted."
msgstr ""
-#: templates/web/default/report/new/councils_text_none.html:8
#: templates/web/default/report/new/councils_text_none.html:9
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 "Si vous signalez un problème ici, le sujet et les détails seront publics, mais le problème ne sera <strong>pas</strong> signalé à l'administration."
@@ -1508,7 +1443,7 @@ msgid ""
" when they are shown on the site. Enter the ID (number) of that user."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Contact.pm:111
+#: perllib/FixMyStreet/App/Controller/Contact.pm:116
msgid "Illegal ID"
msgstr "ID invalide"
@@ -1516,8 +1451,6 @@ msgstr "ID invalide"
msgid "Illegal feed selection"
msgstr "Sélection de flux invalide"
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:82
#: templates/web/default/dashboard/index.html:142
#: templates/web/default/dashboard/index.html:144
#: templates/web/default/report/update-form.html:30
@@ -1528,29 +1461,24 @@ msgid "In Progress"
msgstr "En cours"
#: templates/web/default/admin/flagged.html:39
-#, fuzzy
msgid "In abuse table?"
-msgstr "(email dans la liste des abus)"
+msgstr ""
#: templates/web/default/open311/index.html:90
msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
msgstr "En plus, les attributs suivants qui ne font pas partie de la spécification Open311 v2 sont renvoyés : agency_sent_datetime, title (qui est aussi renvoyé dans la description), interface_used, comment_count, requestor_name (seulement s'il est présent et que le requérant nous a autorisé à l'afficher sur le site)"
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:121
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:143
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:38
#: templates/web/fixmystreet/report/banner.html:19
-#: templates/web/zurich/admin/header.html:1
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/header.html:8
#: templates/web/zurich/admin/report_edit.html:102
#: templates/web/zurich/report/banner.html:15
msgid "In progress"
msgstr "En cours"
-#: templates/web/seesomething/report/new/fill_in_details_form.html:38
-msgid "Incident Category"
-msgstr ""
-
#: templates/web/zurich/admin/report_edit.html:163
msgid "Include reporter personal details"
msgstr ""
@@ -1576,7 +1504,7 @@ msgstr ""
msgid "Invalid agency_responsible value %s"
msgstr "Valeur agency_responsible invalide \"%s\""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1096
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1105
msgid "Invalid end date"
msgstr "Date de fin invalide"
@@ -1584,12 +1512,10 @@ msgstr "Date de fin invalide"
msgid "Invalid format %s specified."
msgstr "Format spécifié %s invalide"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1092
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1101
msgid "Invalid start date"
msgstr "Date de début invalide"
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:81
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:37
#: templates/web/default/dashboard/index.html:142
@@ -1601,30 +1527,25 @@ msgstr "Date de début invalide"
msgid "Investigating"
msgstr "En examen"
-#: templates/web/emptyhomes/tokens/confirm_problem.html:12
+#: templates/web/emptyhomes/tokens/confirm_problem.html:13
#: templates/web/emptyhomes/tokens/confirm_problem.html:14
msgid "It is worth noting however that the process can sometimes be slow, especially if the property is in very poor repair or the owner is unwilling to act. In most cases it can take six months or more before you can expect to see anything change and sometimes there may be considerable barries to a property being brought back into use. This doesn&rsquo;t mean the council isn&rsquo;t doing anything. We encourage councils to update the website so you can see what is happening. It may be a long process, but you reporting your concerns about this property to the council is a valuable first step."
msgstr ""
-#: templates/web/bromley/report/display.html:168
-#: templates/web/bromley/report/new/fill_in_details_form.html:209
+#: templates/web/fixmystreet/contact/blurb.html:8
+msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there."
+msgstr ""
+
#: templates/web/default/auth/general.html:44
#: templates/web/default/report/new/fill_in_details_form.html:149
#: templates/web/default/report/update-form.html:104
#: templates/web/fixmystreet/auth/general.html:46
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:172
#: templates/web/fixmystreet/report/update-form.html:100
-#: templates/web/seesomething/auth/general.html:35
#: templates/web/zurich/auth/general.html:40
msgid "Keep me signed in on this computer"
msgstr "Se souvenir de moi sur cet ordinateur"
-#: templates/web/bromley/report/display.html:197
-#: templates/web/bromley/report/new/fill_in_details_form.html:119
-#: templates/web/bromley/report/new/fill_in_details_form.html:166
-msgid "Last Name"
-msgstr ""
-
#: templates/web/default/admin/body.html:58
#: templates/web/zurich/admin/body.html:15
msgid "Last editor"
@@ -1647,11 +1568,9 @@ msgstr ""
msgid "List all reported problems"
msgstr "Lister tous les problèmes rapportés"
-#: templates/web/bromley/report/new/fill_in_details_form.html:69
#: templates/web/default/report/new/fill_in_details_form.html:68
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:51
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:75
-#: templates/web/seesomething/report/new/fill_in_details_form.html:25
#: templates/web/zurich/report/new/fill_in_details_form.html:51
msgid "Loading..."
msgstr "Chargement…"
@@ -1660,7 +1579,7 @@ msgstr "Chargement…"
#: templates/web/default/alert/choose.html:3
#: templates/web/default/alert/index.html:1
#: templates/web/default/alert/index.html:3
-#: templates/web/default/alert/list.html:1
+#: templates/web/default/alert/list.html:2
#: templates/web/default/alert/list.html:5
#: templates/web/default/alert/updates.html:1
#: templates/web/default/tokens/confirm_alert.html:1
@@ -1673,23 +1592,17 @@ msgstr "Chargement…"
msgid "Local RSS feeds and email alerts"
msgstr "Flux RSS et alertes email locaux"
-#: templates/web/default/alert/list.html:1
-#: templates/web/default/alert/list.html:12
+#: templates/web/default/alert/list.html:13
#: templates/web/default/alert/list.html:14
+#: templates/web/default/alert/list.html:2
#: templates/web/default/alert/list.html:3
msgid "Local RSS feeds and email alerts for ‘%s’"
msgstr "Flux RSS et alertes email locales pour « %s »"
-#: templates/web/barnet/footer.html:22 templates/web/bromley/footer.html:23
-#: templates/web/bromley/header.html:79 templates/web/default/footer.html:13
-#: templates/web/fiksgatami/footer.html:8
+#: templates/web/default/footer.html:13 templates/web/fiksgatami/footer.html:8
#: templates/web/fiksgatami/nn/footer.html:8
-#: templates/web/fixmindelo/footer.html:43
#: templates/web/fixmybarangay/footer.html:22
-#: templates/web/fixmystreet/footer.html:50
-#: templates/web/oxfordshire/footer.html:25
-#: templates/web/oxfordshire/header.html:71
-#: templates/web/reading/footer.html:9 templates/web/stevenage/footer.html:45
+#: templates/web/fixmystreet/footer.html:53
msgid "Local alerts"
msgstr "Alertes locales"
@@ -1698,7 +1611,6 @@ msgid "Locate the problem on a map of the area"
msgstr "Localisez le problème sur un plan des alentours"
#: templates/web/default/js/translation_strings.html:43
-#: templates/web/oxfordshire/js/translation_strings.html:37
msgid "MAP"
msgstr ""
@@ -1710,11 +1622,11 @@ msgstr "Plan &copy; <a id=\"osm_link\" href=\"http://www.openstreetmap.lu/\">Ope
msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
msgstr ""
-#: templates/web/fixmystreet/contact/index.html:98
+#: templates/web/fixmystreet/contact/index.html:103
msgid "Message"
msgstr "Message"
-#: templates/web/default/contact/index.html:90
+#: templates/web/default/contact/index.html:92
msgid "Message:"
msgstr "Message :"
@@ -1756,10 +1668,6 @@ msgstr "Encore plus de problèmes aux alentours"
msgid "Name"
msgstr "Nom"
-#: templates/web/seesomething/report/new/fill_in_details_form.html:74
-msgid "Name (optional)"
-msgstr ""
-
#: templates/web/default/admin/report_edit.html:66
#: templates/web/default/admin/update_edit.html:32
#: templates/web/default/admin/user-form.html:18
@@ -1769,30 +1677,30 @@ msgstr ""
msgid "Name:"
msgstr "Nom :"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:317
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:322
msgid "Name: %s"
msgstr ""
#: templates/web/fiksgatami/footer.html:3
#: templates/web/fiksgatami/nn/footer.html:3
-#: templates/web/reading/footer.html:4
msgid "Navigation"
msgstr "Navigation"
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:188
#: perllib/FixMyStreet/Geocode/OSM.pm:166
msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
msgstr "Route la plus proche de l'épingle placée sur le plan (génerée automatiquement à partir d'OpenStreetMap): %s%s"
-#: perllib/FixMyStreet/Cobrand/UK.pm:148
+#: perllib/FixMyStreet/Cobrand/UK.pm:142
msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
msgstr "Code postal le plus proche de l'épingle placée sur le plan (géneré automatiquement): %s (à %sm d'ici)"
-#: perllib/FixMyStreet/Cobrand/Default.pm:418
-#: perllib/FixMyStreet/Cobrand/Default.pm:458
+#: perllib/FixMyStreet/Cobrand/Default.pm:421
+#: perllib/FixMyStreet/Cobrand/Default.pm:461
msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
msgstr "Route la plus proche de l'épingle placée sur le plan (génerée automatiquement à partir de Bing Maps): %s%s"
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:273
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:297
msgid ""
"Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
"\n"
@@ -1934,14 +1842,12 @@ msgid "No edits have yet been made."
msgstr "Pas encore de modifications."
#: templates/web/default/admin/flagged.html:25
-#, fuzzy
msgid "No flagged problems found."
-msgstr "Aucun problème signalé n'a été trouvé"
+msgstr ""
#: templates/web/default/admin/flagged.html:58
-#, fuzzy
msgid "No flagged users found."
-msgstr "Aucun utilisateur signalé n'a été trouvé"
+msgstr ""
#: templates/web/zurich/admin/report_edit-sdm.html:68
msgid "No further updates"
@@ -1958,7 +1864,6 @@ msgid "No problems have been reported yet."
msgstr "Aucun problème n'a encore été signalé."
#: templates/web/default/js/translation_strings.html:38
-#: templates/web/oxfordshire/js/translation_strings.html:32
msgid "No result returned"
msgstr ""
@@ -1969,7 +1874,7 @@ msgid ""
" your config file is not pointing to a live MapIt service."
msgstr ""
-#: templates/web/default/report/_support.html:2
+#: templates/web/default/report/_support.html:3
#: templates/web/default/report/_support.html:4
msgid "No supporters"
msgstr ""
@@ -1993,8 +1898,6 @@ msgid ""
" activity across their body), the ability to hide reports or set special report statuses."
msgstr ""
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:83
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:46
#: templates/web/default/report/update-form.html:30
@@ -2053,7 +1956,6 @@ msgid "Now to submit your update&hellip; do you have a FixMyStreet password?"
msgstr "Maintenant pour envoyer votre mise à jour&hellip; avez-vous un mot de passe Fix.lu ?"
#: templates/web/default/js/translation_strings.html:42
-#: templates/web/oxfordshire/js/translation_strings.html:36
msgid "OK"
msgstr ""
@@ -2097,8 +1999,7 @@ msgstr "Anciens résolus"
msgid "Older problems"
msgstr "Anciens problèmes"
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:115
-#: templates/web/bromley/report/display.html:80
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:137
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:36
#: templates/web/default/admin/report_edit.html:37
@@ -2106,7 +2007,7 @@ msgstr "Anciens problèmes"
#: templates/web/default/dashboard/index.html:142
#: templates/web/default/report/update-form.html:30
#: templates/web/fixmystreet/report/update-form.html:28
-#: templates/web/zurich/admin/header.html:1
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/header.html:7
#: templates/web/zurich/admin/report_edit.html:89
#: templates/web/zurich/admin/report_edit.html:91
@@ -2115,7 +2016,7 @@ msgstr "Anciens problèmes"
msgid "Open"
msgstr "Ouvert"
-#: templates/web/default/my/my.html:22 templates/web/fixmystreet/my/my.html:26
+#: templates/web/default/my/my.html:27 templates/web/fixmystreet/my/my.html:33
msgid "Open reports"
msgstr "Rapports ouverts"
@@ -2141,15 +2042,15 @@ msgstr "Ou problèmes signalés à :"
msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
msgstr "Ou vous pouvez vous abonner à une alerte en fonction de la commune dans laquelle vous êtes :"
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1053
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:664
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:665
-#: perllib/FixMyStreet/DB/Result/Problem.pm:544
-#: perllib/FixMyStreet/DB/Result/Problem.pm:554
-#: perllib/FixMyStreet/DB/Result/Problem.pm:564
-#: perllib/FixMyStreet/DB/Result/Problem.pm:576
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:361
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1057
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:662
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:663
+#: perllib/FixMyStreet/DB/Result/Problem.pm:546
+#: perllib/FixMyStreet/DB/Result/Problem.pm:556
+#: perllib/FixMyStreet/DB/Result/Problem.pm:566
+#: perllib/FixMyStreet/DB/Result/Problem.pm:578
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:369
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:384
msgid "Other"
msgstr "Autres"
@@ -2176,8 +2077,6 @@ msgstr ""
msgid "Partial"
msgstr "Partiel"
-#: templates/web/bromley/report/display.html:147
-#: templates/web/bromley/report/new/fill_in_details_form.html:186
#: templates/web/fixmystreet/auth/general.html:59
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:208
#: templates/web/fixmystreet/report/update-form.html:119
@@ -2195,19 +2094,15 @@ msgid "Permalink"
msgstr ""
#: templates/web/zurich/report/new/fill_in_details_form.html:106
-#, fuzzy
msgid "Phone number"
-msgstr "Votre numéro de téléphone"
+msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:136
-#: templates/web/bromley/report/new/fill_in_details_form.html:183
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:138
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:205
-#: templates/web/seesomething/report/new/fill_in_details_form.html:89
msgid "Phone number (optional)"
msgstr "Téléphone (facultatif)"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:282
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:287
#: templates/web/default/admin/report_edit.html:68
#: templates/web/default/report/new/fill_in_details_form.html:215
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:138
@@ -2217,11 +2112,8 @@ msgstr "Téléphone (facultatif)"
msgid "Phone:"
msgstr "Téléphone"
-#: templates/web/bromley/report/display.html:111
-#: templates/web/bromley/report/new/fill_in_details_form.html:104
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:92
#: templates/web/fixmystreet/report/update-form.html:59
-#: templates/web/seesomething/report/new/fill_in_details_form.html:52
#: templates/web/zurich/admin/index-dm.html:29
#: templates/web/zurich/admin/index-sdm.html:24
#: templates/web/zurich/admin/reports.html:16
@@ -2243,7 +2135,6 @@ msgid "Photos of recent nearby reports"
msgstr "Photos de rapports récents à proximité"
#: templates/web/default/js/translation_strings.html:30
-#: templates/web/oxfordshire/js/translation_strings.html:24
msgid "Place pin on map"
msgstr ""
@@ -2251,7 +2142,7 @@ msgstr ""
#: templates/web/default/admin/report_edit.html:38
#: templates/web/default/dashboard/index.html:142
#: templates/web/default/dashboard/index.html:143
-#: templates/web/zurich/admin/header.html:1
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/header.html:9
#: templates/web/zurich/admin/index-dm.html:9
#: templates/web/zurich/admin/report_edit.html:89
@@ -2265,7 +2156,6 @@ msgstr "Merci de <a class=\"tab_link\" href=\"#report\">consulter</a> aux mises
#: templates/web/default/report/new/notes.html:6
#: templates/web/fixmystreet/report/new/notes.html:6
-#: templates/web/oxfordshire/report/new/notes.html:5
msgid "Please be polite, concise and to the point."
msgstr "Merci d'être poli, concis et précis."
@@ -2282,20 +2172,16 @@ msgstr "Merci de consulter vos emails"
#: templates/web/default/auth/general.html:8
#: templates/web/fixmystreet/auth/general.html:15
#: templates/web/fixmystreet/auth/general.html:9
-#: templates/web/seesomething/auth/general.html:15
-#: templates/web/seesomething/auth/general.html:9
#: templates/web/zurich/auth/general.html:3
#: templates/web/zurich/auth/general.html:9
msgid "Please check your email address is correct"
msgstr "Merci de vérifier que votre adresse email est correcte"
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:848
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:855
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:874
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:917
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:859
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:878
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:921
#: perllib/FixMyStreet/DB/Result/Problem.pm:381
#: templates/web/default/js/translation_strings.html:9
-#: templates/web/oxfordshire/js/translation_strings.html:9
msgid "Please choose a category"
msgstr "Merci de sélectionner une catégorie"
@@ -2303,19 +2189,8 @@ msgstr "Merci de sélectionner une catégorie"
msgid "Please choose a property type"
msgstr "Merci de choisir un type de propriété"
-#: templates/web/seesomething/js/translation_strings.html:6
-msgid "Please choose a transport category"
-msgstr ""
-
-#: templates/web/seesomething/js/translation_strings.html:7
-msgid "Please choose an incident category"
-msgstr ""
-
-#: templates/web/bromley/report/new/fill_in_details_form.html:64
-msgid "Please describe the exact location of the report. Example: “2 dumped mattresses outside Number 19 Stockwell Close”"
-msgstr ""
-
#: templates/web/default/contact/blurb.html:2
+#: templates/web/fixmystreet/contact/blurb.html:12
msgid ""
"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"
@@ -2327,7 +2202,6 @@ msgstr ""
#: templates/web/default/report/new/notes.html:7
#: templates/web/fixmystreet/report/new/notes.html:7
-#: templates/web/oxfordshire/report/new/notes.html:6
msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the service for all users."
msgstr ""
@@ -2337,7 +2211,6 @@ msgstr ""
#: perllib/FixMyStreet/DB/Result/Comment.pm:126
#: templates/web/default/js/translation_strings.html:2
-#: templates/web/oxfordshire/js/translation_strings.html:2
msgid "Please enter a message"
msgstr "Merci d'entrer un message"
@@ -2350,19 +2223,14 @@ msgstr "Merci d'entrer un mot de passe :"
#: perllib/FixMyStreet/App/Controller/Contact.pm:97
#: perllib/FixMyStreet/DB/Result/Problem.pm:356
#: templates/web/default/js/translation_strings.html:3
-#: templates/web/oxfordshire/js/translation_strings.html:3
msgid "Please enter a subject"
msgstr "Merci d'enter un sujet"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1032
-#: perllib/FixMyStreet/App/Controller/Admin.pm:979
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1041
+#: perllib/FixMyStreet/App/Controller/Admin.pm:988
#: perllib/FixMyStreet/DB/Result/User.pm:115
#: templates/web/default/js/translation_strings.html:12
#: templates/web/default/js/translation_strings.html:16
-#: templates/web/oxfordshire/js/translation_strings.html:12
-#: templates/web/oxfordshire/js/translation_strings.html:16
-#: templates/web/seesomething/js/translation_strings.html:10
-#: templates/web/seesomething/js/translation_strings.html:13
msgid "Please enter a valid email"
msgstr "Merci d'entrer un email valide"
@@ -2373,8 +2241,6 @@ msgstr "Merci d'entrer une adresse email valide"
#: perllib/FixMyStreet/DB/Result/Problem.pm:359
#: templates/web/default/js/translation_strings.html:4
-#: templates/web/oxfordshire/js/translation_strings.html:4
-#: templates/web/seesomething/js/translation_strings.html:2
msgid "Please enter some details"
msgstr "Merci d'entrer quelques détails"
@@ -2386,32 +2252,22 @@ msgstr "Merci d'entrer quelques détails"
#: templates/web/default/js/translation_strings.html:15
#: templates/web/fixmystreet/auth/general.html:14
#: templates/web/fixmystreet/auth/general.html:9
-#: templates/web/oxfordshire/js/translation_strings.html:11
-#: templates/web/oxfordshire/js/translation_strings.html:15
-#: templates/web/seesomething/auth/general.html:14
-#: templates/web/seesomething/auth/general.html:9
-#: templates/web/seesomething/js/translation_strings.html:9
#: templates/web/zurich/auth/general.html:3
#: templates/web/zurich/auth/general.html:8
msgid "Please enter your email"
msgstr "Merci d'entrer votre email"
-#: templates/web/bromley/report/new/fill_in_details_form.html:149
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:151
-#: templates/web/seesomething/report/new/fill_in_details_form.html:85
#: templates/web/zurich/report/new/fill_in_details_form.html:92
msgid "Please enter your email address"
msgstr "Merci d'entrer votre adresse email"
#: templates/web/default/js/translation_strings.html:25
-#: templates/web/oxfordshire/js/translation_strings.html:19
msgid "Please enter your first name"
msgstr ""
#: perllib/FixMyStreet/DB/Result/Problem.pm:374
#: templates/web/default/js/translation_strings.html:7
-#: templates/web/oxfordshire/js/translation_strings.html:7
-#: templates/web/seesomething/js/translation_strings.html:4
msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
msgstr "Merci d'entrer votre nom complet, les administrations ont besoin de cette information. Si vous ne souhaitez pas que votre nom soit affiché sur ce site, décochez la case ci-dessous"
@@ -2420,22 +2276,18 @@ msgstr "Merci d'entrer votre nom complet, les administrations ont besoin de cett
#: perllib/FixMyStreet/DB/Result/Problem.pm:367
#: perllib/FixMyStreet/DB/Result/User.pm:108
#: templates/web/default/js/translation_strings.html:6
-#: templates/web/oxfordshire/js/translation_strings.html:6
msgid "Please enter your name"
msgstr "Merci d'entrer votre nom"
#: templates/web/default/js/translation_strings.html:22
-#, fuzzy
msgid "Please enter your phone number"
-msgstr "Merci d'entrer votre nom"
+msgstr ""
#: templates/web/default/js/translation_strings.html:26
-#: templates/web/oxfordshire/js/translation_strings.html:20
msgid "Please enter your second name"
msgstr ""
#: templates/web/default/js/translation_strings.html:24
-#: templates/web/oxfordshire/js/translation_strings.html:18
msgid "Please enter your title"
msgstr ""
@@ -2454,16 +2306,16 @@ msgid ""
"to read, as does a lack of punctuation."
msgstr ""
-#: templates/web/default/report/new/fill_in_details_text.html:1
#: templates/web/default/report/new/fill_in_details_text.html:11
-#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1
+#: templates/web/default/report/new/fill_in_details_text.html:2
#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:10
-#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:2
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:2
#: templates/web/fixmystreet/report/new/fill_in_details_text.html:8
msgid "Please fill in details of the problem below."
msgstr "Merci d'entrer les détails du problème ci-dessous"
-#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:2
#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:3
msgid ""
"Please fill in details of the problem below. Leave as much detail as you can, \n"
@@ -2471,7 +2323,7 @@ msgid ""
"the problem (e.g. if there is a streetlight number or road name)."
msgstr ""
-#: templates/web/default/report/new/fill_in_details_text.html:1
+#: templates/web/default/report/new/fill_in_details_text.html:2
#: templates/web/default/report/new/fill_in_details_text.html:3
msgid ""
"Please fill in details of the problem below. The council won't be able\n"
@@ -2486,12 +2338,10 @@ msgstr ""
"avez une), etc."
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:70
-#: templates/web/seesomething/report/new/fill_in_details_form.html:20
#: templates/web/zurich/report/new/fill_in_details_form.html:46
msgid "Please fill in details of the problem."
msgstr "Merci d'entrer les détails du problème."
-#: templates/web/bromley/report/new/fill_in_details_form.html:28
#: templates/web/default/report/new/fill_in_details_form.html:27
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:26
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:35
@@ -2503,7 +2353,7 @@ msgstr "Merci de remplir le formulaire ci-dessous avec les détails du problème
msgid "Please indicate whether you'd like to receive another questionnaire"
msgstr "Merci d'indiquer si vous souhaitez recevoir un autre questionnaire"
-#: templates/web/fixmystreet/report/updates-sidebar-notes.html:3
+#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4
msgid "Please note that updates are not sent to the council."
msgstr ""
@@ -2511,11 +2361,6 @@ msgstr ""
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 "Merci de bien noter que les mises à jour ne sont pas envoyées à l'administration. Si vous laissez votre nom, il sera public. Vos informations seront uniquement utilisées conformément à nore <a href=\"/faq#privacy\">politique de confidentialité</a>"
-#: templates/web/barnet/report/updates-sidebar-notes.html:1
-msgid "Please note that updates are not sent to the relevant department. 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 ""
-
-#: templates/web/bromley/report/new/fill_in_details_form.html:23
#: templates/web/default/report/new/fill_in_details_form.html:5
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:5
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:26
@@ -2526,7 +2371,6 @@ msgstr "Merci de noter que votre rapport n'a <strong>pas</strong> été envoyé.
#: templates/web/default/report/new/notes.html:1
#: templates/web/fixmybarangay/report/new/notes.html:1
#: templates/web/fixmystreet/report/new/notes.html:1
-#: templates/web/oxfordshire/report/new/notes.html:1
msgid "Please note:"
msgstr "Quelques remarques :"
@@ -2571,19 +2415,15 @@ msgstr ""
msgid "Please write a message"
msgstr "Merci d'entrer un message"
-#: templates/web/bromley/report/display.html:70
#: templates/web/fixmystreet/report/update-form.html:23
msgid "Please write your update here"
msgstr "Merci d'écrire votre mise à jour ici"
-#: templates/web/bromley/report/display.html:123
-#: templates/web/bromley/report/display.html:151
-#: templates/web/bromley/report/display.html:163
-#: templates/web/default/contact/index.html:93
+#: templates/web/default/contact/index.html:95
#: templates/web/default/report/update-form.html:109
#: templates/web/default/report/update-form.html:131
#: templates/web/default/report/update-form.html:72
-#: templates/web/fixmystreet/contact/index.html:105
+#: templates/web/fixmystreet/contact/index.html:110
#: templates/web/fixmystreet/report/update-form.html:123
#: templates/web/fixmystreet/report/update-form.html:71
#: templates/web/fixmystreet/report/update-form.html:95
@@ -2616,7 +2456,7 @@ msgstr ""
msgid "Private information (not shown on site)"
msgstr ""
-#: templates/web/default/maps/openlayers.html:85
+#: templates/web/default/maps/openlayers.html:86
msgid "Problem"
msgstr "Problème"
@@ -2637,7 +2477,7 @@ msgstr "Problème %d signalé à l&rsquo;administration %s"
msgid "Problem breakdown by state"
msgstr "Répartition des problèmes par état"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:950
+#: perllib/FixMyStreet/App/Controller/Admin.pm:959
msgid "Problem marked as open."
msgstr "Problème signalé comme ouvert."
@@ -2653,7 +2493,6 @@ msgstr "Problèmes"
msgid "Problems in this area"
msgstr "Problèmes dans cette zone"
-#: templates/web/bromley/report/display.html:31
#: templates/web/fixmystreet/around/tabbed_lists.html:4
#: templates/web/fixmystreet/report/display.html:46
msgid "Problems nearby"
@@ -2673,15 +2512,16 @@ msgstr "Problèmes récemment signalés sur Fix.lu"
msgid "Problems within %.1fkm of this location"
msgstr "Problèmes à moins de %.1fkm de ce lieu"
-#: perllib/FixMyStreet/Cobrand/Default.pm:626
+#: perllib/FixMyStreet/Cobrand/Default.pm:629
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:109
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155
-#: perllib/FixMyStreet/Cobrand/UK.pm:228
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:184
+#: perllib/FixMyStreet/Cobrand/UK.pm:222
msgid "Problems within %s"
msgstr "Problèmes à l'intérieur de %s"
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117
-#: perllib/FixMyStreet/Cobrand/UK.pm:242
+#: perllib/FixMyStreet/Cobrand/UK.pm:236
msgid "Problems within %s ward"
msgstr "Problèmes dans la localité %s"
@@ -2709,12 +2549,10 @@ msgstr ""
msgid "Property type:"
msgstr "Type de propriété:"
-#: templates/web/bromley/report/new/fill_in_details_form.html:52
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:64
msgid "Provide a title"
msgstr "Entrez un titre"
-#: templates/web/bromley/report/display.html:57
#: templates/web/default/report/update-form.html:3
#: templates/web/fixmystreet/report/update-form.html:4
msgid "Provide an update"
@@ -2724,11 +2562,6 @@ msgstr "Apporter une mise à jour"
msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:180
-msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
-msgstr ""
-
-#: templates/web/bromley/report/display.html:144
#: templates/web/default/report/new/fill_in_details_form.html:173
#: templates/web/default/report/update-form.html:128
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:202
@@ -2759,7 +2592,6 @@ msgstr ""
msgid "Publish the response"
msgstr ""
-#: templates/web/default/questionnaire/completed.html:1
#: templates/web/default/questionnaire/completed.html:2
#: templates/web/default/questionnaire/index.html:0
#: templates/web/default/questionnaire/index.html:14
@@ -2783,9 +2615,7 @@ msgstr "Questionnaire %d envoyé pour problème %s"
msgid "Questionnaire filled in by problem reporter"
msgstr "Questionnaire rempli par le requérant"
-#: templates/web/bromley/report/display.html:37
#: templates/web/default/alert/_list.html:21
-#: templates/web/default/around/display_location.html:1
#: templates/web/default/around/display_location.html:3
#: templates/web/default/report/display.html:46
#: templates/web/default/reports/_rss.html:1
@@ -2795,11 +2625,11 @@ msgstr "Questionnaire rempli par le requérant"
msgid "RSS feed"
msgstr "Flux RSS"
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:265 perllib/FixMyStreet/Cobrand/UK.pm:277
msgid "RSS feed for %s"
msgstr "Flux RSS pour %s"
-#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289
+#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
msgid "RSS feed for %s ward, %s"
msgstr "Flux RSS pour la localité %s, %s"
@@ -2807,11 +2637,15 @@ msgstr "Flux RSS pour la localité %s, %s"
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:189
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:197
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:309
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:200
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:208
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:218
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:226
+#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303
msgid "RSS feed of %s"
msgstr "Flux RSS de %s"
-#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:314
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:308
msgid "RSS feed of %s, within %s ward"
msgstr "Flux RSS de %s, dans la localité %s"
@@ -2824,31 +2658,30 @@ msgstr "Flux RSS de problèmes à proximité"
msgid "RSS feed of problems in this %s"
msgstr "Flux RSS de problèmes à l'intérieur de cette %s"
-#: perllib/FixMyStreet/Cobrand/Default.pm:627
+#: perllib/FixMyStreet/Cobrand/Default.pm:630
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:110
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:154
-#: perllib/FixMyStreet/Cobrand/UK.pm:235
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:183
+#: perllib/FixMyStreet/Cobrand/UK.pm:229
msgid "RSS feed of problems within %s"
msgstr "Flux RSS de problèmes à l'intérieur de %s"
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:116
-#: perllib/FixMyStreet/Cobrand/UK.pm:241
+#: perllib/FixMyStreet/Cobrand/UK.pm:235
msgid "RSS feed of problems within %s ward"
msgstr "Flux RSS de problèmes à l'intérieur de la localité %s"
-#: templates/web/default/around/display_location.html:1
+#: templates/web/default/around/display_location.html:3
#: templates/web/default/around/display_location.html:4
msgid "RSS feed of recent local problems"
msgstr "Flux RSS de problèmes récents locaux"
-#: templates/web/bromley/report/display.html:37
#: templates/web/default/report/display.html:46
#: templates/web/fixmystreet/alert/updates.html:9
#: templates/web/fixmystreet/report/display.html:61
msgid "RSS feed of updates to this problem"
msgstr "Flux RSS des mises à jour pour ce problème"
-#: templates/web/bromley/report/display.html:39
#: templates/web/default/alert/updates.html:9
#: templates/web/default/report/display.html:37
#: templates/web/fixmystreet/alert/updates.html:14
@@ -2872,7 +2705,7 @@ msgid "Recently fixed"
msgstr "Récemment résolus"
#: templates/web/default/index.html:35 templates/web/emptyhomes/index.html:24
-#: templates/web/fixmystreet/index.html:45
+#: templates/web/fixmystreet/index.html:49
msgid "Recently reported problems"
msgstr "Problèmes signalés récemment"
@@ -2889,8 +2722,8 @@ msgstr ""
msgid "Remove flag"
msgstr "Effacer le signalement"
-#: templates/web/default/admin/report_edit.html:89
-#: templates/web/default/admin/update_edit.html:57
+#: templates/web/default/admin/report_edit.html:94
+#: templates/web/default/admin/update_edit.html:62
#: templates/web/zurich/admin/update_edit.html:35
msgid "Remove photo (can't be undone!)"
msgstr "Effacer la photo (ne peut pas être annulé !)"
@@ -2899,29 +2732,21 @@ msgstr "Effacer la photo (ne peut pas être annulé !)"
msgid "Report Empty Homes"
msgstr ""
-#: templates/web/barnet/footer.html:16 templates/web/bromley/footer.html:17
#: templates/web/default/footer.html:7 templates/web/emptyhomes/header.html:31
#: templates/web/fiksgatami/footer.html:5
#: templates/web/fiksgatami/nn/footer.html:5
-#: templates/web/fixmindelo/footer.html:37
-#: templates/web/fixmystreet/footer.html:44
-#: templates/web/oxfordshire/footer.html:19
-#: templates/web/reading/footer.html:6
-#: templates/web/seesomething/footer.html:11
-#: templates/web/stevenage/footer.html:39 templates/web/zurich/footer.html:17
+#: templates/web/fixmystreet/footer.html:47
+#: templates/web/zurich/footer.html:17
#: templates/web/zurich/nav_over_content.html:4
msgid "Report a problem"
msgstr "Signaler un problème"
-#: templates/web/bromley/report/display.html:28
#: templates/web/fixmystreet/report/display.html:35
msgid "Report abuse"
msgstr "Signaler un abus"
#: templates/web/default/report_created.html:1
#: templates/web/default/report_created.html:3
-#: templates/web/seesomething/report_created.html:0
-#: templates/web/seesomething/report_created.html:8
msgid "Report created"
msgstr ""
@@ -2931,22 +2756,21 @@ msgstr "Signaler sur %s"
#: templates/web/default/index.html:14 templates/web/emptyhomes/index.html:5
#: templates/web/fixmystreet/around/intro.html:1
-#: templates/web/stevenage/around/intro.html:1
#: templates/web/zurich/around/intro.html:1
msgid "Report, view, or discuss local problems"
msgstr "Signalez, voyez ou discutez des problèmes locaux"
-#: templates/web/default/my/my.html:74
+#: templates/web/default/my/my.html:79
msgid "Reported %s"
msgstr "Signalé %s"
-#: templates/web/default/my/my.html:72
+#: templates/web/default/my/my.html:77
msgid "Reported %s, to %s"
msgstr "Signalé %s, à %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:559
+#: perllib/FixMyStreet/DB/Result/Problem.pm:561
#: templates/web/default/contact/index.html:45
-#: templates/web/fixmystreet/contact/index.html:58
+#: templates/web/fixmystreet/contact/index.html:62
msgid "Reported anonymously at %s"
msgstr "Signalé anonymement à %s"
@@ -2956,9 +2780,9 @@ msgstr "Signalé anonymement à %s"
msgid "Reported before"
msgstr "Signalé avant"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:582
+#: perllib/FixMyStreet/DB/Result/Problem.pm:584
#: templates/web/default/contact/index.html:47
-#: templates/web/fixmystreet/contact/index.html:60
+#: templates/web/fixmystreet/contact/index.html:64
msgid "Reported by %s at %s"
msgstr "Signalé par %s à %s"
@@ -2966,27 +2790,27 @@ msgstr "Signalé par %s à %s"
msgid "Reported in the %s category"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:555
+#: perllib/FixMyStreet/DB/Result/Problem.pm:557
msgid "Reported in the %s category anonymously at %s"
msgstr "Signalé dans la catégorie %s anonymement à %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:577
+#: perllib/FixMyStreet/DB/Result/Problem.pm:579
msgid "Reported in the %s category by %s at %s"
msgstr "Signalé dans la catégorie %s par %s à %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:551
+#: perllib/FixMyStreet/DB/Result/Problem.pm:553
msgid "Reported via %s anonymously at %s"
msgstr "Signalé par %s anonymement à %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:573
+#: perllib/FixMyStreet/DB/Result/Problem.pm:575
msgid "Reported via %s by %s at %s"
msgstr "Signalé par %s par %s à %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:547
+#: perllib/FixMyStreet/DB/Result/Problem.pm:549
msgid "Reported via %s in the %s category anonymously at %s"
msgstr "Signalé par %s dans la catégorie %s anonymement à %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:567
+#: perllib/FixMyStreet/DB/Result/Problem.pm:569
msgid "Reported via %s in the %s category by %s at %s"
msgstr "Signalé par %s dans la catégorie %s par %s"
@@ -3000,22 +2824,18 @@ msgstr "Signalé par %s dans la catégorie %s par %s"
#: templates/web/fixmystreet/report/new/fill_in_details.html:0
#: templates/web/fixmystreet/report/new/fill_in_details.html:5
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2
-#: templates/web/oxfordshire/js/translation_strings.html:35
-#: templates/web/seesomething/around/around_index.html:1
-#: templates/web/seesomething/report/new/fill_in_details_form.html:3
#: templates/web/zurich/report/new/fill_in_details_form.html:2
msgid "Reporting a problem"
msgstr "Signalisation d'un problème"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1177
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:242
-#: templates/web/seesomething/admin/stats.html:1
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1186
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:290
#: templates/web/zurich/header.html:60
msgid "Reports"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:393
-#: perllib/FixMyStreet/DB/Result/Problem.pm:397
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
+#: perllib/FixMyStreet/DB/Result/Problem.pm:399
msgid "Reports are limited to %s characters in length. Please shorten your report"
msgstr ""
@@ -3036,27 +2856,28 @@ msgid "Resend report"
msgstr "Renvoyer le rapport"
#: templates/web/default/js/translation_strings.html:28
-#: templates/web/oxfordshire/js/translation_strings.html:22
msgid "Right place?"
msgstr ""
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:195
#: perllib/FixMyStreet/Geocode/OSM.pm:173
msgid "Road operator for this named road (derived from road reference number and type): %s"
msgstr "Opérateur pour cette route (déterminé à partir de la référence et du type de la route): %s"
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:192
#: perllib/FixMyStreet/Geocode/OSM.pm:170
msgid "Road operator for this named road (from OpenStreetMap): %s"
msgstr "Opérateur pour cette route (selon OpenStreetMAp): %s"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1377
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1388
-#: templates/web/default/admin/report_edit.html:85
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1386
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1397
+#: templates/web/default/admin/report_edit.html:90
#: templates/web/zurich/admin/report_edit.html:76
msgid "Rotate Left"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1377
-#: templates/web/default/admin/report_edit.html:86
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1386
+#: templates/web/default/admin/report_edit.html:91
#: templates/web/zurich/admin/report_edit.html:77
msgid "Rotate Right"
msgstr ""
@@ -3085,9 +2906,8 @@ msgid "Search:"
msgstr "Rechercher :"
#: templates/web/default/admin/reports.html:26
-#, fuzzy
msgid "Searching found no reports."
-msgstr "Rechercher rapports"
+msgstr ""
#: templates/web/default/admin/users.html:39
msgid "Searching found no users."
@@ -3108,7 +2928,7 @@ msgstr ""
msgid "Select which type of alert you'd like and click the button for an RSS feed, or enter your email address to subscribe to an email alert."
msgstr "Sélectionnez le type d'alerte que vous souhaitez et cliquez sur le bouton d'un flux RSS, ou entrez votre adresse e-mail pour vous abonner à une alerte e-mail."
-#: perllib/FixMyStreet/DB/Result/Problem.pm:664
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
msgid "Sent to %s %s later"
msgstr "Envoyé à %s %s plus tard)"
@@ -3125,9 +2945,6 @@ msgstr "Service:"
msgid "Share"
msgstr ""
-#: templates/web/bromley/report/display.html:205
-#: templates/web/bromley/report/new/fill_in_details_form.html:129
-#: templates/web/bromley/report/new/fill_in_details_form.html:175
#: templates/web/default/report/new/fill_in_details_form.html:210
#: templates/web/default/report/update-form.html:157
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:129
@@ -3150,11 +2967,7 @@ msgstr "Montrer les épingles"
#: templates/web/fixmystreet/auth/general.html:3
#: templates/web/fixmystreet/auth/general.html:42
#: templates/web/fixmystreet/auth/general.html:62
-#: templates/web/fixmystreet/header.html:54
-#: templates/web/oxfordshire/header.html:115
-#: templates/web/seesomething/auth/general.html:3
-#: templates/web/seesomething/auth/general.html:39
-#: templates/web/stevenage/header.html:101
+#: templates/web/fixmystreet/header.html:57
#: templates/web/zurich/auth/general.html:18
#: templates/web/zurich/auth/general.html:35
msgid "Sign in"
@@ -3166,20 +2979,15 @@ msgstr "S'authentifier par email"
#: templates/web/default/auth/general.html:1
#: templates/web/fixmystreet/auth/general.html:1
-#: templates/web/seesomething/auth/general.html:1
#: templates/web/zurich/auth/general.html:1
msgid "Sign in or create an account"
msgstr "Connectez-vous ou créez un compte"
-#: templates/web/bromley/auth/sign_out.html:1
#: templates/web/default/auth/sign_out.html:1
#: templates/web/default/header.html:30
#: templates/web/emptyhomes/header.html:46
#: templates/web/fiksgatami/header.html:22
#: templates/web/fiksgatami/nn/header.html:22
-#: templates/web/lichfielddc/header.html:177
-#: templates/web/reading/header.html:33
-#: templates/web/seesomething/auth/sign_out.html:1
#: templates/web/zurich/auth/sign_out.html:1
msgid "Sign out"
msgstr "Déconnexion"
@@ -3188,14 +2996,12 @@ msgstr "Déconnexion"
#: templates/web/emptyhomes/header.html:45
#: templates/web/fiksgatami/header.html:21
#: templates/web/fiksgatami/nn/header.html:21
-#: templates/web/lichfielddc/header.html:177
-#: templates/web/reading/header.html:32
msgid "Signed in as %s"
msgstr "Connecté en tant que %s"
-#: templates/web/default/report/new/fill_in_details_text.html:1
-#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1
-#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1
+#: templates/web/default/report/new/fill_in_details_text.html:2
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:2
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:2
msgid "Some categories may require additional information."
msgstr "Certaines catégories peuvent exiger des renseignements supplémentaires."
@@ -3226,6 +3032,8 @@ msgstr "Désolé, il n'y a eu une erreur lors de la confirmation de votre probl
#: perllib/FixMyStreet/App/Controller/Report/New.pm:215
#: perllib/FixMyStreet/Geocode.pm:28 perllib/FixMyStreet/Geocode/Bing.pm:58
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:75
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:95
#: perllib/FixMyStreet/Geocode/Google.pm:74
#: perllib/FixMyStreet/Geocode/OSM.pm:66
msgid "Sorry, we could not find that location."
@@ -3233,7 +3041,7 @@ msgstr "Désolé, nous n'avons pas pu trouver cet emplacement."
#: perllib/FixMyStreet/Geocode/Bing.pm:53
#: perllib/FixMyStreet/Geocode/Google.pm:69
-#: perllib/FixMyStreet/Geocode/Zurich.pm:87
+#: perllib/FixMyStreet/Geocode/Zurich.pm:88
msgid "Sorry, we could not parse that location. Please try again."
msgstr "Désolé, nous n'avons pas pu trouver cet emplacement. Merci de réessayer."
@@ -3243,11 +3051,9 @@ msgid "Source code"
msgstr "Code source"
#: templates/web/default/admin/stats.html:64
-#, fuzzy
msgid "Start Date:"
-msgstr "Jour de début :"
+msgstr ""
-#: templates/web/bromley/report/display.html:78
#: templates/web/default/admin/flagged.html:18
#: templates/web/default/admin/list_updates.html:11
#: templates/web/default/admin/reports.html:15
@@ -3264,8 +3070,8 @@ msgstr "État actuel"
msgid "State:"
msgstr "État actuel :"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1182
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:257
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1191
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:305
#: templates/web/default/admin/stats.html:1
#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72
msgid "Stats"
@@ -3281,7 +3087,7 @@ msgstr ""
msgid "Still open, via questionnaire, %s"
msgstr "Encore ouvert, via questionnaire, %s"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:370
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378
msgid "Subcategory: %s"
msgstr ""
@@ -3289,8 +3095,7 @@ msgstr ""
msgid "Subdivision/Body"
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:48
-#: templates/web/fixmystreet/contact/index.html:91
+#: templates/web/fixmystreet/contact/index.html:95
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:60
msgid "Subject"
msgstr "Sujet"
@@ -3303,9 +3108,6 @@ msgstr "Sujet"
msgid "Subject:"
msgstr "Sujet :"
-#: templates/web/bromley/report/new/fill_in_details_form.html:140
-#: templates/web/bromley/report/new/fill_in_details_form.html:190
-#: templates/web/bromley/report/new/fill_in_details_form.html:204
#: templates/web/default/questionnaire/creator_fixed.html:19
#: templates/web/default/report/new/fill_in_details_form.html:114
#: templates/web/default/report/new/fill_in_details_form.html:154
@@ -3314,13 +3116,12 @@ msgstr "Sujet :"
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:142
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:167
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:212
-#: templates/web/seesomething/report/new/fill_in_details_form.html:93
#: templates/web/zurich/report/new/fill_in_details_form.html:114
msgid "Submit"
msgstr "Envoyer"
-#: templates/web/default/admin/report_edit.html:92
-#: templates/web/default/admin/update_edit.html:60
+#: templates/web/default/admin/report_edit.html:97
+#: templates/web/default/admin/update_edit.html:65
#: templates/web/default/admin/user-form.html:55
#: templates/web/zurich/admin/report_edit-sdm.html:67
#: templates/web/zurich/admin/report_edit.html:224
@@ -3333,8 +3134,8 @@ msgstr "Envoyer les modifications"
msgid "Submit questionnaire"
msgstr "Envoi du questionnaire"
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:111
-#: templates/web/zurich/admin/header.html:1
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:133
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/header.html:6
#: templates/web/zurich/admin/index-dm.html:23
#: templates/web/zurich/admin/index-dm.html:6
@@ -3346,7 +3147,6 @@ msgstr "Envoi du questionnaire"
msgid "Submitted"
msgstr ""
-#: templates/web/bromley/report/display.html:44
#: templates/web/default/alert/updates.html:17
#: templates/web/default/report/display.html:42
#: templates/web/fixmystreet/alert/updates.html:23
@@ -3364,8 +3164,8 @@ msgstr "M'abonner à une alerte par email"
msgid "Subscribe to an alert based upon what baranagay you&rsquo;re in:"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1175
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:241
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1184
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:289
#: templates/web/default/admin/index.html:1
#: templates/web/zurich/admin/index-dm.html:1
#: templates/web/zurich/admin/index-sdm.html:1
@@ -3384,7 +3184,7 @@ msgstr "Sommaires"
msgid "Summary reports"
msgstr "Rapports sommaires"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1179
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1188
msgid "Survey"
msgstr ""
@@ -3407,17 +3207,15 @@ msgstr "Version texte seulement"
msgid "Text:"
msgstr "Texte :"
-#: templates/web/default/tokens/confirm_update.html:7
#: templates/web/default/tokens/confirm_update.html:8
msgid "Thank you &mdash; you can <a href=\"%s\">view your updated problem</a> on the site."
msgstr "Merci &mdash; vous pouvez <a href=\"%s\">voir votre problème mis à jour</a> sur le site."
-#: templates/web/emptyhomes/tokens/confirm_problem.html:6
+#: templates/web/emptyhomes/tokens/confirm_problem.html:7
#: templates/web/emptyhomes/tokens/confirm_problem.html:8
msgid "Thank you for reporting an empty property on ReportEmptyHomes.com. We have emailed the lead officer for empty homes in the council responsible with details, and asked them to do whatever they can to get the empty property back into use as soon as possible."
msgstr ""
-#: templates/web/emptyhomes/tokens/confirm_problem.html:30
#: templates/web/emptyhomes/tokens/confirm_problem.html:31
msgid ""
"Thank you for reporting this empty property on ReportEmptyHomes.com.\n"
@@ -3430,7 +3228,7 @@ msgstr ""
msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it."
msgstr "Merci d'essayer de confirmer votre mise à jour ou un problème. Nous semblons rencontrer une erreur de notre côte ; s'il vous plaît, <a href=\"%s\"> dites-nous nous ce qui s'est passé</ a> et nous nous pencherons sur la question."
-#: templates/web/emptyhomes/tokens/confirm_problem.html:24
+#: templates/web/emptyhomes/tokens/confirm_problem.html:25
#: templates/web/emptyhomes/tokens/confirm_problem.html:26
msgid "Thank you for using ReportEmptyHomes.com. Your action is already helping to resolve the UK&rsquo;s empty homes crisis."
msgstr ""
@@ -3451,15 +3249,16 @@ msgstr "Merci, heureux d'entendre que ça a été résolu ! Pourrions-nous just
msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
msgstr "Cette image ne ​​semble pas avoir été chargés correctement (% s), réessayez s'il vous plaît."
-#: perllib/FixMyStreet/App/Controller/Council.pm:90
+#: perllib/FixMyStreet/App/Controller/Council.pm:100
msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Location.pm:123
+#: perllib/FixMyStreet/App/Controller/Location.pm:124
msgid "That location does not appear to be in the UK; please try again."
msgstr ""
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:63
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:79
#: perllib/FixMyStreet/Cobrand/UK.pm:86
msgid "That postcode was not recognised, sorry."
msgstr "Ce code postal n'a pas été reconnu, désolé."
@@ -3519,7 +3318,7 @@ msgstr ""
msgid "The confirmation email <strong>may</strong> take a few minutes to arrive &mdash; <em>please</em> be patient."
msgstr "L'email de confirmation <strong>peut</ strong> prendre quelques minutes pour arriver — <em>merci</em> de patienter."
-#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:2
#: templates/web/fixmystreet/report/new/fill_in_details_text.html:3
msgid "The council won&rsquo;t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc."
msgstr ""
@@ -3546,6 +3345,7 @@ msgstr "L'erreur était : %s"
msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
msgstr "Les attributs Open311 v2 suivants sont retournés pour chaque requête : service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code et service_name."
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:187
#: perllib/FixMyStreet/Geocode/OSM.pm:165
msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
msgstr "Les informations suivantes au sujet de la route la plus proche pourrait être inexactes ou non pertinentes si le problème est proche de plusieurs routes ou près d'une route sans nom enregistré dans OpenStreetMap."
@@ -3604,7 +3404,7 @@ msgstr ""
msgid "The passwords do not match"
msgstr "Les mots de passe ne correspondent pas"
-#: templates/web/default/errors/page_error_404_not_found.html:10
+#: templates/web/default/errors/page_error_404_not_found.html:11
#: templates/web/default/errors/page_error_404_not_found.html:12
msgid "The requested URL '%s' was not found on this server"
msgstr "L'URL demandée « %s » n'a pas été trouvée sur ce serveur"
@@ -3614,16 +3414,14 @@ msgstr "L'URL demandée « %s » n'a pas été trouvée sur ce serveur"
msgid "The simplest alert is our geographic one:"
msgstr "La plus simple de nos alertes est la géographique :"
-#: templates/web/barnet/report/new/councils_text_all.html:3
#: templates/web/default/report/new/councils_extra_text.html:1
-#: templates/web/default/report/new/councils_text_some.html:10
#: templates/web/default/report/new/councils_text_some.html:11
#: templates/web/default/report/new/fill_in_details_form.html:17
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12
msgid "The subject and details of the problem will be public, plus your name if you give us permission."
msgstr "Le sujet et les détails du problème seront rendus publics, ainsi que votre nom si vous nous donnez la permission."
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:291
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:296
msgid "The user could not locate the problem on a map, but to see the area around the location they entered"
msgstr "L'utilisateur n'a pas pu localiser le problème sur une carte, mais pour voir la zone autour de l'endroit qu'il ou elle a entré"
@@ -3638,16 +3436,15 @@ msgstr ""
msgid "There was a problem showing the All Reports page. Please try again later."
msgstr "Il y a eu un problème pour montrer la page tous les rapports. Réessayez s'il vous plaît ultérieurement."
-#: perllib/FixMyStreet/App/Controller/Contact.pm:116
+#: perllib/FixMyStreet/App/Controller/Contact.pm:121
#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59
msgid "There was a problem showing this page. Please try again later."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:747
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:755
#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134
#: templates/web/default/auth/general.html:23
#: templates/web/fixmystreet/auth/general.html:24
-#: templates/web/seesomething/auth/general.html:24
#: templates/web/zurich/auth/general.html:28
msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the &lsquo;sign in by email&rsquo; section of the form."
msgstr "Il y a un problème avec votre combinaison email / mot de passe. Si vous ne pouvez pas vous souvenir de votre mot de passe, ou n'en avez pas, remplissez s'il vous plaît la section « s'authentifier par email » du formulaire."
@@ -3660,7 +3457,7 @@ msgstr "Il y a un problème avec votre combinaison email / mot de passe. Réessa
msgid "There was a problem with your update. Please try again."
msgstr "Il y a un problème avec votre mise à jour. Réessayez s'il vous plaît."
-#: perllib/FixMyStreet/App/Controller/Contact.pm:120
+#: perllib/FixMyStreet/App/Controller/Contact.pm:125
msgid "There were problems with your report. Please see below."
msgstr "Il y a un problème avec votre rapport. Voir s'il vous plaît plus bas."
@@ -3700,16 +3497,16 @@ msgid ""
" A body will not receive any reports unless it covers at least one area."
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:375
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:385
msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system."
msgstr "Cet email a été envoyé aux deux administrations couvrant l'emplacement du problème parce que l'utilisateur ne l'a pas classé ; ignorez-le s'il vous plaît si vous n'êtes pas l'administration responsable pour la question, ou faites-nous savoir la bonne catégorie de problèmes afin que nous puissions l'ajouter à notre système."
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:388
msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue."
msgstr "Cet email a été envoyé à plus d'une administration couvrant l'emplacement du problème, la catégorie de problème choisie par l'utilisateur étant présente pour chacune d'entre elles ; ignorez-le s'il vous plaît si vous n'êtes pas l'administration responsable pour la question."
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:894
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:964
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:898
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:968
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:131
#: perllib/FixMyStreet/Cobrand/UK.pm:58
msgid "This information is required"
@@ -3741,7 +3538,6 @@ msgstr ""
msgid "This problem has been closed"
msgstr "Ce problème a été clos"
-#: templates/web/bromley/report/display.html:98
#: templates/web/default/report/banner.html:12
#: templates/web/default/report/update-form.html:48
#: templates/web/emptyhomes/report/banner.html:3
@@ -3749,7 +3545,6 @@ msgstr "Ce problème a été clos"
msgid "This problem has been fixed"
msgstr "Ce problème a été résolu"
-#: templates/web/bromley/report/display.html:92
#: templates/web/default/report/update-form.html:43
#: templates/web/fixmystreet/report/update-form.html:40
msgid "This problem has not been fixed"
@@ -3763,33 +3558,33 @@ msgstr "Ce problème est en cours"
msgid "This problem is old and of unknown status."
msgstr "Ce problème est vieux et de statut inconnu."
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:108
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:109
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:130
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:131
#: templates/web/zurich/report/_main.html:14
msgid "This report is awaiting moderation."
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88
msgid "This report is currently marked as closed."
msgstr "Ce rapport est actuellement marqué comme fermé."
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86
msgid "This report is currently marked as fixed."
msgstr "Ce rapport est actuellement marqué comme résolu."
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:90
msgid "This report is currently marked as open."
msgstr "Ce rapport est actuellement marqué comme ouvert."
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:320
msgid "This report was submitted anonymously"
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:284
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:289
msgid "This web page also contains a photo of the problem, provided by the user."
msgstr "Cette page Web contient également une photo du problème, fournie par l'utilisateur."
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1178
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1187
#: templates/web/default/admin/timeline.html:1
msgid "Timeline"
msgstr "Chronologie"
@@ -3807,7 +3602,7 @@ msgstr "Pour <strong>signaler un problème</ strong>, cliquez sur la carte à l'
msgid "To find out what local alerts we have for you, please enter your postcode or street name and area"
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:290
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:295
msgid "To view a map of the precise location of this issue"
msgstr "Pour voir une carte de l'emplacement précis de ce problème"
@@ -3819,17 +3614,10 @@ msgstr "Pour voir une carte de l'emplacement précis de ce problème"
msgid "Total"
msgstr "Total"
-#: templates/web/seesomething/report/new/fill_in_details_form.html:24
-msgid "Transport Category"
-msgstr ""
-
#: templates/web/default/js/translation_strings.html:29
-#: templates/web/oxfordshire/js/translation_strings.html:23
msgid "Try again"
msgstr ""
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:83
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:46
#: templates/web/default/report/update-form.html:30
@@ -3857,7 +3645,6 @@ msgid "Unknown alert type"
msgstr "Type d'alerte inconnu"
#: templates/web/default/js/translation_strings.html:39
-#: templates/web/oxfordshire/js/translation_strings.html:33
msgid "Unknown error"
msgstr ""
@@ -3865,7 +3652,6 @@ msgstr ""
msgid "Unknown problem ID"
msgstr "ID de problème inconnu"
-#: templates/web/bromley/report/display.html:66
#: templates/web/fixmystreet/report/update-form.html:19
msgid "Update"
msgstr "Mise à jour"
@@ -3875,12 +3661,12 @@ msgid "Update %s created for problem %d; by %s"
msgstr "Mise à jour %s créée pour le problème %d; par %s"
#: templates/web/default/contact/index.html:21
-#: templates/web/fixmystreet/contact/index.html:34
+#: templates/web/fixmystreet/contact/index.html:38
msgid "Update below added anonymously at %s"
msgstr "Mise à jour ci-dessous ajoutée anonymement à %s"
#: templates/web/default/contact/index.html:23
-#: templates/web/fixmystreet/contact/index.html:36
+#: templates/web/fixmystreet/contact/index.html:40
msgid "Update below added by %s at %s"
msgstr "Mise à jour ci-dessous ajoutée par %s à %s"
@@ -3924,12 +3710,12 @@ msgstr "Mise à jour :"
msgid "Updated"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1042
-#: perllib/FixMyStreet/App/Controller/Admin.pm:796
-#: perllib/FixMyStreet/App/Controller/Admin.pm:940
-#: perllib/FixMyStreet/App/Controller/Admin.pm:998
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:487
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:556
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1007
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1051
+#: perllib/FixMyStreet/App/Controller/Admin.pm:801
+#: perllib/FixMyStreet/App/Controller/Admin.pm:949
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:550
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:619
msgid "Updated!"
msgstr "Mis à jour !"
@@ -3941,16 +3727,14 @@ msgstr "Mis à jour !"
msgid "Updates"
msgstr "Mises à jour"
-#: perllib/FixMyStreet/DB/Result/Comment.pm:131
-msgid "Updates are limited to 2000 characters in length. Please shorten your update"
+#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+msgid "Updates are limited to %s characters in length. Please shorten your update"
msgstr ""
#: db/alert_types.pl:5 db/alert_types.pl:6
msgid "Updates on {{title}}"
msgstr "Mises à jour sur {{title}}"
-#: templates/web/bromley/report/display.html:0
-#: templates/web/bromley/report/display.html:8
#: templates/web/default/report/display.html:0
#: templates/web/default/report/display.html:5
#: templates/web/fixmystreet/report/display.html:0
@@ -3964,15 +3748,14 @@ msgstr ""
#: templates/web/zurich/admin/list_updates.html:30
#: templates/web/zurich/admin/list_updates.html:9
-#, fuzzy
msgid "User"
-msgstr "Utilisateurs"
+msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1342
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1351
msgid "User flag removed"
msgstr "Utilisateur dé–signalé"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1314
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1323
msgid "User flagged"
msgstr "Utilisateur signalé"
@@ -3980,8 +3763,8 @@ msgstr "Utilisateur signalé"
msgid "User search finds matches in users' names and email addresses."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:256
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1189
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:304
#: templates/web/default/admin/flagged.html:29
#: templates/web/zurich/header.html:69
msgid "Users"
@@ -4010,12 +3793,9 @@ msgstr "Voir votre rapport"
#: templates/web/default/around/display_location.html:0
#: templates/web/default/around/display_location.html:34
-#: templates/web/seesomething/around/display_location.html:0
-#: templates/web/seesomething/around/display_location.html:16
msgid "Viewing a location"
msgstr "Consultation d'un lieu"
-#: templates/web/bromley/report/display.html:0
#: templates/web/default/report/display.html:0
#: templates/web/fixmystreet/report/display.html:0
msgid "Viewing a problem"
@@ -4028,7 +3808,6 @@ msgstr "Localités de cette administration"
#: templates/web/default/alert/choose.html:6
#: templates/web/default/around/around_index.html:13
#: templates/web/fixmystreet/around/around_index.html:16
-#: templates/web/seesomething/around/around_index.html:13
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 "Nous avons trouvé plus d'une correspondance pour cet endroit. Nous montrons jusqu'à dix résultats, essayez s'il vous plaît une recherche différente si le vôtre n'est pas ici."
@@ -4040,25 +3819,22 @@ msgstr ""
msgid "We have sent you an email containing a link to confirm your account."
msgstr "Nous vous avons envoyé un email contenant un lien pour confirmer votre compte."
-#: templates/web/emptyhomes/tokens/confirm_problem.html:18
+#: templates/web/emptyhomes/tokens/confirm_problem.html:19
#: templates/web/emptyhomes/tokens/confirm_problem.html:20
msgid "We may contact you periodically to ask if anything has changed with the property you reported."
msgstr ""
-#: templates/web/bromley/report/display.html:143
#: templates/web/fixmystreet/report/update-form.html:115
msgid "We never show your email"
msgstr "Nous n&rsquo;affichons jamais votre email"
-#: templates/web/bromley/report/new/fill_in_details_form.html:133
-#: templates/web/bromley/report/new/fill_in_details_form.html:179
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:134
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:201
#: templates/web/zurich/report/new/fill_in_details_form.html:96
msgid "We never show your email address or phone number."
msgstr "Nous n&rsquo;affichons jamais votre email ou numéro de téléphone."
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:384
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:394
msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch."
msgstr "Nous sommes conscients que ce problème pourrait être la responsabilité de %s, mais nous n'avons actuellement pas leurs coordonnées. Si vous connaissez une adresse de contact approprié, faites-le nous savoir s'il vous plaît."
@@ -4066,14 +3842,12 @@ msgstr "Nous sommes conscients que ce problème pourrait être la responsabilit
msgid "We send it to the council on your behalf"
msgstr "Nous l'envoyons à l'administration en votre nom"
-#: templates/web/bromley/report/new/fill_in_details_form.html:217
#: templates/web/default/report/new/notes.html:5
#: templates/web/fixmybarangay/report/new/notes.html:5
msgid "We will only use your personal information in accordance with our <a href=\"/faq#privacy\">privacy policy.</a>"
msgstr "Nous n'utiliserons vos renseignements personnels que conformément à notre <a href=\"/faq#privacy\">politique de confidentialité</a>."
#: templates/web/fixmystreet/report/new/notes.html:4
-#: templates/web/oxfordshire/report/new/notes.html:4
msgid "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>"
msgstr ""
@@ -4103,13 +3877,11 @@ msgstr ""
msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>."
msgstr "Avec les recherches à requètes, il est également possible de rechercher des agency_responsible pour limiter les demandes à celles qui sont envoyées à une administration unique. Le terme de recherche est l'ID de l'administration fourni par <a href=\"%s\">MapIt</ a>."
-#: templates/web/fixmystreet/footer.html:21
-#: templates/web/stevenage/footer.html:22
+#: templates/web/fixmystreet/footer.html:24
msgid "Would you like better integration with FixMyStreet? <a href=\"http://www.mysociety.org/for-councils/fixmystreet/\">Find out about FixMyStreet for councils</a>."
msgstr ""
-#: templates/web/fixmystreet/footer.html:17
-#: templates/web/stevenage/footer.html:18
+#: templates/web/fixmystreet/footer.html:20
msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>."
msgstr "Aimeriez-vous contribuer à FixMyStreet? Notre code est open source et <a href=\"http://github.com/grischard/fixmystreet\"> disponible sur GitHub </a>."
@@ -4121,7 +3893,6 @@ msgstr "Aimeriez-vous recevoir un autre questionnaire dans 4 semaines, pour vous
#: templates/web/default/report/new/notes.html:8
#: templates/web/fixmybarangay/report/new/notes.html:8
#: templates/web/fixmystreet/report/new/notes.html:8
-#: templates/web/oxfordshire/report/new/notes.html:7
msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
msgstr "Si vous rédigez votre message entièrement en capitales, ou sans ponctuation, il sera difficile à lire."
@@ -4151,26 +3922,24 @@ msgstr "Année"
msgid "Yes"
msgstr "Oui"
-#: templates/web/bromley/report/display.html:157
-#: templates/web/bromley/report/new/fill_in_details_form.html:198
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:161
#: templates/web/fixmystreet/report/update-form.html:89
msgid "Yes I have a password"
msgstr "Oui j'ai un mot de passe"
#: templates/web/default/contact/index.html:37
-#: templates/web/fixmystreet/contact/index.html:50
+#: templates/web/fixmystreet/contact/index.html:54
msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:"
msgstr "Vous signalez le rapport de problème suivant comme étant violent, contenant des renseignements personnels, ou semblables :"
#: templates/web/default/contact/index.html:15
-#: templates/web/fixmystreet/contact/index.html:28
+#: templates/web/fixmystreet/contact/index.html:32
msgid "You are reporting the following update for being abusive, containing personal information, or similar:"
msgstr "Vous signalez la mise à jour suivante comme étant violente, contenant des renseignements personnels, ou semblables :"
-#: templates/web/default/tokens/confirm_problem.html:19
+#: templates/web/default/tokens/confirm_problem.html:20
#: templates/web/default/tokens/confirm_problem.html:21
-#: templates/web/zurich/tokens/confirm_problem.html:5
+#: templates/web/zurich/tokens/confirm_problem.html:6
#: templates/web/zurich/tokens/confirm_problem.html:8
msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
msgstr ""
@@ -4179,6 +3948,10 @@ msgstr ""
msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
msgstr ""
+#: templates/web/fixmystreet/contact/index.html:118
+msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
+msgstr ""
+
#: templates/web/default/admin/flagged.html:5
msgid ""
"You can flag any report or user by editing them, and they will be listed on this page.\n"
@@ -4186,9 +3959,9 @@ msgid ""
" reports in the past."
msgstr ""
-#: templates/web/default/report/new/councils_text_none.html:11
-#: templates/web/default/report/new/councils_text_none.html:13
-#: templates/web/default/report/new/councils_text_some.html:20
+#: templates/web/default/report/new/councils_text_none.html:19
+#: templates/web/default/report/new/councils_text_none.html:20
+#: templates/web/default/report/new/councils_text_some.html:21
#: templates/web/default/report/new/councils_text_some.html:22
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 "Vous pouvez nous aider en trouvant une adresse e-mail de contact pour les problèmes locaux pour %s et en nous l'envoyant à <a href='mailto:%s'>%s</a>."
@@ -4198,7 +3971,6 @@ msgid "You can mark a body as deleted if you do not want it to be active on the
msgstr ""
#: templates/web/default/js/translation_strings.html:36
-#: templates/web/oxfordshire/js/translation_strings.html:30
msgid "You declined; please fill in the box above"
msgstr ""
@@ -4206,30 +3978,25 @@ msgstr ""
msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
msgstr "Vous avez déjà répondu à ce questionnaire. Si vous avez une question, <a href='%s'>entrez en contact avec nous</a>, ou <a href='%s'>affichez votre problème</a>.\n"
-#: templates/web/bromley/report/new/fill_in_details_form.html:97
#: templates/web/default/questionnaire/index.html:96
#: templates/web/default/report/new/fill_in_details_form.html:93
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:90
#: templates/web/fixmystreet/questionnaire/index.html:87
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:99
-#: templates/web/seesomething/report/new/fill_in_details_form.html:59
#: templates/web/zurich/report/new/fill_in_details_form.html:75
msgid "You have already attached a photo to this report, attaching another one will replace it."
msgstr "Vous avez déjà joint une photo à ce rapport, en joindre un autre la remplacera."
-#: templates/web/bromley/report/display.html:108
#: templates/web/default/report/update-form.html:59
#: templates/web/fixmystreet/report/update-form.html:56
msgid "You have already attached a photo to this update, attaching another one will replace it."
msgstr "Vous avez déjà joint une photo à cette mise à jour, en joindre un autre la remplacera."
#: templates/web/default/auth/sign_out.html:3
-#: templates/web/seesomething/auth/sign_out.html:3
#: templates/web/zurich/auth/sign_out.html:3
msgid "You have been signed out"
msgstr "Vous avez été déconnecté"
-#: templates/web/bromley/report/new/fill_in_details_form.html:25
#: templates/web/default/report/new/fill_in_details_form.html:7
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:7
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:28
@@ -4241,17 +4008,14 @@ msgstr "Vous avez localisé le problème au point marqué avec une épingle vert
msgid "You have successfully confirmed your alert."
msgstr "Vous avez réussi à confirmer votre alerte."
-#: templates/web/zurich/tokens/confirm_problem.html:5
#: templates/web/zurich/tokens/confirm_problem.html:6
msgid "You have successfully confirmed your email address."
msgstr ""
-#: templates/web/default/tokens/confirm_problem.html:14
#: templates/web/default/tokens/confirm_problem.html:15
msgid "You have successfully confirmed your problem"
msgstr "Vous avez réussi à confirmer votre problème."
-#: templates/web/default/tokens/confirm_update.html:11
#: templates/web/default/tokens/confirm_update.html:12
msgid "You have successfully confirmed your update and you can now <a href=\"%s\">view it on the site</a>."
msgstr "Vous avez réussi à confirmer votre mise à jour et vous pouvez maintenant <a href=\"%s\">la voir sur le site</a>."
@@ -4264,11 +4028,15 @@ msgstr "Vous avez réussi à créer votre alerte."
msgid "You have successfully deleted your alert."
msgstr "Vous avez réussi à effacer votre alerte."
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:754
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:762
#: perllib/FixMyStreet/App/Controller/Report/Update.pm:140
msgid "You have successfully signed in; please check and confirm your details are accurate:"
msgstr "Vous avez réussi à vous connecter ; veuillez vérifier et confirmer que vos coordonnées sont exactes :"
+#: templates/web/default/my/my.html:17 templates/web/fixmystreet/my/my.html:17
+msgid "You haven&rsquo;t created any reports yet. <a href=\"%s\">Report a problem now.</a>"
+msgstr ""
+
#: templates/web/default/email_sent.html:13
msgid "You must now click the link in the email we've just sent you."
msgstr ""
@@ -4295,13 +4063,10 @@ msgstr "Vous voulez vraiment renvoyer?"
msgid "Your Reports"
msgstr "Vos rapports"
-#: templates/web/bromley/report/display.html:41
-#: templates/web/bromley/report/display.html:43
-#: templates/web/bromley/report/new/fill_in_details_form.html:145
#: templates/web/fixmystreet/alert/_list.html:89
#: templates/web/fixmystreet/alert/updates.html:19
#: templates/web/fixmystreet/alert/updates.html:22
-#: templates/web/fixmystreet/contact/index.html:84
+#: templates/web/fixmystreet/contact/index.html:88
#: templates/web/fixmystreet/report/display.html:65
#: templates/web/fixmystreet/report/display.html:67
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:115
@@ -4310,14 +4075,8 @@ msgstr "Vos rapports"
msgid "Your email"
msgstr "Votre email"
-#: templates/web/seesomething/report/new/fill_in_details_form.html:81
-msgid "Your email (optional)"
-msgstr ""
-
-#: templates/web/bromley/report/display.html:132
#: templates/web/fixmystreet/auth/general.html:26
#: templates/web/fixmystreet/report/update-form.html:80
-#: templates/web/seesomething/auth/general.html:26
#: templates/web/zurich/auth/general.html:30
#: templates/web/zurich/auth/general.html:58
msgid "Your email address"
@@ -4335,28 +4094,15 @@ msgstr "Votre adresse mail:"
msgid "Your email:"
msgstr "Votre email:"
-#: templates/web/bromley/report/display.html:195
-#: templates/web/bromley/report/new/fill_in_details_form.html:117
-#: templates/web/bromley/report/new/fill_in_details_form.html:164
-msgid "Your first name"
-msgstr ""
-
-#: templates/web/fixmystreet/report/updates-sidebar-notes.html:5
+#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7
msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>"
msgstr ""
-#: templates/web/bromley/report/display.html:201
-#: templates/web/bromley/report/new/fill_in_details_form.html:123
-#: templates/web/bromley/report/new/fill_in_details_form.html:170
-msgid "Your last name"
-msgstr ""
-
#: templates/web/fixmystreet/auth/general.html:57
-#: templates/web/fixmystreet/contact/index.html:77
+#: templates/web/fixmystreet/contact/index.html:81
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:124
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:192
#: templates/web/fixmystreet/report/update-form.html:140
-#: templates/web/seesomething/report/new/fill_in_details_form.html:79
#: templates/web/zurich/auth/general.html:61
#: templates/web/zurich/report/new/fill_in_details_form.html:104
msgid "Your name"
@@ -4370,12 +4116,9 @@ msgstr "Votre nom"
msgid "Your name:"
msgstr "Votre nom :"
-#: templates/web/bromley/report/display.html:162
-#: templates/web/bromley/report/new/fill_in_details_form.html:203
#: templates/web/fixmystreet/auth/general.html:41
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:166
#: templates/web/fixmystreet/report/update-form.html:94
-#: templates/web/seesomething/auth/general.html:30
#: templates/web/zurich/auth/general.html:34
msgid "Your password"
msgstr "Votre mot de passe"
@@ -4384,11 +4127,8 @@ msgstr "Votre mot de passe"
msgid "Your password has been changed"
msgstr "Votre mot de passe a été changé"
-#: templates/web/bromley/report/new/fill_in_details_form.html:137
-#: templates/web/bromley/report/new/fill_in_details_form.html:184
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:139
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:206
-#: templates/web/seesomething/report/new/fill_in_details_form.html:90
#: templates/web/zurich/report/new/fill_in_details_form.html:110
msgid "Your phone number"
msgstr "Votre numéro de téléphone"
@@ -4401,19 +4141,13 @@ msgstr "Votre rapport"
msgid "Your report has been created and will shortly be sent."
msgstr ""
-#: templates/web/barnet/footer.html:18 templates/web/bromley/footer.html:19
-#: templates/web/bromley/header.html:75 templates/web/default/footer.html:9
-#: templates/web/fiksgatami/footer.html:6
+#: templates/web/default/footer.html:9 templates/web/fiksgatami/footer.html:6
#: templates/web/fiksgatami/nn/footer.html:6
-#: templates/web/fixmindelo/footer.html:39
-#: templates/web/fixmystreet/footer.html:46
-#: templates/web/oxfordshire/footer.html:21
-#: templates/web/oxfordshire/header.html:63
-#: templates/web/reading/footer.html:7 templates/web/stevenage/footer.html:41
+#: templates/web/fixmystreet/footer.html:49
msgid "Your reports"
msgstr "Vos rapports"
-#: templates/web/default/my/my.html:45 templates/web/fixmystreet/my/my.html:49
+#: templates/web/default/my/my.html:50 templates/web/fixmystreet/my/my.html:56
msgid "Your updates"
msgstr "Vos mises à jour"
@@ -4430,7 +4164,7 @@ msgstr "par %s"
msgid "council"
msgstr "administration"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
msgid "council ref:&nbsp;%s"
msgstr ""
@@ -4442,27 +4176,24 @@ msgstr "n'a pas utilisé le plan"
#: templates/web/default/alert/index.html:33
#: templates/web/fixmystreet/around/postcode_form.html:20
-#: templates/web/seesomething/around/postcode_form.html:9
msgid "e.g. ‘%s’ or ‘%s’"
msgstr "Par exemple '%s' ou '%s'"
#: templates/web/default/admin/flagged.html:51
-#, fuzzy
msgid "edit user"
-msgstr "Édition de l'utilisateur %d'"
+msgstr ""
#: templates/web/default/admin/index.html:23
#: templates/web/zurich/admin/index.html:5
msgid "from %d different users"
msgstr "de %d utilisateurs différents"
-#: templates/web/bromley/report/_item.html:12
-#: templates/web/fixmystreet/report/_item.html:12
+#: templates/web/fixmystreet/report/_item.html:17
#: templates/web/zurich/report/_item.html:16
msgid "last updated %s"
msgstr ""
-#: perllib/Utils.pm:263
+#: perllib/Utils.pm:265
msgid "less than a minute"
msgstr "moins d'une minute"
@@ -4520,21 +4251,20 @@ msgid "or"
msgstr " ou "
#: templates/web/default/js/translation_strings.html:27
-#: templates/web/oxfordshire/js/translation_strings.html:21
msgid "or locate me automatically"
msgstr ""
-#: templates/web/default/admin/report_edit.html:24
+#: templates/web/default/admin/report_edit.html:25
#: templates/web/default/admin/report_edit.html:26
-#: templates/web/zurich/admin/report_edit-sdm.html:30
+#: templates/web/zurich/admin/report_edit-sdm.html:31
#: templates/web/zurich/admin/report_edit-sdm.html:32
-#: templates/web/zurich/admin/report_edit-sdm.html:39
+#: templates/web/zurich/admin/report_edit-sdm.html:40
#: templates/web/zurich/admin/report_edit-sdm.html:41
-#: templates/web/zurich/admin/report_edit.html:30
+#: templates/web/zurich/admin/report_edit.html:31
#: templates/web/zurich/admin/report_edit.html:32
-#: templates/web/zurich/admin/report_edit.html:41
+#: templates/web/zurich/admin/report_edit.html:42
#: templates/web/zurich/admin/report_edit.html:43
-#: templates/web/zurich/admin/report_edit.html:53
+#: templates/web/zurich/admin/report_edit.html:54
#: templates/web/zurich/admin/report_edit.html:55
msgid "originally entered: &ldquo;%s&rdquo;"
msgstr ""
@@ -4548,23 +4278,17 @@ msgstr "autres lieux:"
msgid "reopened"
msgstr "réouvert"
-#: templates/web/barnet/header.html:71 templates/web/bromley/header.html:100
-#: templates/web/bromley/header.html:65
#: templates/web/fixmybarangay/header.html:67
-#: templates/web/fixmystreet/header.html:51
-#: templates/web/oxfordshire/header.html:112
-#: templates/web/oxfordshire/header.html:48
-#: templates/web/stevenage/header.html:98 templates/web/zurich/footer.html:12
+#: templates/web/fixmystreet/header.html:54
+#: templates/web/zurich/footer.html:12
msgid "sign out"
msgstr "déconnexion"
-#: templates/web/bromley/report/new/fill_in_details_form.html:4
-#: templates/web/bromley/report/new/fill_in_details_form.html:7
-#: templates/web/default/report/new/fill_in_details_form.html:11
+#: templates/web/default/report/new/fill_in_details_form.html:12
#: templates/web/default/report/new/fill_in_details_form.html:14
-#: templates/web/emptyhomes/report/new/fill_in_details_form.html:11
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:12
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:14
-#: templates/web/fixmystreet/report/new/fill_in_details_form.html:6
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:7
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:9
msgid "the local council"
msgstr "L'administration locale"
@@ -4574,11 +4298,11 @@ msgstr "L'administration locale"
msgid "there is no pin shown as the user did not use the map"
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:362
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:370
msgid "this type of local problem"
msgstr "Ce type de problème local"
-#: perllib/Utils.pm:235
+#: perllib/Utils.pm:237
msgid "today"
msgstr "aujourd'hui"
@@ -4608,7 +4332,7 @@ msgid_plural "<big>%s</big> reports recently"
msgstr[0] "<big>%s</big> rapport récemment"
msgstr[1] "<big>%s</big> rapports récemment"
-#: perllib/Utils.pm:282
+#: perllib/Utils.pm:284
#, perl-format
msgid "%d hour"
msgid_plural "%d hours"
@@ -4622,7 +4346,7 @@ msgid_plural "%d supporters"
msgstr[0] ""
msgstr[1] ""
-#: perllib/Utils.pm:284
+#: perllib/Utils.pm:286
#, perl-format
msgid "%d minute"
msgid_plural "%d minutes"
@@ -4643,7 +4367,7 @@ msgid_plural "We do not yet have details for the councils that cover this locati
msgstr[0] "Nous n'avons pas encore de détails pour l'administration responsable de ce lieu."
msgstr[1] "Nous n'avons pas encore de détails pour les administrations responsables de ce lieu."
-#: perllib/Utils.pm:278
+#: perllib/Utils.pm:280
#, perl-format
msgid "%d week"
msgid_plural "%d weeks"
@@ -4664,32 +4388,16 @@ msgid_plural "<big>%s</big> fixed in past month"
msgstr[0] "<big>%s</big> résolu le mois passé"
msgstr[1] "<big>%s</big> résolus le mois passé"
-#: templates/web/default/report/new/councils_text_some.html:14
-#, perl-format
-msgid "We do <strong>not</strong> yet have details for the other council that covers this location."
-msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location."
-msgstr[0] "Nous n'avons pas encore de détails pour l'autre administration responsable de ce lieu."
-msgstr[1] "Nous n'avons pas encore de détails pour les autres administrations responsables de ce lieu."
-
-#: perllib/Utils.pm:280
+#: perllib/Utils.pm:282
#, perl-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] ""
msgstr[1] ""
-#, fuzzy
-#~ msgid "The email field is required"
-#~ msgstr "Ces renseignements sont nécessaires"
-
-#~ msgid "End Year:"
-#~ msgstr "Fin année :"
-
-#~ msgid "End month:"
-#~ msgstr "Fin mois :"
-
-#~ msgid "Start Year:"
-#~ msgstr "Année de début :"
-
-#~ msgid "Start month:"
-#~ msgstr "Mois de début :"
+#: templates/web/default/report/new/councils_text_some.html:14
+#, perl-format
+msgid "We do <strong>not</strong> yet have details for the other council that covers this location."
+msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location."
+msgstr[0] "Nous n'avons pas encore de détails pour l'autre administration responsable de ce lieu."
+msgstr[1] "Nous n'avons pas encore de détails pour les autres administrations responsables de ce lieu."
diff --git a/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po
index 5d2f1bc6c..c0926556f 100644
--- a/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -10,8 +10,8 @@ msgid ""
msgstr ""
"Project-Id-Version: fixmystreet\n"
"Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2013-11-12 13:15+0000\n"
-"PO-Revision-Date: 2013-09-05 16:55+0000\n"
+"POT-Creation-Date: 2014-05-16 17:30+0100\n"
+"PO-Revision-Date: 2013-11-20 13:29+0000\n"
"Last-Translator: mysociety <transifex@mysociety.org>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/fixmystreet/language/hr/)\n"
"Language: hr\n"
@@ -20,25 +20,25 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:373
+#: perllib/FixMyStreet/DB/Result/Problem.pm:604
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383
msgid " and "
msgstr "i"
-#: templates/web/default/tokens/confirm_problem.html:14
+#: templates/web/default/tokens/confirm_problem.html:15
#: templates/web/default/tokens/confirm_problem.html:17
msgid " and <strong>we will now send it to the council</strong>"
msgstr "i <strong>mi to sad šaljemo odgovornim tijelima</strong>"
-#: templates/web/default/report/new/councils_text_all.html:11
-#: templates/web/default/report/new/councils_text_all.html:18
-#: templates/web/default/report/new/councils_text_all.html:4
-#: templates/web/default/report/new/councils_text_none.html:11
-#: templates/web/default/report/new/councils_text_none.html:14
-#: templates/web/default/report/new/councils_text_some.html:20
+#: templates/web/default/report/new/councils_text_all.html:12
+#: templates/web/default/report/new/councils_text_all.html:19
+#: templates/web/default/report/new/councils_text_all.html:5
+#: templates/web/default/report/new/councils_text_none.html:19
+#: templates/web/default/report/new/councils_text_none.html:21
+#: templates/web/default/report/new/councils_text_some.html:21
#: templates/web/default/report/new/councils_text_some.html:23
#: templates/web/default/report/new/councils_text_some.html:5
-#: templates/web/emptyhomes/report/new/councils_text_all.html:2
+#: templates/web/emptyhomes/report/new/councils_text_all.html:3
msgid " or "
msgstr "ili"
@@ -76,19 +76,19 @@ msgstr ""
msgid "%s - Summary reports"
msgstr "%s - Sažetak izvješća"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:653
msgid "%s ref:&nbsp;%s"
msgstr "%s ref:&nbsp;%s"
-#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
msgid "%s ward, %s"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:538
+#: perllib/FixMyStreet/DB/Result/Problem.pm:540
msgid "%s, reported at %s"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/UK.pm:303 perllib/FixMyStreet/Cobrand/UK.pm:315
+#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:309
msgid "%s, within %s ward"
msgstr ""
@@ -119,30 +119,27 @@ msgstr "(zadana udaljenost koja obuhvaća približno 200,000 stanovnika)"
msgid "(alternatively the RSS feed can be customised, within"
msgstr "(u suprotnom RSS feed može biti podešen, unutar"
-#: templates/web/bromley/report/_item.html:22
#: templates/web/default/around/around_map_list_items.html:12
#: templates/web/default/around/on_map_list_items.html:9
-#: templates/web/fixmystreet/report/_item.html:22
+#: templates/web/fixmystreet/report/_item.html:27
#: templates/web/zurich/report/_item.html:21
msgid "(closed)"
msgstr "(zatvoreno)"
-#: templates/web/bromley/report/_item.html:20
#: templates/web/default/around/around_map_list_items.html:10
#: templates/web/default/around/on_map_list_items.html:7
-#: templates/web/fixmystreet/report/_item.html:20
+#: templates/web/fixmystreet/report/_item.html:25
#: templates/web/zurich/report/_item.html:19
msgid "(fixed)"
msgstr "(popravljeno)"
-#: templates/web/default/index.html:12 templates/web/default/index.html:8
+#: templates/web/default/index.html:12 templates/web/default/index.html:9
#: templates/web/fixmystreet/around/intro.html:2
msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
msgstr "(grafiti, ilegalno odlaganje otpada, oštećeni kolnici, klupe, lampe...)"
-#: templates/web/bromley/report/_item.html:16
#: templates/web/default/reports/_list-entry.html:4
-#: templates/web/fixmystreet/report/_item.html:16
+#: templates/web/fixmystreet/report/_item.html:21
msgid "(not sent to council)"
msgstr "(nije poslano odgovornom tijelu)"
@@ -152,9 +149,8 @@ msgstr "(nije poslano odgovornom tijelu)"
msgid "(optional)"
msgstr "(nije obavezno)"
-#: templates/web/bromley/report/_item.html:15
#: templates/web/default/reports/_list-entry.html:2
-#: templates/web/fixmystreet/report/_item.html:15
+#: templates/web/fixmystreet/report/_item.html:20
msgid "(sent to both)"
msgstr "(poslano na obje adrese)"
@@ -166,8 +162,8 @@ msgstr "(vašu email adresu i broj telefona držimo u tajnosti)"
msgid "(we never show your email)"
msgstr "(vaš email držimo u tajnosti)"
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:637
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:664
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:635
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:662
#: perllib/FixMyStreet/DB/Result/Problem.pm:379
msgid "-- Pick a category --"
msgstr "-- Izaberi kategoriju --"
@@ -207,7 +203,7 @@ msgstr ""
"<a href=\"http://www.pledgebank.com/new\">biste obvezali na to i isto objavili</a>?\n"
"</p>"
-#: templates/web/fixmystreet/questionnaire/completed-open.html:6
+#: templates/web/fixmystreet/questionnaire/completed-open.html:25
msgid ""
"<p style=\"font-size:150%\">We&rsquo;re sorry to hear that. We have two\n"
"suggestions: why not try <a href=\"http://www.writetothem.com/\">writing direct\n"
@@ -267,7 +263,7 @@ msgid ""
"site and leave an update.</p>"
msgstr "<p>Hvala Vam mnogo što ste ispunili naš upitnik; ukoliko⏎ dobijete više informacija o stanju Vašeg problema, molimo Vas da ponovno posjetite našu⏎ stranicu i ostavite informaciju.</p>"
-#: templates/web/default/around/_report_banner.html:3
+#: templates/web/default/around/_report_banner.html:4
#: templates/web/default/around/_report_banner.html:5
msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>"
msgstr "<small>Ukoliko ne vidite kartu, <a href='%s' rel='nofollow'>preskočite ovaj korak</a>.</small>"
@@ -322,8 +318,6 @@ msgstr "<strong>Da</strong> Imam password"
msgid "About us"
msgstr "O nama"
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:81
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:39
#: templates/web/default/report/update-form.html:30
@@ -361,7 +355,7 @@ msgstr "Dodaj novu kategoriju"
msgid "Add user"
msgstr ""
-#: templates/web/default/my/my.html:56 templates/web/fixmystreet/my/my.html:60
+#: templates/web/default/my/my.html:61 templates/web/fixmystreet/my/my.html:67
msgid "Added %s"
msgstr "Dodano %s"
@@ -377,7 +371,6 @@ msgstr "Upozorenje %d kreirano za %s, tip %s, parametri%s / %s"
msgid "Alert %d disabled (created %s)"
msgstr "Upozorenje %d onemogućeno (kreirano%s)"
-#: templates/web/bromley/report/display.html:209
#: templates/web/default/report/update-form.html:163
#: templates/web/fixmystreet/report/update-form.html:148
msgid "Alert me to future updates"
@@ -390,17 +383,12 @@ msgstr "Javi mi buduće promjene"
msgid "All Reports"
msgstr "Sve Prijave"
-#: templates/web/barnet/footer.html:20 templates/web/bromley/footer.html:21
-#: templates/web/bromley/header.html:77 templates/web/default/footer.html:11
+#: templates/web/default/footer.html:11
#: templates/web/emptyhomes/header.html:32
#: templates/web/fiksgatami/footer.html:7
#: templates/web/fiksgatami/nn/footer.html:7
-#: templates/web/fixmindelo/footer.html:41
#: templates/web/fixmybarangay/footer.html:20
-#: templates/web/fixmystreet/footer.html:48
-#: templates/web/oxfordshire/footer.html:23
-#: templates/web/oxfordshire/header.html:67
-#: templates/web/reading/footer.html:8 templates/web/stevenage/footer.html:43
+#: templates/web/fixmystreet/footer.html:51
#: templates/web/zurich/admin/index-dm.html:12
#: templates/web/zurich/admin/stats.html:13
#: templates/web/zurich/footer.html:19
@@ -417,27 +405,25 @@ msgstr "Sve prijave između %s i %s"
msgid "All the information you provide here will be sent to"
msgstr "Sve unešene informacije bit će poslane na"
-#: templates/web/default/report/new/councils_text_all.html:11
+#: templates/web/default/report/new/councils_text_all.html:12
#: templates/web/default/report/new/councils_text_all.html:13
msgid "All the information you provide here will be sent to <strong>%s</strong> or <strong>Roads Service</strong>."
msgstr "Sve informacije koje nam dostavite biti će proslijeđene <strong>%s</strong> ili <strong>HAKu</strong>."
-#: templates/web/default/report/new/councils_text_all.html:4
+#: templates/web/default/report/new/councils_text_all.html:5
#: templates/web/default/report/new/councils_text_all.html:6
msgid "All the information you provide here will be sent to <strong>%s</strong> or a relevant local body such as <strong>TfL</strong>, via the London Report-It system."
msgstr "Sve informacije koje nam dostavite bit će proslijeđene <strong>%s</strong> ili će relevantno lokalno tijelo kao <strong>TfL</strong>, putem London Report-It system."
-#: templates/web/bromley/report/new/fill_in_details_form.html:4
-#: templates/web/bromley/report/new/fill_in_details_form.html:6
-#: templates/web/default/report/new/councils_text_all.html:18
+#: templates/web/default/report/new/councils_text_all.html:19
#: templates/web/default/report/new/councils_text_all.html:20
-#: templates/web/default/report/new/fill_in_details_form.html:11
+#: templates/web/default/report/new/fill_in_details_form.html:12
#: templates/web/default/report/new/fill_in_details_form.html:13
-#: templates/web/emptyhomes/report/new/councils_text_all.html:2
+#: templates/web/emptyhomes/report/new/councils_text_all.html:3
#: templates/web/emptyhomes/report/new/councils_text_all.html:4
-#: templates/web/emptyhomes/report/new/fill_in_details_form.html:11
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:12
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:13
-#: templates/web/fixmystreet/report/new/fill_in_details_form.html:6
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:7
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:8
msgid "All the information you provide here will be sent to <strong>%s</strong>."
msgstr "Sve informacije koje nam dostavite bit će proslijeđene <strong>%s</strong>."
@@ -461,13 +447,11 @@ msgstr "Anonimno:"
msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?"
msgstr "Jeste li <strong>developer</strong>? Biste li htjeli doprinijeti ideji popravi.to?"
-#: templates/web/fixmystreet/footer.html:16
-#: templates/web/stevenage/footer.html:17
+#: templates/web/fixmystreet/footer.html:19
msgid "Are you a developer?"
msgstr "Jeste li programer?"
-#: templates/web/fixmystreet/footer.html:20
-#: templates/web/stevenage/footer.html:21
+#: templates/web/fixmystreet/footer.html:23
msgid "Are you from a council?"
msgstr "Pripadate li odgovornom tijelu?"
@@ -490,7 +474,7 @@ msgstr ""
msgid "Assign to subdivision:"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:141
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:163
#: templates/web/zurich/report/updates.html:11
msgid "Assigned to %s"
msgstr ""
@@ -509,7 +493,6 @@ msgid "Awaiting moderation"
msgstr ""
#: templates/web/default/js/translation_strings.html:32
-#: templates/web/oxfordshire/js/translation_strings.html:26
msgid "Back"
msgstr ""
@@ -521,8 +504,8 @@ msgstr "Onemogući e-mail adrese"
msgid "Be sure to choose the right category, because we use that to determine to whom the report is sent."
msgstr "Pazite da odaberete pravu kategoriju jer je koristimo kako bismo utvrdili kome je izvješće poslano."
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1176
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:249
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1185
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:297
#: templates/web/default/admin/bodies.html:1
#: templates/web/zurich/header.html:64
msgid "Bodies"
@@ -548,18 +531,15 @@ msgid "By Date"
msgstr "Po datumu"
#: templates/web/fixmystreet/around/_report_banner.html:10
-#: templates/web/fixmystreet/around/_report_banner.html:8
+#: templates/web/fixmystreet/around/_report_banner.html:9
msgid "Can't see the map? <a href='%s' rel='nofollow'>Skip this step</a>"
msgstr "Ne možete vidjeti mapu? <a href='%s' rel='nofollow'>Preskoči ovaj korak</a>"
-#: templates/web/bromley/report/new/fill_in_details_form.html:68
#: templates/web/default/admin/bodies.html:20
#: templates/web/default/admin/body.html:53
#: templates/web/default/admin/index.html:44
#: templates/web/default/report/new/category.html:10
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:74
-#: templates/web/seesomething/report/new/category.html:6
-#: templates/web/southampton/report/new/category.html:3
#: templates/web/zurich/admin/body.html:13
#: templates/web/zurich/admin/index-dm.html:23
#: templates/web/zurich/admin/index-sdm.html:21
@@ -584,7 +564,7 @@ msgstr " Postotak popravaka za kategoriju > staro 4 tjedna"
msgid "Category:"
msgstr "Kategorija:"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:366
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374
msgid "Category: %s"
msgstr "Kategorija: %s"
@@ -633,21 +613,16 @@ msgstr ""
msgid "Click map to report a problem"
msgstr "Kliknite mapu da prijavite problem"
-#: templates/web/oxfordshire/js/translation_strings.html:39
-#, fuzzy
-msgid "Click on the map to report a problem"
-msgstr "Kliknite mapu da prijavite problem"
-
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:118
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:140
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:45
#: templates/web/default/admin/report_edit.html:47
#: templates/web/default/dashboard/index.html:142
#: templates/web/default/dashboard/index.html:144
#: templates/web/fixmystreet/report/banner.html:15
-#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:10
#: templates/web/zurich/admin/header.html:12
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/report_edit.html:100
#: templates/web/zurich/admin/report_edit.html:98
#: templates/web/zurich/admin/stats.html:31
@@ -655,11 +630,11 @@ msgstr "Kliknite mapu da prijavite problem"
msgid "Closed"
msgstr "Zatvoreno"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:744
+#: perllib/FixMyStreet/DB/Result/Problem.pm:748
msgid "Closed by council"
msgstr "Zatvorilo je odgovorno tijelo"
-#: templates/web/default/my/my.html:32 templates/web/fixmystreet/my/my.html:36
+#: templates/web/default/my/my.html:37 templates/web/fixmystreet/my/my.html:43
msgid "Closed reports"
msgstr "Zatvorene prijave"
@@ -667,7 +642,7 @@ msgstr "Zatvorene prijave"
msgid "Closed:"
msgstr "Zatvoreno:"
-#: templates/web/default/around/tabbed_lists.html:10
+#: templates/web/default/around/tabbed_lists.html:11
#: templates/web/default/around/tabbed_lists.html:12
msgid "Closest nearby problems <small>(within&nbsp;%skm)</small>"
msgstr "Najbliži problemi <small>(within&nbsp;%skm)</small>"
@@ -693,9 +668,8 @@ msgid "Cobrand:"
msgstr "Cobrand:"
#: templates/web/default/admin/config_page.html:1
-#, fuzzy
msgid "Configuration"
-msgstr "Potvrda"
+msgstr ""
#: perllib/FixMyStreet/App/Controller/Admin.pm:421
msgid "Configuration updated - contacts will be generated automatically later"
@@ -725,8 +699,6 @@ msgstr "Potvrdi pomoću dolje navedene e-mail adrese, a potom upiši novu lozink
#: templates/web/default/tokens/confirm_update.html:3
#: templates/web/emptyhomes/tokens/confirm_problem.html:1
#: templates/web/emptyhomes/tokens/confirm_problem.html:3
-#: templates/web/southampton/tokens/confirm_problem.html:1
-#: templates/web/southampton/tokens/confirm_problem.html:3
#: templates/web/zurich/tokens/confirm_problem.html:1
#: templates/web/zurich/tokens/confirm_problem.html:3
msgid "Confirmation"
@@ -759,7 +731,6 @@ msgstr "Kontakt"
msgid "Contact FixMyStreet"
msgstr "Kontaktiraj potvrdi.to"
-#: templates/web/bromley/contact/submit.html:1
#: templates/web/default/contact/index.html:1
#: templates/web/default/contact/index.html:2
#: templates/web/default/contact/submit.html:1
@@ -768,20 +739,18 @@ msgstr "Kontaktiraj potvrdi.to"
msgid "Contact Us"
msgstr "Kontaktiraj nas"
-#: templates/web/bromley/contact/submit.html:3
#: templates/web/default/contact/index.html:6
#: templates/web/default/contact/submit.html:3
-#: templates/web/fixmystreet/contact/index.html:19
+#: templates/web/fixmystreet/contact/index.html:22
msgid "Contact the team"
msgstr "Kontaktiraj tim"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1310
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1338
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1319
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1347
msgid "Could not find user"
msgstr "Nepoznati korisnik"
#: templates/web/default/js/translation_strings.html:37
-#: templates/web/oxfordshire/js/translation_strings.html:31
msgid "Could not look up location"
msgstr ""
@@ -836,11 +805,10 @@ msgstr "Trenutno stanje"
#: templates/web/default/admin/bodies.html:7
#: templates/web/default/admin/index.html:5
-#, fuzzy
msgid "Currently no bodies have been created."
-msgstr "Još uvijek nisu prijavljeni nikakvi problemi."
+msgstr ""
-#: templates/web/default/dashboard/index.html:5
+#: templates/web/default/dashboard/index.html:6
#: templates/web/default/dashboard/index.html:7
msgid "Dashboard"
msgstr "Nadzorna ploča"
@@ -863,11 +831,8 @@ msgstr "Izbrisano"
msgid "Description"
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:54
#: templates/web/default/js/translation_strings.html:34
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66
-#: templates/web/oxfordshire/js/translation_strings.html:28
-#: templates/web/seesomething/report/new/fill_in_details_form.html:16
#: templates/web/zurich/report/new/fill_in_details_form.html:42
msgid "Details"
msgstr "Detalji"
@@ -905,8 +870,10 @@ msgstr "Imaš li popravi.to lozinku?"
msgid "Don&rsquo;t know"
msgstr "Ne&rsquo;znam"
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:82
+#: templates/web/fixmystreet/contact/index.html:115
+msgid "Don't like forms?"
+msgstr ""
+
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:47
#: templates/web/default/report/update-form.html:30
@@ -937,9 +904,9 @@ msgid "Edit body details"
msgstr ""
#: templates/web/default/admin/report_edit.html:1
-#: templates/web/zurich/admin/report_edit-sdm.html:1
+#: templates/web/zurich/admin/report_edit-sdm.html:2
#: templates/web/zurich/admin/report_edit-sdm.html:4
-#: templates/web/zurich/admin/report_edit.html:1
+#: templates/web/zurich/admin/report_edit.html:2
#: templates/web/zurich/admin/report_edit.html:5
msgid "Editing problem %d"
msgstr "Uređivanje problema %d"
@@ -957,7 +924,6 @@ msgstr "Uređivane korisnika %d"
msgid "Editor"
msgstr "Urednik"
-#: templates/web/bromley/report/display.html:128
#: templates/web/default/admin/bodies.html:18
#: templates/web/default/admin/body.html:54
#: templates/web/default/admin/body_edit.html:83
@@ -965,7 +931,6 @@ msgstr "Urednik"
#: templates/web/default/admin/users.html:16
#: templates/web/fixmystreet/auth/general.html:20
#: templates/web/fixmystreet/report/update-form.html:76
-#: templates/web/seesomething/auth/general.html:20
#: templates/web/zurich/admin/body-form.html:9
#: templates/web/zurich/admin/body.html:14
#: templates/web/zurich/auth/general.html:24
@@ -973,16 +938,15 @@ msgstr "Urednik"
msgid "Email"
msgstr "E-mail"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1286
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1295
msgid "Email added to abuse list"
msgstr "E-mail dodan na listu zloupotrebe"
#: templates/web/default/admin/body.html:126
-#, fuzzy
msgid "Email address:"
-msgstr "Vaša e-mail adresa:"
+msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1283
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1292
msgid "Email already in abuse list"
msgstr "E-mail je već na listi zloupotrebe"
@@ -1006,7 +970,7 @@ msgstr "Pošalji mi e-mail o ažuriranjima"
msgid "Email:"
msgstr "E-mail:"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:318
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:323
msgid "Email: %s"
msgstr ""
@@ -1052,15 +1016,14 @@ msgid ""
msgstr ""
#: templates/web/default/admin/stats.html:70
-#, fuzzy
msgid "End Date:"
-msgstr "Dan završetka:"
+msgstr ""
#: templates/web/default/admin/body-form.html:126
msgid "Endpoint"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:71
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:72
msgid "Enter a Z&uuml;rich street name"
msgstr ""
@@ -1069,26 +1032,26 @@ msgid "Enter a nearby UK postcode, or street name and area"
msgstr "Unesi obližnji poštanski broj ili ime ulice i kvarta"
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:25
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:37
msgid "Enter a nearby postcode, or street name and area"
msgstr "Unesi obližnji poštanski broj ili ime ulice i kvarta"
-#: templates/web/default/around/postcode_form.html:1
#: templates/web/default/around/postcode_form.html:2
-#: templates/web/fixmystreet/around/postcode_form.html:10
#: templates/web/fixmystreet/around/postcode_form.html:11
-#: templates/web/seesomething/around/postcode_form.html:3
-#: templates/web/seesomething/around/postcode_form.html:4
msgid "Enter a nearby street name and area"
msgstr "Unesi ime obližnje ulice i kvarta"
+#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:9
+#, fuzzy
+msgid "Enter a nearby street name and area, postal code or district in Delhi"
+msgstr "Unesi ime obližnje ulice i kvarta"
+
#: templates/web/default/auth/general.html:64
#: templates/web/default/report/new/fill_in_details_form.html:169
#: templates/web/default/report/update-form.html:124
msgid "Enter a new password:"
msgstr "Unesi novu lozinku:"
-#: templates/web/bromley/report/display.html:150
-#: templates/web/bromley/report/new/fill_in_details_form.html:189
#: templates/web/fixmystreet/auth/general.html:61
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:211
#: templates/web/fixmystreet/report/update-form.html:122
@@ -1123,7 +1086,6 @@ msgstr "Primjeri:"
msgid "Extra data:"
msgstr "Dodatni podaci:"
-#: templates/web/bromley/contact/submit.html:14
#: templates/web/default/contact/submit.html:15
msgid "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>."
msgstr "Neuspješno slanje poruke. Molimo pokušajte opet ili nas <a href=\"mailto:%s\">kontaktirajte</a>."
@@ -1137,12 +1099,6 @@ msgstr ""
msgid "Find latest local and national news"
msgstr ""
-#: templates/web/bromley/report/display.html:191
-#: templates/web/bromley/report/new/fill_in_details_form.html:113
-#: templates/web/bromley/report/new/fill_in_details_form.html:160
-msgid "First Name"
-msgstr "Ime"
-
#: templates/web/default/questionnaire/index.html:79
#: templates/web/fixmystreet/questionnaire/index.html:73
msgid "First time"
@@ -1191,8 +1147,6 @@ msgstr ""
"bit će poslane općinskom vijeću i tako će se pojaviti u upozorenjima za oba vijeća&rsquo; ali će se samo pojaviti u upozorenju \"Unutar granica\" \n"
"županijskog vijeća."
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:84
#: templates/web/default/admin/index.html:44
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:41
@@ -1217,7 +1171,7 @@ msgstr "Popravljeno - odgovorno tijelo"
msgid "Fixed - User"
msgstr "Popravljeno - Korisnik"
-#: templates/web/default/my/my.html:27 templates/web/fixmystreet/my/my.html:31
+#: templates/web/default/my/my.html:32 templates/web/fixmystreet/my/my.html:38
msgid "Fixed reports"
msgstr "Popravljene prijave"
@@ -1234,7 +1188,7 @@ msgstr ""
msgid "Flag user"
msgstr "Označi korisnika"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1181
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1190
#: templates/web/default/admin/users.html:19
msgid "Flagged"
msgstr "Označen"
@@ -1279,11 +1233,9 @@ msgstr "Zaboravili ste šifru?"
#: templates/web/emptyhomes/faq/faq-en-gb.html:1
#: templates/web/fiksgatami/faq/faq-nb.html:1
#: templates/web/fiksgatami/nn/faq/faq-nn.html:1
-#: templates/web/fixmindelo/faq/faq-pt-cv.html:1
#: templates/web/fixmybarangay/faq/faq-en-gb.html:1
#: templates/web/fixmystreet/faq/faq-en-gb.html:1
#: templates/web/fixmystreet/static/privacy.html:1
-#: templates/web/oxfordshire/faq/faq-en-gb.html:1
msgid "Frequently Asked Questions"
msgstr "Često postavljana pitanja"
@@ -1291,19 +1243,18 @@ msgstr "Često postavljana pitanja"
msgid "GeoRSS on Google Maps"
msgstr "GeoRSS na Google Mapama"
-#: templates/web/bromley/report/display.html:30
#: templates/web/fixmystreet/around/_updates.html:3
#: templates/web/fixmystreet/report/display.html:38
msgid "Get updates"
msgstr "Primite ažuriranja"
-#: templates/web/fixmystreet/reports/_rss.html:3
+#: templates/web/fixmystreet/reports/_rss.html:4
#: templates/web/fixmystreet/reports/_rss.html:9
msgid "Get updates of %s problems"
msgstr "Primite ažuriranja %s problema"
#: templates/web/fixmystreet/reports/_rss.html:11
-#: templates/web/fixmystreet/reports/_rss.html:3
+#: templates/web/fixmystreet/reports/_rss.html:4
msgid "Get updates of problems in this %s"
msgstr "Primite ažuriranja problema u ovom %s"
@@ -1316,7 +1267,6 @@ msgstr "Prijavi se na RSS izvor"
#: templates/web/default/alert/index.html:34
#: templates/web/default/around/postcode_form.html:8
#: templates/web/fixmystreet/around/postcode_form.html:21
-#: templates/web/seesomething/around/postcode_form.html:10
#: templates/web/zurich/admin/stats.html:26
msgid "Go"
msgstr "Idi"
@@ -1343,19 +1293,12 @@ msgstr "Je li ovaj problem popravljen?"
msgid "Have you ever reported a problem to a council before, or is this your first time?"
msgstr "Jeste li prije prijavljivali problem odgovornom tijelu ili je ovo prvi put?"
-#: templates/web/barnet/footer.html:24 templates/web/bromley/footer.html:25
-#: templates/web/bromley/header.html:81 templates/web/default/footer.html:15
+#: templates/web/default/footer.html:15
#: templates/web/emptyhomes/header.html:33
#: templates/web/fiksgatami/footer.html:9
#: templates/web/fiksgatami/nn/footer.html:9
-#: templates/web/fixmindelo/footer.html:45
#: templates/web/fixmybarangay/footer.html:24
-#: templates/web/fixmystreet/footer.html:52
-#: templates/web/oxfordshire/footer.html:27
-#: templates/web/oxfordshire/header.html:75
-#: templates/web/reading/footer.html:10
-#: templates/web/seesomething/footer.html:13
-#: templates/web/stevenage/footer.html:47
+#: templates/web/fixmystreet/footer.html:55
#: templates/web/zurich/faq/faq-de-ch.html:1
#: templates/web/zurich/footer.html:21
#: templates/web/zurich/nav_over_content.html:8
@@ -1367,13 +1310,9 @@ msgstr "Pomoć"
msgid "Here are the types of local problem alerts for &lsquo;%s&rsquo;."
msgstr "Vrste upozorenja za lokalne probleme &lsquo;%s&rsquo;."
-#: templates/web/barnet/header.html:70 templates/web/bromley/header.html:64
-#: templates/web/bromley/header.html:99
#: templates/web/fixmybarangay/header.html:66
-#: templates/web/fixmystreet/header.html:50
-#: templates/web/oxfordshire/header.html:111
-#: templates/web/oxfordshire/header.html:47
-#: templates/web/stevenage/header.html:97 templates/web/zurich/footer.html:11
+#: templates/web/fixmystreet/header.html:53
+#: templates/web/zurich/footer.html:11
msgid "Hi %s"
msgstr "Zdravo %s"
@@ -1381,8 +1320,8 @@ msgstr "Zdravo %s"
#: templates/web/default/admin/report_edit.html:50
#: templates/web/default/admin/report_edit.html:51
#: templates/web/default/admin/update_edit.html:28
-#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:11
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/report_edit.html:89
#: templates/web/zurich/admin/report_edit.html:93
#: templates/web/zurich/admin/stats.html:32
@@ -1403,7 +1342,6 @@ msgid "History"
msgstr "Povijest"
#: templates/web/default/js/translation_strings.html:31
-#: templates/web/oxfordshire/js/translation_strings.html:25
msgid "Home"
msgstr ""
@@ -1412,7 +1350,6 @@ msgid "How to report a problem"
msgstr "Kako prijaviti problem"
#: templates/web/default/js/translation_strings.html:33
-#: templates/web/oxfordshire/js/translation_strings.html:27
msgid "How to send successful reports"
msgstr ""
@@ -1428,7 +1365,7 @@ msgstr "Nažalost, ne možemo locirati tvoj problem u bazi podataka.⏎\n"
msgid "I'm afraid we couldn't validate that token, as the report was made too long ago."
msgstr "Nažalost, ne možemo provjeriti token jer je prijava davno izvršena."
-#: perllib/FixMyStreet/App/Controller/Tokens.pm:259
+#: perllib/FixMyStreet/App/Controller/Tokens.pm:260
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 "Nažalost, ne možemo provjeriti token. Ako ste kopirali URL iz e-maila, molimo provjeriti da ste ga točno kopirali. \n"
@@ -1468,7 +1405,6 @@ msgstr ""
msgid "If you do not, your update will not be posted."
msgstr ""
-#: templates/web/default/report/new/councils_text_none.html:8
#: templates/web/default/report/new/councils_text_none.html:9
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 "Ako iznesete problem ovdje sadržaj i detalji problema bit će javni, ali će problem <strong>not</strong> biti prijavljen vijeću."
@@ -1519,7 +1455,7 @@ msgid ""
" when they are shown on the site. Enter the ID (number) of that user."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Contact.pm:111
+#: perllib/FixMyStreet/App/Controller/Contact.pm:116
msgid "Illegal ID"
msgstr "Ilegalan ID"
@@ -1527,8 +1463,6 @@ msgstr "Ilegalan ID"
msgid "Illegal feed selection"
msgstr "Ilegalan odabir izvora"
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:82
#: templates/web/default/dashboard/index.html:142
#: templates/web/default/dashboard/index.html:144
#: templates/web/default/report/update-form.html:30
@@ -1539,29 +1473,24 @@ msgid "In Progress"
msgstr "U tijeku"
#: templates/web/default/admin/flagged.html:39
-#, fuzzy
msgid "In abuse table?"
-msgstr "(Email na crnoj listi)"
+msgstr ""
#: templates/web/default/open311/index.html:90
msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
msgstr "Nadalje, sljedeća svojstva koja nisu dio Open311 v2 specifikacija su vraćena: agencijski _poslano_datum-vrijeme, naslov (također vraćen kao dio opisa), sučelje_korišteno, brojač_komentara, ime_pretražitelja(prisutno samo ako je tražitelj dopustio prikaz imena na ovoj stranici)."
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:121
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:143
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:38
#: templates/web/fixmystreet/report/banner.html:19
-#: templates/web/zurich/admin/header.html:1
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/header.html:8
#: templates/web/zurich/admin/report_edit.html:102
#: templates/web/zurich/report/banner.html:15
msgid "In progress"
msgstr "U tijeku"
-#: templates/web/seesomething/report/new/fill_in_details_form.html:38
-msgid "Incident Category"
-msgstr ""
-
#: templates/web/zurich/admin/report_edit.html:163
msgid "Include reporter personal details"
msgstr ""
@@ -1587,7 +1516,7 @@ msgstr ""
msgid "Invalid agency_responsible value %s"
msgstr "Nevažeća odgovorna_vrijednost agencije %s"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1096
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1105
msgid "Invalid end date"
msgstr "Nevažeći datum završetka"
@@ -1595,12 +1524,10 @@ msgstr "Nevažeći datum završetka"
msgid "Invalid format %s specified."
msgstr "Naveden nevažeći %s format."
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1092
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1101
msgid "Invalid start date"
msgstr "Nevažeći datum početka"
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:81
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:37
#: templates/web/default/dashboard/index.html:142
@@ -1612,30 +1539,25 @@ msgstr "Nevažeći datum početka"
msgid "Investigating"
msgstr "Istražujem"
-#: templates/web/emptyhomes/tokens/confirm_problem.html:12
+#: templates/web/emptyhomes/tokens/confirm_problem.html:13
#: templates/web/emptyhomes/tokens/confirm_problem.html:14
msgid "It is worth noting however that the process can sometimes be slow, especially if the property is in very poor repair or the owner is unwilling to act. In most cases it can take six months or more before you can expect to see anything change and sometimes there may be considerable barries to a property being brought back into use. This doesn&rsquo;t mean the council isn&rsquo;t doing anything. We encourage councils to update the website so you can see what is happening. It may be a long process, but you reporting your concerns about this property to the council is a valuable first step."
msgstr "Međutim, važno je napomenuti da proces ponekad može biti spor, osobito ako je imovina u vrlo lošem stanju ili ako vlasnik ne želi sudjelovati. U većini slučajeva, može proći šest mjeseci ili više prije nego što se primjete neke promjene, a ponekad mogu postojati bitne prepreke u pokušaju osposobljavanja imovine za uporabu. To ne znači&rsquo; da odgovorno tijelo &rsquo;ništa ne radi. Potičemo odgovorna tijela na redovito ažuriranje web stranice kako biste mogli vidjeti što se događa. .To može biti dug proces, ali prijavljivanje vaših nedoumica odgovornom tijelu je važan prvi korak."
-#: templates/web/bromley/report/display.html:168
-#: templates/web/bromley/report/new/fill_in_details_form.html:209
+#: templates/web/fixmystreet/contact/blurb.html:8
+msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there."
+msgstr ""
+
#: templates/web/default/auth/general.html:44
#: templates/web/default/report/new/fill_in_details_form.html:149
#: templates/web/default/report/update-form.html:104
#: templates/web/fixmystreet/auth/general.html:46
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:172
#: templates/web/fixmystreet/report/update-form.html:100
-#: templates/web/seesomething/auth/general.html:35
#: templates/web/zurich/auth/general.html:40
msgid "Keep me signed in on this computer"
msgstr "Ostani prijavljen na ovom računalu"
-#: templates/web/bromley/report/display.html:197
-#: templates/web/bromley/report/new/fill_in_details_form.html:119
-#: templates/web/bromley/report/new/fill_in_details_form.html:166
-msgid "Last Name"
-msgstr "Prezime"
-
#: templates/web/default/admin/body.html:58
#: templates/web/zurich/admin/body.html:15
msgid "Last editor"
@@ -1658,11 +1580,9 @@ msgstr ""
msgid "List all reported problems"
msgstr "Izlistaj sve prijavljenje probleme"
-#: templates/web/bromley/report/new/fill_in_details_form.html:69
#: templates/web/default/report/new/fill_in_details_form.html:68
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:51
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:75
-#: templates/web/seesomething/report/new/fill_in_details_form.html:25
#: templates/web/zurich/report/new/fill_in_details_form.html:51
msgid "Loading..."
msgstr "Učitavanje"
@@ -1671,7 +1591,7 @@ msgstr "Učitavanje"
#: templates/web/default/alert/choose.html:3
#: templates/web/default/alert/index.html:1
#: templates/web/default/alert/index.html:3
-#: templates/web/default/alert/list.html:1
+#: templates/web/default/alert/list.html:2
#: templates/web/default/alert/list.html:5
#: templates/web/default/alert/updates.html:1
#: templates/web/default/tokens/confirm_alert.html:1
@@ -1684,23 +1604,17 @@ msgstr "Učitavanje"
msgid "Local RSS feeds and email alerts"
msgstr "Lokalni RSS izvori i e-mail upozorenja"
-#: templates/web/default/alert/list.html:1
-#: templates/web/default/alert/list.html:12
+#: templates/web/default/alert/list.html:13
#: templates/web/default/alert/list.html:14
+#: templates/web/default/alert/list.html:2
#: templates/web/default/alert/list.html:3
msgid "Local RSS feeds and email alerts for ‘%s’"
msgstr "Lokalni RSS izvori i e-mail upozorenja za‘%s’"
-#: templates/web/barnet/footer.html:22 templates/web/bromley/footer.html:23
-#: templates/web/bromley/header.html:79 templates/web/default/footer.html:13
-#: templates/web/fiksgatami/footer.html:8
+#: templates/web/default/footer.html:13 templates/web/fiksgatami/footer.html:8
#: templates/web/fiksgatami/nn/footer.html:8
-#: templates/web/fixmindelo/footer.html:43
#: templates/web/fixmybarangay/footer.html:22
-#: templates/web/fixmystreet/footer.html:50
-#: templates/web/oxfordshire/footer.html:25
-#: templates/web/oxfordshire/header.html:71
-#: templates/web/reading/footer.html:9 templates/web/stevenage/footer.html:45
+#: templates/web/fixmystreet/footer.html:53
msgid "Local alerts"
msgstr "Lokalna upozorenja"
@@ -1709,7 +1623,6 @@ msgid "Locate the problem on a map of the area"
msgstr "Lociraj problem na mapi područja"
#: templates/web/default/js/translation_strings.html:43
-#: templates/web/oxfordshire/js/translation_strings.html:37
msgid "MAP"
msgstr ""
@@ -1721,11 +1634,11 @@ msgstr "Mapiraj i kopiraj; <a id=\"osm_link\" href=\"http://www.openstreetmap.or
msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
msgstr ""
-#: templates/web/fixmystreet/contact/index.html:98
+#: templates/web/fixmystreet/contact/index.html:103
msgid "Message"
msgstr "Poruka"
-#: templates/web/default/contact/index.html:90
+#: templates/web/default/contact/index.html:92
msgid "Message:"
msgstr "Poruka:"
@@ -1767,10 +1680,6 @@ msgstr "Više problema u blizini"
msgid "Name"
msgstr "Ime"
-#: templates/web/seesomething/report/new/fill_in_details_form.html:74
-msgid "Name (optional)"
-msgstr ""
-
#: templates/web/default/admin/report_edit.html:66
#: templates/web/default/admin/update_edit.html:32
#: templates/web/default/admin/user-form.html:18
@@ -1780,30 +1689,30 @@ msgstr ""
msgid "Name:"
msgstr "Ime:"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:317
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:322
msgid "Name: %s"
msgstr ""
#: templates/web/fiksgatami/footer.html:3
#: templates/web/fiksgatami/nn/footer.html:3
-#: templates/web/reading/footer.html:4
msgid "Navigation"
msgstr "Navigacija"
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:188
#: perllib/FixMyStreet/Geocode/OSM.pm:166
msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
msgstr "Najbliža imenovana cesta smještena pokraj oznake na mapi (automatski generirano pomoću OpenStreetMap): %s%s"
-#: perllib/FixMyStreet/Cobrand/UK.pm:148
+#: perllib/FixMyStreet/Cobrand/UK.pm:142
msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
msgstr "Najbliži poštanski broj pokraj oznake na mapi (automatski generiran): %s (%sm away)"
-#: perllib/FixMyStreet/Cobrand/Default.pm:418
-#: perllib/FixMyStreet/Cobrand/Default.pm:458
+#: perllib/FixMyStreet/Cobrand/Default.pm:421
+#: perllib/FixMyStreet/Cobrand/Default.pm:461
msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
msgstr "Najbliža cesta smještena pokraj oznake na mapi (automatski generirano pomoću Bing Maps): %s"
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:273
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:297
msgid ""
"Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
"\n"
@@ -1945,14 +1854,12 @@ msgid "No edits have yet been made."
msgstr "Nikakve izmjene još nisu napravljenje."
#: templates/web/default/admin/flagged.html:25
-#, fuzzy
msgid "No flagged problems found."
-msgstr "Nisu pronađeni označeni problemi"
+msgstr ""
#: templates/web/default/admin/flagged.html:58
-#, fuzzy
msgid "No flagged users found."
-msgstr "Nisu pronađeni označeni korisnici"
+msgstr ""
#: templates/web/zurich/admin/report_edit-sdm.html:68
msgid "No further updates"
@@ -1969,7 +1876,6 @@ msgid "No problems have been reported yet."
msgstr "Još uvijek nisu prijavljeni nikakvi problemi."
#: templates/web/default/js/translation_strings.html:38
-#: templates/web/oxfordshire/js/translation_strings.html:32
msgid "No result returned"
msgstr ""
@@ -1980,7 +1886,7 @@ msgid ""
" your config file is not pointing to a live MapIt service."
msgstr ""
-#: templates/web/default/report/_support.html:2
+#: templates/web/default/report/_support.html:3
#: templates/web/default/report/_support.html:4
msgid "No supporters"
msgstr "Bez podrške"
@@ -2004,8 +1910,6 @@ msgid ""
" activity across their body), the ability to hide reports or set special report statuses."
msgstr ""
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:83
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:46
#: templates/web/default/report/update-form.html:30
@@ -2064,7 +1968,6 @@ msgid "Now to submit your update&hellip; do you have a FixMyStreet password?"
msgstr "Pošaljite svoje ažuriranje&hellip; imate li Popravi.to lozinku?"
#: templates/web/default/js/translation_strings.html:42
-#: templates/web/oxfordshire/js/translation_strings.html:36
msgid "OK"
msgstr ""
@@ -2108,8 +2011,7 @@ msgstr "Starije popravljeno"
msgid "Older problems"
msgstr "Stariji problemi"
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:115
-#: templates/web/bromley/report/display.html:80
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:137
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:36
#: templates/web/default/admin/report_edit.html:37
@@ -2117,7 +2019,7 @@ msgstr "Stariji problemi"
#: templates/web/default/dashboard/index.html:142
#: templates/web/default/report/update-form.html:30
#: templates/web/fixmystreet/report/update-form.html:28
-#: templates/web/zurich/admin/header.html:1
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/header.html:7
#: templates/web/zurich/admin/report_edit.html:89
#: templates/web/zurich/admin/report_edit.html:91
@@ -2126,7 +2028,7 @@ msgstr "Stariji problemi"
msgid "Open"
msgstr "Otvori"
-#: templates/web/default/my/my.html:22 templates/web/fixmystreet/my/my.html:26
+#: templates/web/default/my/my.html:27 templates/web/fixmystreet/my/my.html:33
msgid "Open reports"
msgstr "Otvori izvješća"
@@ -2152,15 +2054,15 @@ msgstr "Ili problemi prijavljeni:"
msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
msgstr "Ili se možete pretplatiti na upozorenja unutar vašeg vijeća &rsquo;:"
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1053
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:664
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:665
-#: perllib/FixMyStreet/DB/Result/Problem.pm:544
-#: perllib/FixMyStreet/DB/Result/Problem.pm:554
-#: perllib/FixMyStreet/DB/Result/Problem.pm:564
-#: perllib/FixMyStreet/DB/Result/Problem.pm:576
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:361
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1057
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:662
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:663
+#: perllib/FixMyStreet/DB/Result/Problem.pm:546
+#: perllib/FixMyStreet/DB/Result/Problem.pm:556
+#: perllib/FixMyStreet/DB/Result/Problem.pm:566
+#: perllib/FixMyStreet/DB/Result/Problem.pm:578
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:369
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:384
msgid "Other"
msgstr "Drugo"
@@ -2187,8 +2089,6 @@ msgstr ""
msgid "Partial"
msgstr "Djelomično"
-#: templates/web/bromley/report/display.html:147
-#: templates/web/bromley/report/new/fill_in_details_form.html:186
#: templates/web/fixmystreet/auth/general.html:59
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:208
#: templates/web/fixmystreet/report/update-form.html:119
@@ -2206,19 +2106,15 @@ msgid "Permalink"
msgstr ""
#: templates/web/zurich/report/new/fill_in_details_form.html:106
-#, fuzzy
msgid "Phone number"
-msgstr "Vaš broj telefona"
+msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:136
-#: templates/web/bromley/report/new/fill_in_details_form.html:183
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:138
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:205
-#: templates/web/seesomething/report/new/fill_in_details_form.html:89
msgid "Phone number (optional)"
msgstr "Telefonski broj (neobavezan)"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:282
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:287
#: templates/web/default/admin/report_edit.html:68
#: templates/web/default/report/new/fill_in_details_form.html:215
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:138
@@ -2228,11 +2124,8 @@ msgstr "Telefonski broj (neobavezan)"
msgid "Phone:"
msgstr "Telefon:"
-#: templates/web/bromley/report/display.html:111
-#: templates/web/bromley/report/new/fill_in_details_form.html:104
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:92
#: templates/web/fixmystreet/report/update-form.html:59
-#: templates/web/seesomething/report/new/fill_in_details_form.html:52
#: templates/web/zurich/admin/index-dm.html:29
#: templates/web/zurich/admin/index-sdm.html:24
#: templates/web/zurich/admin/reports.html:16
@@ -2254,7 +2147,6 @@ msgid "Photos of recent nearby reports"
msgstr "Fotografije posljednjih obližnjih prijava"
#: templates/web/default/js/translation_strings.html:30
-#: templates/web/oxfordshire/js/translation_strings.html:24
msgid "Place pin on map"
msgstr ""
@@ -2262,7 +2154,7 @@ msgstr ""
#: templates/web/default/admin/report_edit.html:38
#: templates/web/default/dashboard/index.html:142
#: templates/web/default/dashboard/index.html:143
-#: templates/web/zurich/admin/header.html:1
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/header.html:9
#: templates/web/zurich/admin/index-dm.html:9
#: templates/web/zurich/admin/report_edit.html:89
@@ -2276,7 +2168,6 @@ msgstr "Molimo<a class=\"tab_link\" href=\"#report\">pregledajte</a> poslana až
#: templates/web/default/report/new/notes.html:6
#: templates/web/fixmystreet/report/new/notes.html:6
-#: templates/web/oxfordshire/report/new/notes.html:5
msgid "Please be polite, concise and to the point."
msgstr "Molimo da budete pristojni, jezgroviti i jasni."
@@ -2293,20 +2184,16 @@ msgstr "Provjeri svoj e-mail"
#: templates/web/default/auth/general.html:8
#: templates/web/fixmystreet/auth/general.html:15
#: templates/web/fixmystreet/auth/general.html:9
-#: templates/web/seesomething/auth/general.html:15
-#: templates/web/seesomething/auth/general.html:9
#: templates/web/zurich/auth/general.html:3
#: templates/web/zurich/auth/general.html:9
msgid "Please check your email address is correct"
msgstr "Provjerite je li vaša e-mail adresa točna"
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:848
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:855
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:874
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:917
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:859
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:878
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:921
#: perllib/FixMyStreet/DB/Result/Problem.pm:381
#: templates/web/default/js/translation_strings.html:9
-#: templates/web/oxfordshire/js/translation_strings.html:9
msgid "Please choose a category"
msgstr "Izaberi kategoriju"
@@ -2314,19 +2201,8 @@ msgstr "Izaberi kategoriju"
msgid "Please choose a property type"
msgstr "Izaberi tip imovine"
-#: templates/web/seesomething/js/translation_strings.html:6
-msgid "Please choose a transport category"
-msgstr ""
-
-#: templates/web/seesomething/js/translation_strings.html:7
-msgid "Please choose an incident category"
-msgstr ""
-
-#: templates/web/bromley/report/new/fill_in_details_form.html:64
-msgid "Please describe the exact location of the report. Example: “2 dumped mattresses outside Number 19 Stockwell Close”"
-msgstr "Molimo opišite točnu lokaciju prijave. Primjer: “2 bačena madraca na broju 19 Stockwell Close”"
-
#: templates/web/default/contact/blurb.html:2
+#: templates/web/fixmystreet/contact/blurb.html:12
msgid ""
"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"
@@ -2338,7 +2214,6 @@ msgstr ""
#: templates/web/default/report/new/notes.html:7
#: templates/web/fixmystreet/report/new/notes.html:7
-#: templates/web/oxfordshire/report/new/notes.html:6
msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the service for all users."
msgstr ""
@@ -2348,7 +2223,6 @@ msgstr ""
#: perllib/FixMyStreet/DB/Result/Comment.pm:126
#: templates/web/default/js/translation_strings.html:2
-#: templates/web/oxfordshire/js/translation_strings.html:2
msgid "Please enter a message"
msgstr "Unesi poruku"
@@ -2361,19 +2235,14 @@ msgstr "Unesi lozinku"
#: perllib/FixMyStreet/App/Controller/Contact.pm:97
#: perllib/FixMyStreet/DB/Result/Problem.pm:356
#: templates/web/default/js/translation_strings.html:3
-#: templates/web/oxfordshire/js/translation_strings.html:3
msgid "Please enter a subject"
msgstr "Unesi predmet"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1032
-#: perllib/FixMyStreet/App/Controller/Admin.pm:979
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1041
+#: perllib/FixMyStreet/App/Controller/Admin.pm:988
#: perllib/FixMyStreet/DB/Result/User.pm:115
#: templates/web/default/js/translation_strings.html:12
#: templates/web/default/js/translation_strings.html:16
-#: templates/web/oxfordshire/js/translation_strings.html:12
-#: templates/web/oxfordshire/js/translation_strings.html:16
-#: templates/web/seesomething/js/translation_strings.html:10
-#: templates/web/seesomething/js/translation_strings.html:13
msgid "Please enter a valid email"
msgstr "Unesi valjani e-mail"
@@ -2384,8 +2253,6 @@ msgstr "Unesi valjanu e-mail adresu"
#: perllib/FixMyStreet/DB/Result/Problem.pm:359
#: templates/web/default/js/translation_strings.html:4
-#: templates/web/oxfordshire/js/translation_strings.html:4
-#: templates/web/seesomething/js/translation_strings.html:2
msgid "Please enter some details"
msgstr "Unesi detalje"
@@ -2397,32 +2264,22 @@ msgstr "Unesi detalje"
#: templates/web/default/js/translation_strings.html:15
#: templates/web/fixmystreet/auth/general.html:14
#: templates/web/fixmystreet/auth/general.html:9
-#: templates/web/oxfordshire/js/translation_strings.html:11
-#: templates/web/oxfordshire/js/translation_strings.html:15
-#: templates/web/seesomething/auth/general.html:14
-#: templates/web/seesomething/auth/general.html:9
-#: templates/web/seesomething/js/translation_strings.html:9
#: templates/web/zurich/auth/general.html:3
#: templates/web/zurich/auth/general.html:8
msgid "Please enter your email"
msgstr "Unesi svoj e-mail"
-#: templates/web/bromley/report/new/fill_in_details_form.html:149
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:151
-#: templates/web/seesomething/report/new/fill_in_details_form.html:85
#: templates/web/zurich/report/new/fill_in_details_form.html:92
msgid "Please enter your email address"
msgstr "Unesi svoju e-mail adresu"
#: templates/web/default/js/translation_strings.html:25
-#: templates/web/oxfordshire/js/translation_strings.html:19
msgid "Please enter your first name"
msgstr "Unesi svoje ime"
#: perllib/FixMyStreet/DB/Result/Problem.pm:374
#: templates/web/default/js/translation_strings.html:7
-#: templates/web/oxfordshire/js/translation_strings.html:7
-#: templates/web/seesomething/js/translation_strings.html:4
msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
msgstr "Molimo unesite svoje puno ime, odgovorno tijelo treba ovu informaciju – ako ne želite da vaše ime bude prikazano na stranici, odznačite kvadratić ispod"
@@ -2431,22 +2288,18 @@ msgstr "Molimo unesite svoje puno ime, odgovorno tijelo treba ovu informaciju
#: perllib/FixMyStreet/DB/Result/Problem.pm:367
#: perllib/FixMyStreet/DB/Result/User.pm:108
#: templates/web/default/js/translation_strings.html:6
-#: templates/web/oxfordshire/js/translation_strings.html:6
msgid "Please enter your name"
msgstr "Unesite svoje ime"
#: templates/web/default/js/translation_strings.html:22
-#, fuzzy
msgid "Please enter your phone number"
-msgstr "Unesite svoje prezime"
+msgstr ""
#: templates/web/default/js/translation_strings.html:26
-#: templates/web/oxfordshire/js/translation_strings.html:20
msgid "Please enter your second name"
msgstr "Unesite svoje prezime"
#: templates/web/default/js/translation_strings.html:24
-#: templates/web/oxfordshire/js/translation_strings.html:18
msgid "Please enter your title"
msgstr "Unesite svoju titulu"
@@ -2469,16 +2322,16 @@ msgstr ""
"Ne trebate navoditi točnu adresu. Molimo budite pristojni, jezgroviti\n"
"i precizni; pisanje poruke tiskanim slovima i nedostatak interpunkcije otežava čitanje."
-#: templates/web/default/report/new/fill_in_details_text.html:1
#: templates/web/default/report/new/fill_in_details_text.html:11
-#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1
+#: templates/web/default/report/new/fill_in_details_text.html:2
#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:10
-#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:2
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:2
#: templates/web/fixmystreet/report/new/fill_in_details_text.html:8
msgid "Please fill in details of the problem below."
msgstr "Popunite detalje o problemu u nastavku."
-#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:2
#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:3
msgid ""
"Please fill in details of the problem below. Leave as much detail as you can, \n"
@@ -2489,7 +2342,7 @@ msgstr ""
"i ako je moguće navedite točnu lokaciju\n"
"problema (npr. ako postoji broj javne rasvjete ili ime ceste)."
-#: templates/web/default/report/new/fill_in_details_text.html:1
+#: templates/web/default/report/new/fill_in_details_text.html:2
#: templates/web/default/report/new/fill_in_details_text.html:3
msgid ""
"Please fill in details of the problem below. The council won't be able\n"
@@ -2502,12 +2355,10 @@ msgstr ""
"fotografiju problema), itd."
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:70
-#: templates/web/seesomething/report/new/fill_in_details_form.html:20
#: templates/web/zurich/report/new/fill_in_details_form.html:46
msgid "Please fill in details of the problem."
msgstr "Popunite detalje o problemu u nastavku."
-#: templates/web/bromley/report/new/fill_in_details_form.html:28
#: templates/web/default/report/new/fill_in_details_form.html:27
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:26
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:35
@@ -2519,7 +2370,7 @@ msgstr "Popunite detalje o problemu u nastavku i opišite lokaciju što precizni
msgid "Please indicate whether you'd like to receive another questionnaire"
msgstr "Molimo navedite želite li primiti novi upitnik"
-#: templates/web/fixmystreet/report/updates-sidebar-notes.html:3
+#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4
msgid "Please note that updates are not sent to the council."
msgstr "Napominjemo da se ažuriranja ne šalju odgovornom tijelu."
@@ -2527,11 +2378,6 @@ msgstr "Napominjemo da se ažuriranja ne šalju odgovornom tijelu."
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 "Napominjemo da se ažuriranja ne šalju odgovornom tijelu. Ako navedete svoje ime, bit će vidljivo. Vaše informacije će biti korištene u skladu s našim <a href=\"/faq#privacy\">pravilima o privatnosti</a>"
-#: templates/web/barnet/report/updates-sidebar-notes.html:1
-msgid "Please note that updates are not sent to the relevant department. 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 "Napominjemo da se ažuriranja ne šalju nadležnom odjelu. Ako navedete svoje ime, bit će vidljivo. Vaše informacije će biti korištene u skaldu s našim <a href=\"/faq#privacy\">pravilima o privatnosti</a>"
-
-#: templates/web/bromley/report/new/fill_in_details_form.html:23
#: templates/web/default/report/new/fill_in_details_form.html:5
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:5
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:26
@@ -2542,7 +2388,6 @@ msgstr "Napominjemo da vaša prijava <strong>još nije poslana</strong>. Izaberi
#: templates/web/default/report/new/notes.html:1
#: templates/web/fixmybarangay/report/new/notes.html:1
#: templates/web/fixmystreet/report/new/notes.html:1
-#: templates/web/oxfordshire/report/new/notes.html:1
msgid "Please note:"
msgstr "Napominjemo:"
@@ -2587,19 +2432,15 @@ msgstr "Molimo učitajte samo JPEG slike\n"
msgid "Please write a message"
msgstr "Napiši poruku"
-#: templates/web/bromley/report/display.html:70
#: templates/web/fixmystreet/report/update-form.html:23
msgid "Please write your update here"
msgstr "Ovdje ažurirajte"
-#: templates/web/bromley/report/display.html:123
-#: templates/web/bromley/report/display.html:151
-#: templates/web/bromley/report/display.html:163
-#: templates/web/default/contact/index.html:93
+#: templates/web/default/contact/index.html:95
#: templates/web/default/report/update-form.html:109
#: templates/web/default/report/update-form.html:131
#: templates/web/default/report/update-form.html:72
-#: templates/web/fixmystreet/contact/index.html:105
+#: templates/web/fixmystreet/contact/index.html:110
#: templates/web/fixmystreet/report/update-form.html:123
#: templates/web/fixmystreet/report/update-form.html:71
#: templates/web/fixmystreet/report/update-form.html:95
@@ -2632,7 +2473,7 @@ msgstr "Privatno"
msgid "Private information (not shown on site)"
msgstr ""
-#: templates/web/default/maps/openlayers.html:85
+#: templates/web/default/maps/openlayers.html:86
msgid "Problem"
msgstr "Problem"
@@ -2653,7 +2494,7 @@ msgstr "Problem %s poslan odgovornom tijelu %s"
msgid "Problem breakdown by state"
msgstr "Analiza problema prema stanju"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:950
+#: perllib/FixMyStreet/App/Controller/Admin.pm:959
msgid "Problem marked as open."
msgstr "Problem označen kao otvoren."
@@ -2669,7 +2510,6 @@ msgstr "Problemi"
msgid "Problems in this area"
msgstr "Problemi u ovom području"
-#: templates/web/bromley/report/display.html:31
#: templates/web/fixmystreet/around/tabbed_lists.html:4
#: templates/web/fixmystreet/report/display.html:46
msgid "Problems nearby"
@@ -2689,15 +2529,16 @@ msgstr "Problems nedavno prijavljeni kao popravljeni na Popravi.to"
msgid "Problems within %.1fkm of this location"
msgstr "Problemi unutar%.1fkm od ove lokacije"
-#: perllib/FixMyStreet/Cobrand/Default.pm:626
+#: perllib/FixMyStreet/Cobrand/Default.pm:629
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:109
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155
-#: perllib/FixMyStreet/Cobrand/UK.pm:228
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:184
+#: perllib/FixMyStreet/Cobrand/UK.pm:222
msgid "Problems within %s"
msgstr "Problemi unutar %s"
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117
-#: perllib/FixMyStreet/Cobrand/UK.pm:242
+#: perllib/FixMyStreet/Cobrand/UK.pm:236
msgid "Problems within %s ward"
msgstr "Problemi unutar %s ward"
@@ -2725,12 +2566,10 @@ msgstr ""
msgid "Property type:"
msgstr "Tip objekta:"
-#: templates/web/bromley/report/new/fill_in_details_form.html:52
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:64
msgid "Provide a title"
msgstr "Navedite naslov"
-#: templates/web/bromley/report/display.html:57
#: templates/web/default/report/update-form.html:3
#: templates/web/fixmystreet/report/update-form.html:4
msgid "Provide an update"
@@ -2740,11 +2579,6 @@ msgstr "Ažuriranje"
msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:180
-msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
-msgstr "Lozinka nije obvezna, ali će vam omogućiti lakše prijavljivanje budućih problema, ažuriranja i upravljanje vašim izvješćima."
-
-#: templates/web/bromley/report/display.html:144
#: templates/web/default/report/new/fill_in_details_form.html:173
#: templates/web/default/report/update-form.html:128
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:202
@@ -2775,7 +2609,6 @@ msgstr ""
msgid "Publish the response"
msgstr ""
-#: templates/web/default/questionnaire/completed.html:1
#: templates/web/default/questionnaire/completed.html:2
#: templates/web/default/questionnaire/index.html:0
#: templates/web/default/questionnaire/index.html:14
@@ -2799,9 +2632,7 @@ msgstr "Upitnik %d poslan za problem %d"
msgid "Questionnaire filled in by problem reporter"
msgstr "Upitnik popunila osoba koja je prijavila problem"
-#: templates/web/bromley/report/display.html:37
#: templates/web/default/alert/_list.html:21
-#: templates/web/default/around/display_location.html:1
#: templates/web/default/around/display_location.html:3
#: templates/web/default/report/display.html:46
#: templates/web/default/reports/_rss.html:1
@@ -2811,11 +2642,11 @@ msgstr "Upitnik popunila osoba koja je prijavila problem"
msgid "RSS feed"
msgstr "RSS izvor"
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:265 perllib/FixMyStreet/Cobrand/UK.pm:277
msgid "RSS feed for %s"
msgstr "RSS izvor za %s"
-#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289
+#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
msgid "RSS feed for %s ward, %s"
msgstr "RSS izvor za %s ward, %s"
@@ -2823,11 +2654,15 @@ msgstr "RSS izvor za %s ward, %s"
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:189
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:197
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:309
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:200
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:208
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:218
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:226
+#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303
msgid "RSS feed of %s"
msgstr "RSS izvor za %s"
-#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:314
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:308
msgid "RSS feed of %s, within %s ward"
msgstr "RSS izvor za %s, unutar %s ward"
@@ -2840,31 +2675,30 @@ msgstr "RSS izvor za okolne probleme"
msgid "RSS feed of problems in this %s"
msgstr "RSS izvor za probleme u ovom %s"
-#: perllib/FixMyStreet/Cobrand/Default.pm:627
+#: perllib/FixMyStreet/Cobrand/Default.pm:630
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:110
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:154
-#: perllib/FixMyStreet/Cobrand/UK.pm:235
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:183
+#: perllib/FixMyStreet/Cobrand/UK.pm:229
msgid "RSS feed of problems within %s"
msgstr "RSS izvor za probleme unutar %s"
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:116
-#: perllib/FixMyStreet/Cobrand/UK.pm:241
+#: perllib/FixMyStreet/Cobrand/UK.pm:235
msgid "RSS feed of problems within %s ward"
msgstr "RSS izvor za probleme unutar %s ward"
-#: templates/web/default/around/display_location.html:1
+#: templates/web/default/around/display_location.html:3
#: templates/web/default/around/display_location.html:4
msgid "RSS feed of recent local problems"
msgstr "RSS izvor za nedavne lokalne probleme"
-#: templates/web/bromley/report/display.html:37
#: templates/web/default/report/display.html:46
#: templates/web/fixmystreet/alert/updates.html:9
#: templates/web/fixmystreet/report/display.html:61
msgid "RSS feed of updates to this problem"
msgstr "RSS izvor za ažuriranja ovog problema"
-#: templates/web/bromley/report/display.html:39
#: templates/web/default/alert/updates.html:9
#: templates/web/default/report/display.html:37
#: templates/web/fixmystreet/alert/updates.html:14
@@ -2888,7 +2722,7 @@ msgid "Recently fixed"
msgstr "Nedavno popravljeno"
#: templates/web/default/index.html:35 templates/web/emptyhomes/index.html:24
-#: templates/web/fixmystreet/index.html:45
+#: templates/web/fixmystreet/index.html:49
msgid "Recently reported problems"
msgstr "Nedavno prijavljeni problemi"
@@ -2905,8 +2739,8 @@ msgstr "Napominjemo da, u sklopu pilot projekt, FixMyBarangay služi samo za pri
msgid "Remove flag"
msgstr "Ukloni oznaku"
-#: templates/web/default/admin/report_edit.html:89
-#: templates/web/default/admin/update_edit.html:57
+#: templates/web/default/admin/report_edit.html:94
+#: templates/web/default/admin/update_edit.html:62
#: templates/web/zurich/admin/update_edit.html:35
msgid "Remove photo (can't be undone!)"
msgstr "Ukloni fotografiju (nije moguće poništiti!)"
@@ -2915,29 +2749,21 @@ msgstr "Ukloni fotografiju (nije moguće poništiti!)"
msgid "Report Empty Homes"
msgstr "Prijavi prazne kuće"
-#: templates/web/barnet/footer.html:16 templates/web/bromley/footer.html:17
#: templates/web/default/footer.html:7 templates/web/emptyhomes/header.html:31
#: templates/web/fiksgatami/footer.html:5
#: templates/web/fiksgatami/nn/footer.html:5
-#: templates/web/fixmindelo/footer.html:37
-#: templates/web/fixmystreet/footer.html:44
-#: templates/web/oxfordshire/footer.html:19
-#: templates/web/reading/footer.html:6
-#: templates/web/seesomething/footer.html:11
-#: templates/web/stevenage/footer.html:39 templates/web/zurich/footer.html:17
+#: templates/web/fixmystreet/footer.html:47
+#: templates/web/zurich/footer.html:17
#: templates/web/zurich/nav_over_content.html:4
msgid "Report a problem"
msgstr "Prijavi problem"
-#: templates/web/bromley/report/display.html:28
#: templates/web/fixmystreet/report/display.html:35
msgid "Report abuse"
msgstr "Prijavi zloupotrebu"
#: templates/web/default/report_created.html:1
#: templates/web/default/report_created.html:3
-#: templates/web/seesomething/report_created.html:0
-#: templates/web/seesomething/report_created.html:8
msgid "Report created"
msgstr ""
@@ -2947,22 +2773,21 @@ msgstr "Prijava za %s"
#: templates/web/default/index.html:14 templates/web/emptyhomes/index.html:5
#: templates/web/fixmystreet/around/intro.html:1
-#: templates/web/stevenage/around/intro.html:1
#: templates/web/zurich/around/intro.html:1
msgid "Report, view, or discuss local problems"
msgstr "Prijavi, pregledaj ili raspravljaj o lokalnim problemima"
-#: templates/web/default/my/my.html:74
+#: templates/web/default/my/my.html:79
msgid "Reported %s"
msgstr "Prijavljeno %s"
-#: templates/web/default/my/my.html:72
+#: templates/web/default/my/my.html:77
msgid "Reported %s, to %s"
msgstr "Prijavljeno %s, za %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:559
+#: perllib/FixMyStreet/DB/Result/Problem.pm:561
#: templates/web/default/contact/index.html:45
-#: templates/web/fixmystreet/contact/index.html:58
+#: templates/web/fixmystreet/contact/index.html:62
msgid "Reported anonymously at %s"
msgstr "Prijavljeno anonimno %s"
@@ -2972,9 +2797,9 @@ msgstr "Prijavljeno anonimno %s"
msgid "Reported before"
msgstr "Prije prijavljeno"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:582
+#: perllib/FixMyStreet/DB/Result/Problem.pm:584
#: templates/web/default/contact/index.html:47
-#: templates/web/fixmystreet/contact/index.html:60
+#: templates/web/fixmystreet/contact/index.html:64
msgid "Reported by %s at %s"
msgstr "Prijavio %s za %s"
@@ -2982,27 +2807,27 @@ msgstr "Prijavio %s za %s"
msgid "Reported in the %s category"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:555
+#: perllib/FixMyStreet/DB/Result/Problem.pm:557
msgid "Reported in the %s category anonymously at %s"
msgstr "Prijavljeno %s u kategoriju anonimno u %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:577
+#: perllib/FixMyStreet/DB/Result/Problem.pm:579
msgid "Reported in the %s category by %s at %s"
msgstr "Prijavio %s u kategoriju %s u %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:551
+#: perllib/FixMyStreet/DB/Result/Problem.pm:553
msgid "Reported via %s anonymously at %s"
msgstr "Prijavio %s anonimno %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:573
+#: perllib/FixMyStreet/DB/Result/Problem.pm:575
msgid "Reported via %s by %s at %s"
msgstr "Prijavio %s %s u %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:547
+#: perllib/FixMyStreet/DB/Result/Problem.pm:549
msgid "Reported via %s in the %s category anonymously at %s"
msgstr "Prijavio %s u kategoriju %s anonimno u %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:567
+#: perllib/FixMyStreet/DB/Result/Problem.pm:569
msgid "Reported via %s in the %s category by %s at %s"
msgstr "Prijavio %s u %s kategoriju %s u %s"
@@ -3016,22 +2841,18 @@ msgstr "Prijavio %s u %s kategoriju %s u %s"
#: templates/web/fixmystreet/report/new/fill_in_details.html:0
#: templates/web/fixmystreet/report/new/fill_in_details.html:5
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2
-#: templates/web/oxfordshire/js/translation_strings.html:35
-#: templates/web/seesomething/around/around_index.html:1
-#: templates/web/seesomething/report/new/fill_in_details_form.html:3
#: templates/web/zurich/report/new/fill_in_details_form.html:2
msgid "Reporting a problem"
msgstr "Prijavljivanje problema"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1177
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:242
-#: templates/web/seesomething/admin/stats.html:1
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1186
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:290
#: templates/web/zurich/header.html:60
msgid "Reports"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:393
-#: perllib/FixMyStreet/DB/Result/Problem.pm:397
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
+#: perllib/FixMyStreet/DB/Result/Problem.pm:399
msgid "Reports are limited to %s characters in length. Please shorten your report"
msgstr ""
@@ -3052,27 +2873,28 @@ msgid "Resend report"
msgstr "Ponovno pošalji prijavu"
#: templates/web/default/js/translation_strings.html:28
-#: templates/web/oxfordshire/js/translation_strings.html:22
msgid "Right place?"
msgstr ""
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:195
#: perllib/FixMyStreet/Geocode/OSM.pm:173
msgid "Road operator for this named road (derived from road reference number and type): %s"
msgstr "Cestovni operater za ovu imenovanu cestu (izveden iz cestovnog referentnog broja i tipa): %s"
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:192
#: perllib/FixMyStreet/Geocode/OSM.pm:170
msgid "Road operator for this named road (from OpenStreetMap): %s"
msgstr "Cestovni operater za ovu imenovanu cestu (sa OpenStreetMap): %s"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1377
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1388
-#: templates/web/default/admin/report_edit.html:85
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1386
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1397
+#: templates/web/default/admin/report_edit.html:90
#: templates/web/zurich/admin/report_edit.html:76
msgid "Rotate Left"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1377
-#: templates/web/default/admin/report_edit.html:86
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1386
+#: templates/web/default/admin/report_edit.html:91
#: templates/web/zurich/admin/report_edit.html:77
msgid "Rotate Right"
msgstr ""
@@ -3101,9 +2923,8 @@ msgid "Search:"
msgstr "Pretraži:"
#: templates/web/default/admin/reports.html:26
-#, fuzzy
msgid "Searching found no reports."
-msgstr "Pretraži prijave"
+msgstr ""
#: templates/web/default/admin/users.html:39
msgid "Searching found no users."
@@ -3124,7 +2945,7 @@ msgstr ""
msgid "Select which type of alert you'd like and click the button for an RSS feed, or enter your email address to subscribe to an email alert."
msgstr "Odaberite tip upozorenja i kliknite na gumb za RSS izvor, ili unesite svoju e-mail adresu kako biste se pretplatili na e-mail upozorenja."
-#: perllib/FixMyStreet/DB/Result/Problem.pm:664
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
msgid "Sent to %s %s later"
msgstr "Pošalji %s %s naknadno"
@@ -3141,9 +2962,6 @@ msgstr "Servis:"
msgid "Share"
msgstr "Podijeli"
-#: templates/web/bromley/report/display.html:205
-#: templates/web/bromley/report/new/fill_in_details_form.html:129
-#: templates/web/bromley/report/new/fill_in_details_form.html:175
#: templates/web/default/report/new/fill_in_details_form.html:210
#: templates/web/default/report/update-form.html:157
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:129
@@ -3166,11 +2984,7 @@ msgstr "Prikaži pinove"
#: templates/web/fixmystreet/auth/general.html:3
#: templates/web/fixmystreet/auth/general.html:42
#: templates/web/fixmystreet/auth/general.html:62
-#: templates/web/fixmystreet/header.html:54
-#: templates/web/oxfordshire/header.html:115
-#: templates/web/seesomething/auth/general.html:3
-#: templates/web/seesomething/auth/general.html:39
-#: templates/web/stevenage/header.html:101
+#: templates/web/fixmystreet/header.html:57
#: templates/web/zurich/auth/general.html:18
#: templates/web/zurich/auth/general.html:35
msgid "Sign in"
@@ -3182,20 +2996,15 @@ msgstr "Prijavi se putem e-maila"
#: templates/web/default/auth/general.html:1
#: templates/web/fixmystreet/auth/general.html:1
-#: templates/web/seesomething/auth/general.html:1
#: templates/web/zurich/auth/general.html:1
msgid "Sign in or create an account"
msgstr "Prijavi se ili kreiraj korisnički račun"
-#: templates/web/bromley/auth/sign_out.html:1
#: templates/web/default/auth/sign_out.html:1
#: templates/web/default/header.html:30
#: templates/web/emptyhomes/header.html:46
#: templates/web/fiksgatami/header.html:22
#: templates/web/fiksgatami/nn/header.html:22
-#: templates/web/lichfielddc/header.html:177
-#: templates/web/reading/header.html:33
-#: templates/web/seesomething/auth/sign_out.html:1
#: templates/web/zurich/auth/sign_out.html:1
msgid "Sign out"
msgstr "Odjavi se"
@@ -3204,14 +3013,12 @@ msgstr "Odjavi se"
#: templates/web/emptyhomes/header.html:45
#: templates/web/fiksgatami/header.html:21
#: templates/web/fiksgatami/nn/header.html:21
-#: templates/web/lichfielddc/header.html:177
-#: templates/web/reading/header.html:32
msgid "Signed in as %s"
msgstr "Prijavljen kao %s"
-#: templates/web/default/report/new/fill_in_details_text.html:1
-#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1
-#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1
+#: templates/web/default/report/new/fill_in_details_text.html:2
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:2
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:2
msgid "Some categories may require additional information."
msgstr "Neke kategorije mogu zahtijevati dodatne informacije."
@@ -3242,6 +3049,8 @@ msgstr "Žao nam je, došlo je do greške pri potvrđivanju problema."
#: perllib/FixMyStreet/App/Controller/Report/New.pm:215
#: perllib/FixMyStreet/Geocode.pm:28 perllib/FixMyStreet/Geocode/Bing.pm:58
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:75
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:95
#: perllib/FixMyStreet/Geocode/Google.pm:74
#: perllib/FixMyStreet/Geocode/OSM.pm:66
msgid "Sorry, we could not find that location."
@@ -3249,7 +3058,7 @@ msgstr "Žao nam je, ne možemo pronaći tu lokaciju."
#: perllib/FixMyStreet/Geocode/Bing.pm:53
#: perllib/FixMyStreet/Geocode/Google.pm:69
-#: perllib/FixMyStreet/Geocode/Zurich.pm:87
+#: perllib/FixMyStreet/Geocode/Zurich.pm:88
msgid "Sorry, we could not parse that location. Please try again."
msgstr "Žao nam je, nije moguće analizirati tu lokaciju. Molimo pokušajte ponovno."
@@ -3259,11 +3068,9 @@ msgid "Source code"
msgstr "Izvorni kod"
#: templates/web/default/admin/stats.html:64
-#, fuzzy
msgid "Start Date:"
-msgstr "Dan početka:"
+msgstr ""
-#: templates/web/bromley/report/display.html:78
#: templates/web/default/admin/flagged.html:18
#: templates/web/default/admin/list_updates.html:11
#: templates/web/default/admin/reports.html:15
@@ -3280,8 +3087,8 @@ msgstr "Stanje"
msgid "State:"
msgstr "Stanje:"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1182
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:257
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1191
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:305
#: templates/web/default/admin/stats.html:1
#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72
msgid "Stats"
@@ -3297,7 +3104,7 @@ msgstr ""
msgid "Still open, via questionnaire, %s"
msgstr "I dalje otvoreno, putem upitnika %s"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:370
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378
msgid "Subcategory: %s"
msgstr ""
@@ -3305,8 +3112,7 @@ msgstr ""
msgid "Subdivision/Body"
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:48
-#: templates/web/fixmystreet/contact/index.html:91
+#: templates/web/fixmystreet/contact/index.html:95
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:60
msgid "Subject"
msgstr "Predmet"
@@ -3319,9 +3125,6 @@ msgstr "Predmet"
msgid "Subject:"
msgstr "Predmet:"
-#: templates/web/bromley/report/new/fill_in_details_form.html:140
-#: templates/web/bromley/report/new/fill_in_details_form.html:190
-#: templates/web/bromley/report/new/fill_in_details_form.html:204
#: templates/web/default/questionnaire/creator_fixed.html:19
#: templates/web/default/report/new/fill_in_details_form.html:114
#: templates/web/default/report/new/fill_in_details_form.html:154
@@ -3330,13 +3133,12 @@ msgstr "Predmet:"
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:142
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:167
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:212
-#: templates/web/seesomething/report/new/fill_in_details_form.html:93
#: templates/web/zurich/report/new/fill_in_details_form.html:114
msgid "Submit"
msgstr "Pošalji"
-#: templates/web/default/admin/report_edit.html:92
-#: templates/web/default/admin/update_edit.html:60
+#: templates/web/default/admin/report_edit.html:97
+#: templates/web/default/admin/update_edit.html:65
#: templates/web/default/admin/user-form.html:55
#: templates/web/zurich/admin/report_edit-sdm.html:67
#: templates/web/zurich/admin/report_edit.html:224
@@ -3349,8 +3151,8 @@ msgstr "Pošalji promjene"
msgid "Submit questionnaire"
msgstr "Pošalji upitnik"
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:111
-#: templates/web/zurich/admin/header.html:1
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:133
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/header.html:6
#: templates/web/zurich/admin/index-dm.html:23
#: templates/web/zurich/admin/index-dm.html:6
@@ -3362,7 +3164,6 @@ msgstr "Pošalji upitnik"
msgid "Submitted"
msgstr ""
-#: templates/web/bromley/report/display.html:44
#: templates/web/default/alert/updates.html:17
#: templates/web/default/report/display.html:42
#: templates/web/fixmystreet/alert/updates.html:23
@@ -3380,8 +3181,8 @@ msgstr "Pretplati se na e-mail upozorenja"
msgid "Subscribe to an alert based upon what baranagay you&rsquo;re in:"
msgstr "Pretplati se na upozorenja svog kvarta &rsquo;"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1175
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:241
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1184
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:289
#: templates/web/default/admin/index.html:1
#: templates/web/zurich/admin/index-dm.html:1
#: templates/web/zurich/admin/index-sdm.html:1
@@ -3400,7 +3201,7 @@ msgstr "Sažetak"
msgid "Summary reports"
msgstr "Sažetak prijava"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1179
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1188
msgid "Survey"
msgstr ""
@@ -3423,17 +3224,15 @@ msgstr "Tekst samo verzija"
msgid "Text:"
msgstr "Tekst:"
-#: templates/web/default/tokens/confirm_update.html:7
#: templates/web/default/tokens/confirm_update.html:8
msgid "Thank you &mdash; you can <a href=\"%s\">view your updated problem</a> on the site."
msgstr "Hvala &mdash; možete <a href=\"%s\">pregledati vaš ažurirani post</a> na stranici."
-#: templates/web/emptyhomes/tokens/confirm_problem.html:6
+#: templates/web/emptyhomes/tokens/confirm_problem.html:7
#: templates/web/emptyhomes/tokens/confirm_problem.html:8
msgid "Thank you for reporting an empty property on ReportEmptyHomes.com. We have emailed the lead officer for empty homes in the council responsible with details, and asked them to do whatever they can to get the empty property back into use as soon as possible."
msgstr "Hvala na prijavljivanju praznog objekta na Prijavi.to. Poslali smo detaljan e-mail glavnom službeniku za prazne kuće u council i zamolili smo ih da učine što god mogu ne bi li se čim prije prazni objekti vratili u upotrebu. "
-#: templates/web/emptyhomes/tokens/confirm_problem.html:30
#: templates/web/emptyhomes/tokens/confirm_problem.html:31
msgid ""
"Thank you for reporting this empty property on ReportEmptyHomes.com.\n"
@@ -3449,7 +3248,7 @@ msgstr ""
msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it."
msgstr "Zahvaljujemo se na pokušaju slanja vaše nadopune ili problema. Izgleda da imamo problem pa<a href=\"%s\">vas molimo da nam pojasnite što se dogodilo</a> te ćemo pokušati popraviti."
-#: templates/web/emptyhomes/tokens/confirm_problem.html:24
+#: templates/web/emptyhomes/tokens/confirm_problem.html:25
#: templates/web/emptyhomes/tokens/confirm_problem.html:26
msgid "Thank you for using ReportEmptyHomes.com. Your action is already helping to resolve the UK&rsquo;s empty homes crisis."
msgstr "Zahvaljujemo na korištenju kucoprazna.joj. Vaše sudjelovanje doprinosi rješavanju krize praznih &rsquo;kuća."
@@ -3470,15 +3269,16 @@ msgstr "Hvala, drago nam je čuti da je problem riješen! Htjeli bismo vas još
msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
msgstr "Slika nije ispravno učitana (%s), molimo pokušajte ponovno."
-#: perllib/FixMyStreet/App/Controller/Council.pm:90
+#: perllib/FixMyStreet/App/Controller/Council.pm:100
msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
msgstr "Odgovorno tijelo ne pokriva navedenu lokaciju, možda je riječ o obalnom dijelu ili je izvan zemlje. Molimo pokušajte ponovno."
-#: perllib/FixMyStreet/App/Controller/Location.pm:123
+#: perllib/FixMyStreet/App/Controller/Location.pm:124
msgid "That location does not appear to be in the UK; please try again."
msgstr "Lokacija se ne nalazi u Hrvatskoj. Molimo pokušajte ponovno."
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:63
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:79
#: perllib/FixMyStreet/Cobrand/UK.pm:86
msgid "That postcode was not recognised, sorry."
msgstr "Žao nam je, poštanski broj nije prepoznat."
@@ -3538,7 +3338,7 @@ msgstr ""
msgid "The confirmation email <strong>may</strong> take a few minutes to arrive &mdash; <em>please</em> be patient."
msgstr "Molimo<strong> pričekajte </strong> &mdash; <em>email</em> potvrde."
-#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:2
#: templates/web/fixmystreet/report/new/fill_in_details_text.html:3
msgid "The council won&rsquo;t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc."
msgstr ""
@@ -3565,6 +3365,7 @@ msgstr "Greška je: %s"
msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
msgstr ""
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:187
#: perllib/FixMyStreet/Geocode/OSM.pm:165
msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
msgstr "Informacija o najbližoj cesti može biti netočna ili irelevantna u slučaju da je problem u blizini više prometnica ili u neposrednoj blizini neimenovane ceste u OpenStreetMap"
@@ -3623,7 +3424,7 @@ msgstr ""
msgid "The passwords do not match"
msgstr "Lozinke se ne podudaraju"
-#: templates/web/default/errors/page_error_404_not_found.html:10
+#: templates/web/default/errors/page_error_404_not_found.html:11
#: templates/web/default/errors/page_error_404_not_found.html:12
msgid "The requested URL '%s' was not found on this server"
msgstr "Traženi URL '%s' nije pronađen na ovom serveru"
@@ -3633,16 +3434,14 @@ msgstr "Traženi URL '%s' nije pronađen na ovom serveru"
msgid "The simplest alert is our geographic one:"
msgstr "Dojavljivanja problema preko karte:"
-#: templates/web/barnet/report/new/councils_text_all.html:3
#: templates/web/default/report/new/councils_extra_text.html:1
-#: templates/web/default/report/new/councils_text_some.html:10
#: templates/web/default/report/new/councils_text_some.html:11
#: templates/web/default/report/new/fill_in_details_form.html:17
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12
msgid "The subject and details of the problem will be public, plus your name if you give us permission."
msgstr "Predmet i detalji problema bit će javni. Ukoliko se slažete, bit će prikazano i Vaše ime."
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:291
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:296
msgid "The user could not locate the problem on a map, but to see the area around the location they entered"
msgstr "Korisnik nije mogao locirati problem na karti, ali možete vidjeti područje oko navedene lokacije"
@@ -3657,16 +3456,15 @@ msgstr ""
msgid "There was a problem showing the All Reports page. Please try again later."
msgstr "Došlo je do problema pri učitavanju svih prijava. Molimo pokušajte ponovno."
-#: perllib/FixMyStreet/App/Controller/Contact.pm:116
+#: perllib/FixMyStreet/App/Controller/Contact.pm:121
#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59
msgid "There was a problem showing this page. Please try again later."
msgstr "Došlo je do problema pri učitavanju ove stranice. Molimo pokušajte ponovno."
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:747
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:755
#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134
#: templates/web/default/auth/general.html:23
#: templates/web/fixmystreet/auth/general.html:24
-#: templates/web/seesomething/auth/general.html:24
#: templates/web/zurich/auth/general.html:28
msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the &lsquo;sign in by email&rsquo; section of the form."
msgstr "Došlo je do problema s kombinacijom Vašeg e-maila i lozinke.Ako se ne možete sjetiti ili nemate lozinku, molimo odaberite &lsquo; model prijave putem e-maila &rsquo;."
@@ -3679,7 +3477,7 @@ msgstr "Došlo je do problema s kombinacijom Vaše e-maila i lozinke. Molimo pok
msgid "There was a problem with your update. Please try again."
msgstr "Došlo je do problema pri ažuriranju. Molimo pokušajte ponovno."
-#: perllib/FixMyStreet/App/Controller/Contact.pm:120
+#: perllib/FixMyStreet/App/Controller/Contact.pm:125
msgid "There were problems with your report. Please see below."
msgstr "Došlo je do problema pri prijavi. Detalje pogledajte u nastavku."
@@ -3719,16 +3517,16 @@ msgid ""
" A body will not receive any reports unless it covers at least one area."
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:375
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:385
msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system."
msgstr "Kako korisnik nije kategorizirao problem ,ovaj e-mail poslan je oboma odgovornim tijelima koji pokrivaju mjesto problema. Molimo vas da zanemarite e-mail ukoliko problem ne ulazi u vaše područje ili nam javite o kakvoj je kategoriji problema riječ kako bismo ga unijeli u naš sustav."
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:388
msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue."
msgstr "Kako je odabrana kategorija predviđena za više odgovornih tijela, ovaj e-mail poslan je na adrese nekoliko ureda koje prekrivaju mjesto problema. Molimo vas da zanemarite e-mail ukoliko niste nadležni za ovaj problem."
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:894
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:964
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:898
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:968
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:131
#: perllib/FixMyStreet/Cobrand/UK.pm:58
msgid "This information is required"
@@ -3760,7 +3558,6 @@ msgstr ""
msgid "This problem has been closed"
msgstr "Problem je zatvoren"
-#: templates/web/bromley/report/display.html:98
#: templates/web/default/report/banner.html:12
#: templates/web/default/report/update-form.html:48
#: templates/web/emptyhomes/report/banner.html:3
@@ -3768,7 +3565,6 @@ msgstr "Problem je zatvoren"
msgid "This problem has been fixed"
msgstr "Problem je riješen"
-#: templates/web/bromley/report/display.html:92
#: templates/web/default/report/update-form.html:43
#: templates/web/fixmystreet/report/update-form.html:40
msgid "This problem has not been fixed"
@@ -3782,33 +3578,33 @@ msgstr "Problem je i dalje aktualan"
msgid "This problem is old and of unknown status."
msgstr "Odabrani problem je star i nismo upoznati s trenutnim stanjem."
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:108
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:109
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:130
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:131
#: templates/web/zurich/report/_main.html:14
msgid "This report is awaiting moderation."
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88
msgid "This report is currently marked as closed."
msgstr "Ova prijava je trenutno označena kao zatvorena."
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86
msgid "This report is currently marked as fixed."
msgstr "Prijava je trenutno označena kao popravljena."
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:90
msgid "This report is currently marked as open."
msgstr "Prijava je trenutno označena kao otvorena."
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:320
msgid "This report was submitted anonymously"
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:284
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:289
msgid "This web page also contains a photo of the problem, provided by the user."
msgstr "Stranica sadrži i fotografiju problem, dodanu od strane korisnika."
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1178
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1187
#: templates/web/default/admin/timeline.html:1
msgid "Timeline"
msgstr "Vremenska skala"
@@ -3826,7 +3622,7 @@ msgstr "Kako<strong>biste prijavili problem</strong>, na karti označite točnu
msgid "To find out what local alerts we have for you, please enter your postcode or street name and area"
msgstr "Kako biste vidjeli lokalne probleme,molimo Vas da unesete poštanski broj ili naziv ulice i područje."
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:290
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:295
msgid "To view a map of the precise location of this issue"
msgstr "Karta točne lokacije ovog problema"
@@ -3838,17 +3634,10 @@ msgstr "Karta točne lokacije ovog problema"
msgid "Total"
msgstr "Ukupno"
-#: templates/web/seesomething/report/new/fill_in_details_form.html:24
-msgid "Transport Category"
-msgstr ""
-
#: templates/web/default/js/translation_strings.html:29
-#: templates/web/oxfordshire/js/translation_strings.html:23
msgid "Try again"
msgstr ""
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:83
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:46
#: templates/web/default/report/update-form.html:30
@@ -3876,7 +3665,6 @@ msgid "Unknown alert type"
msgstr "Nepoznat tip upozorenja"
#: templates/web/default/js/translation_strings.html:39
-#: templates/web/oxfordshire/js/translation_strings.html:33
msgid "Unknown error"
msgstr ""
@@ -3884,7 +3672,6 @@ msgstr ""
msgid "Unknown problem ID"
msgstr "Nepoznat IB problema"
-#: templates/web/bromley/report/display.html:66
#: templates/web/fixmystreet/report/update-form.html:19
msgid "Update"
msgstr "Ažuriranje"
@@ -3894,12 +3681,12 @@ msgid "Update %s created for problem %d; by %s"
msgstr "Problem %s ažurirao %d; korisnik %s"
#: templates/web/default/contact/index.html:21
-#: templates/web/fixmystreet/contact/index.html:34
+#: templates/web/fixmystreet/contact/index.html:38
msgid "Update below added anonymously at %s"
msgstr "Ažuriranje u nastavku dodao je anonimni korisnik u %s"
#: templates/web/default/contact/index.html:23
-#: templates/web/fixmystreet/contact/index.html:36
+#: templates/web/fixmystreet/contact/index.html:40
msgid "Update below added by %s at %s"
msgstr "Ažuriranje u nastavku dodao %s u %s"
@@ -3943,12 +3730,12 @@ msgstr "Ažuriranje:"
msgid "Updated"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1042
-#: perllib/FixMyStreet/App/Controller/Admin.pm:796
-#: perllib/FixMyStreet/App/Controller/Admin.pm:940
-#: perllib/FixMyStreet/App/Controller/Admin.pm:998
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:487
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:556
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1007
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1051
+#: perllib/FixMyStreet/App/Controller/Admin.pm:801
+#: perllib/FixMyStreet/App/Controller/Admin.pm:949
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:550
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:619
msgid "Updated!"
msgstr "Ažurirano!"
@@ -3960,16 +3747,14 @@ msgstr "Ažurirano!"
msgid "Updates"
msgstr "Ažuriranja"
-#: perllib/FixMyStreet/DB/Result/Comment.pm:131
-msgid "Updates are limited to 2000 characters in length. Please shorten your update"
+#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+msgid "Updates are limited to %s characters in length. Please shorten your update"
msgstr ""
#: db/alert_types.pl:5 db/alert_types.pl:6
msgid "Updates on {{title}}"
msgstr "Ažuriranja za {{naslov}}"
-#: templates/web/bromley/report/display.html:0
-#: templates/web/bromley/report/display.html:8
#: templates/web/default/report/display.html:0
#: templates/web/default/report/display.html:5
#: templates/web/fixmystreet/report/display.html:0
@@ -3983,15 +3768,14 @@ msgstr ""
#: templates/web/zurich/admin/list_updates.html:30
#: templates/web/zurich/admin/list_updates.html:9
-#, fuzzy
msgid "User"
-msgstr "Korisnici"
+msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1342
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1351
msgid "User flag removed"
msgstr "Korisnička oznaka uklonjena"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1314
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1323
msgid "User flagged"
msgstr "Korisnik označen"
@@ -3999,8 +3783,8 @@ msgstr "Korisnik označen"
msgid "User search finds matches in users' names and email addresses."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:256
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1189
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:304
#: templates/web/default/admin/flagged.html:29
#: templates/web/zurich/header.html:69
msgid "Users"
@@ -4029,12 +3813,9 @@ msgstr "Prikaz Vaše prijave"
#: templates/web/default/around/display_location.html:0
#: templates/web/default/around/display_location.html:34
-#: templates/web/seesomething/around/display_location.html:0
-#: templates/web/seesomething/around/display_location.html:16
msgid "Viewing a location"
msgstr "Prikaz lokacije"
-#: templates/web/bromley/report/display.html:0
#: templates/web/default/report/display.html:0
#: templates/web/fixmystreet/report/display.html:0
msgid "Viewing a problem"
@@ -4047,7 +3828,6 @@ msgstr "Općine ove županije"
#: templates/web/default/alert/choose.html:6
#: templates/web/default/around/around_index.html:13
#: templates/web/fixmystreet/around/around_index.html:16
-#: templates/web/seesomething/around/around_index.html:13
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 "Pronađeno je više rezultata za tnavedenulokaciju. Prikazano je do deset rezlutata. Ukoliko nije naveden traženi problem, molimo pokušajte s drugom pretragom."
@@ -4059,25 +3839,22 @@ msgstr ""
msgid "We have sent you an email containing a link to confirm your account."
msgstr "Poslali smo Vam e-mail s linkom za potvrdu korisničkog računa."
-#: templates/web/emptyhomes/tokens/confirm_problem.html:18
+#: templates/web/emptyhomes/tokens/confirm_problem.html:19
#: templates/web/emptyhomes/tokens/confirm_problem.html:20
msgid "We may contact you periodically to ask if anything has changed with the property you reported."
msgstr "Možda ćemo Vas povremeno kontaktirati kako bismo saznali je li se nešto mijenjalo s objektom koji ste prijavili."
-#: templates/web/bromley/report/display.html:143
#: templates/web/fixmystreet/report/update-form.html:115
msgid "We never show your email"
msgstr "Nikada ne prikazujemo vašu e-mail adresu"
-#: templates/web/bromley/report/new/fill_in_details_form.html:133
-#: templates/web/bromley/report/new/fill_in_details_form.html:179
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:134
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:201
#: templates/web/zurich/report/new/fill_in_details_form.html:96
msgid "We never show your email address or phone number."
msgstr "Nikada ne prikazujemo vašu e-mail adresu ili telefonski broj."
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:384
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:394
msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch."
msgstr "Shvaćamo da bi za ovaj problem moglo biti odgovorno% s, međutim, trenutno nemamo nikakve pojedinosti o njihovom kontaktu. Ako znate odgovarajuću kontakt adresu, molimo Vas da nam se javite."
@@ -4085,14 +3862,12 @@ msgstr "Shvaćamo da bi za ovaj problem moglo biti odgovorno% s, međutim, trenu
msgid "We send it to the council on your behalf"
msgstr "Poslan je odgovornom tijelu u Vaše ime"
-#: templates/web/bromley/report/new/fill_in_details_form.html:217
#: templates/web/default/report/new/notes.html:5
#: templates/web/fixmybarangay/report/new/notes.html:5
msgid "We will only use your personal information in accordance with our <a href=\"/faq#privacy\">privacy policy.</a>"
msgstr "Vaše privatne podatke koristimo u skladu s našim <a href=\"/faq#privacy\">pravilima o privatnosti.</a>"
#: templates/web/fixmystreet/report/new/notes.html:4
-#: templates/web/oxfordshire/report/new/notes.html:4
msgid "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>"
msgstr "Vaše privatne podatke koristimo u skladu s našim <a href=\"/privacy\">pravilima o privatnosti.</a>"
@@ -4122,13 +3897,11 @@ msgstr "Cijeli blok praznih stanova"
msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>."
msgstr "Osim pretraživanja prijava, moguće je pretražiti i odgovorne_agencije kako biste ograničili prijave na one poslane određenom uredu. Pojam za pretraživanje je IB pojedinog ureda kojeg možete saznati pomoću <a href=\"%s\">MaPit</a>."
-#: templates/web/fixmystreet/footer.html:21
-#: templates/web/stevenage/footer.html:22
+#: templates/web/fixmystreet/footer.html:24
msgid "Would you like better integration with FixMyStreet? <a href=\"http://www.mysociety.org/for-councils/fixmystreet/\">Find out about FixMyStreet for councils</a>."
msgstr "Želite li se bolje integrirati na Popravi.to? <a href=\"http://www.mysociety.org/for-councils/fixmystreet/\">Saznajte više o Popravi.to za pojedina odgovorna tijela</a>."
-#: templates/web/fixmystreet/footer.html:17
-#: templates/web/stevenage/footer.html:18
+#: templates/web/fixmystreet/footer.html:20
msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>."
msgstr "Želite li sudjelovati u Popravi.to? Naš kod je open source i <a href=\"http://github.com/mysociety/fixmystreet\">dostupan na GitHub</a>."
@@ -4140,7 +3913,6 @@ msgstr "Želite li za 4 tjedna primiti još jedan upitnik koji bi Vas podsjetio
#: templates/web/default/report/new/notes.html:8
#: templates/web/fixmybarangay/report/new/notes.html:8
#: templates/web/fixmystreet/report/new/notes.html:8
-#: templates/web/oxfordshire/report/new/notes.html:7
msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
msgstr "Pisanje velikim tiskanim slovima i bez interpunkcijskih znakova čini poruku teško čitljivom."
@@ -4170,26 +3942,24 @@ msgstr "Godina"
msgid "Yes"
msgstr "Da"
-#: templates/web/bromley/report/display.html:157
-#: templates/web/bromley/report/new/fill_in_details_form.html:198
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:161
#: templates/web/fixmystreet/report/update-form.html:89
msgid "Yes I have a password"
msgstr "Da, imam lozinku"
#: templates/web/default/contact/index.html:37
-#: templates/web/fixmystreet/contact/index.html:50
+#: templates/web/fixmystreet/contact/index.html:54
msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:"
msgstr "Sljedeće izvješće o problemu prijavljujete jer je uvredljivo, sadrži osobne podatke ili slično:"
#: templates/web/default/contact/index.html:15
-#: templates/web/fixmystreet/contact/index.html:28
+#: templates/web/fixmystreet/contact/index.html:32
msgid "You are reporting the following update for being abusive, containing personal information, or similar:"
msgstr "Sljedeće ažuriranje prijavljujete jer je uvredljivo, sadrži osobne podatke ili slično:"
-#: templates/web/default/tokens/confirm_problem.html:19
+#: templates/web/default/tokens/confirm_problem.html:20
#: templates/web/default/tokens/confirm_problem.html:21
-#: templates/web/zurich/tokens/confirm_problem.html:5
+#: templates/web/zurich/tokens/confirm_problem.html:6
#: templates/web/zurich/tokens/confirm_problem.html:8
msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
msgstr ""
@@ -4198,6 +3968,10 @@ msgstr ""
msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
msgstr ""
+#: templates/web/fixmystreet/contact/index.html:118
+msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
+msgstr ""
+
#: templates/web/default/admin/flagged.html:5
msgid ""
"You can flag any report or user by editing them, and they will be listed on this page.\n"
@@ -4205,9 +3979,9 @@ msgid ""
" reports in the past."
msgstr ""
-#: templates/web/default/report/new/councils_text_none.html:11
-#: templates/web/default/report/new/councils_text_none.html:13
-#: templates/web/default/report/new/councils_text_some.html:20
+#: templates/web/default/report/new/councils_text_none.html:19
+#: templates/web/default/report/new/councils_text_none.html:20
+#: templates/web/default/report/new/councils_text_some.html:21
#: templates/web/default/report/new/councils_text_some.html:22
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 "Možete nam pomoći u pronalaženju kontakt e-mail adresa za lokalne probleme %s i poslati nam ih e-mailom na <a href='mailto:%s'>%s</a>."
@@ -4217,7 +3991,6 @@ msgid "You can mark a body as deleted if you do not want it to be active on the
msgstr ""
#: templates/web/default/js/translation_strings.html:36
-#: templates/web/oxfordshire/js/translation_strings.html:30
msgid "You declined; please fill in the box above"
msgstr ""
@@ -4225,30 +3998,25 @@ msgstr ""
msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
msgstr "Već ste ogovorili na upitnik. Ako imate nekih pitanja, molimo da nam<a href='%s'>se javite</a>, ili<a href='%s'>pregledate problem koji vas zanima</a>.\n"
-#: templates/web/bromley/report/new/fill_in_details_form.html:97
#: templates/web/default/questionnaire/index.html:96
#: templates/web/default/report/new/fill_in_details_form.html:93
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:90
#: templates/web/fixmystreet/questionnaire/index.html:87
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:99
-#: templates/web/seesomething/report/new/fill_in_details_form.html:59
#: templates/web/zurich/report/new/fill_in_details_form.html:75
msgid "You have already attached a photo to this report, attaching another one will replace it."
msgstr "Već ste priložiti fotografiju ovoj prijavi, ako dodate novu, zamijenit će prethodno postojeću."
-#: templates/web/bromley/report/display.html:108
#: templates/web/default/report/update-form.html:59
#: templates/web/fixmystreet/report/update-form.html:56
msgid "You have already attached a photo to this update, attaching another one will replace it."
msgstr "Već ste priložiti fotografiju ovom ažuriranju, ako dodate novu, zamijenit će prethodno postojeću."
#: templates/web/default/auth/sign_out.html:3
-#: templates/web/seesomething/auth/sign_out.html:3
#: templates/web/zurich/auth/sign_out.html:3
msgid "You have been signed out"
msgstr "Odjavljeni ste"
-#: templates/web/bromley/report/new/fill_in_details_form.html:25
#: templates/web/default/report/new/fill_in_details_form.html:7
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:7
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:28
@@ -4260,17 +4028,14 @@ msgstr "Locirali ste problem na mjestu označenom zelenom iglom na karti. Ako to
msgid "You have successfully confirmed your alert."
msgstr "Uspješno ste potvrdili Vaše upozorenje"
-#: templates/web/zurich/tokens/confirm_problem.html:5
#: templates/web/zurich/tokens/confirm_problem.html:6
msgid "You have successfully confirmed your email address."
msgstr ""
-#: templates/web/default/tokens/confirm_problem.html:14
#: templates/web/default/tokens/confirm_problem.html:15
msgid "You have successfully confirmed your problem"
msgstr "Uspješno ste potvrdili Vaš problem"
-#: templates/web/default/tokens/confirm_update.html:11
#: templates/web/default/tokens/confirm_update.html:12
msgid "You have successfully confirmed your update and you can now <a href=\"%s\">view it on the site</a>."
msgstr "Uspješno ste potvrdili ažuriranje te ga možete<a href=\"%s\">pregledati na stranici</a>."
@@ -4283,11 +4048,15 @@ msgstr "Uspješno ste dodali upozorenje."
msgid "You have successfully deleted your alert."
msgstr "Uspješno ste izbrisali upozorenje."
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:754
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:762
#: perllib/FixMyStreet/App/Controller/Report/Update.pm:140
msgid "You have successfully signed in; please check and confirm your details are accurate:"
msgstr "Uapješno ste se prijavili; molimo provjerite i potvrdite točnost Vaših podataka:"
+#: templates/web/default/my/my.html:17 templates/web/fixmystreet/my/my.html:17
+msgid "You haven&rsquo;t created any reports yet. <a href=\"%s\">Report a problem now.</a>"
+msgstr ""
+
#: templates/web/default/email_sent.html:13
msgid "You must now click the link in the email we've just sent you."
msgstr ""
@@ -4314,13 +4083,10 @@ msgstr "Jeste li sigurni da želite ponovno poslati?"
msgid "Your Reports"
msgstr "Vaše prijave"
-#: templates/web/bromley/report/display.html:41
-#: templates/web/bromley/report/display.html:43
-#: templates/web/bromley/report/new/fill_in_details_form.html:145
#: templates/web/fixmystreet/alert/_list.html:89
#: templates/web/fixmystreet/alert/updates.html:19
#: templates/web/fixmystreet/alert/updates.html:22
-#: templates/web/fixmystreet/contact/index.html:84
+#: templates/web/fixmystreet/contact/index.html:88
#: templates/web/fixmystreet/report/display.html:65
#: templates/web/fixmystreet/report/display.html:67
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:115
@@ -4329,14 +4095,8 @@ msgstr "Vaše prijave"
msgid "Your email"
msgstr "Vaš e-mail"
-#: templates/web/seesomething/report/new/fill_in_details_form.html:81
-msgid "Your email (optional)"
-msgstr ""
-
-#: templates/web/bromley/report/display.html:132
#: templates/web/fixmystreet/auth/general.html:26
#: templates/web/fixmystreet/report/update-form.html:80
-#: templates/web/seesomething/auth/general.html:26
#: templates/web/zurich/auth/general.html:30
#: templates/web/zurich/auth/general.html:58
msgid "Your email address"
@@ -4354,28 +4114,15 @@ msgstr "Vaša e-mail adresa:"
msgid "Your email:"
msgstr "Vaš e-mail:"
-#: templates/web/bromley/report/display.html:195
-#: templates/web/bromley/report/new/fill_in_details_form.html:117
-#: templates/web/bromley/report/new/fill_in_details_form.html:164
-msgid "Your first name"
-msgstr "Ime"
-
-#: templates/web/fixmystreet/report/updates-sidebar-notes.html:5
+#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7
msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>"
msgstr "Vaše informacije će se koristiti isključivo u skladu s našim<a href=\"/privacy\">pravilima o privatnosti</a>"
-#: templates/web/bromley/report/display.html:201
-#: templates/web/bromley/report/new/fill_in_details_form.html:123
-#: templates/web/bromley/report/new/fill_in_details_form.html:170
-msgid "Your last name"
-msgstr "Prezime"
-
#: templates/web/fixmystreet/auth/general.html:57
-#: templates/web/fixmystreet/contact/index.html:77
+#: templates/web/fixmystreet/contact/index.html:81
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:124
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:192
#: templates/web/fixmystreet/report/update-form.html:140
-#: templates/web/seesomething/report/new/fill_in_details_form.html:79
#: templates/web/zurich/auth/general.html:61
#: templates/web/zurich/report/new/fill_in_details_form.html:104
msgid "Your name"
@@ -4389,12 +4136,9 @@ msgstr "Ime"
msgid "Your name:"
msgstr "Ime:"
-#: templates/web/bromley/report/display.html:162
-#: templates/web/bromley/report/new/fill_in_details_form.html:203
#: templates/web/fixmystreet/auth/general.html:41
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:166
#: templates/web/fixmystreet/report/update-form.html:94
-#: templates/web/seesomething/auth/general.html:30
#: templates/web/zurich/auth/general.html:34
msgid "Your password"
msgstr "Lozinka"
@@ -4403,11 +4147,8 @@ msgstr "Lozinka"
msgid "Your password has been changed"
msgstr "Vaša lozinka je promijenjena"
-#: templates/web/bromley/report/new/fill_in_details_form.html:137
-#: templates/web/bromley/report/new/fill_in_details_form.html:184
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:139
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:206
-#: templates/web/seesomething/report/new/fill_in_details_form.html:90
#: templates/web/zurich/report/new/fill_in_details_form.html:110
msgid "Your phone number"
msgstr "Vaš broj telefona"
@@ -4420,19 +4161,13 @@ msgstr "Vaša prijava"
msgid "Your report has been created and will shortly be sent."
msgstr ""
-#: templates/web/barnet/footer.html:18 templates/web/bromley/footer.html:19
-#: templates/web/bromley/header.html:75 templates/web/default/footer.html:9
-#: templates/web/fiksgatami/footer.html:6
+#: templates/web/default/footer.html:9 templates/web/fiksgatami/footer.html:6
#: templates/web/fiksgatami/nn/footer.html:6
-#: templates/web/fixmindelo/footer.html:39
-#: templates/web/fixmystreet/footer.html:46
-#: templates/web/oxfordshire/footer.html:21
-#: templates/web/oxfordshire/header.html:63
-#: templates/web/reading/footer.html:7 templates/web/stevenage/footer.html:41
+#: templates/web/fixmystreet/footer.html:49
msgid "Your reports"
msgstr "Vaše prijave"
-#: templates/web/default/my/my.html:45 templates/web/fixmystreet/my/my.html:49
+#: templates/web/default/my/my.html:50 templates/web/fixmystreet/my/my.html:56
msgid "Your updates"
msgstr "Vaša ažuriranja"
@@ -4449,7 +4184,7 @@ msgstr "od %s"
msgid "council"
msgstr "odgovorno tijelo"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
msgid "council ref:&nbsp;%s"
msgstr "odgovorno tijelo ref:&nbsp;%s"
@@ -4461,27 +4196,24 @@ msgstr "nije korištena karta"
#: templates/web/default/alert/index.html:33
#: templates/web/fixmystreet/around/postcode_form.html:20
-#: templates/web/seesomething/around/postcode_form.html:9
msgid "e.g. ‘%s’ or ‘%s’"
msgstr "npr. ‘%s’ ili‘%s’"
#: templates/web/default/admin/flagged.html:51
-#, fuzzy
msgid "edit user"
-msgstr "Uređivane korisnika %d"
+msgstr ""
#: templates/web/default/admin/index.html:23
#: templates/web/zurich/admin/index.html:5
msgid "from %d different users"
msgstr "od %d različitih korisnika"
-#: templates/web/bromley/report/_item.html:12
-#: templates/web/fixmystreet/report/_item.html:12
+#: templates/web/fixmystreet/report/_item.html:17
#: templates/web/zurich/report/_item.html:16
msgid "last updated %s"
msgstr ""
-#: perllib/Utils.pm:263
+#: perllib/Utils.pm:265
msgid "less than a minute"
msgstr "manje od minute"
@@ -4539,21 +4271,20 @@ msgid "or"
msgstr "ili"
#: templates/web/default/js/translation_strings.html:27
-#: templates/web/oxfordshire/js/translation_strings.html:21
msgid "or locate me automatically"
msgstr ""
-#: templates/web/default/admin/report_edit.html:24
+#: templates/web/default/admin/report_edit.html:25
#: templates/web/default/admin/report_edit.html:26
-#: templates/web/zurich/admin/report_edit-sdm.html:30
+#: templates/web/zurich/admin/report_edit-sdm.html:31
#: templates/web/zurich/admin/report_edit-sdm.html:32
-#: templates/web/zurich/admin/report_edit-sdm.html:39
+#: templates/web/zurich/admin/report_edit-sdm.html:40
#: templates/web/zurich/admin/report_edit-sdm.html:41
-#: templates/web/zurich/admin/report_edit.html:30
+#: templates/web/zurich/admin/report_edit.html:31
#: templates/web/zurich/admin/report_edit.html:32
-#: templates/web/zurich/admin/report_edit.html:41
+#: templates/web/zurich/admin/report_edit.html:42
#: templates/web/zurich/admin/report_edit.html:43
-#: templates/web/zurich/admin/report_edit.html:53
+#: templates/web/zurich/admin/report_edit.html:54
#: templates/web/zurich/admin/report_edit.html:55
msgid "originally entered: &ldquo;%s&rdquo;"
msgstr ""
@@ -4567,23 +4298,17 @@ msgstr "druga područja:"
msgid "reopened"
msgstr "ponovno otvoreno"
-#: templates/web/barnet/header.html:71 templates/web/bromley/header.html:100
-#: templates/web/bromley/header.html:65
#: templates/web/fixmybarangay/header.html:67
-#: templates/web/fixmystreet/header.html:51
-#: templates/web/oxfordshire/header.html:112
-#: templates/web/oxfordshire/header.html:48
-#: templates/web/stevenage/header.html:98 templates/web/zurich/footer.html:12
+#: templates/web/fixmystreet/header.html:54
+#: templates/web/zurich/footer.html:12
msgid "sign out"
msgstr "odjavi se"
-#: templates/web/bromley/report/new/fill_in_details_form.html:4
-#: templates/web/bromley/report/new/fill_in_details_form.html:7
-#: templates/web/default/report/new/fill_in_details_form.html:11
+#: templates/web/default/report/new/fill_in_details_form.html:12
#: templates/web/default/report/new/fill_in_details_form.html:14
-#: templates/web/emptyhomes/report/new/fill_in_details_form.html:11
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:12
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:14
-#: templates/web/fixmystreet/report/new/fill_in_details_form.html:6
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:7
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:9
msgid "the local council"
msgstr "lokalno odgovorno tijelo"
@@ -4593,11 +4318,11 @@ msgstr "lokalno odgovorno tijelo"
msgid "there is no pin shown as the user did not use the map"
msgstr "nema oznake jer korisnik nije označio problem na karti"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:362
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:370
msgid "this type of local problem"
msgstr "ovaj tip "
-#: perllib/Utils.pm:235
+#: perllib/Utils.pm:237
msgid "today"
msgstr "danas"
@@ -4628,7 +4353,7 @@ msgstr[0] "<big>%s</big> novija prijava"
msgstr[1] "<big>%s</big> novije prijave"
msgstr[2] "<big>%s</big> novije prijave"
-#: perllib/Utils.pm:282
+#: perllib/Utils.pm:284
#, perl-format
msgid "%d hour"
msgid_plural "%d hours"
@@ -4644,7 +4369,7 @@ msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: perllib/Utils.pm:284
+#: perllib/Utils.pm:286
#, perl-format
msgid "%d minute"
msgid_plural "%d minutes"
@@ -4668,7 +4393,7 @@ msgstr[0] "Još uvijek nemamo podatke za odgovorno tijelo koja pokriva ovu lokac
msgstr[1] "Još uvijek nemamo podatke za odgovorna tijela koja pokrivaju ovu lokaciju."
msgstr[2] "Još uvijek nemamo podatke za odgovorna tijela koja pokrivaju ovu lokaciju."
-#: perllib/Utils.pm:278
+#: perllib/Utils.pm:280
#, perl-format
msgid "%d week"
msgid_plural "%d weeks"
@@ -4692,6 +4417,14 @@ msgstr[0] "<big>%s</big> popravljeno u posljednjih mjesec dana"
msgstr[1] "<big>%s</big> popravljeno u posljednjih mjesec dana"
msgstr[2] "<big>%s</big> popravljeno u posljednjih mjesec dana"
+#: perllib/Utils.pm:282
+#, perl-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d dan"
+msgstr[1] "%d dani"
+msgstr[2] "%d dani"
+
#: templates/web/default/report/new/councils_text_some.html:14
#, perl-format
msgid "We do <strong>not</strong> yet have details for the other council that covers this location."
@@ -4700,26 +4433,23 @@ msgstr[0] "Još <strong>nemamo</strong> podatke za drugo odgovorno tijelo koje j
msgstr[1] "Još <strong>nemamo</strong> podatke za ostala odgovorna tijela koja su odgovorna za ovu lokaciju."
msgstr[2] "Još <strong>nemamo</strong> podatke za ostala odgovorna tijela koja su odgovorna za ovu lokaciju."
-#: perllib/Utils.pm:280
-#, perl-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d dan"
-msgstr[1] "%d dani"
-msgstr[2] "%d dani"
+#~ msgid "First Name"
+#~ msgstr "Ime"
-#, fuzzy
-#~ msgid "The email field is required"
-#~ msgstr "Potrebna informacija"
+#~ msgid "Last Name"
+#~ msgstr "Prezime"
+
+#~ msgid "Please describe the exact location of the report. Example: “2 dumped mattresses outside Number 19 Stockwell Close”"
+#~ msgstr "Molimo opišite točnu lokaciju prijave. Primjer: “2 bačena madraca na broju 19 Stockwell Close”"
-#~ msgid "End Year:"
-#~ msgstr "Godina završetka:"
+#~ msgid "Please note that updates are not sent to the relevant department. 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 "Napominjemo da se ažuriranja ne šalju nadležnom odjelu. Ako navedete svoje ime, bit će vidljivo. Vaše informacije će biti korištene u skaldu s našim <a href=\"/faq#privacy\">pravilima o privatnosti</a>"
-#~ msgid "End month:"
-#~ msgstr "Mjesec završetka:"
+#~ msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
+#~ msgstr "Lozinka nije obvezna, ali će vam omogućiti lakše prijavljivanje budućih problema, ažuriranja i upravljanje vašim izvješćima."
-#~ msgid "Start Year:"
-#~ msgstr "Godina početka:"
+#~ msgid "Your first name"
+#~ msgstr "Ime"
-#~ msgid "Start month:"
-#~ msgstr "Mjesec početka:"
+#~ msgid "Your last name"
+#~ msgstr "Prezime"
diff --git a/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po
new file mode 100644
index 000000000..edb179f45
--- /dev/null
+++ b/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -0,0 +1,4478 @@
+# FixMyStreet original .po file, autogenerated by gettext-extract.
+# Copyright (C) 2011 UK Citizens Online Democracy
+# This file is distributed under the same license as the main FixMyStreet code.
+# Matthew Somerville <matthew@mysociety.org>, 2011-06-03.
+#
+# Translators:
+# carlino821 <claudio_carletti@hotmail.it>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: fixmystreet\n"
+"Report-Msgid-Bugs-To: matthew@mysociety.org\n"
+"POT-Creation-Date: 2014-05-16 17:30+0100\n"
+"PO-Revision-Date: 2013-11-20 12:46+0000\n"
+"Last-Translator: mysociety <transifex@mysociety.org>\n"
+"Language-Team: Italian (http://www.transifex.com/projects/p/fixmystreet/language/it/)\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:604
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383
+msgid " and "
+msgstr "e"
+
+#: templates/web/default/tokens/confirm_problem.html:15
+#: templates/web/default/tokens/confirm_problem.html:17
+msgid " and <strong>we will now send it to the council</strong>"
+msgstr "e <strong>lo invieremo adesso al Comune</strong>"
+
+#: templates/web/default/report/new/councils_text_all.html:12
+#: templates/web/default/report/new/councils_text_all.html:19
+#: templates/web/default/report/new/councils_text_all.html:5
+#: templates/web/default/report/new/councils_text_none.html:19
+#: templates/web/default/report/new/councils_text_none.html:21
+#: templates/web/default/report/new/councils_text_some.html:21
+#: templates/web/default/report/new/councils_text_some.html:23
+#: templates/web/default/report/new/councils_text_some.html:5
+#: templates/web/emptyhomes/report/new/councils_text_all.html:3
+msgid " or "
+msgstr "o"
+
+#: templates/web/default/admin/bodies.html:46
+msgid "%d addresses"
+msgstr "%d indirizzi"
+
+#: templates/web/default/admin/index.html:25
+msgid "%d confirmed alerts, %d unconfirmed"
+msgstr "%d segnalazioni confermate, %d non confermate"
+
+#: templates/web/default/admin/index.html:27
+#: templates/web/zurich/admin/index.html:6
+msgid "%d council contacts &ndash; %d confirmed, %d unconfirmed"
+msgstr "%d contatti del Comune &ndash; %d confermati, %d non confermati"
+
+#: templates/web/default/admin/edit-league.html:12
+msgid "%d edits by %s"
+msgstr "%d modificato da %s"
+
+#: templates/web/default/admin/index.html:24
+msgid "%d live updates"
+msgstr "%d aggiornamenti in tempo reale"
+
+#: templates/web/default/admin/index.html:26
+msgid "%d questionnaires sent &ndash; %d answered (%s%%)"
+msgstr "%d questionari inviati &ndash; %d compilati (%s%%)"
+
+#: templates/web/default/pagination.html:10
+msgid "%d to %d of %d"
+msgstr "%d a %d di %d"
+
+#: templates/web/default/reports/body.html:0
+#: templates/web/default/reports/body.html:22
+msgid "%s - Summary reports"
+msgstr "%s - Riassunto sulle segnalazioni"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:653
+msgid "%s ref:&nbsp;%s"
+msgstr "%s ref:&nbsp;%s"
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
+msgid "%s ward, %s"
+msgstr "%s quartiere, %s"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:540
+msgid "%s, reported at %s"
+msgstr "%s, segnalati al %s"
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:309
+msgid "%s, within %s ward"
+msgstr "%s dentro al quartiere %s"
+
+#: templates/web/default/email_sent.html:29
+msgid "(Don't worry &mdash; we'll hang on to your alert while you're checking your email.)"
+msgstr "(Non ti preoccupare &mdash; ci penseremo noi alla tua segnalazione mentre controlli l'email.)"
+
+#: templates/web/default/email_sent.html:25
+msgid "(Don't worry &mdash; we'll hang on to your problem report while you're checking your email.)"
+msgstr "(Non ti preoccupare &mdash; ci penseremo noi al tuo problema segnalato mentre controlli l'email.)"
+
+#: templates/web/default/email_sent.html:27
+msgid "(Don't worry &mdash; we'll hang on to your update while you're checking your email.)"
+msgstr "(Non ti preoccupare &mdash; ci penseremo noi al tuo aggiornamento mentre controlli l'email.)"
+
+#: templates/web/default/admin/report_blocks.html:11
+#: templates/web/default/admin/users.html:29
+msgid "(Email in abuse table)"
+msgstr "(Email nella tabella degli abusi)"
+
+#: templates/web/default/alert/_list.html:20
+#: templates/web/fixmystreet/alert/_list.html:24
+msgid "(a default distance which covers roughly 200,000 people)"
+msgstr "(una distanza predefinita che copre approssimativamente 200,000 persone)"
+
+#: templates/web/default/alert/_list.html:25
+#: templates/web/fixmystreet/alert/_list.html:28
+msgid "(alternatively the RSS feed can be customised, within"
+msgstr "(alternativamente gli RSS feed possono essere personalizzati, dentro "
+
+#: templates/web/default/around/around_map_list_items.html:12
+#: templates/web/default/around/on_map_list_items.html:9
+#: templates/web/fixmystreet/report/_item.html:27
+#: templates/web/zurich/report/_item.html:21
+msgid "(closed)"
+msgstr "(chiuso)"
+
+#: templates/web/default/around/around_map_list_items.html:10
+#: templates/web/default/around/on_map_list_items.html:7
+#: templates/web/fixmystreet/report/_item.html:25
+#: templates/web/zurich/report/_item.html:19
+msgid "(fixed)"
+msgstr "(risolto)"
+
+#: templates/web/default/index.html:12 templates/web/default/index.html:9
+#: templates/web/fixmystreet/around/intro.html:2
+msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
+msgstr "(come gli atti vandalici, le discariche abusive, la pavimentazione e l'illuminazione stradale rotta)"
+
+#: templates/web/default/reports/_list-entry.html:4
+#: templates/web/fixmystreet/report/_item.html:21
+msgid "(not sent to council)"
+msgstr "(non inviato al Comune)"
+
+#: templates/web/default/report/new/fill_in_details_form.html:217
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:140
+#: templates/web/zurich/report/new/fill_in_details_form.html:100
+msgid "(optional)"
+msgstr "(opzionale)"
+
+#: templates/web/default/reports/_list-entry.html:2
+#: templates/web/fixmystreet/report/_item.html:20
+msgid "(sent to both)"
+msgstr "(inviato ad entrambi)"
+
+#: templates/web/default/report/new/fill_in_details_form.html:211
+msgid "(we never show your email address or phone number)"
+msgstr "(non mostreremo mai la tua email o il tuo numero di telefono)"
+
+#: templates/web/default/report/update-form.html:158
+msgid "(we never show your email)"
+msgstr "(non mostreremo mai la tua email)"
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:635
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:662
+#: perllib/FixMyStreet/DB/Result/Problem.pm:379
+msgid "-- Pick a category --"
+msgstr "-- Scegli una categoria --"
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:618
+#: perllib/FixMyStreet/DB/Result/Problem.pm:385
+msgid "-- Pick a property type --"
+msgstr "-- Scegli un tipo di proprietà --"
+
+#: templates/web/emptyhomes/front/stats.html:5
+msgid "<big>%s</big> reports"
+msgstr "<big>%s</big> segnalazioni"
+
+#: templates/web/default/admin/body-form.html:42
+#: templates/web/default/admin/body-form.html:43
+msgid ""
+"<code>MAPIT_URL</code> is set (<code>%s</code>) but no <code>MAPIT_TYPES</code>.<br>\n"
+" This is probably why \"area covered\" is empty (below).<br>\n"
+" Maybe add some <code>MAPIT_TYPES</code> to your config file?"
+msgstr ""
+
+#: templates/web/default/questionnaire/completed.html:20
+msgid "<p style=\"font-size:150%\">Thank you very much for filling in our questionnaire; glad to hear it&rsquo;s been fixed.</p>"
+msgstr "<p style=\"font-size:150%\">Grazie mille per aver risposto al nostro questionario; siamo felici di sapere che il problema è stato risolto.</p>"
+
+#: templates/web/fiksgatami/questionnaire/completed-open.html:1
+msgid ""
+"<p style=\"font-size:150%\">We&rsquo;re sorry to hear that. We have two\n"
+"suggestions: why not try <a href=\"http://www.norge.no/styresmakter/\">writing\n"
+"direct to your councillor(s)</a> or, if it&rsquo;s a problem that could be\n"
+"fixed by local people working together, why not\n"
+"<a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n"
+"</p>"
+msgstr ""
+"<p style=\"font-size:150%\">Siamo spiacenti di sentire questo. Abbiamo due⏎\n"
+"suggerimenti: prova <a href=\"http://www.norge.no/styresmakter/\">a scrivere⏎\n"
+"direttamente al tuo consigliere(i) comunale</a> oppure se il problema può essere⏎\n"
+"risolto da un gruppo di cittadini, prova ⏎\n"
+"<a href=\"http://www.pledgebank.com/new\">a farlo presente agli altri</a>?⏎\n"
+"</p>"
+
+#: templates/web/fixmystreet/questionnaire/completed-open.html:25
+msgid ""
+"<p style=\"font-size:150%\">We&rsquo;re sorry to hear that. We have two\n"
+"suggestions: why not try <a href=\"http://www.writetothem.com/\">writing direct\n"
+"to your councillor(s)</a> or, if it&rsquo;s a problem that could be fixed by\n"
+"local people working together, why not\n"
+"<a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n"
+"</p>"
+msgstr ""
+"<p style=\"font-size:150%\">Siamo spiacenti di sentire questo. Abbiamo due⏎\n"
+"suggerimenti: o <a href=\"http://www.writetothem.com/\">scrivere direttamente⏎\n"
+"ai tuoi assessori comunali</a> oppure se il problema può essere facilmente risolto⏎\n"
+"organizzando un gruppo di cittadini,⏎\n"
+"<a href=\"http://www.pledgebank.com/new\">provi a farlo sapere agli altri</a>?⏎\n"
+"</p>"
+
+#: templates/web/default/questionnaire/completed-open.html:6
+msgid ""
+"<p style=\"font-size:150%\">We&rsquo;re sorry to hear that. We have two\n"
+"suggestions: why not try writing to your local representative or, if it&rsquo;s\n"
+"a problem that could be fixed by local people working together, why not\n"
+"<a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n"
+"</p>"
+msgstr ""
+"<p style=\"font-size:150%\">Ci dispiace sentire questo. Abbiamo due⏎\n"
+"suggerimenti: provare a scrivere al vostro rappresentante locale, oppure se⏎\n"
+"è un problema che può essere risolto dai cittadini stessi riunendosi insieme, potresti provare⏎\n"
+"<a href=\"http://www.pledgebank.com/new\">a farlo e a pubblicizzare la cosa</a>?⏎\n"
+"</p>"
+
+#: templates/web/default/questionnaire/index.html:35
+msgid ""
+"<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"
+"time to say so. We think it&rsquo;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>Riutilizzare delle case vuote può essere difficile, ma nel frattempo un buon comune può fare dei progressi e riportare nel sito cosa hanno fatto. Anche se le proprietà possono rimanere vuote per molti mesi se il proprietario non vuole o l'edificio stesso è in pessime condizioni. Se niente è stato fatto o se non si è soddisfatti con i progressi che il comune sta facendo, ora è il momento giusto per dirlo. Potrebbe essere una buona idea contattare altre persone che possono aiutare e mettere pressione al comune. Per trovare un consiglio su come poter fare o per altre utili informazioni visitate <a href=\"http://www.emptyhomes.com/getinvolved/campaign.html\">http://www.emptyhomes.com/getinvolved/campaign.html</a>.\n"
+"</p>⏎\n"
+
+#: templates/web/default/questionnaire/index.html:26
+msgid ""
+"<p>Getting empty homes back into use can be difficult. You shouldn&rsquo;t expect\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"
+"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"
+msgstr ""
+
+#: templates/web/default/questionnaire/completed.html:9
+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"
+"site and leave an update.</p>"
+msgstr ""
+"<p>Grazie mille per aver compilato il nostro questionario; se⏎\n"
+"vieni a conoscenza di nuove informazioni riguardo lo stato del problema, per favore torna qui⏎\n"
+"sul sito e aggiungi un'aggiornamento.</p>"
+
+#: templates/web/default/around/_report_banner.html:4
+#: templates/web/default/around/_report_banner.html:5
+msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>"
+msgstr "<small>Se non puoi vedere la mappa, <a href='%s' rel='nofollow'>salta questo passaggio</a>.</small>"
+
+#: templates/web/default/admin/index.html:22
+#: templates/web/zurich/admin/index.html:4
+msgid "<strong>%d</strong> live problems"
+msgstr "<strong>%d</strong> problemi in tempo reale"
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:183
+msgid "<strong>No</strong> Let me confirm my report by email"
+msgstr "<strong>No</strong> Lasciami confermare la mia segnalazione via email"
+
+#: templates/web/fixmystreet/report/update-form.html:110
+msgid "<strong>No</strong> Let me confirm my update by email"
+msgstr "<strong>No</strong> Lasciami confermare il mio aggiornamento via email"
+
+#: templates/web/fixmystreet/auth/general.html:50
+#: templates/web/zurich/auth/general.html:51
+msgid "<strong>No</strong> let me sign in by email"
+msgstr "<strong>No</strong> lasciami entrare con l'email"
+
+#: templates/web/default/auth/general.html:55
+msgid "<strong>No</strong>, I do not, let me sign in by email:"
+msgstr "<strong>No</strong>, Non c'e l'ho, lasciami entrare con la mia email:"
+
+#: templates/web/default/report/new/fill_in_details_form.html:162
+msgid "<strong>No</strong>, let me confirm my report by email:"
+msgstr "<strong>No</strong>, lasciami confermare la mia segnalazione via email:"
+
+#: templates/web/default/report/update-form.html:117
+msgid "<strong>No</strong>, let me confirm my update by email:"
+msgstr "<strong>No</strong>, lasciami confermare il mio aggiornamento via email:"
+
+#: templates/web/default/auth/general.html:37
+#: templates/web/default/report/new/fill_in_details_form.html:140
+#: templates/web/default/report/update-form.html:95
+#: templates/web/fixmystreet/auth/general.html:36
+#: templates/web/fixmystreet/auth/general.html:38
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:159
+#: templates/web/fixmystreet/report/update-form.html:87
+msgid "<strong>Yes</strong> I have a password"
+msgstr "<strong>Si</strong> Ho già la password"
+
+#: templates/web/default/static/about-en-gb.html:1
+#: templates/web/default/static/about-en-gb.html:3
+#: templates/web/emptyhomes/header.html:34
+#: templates/web/emptyhomes/static/about-cy.html:1
+#: templates/web/emptyhomes/static/about-cy.html:3
+#: templates/web/emptyhomes/static/about-en-gb.html:1
+#: templates/web/emptyhomes/static/about-en-gb.html:3
+msgid "About us"
+msgstr "Chi siamo"
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:39
+#: templates/web/default/report/update-form.html:30
+#: templates/web/default/report/update-form.html:31
+#: templates/web/fixmystreet/report/update-form.html:28
+#: templates/web/fixmystreet/report/update-form.html:29
+msgid "Action Scheduled"
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:3
+#: templates/web/default/admin/body-form.html:4
+msgid ""
+"Add a <strong>body</strong> for each administrative body, such as a council or department\n"
+" to which problem reports can be sent. You can add one or more contacts (for different\n"
+" categories of problem) to each body."
+msgstr ""
+
+#: templates/web/default/admin/body.html:45
+msgid "Add a contact using the form below."
+msgstr ""
+
+#: templates/web/default/admin/bodies.html:65
+#: templates/web/default/admin/bodies.html:70
+#: templates/web/default/admin/body-form.html:233
+#: templates/web/zurich/admin/body-form.html:51
+msgid "Add body"
+msgstr "Aggiungi un corpo"
+
+#: templates/web/default/admin/body.html:88
+#: templates/web/zurich/admin/body.html:30
+msgid "Add new category"
+msgstr "Aggiungi una nuova categoria"
+
+#: templates/web/default/admin/users.html:45
+msgid "Add user"
+msgstr "Aggiungi un'utente"
+
+#: templates/web/default/my/my.html:61 templates/web/fixmystreet/my/my.html:67
+msgid "Added %s"
+msgstr "Aggiunti %s"
+
+#: templates/web/default/auth/change_password.html:29
+msgid "Again:"
+msgstr "Ancora:"
+
+#: templates/web/default/admin/timeline.html:35
+msgid "Alert %d created for %s, type %s, parameters %s / %s"
+msgstr "Segnalazione %d creata per %s tipo %s, parametri %s / %s"
+
+#: templates/web/default/admin/timeline.html:37
+msgid "Alert %d disabled (created %s)"
+msgstr "Segnalazione %d disabilitata (creata %s)"
+
+#: templates/web/default/report/update-form.html:163
+#: templates/web/fixmystreet/report/update-form.html:148
+msgid "Alert me to future updates"
+msgstr "Avvisami su futuri aggiornamenti"
+
+#: templates/web/default/reports/index.html:3
+#: templates/web/fixmybarangay/reports/index.html:3
+#: templates/web/zurich/admin/stats.html:5
+#: templates/web/zurich/reports/index.html:15
+msgid "All Reports"
+msgstr "Tutte le segnalazioni"
+
+#: templates/web/default/footer.html:11
+#: templates/web/emptyhomes/header.html:32
+#: templates/web/fiksgatami/footer.html:7
+#: templates/web/fiksgatami/nn/footer.html:7
+#: templates/web/fixmybarangay/footer.html:20
+#: templates/web/fixmystreet/footer.html:51
+#: templates/web/zurich/admin/index-dm.html:12
+#: templates/web/zurich/admin/stats.html:13
+#: templates/web/zurich/footer.html:19
+#: templates/web/zurich/nav_over_content.html:6
+msgid "All reports"
+msgstr "Tutte le segnalazioni"
+
+#: templates/web/default/admin/stats.html:5
+#: templates/web/zurich/admin/stats.html:8
+msgid "All reports between %s and %s"
+msgstr "Tutte le segnalazioni tra %s e %s"
+
+#: templates/web/default/report/new/councils_text_some.html:2
+msgid "All the information you provide here will be sent to"
+msgstr "Tutte le informazioni che aggiungi qui, saranno inviate all'ufficio competente del comune di "
+
+#: templates/web/default/report/new/councils_text_all.html:12
+#: templates/web/default/report/new/councils_text_all.html:13
+msgid "All the information you provide here will be sent to <strong>%s</strong> or <strong>Roads Service</strong>."
+msgstr "Tutte le informazioni che aggiungi qui, saranno inviate a <strong>%s</strong> o al<strong> Servizio Stradale</strong>."
+
+#: templates/web/default/report/new/councils_text_all.html:5
+#: templates/web/default/report/new/councils_text_all.html:6
+msgid "All the information you provide here will be sent to <strong>%s</strong> or a relevant local body such as <strong>TfL</strong>, via the London Report-It system."
+msgstr "Tutte le informazioni che inserisci qui verranno inviate al <strong>%s</strong> o all'organo locale come il <strong>TfL</strong>, attraverso il London Report-it system."
+
+#: templates/web/default/report/new/councils_text_all.html:19
+#: templates/web/default/report/new/councils_text_all.html:20
+#: templates/web/default/report/new/fill_in_details_form.html:12
+#: templates/web/default/report/new/fill_in_details_form.html:13
+#: templates/web/emptyhomes/report/new/councils_text_all.html:3
+#: templates/web/emptyhomes/report/new/councils_text_all.html:4
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:12
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:13
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:7
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:8
+msgid "All the information you provide here will be sent to <strong>%s</strong>."
+msgstr "Tutte le informazioni che aggiungi qui saranno inviate al <strong>%s</strong>."
+
+#: templates/web/default/questionnaire/index.html:60
+#: templates/web/fixmystreet/questionnaire/index.html:54
+msgid "An update marked this problem as fixed."
+msgstr "Un aggiornamento ha riportato questo problema come risolto."
+
+#: templates/web/default/admin/list_updates.html:32
+#: templates/web/default/admin/problem_row.html:20
+msgid "Anonymous"
+msgstr "Anonimo"
+
+#: templates/web/default/admin/report_edit.html:62
+#: templates/web/default/admin/update_edit.html:23
+msgid "Anonymous:"
+msgstr "Anonimo:"
+
+#: templates/web/default/footer.html:26
+msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?"
+msgstr "Sei uno <strong>sviluppatore</strong>? Vorresti contribuire a FixMyStreet?"
+
+#: templates/web/fixmystreet/footer.html:19
+msgid "Are you a developer?"
+msgstr "Sei uno sviluppatore?"
+
+#: templates/web/fixmystreet/footer.html:23
+msgid "Are you from a council?"
+msgstr "Lavori per un comune?"
+
+#: templates/web/default/admin/body-form.html:69
+#: templates/web/zurich/admin/body-form.html:24
+msgid "Area covered"
+msgstr "Area coperta"
+
+#: templates/web/zurich/admin/report_edit.html:144
+#: templates/web/zurich/admin/stats.html:36
+msgid "Assign to different category:"
+msgstr "Assegna ad una categoria differente:"
+
+#: templates/web/zurich/admin/report_edit.html:153
+msgid "Assign to external body:"
+msgstr "Assegna ad un corpo esterno:"
+
+#: templates/web/zurich/admin/report_edit.html:133
+#: templates/web/zurich/admin/report_edit.html:190
+msgid "Assign to subdivision:"
+msgstr "Assegna ad una subdivisione:"
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:163
+#: templates/web/zurich/report/updates.html:11
+msgid "Assigned to %s"
+msgstr "Assegnato a %s"
+
+#: templates/web/default/open311/index.html:86
+msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date."
+msgstr ""
+
+#: templates/web/default/open311/index.html:78
+msgid "At the moment only searching for and looking at reports work."
+msgstr "Al momento funziona solo la ricerca e la visualizzazione delle segnalazioni."
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:334
+#: templates/web/zurich/report/_item.html:11
+msgid "Awaiting moderation"
+msgstr ""
+
+#: templates/web/default/js/translation_strings.html:32
+msgid "Back"
+msgstr "Indietro"
+
+#: templates/web/default/admin/report_blocks.html:11
+msgid "Ban email address"
+msgstr "Vietare l'indirizzo email"
+
+#: templates/web/fixmybarangay/report/new/notes.html:7
+msgid "Be sure to choose the right category, because we use that to determine to whom the report is sent."
+msgstr "Devi essere sicuro di aver scelto la categoria giusta, è importante per determinare a quale ufficio dovrà essere inviata la segnalazione."
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1185
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:297
+#: templates/web/default/admin/bodies.html:1
+#: templates/web/zurich/header.html:64
+msgid "Bodies"
+msgstr "Corpi"
+
+#: templates/web/default/admin/flagged.html:17
+#: templates/web/default/admin/reports.html:14
+#: templates/web/default/admin/users.html:17
+msgid "Body"
+msgstr "Corpo"
+
+#: templates/web/default/admin/user-form.html:32
+msgid "Body:"
+msgstr "Corpo:"
+
+#: templates/web/fiksgatami/footer.html:16
+#: templates/web/fiksgatami/nn/footer.html:16
+msgid "Built by <a href=\"http://www.mysociety.org/\">mySociety</a> and maintained by <a href=\"http://www.nuug.no/\">NUUG</a>"
+msgstr "Costruito da <a href=\"http://www.mysociety.org/\">mySociety</a> e mantenuto da <a href=\"http://www.nuug.no/\">NUUG</a>"
+
+#: templates/web/default/admin/stats.html:80
+msgid "By Date"
+msgstr "Per data"
+
+#: templates/web/fixmystreet/around/_report_banner.html:10
+#: templates/web/fixmystreet/around/_report_banner.html:9
+msgid "Can't see the map? <a href='%s' rel='nofollow'>Skip this step</a>"
+msgstr "Non puoi vedere la mappa? <a href='%s' rel='nofollow'>Salta questo passaggio</a>"
+
+#: templates/web/default/admin/bodies.html:20
+#: templates/web/default/admin/body.html:53
+#: templates/web/default/admin/index.html:44
+#: templates/web/default/report/new/category.html:10
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:74
+#: templates/web/zurich/admin/body.html:13
+#: templates/web/zurich/admin/index-dm.html:23
+#: templates/web/zurich/admin/index-sdm.html:21
+#: templates/web/zurich/admin/reports.html:13
+#: templates/web/zurich/admin/stats.html:50
+#: templates/web/zurich/report/new/fill_in_details_form.html:50
+msgid "Category"
+msgstr "Categoria"
+
+#: templates/web/default/admin/index.html:42
+msgid "Category fix rate for problems > 4 weeks old"
+msgstr ""
+
+#: templates/web/default/admin/body.html:109
+#: templates/web/default/admin/body_edit.html:23
+#: templates/web/default/admin/report_edit.html:61
+#: templates/web/default/report/new/fill_in_details_form.html:67
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:50
+#: templates/web/zurich/admin/body.html:36
+#: templates/web/zurich/admin/report_edit-sdm.html:45
+#: templates/web/zurich/admin/report_edit.html:143
+msgid "Category:"
+msgstr "Categoria:"
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374
+msgid "Category: %s"
+msgstr "Categoria: %s"
+
+#: templates/web/default/auth/change_password.html:1
+#: templates/web/default/auth/change_password.html:3
+#: templates/web/default/auth/change_password.html:33
+msgid "Change Password"
+msgstr "Cambia la Password"
+
+#: templates/web/default/admin/body.html:131
+msgid ""
+"Check <strong>confirmed</strong> to indicate that this contact has been confirmed as correct.\n"
+" If you are not sure of the origin or validity of the contact, leave this unchecked."
+msgstr ""
+
+#: templates/web/default/admin/body.html:142
+msgid ""
+"Check <strong>deleted</strong> to remove the category from use. \n"
+" It will not appear as an available category in the drop-down menu on the report-a-problem page."
+msgstr ""
+
+#: templates/web/default/admin/body.html:162
+msgid ""
+"Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n"
+" <br>\n"
+" Normally, categories are not private.\n"
+" <br>\n"
+" This is suitable for issues that you want to allow users to report to the body, but for which there is no public\n"
+" interest in displaying the report. In the UK, we've used this for services like requesting an extra rubbish bin\n"
+" at a specific address."
+msgstr ""
+
+#: templates/web/default/admin/body.html:101
+msgid ""
+"Choose a <strong>category</strong> name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n"
+" to the body too. These will appear in the drop-down menu on the report-a-problem page."
+msgstr ""
+
+#: templates/web/default/admin/stats.html:65
+#: templates/web/default/admin/stats.html:71
+msgid "Click here or enter as dd/mm/yyyy"
+msgstr ""
+
+#: templates/web/default/js/translation_strings.html:47
+#: templates/web/fixmystreet/around/_report_banner.html:2
+msgid "Click map to report a problem"
+msgstr "Clicca sulla mappa per riportare un problema"
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:140
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:45
+#: templates/web/default/admin/report_edit.html:47
+#: templates/web/default/dashboard/index.html:142
+#: templates/web/default/dashboard/index.html:144
+#: templates/web/fixmystreet/report/banner.html:15
+#: templates/web/zurich/admin/header.html:10
+#: templates/web/zurich/admin/header.html:12
+#: templates/web/zurich/admin/header.html:2
+#: templates/web/zurich/admin/report_edit.html:100
+#: templates/web/zurich/admin/report_edit.html:98
+#: templates/web/zurich/admin/stats.html:31
+#: templates/web/zurich/report/banner.html:13
+msgid "Closed"
+msgstr "Chiuso"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:748
+msgid "Closed by council"
+msgstr "Chiuso dal comune"
+
+#: templates/web/default/my/my.html:37 templates/web/fixmystreet/my/my.html:43
+msgid "Closed reports"
+msgstr "Segnalazione chiusa"
+
+#: templates/web/default/admin/problem_row.html:38
+msgid "Closed:"
+msgstr "Chiuso:"
+
+#: templates/web/default/around/tabbed_lists.html:11
+#: templates/web/default/around/tabbed_lists.html:12
+msgid "Closest nearby problems <small>(within&nbsp;%skm)</small>"
+msgstr "Problemi più vicini <small>(within&nbsp;%skm)</small>"
+
+#: templates/web/default/admin/report_edit.html:23
+#: templates/web/zurich/admin/report_edit-sdm.html:36
+#: templates/web/zurich/admin/report_edit.html:49
+msgid "Co-ordinates:"
+msgstr "Coordinate:"
+
+#: templates/web/default/admin/list_updates.html:10
+msgid "Cobrand"
+msgstr "Cobrand"
+
+#: templates/web/default/admin/report_edit.html:75
+#: templates/web/default/admin/update_edit.html:50
+msgid "Cobrand data:"
+msgstr "Dati del Cobrand:"
+
+#: templates/web/default/admin/report_edit.html:74
+#: templates/web/default/admin/update_edit.html:49
+msgid "Cobrand:"
+msgstr "Cobrand:"
+
+#: templates/web/default/admin/config_page.html:1
+#, fuzzy
+msgid "Configuration"
+msgstr "Conferma"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:421
+msgid "Configuration updated - contacts will be generated automatically later"
+msgstr "Aggiornamento configurazione - i contatti verranno generati automaticamente più tardi"
+
+#: templates/web/default/admin/body_edit.html:47
+msgid "Configure Endpoint"
+msgstr "Configura il punto finale"
+
+#: templates/web/default/admin/body.html:62
+msgid "Confirm"
+msgstr "Conferma"
+
+#: templates/web/default/auth/token.html:1
+msgid "Confirm account"
+msgstr "Conferma l'account"
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:177
+#: templates/web/fixmystreet/report/update-form.html:105
+msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated."
+msgstr "Conferma tramite l'email qui sotto ed una nuova password ti verrà fornita. Dopo aver confermato l'email che riceverai, la tua password verrà aggiornata."
+
+#: templates/web/default/questionnaire/creator_fixed.html:1
+#: templates/web/default/tokens/confirm_problem.html:1
+#: templates/web/default/tokens/confirm_problem.html:3
+#: templates/web/default/tokens/confirm_update.html:1
+#: templates/web/default/tokens/confirm_update.html:3
+#: templates/web/emptyhomes/tokens/confirm_problem.html:1
+#: templates/web/emptyhomes/tokens/confirm_problem.html:3
+#: templates/web/zurich/tokens/confirm_problem.html:1
+#: templates/web/zurich/tokens/confirm_problem.html:3
+msgid "Confirmation"
+msgstr "Conferma"
+
+#: templates/web/default/admin/body.html:137
+#: templates/web/default/admin/body.html:55
+#: templates/web/default/admin/body_edit.html:32
+#: templates/web/default/admin/body_edit.html:84
+#: templates/web/zurich/admin/stats.html:40
+msgid "Confirmed"
+msgstr "Confermato"
+
+#: templates/web/default/admin/stats.html:5
+msgid "Confirmed reports between %s and %s"
+msgstr "La segnalazione è confermata tra %s e %s"
+
+#: templates/web/default/admin/list_updates.html:39
+#: templates/web/default/admin/problem_row.html:36
+#: templates/web/default/admin/report_edit.html:70
+msgid "Confirmed:"
+msgstr "Confermato:"
+
+#: templates/web/fiksgatami/footer.html:10
+#: templates/web/fiksgatami/nn/footer.html:10
+msgid "Contact"
+msgstr "Contatto"
+
+#: templates/web/default/footer.html:24
+msgid "Contact FixMyStreet"
+msgstr "Contatto FixMyStreet"
+
+#: templates/web/default/contact/index.html:1
+#: templates/web/default/contact/index.html:2
+#: templates/web/default/contact/submit.html:1
+#: templates/web/fixmystreet/contact/index.html:1
+#: templates/web/fixmystreet/contact/index.html:2
+msgid "Contact Us"
+msgstr "Contattaci"
+
+#: templates/web/default/contact/index.html:6
+#: templates/web/default/contact/submit.html:3
+#: templates/web/fixmystreet/contact/index.html:22
+msgid "Contact the team"
+msgstr "Contatta il team"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1319
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1347
+msgid "Could not find user"
+msgstr "Non posso trovare l'utente"
+
+#: templates/web/default/js/translation_strings.html:37
+msgid "Could not look up location"
+msgstr "Non posso trovare l'area desiderata"
+
+#: templates/web/default/admin/list_updates.html:9
+msgid "Council"
+msgstr "Comune"
+
+#: templates/web/default/admin/body.html:1
+#: templates/web/default/admin/body_edit.html:1
+#: templates/web/zurich/admin/body.html:1
+msgid "Council contacts for %s"
+msgstr "I contatti del comune per %s"
+
+#: templates/web/default/admin/stats.html:84
+msgid "Council:"
+msgstr "Comune:"
+
+#: templates/web/default/admin/stats.html:12
+#: templates/web/default/admin/stats.html:32
+#: templates/web/zurich/admin/stats.html:45
+#: templates/web/zurich/admin/stats.html:50
+msgid "Count"
+msgstr "Contare"
+
+#: templates/web/default/email_sent.html:1
+msgid "Create a report"
+msgstr "Crea una segnalazione"
+
+#: templates/web/default/admin/body.html:179
+#: templates/web/zurich/admin/body.html:53
+msgid "Create category"
+msgstr "Crea una categoria"
+
+#: templates/web/default/admin/problem_row.html:34
+#: templates/web/zurich/admin/list_updates.html:29
+#: templates/web/zurich/admin/list_updates.html:8
+msgid "Created"
+msgstr "Creato"
+
+#: templates/web/default/admin/list_updates.html:38
+#: templates/web/default/admin/report_edit.html:69
+#: templates/web/default/admin/update_edit.html:51
+#: templates/web/zurich/admin/report_edit-sdm.html:50
+#: templates/web/zurich/admin/report_edit.html:64
+#: templates/web/zurich/admin/update_edit.html:29
+msgid "Created:"
+msgstr "Creato:"
+
+#: templates/web/default/admin/stats.html:31
+msgid "Current state"
+msgstr "Stato corrente"
+
+#: templates/web/default/admin/bodies.html:7
+#: templates/web/default/admin/index.html:5
+#, fuzzy
+msgid "Currently no bodies have been created."
+msgstr "Nessun problema è stato ancora segnalato."
+
+#: templates/web/default/dashboard/index.html:6
+#: templates/web/default/dashboard/index.html:7
+msgid "Dashboard"
+msgstr "Pannello di controllo"
+
+#: templates/web/zurich/admin/stats.html:35
+msgid "Dealt with by subdivision within 5 working days"
+msgstr ""
+
+#: templates/web/default/admin/bodies.html:22
+#: templates/web/default/admin/body.html:148
+#: templates/web/default/admin/body.html:56
+#: templates/web/default/admin/body_edit.html:37
+#: templates/web/default/admin/body_edit.html:85
+msgid "Deleted"
+msgstr "Eliminato"
+
+#: templates/web/zurich/admin/index-dm.html:22
+#: templates/web/zurich/admin/index-sdm.html:20
+#: templates/web/zurich/admin/reports.html:12
+msgid "Description"
+msgstr "Descrizione"
+
+#: templates/web/default/js/translation_strings.html:34
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66
+#: templates/web/zurich/report/new/fill_in_details_form.html:42
+msgid "Details"
+msgstr "Dettagli"
+
+#: templates/web/default/admin/report_edit.html:20
+#: templates/web/default/report/new/fill_in_details_form.html:61
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:79
+#: templates/web/zurich/admin/report_edit-sdm.html:28
+#: templates/web/zurich/admin/report_edit.html:28
+#: templates/web/zurich/admin/report_edit.html:38
+msgid "Details:"
+msgstr "Dettagli:"
+
+#: templates/web/default/admin/body.html:57
+msgid "Devolved"
+msgstr "Devoluto:"
+
+#: templates/web/default/admin/edit-league.html:8
+msgid "Diligency prize league table"
+msgstr ""
+
+#: templates/web/fixmystreet/auth/general.html:30
+msgid "Do you have a FixMyBarangay password?"
+msgstr "Hai già la password per FixMyBrarangay?"
+
+#: templates/web/default/auth/general.html:32
+#: templates/web/fixmystreet/auth/general.html:32
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:155
+#: templates/web/fixmystreet/report/update-form.html:84
+msgid "Do you have a FixMyStreet password?"
+msgstr "Hai già la password per FixMyStreet?"
+
+#: templates/web/default/questionnaire/index.html:70
+#: templates/web/fixmystreet/questionnaire/index.html:64
+msgid "Don&rsquo;t know"
+msgstr "Non lo so"
+
+#: templates/web/fixmystreet/contact/index.html:115
+msgid "Don't like forms?"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:47
+#: templates/web/default/report/update-form.html:30
+#: templates/web/default/report/update-form.html:32
+#: templates/web/fixmystreet/report/update-form.html:28
+#: templates/web/fixmystreet/report/update-form.html:30
+msgid "Duplicate"
+msgstr ""
+
+#: templates/web/default/admin/body.html:90
+msgid ""
+"Each contact for the body has a category, which is displayed to the public. \n"
+" Different categories <strong>can have the same contact</strong> (email address).\n"
+" This means you can add many categories even if you only have one contact for the body.\n"
+" "
+msgstr ""
+
+#: templates/web/default/admin/list_updates.html:42
+#: templates/web/default/admin/problem_row.html:41
+#: templates/web/default/admin/users.html:31
+#: templates/web/zurich/admin/problem_row.html:42
+msgid "Edit"
+msgstr "Modifica"
+
+#: templates/web/default/admin/body.html:189
+#: templates/web/zurich/admin/body.html:64
+msgid "Edit body details"
+msgstr "Modifica dettagli corpo"
+
+#: templates/web/default/admin/report_edit.html:1
+#: templates/web/zurich/admin/report_edit-sdm.html:2
+#: templates/web/zurich/admin/report_edit-sdm.html:4
+#: templates/web/zurich/admin/report_edit.html:2
+#: templates/web/zurich/admin/report_edit.html:5
+msgid "Editing problem %d"
+msgstr "Modifica problema %d"
+
+#: templates/web/default/admin/update_edit.html:1
+#: templates/web/zurich/admin/update_edit.html:1
+msgid "Editing update %d"
+msgstr "Modifica aggiornamento %d"
+
+#: templates/web/default/admin/user_edit.html:1
+msgid "Editing user %d"
+msgstr "Modifica utente %d"
+
+#: templates/web/default/admin/body_edit.html:86
+msgid "Editor"
+msgstr "Editor"
+
+#: templates/web/default/admin/bodies.html:18
+#: templates/web/default/admin/body.html:54
+#: templates/web/default/admin/body_edit.html:83
+#: templates/web/default/admin/flagged.html:38
+#: templates/web/default/admin/users.html:16
+#: templates/web/fixmystreet/auth/general.html:20
+#: templates/web/fixmystreet/report/update-form.html:76
+#: templates/web/zurich/admin/body-form.html:9
+#: templates/web/zurich/admin/body.html:14
+#: templates/web/zurich/auth/general.html:24
+#: templates/web/zurich/auth/general.html:54
+msgid "Email"
+msgstr "Email"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1295
+msgid "Email added to abuse list"
+msgstr "Email aggiunta alla lista abusi"
+
+#: templates/web/default/admin/body.html:126
+#, fuzzy
+msgid "Email address:"
+msgstr "Tuo indirizzo email:"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1292
+msgid "Email already in abuse list"
+msgstr "Email già presente nella lista abusi"
+
+#: templates/web/default/around/_updates.html:5
+msgid "Email me new local problems"
+msgstr "Inviami via email i nuovi problemi locali"
+
+#: templates/web/default/report/display.html:34
+msgid "Email me updates"
+msgstr "Inviami via email gli aggiornamenti"
+
+#: templates/web/default/admin/body_edit.html:26
+#: templates/web/default/admin/report_edit.html:67
+#: templates/web/default/admin/update_edit.html:33
+#: templates/web/default/admin/user-form.html:20
+#: templates/web/default/alert/updates.html:13
+#: templates/web/default/report/display.html:38
+#: templates/web/zurich/admin/body.html:41
+#: templates/web/zurich/admin/report_edit-sdm.html:47
+#: templates/web/zurich/admin/report_edit.html:60
+msgid "Email:"
+msgstr "Email:"
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:323
+msgid "Email: %s"
+msgstr "Email: %s"
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:620
+msgid "Empty flat or maisonette"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:619
+msgid "Empty house or bungalow"
+msgstr "Case o bungalow vuoti"
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:622
+msgid "Empty office or other commercial"
+msgstr "Uffici o altri locali commerciali vuoti"
+
+#: templates/web/emptyhomes/report/new/form_heading.html:1
+msgid "Empty property details form"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:623
+msgid "Empty pub or bar"
+msgstr "Pub o bar vuoti"
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:624
+msgid "Empty public building - school, hospital, etc."
+msgstr "Edifici pubblici - scuole, ospedali, ecc vuoti"
+
+#: templates/web/default/admin/body-form.html:158
+#: templates/web/default/admin/body-form.html:159
+msgid ""
+"Enable <strong>Open311 update-sending</strong> if the endpoint will send and receive\n"
+" updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n"
+" For more information, see \n"
+" <a href='http://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:215
+#: templates/web/default/admin/body-form.html:216
+msgid ""
+"Enable this <strong>can be devolved</strong> setting if one or more contacts have a \n"
+" different endpoint (and send method) from the body's. For example, if reports for some categories of\n"
+" problem must be emailed, while others can be sent over Open311."
+msgstr ""
+
+#: templates/web/default/admin/stats.html:70
+#, fuzzy
+msgid "End Date:"
+msgstr "Fine giorno:"
+
+#: templates/web/default/admin/body-form.html:126
+msgid "Endpoint"
+msgstr "Punto finale"
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:72
+msgid "Enter a Z&uuml;rich street name"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:18
+msgid "Enter a nearby UK postcode, or street name and area"
+msgstr "Inserisci il piu vicino codice postale UK, o il nome di una strada e una città "
+
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:25
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:37
+msgid "Enter a nearby postcode, or street name and area"
+msgstr "Inserisci il piu vicino codice postale UK o il nome di una strada e l'area"
+
+#: templates/web/default/around/postcode_form.html:2
+#: templates/web/fixmystreet/around/postcode_form.html:11
+msgid "Enter a nearby street name and area"
+msgstr "Inserisci il nome di una strada nelle vicinanze e una città o solo in nome della città "
+
+#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:9
+#, fuzzy
+msgid "Enter a nearby street name and area, postal code or district in Delhi"
+msgstr "Inserisci il nome di una strada nelle vicinanze e una città o solo in nome della città "
+
+#: templates/web/default/auth/general.html:64
+#: templates/web/default/report/new/fill_in_details_form.html:169
+#: templates/web/default/report/update-form.html:124
+msgid "Enter a new password:"
+msgstr "Inserisci una nuova password:"
+
+#: templates/web/fixmystreet/auth/general.html:61
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:211
+#: templates/web/fixmystreet/report/update-form.html:122
+#: templates/web/zurich/auth/general.html:65
+msgid "Enter a password"
+msgstr "Inserisci una password"
+
+#: templates/web/default/index-steps.html:26
+msgid "Enter details of the problem"
+msgstr "Inserisci i dettagli del problema"
+
+#: templates/web/default/auth/token.html:5
+#: templates/web/default/errors/generic.html:1
+#: templates/web/default/errors/generic.html:3
+#: templates/web/default/tokens/abuse.html:1
+#: templates/web/default/tokens/abuse.html:3
+#: templates/web/default/tokens/error.html:1
+#: templates/web/default/tokens/error.html:3
+msgid "Error"
+msgstr "Errore"
+
+#: templates/web/default/admin/body.html:11
+#: templates/web/default/admin/body_edit.html:18
+msgid "Example postcode %s"
+msgstr "Esempio codice postale %s"
+
+#: templates/web/default/open311/index.html:96
+msgid "Examples:"
+msgstr "Esempi:"
+
+#: templates/web/default/admin/report_edit.html:76
+msgid "Extra data:"
+msgstr "Dati extra:"
+
+#: templates/web/default/contact/submit.html:15
+msgid "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>."
+msgstr "Messaggio non inviato. Per favore prova ancora o <a href=\"mailto:%s\">inviaci un'email</a>."
+
+#: templates/web/zurich/admin/index-dm.html:33
+#: templates/web/zurich/admin/index-sdm.html:30
+msgid "Filter report list"
+msgstr ""
+
+#: templates/web/emptyhomes/front/stats.html:6
+msgid "Find latest local and national news"
+msgstr "Trova le ultime notizie locali e nazionali"
+
+#: templates/web/default/questionnaire/index.html:79
+#: templates/web/fixmystreet/questionnaire/index.html:73
+msgid "First time"
+msgstr "Prima volta"
+
+#: templates/web/default/admin/body.html:37
+msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
+msgstr ""
+
+#: templates/web/fiksgatami/header.html:16
+#: templates/web/fiksgatami/nn/header.html:16
+msgid "Fix<span id=\"my\">My</span>Street"
+msgstr "Fix<span id=\"my\">My</span>Street"
+
+#: templates/web/default/header.html:24
+msgid "FixMyStreet"
+msgstr "FixMyStreet"
+
+#: templates/web/default/admin/header.html:10
+msgid "FixMyStreet admin:"
+msgstr "FixMyStreet amministrazione:"
+
+#: templates/web/default/alert/index.html:11
+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"
+"within a certain distance of a particular location."
+msgstr ""
+"FixMyStreet offre un servizio di RSS feed e di avvertimenti via email sui problemi locali, inclusi⏎\n"
+"gli avvertimenti per problemi in un particolare quartiere o comune, o tutti i problemi⏎\n"
+"da una certa distanza da una specifica zona."
+
+#: templates/web/default/alert/_list.html:71
+#: templates/web/fixmystreet/alert/_list.html:73
+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"
+"for the county council."
+msgstr ""
+
+#: templates/web/default/admin/index.html:44
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:41
+#: templates/web/default/admin/report_edit.html:42
+#: templates/web/default/dashboard/index.html:142
+#: templates/web/default/dashboard/index.html:144
+#: templates/web/default/report/update-form.html:30
+#: templates/web/default/report/update-form.html:34
+#: templates/web/fixmystreet/report/banner.html:12
+#: templates/web/fixmystreet/report/update-form.html:28
+#: templates/web/fixmystreet/report/update-form.html:32
+msgid "Fixed"
+msgstr "Risolto"
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:43
+msgid "Fixed - Council"
+msgstr "Risolto - Comune"
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:42
+msgid "Fixed - User"
+msgstr "Risolto - Utente"
+
+#: templates/web/default/my/my.html:32 templates/web/fixmystreet/my/my.html:38
+msgid "Fixed reports"
+msgstr "Problemi risolti"
+
+#: templates/web/default/admin/problem_row.html:37
+msgid "Fixed:"
+msgstr "Risolto:"
+
+#: templates/web/default/admin/body-form.html:84
+#: templates/web/zurich/admin/body-form.html:36
+msgid "Flag as deleted"
+msgstr ""
+
+#: templates/web/default/admin/report_blocks.html:16
+msgid "Flag user"
+msgstr "Utente segnalato"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1190
+#: templates/web/default/admin/users.html:19
+msgid "Flagged"
+msgstr "Segnalato"
+
+#: templates/web/default/admin/flagged.html:1
+msgid "Flagged reports and users"
+msgstr ""
+
+#: templates/web/default/admin/user-form.html:45
+msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
+msgstr ""
+
+#: templates/web/default/admin/flagged.html:31
+msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:78
+#: templates/web/default/admin/user-form.html:51
+msgid "Flagged:"
+msgstr "Segnalato:"
+
+#: templates/web/default/reports/_ward-list.html:3
+#: templates/web/fixmystreet/reports/_ward-list.html:4
+msgid "Follow a ward link to view only reports within that ward."
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:30
+msgid "For council(s):"
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:65
+msgid "For more information, see <a href='http://code.fixmystreet.com/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>."
+msgstr ""
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:176
+#: templates/web/fixmystreet/report/update-form.html:104
+msgid "Forgotten your password?"
+msgstr "Hai dimenticato la tua password?"
+
+#: templates/web/default/faq/faq-en-gb.html:1
+#: templates/web/emptyhomes/faq/faq-cy.html:1
+#: templates/web/emptyhomes/faq/faq-en-gb.html:1
+#: templates/web/fiksgatami/faq/faq-nb.html:1
+#: templates/web/fiksgatami/nn/faq/faq-nn.html:1
+#: templates/web/fixmybarangay/faq/faq-en-gb.html:1
+#: templates/web/fixmystreet/faq/faq-en-gb.html:1
+#: templates/web/fixmystreet/static/privacy.html:1
+msgid "Frequently Asked Questions"
+msgstr ""
+
+#: templates/web/default/open311/index.html:138
+msgid "GeoRSS on Google Maps"
+msgstr "GeoRSS su Google Maps"
+
+#: templates/web/fixmystreet/around/_updates.html:3
+#: templates/web/fixmystreet/report/display.html:38
+msgid "Get updates"
+msgstr "Ottieni aggiornamenti "
+
+#: templates/web/fixmystreet/reports/_rss.html:4
+#: templates/web/fixmystreet/reports/_rss.html:9
+msgid "Get updates of %s problems"
+msgstr "Ottieni gli aggiornamenti di %s problemi"
+
+#: templates/web/fixmystreet/reports/_rss.html:11
+#: templates/web/fixmystreet/reports/_rss.html:4
+msgid "Get updates of problems in this %s"
+msgstr "Ottieni gli aggiornamenti dei problemi in questo %s"
+
+#: templates/web/default/alert/_list.html:83
+#: templates/web/fixmybarangay/alert/_list.html:28
+#: templates/web/fixmystreet/alert/_list.html:82
+msgid "Give me an RSS feed"
+msgstr "Dammi un' RSS feed"
+
+#: templates/web/default/alert/index.html:34
+#: templates/web/default/around/postcode_form.html:8
+#: templates/web/fixmystreet/around/postcode_form.html:21
+#: templates/web/zurich/admin/stats.html:26
+msgid "Go"
+msgstr "Vai"
+
+#: templates/web/default/admin/report_edit.html:77
+msgid "Going to send questionnaire?"
+msgstr ""
+
+#: templates/web/default/admin/index.html:32
+msgid "Graph of problem creation by status over time"
+msgstr ""
+
+#: templates/web/default/reports/index.html:8
+msgid "Greyed-out lines are councils that no longer exist."
+msgstr "Le linee evidenziate in grigio sono i comuni che non esistono più."
+
+#: templates/web/default/questionnaire/index.html:61
+#: templates/web/fixmystreet/questionnaire/index.html:55
+msgid "Has this problem been fixed?"
+msgstr "E' stato risolto questo problema?"
+
+#: templates/web/default/questionnaire/index.html:74
+#: templates/web/fixmystreet/questionnaire/index.html:68
+msgid "Have you ever reported a problem to a council before, or is this your first time?"
+msgstr "Avevi mai segnalato un problema ad un comune precedentemente, o questa è la tua prima volta?"
+
+#: templates/web/default/footer.html:15
+#: templates/web/emptyhomes/header.html:33
+#: templates/web/fiksgatami/footer.html:9
+#: templates/web/fiksgatami/nn/footer.html:9
+#: templates/web/fixmybarangay/footer.html:24
+#: templates/web/fixmystreet/footer.html:55
+#: templates/web/zurich/faq/faq-de-ch.html:1
+#: templates/web/zurich/footer.html:21
+#: templates/web/zurich/nav_over_content.html:8
+msgid "Help"
+msgstr "Aiuto"
+
+#: templates/web/default/alert/_list.html:6
+#: templates/web/fixmystreet/alert/_list.html:8
+msgid "Here are the types of local problem alerts for &lsquo;%s&rsquo;."
+msgstr "Qui trovi i tipi di avvertimenti sui problemi locali per &lsquo;%s&rsquo;."
+
+#: templates/web/fixmybarangay/header.html:66
+#: templates/web/fixmystreet/header.html:53
+#: templates/web/zurich/footer.html:11
+msgid "Hi %s"
+msgstr "Ciao %s"
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:50
+#: templates/web/default/admin/report_edit.html:51
+#: templates/web/default/admin/update_edit.html:28
+#: templates/web/zurich/admin/header.html:11
+#: templates/web/zurich/admin/header.html:2
+#: templates/web/zurich/admin/report_edit.html:89
+#: templates/web/zurich/admin/report_edit.html:93
+#: templates/web/zurich/admin/stats.html:32
+#: templates/web/zurich/admin/update_edit.html:18
+msgid "Hidden"
+msgstr "Nascosto"
+
+#: templates/web/default/around/display_location.html:67
+msgid "Hide old"
+msgstr ""
+
+#: templates/web/default/around/display_location.html:62
+msgid "Hide pins"
+msgstr ""
+
+#: templates/web/default/admin/body_edit.html:79
+msgid "History"
+msgstr "Cronologia"
+
+#: templates/web/default/js/translation_strings.html:31
+msgid "Home"
+msgstr "Home"
+
+#: templates/web/default/index-steps.html:1
+msgid "How to report a problem"
+msgstr "Come segnalare un problema"
+
+#: templates/web/default/js/translation_strings.html:33
+msgid "How to send successful reports"
+msgstr "Come inviare segnalazioni di successo"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:733
+msgid "I am afraid you cannot confirm unconfirmed reports."
+msgstr "Mi spiace non puoi confermare le segnalazioni non confermate."
+
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:89
+msgid "I'm afraid we couldn't locate your problem in the database.\n"
+msgstr "Mi spiace non possiamo localizzare il tuo problema nel database.\n"
+
+#: perllib/FixMyStreet/App/Controller/Tokens.pm:44
+msgid "I'm afraid we couldn't validate that token, as the report was made too long ago."
+msgstr "Mi spiace non possiamo validare questo token, perchè la segnalazione è stata fatta troppo tempo fa."
+
+#: perllib/FixMyStreet/App/Controller/Tokens.pm:260
+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 "Mi spiace non possiamo validare questo token. Se hai copiato l'URL dall'email, controlla se l'hai copiato correttamente.\n"
+
+#: templates/web/default/admin/flagged.html:14
+#: templates/web/default/admin/list_updates.html:6
+#: templates/web/default/admin/reports.html:11
+#: templates/web/zurich/admin/index-dm.html:21
+#: templates/web/zurich/admin/index-sdm.html:19
+#: templates/web/zurich/admin/list_updates.html:28
+#: templates/web/zurich/admin/list_updates.html:7
+#: templates/web/zurich/admin/reports.html:11
+msgid "ID"
+msgstr "ID"
+
+#: templates/web/default/admin/body-form.html:24
+#: templates/web/default/admin/body-form.html:25
+msgid ""
+"Identify a <strong>parent</strong> if this body is itself part of another body.\n"
+" For basic installations, you don't need to join bodies in this way."
+msgstr ""
+
+#: templates/web/default/admin/body.html:104
+msgid ""
+"If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n"
+" the menu. Make sure you use the same category name in the bodies if you want this to happen."
+msgstr ""
+
+#: templates/web/default/email_sent.html:19
+msgid "If you do not, your alert will not be activated."
+msgstr "Se non lo fai, il tuo avviso non sarà attivato."
+
+#: templates/web/default/email_sent.html:15
+msgid "If you do not, your problem will not be posted."
+msgstr "Se non lo fai, il tuo problema non sarà postato."
+
+#: templates/web/default/email_sent.html:17
+msgid "If you do not, your update will not be posted."
+msgstr "Se non lo fai, il tuo aggiornamento non sarà postato."
+
+#: templates/web/default/report/new/councils_text_none.html:9
+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 "Se invii un problema qui, il soggetto e i dettagli del problema saranno pubblici ma il problema <strong>non</strong> verrà segnalato al comune."
+
+#: templates/web/emptyhomes/report/new/councils_text_none.html:9
+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 "Se inserisci una segnalazione qui, sarà lasciata nel sito, ma non inviata al comune &ndash; lascia per favore comunque la tua segnalazione, così potremmo mostrare al comune l'attività nella loro area."
+
+#: templates/web/default/auth/token.html:22
+#: templates/web/default/email_sent.html:9
+msgid "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."
+msgstr "Se usi un' email su un sito web o hai un filtro per la posta indesiderata, dovresti controllare anche la cartella dello spam o posta indesiderata: qualche volta i nostri messaggi finiscono li."
+
+#: templates/web/default/questionnaire/index.html:86
+#: templates/web/fixmystreet/questionnaire/index.html:77
+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 ""
+"Se desideri lasciare un'aggiornamento pubblico sullo stato del problema, per favore inseriscilo qui⏎\n"
+"(tieni presente che non verrà inviato al comune). Per esempio, com'è stata la⏎\n"
+"tua esperienza nell'ottenere il problema risolto?"
+
+#: templates/web/default/admin/body.html:120
+msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:200
+#: templates/web/default/admin/body-form.html:201
+msgid ""
+"If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n"
+" its updates. Enable <strong>extended Open311 stauses</strong> if you want to allow extra states to be passed.\n"
+" Check that your cobrand supports this feature before switching it on."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:187
+#: templates/web/default/admin/body-form.html:188
+msgid ""
+"If you've enabled Open311 update-sending above, enable <strong>suppression of alerts</strong> \n"
+" if you do <strong>not</strong> want that user to be notified whenever these updates are created."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:173
+#: templates/web/default/admin/body-form.html:174
+msgid ""
+"If you've enabled Open311 update-sending above, you must identify which \n"
+" FixMyStreet <strong>user</strong> will be attributed as the creator of those updates\n"
+" when they are shown on the site. Enter the ID (number) of that user."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Contact.pm:116
+msgid "Illegal ID"
+msgstr "ID illegale"
+
+#: perllib/FixMyStreet/App/Controller/Alert.pm:100
+msgid "Illegal feed selection"
+msgstr "Selezione feed illegale"
+
+#: templates/web/default/dashboard/index.html:142
+#: templates/web/default/dashboard/index.html:144
+#: templates/web/default/report/update-form.html:30
+#: templates/web/default/report/update-form.html:32
+#: templates/web/fixmystreet/report/update-form.html:28
+#: templates/web/fixmystreet/report/update-form.html:30
+msgid "In Progress"
+msgstr "In progresso"
+
+#: templates/web/default/admin/flagged.html:39
+#, fuzzy
+msgid "In abuse table?"
+msgstr "(Email nella tabella degli abusi)"
+
+#: templates/web/default/open311/index.html:90
+msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:143
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:38
+#: templates/web/fixmystreet/report/banner.html:19
+#: templates/web/zurich/admin/header.html:2
+#: templates/web/zurich/admin/header.html:8
+#: templates/web/zurich/admin/report_edit.html:102
+#: templates/web/zurich/report/banner.html:15
+msgid "In progress"
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit.html:163
+msgid "Include reporter personal details"
+msgstr ""
+
+#: templates/web/default/admin/stats.html:76
+msgid "Include unconfirmed reports"
+msgstr "Includi segnalazioni non confermate"
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:354
+msgid "Incorrect has_photo value \"%s\""
+msgstr ""
+
+#: templates/web/zurich/admin/list_updates.html:3
+msgid "Internal notes"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:48
+msgid "Internal referral"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:339
+msgid "Invalid agency_responsible value %s"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1105
+msgid "Invalid end date"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:432
+msgid "Invalid format %s specified."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1101
+msgid "Invalid start date"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:37
+#: templates/web/default/dashboard/index.html:142
+#: templates/web/default/dashboard/index.html:143
+#: templates/web/default/report/update-form.html:30
+#: templates/web/default/report/update-form.html:31
+#: templates/web/fixmystreet/report/update-form.html:28
+#: templates/web/fixmystreet/report/update-form.html:29
+msgid "Investigating"
+msgstr "Investigando"
+
+#: templates/web/emptyhomes/tokens/confirm_problem.html:13
+#: templates/web/emptyhomes/tokens/confirm_problem.html:14
+msgid "It is worth noting however that the process can sometimes be slow, especially if the property is in very poor repair or the owner is unwilling to act. In most cases it can take six months or more before you can expect to see anything change and sometimes there may be considerable barries to a property being brought back into use. This doesn&rsquo;t mean the council isn&rsquo;t doing anything. We encourage councils to update the website so you can see what is happening. It may be a long process, but you reporting your concerns about this property to the council is a valuable first step."
+msgstr ""
+
+#: templates/web/fixmystreet/contact/blurb.html:8
+msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there."
+msgstr ""
+
+#: templates/web/default/auth/general.html:44
+#: templates/web/default/report/new/fill_in_details_form.html:149
+#: templates/web/default/report/update-form.html:104
+#: templates/web/fixmystreet/auth/general.html:46
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:172
+#: templates/web/fixmystreet/report/update-form.html:100
+#: templates/web/zurich/auth/general.html:40
+msgid "Keep me signed in on this computer"
+msgstr "Lasciami loggato su questo computer"
+
+#: templates/web/default/admin/body.html:58
+#: templates/web/zurich/admin/body.html:15
+msgid "Last editor"
+msgstr "Ultima modifica"
+
+#: templates/web/default/admin/report_edit.html:72
+msgid "Last update:"
+msgstr "Ultimo aggiornamento:"
+
+#: templates/web/default/admin/problem_row.html:39
+msgid "Last&nbsp;update:"
+msgstr "Ultimo&nbsp;aggiornamento:"
+
+#: templates/web/default/admin/body-form.html:222
+msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
+msgstr ""
+
+#: templates/web/default/admin/body.html:14
+#: templates/web/default/admin/body.html:16
+msgid "List all reported problems"
+msgstr "Lista di tutti i problemi segnalati"
+
+#: templates/web/default/report/new/fill_in_details_form.html:68
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:51
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:75
+#: templates/web/zurich/report/new/fill_in_details_form.html:51
+msgid "Loading..."
+msgstr "Caricando..."
+
+#: templates/web/default/alert/choose.html:1
+#: templates/web/default/alert/choose.html:3
+#: templates/web/default/alert/index.html:1
+#: templates/web/default/alert/index.html:3
+#: templates/web/default/alert/list.html:2
+#: templates/web/default/alert/list.html:5
+#: templates/web/default/alert/updates.html:1
+#: templates/web/default/tokens/confirm_alert.html:1
+#: templates/web/default/tokens/confirm_alert.html:3
+#: templates/web/emptyhomes/alert/index.html:1
+#: templates/web/emptyhomes/alert/index.html:3
+#: templates/web/fixmybarangay/alert/index.html:1
+#: templates/web/fixmybarangay/alert/index.html:3
+#: templates/web/fixmystreet/alert/updates.html:1
+msgid "Local RSS feeds and email alerts"
+msgstr "RSS feed locali ed avvertimenti via email"
+
+#: templates/web/default/alert/list.html:13
+#: templates/web/default/alert/list.html:14
+#: templates/web/default/alert/list.html:2
+#: templates/web/default/alert/list.html:3
+msgid "Local RSS feeds and email alerts for ‘%s’"
+msgstr "RSS feed locali ed avvertimenti via email per ‘%s’"
+
+#: templates/web/default/footer.html:13 templates/web/fiksgatami/footer.html:8
+#: templates/web/fiksgatami/nn/footer.html:8
+#: templates/web/fixmybarangay/footer.html:22
+#: templates/web/fixmystreet/footer.html:53
+msgid "Local alerts"
+msgstr "Segnalazioni locali"
+
+#: templates/web/default/index-steps.html:25
+msgid "Locate the problem on a map of the area"
+msgstr "Localizza il problema nella mappa della zona"
+
+#: templates/web/default/js/translation_strings.html:43
+msgid "MAP"
+msgstr ""
+
+#: perllib/FixMyStreet/Map/OSM.pm:44
+msgid "Map &copy; <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> and contributors, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA</a>"
+msgstr ""
+
+#: templates/web/default/admin/user-form.html:43
+msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
+msgstr ""
+
+#: templates/web/fixmystreet/contact/index.html:103
+msgid "Message"
+msgstr "Messaggio"
+
+#: templates/web/default/contact/index.html:92
+msgid "Message:"
+msgstr "Messaggio:"
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:440
+msgid "Missing jurisdiction_id"
+msgstr ""
+
+#: templates/web/zurich/admin/stats.html:34
+msgid "Moderated by division within one working day"
+msgstr ""
+
+#: templates/web/default/admin/stats.html:11
+msgid "Month"
+msgstr "Mese"
+
+#: templates/web/default/report/display.html:30
+msgid "More problems nearby"
+msgstr "Più problemi vicini"
+
+#: templates/web/default/admin/bodies.html:16
+#: templates/web/default/admin/body-form.html:18
+#: templates/web/default/admin/flagged.html:16
+#: templates/web/default/admin/flagged.html:37
+#: templates/web/default/admin/list_updates.html:7
+#: templates/web/default/admin/reports.html:13
+#: templates/web/default/admin/users.html:15
+#: templates/web/default/reports/index.html:15
+#: templates/web/emptyhomes/reports/index.html:9
+#: templates/web/fiksgatami/nn/reports/index.html:9
+#: templates/web/fiksgatami/reports/index.html:9
+#: templates/web/fixmybarangay/reports/index.html:15
+#: templates/web/fixmystreet/auth/general.html:56
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:120
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:187
+#: templates/web/fixmystreet/report/update-form.html:136
+#: templates/web/zurich/admin/body-form.html:4
+#: templates/web/zurich/auth/general.html:60
+#: templates/web/zurich/report/new/fill_in_details_form.html:100
+msgid "Name"
+msgstr "Nome"
+
+#: templates/web/default/admin/report_edit.html:66
+#: templates/web/default/admin/update_edit.html:32
+#: templates/web/default/admin/user-form.html:18
+#: templates/web/zurich/admin/report_edit-sdm.html:46
+#: templates/web/zurich/admin/report_edit.html:59
+#: templates/web/zurich/admin/stats.html:41
+msgid "Name:"
+msgstr "Nome:"
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:322
+msgid "Name: %s"
+msgstr "Nome: %s"
+
+#: templates/web/fiksgatami/footer.html:3
+#: templates/web/fiksgatami/nn/footer.html:3
+msgid "Navigation"
+msgstr "Navigazione"
+
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:188
+#: perllib/FixMyStreet/Geocode/OSM.pm:166
+msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
+msgstr "Il più vicino nome della strada al segno posizionato sulla mappa (automaticamente generato usando OpenStreetMap): %s%s"
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:142
+msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:421
+#: perllib/FixMyStreet/Cobrand/Default.pm:461
+msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:297
+msgid ""
+"Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
+"\n"
+msgstr ""
+
+#: templates/web/default/email_sent.html:3
+msgid "Nearly Done! Now check your email..."
+msgstr "Quasi fatto! Ora controlla la tua email..."
+
+#: templates/web/default/reports/index.html:16
+#: templates/web/fixmybarangay/reports/index.html:16
+msgid "New <br>problems"
+msgstr "Nuovi <br>problemi"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:264
+msgid "New body added"
+msgstr "Nuovo corpo aggiunto"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:376
+msgid "New category contact added"
+msgstr "Nuova categoria contatto aggiunta"
+
+#: templates/web/zurich/admin/report_edit-sdm.html:58
+#: templates/web/zurich/admin/report_edit.html:84
+msgid "New internal note:"
+msgstr ""
+
+#: db/alert_types.pl:18 db/alert_types.pl:22
+msgid "New local problems on FixMyStreet"
+msgstr "Nuovi problemi locali su FixMyStreet"
+
+#: db/alert_types_eha.pl:12
+msgid "New local reports on reportemptyhomes.com"
+msgstr ""
+
+#: templates/web/emptyhomes/reports/index.html:10
+#: templates/web/fiksgatami/nn/reports/index.html:10
+#: templates/web/fiksgatami/reports/index.html:10
+msgid "New problems"
+msgstr "Nuovi problemi"
+
+#: db/alert_types.pl:38
+msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet"
+msgstr "Nuovi problemi per {{COUNCIL}} dentro il quartiere {{WARD}} su FixMyStreet"
+
+#: db/alert_types.pl:26 db/alert_types.pl:30
+msgid "New problems near {{POSTCODE}} on FixMyStreet"
+msgstr "Nuovi problemi vicino {{POSTCODE}} su FixMyStreet"
+
+#: db/alert_types.pl:10
+msgid "New problems on FixMyStreet"
+msgstr "Nuovi problemi su FIxMyStreet"
+
+#: db/alert_types.pl:34
+msgid "New problems to {{COUNCIL}} on FixMyStreet"
+msgstr "Nuovi problemi a {{COUNCIL}} su FixMyStreet"
+
+#: db/alert_types.pl:42
+msgid "New problems within {{NAME}}'s boundary on FixMyStreet"
+msgstr "Nuovi problemi dentro i confini di {{NAME}} su FixMyStreet"
+
+#: templates/web/zurich/admin/index-sdm.html:4
+msgid "New reports"
+msgstr ""
+
+#: db/alert_types_eha.pl:23
+msgid "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com"
+msgstr "Nuova segnalazione per {{COUNCIL}} dentro il quartiere {{WARD}} su reportemptyhomes.com"
+
+#: db/alert_types_eha.pl:5
+msgid "New reports on reportemptyhomes.com"
+msgstr ""
+
+#: db/alert_types_eha.pl:16
+msgid "New reports on reportemptyhomes.com near {{POSTCODE}}"
+msgstr ""
+
+#: db/alert_types_eha.pl:19
+msgid "New reports to {{COUNCIL}} on reportemptyhomes.com"
+msgstr ""
+
+#: db/alert_types_eha.pl:27
+msgid "New reports within {{NAME}}'s boundary on reportemptyhomes.com"
+msgstr "Nuove segnalazioni dentro i confini di {{NAME}} su reportemptyhomes.com"
+
+#: templates/web/default/admin/questionnaire.html:24
+msgid "New state"
+msgstr "Nuovo stato"
+
+#: templates/web/zurich/admin/report_edit-sdm.html:61
+msgid "New update:"
+msgstr "Nuovo aggiornamento:"
+
+#: templates/web/fiksgatami/front/news.html:9
+#: templates/web/fiksgatami/nn/front/news.html:9
+#: templates/web/fixmystreet/front/news.html:8
+msgid "New!"
+msgstr "Nuovo!"
+
+#: templates/web/default/pagination.html:13
+msgid "Next"
+msgstr "Prossimo"
+
+#: templates/web/default/admin/body.html:68
+#: templates/web/default/admin/body.html:69
+#: templates/web/default/admin/body.html:70
+#: templates/web/default/admin/body_edit.html:4
+#: templates/web/default/admin/list_updates.html:32
+#: templates/web/default/admin/list_updates.html:34
+#: templates/web/default/admin/list_updates.html:35
+#: templates/web/default/admin/problem_row.html:20
+#: templates/web/default/admin/report_edit.html:64
+#: templates/web/default/admin/report_edit.html:77
+#: templates/web/default/admin/update_edit.html:25
+#: templates/web/default/questionnaire/creator_fixed.html:16
+#: templates/web/default/questionnaire/index.html:111
+#: templates/web/default/questionnaire/index.html:68
+#: templates/web/fixmystreet/questionnaire/index.html:101
+#: templates/web/fixmystreet/questionnaire/index.html:62
+msgid "No"
+msgstr "No"
+
+#: templates/web/default/admin/user-form.html:33
+msgid "No body"
+msgstr "Nessun corpo"
+
+#: templates/web/default/admin/stats.html:85
+msgid "No council"
+msgstr "Nessuno comune"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:362
+msgid "No council selected"
+msgstr "Nessun comune selezionato"
+
+#: templates/web/default/admin/edit-league.html:17
+msgid "No edits have yet been made."
+msgstr "Nessuna modifica è stata fatta fino ad ora."
+
+#: templates/web/default/admin/flagged.html:25
+#, fuzzy
+msgid "No flagged problems found."
+msgstr "Nessun problema contrassegnato è stato trovato"
+
+#: templates/web/default/admin/flagged.html:58
+#, fuzzy
+msgid "No flagged users found."
+msgstr "Nessun utente contrassegnato è stato trovato"
+
+#: templates/web/zurich/admin/report_edit-sdm.html:68
+msgid "No further updates"
+msgstr ""
+
+#: templates/web/default/around/around_map_list_items.html:17
+#: templates/web/fixmystreet/around/around_map_list_items.html:8
+msgid "No problems found."
+msgstr "Nessun problema trovato."
+
+#: templates/web/default/around/on_map_list_items.html:14
+#: templates/web/fixmystreet/around/on_map_list_items.html:6
+msgid "No problems have been reported yet."
+msgstr "Nessun problema è stato ancora segnalato."
+
+#: templates/web/default/js/translation_strings.html:38
+msgid "No result returned"
+msgstr "Nessun risultato ritornato"
+
+#: templates/web/default/admin/body-form.html:60
+#: templates/web/default/admin/body-form.html:61
+msgid ""
+"No specific areas are currently available, because the <code>MAPIT_URL</code> in\n"
+" your config file is not pointing to a live MapIt service."
+msgstr ""
+
+#: templates/web/default/report/_support.html:3
+#: templates/web/default/report/_support.html:4
+msgid "No supporters"
+msgstr "Nessun sostenitore"
+
+#: templates/web/default/admin/body.html:73
+msgid "Non Public"
+msgstr "No Pubblico"
+
+#: templates/web/default/admin/report_edit.html:30
+#: templates/web/zurich/admin/report_edit-sdm.html:49
+#: templates/web/zurich/admin/report_edit.html:63
+msgid "None"
+msgstr "Nessuno"
+
+#: templates/web/default/admin/user-form.html:24
+#: templates/web/default/admin/user-form.html:25
+msgid ""
+"Normal (public) users should not be associated with any <strong>body</strong>.<br>\n"
+" Authorised staff users can be associated with the body they represent.<br>\n"
+" Depending on the implementation, staff users may have access to the dashboard (summary of\n"
+" activity across their body), the ability to hide reports or set special report statuses."
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:46
+#: templates/web/default/report/update-form.html:30
+#: templates/web/default/report/update-form.html:33
+#: templates/web/fixmystreet/report/update-form.html:28
+#: templates/web/fixmystreet/report/update-form.html:31
+msgid "Not Responsible"
+msgstr "Non responsabile"
+
+#: templates/web/zurich/admin/report_edit-sdm.html:21
+msgid "Not for my subdivision"
+msgstr ""
+
+#: templates/web/default/admin/questionnaire.html:6
+msgid "Not reported before"
+msgstr "Non segnalato precedente"
+
+#: templates/web/default/report/_main.html:10
+msgid "Not reported to council"
+msgstr "Non segnalato al comune"
+
+#: templates/web/default/admin/body.html:59
+#: templates/web/default/admin/body_edit.html:87
+#: templates/web/zurich/admin/body.html:16
+msgid "Note"
+msgstr "Nota"
+
+#: templates/web/default/admin/stats.html:51
+msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little"
+msgstr "Tieni presente che per includere delle segnalazioni non confermate, usiamo la data della creazione della segnalazione, la quale potrebbe non essere nello stesso mese in cui la segnalazione stessa è stata poi confermata, quindi i numeri potrebbero saltare un po."
+
+#: templates/web/default/admin/body.html:157
+#: templates/web/default/admin/body_edit.html:44
+#: templates/web/zurich/admin/body.html:47
+msgid "Note:"
+msgstr "Nota:"
+
+#: templates/web/default/open311/index.html:75
+msgid "Note: <strong>%s</strong>"
+msgstr "Nota: <strong>%s</strong>"
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:154
+msgid "Now to submit your report&hellip;"
+msgstr "Ora per inserire la tua segnalazione&hellip;"
+
+#: templates/web/default/report/new/fill_in_details_form.html:131
+msgid "Now to submit your report&hellip; do you have a FixMyStreet password?"
+msgstr "Ora per inserire la tua segnalazione&hellip; Hai già la password per FixMyStreet?"
+
+#: templates/web/fixmystreet/report/update-form.html:83
+msgid "Now to submit your update&hellip;"
+msgstr "Ora per inserire il tuo aggiornamento&hellip;"
+
+#: templates/web/default/report/update-form.html:86
+msgid "Now to submit your update&hellip; do you have a FixMyStreet password?"
+msgstr "Ora per inserire il tuo aggiornamento&hellip; Hai già la password per FixMyStreet?"
+
+#: templates/web/default/js/translation_strings.html:42
+msgid "OK"
+msgstr "OK"
+
+#: templates/web/default/report/display.html:24
+#: templates/web/default/report/update.html:16
+msgid "Offensive? Unsuitable? Tell us"
+msgstr "Offensivo? Non adatto? Contattaci"
+
+#: templates/web/default/reports/index.html:18
+#: templates/web/fixmybarangay/reports/index.html:18
+msgid "Old / unknown <br>problems"
+msgstr "Vecchi / sconosciuti <br>problemi"
+
+#: templates/web/fiksgatami/nn/reports/index.html:12
+#: templates/web/fiksgatami/reports/index.html:12
+msgid "Old problems,<br>state unknown"
+msgstr "Vecchi problemi, <br> stato sconosciuto"
+
+#: templates/web/default/admin/questionnaire.html:24
+msgid "Old state"
+msgstr "Vecchio stato"
+
+#: templates/web/default/reports/index.html:20
+#: templates/web/fixmybarangay/reports/index.html:20
+msgid "Older <br>fixed"
+msgstr "Più vecchi <br> risolti"
+
+#: templates/web/default/reports/index.html:17
+#: templates/web/fixmybarangay/reports/index.html:17
+msgid "Older <br>problems"
+msgstr "Vecchi <br>problemi"
+
+#: templates/web/fiksgatami/nn/reports/index.html:14
+#: templates/web/fiksgatami/reports/index.html:14
+msgid "Older fixed"
+msgstr "Più vecchi risolti"
+
+#: templates/web/emptyhomes/reports/index.html:11
+#: templates/web/fiksgatami/nn/reports/index.html:11
+#: templates/web/fiksgatami/reports/index.html:11
+msgid "Older problems"
+msgstr "Vecchi problemi"
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:137
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:36
+#: templates/web/default/admin/report_edit.html:37
+#: templates/web/default/admin/update_edit.html:28
+#: templates/web/default/dashboard/index.html:142
+#: templates/web/default/report/update-form.html:30
+#: templates/web/fixmystreet/report/update-form.html:28
+#: templates/web/zurich/admin/header.html:2
+#: templates/web/zurich/admin/header.html:7
+#: templates/web/zurich/admin/report_edit.html:89
+#: templates/web/zurich/admin/report_edit.html:91
+#: templates/web/zurich/admin/update_edit.html:18
+#: templates/web/zurich/report/banner.html:11
+msgid "Open"
+msgstr "Aperto"
+
+#: templates/web/default/my/my.html:27 templates/web/fixmystreet/my/my.html:33
+msgid "Open reports"
+msgstr "Segnalazione aperta"
+
+#: templates/web/default/open311/index.html:72
+msgid "Open311 API for the mySociety FixMyStreet server"
+msgstr ""
+
+#: templates/web/default/open311/index.html:82
+msgid "Open311 initiative web page"
+msgstr ""
+
+#: templates/web/default/open311/index.html:83
+msgid "Open311 specification"
+msgstr ""
+
+#: templates/web/default/alert/_list.html:58
+#: templates/web/fixmystreet/alert/_list.html:60
+msgid "Or problems reported to:"
+msgstr ""
+
+#: templates/web/default/alert/_list.html:33
+#: templates/web/fixmystreet/alert/_list.html:36
+msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
+msgstr "O puoi iscriverti agli avvisi basati sul tuo quartiere o comune di appartenenza:"
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1057
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:662
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:663
+#: perllib/FixMyStreet/DB/Result/Problem.pm:546
+#: perllib/FixMyStreet/DB/Result/Problem.pm:556
+#: perllib/FixMyStreet/DB/Result/Problem.pm:566
+#: perllib/FixMyStreet/DB/Result/Problem.pm:578
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:369
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:384
+msgid "Other"
+msgstr "Altro"
+
+#: templates/web/default/footer.html:27
+msgid "Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>."
+msgstr "Il nostro codice è open source e <a href=\"http://github.com/mysociety/fixmystreet\">disponibile su GitHub</a>"
+
+#: templates/web/default/admin/list_updates.html:8
+msgid "Owner"
+msgstr "Proprietario"
+
+#: templates/web/default/errors/page_error_404_not_found.html:1
+#: templates/web/default/errors/page_error_404_not_found.html:3
+msgid "Page Not Found"
+msgstr "Pagina non trovata"
+
+#: templates/web/default/admin/body-form.html:31
+#: templates/web/zurich/admin/body-form.html:14
+msgid "Parent"
+msgstr "Parente"
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:51
+msgid "Partial"
+msgstr "Parziale"
+
+#: templates/web/fixmystreet/auth/general.html:59
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:208
+#: templates/web/fixmystreet/report/update-form.html:119
+#: templates/web/zurich/auth/general.html:32
+#: templates/web/zurich/auth/general.html:63
+msgid "Password (optional)"
+msgstr "Password (opzionale)"
+
+#: templates/web/default/auth/change_password.html:25
+msgid "Password:"
+msgstr "Password:"
+
+#: templates/web/default/js/translation_strings.html:45
+msgid "Permalink"
+msgstr ""
+
+#: templates/web/zurich/report/new/fill_in_details_form.html:106
+#, fuzzy
+msgid "Phone number"
+msgstr "Numero di telefono (opzionale)"
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:138
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:205
+msgid "Phone number (optional)"
+msgstr "Numero di telefono (opzionale)"
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:287
+#: templates/web/default/admin/report_edit.html:68
+#: templates/web/default/report/new/fill_in_details_form.html:215
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:138
+#: templates/web/zurich/admin/report_edit-sdm.html:49
+#: templates/web/zurich/admin/report_edit.html:63
+#: templates/web/zurich/admin/stats.html:39
+msgid "Phone:"
+msgstr "Telefono:"
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:92
+#: templates/web/fixmystreet/report/update-form.html:59
+#: templates/web/zurich/admin/index-dm.html:29
+#: templates/web/zurich/admin/index-sdm.html:24
+#: templates/web/zurich/admin/reports.html:16
+#: templates/web/zurich/admin/stats.html:37
+#: templates/web/zurich/report/new/fill_in_details_form.html:68
+msgid "Photo"
+msgstr "Foto"
+
+#: templates/web/default/questionnaire/index.html:99
+#: templates/web/default/report/new/fill_in_details_form.html:102
+#: templates/web/default/report/update-form.html:62
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:99
+#: templates/web/fixmystreet/questionnaire/index.html:90
+msgid "Photo:"
+msgstr "Foto:"
+
+#: templates/web/default/alert/list.html:26
+msgid "Photos of recent nearby reports"
+msgstr "Foto delle piu vicine e recenti segnalazioni"
+
+#: templates/web/default/js/translation_strings.html:30
+msgid "Place pin on map"
+msgstr "Inserisci il cursore sulla mappa"
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:38
+#: templates/web/default/dashboard/index.html:142
+#: templates/web/default/dashboard/index.html:143
+#: templates/web/zurich/admin/header.html:2
+#: templates/web/zurich/admin/header.html:9
+#: templates/web/zurich/admin/index-dm.html:9
+#: templates/web/zurich/admin/report_edit.html:89
+#: templates/web/zurich/admin/report_edit.html:92
+msgid "Planned"
+msgstr "Pianificato"
+
+#: templates/web/fixmystreet/questionnaire/index.html:44
+msgid "Please <a class=\"tab_link\" href=\"#report\">take a look</a> at the updates that have been left."
+msgstr "Per favore <a class=\"tab_link\" href=\"#report\">dai un'occhiata</a> agli aggiornamenti che sono stati lasciati."
+
+#: templates/web/default/report/new/notes.html:6
+#: templates/web/fixmystreet/report/new/notes.html:6
+msgid "Please be polite, concise and to the point."
+msgstr "Per favore cerca di essere educato, conciso e dritto al punto."
+
+#: templates/web/default/auth/change_password.html:12
+#: templates/web/default/auth/change_password.html:17
+msgid "Please check the passwords and try again"
+msgstr "Per favore controlla la password e prova ancora"
+
+#: templates/web/default/auth/token.html:14
+msgid "Please check your email"
+msgstr "Per favore controlla la tua email"
+
+#: templates/web/default/auth/general.html:14
+#: templates/web/default/auth/general.html:8
+#: templates/web/fixmystreet/auth/general.html:15
+#: templates/web/fixmystreet/auth/general.html:9
+#: templates/web/zurich/auth/general.html:3
+#: templates/web/zurich/auth/general.html:9
+msgid "Please check your email address is correct"
+msgstr "Per favore controlla che il tuo indirizzo email è corretto"
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:859
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:878
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:921
+#: perllib/FixMyStreet/DB/Result/Problem.pm:381
+#: templates/web/default/js/translation_strings.html:9
+msgid "Please choose a category"
+msgstr "Per favore scegli una categoria"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:387
+msgid "Please choose a property type"
+msgstr "Per favore scegli un tipo di proprietà"
+
+#: templates/web/default/contact/blurb.html:2
+#: templates/web/fixmystreet/contact/blurb.html:12
+msgid ""
+"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 ""
+"Per favore <strong>non</strong> segnalare i problemi attraverso questo form; i messaggi inseriti qui arrivano⏎\n"
+"al team che gestisce FixMyStreet, non ai comuni. Per riportare un problema,⏎\n"
+"per favore <a href=\"/\">vai nella pagina principale</a> e segui le istruzioni."
+
+#: templates/web/default/report/new/notes.html:7
+#: templates/web/fixmystreet/report/new/notes.html:7
+msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the service for all users."
+msgstr "Per favore non abusarne&nbsp;&mdash; abusandone il comune svaluterà il servizio per tutti gli utenti."
+
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:46
+msgid "Please do not give address or personal information in this section."
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Comment.pm:126
+#: templates/web/default/js/translation_strings.html:2
+msgid "Please enter a message"
+msgstr "Per favore inserisci un messaggio"
+
+#: templates/web/default/auth/change_password.html:12
+#: templates/web/default/auth/change_password.html:15
+#: templates/web/default/js/translation_strings.html:19
+msgid "Please enter a password"
+msgstr "Per favore inserisci la password"
+
+#: perllib/FixMyStreet/App/Controller/Contact.pm:97
+#: perllib/FixMyStreet/DB/Result/Problem.pm:356
+#: templates/web/default/js/translation_strings.html:3
+msgid "Please enter a subject"
+msgstr "Per favore inserisci il soggetto"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1041
+#: perllib/FixMyStreet/App/Controller/Admin.pm:988
+#: perllib/FixMyStreet/DB/Result/User.pm:115
+#: templates/web/default/js/translation_strings.html:12
+#: templates/web/default/js/translation_strings.html:16
+msgid "Please enter a valid email"
+msgstr "Per favore inserire un email valida"
+
+#: perllib/FixMyStreet/App/Controller/Alert.pm:346
+#: perllib/FixMyStreet/App/Controller/Contact.pm:107
+msgid "Please enter a valid email address"
+msgstr "Per favore inserire un indirizzo email valido"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:359
+#: templates/web/default/js/translation_strings.html:4
+msgid "Please enter some details"
+msgstr "Per favore inserire qualche dettaglio "
+
+#: perllib/FixMyStreet/App/Controller/Contact.pm:96
+#: perllib/FixMyStreet/DB/Result/User.pm:112
+#: templates/web/default/auth/general.html:13
+#: templates/web/default/auth/general.html:8
+#: templates/web/default/js/translation_strings.html:11
+#: templates/web/default/js/translation_strings.html:15
+#: templates/web/fixmystreet/auth/general.html:14
+#: templates/web/fixmystreet/auth/general.html:9
+#: templates/web/zurich/auth/general.html:3
+#: templates/web/zurich/auth/general.html:8
+msgid "Please enter your email"
+msgstr "Per favore inserisci la tua email"
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:151
+#: templates/web/zurich/report/new/fill_in_details_form.html:92
+msgid "Please enter your email address"
+msgstr "Per favore inserisci il tuo indirizzo email"
+
+#: templates/web/default/js/translation_strings.html:25
+msgid "Please enter your first name"
+msgstr "Per favore inserisci il tuo nome"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:374
+#: templates/web/default/js/translation_strings.html:7
+msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
+msgstr "Per favore inserisci il tuo nome completo, i comuni hanno bisogno di questa informazione - Se non vuoi che il tuo nome venga mostrato sul sito, deseleziona il box qui sotto"
+
+#: perllib/FixMyStreet/App/Controller/Contact.pm:95
+#: perllib/FixMyStreet/DB/Result/Comment.pm:123
+#: perllib/FixMyStreet/DB/Result/Problem.pm:367
+#: perllib/FixMyStreet/DB/Result/User.pm:108
+#: templates/web/default/js/translation_strings.html:6
+msgid "Please enter your name"
+msgstr "Per favore inserisci il tuo nome"
+
+#: templates/web/default/js/translation_strings.html:22
+#, fuzzy
+msgid "Please enter your phone number"
+msgstr "Per favore inserisci il tuo cognome"
+
+#: templates/web/default/js/translation_strings.html:26
+msgid "Please enter your second name"
+msgstr "Per favore inserisci il tuo cognome"
+
+#: templates/web/default/js/translation_strings.html:24
+msgid "Please enter your title"
+msgstr "Per favore inserisci il tuo titolo"
+
+#: templates/web/default/auth/sign_out.html:5
+#: templates/web/zurich/auth/sign_out.html:5
+msgid "Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a href=\"/\">front page</a>."
+msgstr "Per favore <a href=\"%s\">entra di nuovo</a>, o torna indietro nella <a href=\"/\">pagina principale</a>."
+
+#: templates/web/emptyhomes/report/new/fill_in_details_text.html:1
+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"
+"to read, as does a lack of punctuation."
+msgstr ""
+
+#: templates/web/default/report/new/fill_in_details_text.html:11
+#: templates/web/default/report/new/fill_in_details_text.html:2
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:10
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:2
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:2
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:8
+msgid "Please fill in details of the problem below."
+msgstr "Si prega di compilare i dettagli del problema qui di seguito."
+
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:2
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:3
+msgid ""
+"Please fill in details of the problem below. Leave as much detail as you can, \n"
+"and if possible describe the exact location of\n"
+"the problem (e.g. if there is a streetlight number or road name)."
+msgstr ""
+"Per favore inserisci i dettagli del problema qui sotto. Elenca più dettagli possibili,⏎\n"
+"e se possibile descrivi anche l'esatta posizione del⏎\n"
+"problema (es. il numero della via o il nome della strada)."
+
+#: templates/web/default/report/new/fill_in_details_text.html:2
+#: templates/web/default/report/new/fill_in_details_text.html:3
+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 ""
+"Per favore inserisci i dettagli del problema qui sotto. Il comune non sarà in grado⏎\n"
+"di aiutare se non lasci più dettagli possibili, quindi per favore descrivi l'esatta posizione⏎\n"
+"del problema (es nel muro), che cosa è, da quanto tempo è li, una descrizione (e una⏎\n"
+"foto del problema se ne hai una), etc."
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:70
+#: templates/web/zurich/report/new/fill_in_details_form.html:46
+msgid "Please fill in details of the problem."
+msgstr "SI prega di inserire i dettagli del problema"
+
+#: templates/web/default/report/new/fill_in_details_form.html:27
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:26
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:35
+#: templates/web/zurich/report/new/fill_in_details_form.html:20
+msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box."
+msgstr "Si prega di compilare il modulo sottostante con i dettagli del problema, e descrivere la posizione nel modo più preciso possibile, nella casella dettagli."
+
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
+msgid "Please indicate whether you'd like to receive another questionnaire"
+msgstr "Per favore indicare se si vuole ricevere un altro questionario"
+
+#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4
+msgid "Please note that updates are not sent to the council."
+msgstr "Gli aggiornamenti non verranno inviati al comune."
+
+#: templates/web/default/report/update-form.html:7
+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 "Gli aggiornamenti non vengono inviati al comune. Se lasci il tuo nome questo sarà pubblico. Le tue informazioni non verranno usate in accordo con la nostra <a href=\"/faq#privacy\">politica sulla privacy</a>"
+
+#: templates/web/default/report/new/fill_in_details_form.html:5
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:5
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:26
+#: templates/web/zurich/report/new/fill_in_details_form.html:11
+msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit."
+msgstr "La tua segnalazione <strong>non è stata inviata</strong>. Scegli una categoria e aggiungi ulteriori informazioni qui di seguito e infine inviala."
+
+#: templates/web/default/report/new/notes.html:1
+#: templates/web/fixmybarangay/report/new/notes.html:1
+#: templates/web/fixmystreet/report/new/notes.html:1
+msgid "Please note:"
+msgstr "Attenzione:"
+
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:246
+msgid "Please provide some explanation as to why you're reopening this report"
+msgstr "Per favore provvedi ad alcune spiegazioni perché stai riaprendo questa segnalazione"
+
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253
+msgid "Please provide some text as well as a photo"
+msgstr "Per favore provvedi a del testo come ad una foto"
+
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239
+msgid "Please say whether you've ever reported a problem to your council before"
+msgstr "Per favore dicci se hai mai precedentemente riportato un problema al tuo comune "
+
+#: perllib/FixMyStreet/App/Controller/Alert.pm:80
+msgid "Please select the feed you want"
+msgstr "Si prega di selezionare il feed che si vuole"
+
+#: perllib/FixMyStreet/App/Controller/Alert.pm:118
+msgid "Please select the type of alert you want"
+msgstr "Per favore seleziona il tipo di avvertimento che desideri"
+
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235
+msgid "Please state whether or not the problem has been fixed"
+msgstr "Si prega di indicare se il problema è stato risolto"
+
+#: templates/web/default/questionnaire/index.html:50
+msgid "Please take a look at the updates that have been left."
+msgstr "Per favore dai un'occhiata agli aggiornamenti che sono stati aggiunti"
+
+#: perllib/FixMyStreet/App/Controller/Photo.pm:176
+msgid "Please upload a JPEG image only"
+msgstr "Per favore utilizza soltanto il formato JPG"
+
+#: perllib/FixMyStreet/App/Controller/Photo.pm:183
+msgid "Please upload a JPEG image only\n"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Contact.pm:98
+msgid "Please write a message"
+msgstr "Per favore scrivi un messaggio"
+
+#: templates/web/fixmystreet/report/update-form.html:23
+msgid "Please write your update here"
+msgstr "Per favore scrivi il tuo aggiornamento qui"
+
+#: templates/web/default/contact/index.html:95
+#: templates/web/default/report/update-form.html:109
+#: templates/web/default/report/update-form.html:131
+#: templates/web/default/report/update-form.html:72
+#: templates/web/fixmystreet/contact/index.html:110
+#: templates/web/fixmystreet/report/update-form.html:123
+#: templates/web/fixmystreet/report/update-form.html:71
+#: templates/web/fixmystreet/report/update-form.html:95
+msgid "Post"
+msgstr "Posta"
+
+#: templates/web/default/report/updates.html:15
+msgid "Posted anonymously at %s"
+msgstr "Postato anonimamente al %s"
+
+#: templates/web/default/report/updates.html:22
+msgid "Posted by %s (<strong>%s</strong>) at %s"
+msgstr "Postato da %s (<strong>%s</strong>) al %s"
+
+#: templates/web/default/report/updates.html:24
+msgid "Posted by %s at %s"
+msgstr "Postato da %s al %s"
+
+#: templates/web/default/pagination.html:7
+msgid "Previous"
+msgstr "Precedente"
+
+#: templates/web/default/admin/body.html:173
+#: templates/web/default/admin/body_edit.html:40
+#: templates/web/default/admin/report_edit.html:79
+msgid "Private"
+msgstr "Privato"
+
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:108
+msgid "Private information (not shown on site)"
+msgstr "Informazioni private (non mostrate nel sito)"
+
+#: templates/web/default/maps/openlayers.html:86
+msgid "Problem"
+msgstr "Problema"
+
+#: templates/web/default/admin/timeline.html:22
+msgid "Problem %d created"
+msgstr "Problema %d creato"
+
+#: templates/web/default/admin/timeline.html:24
+msgid "Problem %s confirmed"
+msgstr "Problema %s confermato"
+
+#: templates/web/default/admin/timeline.html:26
+msgid "Problem %s sent to council %s"
+msgstr "Problema %s inviato al comune %s"
+
+#: templates/web/default/admin/index.html:36
+#: templates/web/zurich/admin/index.html:9
+msgid "Problem breakdown by state"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:959
+msgid "Problem marked as open."
+msgstr "Problema marcato come aperto."
+
+#: templates/web/default/admin/questionnaire.html:21
+msgid "Problem state change based on survey results"
+msgstr "Il cambio di stato del problema è basato sui risultati del sondaggio"
+
+#: templates/web/default/admin/flagged.html:10
+msgid "Problems"
+msgstr "Problemi"
+
+#: templates/web/default/around/_updates.html:1
+msgid "Problems in this area"
+msgstr "Problemi in questa area"
+
+#: templates/web/fixmystreet/around/tabbed_lists.html:4
+#: templates/web/fixmystreet/report/display.html:46
+msgid "Problems nearby"
+msgstr "Problemi vicino"
+
+#: templates/web/fixmystreet/around/tabbed_lists.html:3
+#: templates/web/fixmystreet/report/display.html:44
+msgid "Problems on the map"
+msgstr "Problemi sulla mappa"
+
+#: db/alert_types.pl:14
+msgid "Problems recently reported fixed on FixMyStreet"
+msgstr "Problemi recentemente segnalati e risolti su FIxMyStreet"
+
+#: templates/web/default/alert/_list.html:19
+#: templates/web/fixmystreet/alert/_list.html:21
+msgid "Problems within %.1fkm of this location"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:629
+#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:109
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:184
+#: perllib/FixMyStreet/Cobrand/UK.pm:222
+msgid "Problems within %s"
+msgstr "Problemi dentro %s"
+
+#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117
+#: perllib/FixMyStreet/Cobrand/UK.pm:236
+msgid "Problems within %s ward"
+msgstr "Problemi dentro %s quartiere"
+
+#: templates/web/default/reports/body.html:0
+#: templates/web/default/reports/body.html:24
+msgid "Problems within %s, FixMyStreet"
+msgstr "Problemi dentro %s, FIxMyStreet"
+
+#: templates/web/default/alert/_list.html:40
+#: templates/web/fixmybarangay/alert/_list.html:13
+#: templates/web/fixmystreet/alert/_list.html:42
+msgid "Problems within the boundary of:"
+msgstr "Problemi dentro i confini di:"
+
+#: db/alert_types_eha.pl:8
+msgid "Properties recently reported as put back to use on reportemptyhomes.com"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:32
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:115
+msgid "Property address:"
+msgstr "L'indirizzo della proprietà:"
+
+#: templates/web/default/report/new/category.html:8
+msgid "Property type:"
+msgstr "Tipo di proprietà:"
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:64
+msgid "Provide a title"
+msgstr "Fornisci un titolo"
+
+#: templates/web/default/report/update-form.html:3
+#: templates/web/fixmystreet/report/update-form.html:4
+msgid "Provide an update"
+msgstr "Fornisci un'aggiornamento"
+
+#: templates/web/fixmystreet/auth/general.html:53
+msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
+msgstr ""
+
+#: templates/web/default/report/new/fill_in_details_form.html:173
+#: templates/web/default/report/update-form.html:128
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:202
+#: templates/web/fixmystreet/report/update-form.html:116
+msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
+msgstr "Scegliere una password è opzionale, ma farlo ti acconsentirà di riportare più facilmente le future segnalazioni, di aggiungere degli aggiornamenti e gestire le tue segnalazioni."
+
+#: templates/web/default/admin/body.html:60
+#: templates/web/default/admin/body.html:73
+msgid "Public"
+msgstr "Pubblico"
+
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:44
+msgid "Public information (shown on site)"
+msgstr "Informazione pubblica (mostrata nel sito)"
+
+#: templates/web/zurich/admin/report_edit.html:198
+#: templates/web/zurich/admin/report_edit.html:214
+msgid "Public response:"
+msgstr "Risposte pubbliche:"
+
+#: templates/web/zurich/admin/report_edit.html:80
+#: templates/web/zurich/admin/stats.html:38
+msgid "Publish photo"
+msgstr "Pubblica la foto"
+
+#: templates/web/zurich/admin/report_edit.html:222
+msgid "Publish the response"
+msgstr "Pubblica la risposta"
+
+#: templates/web/default/questionnaire/completed.html:2
+#: templates/web/default/questionnaire/index.html:0
+#: templates/web/default/questionnaire/index.html:14
+#: templates/web/default/questionnaire/index.html:4
+#: templates/web/fixmystreet/questionnaire/index.html:0
+#: templates/web/fixmystreet/questionnaire/index.html:14
+#: templates/web/fixmystreet/questionnaire/index.html:32
+#: templates/web/fixmystreet/questionnaire/index.html:4
+msgid "Questionnaire"
+msgstr "Questionario"
+
+#: templates/web/default/admin/timeline.html:30
+msgid "Questionnaire %d answered for problem %d, %s to %s"
+msgstr "Questionario %d e risposte per il problema %d, %s o %s"
+
+#: templates/web/default/admin/timeline.html:28
+msgid "Questionnaire %d sent for problem %d"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192
+msgid "Questionnaire filled in by problem reporter"
+msgstr ""
+
+#: templates/web/default/alert/_list.html:21
+#: templates/web/default/around/display_location.html:3
+#: templates/web/default/report/display.html:46
+#: templates/web/default/reports/_rss.html:1
+#: templates/web/fixmystreet/alert/_list.html:22
+#: templates/web/fixmystreet/alert/updates.html:9
+#: templates/web/fixmystreet/report/display.html:61
+msgid "RSS feed"
+msgstr "RSS feed"
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:265 perllib/FixMyStreet/Cobrand/UK.pm:277
+msgid "RSS feed for %s"
+msgstr "RSS feed per %s"
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+msgid "RSS feed for %s ward, %s"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:189
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:197
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:200
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:208
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:218
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:226
+#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303
+msgid "RSS feed of %s"
+msgstr "RSS feed di %s"
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:308
+msgid "RSS feed of %s, within %s ward"
+msgstr "RSS feed di %s, dentro al quartiere %s "
+
+#: templates/web/default/alert/_list.html:21
+#: templates/web/fixmystreet/alert/_list.html:22
+msgid "RSS feed of nearby problems"
+msgstr "RSS feed dei problemi vicino"
+
+#: templates/web/default/reports/_rss.html:1
+msgid "RSS feed of problems in this %s"
+msgstr "RSS feed per i problemi in questo %s"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:630
+#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:110
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:154
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:183
+#: perllib/FixMyStreet/Cobrand/UK.pm:229
+msgid "RSS feed of problems within %s"
+msgstr "RSS feed dei problemi dentro %s"
+
+#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:116
+#: perllib/FixMyStreet/Cobrand/UK.pm:235
+msgid "RSS feed of problems within %s ward"
+msgstr "RSS feed di problemi dentro al quartiere %s "
+
+#: templates/web/default/around/display_location.html:3
+#: templates/web/default/around/display_location.html:4
+msgid "RSS feed of recent local problems"
+msgstr "RSS feed dei recenti problemi locali"
+
+#: templates/web/default/report/display.html:46
+#: templates/web/fixmystreet/alert/updates.html:9
+#: templates/web/fixmystreet/report/display.html:61
+msgid "RSS feed of updates to this problem"
+msgstr "RSS feed degli aggiornamenti su questa segnalazione"
+
+#: templates/web/default/alert/updates.html:9
+#: templates/web/default/report/display.html:37
+#: templates/web/fixmystreet/alert/updates.html:14
+#: templates/web/fixmystreet/report/display.html:63
+msgid "Receive email when updates are left on this problem."
+msgstr "Ricevi un'email quando gli aggiornamenti sono aggiunti su questa segnalazione."
+
+#: templates/web/default/around/display_location.html:0
+#: templates/web/default/around/display_location.html:32
+msgid "Recent local problems, FixMyStreet"
+msgstr "Recenti problemi locali, FIxMyStreet"
+
+#: templates/web/default/reports/index.html:19
+#: templates/web/fixmybarangay/reports/index.html:19
+msgid "Recently <br>fixed"
+msgstr "Recentemente <br>risolti"
+
+#: templates/web/fiksgatami/nn/reports/index.html:13
+#: templates/web/fiksgatami/reports/index.html:13
+msgid "Recently fixed"
+msgstr "Recentemente risolti"
+
+#: templates/web/default/index.html:35 templates/web/emptyhomes/index.html:24
+#: templates/web/fixmystreet/index.html:49
+msgid "Recently reported problems"
+msgstr "Problemi segnalati di recente"
+
+#: templates/web/default/report/new/notes.html:9
+#: templates/web/fixmystreet/report/new/notes.html:10
+msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website."
+msgstr "Ricorda che FIxMyStreet serve per segnalare problemi materiali che possono essere risolti. Se il tuo non è un problema appropriato, da segnalare attraverso questo sito, ti ricordiamo che puoi sempre contattare tu direttamente il comune attraverso il suo sito internet."
+
+#: templates/web/fixmybarangay/report/new/notes.html:9
+msgid "Remember that, for the pilot project, FixMyBarangay is only for reporting potholes and streetlights in bgy. Luz or Basak San Nicolas."
+msgstr ""
+
+#: templates/web/default/admin/report_blocks.html:16
+msgid "Remove flag"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:94
+#: templates/web/default/admin/update_edit.html:62
+#: templates/web/zurich/admin/update_edit.html:35
+msgid "Remove photo (can't be undone!)"
+msgstr ""
+
+#: templates/web/emptyhomes/header.html:12
+msgid "Report Empty Homes"
+msgstr ""
+
+#: templates/web/default/footer.html:7 templates/web/emptyhomes/header.html:31
+#: templates/web/fiksgatami/footer.html:5
+#: templates/web/fiksgatami/nn/footer.html:5
+#: templates/web/fixmystreet/footer.html:47
+#: templates/web/zurich/footer.html:17
+#: templates/web/zurich/nav_over_content.html:4
+msgid "Report a problem"
+msgstr "Segnala un problema"
+
+#: templates/web/fixmystreet/report/display.html:35
+msgid "Report abuse"
+msgstr ""
+
+#: templates/web/default/report_created.html:1
+#: templates/web/default/report_created.html:3
+msgid "Report created"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Rss.pm:295
+msgid "Report on %s"
+msgstr ""
+
+#: templates/web/default/index.html:14 templates/web/emptyhomes/index.html:5
+#: templates/web/fixmystreet/around/intro.html:1
+#: templates/web/zurich/around/intro.html:1
+msgid "Report, view, or discuss local problems"
+msgstr "Segnala, conosci e discuti sui problemi della tua città "
+
+#: templates/web/default/my/my.html:79
+msgid "Reported %s"
+msgstr "Riportati %s"
+
+#: templates/web/default/my/my.html:77
+msgid "Reported %s, to %s"
+msgstr "Riportati %s, a %s"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:561
+#: templates/web/default/contact/index.html:45
+#: templates/web/fixmystreet/contact/index.html:62
+msgid "Reported anonymously at %s"
+msgstr "Riportati anonimamente al %s"
+
+#: templates/web/default/admin/questionnaire.html:5
+#: templates/web/default/questionnaire/index.html:77
+#: templates/web/fixmystreet/questionnaire/index.html:71
+msgid "Reported before"
+msgstr "Segnalati prima"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:584
+#: templates/web/default/contact/index.html:47
+#: templates/web/fixmystreet/contact/index.html:64
+msgid "Reported by %s at %s"
+msgstr "Segnalato da %s al %s"
+
+#: templates/web/zurich/report/_main.html:2
+msgid "Reported in the %s category"
+msgstr "Riportato nella categoria %s"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:557
+msgid "Reported in the %s category anonymously at %s"
+msgstr "Riportato nella categoria %s anonimamente alle %s"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:579
+msgid "Reported in the %s category by %s at %s"
+msgstr "Riportato nella categoria %s da %s alle %s"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:553
+#, fuzzy
+msgid "Reported via %s anonymously at %s"
+msgstr "Segnalati da %s anonimamente al %s"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:575
+#, fuzzy
+msgid "Reported via %s by %s at %s"
+msgstr "Segnalato da %s al %s"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:549
+#, fuzzy
+msgid "Reported via %s in the %s category anonymously at %s"
+msgstr "Riportato da %s nella categoria %s anonimo alle %s"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:569
+#, fuzzy
+msgid "Reported via %s in the %s category by %s at %s"
+msgstr "Riportato da %s nella categoria %s da %s alle %s"
+
+#: templates/web/default/around/around_index.html:1
+#: templates/web/default/js/translation_strings.html:41
+#: templates/web/default/report/new/fill_in_details.html:0
+#: templates/web/default/report/new/fill_in_details.html:3
+#: templates/web/default/report/new/fill_in_details_form.html:1
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:1
+#: templates/web/fixmystreet/around/around_index.html:2
+#: templates/web/fixmystreet/report/new/fill_in_details.html:0
+#: templates/web/fixmystreet/report/new/fill_in_details.html:5
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2
+#: templates/web/zurich/report/new/fill_in_details_form.html:2
+msgid "Reporting a problem"
+msgstr "Stai segnalando un problema"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1186
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:290
+#: templates/web/zurich/header.html:60
+msgid "Reports"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
+#: perllib/FixMyStreet/DB/Result/Problem.pm:399
+#, fuzzy
+msgid "Reports are limited to %s characters in length. Please shorten your report"
+msgstr "Le segnalazioni sono limitate a 2000 caratteri di lunghezza. Per favore accorcia la tua segnalazione"
+
+#: templates/web/zurich/admin/index-sdm.html:7
+msgid "Reports awaiting approval"
+msgstr "Segnalazioni in attesa di approvazione"
+
+#: templates/web/default/around/tabbed_lists.html:3
+msgid "Reports on and around the map"
+msgstr "Segnalazioni sulla e intorno alla mappa"
+
+#: templates/web/zurich/admin/index-sdm.html:10
+msgid "Reports published"
+msgstr "Segnalazioni pubblicate"
+
+#: templates/web/default/admin/report_edit.html:71
+msgid "Resend report"
+msgstr "Rinvia la segnalazione"
+
+#: templates/web/default/js/translation_strings.html:28
+msgid "Right place?"
+msgstr "E' il posto giusto?"
+
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:195
+#: perllib/FixMyStreet/Geocode/OSM.pm:173
+msgid "Road operator for this named road (derived from road reference number and type): %s"
+msgstr ""
+
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:192
+#: perllib/FixMyStreet/Geocode/OSM.pm:170
+msgid "Road operator for this named road (from OpenStreetMap): %s"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1386
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1397
+#: templates/web/default/admin/report_edit.html:90
+#: templates/web/zurich/admin/report_edit.html:76
+msgid "Rotate Left"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1386
+#: templates/web/default/admin/report_edit.html:91
+#: templates/web/zurich/admin/report_edit.html:77
+msgid "Rotate Right"
+msgstr ""
+
+#: templates/web/default/admin/body_edit.html:76
+msgid "Save changes"
+msgstr ""
+
+#: templates/web/default/admin/reports.html:1
+#: templates/web/zurich/admin/reports.html:1
+msgid "Search Reports"
+msgstr ""
+
+#: templates/web/default/admin/users.html:1
+msgid "Search Users"
+msgstr ""
+
+#: templates/web/zurich/header.html:77
+msgid "Search reports"
+msgstr ""
+
+#: templates/web/default/admin/reports.html:5
+#: templates/web/default/admin/users.html:8
+#: templates/web/zurich/admin/reports.html:5
+msgid "Search:"
+msgstr ""
+
+#: templates/web/default/admin/reports.html:26
+msgid "Searching found no reports."
+msgstr ""
+
+#: templates/web/default/admin/users.html:39
+msgid "Searching found no users."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:33
+#: templates/web/zurich/admin/body-form.html:16
+msgid "Select a body"
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:71
+#: templates/web/zurich/admin/body-form.html:26
+msgid "Select an area"
+msgstr ""
+
+#: templates/web/default/alert/_list.html:8
+#: templates/web/fixmystreet/alert/_list.html:10
+msgid "Select which type of alert you'd like and click the button for an RSS feed, or enter your email address to subscribe to an email alert."
+msgstr "Seleziona quale tipo di avvertimento vorresti e clicca sul bottone per gli RSS feed oppure inserisci il tuo indirizzo email per iscriverti agli avvertimenti via email."
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
+msgid "Sent to %s %s later"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:71
+msgid "Sent:"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:73
+#: templates/web/zurich/admin/stats.html:45
+msgid "Service:"
+msgstr ""
+
+#: templates/web/fixmystreet/report/display.html:41
+msgid "Share"
+msgstr ""
+
+#: templates/web/default/report/new/fill_in_details_form.html:210
+#: templates/web/default/report/update-form.html:157
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:129
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:197
+#: templates/web/fixmystreet/report/update-form.html:144
+msgid "Show my name publicly"
+msgstr "Mostra il mio nome pubblicamente"
+
+#: templates/web/default/around/display_location.html:69
+msgid "Show old"
+msgstr ""
+
+#: templates/web/default/around/display_location.html:60
+msgid "Show pins"
+msgstr ""
+
+#: templates/web/default/auth/general.html:3
+#: templates/web/default/auth/general.html:49
+#: templates/web/fixmybarangay/header.html:70
+#: templates/web/fixmystreet/auth/general.html:3
+#: templates/web/fixmystreet/auth/general.html:42
+#: templates/web/fixmystreet/auth/general.html:62
+#: templates/web/fixmystreet/header.html:57
+#: templates/web/zurich/auth/general.html:18
+#: templates/web/zurich/auth/general.html:35
+msgid "Sign in"
+msgstr "Entra"
+
+#: templates/web/default/auth/general.html:74
+msgid "Sign in by email"
+msgstr "Entra inserendo l'email"
+
+#: templates/web/default/auth/general.html:1
+#: templates/web/fixmystreet/auth/general.html:1
+#: templates/web/zurich/auth/general.html:1
+msgid "Sign in or create an account"
+msgstr "Entra o crea un nuovo account"
+
+#: templates/web/default/auth/sign_out.html:1
+#: templates/web/default/header.html:30
+#: templates/web/emptyhomes/header.html:46
+#: templates/web/fiksgatami/header.html:22
+#: templates/web/fiksgatami/nn/header.html:22
+#: templates/web/zurich/auth/sign_out.html:1
+msgid "Sign out"
+msgstr ""
+
+#: templates/web/default/header.html:29
+#: templates/web/emptyhomes/header.html:45
+#: templates/web/fiksgatami/header.html:21
+#: templates/web/fiksgatami/nn/header.html:21
+msgid "Signed in as %s"
+msgstr "Entra come %s"
+
+#: templates/web/default/report/new/fill_in_details_text.html:2
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:2
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:2
+msgid "Some categories may require additional information."
+msgstr "Qualche categoria potrebbe richiedere ulteriori informazioni."
+
+#: templates/web/default/admin/body-form.html:145
+#: templates/web/default/admin/body-form.html:146
+msgid ""
+"Some endpoints require an <strong>API key</strong> to indicate that the reports are being\n"
+" sent from your FixMyStreet installation."
+msgstr ""
+
+#: templates/web/default/alert/index.html:42
+#: templates/web/fixmybarangay/alert/index.html:32
+msgid "Some photos of recent reports"
+msgstr "Qualche foto di segnalazioni recenti"
+
+#: perllib/FixMyStreet/App/View/Email.pm:32
+#: perllib/FixMyStreet/App/View/Web.pm:44
+msgid "Some text to localize"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:93
+msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
+msgstr ""
+
+#: templates/web/default/tokens/abuse.html:5
+msgid "Sorry, there has been an error confirming your problem."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:215
+#: perllib/FixMyStreet/Geocode.pm:28 perllib/FixMyStreet/Geocode/Bing.pm:58
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:75
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:95
+#: perllib/FixMyStreet/Geocode/Google.pm:74
+#: perllib/FixMyStreet/Geocode/OSM.pm:66
+msgid "Sorry, we could not find that location."
+msgstr "Ci scusiamo, non possiamo trovare questa zona."
+
+#: perllib/FixMyStreet/Geocode/Bing.pm:53
+#: perllib/FixMyStreet/Geocode/Google.pm:69
+#: perllib/FixMyStreet/Geocode/Zurich.pm:88
+msgid "Sorry, we could not parse that location. Please try again."
+msgstr "Ci scusiamo, non possiamo analizzare questa zona. Per favore prova ancora."
+
+#: templates/web/fiksgatami/footer.html:16
+#: templates/web/fiksgatami/nn/footer.html:16
+msgid "Source code"
+msgstr "Codice sorgente"
+
+#: templates/web/default/admin/stats.html:64
+#, fuzzy
+msgid "Start Date:"
+msgstr "Giorno d'inizio:"
+
+#: templates/web/default/admin/flagged.html:18
+#: templates/web/default/admin/list_updates.html:11
+#: templates/web/default/admin/reports.html:15
+#: templates/web/fixmystreet/report/update-form.html:26
+msgid "State"
+msgstr "Stato"
+
+#: templates/web/default/admin/report_edit.html:34
+#: templates/web/default/admin/update_edit.html:27
+#: templates/web/default/report/update-form.html:28
+#: templates/web/zurich/admin/report_edit-sdm.html:56
+#: templates/web/zurich/admin/report_edit.html:87
+#: templates/web/zurich/admin/update_edit.html:17
+msgid "State:"
+msgstr "Stato:"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1191
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:305
+#: templates/web/default/admin/stats.html:1
+#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72
+msgid "Stats"
+msgstr "Stati"
+
+#: templates/web/zurich/admin/index-dm.html:23
+#: templates/web/zurich/admin/index-sdm.html:21
+#: templates/web/zurich/admin/reports.html:13
+msgid "Status"
+msgstr "Status"
+
+#: templates/web/default/report/updates.html:10
+msgid "Still open, via questionnaire, %s"
+msgstr "Ancora aperto, attraverso il questionario %s"
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378
+msgid "Subcategory: %s"
+msgstr "Sottocategoria: %s"
+
+#: templates/web/zurich/admin/index-dm.html:27
+msgid "Subdivision/Body"
+msgstr "Sottodivisione/Corpo"
+
+#: templates/web/fixmystreet/contact/index.html:95
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:60
+msgid "Subject"
+msgstr "Soggetto"
+
+#: templates/web/default/admin/report_edit.html:19
+#: templates/web/default/contact/index.html:83
+#: templates/web/default/report/new/fill_in_details_form.html:52
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:70
+#: templates/web/zurich/admin/report_edit.html:37
+msgid "Subject:"
+msgstr "Soggetto:"
+
+#: templates/web/default/questionnaire/creator_fixed.html:19
+#: templates/web/default/report/new/fill_in_details_form.html:114
+#: templates/web/default/report/new/fill_in_details_form.html:154
+#: templates/web/default/report/new/fill_in_details_form.html:176
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:144
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:142
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:167
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:212
+#: templates/web/zurich/report/new/fill_in_details_form.html:114
+msgid "Submit"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:97
+#: templates/web/default/admin/update_edit.html:65
+#: templates/web/default/admin/user-form.html:55
+#: templates/web/zurich/admin/report_edit-sdm.html:67
+#: templates/web/zurich/admin/report_edit.html:224
+#: templates/web/zurich/admin/update_edit.html:38
+msgid "Submit changes"
+msgstr ""
+
+#: templates/web/default/questionnaire/index.html:116
+#: templates/web/fixmystreet/questionnaire/index.html:105
+msgid "Submit questionnaire"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:133
+#: templates/web/zurich/admin/header.html:2
+#: templates/web/zurich/admin/header.html:6
+#: templates/web/zurich/admin/index-dm.html:23
+#: templates/web/zurich/admin/index-dm.html:6
+#: templates/web/zurich/admin/index-sdm.html:21
+#: templates/web/zurich/admin/report_edit.html:89
+#: templates/web/zurich/admin/report_edit.html:90
+#: templates/web/zurich/admin/reports.html:13
+#: templates/web/zurich/report/banner.html:9
+msgid "Submitted"
+msgstr ""
+
+#: templates/web/default/alert/updates.html:17
+#: templates/web/default/report/display.html:42
+#: templates/web/fixmystreet/alert/updates.html:23
+#: templates/web/fixmystreet/report/display.html:68
+msgid "Subscribe"
+msgstr ""
+
+#: templates/web/default/alert/_list.html:97
+#: templates/web/fixmybarangay/alert/_list.html:42
+#: templates/web/fixmystreet/alert/_list.html:92
+msgid "Subscribe me to an email alert"
+msgstr "Iscrivimi alle email di avviso"
+
+#: templates/web/fixmybarangay/alert/_list.html:6
+msgid "Subscribe to an alert based upon what baranagay you&rsquo;re in:"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1184
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:289
+#: templates/web/default/admin/index.html:1
+#: templates/web/zurich/admin/index-dm.html:1
+#: templates/web/zurich/admin/index-sdm.html:1
+#: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12
+#: templates/web/zurich/header.html:57
+msgid "Summary"
+msgstr ""
+
+#: templates/web/default/reports/index.html:1
+#: templates/web/emptyhomes/reports/index.html:1
+#: templates/web/fiksgatami/nn/reports/index.html:1
+#: templates/web/fiksgatami/reports/index.html:1
+#: templates/web/fixmybarangay/reports/index.html:1
+#: templates/web/zurich/reports/index.html:0
+#: templates/web/zurich/reports/index.html:4
+msgid "Summary reports"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1188
+msgid "Survey"
+msgstr ""
+
+#: templates/web/default/admin/questionnaire.html:1
+msgid "Survey Results"
+msgstr ""
+
+#: templates/web/default/admin/list_updates.html:12
+#: templates/web/zurich/admin/list_updates.html:10
+#: templates/web/zurich/admin/list_updates.html:31
+msgid "Text"
+msgstr ""
+
+#: templates/web/default/admin/body.html:18
+msgid "Text only version"
+msgstr ""
+
+#: templates/web/default/admin/update_edit.html:20
+#: templates/web/zurich/admin/update_edit.html:12
+msgid "Text:"
+msgstr ""
+
+#: templates/web/default/tokens/confirm_update.html:8
+msgid "Thank you &mdash; you can <a href=\"%s\">view your updated problem</a> on the site."
+msgstr ""
+
+#: templates/web/emptyhomes/tokens/confirm_problem.html:7
+#: templates/web/emptyhomes/tokens/confirm_problem.html:8
+msgid "Thank you for reporting an empty property on ReportEmptyHomes.com. We have emailed the lead officer for empty homes in the council responsible with details, and asked them to do whatever they can to get the empty property back into use as soon as possible."
+msgstr ""
+
+#: templates/web/emptyhomes/tokens/confirm_problem.html:31
+msgid ""
+"Thank you for reporting this empty property on ReportEmptyHomes.com.\n"
+"At present the report cannot be sent through to the council for this area. We\n"
+"are working with councils to link them into the system so that as many areas\n"
+"as possible will be covered."
+msgstr ""
+
+#: templates/web/default/tokens/error.html:7
+msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it."
+msgstr ""
+
+#: templates/web/emptyhomes/tokens/confirm_problem.html:25
+#: templates/web/emptyhomes/tokens/confirm_problem.html:26
+msgid "Thank you for using ReportEmptyHomes.com. Your action is already helping to resolve the UK&rsquo;s empty homes crisis."
+msgstr ""
+
+#: templates/web/fixmystreet/around/around_index.html:27
+msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above&nbsp;:"
+msgstr "Grazie per aver aggiunto la tua foto. Abbiamo adesso bisogno di localizzare il problema, quindi inserisci il nome della strada piu vicina o il codice postale nel box qui sopra&nbsp;:"
+
+#: templates/web/default/contact/submit.html:8
+msgid "Thanks for your feedback. We'll get back to you as soon as we can!"
+msgstr ""
+
+#: templates/web/default/questionnaire/creator_fixed.html:9
+msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?"
+msgstr "Grazie, è fantastico sapere che è stato risolto! Possiamo soltanto chiederti se avevi gia segnalato altri problemi al tuo comune precedentemente?"
+
+#: perllib/FixMyStreet/App/Controller/Photo.pm:190
+msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Council.pm:100
+msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
+msgstr "Questa posizione non sembra essere coperta da un comune; forse è in mare aperto o all'esterno del paese. Riprova."
+
+#: perllib/FixMyStreet/App/Controller/Location.pm:124
+msgid "That location does not appear to be in the UK; please try again."
+msgstr "Questa posizione non sembra essere nel Regno Unito, si prega di riprovare."
+
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:63
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:86
+msgid "That postcode was not recognised, sorry."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:704
+msgid "That problem will now be resent."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:117
+msgid "That report cannot be viewed on %s."
+msgstr "La segnalazione non può essere vista su %s."
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:111
+msgid "That report has been removed from FixMyStreet."
+msgstr ""
+
+#: templates/web/default/admin/body.html:115
+msgid ""
+"The <strong>email address</strong> is the destination to which reports about this category will be sent. \n"
+" Other categories for this body may have the same email address."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:119
+#: templates/web/default/admin/body-form.html:120
+msgid ""
+"The <strong>endpoint</strong> is the URL of the service that FixMyStreet will connect to \n"
+" when sending reports to this body."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:132
+#: templates/web/default/admin/body-form.html:133
+msgid ""
+"The <strong>jurisdiction</strong> is only needed if the endpoint is serving more\n"
+" than one. If the body is running its own endpoint, you can usually leave this blank."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:90
+#: templates/web/default/admin/body-form.html:91
+msgid ""
+"The <strong>send method</strong> determines how problem reports will be sent to the body.\n"
+" If you leave this blank, <strong>send method defaults to email</strong>."
+msgstr ""
+
+#: templates/web/default/open311/index.html:92
+msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:11
+#: templates/web/default/admin/body-form.html:12
+msgid ""
+"The body's <strong>name</strong> identifies the body (for example, <em>Borsetshire District Council</em>)\n"
+" and may be displayed publically."
+msgstr ""
+
+#: templates/web/default/auth/token.html:19
+#: templates/web/default/email_sent.html:6
+msgid "The confirmation email <strong>may</strong> take a few minutes to arrive &mdash; <em>please</em> be patient."
+msgstr ""
+
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:2
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:3
+msgid "The council won&rsquo;t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc."
+msgstr "Il comune non sarà in grado di fare qualcosa finchè non lascerai più dettagli possibili sul problema che stai segnalando. Per favore descrivi l'esatta location (es. nel muro), che cos'è, da quanto tempo c'è, una descrizione (e una foto del problema se ne hai una), ecc.."
+
+#: templates/web/fixmystreet/questionnaire/index.html:43
+msgid "The details of your problem are available from the other tab above."
+msgstr ""
+
+#: templates/web/default/questionnaire/index.html:49
+msgid "The details of your problem are available on the right hand side of this page."
+msgstr ""
+
+#: templates/web/default/admin/edit-league.html:3
+#: templates/web/default/admin/edit-league.html:4
+msgid "The diligency prize league table shows editors' activity (who's been editing the most records)."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60
+#: perllib/FixMyStreet/App/Controller/Reports.pm:72
+msgid "The error was: %s"
+msgstr ""
+
+#: templates/web/default/open311/index.html:88
+msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
+msgstr ""
+
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:187
+#: perllib/FixMyStreet/Geocode/OSM.pm:165
+msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
+msgstr ""
+
+#: db/alert_types.pl:19 db/alert_types.pl:23 db/alert_types.pl:27
+#: db/alert_types.pl:31
+msgid "The latest local problems reported by users"
+msgstr ""
+
+#: db/alert_types_eha.pl:13
+msgid "The latest local reports reported by users"
+msgstr ""
+
+#: db/alert_types.pl:35
+msgid "The latest problems for {{COUNCIL}} reported by users"
+msgstr ""
+
+#: db/alert_types.pl:39
+msgid "The latest problems for {{COUNCIL}} within {{WARD}} ward reported by users"
+msgstr "Gli ultimi problemi per {{COUNCIL}} dentro il quartiere {{WARD}} segnalati dagli utenti"
+
+#: db/alert_types.pl:11
+msgid "The latest problems reported by users"
+msgstr ""
+
+#: db/alert_types.pl:15
+msgid "The latest problems reported fixed by users"
+msgstr ""
+
+#: db/alert_types.pl:43
+msgid "The latest problems within {{NAME}}'s boundary reported by users"
+msgstr "Gli ultimi problemi dentro i confini di {{NAME}} segnalati dagli utenti"
+
+#: db/alert_types_eha.pl:9
+msgid "The latest properties reported back to use by users"
+msgstr ""
+
+#: db/alert_types_eha.pl:20
+msgid "The latest reports for {{COUNCIL}} reported by users"
+msgstr ""
+
+#: db/alert_types_eha.pl:24
+msgid "The latest reports for {{COUNCIL}} within {{WARD}} ward reported by users"
+msgstr "Le ultime segnalazioni per {{COUNCIL}} dentro i confini del quartiere {{WARD}} riportate dagli utenti"
+
+#: db/alert_types_eha.pl:28
+msgid "The latest reports within {{NAME}}'s boundary reported by users"
+msgstr "Le ultime segnalazioni dentro i confini di {{NAME}} riportate dagli utenti"
+
+#: templates/web/default/admin/body-form.html:58
+msgid "The list of available areas is being provided by the MapIt service at %s."
+msgstr ""
+
+#: templates/web/default/auth/change_password.html:12
+#: templates/web/default/auth/change_password.html:16
+msgid "The passwords do not match"
+msgstr ""
+
+#: templates/web/default/errors/page_error_404_not_found.html:11
+#: templates/web/default/errors/page_error_404_not_found.html:12
+msgid "The requested URL '%s' was not found on this server"
+msgstr ""
+
+#: templates/web/default/alert/_list.html:14
+#: templates/web/fixmystreet/alert/_list.html:16
+msgid "The simplest alert is our geographic one:"
+msgstr ""
+
+#: templates/web/default/report/new/councils_extra_text.html:1
+#: templates/web/default/report/new/councils_text_some.html:11
+#: templates/web/default/report/new/fill_in_details_form.html:17
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12
+msgid "The subject and details of the problem will be public, plus your name if you give us permission."
+msgstr "Il soggetto e i dettagli del problema saranno visibili a tutti, il tuo nome sarà pubblicato soltanto se ci darai il tuo permesso."
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:296
+msgid "The user could not locate the problem on a map, but to see the area around the location they entered"
+msgstr ""
+
+#: templates/web/default/admin/user-form.html:12
+#: templates/web/default/admin/user-form.html:13
+msgid ""
+"The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n"
+" Names are not necessarily unique."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Reports.pm:69
+msgid "There was a problem showing the All Reports page. Please try again later."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Contact.pm:121
+#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59
+msgid "There was a problem showing this page. Please try again later."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:755
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134
+#: templates/web/default/auth/general.html:23
+#: templates/web/fixmystreet/auth/general.html:24
+#: templates/web/zurich/auth/general.html:28
+msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the &lsquo;sign in by email&rsquo; section of the form."
+msgstr "E' accaduto un problema con la tua combinazione email/password. Se non ti ricordi la password, o non né hai ancora una, per favore riempi qui gli &lsquo; ed entra con l'email&rsquo, nella sezione del form"
+
+#: perllib/FixMyStreet/App/Controller/Alert.pm:355
+msgid "There was a problem with your email/password combination. Please try again."
+msgstr "E' accaduto un problema con la tua combinazione email/password. Per favore prova ancora."
+
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:272
+msgid "There was a problem with your update. Please try again."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Contact.pm:125
+msgid "There were problems with your report. Please see below."
+msgstr "Ci sono stati dei problemi con la tua segnalazione. Per favore guarda qui sotto."
+
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:299
+msgid "There were problems with your update. Please see below."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:108
+#: templates/web/default/admin/body-form.html:109
+msgid ""
+"These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.<br>\n"
+" <strong>You don't need to set them if the Send Method is email.</strong>.\n"
+" For more information on Open311, see \n"
+" <a href='http://www.mysociety.org/2013/01/17/open311-explained/' class='admin-offsite-link'>this article</a>.\n"
+" "
+msgstr ""
+
+#: templates/web/default/open311/index.html:79
+msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future."
+msgstr ""
+
+#: templates/web/default/admin/body.html:33
+msgid ""
+"This body covers no area. This means that it has no jurisdiction over problems reported <em>at any location</em>.\n"
+" Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n"
+" Currently, users <strong>cannot report problems to this body</strong>."
+msgstr ""
+
+#: templates/web/default/admin/body.html:43
+msgid "This body has no contacts. This means that currently problems reported to this body <strong>will not be sent</strong>."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:52
+#: templates/web/default/admin/body-form.html:53
+msgid ""
+"This body will only be sent reports for problems that are located in the <strong>area covered</strong>.\n"
+" A body will not receive any reports unless it covers at least one area."
+msgstr ""
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:385
+msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system."
+msgstr "Questa email è stata inviata ad entrambi i comuni che coprono la zona del problema, visto che l'utente non ha aggiunto una categoria; per favore ignorate l'email se non siete il comune corretto che deve gestire il problema, o fateci sapere qual'e la categoria di questo problema così da poterla aggiungere nel nostro sistema."
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:388
+msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:898
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:968
+#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:131
+#: perllib/FixMyStreet/Cobrand/UK.pm:58
+msgid "This information is required"
+msgstr ""
+
+#: templates/web/default/debug_header.html:3
+msgid "This is a developer site; things might break at any time, and the database will be periodically deleted."
+msgstr ""
+
+#: templates/web/fixmybarangay/reports/index.html:7
+msgid "This is a summary of all reports on this site; select a particular barangay to see the reports sent there."
+msgstr "Questo è un riassunto di tutte le segnalazioni su questo sito, selezionare un particolare barangay per vedere le segnalazioni inviate lì."
+
+#: templates/web/emptyhomes/reports/index.html:4
+msgid "This is a summary of all reports on this site; select a particular council to see the empty homes news for that area."
+msgstr ""
+
+#: templates/web/default/reports/index.html:7
+#: templates/web/fiksgatami/nn/reports/index.html:4
+#: templates/web/fiksgatami/reports/index.html:4
+msgid "This is a summary of all reports on this site; select a particular council to see the reports sent there."
+msgstr "Questo è un riassunto di tutte le segnalazioni su questo sito, selezionare un particolare comune per vedere le segnalazioni inviate lì."
+
+#: templates/web/default/auth/token.html:9
+msgid "This may be because the link is too old or already used, or the address was not copied correctly."
+msgstr ""
+
+#: templates/web/default/report/banner.html:15
+msgid "This problem has been closed"
+msgstr ""
+
+#: templates/web/default/report/banner.html:12
+#: templates/web/default/report/update-form.html:48
+#: templates/web/emptyhomes/report/banner.html:3
+#: templates/web/fixmystreet/report/update-form.html:46
+msgid "This problem has been fixed"
+msgstr "Questo problema è stato risolto"
+
+#: templates/web/default/report/update-form.html:43
+#: templates/web/fixmystreet/report/update-form.html:40
+msgid "This problem has not been fixed"
+msgstr "Questo problema non è stato risolto"
+
+#: templates/web/default/report/banner.html:19
+msgid "This problem is in progress"
+msgstr ""
+
+#: templates/web/default/report/banner.html:9
+msgid "This problem is old and of unknown status."
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:130
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:131
+#: templates/web/zurich/report/_main.html:14
+msgid "This report is awaiting moderation."
+msgstr ""
+
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88
+msgid "This report is currently marked as closed."
+msgstr ""
+
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86
+msgid "This report is currently marked as fixed."
+msgstr ""
+
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:90
+msgid "This report is currently marked as open."
+msgstr ""
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:320
+msgid "This report was submitted anonymously"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:289
+msgid "This web page also contains a photo of the problem, provided by the user."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1187
+#: templates/web/default/admin/timeline.html:1
+msgid "Timeline"
+msgstr ""
+
+#: templates/web/default/admin/flagged.html:15
+#: templates/web/default/admin/reports.html:12
+msgid "Title"
+msgstr ""
+
+#: templates/web/default/around/_report_banner.html:2
+msgid "To <strong>report a problem</strong>, click on the map at the correct location."
+msgstr "Per <strong>segnalare un problema</strong>, clicca sulla mappa nella corretta zona."
+
+#: templates/web/default/alert/index.html:27
+msgid "To find out what local alerts we have for you, please enter your postcode or street name and area"
+msgstr "Per sapere quali segnalazioni locali abbiamo per te, inserisci per favore il tuo codice postale o il nome della via e della zona"
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:295
+msgid "To view a map of the precise location of this issue"
+msgstr ""
+
+#: templates/web/default/admin/index.html:44
+#: templates/web/default/admin/questionnaire.html:24
+#: templates/web/default/admin/stats.html:24
+#: templates/web/default/admin/stats.html:43
+#: templates/web/zurich/admin/stats.html:30
+msgid "Total"
+msgstr ""
+
+#: templates/web/default/js/translation_strings.html:29
+msgid "Try again"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:46
+#: templates/web/default/report/update-form.html:30
+#: templates/web/default/report/update-form.html:33
+#: templates/web/fixmystreet/report/update-form.html:28
+#: templates/web/fixmystreet/report/update-form.html:31
+msgid "Unable to fix"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:51
+#: templates/web/default/admin/update_edit.html:28
+#: templates/web/zurich/admin/report_edit-sdm.html:48
+#: templates/web/zurich/admin/report_edit.html:61
+#: templates/web/zurich/admin/update_edit.html:18
+msgid "Unconfirmed"
+msgstr ""
+
+#: templates/web/fixmystreet/report/banner.html:9
+msgid "Unknown"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Rss.pm:173
+msgid "Unknown alert type"
+msgstr ""
+
+#: templates/web/default/js/translation_strings.html:39
+msgid "Unknown error"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:106
+msgid "Unknown problem ID"
+msgstr ""
+
+#: templates/web/fixmystreet/report/update-form.html:19
+msgid "Update"
+msgstr ""
+
+#: templates/web/default/admin/timeline.html:33
+msgid "Update %s created for problem %d; by %s"
+msgstr ""
+
+#: templates/web/default/contact/index.html:21
+#: templates/web/fixmystreet/contact/index.html:38
+msgid "Update below added anonymously at %s"
+msgstr ""
+
+#: templates/web/default/contact/index.html:23
+#: templates/web/fixmystreet/contact/index.html:40
+msgid "Update below added by %s at %s"
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:233
+#: templates/web/zurich/admin/body-form.html:51
+msgid "Update body"
+msgstr ""
+
+#: templates/web/default/admin/index.html:38
+msgid "Update breakdown by state"
+msgstr ""
+
+#: db/alert_types.pl:7
+msgid "Update by {{name}}"
+msgstr ""
+
+#: templates/web/default/admin/update_edit.html:42
+#: templates/web/zurich/admin/update_edit.html:25
+msgid "Update changed problem state to %s"
+msgstr ""
+
+#: templates/web/default/admin/update_edit.html:44
+msgid "Update marked problem as fixed"
+msgstr ""
+
+#: templates/web/default/admin/update_edit.html:46
+msgid "Update reopened problem"
+msgstr ""
+
+#: templates/web/default/admin/body.html:83
+msgid "Update statuses"
+msgstr ""
+
+#: templates/web/default/report/update-form.html:22
+msgid "Update:"
+msgstr ""
+
+#: templates/web/zurich/admin/index-dm.html:23
+#: templates/web/zurich/admin/index-sdm.html:21
+#: templates/web/zurich/admin/reports.html:13
+msgid "Updated"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1007
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1051
+#: perllib/FixMyStreet/App/Controller/Admin.pm:801
+#: perllib/FixMyStreet/App/Controller/Admin.pm:949
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:550
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:619
+msgid "Updated!"
+msgstr ""
+
+#: templates/web/default/admin/list_updates.html:2
+#: templates/web/default/report/update.html:3
+#: templates/web/fixmystreet/report/update.html:3
+#: templates/web/zurich/admin/list_updates.html:24
+#: templates/web/zurich/report/updates.html:2
+msgid "Updates"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+#, fuzzy
+msgid "Updates are limited to %s characters in length. Please shorten your update"
+msgstr "Le segnalazioni sono limitate a 2000 caratteri di lunghezza. Per favore accorcia la tua segnalazione"
+
+#: db/alert_types.pl:5 db/alert_types.pl:6
+msgid "Updates on {{title}}"
+msgstr ""
+
+#: templates/web/default/report/display.html:0
+#: templates/web/default/report/display.html:5
+#: templates/web/fixmystreet/report/display.html:0
+#: templates/web/fixmystreet/report/display.html:8
+msgid "Updates to this problem, FixMyStreet"
+msgstr ""
+
+#: templates/web/default/admin/body.html:153
+msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body."
+msgstr ""
+
+#: templates/web/zurich/admin/list_updates.html:30
+#: templates/web/zurich/admin/list_updates.html:9
+msgid "User"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1351
+msgid "User flag removed"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1323
+msgid "User flagged"
+msgstr ""
+
+#: templates/web/default/admin/users.html:5
+msgid "User search finds matches in users' names and email addresses."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1189
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:304
+#: templates/web/default/admin/flagged.html:29
+#: templates/web/zurich/header.html:69
+msgid "Users"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:371
+#: perllib/FixMyStreet/App/Controller/Admin.pm:401
+msgid "Values updated"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:18
+#: templates/web/default/admin/update_edit.html:18
+#: templates/web/zurich/admin/report_edit-sdm.html:24
+#: templates/web/zurich/admin/report_edit.html:23
+#: templates/web/zurich/admin/update_edit.html:10
+msgid "View report on site"
+msgstr ""
+
+#: templates/web/default/reports/body.html:14
+msgid "View reports by ward"
+msgstr ""
+
+#: templates/web/emptyhomes/tokens/confirm_problem.html:39
+msgid "View your report"
+msgstr ""
+
+#: templates/web/default/around/display_location.html:0
+#: templates/web/default/around/display_location.html:34
+msgid "Viewing a location"
+msgstr ""
+
+#: templates/web/default/report/display.html:0
+#: templates/web/fixmystreet/report/display.html:0
+msgid "Viewing a problem"
+msgstr ""
+
+#: templates/web/default/reports/body.html:16
+msgid "Wards of this council"
+msgstr ""
+
+#: templates/web/default/alert/choose.html:6
+#: templates/web/default/around/around_index.html:13
+#: templates/web/fixmystreet/around/around_index.html:16
+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 "Abbiamo trovato più di una corrispondenza per questa posizione. Mostriamo fino a dieci risultati, per favore prova una ricerca differente se quello che cercavi non è qui."
+
+#: templates/web/default/auth/token.html:8
+msgid "We have not been able to confirm your account - sorry."
+msgstr ""
+
+#: templates/web/default/auth/token.html:16
+msgid "We have sent you an email containing a link to confirm your account."
+msgstr ""
+
+#: templates/web/emptyhomes/tokens/confirm_problem.html:19
+#: templates/web/emptyhomes/tokens/confirm_problem.html:20
+msgid "We may contact you periodically to ask if anything has changed with the property you reported."
+msgstr "Potrebbe essere che ti contatteremo periodicamente per chiederti se qualcosa è cambiato nella proprietà che hai segnalato."
+
+#: templates/web/fixmystreet/report/update-form.html:115
+msgid "We never show your email"
+msgstr ""
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:134
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:201
+#: templates/web/zurich/report/new/fill_in_details_form.html:96
+msgid "We never show your email address or phone number."
+msgstr "Non mostriamo mai il tuo indirizzo email e numero di telefono."
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:394
+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 ""
+
+#: templates/web/default/index-steps.html:31
+msgid "We send it to the council on your behalf"
+msgstr "Lo invieremo noi al comune responsabile a tuo nome"
+
+#: templates/web/default/report/new/notes.html:5
+#: templates/web/fixmybarangay/report/new/notes.html:5
+msgid "We will only use your personal information in accordance with our <a href=\"/faq#privacy\">privacy policy.</a>"
+msgstr "Useremo le tue informazioni personali solo in accordo con la nostra <a href=\"/faq#privacy\">politica sulla privacy.</a>"
+
+#: templates/web/fixmystreet/report/new/notes.html:4
+msgid "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>"
+msgstr "Useremo le tue informazioni personali solo in accordo con la nostra <a href=\"/faq#privacy\">politica sulla privacy.</a>"
+
+#: templates/web/emptyhomes/contact/blurb.html:2
+msgid "We&rsquo;d love to hear what you think about this website. Just fill in the form. Please don&rsquo;t contact us about individual empty homes; use the box accessed from <a href=\"/\">the front page</a>."
+msgstr ""
+
+#: templates/web/default/contact/blurb.html:8
+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 ""
+
+#: templates/web/default/admin/body.html:61
+#: templates/web/default/admin/body_edit.html:82
+#: templates/web/zurich/admin/body.html:17
+msgid "When edited"
+msgstr ""
+
+#: templates/web/default/admin/problem_row.html:35
+msgid "When sent"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:621
+msgid "Whole block of empty flats"
+msgstr ""
+
+#: templates/web/default/open311/index.html:94
+msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>."
+msgstr ""
+
+#: templates/web/fixmystreet/footer.html:24
+msgid "Would you like better integration with FixMyStreet? <a href=\"http://www.mysociety.org/for-councils/fixmystreet/\">Find out about FixMyStreet for councils</a>."
+msgstr "Vi piacerebbe integrare FixMyStreet nei vostri servizi? <a href=\"http://www.mysociety.org/for-councils/fixmystreet/\">vieni a conoscere FixMyStreet per i comuni</a>."
+
+#: templates/web/fixmystreet/footer.html:20
+msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>."
+msgstr "Ti piacerebbe contribuire a FIxMyStreet? Il nostro codice è open source e <a href=\"http://github.com/mysociety/fixmystreet\">lo puoi trovare su GitHub</a>."
+
+#: templates/web/default/questionnaire/index.html:106
+#: templates/web/fixmystreet/questionnaire/index.html:96
+msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
+msgstr ""
+
+#: templates/web/default/report/new/notes.html:8
+#: templates/web/fixmybarangay/report/new/notes.html:8
+#: templates/web/fixmystreet/report/new/notes.html:8
+msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
+msgstr "Scrivere il tuo messaggio interamente con lettere maiuscole diventa di difficile lettura, come anche una mancanza di punteggiatura."
+
+#: templates/web/default/admin/stats.html:10
+msgid "Year"
+msgstr ""
+
+#: templates/web/default/admin/bodies.html:57
+#: templates/web/default/admin/body.html:68
+#: templates/web/default/admin/body.html:69
+#: templates/web/default/admin/body.html:70
+#: templates/web/default/admin/body_edit.html:5
+#: templates/web/default/admin/flagged.html:47
+#: templates/web/default/admin/list_updates.html:32
+#: templates/web/default/admin/list_updates.html:34
+#: templates/web/default/admin/list_updates.html:35
+#: templates/web/default/admin/problem_row.html:20
+#: templates/web/default/admin/report_edit.html:63
+#: templates/web/default/admin/report_edit.html:77
+#: templates/web/default/admin/update_edit.html:24
+#: templates/web/default/admin/users.html:29
+#: templates/web/default/questionnaire/creator_fixed.html:14
+#: templates/web/default/questionnaire/index.html:109
+#: templates/web/default/questionnaire/index.html:66
+#: templates/web/fixmystreet/questionnaire/index.html:60
+#: templates/web/fixmystreet/questionnaire/index.html:99
+msgid "Yes"
+msgstr ""
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:161
+#: templates/web/fixmystreet/report/update-form.html:89
+msgid "Yes I have a password"
+msgstr "Si ho già la password"
+
+#: templates/web/default/contact/index.html:37
+#: templates/web/fixmystreet/contact/index.html:54
+msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:"
+msgstr ""
+
+#: templates/web/default/contact/index.html:15
+#: templates/web/fixmystreet/contact/index.html:32
+msgid "You are reporting the following update for being abusive, containing personal information, or similar:"
+msgstr ""
+
+#: templates/web/default/tokens/confirm_problem.html:20
+#: templates/web/default/tokens/confirm_problem.html:21
+#: templates/web/zurich/tokens/confirm_problem.html:6
+#: templates/web/zurich/tokens/confirm_problem.html:8
+msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
+msgstr ""
+
+#: templates/web/default/admin/user-form.html:47
+msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
+msgstr ""
+
+#: templates/web/fixmystreet/contact/index.html:118
+msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
+msgstr ""
+
+#: templates/web/default/admin/flagged.html:5
+msgid ""
+"You can flag any report or user by editing them, and they will be listed on this page.\n"
+" For example, this can useful if you want to keep an eye on a user who has posted inappropriate\n"
+" reports in the past."
+msgstr ""
+
+#: templates/web/default/report/new/councils_text_none.html:19
+#: templates/web/default/report/new/councils_text_none.html:20
+#: templates/web/default/report/new/councils_text_some.html:21
+#: templates/web/default/report/new/councils_text_some.html:22
+msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:81
+msgid "You can mark a body as deleted if you do not want it to be active on the site."
+msgstr ""
+
+#: templates/web/default/js/translation_strings.html:36
+msgid "You declined; please fill in the box above"
+msgstr "Hai rifiutato; Per favore riempi il box qui sopra "
+
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38
+msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
+msgstr ""
+
+#: templates/web/default/questionnaire/index.html:96
+#: templates/web/default/report/new/fill_in_details_form.html:93
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:90
+#: templates/web/fixmystreet/questionnaire/index.html:87
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:99
+#: templates/web/zurich/report/new/fill_in_details_form.html:75
+msgid "You have already attached a photo to this report, attaching another one will replace it."
+msgstr ""
+
+#: templates/web/default/report/update-form.html:59
+#: templates/web/fixmystreet/report/update-form.html:56
+msgid "You have already attached a photo to this update, attaching another one will replace it."
+msgstr ""
+
+#: templates/web/default/auth/sign_out.html:3
+#: templates/web/zurich/auth/sign_out.html:3
+msgid "You have been signed out"
+msgstr ""
+
+#: templates/web/default/report/new/fill_in_details_form.html:7
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:7
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:28
+#: templates/web/zurich/report/new/fill_in_details_form.html:13
+msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. "
+msgstr "Hai localizzato il problema nel punto segnato sulla mappa dal segnetto verde. Se questa non è la corretta posizione, clicca semplicemente ancora sulla mappa."
+
+#: templates/web/default/tokens/confirm_alert.html:7
+msgid "You have successfully confirmed your alert."
+msgstr ""
+
+#: templates/web/zurich/tokens/confirm_problem.html:6
+msgid "You have successfully confirmed your email address."
+msgstr "Il tuo indirizzo email è stato confermato con successo."
+
+#: templates/web/default/tokens/confirm_problem.html:15
+msgid "You have successfully confirmed your problem"
+msgstr ""
+
+#: templates/web/default/tokens/confirm_update.html:12
+msgid "You have successfully confirmed your update and you can now <a href=\"%s\">view it on the site</a>."
+msgstr ""
+
+#: templates/web/default/tokens/confirm_alert.html:11
+msgid "You have successfully created your alert."
+msgstr ""
+
+#: templates/web/default/tokens/confirm_alert.html:9
+msgid "You have successfully deleted your alert."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:762
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:140
+msgid "You have successfully signed in; please check and confirm your details are accurate:"
+msgstr "Ti sei correttamente iscritto; per favore controlla e conferma i tuoi dettagli:"
+
+#: templates/web/default/my/my.html:17 templates/web/fixmystreet/my/my.html:17
+msgid "You haven&rsquo;t created any reports yet. <a href=\"%s\">Report a problem now.</a>"
+msgstr ""
+
+#: templates/web/default/email_sent.html:13
+msgid "You must now click the link in the email we've just sent you."
+msgstr ""
+
+#: templates/web/default/admin/index.html:7
+msgid "You need to <a href=\"%s\">add some bodies</a> (such as councils or departments) before any reports can be sent."
+msgstr ""
+
+#: templates/web/default/admin/bodies.html:9
+msgid ""
+"You need to add bodies (such as councils or departments) so that you can then add\n"
+" the categories of problems they can handle (such as potholes or streetlights) and the\n"
+" contacts (such as an email address) to which reports are sent."
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:71
+msgid "You really want to resend?"
+msgstr ""
+
+#: templates/web/default/my/my.html:0 templates/web/default/my/my.html:14
+#: templates/web/default/my/my.html:3 templates/web/fixmystreet/my/my.html:0
+#: templates/web/fixmystreet/my/my.html:14
+#: templates/web/fixmystreet/my/my.html:3
+msgid "Your Reports"
+msgstr "Tue segnalazioni"
+
+#: templates/web/fixmystreet/alert/_list.html:89
+#: templates/web/fixmystreet/alert/updates.html:19
+#: templates/web/fixmystreet/alert/updates.html:22
+#: templates/web/fixmystreet/contact/index.html:88
+#: templates/web/fixmystreet/report/display.html:65
+#: templates/web/fixmystreet/report/display.html:67
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:115
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:147
+#: templates/web/zurich/report/new/fill_in_details_form.html:88
+msgid "Your email"
+msgstr "La tua email"
+
+#: templates/web/fixmystreet/auth/general.html:26
+#: templates/web/fixmystreet/report/update-form.html:80
+#: templates/web/zurich/auth/general.html:30
+#: templates/web/zurich/auth/general.html:58
+msgid "Your email address"
+msgstr "Tuo indirizzo email"
+
+#: templates/web/default/auth/general.html:27
+msgid "Your email address:"
+msgstr "Tuo indirizzo email:"
+
+#: templates/web/default/alert/_list.html:92
+#: templates/web/default/report/new/fill_in_details_form.html:124
+#: templates/web/default/report/update-form.html:81
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:133
+#: templates/web/fixmybarangay/alert/_list.html:37
+msgid "Your email:"
+msgstr "La tua email:"
+
+#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7
+msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>"
+msgstr ""
+
+#: templates/web/fixmystreet/auth/general.html:57
+#: templates/web/fixmystreet/contact/index.html:81
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:124
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:192
+#: templates/web/fixmystreet/report/update-form.html:140
+#: templates/web/zurich/auth/general.html:61
+#: templates/web/zurich/report/new/fill_in_details_form.html:104
+msgid "Your name"
+msgstr "Il tuo nome"
+
+#: templates/web/default/auth/general.html:59
+#: templates/web/default/contact/index.html:68
+#: templates/web/default/report/new/fill_in_details_form.html:203
+#: templates/web/default/report/update-form.html:151
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:124
+msgid "Your name:"
+msgstr "Il tuo nome:"
+
+#: templates/web/fixmystreet/auth/general.html:41
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:166
+#: templates/web/fixmystreet/report/update-form.html:94
+#: templates/web/zurich/auth/general.html:34
+msgid "Your password"
+msgstr "Tua password"
+
+#: templates/web/default/auth/change_password.html:6
+msgid "Your password has been changed"
+msgstr "La tua password è stata cambiata"
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:139
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:206
+#: templates/web/zurich/report/new/fill_in_details_form.html:110
+msgid "Your phone number"
+msgstr ""
+
+#: templates/web/fixmystreet/questionnaire/index.html:15
+msgid "Your report"
+msgstr ""
+
+#: templates/web/default/report_created.html:6
+msgid "Your report has been created and will shortly be sent."
+msgstr ""
+
+#: templates/web/default/footer.html:9 templates/web/fiksgatami/footer.html:6
+#: templates/web/fiksgatami/nn/footer.html:6
+#: templates/web/fixmystreet/footer.html:49
+msgid "Your reports"
+msgstr "Tue segnalazioni"
+
+#: templates/web/default/my/my.html:50 templates/web/fixmystreet/my/my.html:56
+msgid "Your updates"
+msgstr ""
+
+#: templates/web/default/contact/index.html:76
+msgid "Your&nbsp;email:"
+msgstr "La tua&nbsp;email:"
+
+#: templates/web/default/admin/timeline.html:4
+msgid "by %s"
+msgstr ""
+
+#: templates/web/default/reports/body.html:6
+#: templates/web/default/reports/body.html:7
+msgid "council"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+msgid "council ref:&nbsp;%s"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:28
+#: templates/web/zurich/admin/report_edit-sdm.html:43
+#: templates/web/zurich/admin/report_edit.html:57
+msgid "didn't use map"
+msgstr ""
+
+#: templates/web/default/alert/index.html:33
+#: templates/web/fixmystreet/around/postcode_form.html:20
+msgid "e.g. ‘%s’ or ‘%s’"
+msgstr ""
+
+#: templates/web/default/admin/flagged.html:51
+#, fuzzy
+msgid "edit user"
+msgstr "Aggiungi un'utente"
+
+#: templates/web/default/admin/index.html:23
+#: templates/web/zurich/admin/index.html:5
+msgid "from %d different users"
+msgstr ""
+
+#: templates/web/fixmystreet/report/_item.html:17
+#: templates/web/zurich/report/_item.html:16
+msgid "last updated %s"
+msgstr ""
+
+#: perllib/Utils.pm:265
+msgid "less than a minute"
+msgstr ""
+
+#: templates/web/default/report/updates.html:57
+msgid "marked as a duplicate report"
+msgstr ""
+
+#: templates/web/default/report/updates.html:47
+msgid "marked as action scheduled"
+msgstr ""
+
+#: templates/web/default/report/updates.html:59
+msgid "marked as an internal referral"
+msgstr ""
+
+#: templates/web/default/report/updates.html:49
+msgid "marked as closed"
+msgstr ""
+
+#: templates/web/default/report/updates.html:28
+#: templates/web/default/report/updates.html:51
+msgid "marked as fixed"
+msgstr ""
+
+#: templates/web/default/report/updates.html:45
+msgid "marked as in progress"
+msgstr ""
+
+#: templates/web/default/report/updates.html:41
+msgid "marked as investigating"
+msgstr ""
+
+#: templates/web/default/report/updates.html:55
+msgid "marked as not the council's responsibility"
+msgstr ""
+
+#: templates/web/default/report/updates.html:43
+msgid "marked as planned"
+msgstr ""
+
+#: templates/web/default/report/updates.html:53
+msgid "marked as unable to fix"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:130
+#: templates/web/default/admin/questionnaire.html:15
+#: templates/web/default/admin/questionnaire.html:16
+msgid "n/a"
+msgstr ""
+
+#: templates/web/default/alert/_list.html:87
+#: templates/web/fixmybarangay/alert/_list.html:32
+#: templates/web/fixmystreet/alert/_list.html:85
+msgid "or"
+msgstr ""
+
+#: templates/web/default/js/translation_strings.html:27
+msgid "or locate me automatically"
+msgstr "oppure fatti localizzare automaticamente"
+
+#: templates/web/default/admin/report_edit.html:25
+#: templates/web/default/admin/report_edit.html:26
+#: templates/web/zurich/admin/report_edit-sdm.html:31
+#: templates/web/zurich/admin/report_edit-sdm.html:32
+#: templates/web/zurich/admin/report_edit-sdm.html:40
+#: templates/web/zurich/admin/report_edit-sdm.html:41
+#: templates/web/zurich/admin/report_edit.html:31
+#: templates/web/zurich/admin/report_edit.html:32
+#: templates/web/zurich/admin/report_edit.html:42
+#: templates/web/zurich/admin/report_edit.html:43
+#: templates/web/zurich/admin/report_edit.html:54
+#: templates/web/zurich/admin/report_edit.html:55
+msgid "originally entered: &ldquo;%s&rdquo;"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:30
+msgid "other areas:"
+msgstr ""
+
+#: templates/web/default/report/updates.html:29
+#: templates/web/default/report/updates.html:39
+msgid "reopened"
+msgstr ""
+
+#: templates/web/fixmybarangay/header.html:67
+#: templates/web/fixmystreet/header.html:54
+#: templates/web/zurich/footer.html:12
+msgid "sign out"
+msgstr ""
+
+#: templates/web/default/report/new/fill_in_details_form.html:12
+#: templates/web/default/report/new/fill_in_details_form.html:14
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:12
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:14
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:7
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:9
+msgid "the local council"
+msgstr ""
+
+#: templates/web/default/report/_main.html:6
+#: templates/web/zurich/report/_main.html:5
+msgid "there is no pin shown as the user did not use the map"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:370
+msgid "this type of local problem"
+msgstr ""
+
+#: perllib/Utils.pm:237
+msgid "today"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:28
+#: templates/web/zurich/admin/report_edit-sdm.html:43
+#: templates/web/zurich/admin/report_edit.html:57
+msgid "used map"
+msgstr ""
+
+#: templates/web/default/admin/update_edit.html:35
+msgid "user is from same council as problem - %d"
+msgstr ""
+
+#: templates/web/default/admin/update_edit.html:38
+msgid "user is problem owner"
+msgstr ""
+
+#: templates/web/default/reports/body.html:0
+#: templates/web/default/reports/body.html:3
+msgid "ward"
+msgstr ""
+
+#: templates/web/default/front/stats.html:17
+#, perl-format
+msgid "<big>%s</big> report recently"
+msgid_plural "<big>%s</big> reports recently"
+msgstr[0] "<big>%s</big> segnalazione recente"
+msgstr[1] "<big>%s</big> segnalazioni recenti"
+
+#: perllib/Utils.pm:284
+#, perl-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/web/default/report/_support.html:6
+#, perl-format
+msgid "%d supporter"
+msgid_plural "%d supporters"
+msgstr[0] ""
+msgstr[1] ""
+
+#: perllib/Utils.pm:286
+#, perl-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/web/default/front/stats.html:29
+#, perl-format
+msgid "<big>%s</big> update on reports"
+msgid_plural "<big>%s</big> updates on reports"
+msgstr[0] "<big>%s</big> aggiornamento sulle segnalazioni"
+msgstr[1] "<big>%s</big> aggiornamenti sulle segnalazioni"
+
+#: templates/web/emptyhomes/report/new/councils_text_none.html:3
+#, perl-format
+msgid "We do not yet have details for the council that covers this location."
+msgid_plural "We do not yet have details for the councils that cover this location."
+msgstr[0] "Non abbiamo ancora i dettagli sul comune che copre questa zona."
+msgstr[1] "Non abbiamo ancora i dettagli sui comuni che coprono questa zona."
+
+#: perllib/Utils.pm:280
+#, perl-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/web/default/front/stats.html:12
+#, perl-format
+msgid "<big>%s</big> report in past week"
+msgid_plural "<big>%s</big> reports in past week"
+msgstr[0] "<big>%s</big> Segnalazione nell'ultima settimana"
+msgstr[1] "<big>%s</big> Segnalazioni nelle ultime settimane"
+
+#: templates/web/default/front/stats.html:23
+#, perl-format
+msgid "<big>%s</big> fixed in past month"
+msgid_plural "<big>%s</big> fixed in past month"
+msgstr[0] "<big>%s</big> risolti nel mese passato"
+msgstr[1] "<big>%s</big> risolti nel mese passato"
+
+#: perllib/Utils.pm:282
+#, perl-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
+msgstr[1] ""
+
+#: templates/web/default/report/new/councils_text_some.html:14
+#, perl-format
+msgid "We do <strong>not</strong> yet have details for the other council that covers this location."
+msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location."
+msgstr[0] "<strong>Non</strong>abbiamo ancora dettagli per un'altro comune che copre questa zona."
+msgstr[1] "<strong>Non</strong>abbiamo ancora dettagli sugli altri comuni che coprono questa zona."
+
+#, fuzzy
+#~ msgid "Click on the map to report a problem"
+#~ msgstr "Clicca sulla mappa per riportare un problema"
+
+#~ msgid "First Name"
+#~ msgstr "Nome"
+
+#~ msgid "Last Name"
+#~ msgstr "Cognome"
+
+#~ msgid "Name (optional)"
+#~ msgstr "Nome (opzionale)"
+
+#~ msgid "Please choose a transport category"
+#~ msgstr "Per favore scegli una categoria di trasporto"
+
+#~ msgid "Please choose an incident category"
+#~ msgstr "Per favore scegli una categoria di incidente"
+
+#~ msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
+#~ msgstr "Scegliere una password è opzionale, ma farlo ti acconsente di riportare più facilmente le future segnalazioni, di aggiungere degli aggiornamenti e gestire le tue segnalazioni."
+
+#~ msgid "Your email (optional)"
+#~ msgstr "La tua email (opzionale)"
+
+#~ msgid "Your first name"
+#~ msgstr "Il tuo nome"
+
+#~ msgid "Your last name"
+#~ msgstr "Il tuo cognome"
+
+#~ msgid "End Year:"
+#~ msgstr "Fine anno:"
+
+#~ msgid "End month:"
+#~ msgstr "Fine mese: "
+
+#~ msgid "Start Year:"
+#~ msgstr "Anno d'inizio:"
+
+#~ msgid "Start month:"
+#~ msgstr "Mese d'inizio:"
diff --git a/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po
new file mode 100644
index 000000000..438a2e89c
--- /dev/null
+++ b/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -0,0 +1,4412 @@
+# FixMyStreet original .po file, autogenerated by gettext-extract.
+# Copyright (C) 2011 UK Citizens Online Democracy
+# This file is distributed under the same license as the main FixMyStreet code.
+# Matthew Somerville <matthew@mysociety.org>, 2011-06-03.
+#
+# Translators:
+# klrkdekira <klrkdekira@gmail.com>, 2013
+# klrkdekira <klrkdekira@gmail.com>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: fixmystreet\n"
+"Report-Msgid-Bugs-To: matthew@mysociety.org\n"
+"POT-Creation-Date: 2014-05-16 17:30+0100\n"
+"PO-Revision-Date: 2013-12-13 06:40+0000\n"
+"Last-Translator: klrkdekira <klrkdekira@gmail.com>\n"
+"Language-Team: Malay (http://www.transifex.com/projects/p/fixmystreet/language/ms/)\n"
+"Language: ms\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:604
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383
+msgid " and "
+msgstr " dan "
+
+#: templates/web/default/tokens/confirm_problem.html:15
+#: templates/web/default/tokens/confirm_problem.html:17
+msgid " and <strong>we will now send it to the council</strong>"
+msgstr "dan <strong>kita akan hantarkan kepada majlis</strong>"
+
+#: templates/web/default/report/new/councils_text_all.html:12
+#: templates/web/default/report/new/councils_text_all.html:19
+#: templates/web/default/report/new/councils_text_all.html:5
+#: templates/web/default/report/new/councils_text_none.html:19
+#: templates/web/default/report/new/councils_text_none.html:21
+#: templates/web/default/report/new/councils_text_some.html:21
+#: templates/web/default/report/new/councils_text_some.html:23
+#: templates/web/default/report/new/councils_text_some.html:5
+#: templates/web/emptyhomes/report/new/councils_text_all.html:3
+msgid " or "
+msgstr " atau "
+
+#: templates/web/default/admin/bodies.html:46
+msgid "%d addresses"
+msgstr "%d alamat"
+
+#: templates/web/default/admin/index.html:25
+msgid "%d confirmed alerts, %d unconfirmed"
+msgstr "%d alert disahkan, %d belum disah"
+
+#: templates/web/default/admin/index.html:27
+#: templates/web/zurich/admin/index.html:6
+msgid "%d council contacts &ndash; %d confirmed, %d unconfirmed"
+msgstr "%d cara hubungan majlis &ndash; %d disahkan, %d belum disah"
+
+#: templates/web/default/admin/edit-league.html:12
+msgid "%d edits by %s"
+msgstr "%d suntingan daripada %s"
+
+#: templates/web/default/admin/index.html:24
+msgid "%d live updates"
+msgstr "%d update secara langsung"
+
+#: templates/web/default/admin/index.html:26
+msgid "%d questionnaires sent &ndash; %d answered (%s%%)"
+msgstr "%d soalan selidik dihantar &ndash; %d dijawabi (%s%%)"
+
+#: templates/web/default/pagination.html:10
+msgid "%d to %d of %d"
+msgstr "%d kepada %d daripada %d"
+
+#: templates/web/default/reports/body.html:0
+#: templates/web/default/reports/body.html:22
+msgid "%s - Summary reports"
+msgstr "%s - Laporan Ringkasan"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:653
+msgid "%s ref:&nbsp;%s"
+msgstr "%s ruj;&nbsp;%s"
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
+msgid "%s ward, %s"
+msgstr "%s kawasan pentadbiran, %s"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:540
+msgid "%s, reported at %s"
+msgstr "%s, dilaporkan pada %s"
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:309
+msgid "%s, within %s ward"
+msgstr "%s, dalam kawasan pentadbiran %s"
+
+#: templates/web/default/email_sent.html:29
+msgid "(Don't worry &mdash; we'll hang on to your alert while you're checking your email.)"
+msgstr "(Jangan bimbang &mdash; kita akan mengantungkan alert akan sambil anda menyemak emel anda.)"
+
+#: templates/web/default/email_sent.html:25
+msgid "(Don't worry &mdash; we'll hang on to your problem report while you're checking your email.)"
+msgstr "(Jangan bimbang &mdash; kita akan mengantungkan laporan masalah anda sambil anda menyemak emel anda.)"
+
+#: templates/web/default/email_sent.html:27
+msgid "(Don't worry &mdash; we'll hang on to your update while you're checking your email.)"
+msgstr "(Jangan bimbang &mdash; kita akan mengantungkan update akan sambil anda menyemak emel anda.)"
+
+#: templates/web/default/admin/report_blocks.html:11
+#: templates/web/default/admin/users.html:29
+msgid "(Email in abuse table)"
+msgstr "(Emel dalam jadual penyalahguna)"
+
+#: templates/web/default/alert/_list.html:20
+#: templates/web/fixmystreet/alert/_list.html:24
+msgid "(a default distance which covers roughly 200,000 people)"
+msgstr "(jarak lalai mengandunging 200,000 orang secara kasar)"
+
+#: templates/web/default/alert/_list.html:25
+#: templates/web/fixmystreet/alert/_list.html:28
+msgid "(alternatively the RSS feed can be customised, within"
+msgstr "(manakala RSS feed disesuaikan, dalam"
+
+#: templates/web/default/around/around_map_list_items.html:12
+#: templates/web/default/around/on_map_list_items.html:9
+#: templates/web/fixmystreet/report/_item.html:27
+#: templates/web/zurich/report/_item.html:21
+msgid "(closed)"
+msgstr "(ditutup)"
+
+#: templates/web/default/around/around_map_list_items.html:10
+#: templates/web/default/around/on_map_list_items.html:7
+#: templates/web/fixmystreet/report/_item.html:25
+#: templates/web/zurich/report/_item.html:19
+msgid "(fixed)"
+msgstr "(tetap)"
+
+#: templates/web/default/index.html:12 templates/web/default/index.html:9
+#: templates/web/fixmystreet/around/intro.html:2
+msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
+msgstr "(seperti graffiti, fly tipping, paving slabs rosak, atau lampu jalan)"
+
+#: templates/web/default/reports/_list-entry.html:4
+#: templates/web/fixmystreet/report/_item.html:21
+msgid "(not sent to council)"
+msgstr "(tidak dihantar kepada majlis)"
+
+#: templates/web/default/report/new/fill_in_details_form.html:217
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:140
+#: templates/web/zurich/report/new/fill_in_details_form.html:100
+msgid "(optional)"
+msgstr "(tidak diwajibkan)"
+
+#: templates/web/default/reports/_list-entry.html:2
+#: templates/web/fixmystreet/report/_item.html:20
+msgid "(sent to both)"
+msgstr "(hantar kepada kedua-dua)"
+
+#: templates/web/default/report/new/fill_in_details_form.html:211
+msgid "(we never show your email address or phone number)"
+msgstr "(kita tidak akan menunjukkan alamat emel atau nombor telefon anda)"
+
+#: templates/web/default/report/update-form.html:158
+msgid "(we never show your email)"
+msgstr "(kita tidak akan menunjukkan alamat emel anda)"
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:635
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:662
+#: perllib/FixMyStreet/DB/Result/Problem.pm:379
+msgid "-- Pick a category --"
+msgstr "-- Pilih kategori --"
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:618
+#: perllib/FixMyStreet/DB/Result/Problem.pm:385
+msgid "-- Pick a property type --"
+msgstr "-- Pilih jenis harta --"
+
+#: templates/web/emptyhomes/front/stats.html:5
+msgid "<big>%s</big> reports"
+msgstr "<big>%s</big> laporan"
+
+#: templates/web/default/admin/body-form.html:42
+#: templates/web/default/admin/body-form.html:43
+msgid ""
+"<code>MAPIT_URL</code> is set (<code>%s</code>) but no <code>MAPIT_TYPES</code>.<br>\n"
+" This is probably why \"area covered\" is empty (below).<br>\n"
+" Maybe add some <code>MAPIT_TYPES</code> to your config file?"
+msgstr ""
+"<code>MAPIT_URL</code> ditetapkan dengan (<code>%s</code>) tetapi tiada <code>MAPIT_TYPES</code>.<br>\n"
+"Mungkin ini kenapa \"kawasan ditutupi\" adalah kosong (bawah).<br>\n"
+"Tambahkan <code>MAPIT_TYPES</code> ke dalam fail konfigurasi anda?"
+
+#: templates/web/default/questionnaire/completed.html:20
+msgid "<p style=\"font-size:150%\">Thank you very much for filling in our questionnaire; glad to hear it&rsquo;s been fixed.</p>"
+msgstr "<p style=\"font-size:150%\">Terima kasih banyak-banyak kerana menyisikan soalan selidik kita; gembira &rsquo;s telah dibaiki.</p>"
+
+#: templates/web/fiksgatami/questionnaire/completed-open.html:1
+msgid ""
+"<p style=\"font-size:150%\">We&rsquo;re sorry to hear that. We have two\n"
+"suggestions: why not try <a href=\"http://www.norge.no/styresmakter/\">writing\n"
+"direct to your councillor(s)</a> or, if it&rsquo;s a problem that could be\n"
+"fixed by local people working together, why not\n"
+"<a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n"
+"</p>"
+msgstr ""
+
+#: templates/web/fixmystreet/questionnaire/completed-open.html:25
+msgid ""
+"<p style=\"font-size:150%\">We&rsquo;re sorry to hear that. We have two\n"
+"suggestions: why not try <a href=\"http://www.writetothem.com/\">writing direct\n"
+"to your councillor(s)</a> or, if it&rsquo;s a problem that could be fixed by\n"
+"local people working together, why not\n"
+"<a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n"
+"</p>"
+msgstr ""
+
+#: templates/web/default/questionnaire/completed-open.html:6
+msgid ""
+"<p style=\"font-size:150%\">We&rsquo;re sorry to hear that. We have two\n"
+"suggestions: why not try writing to your local representative or, if it&rsquo;s\n"
+"a problem that could be fixed by local people working together, why not\n"
+"<a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n"
+"</p>"
+msgstr ""
+
+#: templates/web/default/questionnaire/index.html:35
+msgid ""
+"<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"
+"time to say so. We think it&rsquo;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 ""
+
+#: templates/web/default/questionnaire/index.html:26
+msgid ""
+"<p>Getting empty homes back into use can be difficult. You shouldn&rsquo;t expect\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"
+"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"
+msgstr ""
+
+#: templates/web/default/questionnaire/completed.html:9
+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"
+"site and leave an update.</p>"
+msgstr ""
+
+#: templates/web/default/around/_report_banner.html:4
+#: templates/web/default/around/_report_banner.html:5
+msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>"
+msgstr ""
+
+#: templates/web/default/admin/index.html:22
+#: templates/web/zurich/admin/index.html:4
+msgid "<strong>%d</strong> live problems"
+msgstr "<strong>%d</strong> masalah"
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:183
+msgid "<strong>No</strong> Let me confirm my report by email"
+msgstr "<strong>Tidak</strong> Benarkan aku mengesahkan laporanku dengan emel"
+
+#: templates/web/fixmystreet/report/update-form.html:110
+msgid "<strong>No</strong> Let me confirm my update by email"
+msgstr "<strong>Tidak</strong> Benarkan aku mengesahkan kemas kiniku dengan emel"
+
+#: templates/web/fixmystreet/auth/general.html:50
+#: templates/web/zurich/auth/general.html:51
+msgid "<strong>No</strong> let me sign in by email"
+msgstr "<strong>Tidak</strong> benarkan aku log masuk dengan emel"
+
+#: templates/web/default/auth/general.html:55
+msgid "<strong>No</strong>, I do not, let me sign in by email:"
+msgstr "<strong>Tidak</strong>, Aku tidak, benarkan aku log masuk dengan emel:"
+
+#: templates/web/default/report/new/fill_in_details_form.html:162
+msgid "<strong>No</strong>, let me confirm my report by email:"
+msgstr "<strong>Tidak</strong>, benarkan aku mengesahkan laporanku dengan emel:"
+
+#: templates/web/default/report/update-form.html:117
+msgid "<strong>No</strong>, let me confirm my update by email:"
+msgstr "<strong>Tidak</strong> Benarkan aku mengesahkan kemas kiniku dengan emel"
+
+#: templates/web/default/auth/general.html:37
+#: templates/web/default/report/new/fill_in_details_form.html:140
+#: templates/web/default/report/update-form.html:95
+#: templates/web/fixmystreet/auth/general.html:36
+#: templates/web/fixmystreet/auth/general.html:38
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:159
+#: templates/web/fixmystreet/report/update-form.html:87
+msgid "<strong>Yes</strong> I have a password"
+msgstr "<strong>Ya</strong> Aku ada kata laluan"
+
+#: templates/web/default/static/about-en-gb.html:1
+#: templates/web/default/static/about-en-gb.html:3
+#: templates/web/emptyhomes/header.html:34
+#: templates/web/emptyhomes/static/about-cy.html:1
+#: templates/web/emptyhomes/static/about-cy.html:3
+#: templates/web/emptyhomes/static/about-en-gb.html:1
+#: templates/web/emptyhomes/static/about-en-gb.html:3
+msgid "About us"
+msgstr "Tentang kita"
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:39
+#: templates/web/default/report/update-form.html:30
+#: templates/web/default/report/update-form.html:31
+#: templates/web/fixmystreet/report/update-form.html:28
+#: templates/web/fixmystreet/report/update-form.html:29
+msgid "Action Scheduled"
+msgstr "Jadual tindakan"
+
+#: templates/web/default/admin/body-form.html:3
+#: templates/web/default/admin/body-form.html:4
+msgid ""
+"Add a <strong>body</strong> for each administrative body, such as a council or department\n"
+" to which problem reports can be sent. You can add one or more contacts (for different\n"
+" categories of problem) to each body."
+msgstr ""
+
+#: templates/web/default/admin/body.html:45
+msgid "Add a contact using the form below."
+msgstr "Tambahkan cara hubungan dengan borang dibawah"
+
+#: templates/web/default/admin/bodies.html:65
+#: templates/web/default/admin/bodies.html:70
+#: templates/web/default/admin/body-form.html:233
+#: templates/web/zurich/admin/body-form.html:51
+msgid "Add body"
+msgstr "Tambah badan"
+
+#: templates/web/default/admin/body.html:88
+#: templates/web/zurich/admin/body.html:30
+msgid "Add new category"
+msgstr "Tambah kategori baru"
+
+#: templates/web/default/admin/users.html:45
+msgid "Add user"
+msgstr "Tambah pengguna"
+
+#: templates/web/default/my/my.html:61 templates/web/fixmystreet/my/my.html:67
+msgid "Added %s"
+msgstr "%s telah ditambahi"
+
+#: templates/web/default/auth/change_password.html:29
+msgid "Again:"
+msgstr "Sekali lagi:"
+
+#: templates/web/default/admin/timeline.html:35
+msgid "Alert %d created for %s, type %s, parameters %s / %s"
+msgstr "Alert %d diciptakan untuk %s, jenis %s, parameter %s/%s"
+
+#: templates/web/default/admin/timeline.html:37
+msgid "Alert %d disabled (created %s)"
+msgstr "Pemberitahuan %d dihenti (dibuat pada %s)"
+
+#: templates/web/default/report/update-form.html:163
+#: templates/web/fixmystreet/report/update-form.html:148
+msgid "Alert me to future updates"
+msgstr "Maklumkan aku sebarang kemas kini masa depan"
+
+#: templates/web/default/reports/index.html:3
+#: templates/web/fixmybarangay/reports/index.html:3
+#: templates/web/zurich/admin/stats.html:5
+#: templates/web/zurich/reports/index.html:15
+msgid "All Reports"
+msgstr "Semua Laporan"
+
+#: templates/web/default/footer.html:11
+#: templates/web/emptyhomes/header.html:32
+#: templates/web/fiksgatami/footer.html:7
+#: templates/web/fiksgatami/nn/footer.html:7
+#: templates/web/fixmybarangay/footer.html:20
+#: templates/web/fixmystreet/footer.html:51
+#: templates/web/zurich/admin/index-dm.html:12
+#: templates/web/zurich/admin/stats.html:13
+#: templates/web/zurich/footer.html:19
+#: templates/web/zurich/nav_over_content.html:6
+msgid "All reports"
+msgstr "Semua laporan"
+
+#: templates/web/default/admin/stats.html:5
+#: templates/web/zurich/admin/stats.html:8
+msgid "All reports between %s and %s"
+msgstr "Semua laporan antara %s dan %s"
+
+#: templates/web/default/report/new/councils_text_some.html:2
+msgid "All the information you provide here will be sent to"
+msgstr "Semua maklumat yang disediakan anda akan dihantar kepada"
+
+#: templates/web/default/report/new/councils_text_all.html:12
+#: templates/web/default/report/new/councils_text_all.html:13
+msgid "All the information you provide here will be sent to <strong>%s</strong> or <strong>Roads Service</strong>."
+msgstr ""
+
+#: templates/web/default/report/new/councils_text_all.html:5
+#: templates/web/default/report/new/councils_text_all.html:6
+msgid "All the information you provide here will be sent to <strong>%s</strong> or a relevant local body such as <strong>TfL</strong>, via the London Report-It system."
+msgstr ""
+
+#: templates/web/default/report/new/councils_text_all.html:19
+#: templates/web/default/report/new/councils_text_all.html:20
+#: templates/web/default/report/new/fill_in_details_form.html:12
+#: templates/web/default/report/new/fill_in_details_form.html:13
+#: templates/web/emptyhomes/report/new/councils_text_all.html:3
+#: templates/web/emptyhomes/report/new/councils_text_all.html:4
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:12
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:13
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:7
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:8
+msgid "All the information you provide here will be sent to <strong>%s</strong>."
+msgstr ""
+
+#: templates/web/default/questionnaire/index.html:60
+#: templates/web/fixmystreet/questionnaire/index.html:54
+msgid "An update marked this problem as fixed."
+msgstr "Ada kemas kini menanda masalah ini sebagai diselesai."
+
+#: templates/web/default/admin/list_updates.html:32
+#: templates/web/default/admin/problem_row.html:20
+msgid "Anonymous"
+msgstr "Tanpa nama"
+
+#: templates/web/default/admin/report_edit.html:62
+#: templates/web/default/admin/update_edit.html:23
+msgid "Anonymous:"
+msgstr "Tanpa Nama:"
+
+#: templates/web/default/footer.html:26
+msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?"
+msgstr ""
+
+#: templates/web/fixmystreet/footer.html:19
+msgid "Are you a developer?"
+msgstr "Adakan anda developer?"
+
+#: templates/web/fixmystreet/footer.html:23
+msgid "Are you from a council?"
+msgstr "Adakan anda dari majlis bandar?"
+
+#: templates/web/default/admin/body-form.html:69
+#: templates/web/zurich/admin/body-form.html:24
+msgid "Area covered"
+msgstr "Kawasan dilintungi"
+
+#: templates/web/zurich/admin/report_edit.html:144
+#: templates/web/zurich/admin/stats.html:36
+msgid "Assign to different category:"
+msgstr "Ditugaskan kepada kategori lain:"
+
+#: templates/web/zurich/admin/report_edit.html:153
+msgid "Assign to external body:"
+msgstr "Ditugaskan kepada badan luaran:"
+
+#: templates/web/zurich/admin/report_edit.html:133
+#: templates/web/zurich/admin/report_edit.html:190
+msgid "Assign to subdivision:"
+msgstr "Ditugaskan kepada bahagian bawah:"
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:163
+#: templates/web/zurich/report/updates.html:11
+msgid "Assigned to %s"
+msgstr "Ditugaskan kepada %s"
+
+#: templates/web/default/open311/index.html:86
+msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date."
+msgstr ""
+
+#: templates/web/default/open311/index.html:78
+msgid "At the moment only searching for and looking at reports work."
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:334
+#: templates/web/zurich/report/_item.html:11
+msgid "Awaiting moderation"
+msgstr "Mengunggu penyederhanaan"
+
+#: templates/web/default/js/translation_strings.html:32
+msgid "Back"
+msgstr "Balik"
+
+#: templates/web/default/admin/report_blocks.html:11
+msgid "Ban email address"
+msgstr "Melarang alamat emel"
+
+#: templates/web/fixmybarangay/report/new/notes.html:7
+msgid "Be sure to choose the right category, because we use that to determine to whom the report is sent."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1185
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:297
+#: templates/web/default/admin/bodies.html:1
+#: templates/web/zurich/header.html:64
+msgid "Bodies"
+msgstr "Badan"
+
+#: templates/web/default/admin/flagged.html:17
+#: templates/web/default/admin/reports.html:14
+#: templates/web/default/admin/users.html:17
+msgid "Body"
+msgstr "Badan"
+
+#: templates/web/default/admin/user-form.html:32
+msgid "Body:"
+msgstr "Badan:"
+
+#: templates/web/fiksgatami/footer.html:16
+#: templates/web/fiksgatami/nn/footer.html:16
+msgid "Built by <a href=\"http://www.mysociety.org/\">mySociety</a> and maintained by <a href=\"http://www.nuug.no/\">NUUG</a>"
+msgstr ""
+
+#: templates/web/default/admin/stats.html:80
+msgid "By Date"
+msgstr "Dengan Tarikh"
+
+#: templates/web/fixmystreet/around/_report_banner.html:10
+#: templates/web/fixmystreet/around/_report_banner.html:9
+msgid "Can't see the map? <a href='%s' rel='nofollow'>Skip this step</a>"
+msgstr ""
+
+#: templates/web/default/admin/bodies.html:20
+#: templates/web/default/admin/body.html:53
+#: templates/web/default/admin/index.html:44
+#: templates/web/default/report/new/category.html:10
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:74
+#: templates/web/zurich/admin/body.html:13
+#: templates/web/zurich/admin/index-dm.html:23
+#: templates/web/zurich/admin/index-sdm.html:21
+#: templates/web/zurich/admin/reports.html:13
+#: templates/web/zurich/admin/stats.html:50
+#: templates/web/zurich/report/new/fill_in_details_form.html:50
+msgid "Category"
+msgstr "Kategori"
+
+#: templates/web/default/admin/index.html:42
+msgid "Category fix rate for problems > 4 weeks old"
+msgstr "Kategori rata masalah diselesai > 4 minggu"
+
+#: templates/web/default/admin/body.html:109
+#: templates/web/default/admin/body_edit.html:23
+#: templates/web/default/admin/report_edit.html:61
+#: templates/web/default/report/new/fill_in_details_form.html:67
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:50
+#: templates/web/zurich/admin/body.html:36
+#: templates/web/zurich/admin/report_edit-sdm.html:45
+#: templates/web/zurich/admin/report_edit.html:143
+msgid "Category:"
+msgstr "Kategori:"
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374
+msgid "Category: %s"
+msgstr "Kategori: %s"
+
+#: templates/web/default/auth/change_password.html:1
+#: templates/web/default/auth/change_password.html:3
+#: templates/web/default/auth/change_password.html:33
+msgid "Change Password"
+msgstr "Menukar Kata Laluan"
+
+#: templates/web/default/admin/body.html:131
+msgid ""
+"Check <strong>confirmed</strong> to indicate that this contact has been confirmed as correct.\n"
+" If you are not sure of the origin or validity of the contact, leave this unchecked."
+msgstr ""
+
+#: templates/web/default/admin/body.html:142
+msgid ""
+"Check <strong>deleted</strong> to remove the category from use. \n"
+" It will not appear as an available category in the drop-down menu on the report-a-problem page."
+msgstr ""
+
+#: templates/web/default/admin/body.html:162
+msgid ""
+"Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n"
+" <br>\n"
+" Normally, categories are not private.\n"
+" <br>\n"
+" This is suitable for issues that you want to allow users to report to the body, but for which there is no public\n"
+" interest in displaying the report. In the UK, we've used this for services like requesting an extra rubbish bin\n"
+" at a specific address."
+msgstr ""
+
+#: templates/web/default/admin/body.html:101
+msgid ""
+"Choose a <strong>category</strong> name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n"
+" to the body too. These will appear in the drop-down menu on the report-a-problem page."
+msgstr ""
+
+#: templates/web/default/admin/stats.html:65
+#: templates/web/default/admin/stats.html:71
+msgid "Click here or enter as dd/mm/yyyy"
+msgstr "Klik sini atau masukkan sebagai dd/mm/yyyy"
+
+#: templates/web/default/js/translation_strings.html:47
+#: templates/web/fixmystreet/around/_report_banner.html:2
+msgid "Click map to report a problem"
+msgstr "Klik peta untuk melaporkan masalah"
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:140
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:45
+#: templates/web/default/admin/report_edit.html:47
+#: templates/web/default/dashboard/index.html:142
+#: templates/web/default/dashboard/index.html:144
+#: templates/web/fixmystreet/report/banner.html:15
+#: templates/web/zurich/admin/header.html:10
+#: templates/web/zurich/admin/header.html:12
+#: templates/web/zurich/admin/header.html:2
+#: templates/web/zurich/admin/report_edit.html:100
+#: templates/web/zurich/admin/report_edit.html:98
+#: templates/web/zurich/admin/stats.html:31
+#: templates/web/zurich/report/banner.html:13
+msgid "Closed"
+msgstr "Ditutup"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:748
+msgid "Closed by council"
+msgstr "Ditutup oleh majlis"
+
+#: templates/web/default/my/my.html:37 templates/web/fixmystreet/my/my.html:43
+msgid "Closed reports"
+msgstr "Laporan ditutup"
+
+#: templates/web/default/admin/problem_row.html:38
+msgid "Closed:"
+msgstr "Ditutup:"
+
+#: templates/web/default/around/tabbed_lists.html:11
+#: templates/web/default/around/tabbed_lists.html:12
+msgid "Closest nearby problems <small>(within&nbsp;%skm)</small>"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:23
+#: templates/web/zurich/admin/report_edit-sdm.html:36
+#: templates/web/zurich/admin/report_edit.html:49
+msgid "Co-ordinates:"
+msgstr "Kordinat:"
+
+#: templates/web/default/admin/list_updates.html:10
+msgid "Cobrand"
+msgstr "Cobrand"
+
+#: templates/web/default/admin/report_edit.html:75
+#: templates/web/default/admin/update_edit.html:50
+msgid "Cobrand data:"
+msgstr "Data Cobrand"
+
+#: templates/web/default/admin/report_edit.html:74
+#: templates/web/default/admin/update_edit.html:49
+msgid "Cobrand:"
+msgstr "Cobrand:"
+
+#: templates/web/default/admin/config_page.html:1
+msgid "Configuration"
+msgstr "Konfigurasi"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:421
+msgid "Configuration updated - contacts will be generated automatically later"
+msgstr ""
+
+#: templates/web/default/admin/body_edit.html:47
+msgid "Configure Endpoint"
+msgstr "Mengkonfigurasi Endpoint"
+
+#: templates/web/default/admin/body.html:62
+msgid "Confirm"
+msgstr "Sah"
+
+#: templates/web/default/auth/token.html:1
+msgid "Confirm account"
+msgstr "Mengesahkan Akaun"
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:177
+#: templates/web/fixmystreet/report/update-form.html:105
+msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated."
+msgstr ""
+
+#: templates/web/default/questionnaire/creator_fixed.html:1
+#: templates/web/default/tokens/confirm_problem.html:1
+#: templates/web/default/tokens/confirm_problem.html:3
+#: templates/web/default/tokens/confirm_update.html:1
+#: templates/web/default/tokens/confirm_update.html:3
+#: templates/web/emptyhomes/tokens/confirm_problem.html:1
+#: templates/web/emptyhomes/tokens/confirm_problem.html:3
+#: templates/web/zurich/tokens/confirm_problem.html:1
+#: templates/web/zurich/tokens/confirm_problem.html:3
+msgid "Confirmation"
+msgstr "Pengesahan"
+
+#: templates/web/default/admin/body.html:137
+#: templates/web/default/admin/body.html:55
+#: templates/web/default/admin/body_edit.html:32
+#: templates/web/default/admin/body_edit.html:84
+#: templates/web/zurich/admin/stats.html:40
+msgid "Confirmed"
+msgstr "Disahkan"
+
+#: templates/web/default/admin/stats.html:5
+msgid "Confirmed reports between %s and %s"
+msgstr "Laporan disahkan antara %s dan %s"
+
+#: templates/web/default/admin/list_updates.html:39
+#: templates/web/default/admin/problem_row.html:36
+#: templates/web/default/admin/report_edit.html:70
+msgid "Confirmed:"
+msgstr "Disahkan:"
+
+#: templates/web/fiksgatami/footer.html:10
+#: templates/web/fiksgatami/nn/footer.html:10
+msgid "Contact"
+msgstr "Hubung"
+
+#: templates/web/default/footer.html:24
+msgid "Contact FixMyStreet"
+msgstr "Menghubungi FixMyStreet"
+
+#: templates/web/default/contact/index.html:1
+#: templates/web/default/contact/index.html:2
+#: templates/web/default/contact/submit.html:1
+#: templates/web/fixmystreet/contact/index.html:1
+#: templates/web/fixmystreet/contact/index.html:2
+msgid "Contact Us"
+msgstr "Menghubungi Kita"
+
+#: templates/web/default/contact/index.html:6
+#: templates/web/default/contact/submit.html:3
+#: templates/web/fixmystreet/contact/index.html:22
+msgid "Contact the team"
+msgstr "Menghubungi pasukan"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1319
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1347
+msgid "Could not find user"
+msgstr "Tidak dapat mencari pengguna"
+
+#: templates/web/default/js/translation_strings.html:37
+msgid "Could not look up location"
+msgstr "Tidak dapat mencari lokasi"
+
+#: templates/web/default/admin/list_updates.html:9
+msgid "Council"
+msgstr "Majlis"
+
+#: templates/web/default/admin/body.html:1
+#: templates/web/default/admin/body_edit.html:1
+#: templates/web/zurich/admin/body.html:1
+msgid "Council contacts for %s"
+msgstr "Hubungan Majlis untuk %s"
+
+#: templates/web/default/admin/stats.html:84
+msgid "Council:"
+msgstr "Majlis:"
+
+#: templates/web/default/admin/stats.html:12
+#: templates/web/default/admin/stats.html:32
+#: templates/web/zurich/admin/stats.html:45
+#: templates/web/zurich/admin/stats.html:50
+msgid "Count"
+msgstr "Kiraan"
+
+#: templates/web/default/email_sent.html:1
+msgid "Create a report"
+msgstr "Laporan baru"
+
+#: templates/web/default/admin/body.html:179
+#: templates/web/zurich/admin/body.html:53
+msgid "Create category"
+msgstr "Kategori baru"
+
+#: templates/web/default/admin/problem_row.html:34
+#: templates/web/zurich/admin/list_updates.html:29
+#: templates/web/zurich/admin/list_updates.html:8
+msgid "Created"
+msgstr "Diwujudkan"
+
+#: templates/web/default/admin/list_updates.html:38
+#: templates/web/default/admin/report_edit.html:69
+#: templates/web/default/admin/update_edit.html:51
+#: templates/web/zurich/admin/report_edit-sdm.html:50
+#: templates/web/zurich/admin/report_edit.html:64
+#: templates/web/zurich/admin/update_edit.html:29
+msgid "Created:"
+msgstr "Diwujudkan:"
+
+#: templates/web/default/admin/stats.html:31
+msgid "Current state"
+msgstr "Keadaan semasa"
+
+#: templates/web/default/admin/bodies.html:7
+#: templates/web/default/admin/index.html:5
+msgid "Currently no bodies have been created."
+msgstr "Belum ada badan wujud pada masa kini."
+
+#: templates/web/default/dashboard/index.html:6
+#: templates/web/default/dashboard/index.html:7
+msgid "Dashboard"
+msgstr "Papan pemuka"
+
+#: templates/web/zurich/admin/stats.html:35
+msgid "Dealt with by subdivision within 5 working days"
+msgstr "Diuruskan oleh bahagian bawah dalam 5 hari bekerja"
+
+#: templates/web/default/admin/bodies.html:22
+#: templates/web/default/admin/body.html:148
+#: templates/web/default/admin/body.html:56
+#: templates/web/default/admin/body_edit.html:37
+#: templates/web/default/admin/body_edit.html:85
+msgid "Deleted"
+msgstr "Dipadam"
+
+#: templates/web/zurich/admin/index-dm.html:22
+#: templates/web/zurich/admin/index-sdm.html:20
+#: templates/web/zurich/admin/reports.html:12
+msgid "Description"
+msgstr "Huraian"
+
+#: templates/web/default/js/translation_strings.html:34
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66
+#: templates/web/zurich/report/new/fill_in_details_form.html:42
+msgid "Details"
+msgstr "Perincian"
+
+#: templates/web/default/admin/report_edit.html:20
+#: templates/web/default/report/new/fill_in_details_form.html:61
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:79
+#: templates/web/zurich/admin/report_edit-sdm.html:28
+#: templates/web/zurich/admin/report_edit.html:28
+#: templates/web/zurich/admin/report_edit.html:38
+msgid "Details:"
+msgstr "Perincian:"
+
+#: templates/web/default/admin/body.html:57
+msgid "Devolved"
+msgstr "Didelegasikan"
+
+#: templates/web/default/admin/edit-league.html:8
+msgid "Diligency prize league table"
+msgstr "Jadual liga hadiah ketekunan"
+
+#: templates/web/fixmystreet/auth/general.html:30
+msgid "Do you have a FixMyBarangay password?"
+msgstr "Adakan anda mempunyai kata laluan FixMyBarangay?"
+
+#: templates/web/default/auth/general.html:32
+#: templates/web/fixmystreet/auth/general.html:32
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:155
+#: templates/web/fixmystreet/report/update-form.html:84
+msgid "Do you have a FixMyStreet password?"
+msgstr "Adakan anda mempunyai kata laluan FixMyStreet?"
+
+#: templates/web/default/questionnaire/index.html:70
+#: templates/web/fixmystreet/questionnaire/index.html:64
+msgid "Don&rsquo;t know"
+msgstr "Tidak tahu"
+
+#: templates/web/fixmystreet/contact/index.html:115
+msgid "Don't like forms?"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:47
+#: templates/web/default/report/update-form.html:30
+#: templates/web/default/report/update-form.html:32
+#: templates/web/fixmystreet/report/update-form.html:28
+#: templates/web/fixmystreet/report/update-form.html:30
+msgid "Duplicate"
+msgstr "Salinan"
+
+#: templates/web/default/admin/body.html:90
+msgid ""
+"Each contact for the body has a category, which is displayed to the public. \n"
+" Different categories <strong>can have the same contact</strong> (email address).\n"
+" This means you can add many categories even if you only have one contact for the body.\n"
+" "
+msgstr ""
+
+#: templates/web/default/admin/list_updates.html:42
+#: templates/web/default/admin/problem_row.html:41
+#: templates/web/default/admin/users.html:31
+#: templates/web/zurich/admin/problem_row.html:42
+msgid "Edit"
+msgstr "Menyunting"
+
+#: templates/web/default/admin/body.html:189
+#: templates/web/zurich/admin/body.html:64
+msgid "Edit body details"
+msgstr "Edit perincian badah"
+
+#: templates/web/default/admin/report_edit.html:1
+#: templates/web/zurich/admin/report_edit-sdm.html:2
+#: templates/web/zurich/admin/report_edit-sdm.html:4
+#: templates/web/zurich/admin/report_edit.html:2
+#: templates/web/zurich/admin/report_edit.html:5
+msgid "Editing problem %d"
+msgstr "Sedang edit masalah %d"
+
+#: templates/web/default/admin/update_edit.html:1
+#: templates/web/zurich/admin/update_edit.html:1
+msgid "Editing update %d"
+msgstr "Sedang mengemaskini %d"
+
+#: templates/web/default/admin/user_edit.html:1
+msgid "Editing user %d"
+msgstr "Sedang edit pengguna %d"
+
+#: templates/web/default/admin/body_edit.html:86
+msgid "Editor"
+msgstr "Editor"
+
+#: templates/web/default/admin/bodies.html:18
+#: templates/web/default/admin/body.html:54
+#: templates/web/default/admin/body_edit.html:83
+#: templates/web/default/admin/flagged.html:38
+#: templates/web/default/admin/users.html:16
+#: templates/web/fixmystreet/auth/general.html:20
+#: templates/web/fixmystreet/report/update-form.html:76
+#: templates/web/zurich/admin/body-form.html:9
+#: templates/web/zurich/admin/body.html:14
+#: templates/web/zurich/auth/general.html:24
+#: templates/web/zurich/auth/general.html:54
+msgid "Email"
+msgstr "Emel"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1295
+msgid "Email added to abuse list"
+msgstr "Emel ditambahkan kepada senarai penyalahguna"
+
+#: templates/web/default/admin/body.html:126
+msgid "Email address:"
+msgstr "Alamat emel:"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1292
+msgid "Email already in abuse list"
+msgstr "Emel telah dalam senarai penyalahguna"
+
+#: templates/web/default/around/_updates.html:5
+msgid "Email me new local problems"
+msgstr "Emel aku masalah tempatan baru"
+
+#: templates/web/default/report/display.html:34
+msgid "Email me updates"
+msgstr "Emel aku kemas kini"
+
+#: templates/web/default/admin/body_edit.html:26
+#: templates/web/default/admin/report_edit.html:67
+#: templates/web/default/admin/update_edit.html:33
+#: templates/web/default/admin/user-form.html:20
+#: templates/web/default/alert/updates.html:13
+#: templates/web/default/report/display.html:38
+#: templates/web/zurich/admin/body.html:41
+#: templates/web/zurich/admin/report_edit-sdm.html:47
+#: templates/web/zurich/admin/report_edit.html:60
+msgid "Email:"
+msgstr "Emel:"
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:323
+msgid "Email: %s"
+msgstr "Emel: %s"
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:620
+msgid "Empty flat or maisonette"
+msgstr "Flat atau apartmen lama"
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:619
+msgid "Empty house or bungalow"
+msgstr "Rumah kosong atau banglo"
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:622
+msgid "Empty office or other commercial"
+msgstr "Pejabat kosing atau komersial lain"
+
+#: templates/web/emptyhomes/report/new/form_heading.html:1
+msgid "Empty property details form"
+msgstr "Borang perincian harta tanah kosing "
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:623
+msgid "Empty pub or bar"
+msgstr "Pub kosong atau bar"
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:624
+msgid "Empty public building - school, hospital, etc."
+msgstr "Bangunan awam kosong - sekolah, hospital, lain-lain"
+
+#: templates/web/default/admin/body-form.html:158
+#: templates/web/default/admin/body-form.html:159
+msgid ""
+"Enable <strong>Open311 update-sending</strong> if the endpoint will send and receive\n"
+" updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n"
+" For more information, see \n"
+" <a href='http://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:215
+#: templates/web/default/admin/body-form.html:216
+msgid ""
+"Enable this <strong>can be devolved</strong> setting if one or more contacts have a \n"
+" different endpoint (and send method) from the body's. For example, if reports for some categories of\n"
+" problem must be emailed, while others can be sent over Open311."
+msgstr ""
+
+#: templates/web/default/admin/stats.html:70
+msgid "End Date:"
+msgstr "Tarikh Akhir:"
+
+#: templates/web/default/admin/body-form.html:126
+msgid "Endpoint"
+msgstr "Endpoint"
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:72
+msgid "Enter a Z&uuml;rich street name"
+msgstr "Masukkan nama jalan Z&uuml;rich"
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:18
+msgid "Enter a nearby UK postcode, or street name and area"
+msgstr "Masukkan poskod UK terdekat, atau nama jalan dan kawasan"
+
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:25
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:37
+msgid "Enter a nearby postcode, or street name and area"
+msgstr "Masukkan poskod terdekat, atau nama jalan dan kawasan"
+
+#: templates/web/default/around/postcode_form.html:2
+#: templates/web/fixmystreet/around/postcode_form.html:11
+msgid "Enter a nearby street name and area"
+msgstr "Masukkan nama jalan dan kawasan terdekat"
+
+#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:9
+#, fuzzy
+msgid "Enter a nearby street name and area, postal code or district in Delhi"
+msgstr "Masukkan nama jalan dan kawasan terdekat"
+
+#: templates/web/default/auth/general.html:64
+#: templates/web/default/report/new/fill_in_details_form.html:169
+#: templates/web/default/report/update-form.html:124
+msgid "Enter a new password:"
+msgstr "Masukkan kata laluan baru"
+
+#: templates/web/fixmystreet/auth/general.html:61
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:211
+#: templates/web/fixmystreet/report/update-form.html:122
+#: templates/web/zurich/auth/general.html:65
+msgid "Enter a password"
+msgstr "Masukkan kata laluan"
+
+#: templates/web/default/index-steps.html:26
+msgid "Enter details of the problem"
+msgstr "Masukkan perincian masalah tersebut"
+
+#: templates/web/default/auth/token.html:5
+#: templates/web/default/errors/generic.html:1
+#: templates/web/default/errors/generic.html:3
+#: templates/web/default/tokens/abuse.html:1
+#: templates/web/default/tokens/abuse.html:3
+#: templates/web/default/tokens/error.html:1
+#: templates/web/default/tokens/error.html:3
+msgid "Error"
+msgstr "Ralat"
+
+#: templates/web/default/admin/body.html:11
+#: templates/web/default/admin/body_edit.html:18
+msgid "Example postcode %s"
+msgstr "Contoh poskod %s"
+
+#: templates/web/default/open311/index.html:96
+msgid "Examples:"
+msgstr "Contoh:"
+
+#: templates/web/default/admin/report_edit.html:76
+msgid "Extra data:"
+msgstr "Data tambahan:"
+
+#: templates/web/default/contact/submit.html:15
+msgid "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>."
+msgstr "Gagal menghantar mesej. Sila cuba lagi, atau <a href=\"mailto:%s\">emelkan kita</a>."
+
+#: templates/web/zurich/admin/index-dm.html:33
+#: templates/web/zurich/admin/index-sdm.html:30
+msgid "Filter report list"
+msgstr "Tapis senarai laporan"
+
+#: templates/web/emptyhomes/front/stats.html:6
+msgid "Find latest local and national news"
+msgstr "Cari berita tempatan dan kebangsaan terkini"
+
+#: templates/web/default/questionnaire/index.html:79
+#: templates/web/fixmystreet/questionnaire/index.html:73
+msgid "First time"
+msgstr "Pertama kali"
+
+#: templates/web/default/admin/body.html:37
+msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
+msgstr ""
+
+#: templates/web/fiksgatami/header.html:16
+#: templates/web/fiksgatami/nn/header.html:16
+msgid "Fix<span id=\"my\">My</span>Street"
+msgstr "Fix<span id=\"my\">My</span>Street"
+
+#: templates/web/default/header.html:24
+msgid "FixMyStreet"
+msgstr "FixMyStreet"
+
+#: templates/web/default/admin/header.html:10
+msgid "FixMyStreet admin:"
+msgstr "Admin FixMyStreet:"
+
+#: templates/web/default/alert/index.html:11
+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"
+"within a certain distance of a particular location."
+msgstr ""
+
+#: templates/web/default/alert/_list.html:71
+#: templates/web/fixmystreet/alert/_list.html:73
+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"
+"for the county council."
+msgstr ""
+
+#: templates/web/default/admin/index.html:44
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:41
+#: templates/web/default/admin/report_edit.html:42
+#: templates/web/default/dashboard/index.html:142
+#: templates/web/default/dashboard/index.html:144
+#: templates/web/default/report/update-form.html:30
+#: templates/web/default/report/update-form.html:34
+#: templates/web/fixmystreet/report/banner.html:12
+#: templates/web/fixmystreet/report/update-form.html:28
+#: templates/web/fixmystreet/report/update-form.html:32
+msgid "Fixed"
+msgstr "Diselesai"
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:43
+msgid "Fixed - Council"
+msgstr "Diselesai - Majlis"
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:42
+msgid "Fixed - User"
+msgstr "Diselesai - Pengguna"
+
+#: templates/web/default/my/my.html:32 templates/web/fixmystreet/my/my.html:38
+msgid "Fixed reports"
+msgstr "Laporan selesai"
+
+#: templates/web/default/admin/problem_row.html:37
+msgid "Fixed:"
+msgstr "Selesai:"
+
+#: templates/web/default/admin/body-form.html:84
+#: templates/web/zurich/admin/body-form.html:36
+msgid "Flag as deleted"
+msgstr "Tanda sebagai dipadam"
+
+#: templates/web/default/admin/report_blocks.html:16
+msgid "Flag user"
+msgstr "Tanda pengguna"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1190
+#: templates/web/default/admin/users.html:19
+msgid "Flagged"
+msgstr "Ditanda"
+
+#: templates/web/default/admin/flagged.html:1
+msgid "Flagged reports and users"
+msgstr "Laporan dan pengguna ditanda"
+
+#: templates/web/default/admin/user-form.html:45
+msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
+msgstr ""
+
+#: templates/web/default/admin/flagged.html:31
+msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:78
+#: templates/web/default/admin/user-form.html:51
+msgid "Flagged:"
+msgstr "Ditanda:"
+
+#: templates/web/default/reports/_ward-list.html:3
+#: templates/web/fixmystreet/reports/_ward-list.html:4
+msgid "Follow a ward link to view only reports within that ward."
+msgstr "Ikuti link kawasan pentadbiran untuk melihat laporan dalam kawasan tersebut sahaja."
+
+#: templates/web/default/admin/report_edit.html:30
+msgid "For council(s):"
+msgstr "Untuk majlis:"
+
+#: templates/web/default/admin/body-form.html:65
+msgid "For more information, see <a href='http://code.fixmystreet.com/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>."
+msgstr "Untuk maklumat lanjut, lihat <a href='http://code.fixmystreet.com/customising/fms_and_mapit' class='admin-offsite-link'>Bagaimana FixMyStreet mengguna Mapit</a>."
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:176
+#: templates/web/fixmystreet/report/update-form.html:104
+msgid "Forgotten your password?"
+msgstr "Terlupai kata laluan anda?"
+
+#: templates/web/default/faq/faq-en-gb.html:1
+#: templates/web/emptyhomes/faq/faq-cy.html:1
+#: templates/web/emptyhomes/faq/faq-en-gb.html:1
+#: templates/web/fiksgatami/faq/faq-nb.html:1
+#: templates/web/fiksgatami/nn/faq/faq-nn.html:1
+#: templates/web/fixmybarangay/faq/faq-en-gb.html:1
+#: templates/web/fixmystreet/faq/faq-en-gb.html:1
+#: templates/web/fixmystreet/static/privacy.html:1
+msgid "Frequently Asked Questions"
+msgstr "Soalan lazim"
+
+#: templates/web/default/open311/index.html:138
+msgid "GeoRSS on Google Maps"
+msgstr "GeoRSS atas Google Maps"
+
+#: templates/web/fixmystreet/around/_updates.html:3
+#: templates/web/fixmystreet/report/display.html:38
+msgid "Get updates"
+msgstr "Dapatkan kemas kini"
+
+#: templates/web/fixmystreet/reports/_rss.html:4
+#: templates/web/fixmystreet/reports/_rss.html:9
+msgid "Get updates of %s problems"
+msgstr "Dapatkan kemas kini %s masalah"
+
+#: templates/web/fixmystreet/reports/_rss.html:11
+#: templates/web/fixmystreet/reports/_rss.html:4
+msgid "Get updates of problems in this %s"
+msgstr "Dapatkan kemas kini masalah di %"
+
+#: templates/web/default/alert/_list.html:83
+#: templates/web/fixmybarangay/alert/_list.html:28
+#: templates/web/fixmystreet/alert/_list.html:82
+msgid "Give me an RSS feed"
+msgstr "Berikan aku RSS feed"
+
+#: templates/web/default/alert/index.html:34
+#: templates/web/default/around/postcode_form.html:8
+#: templates/web/fixmystreet/around/postcode_form.html:21
+#: templates/web/zurich/admin/stats.html:26
+msgid "Go"
+msgstr "Pergi"
+
+#: templates/web/default/admin/report_edit.html:77
+msgid "Going to send questionnaire?"
+msgstr "Teruskan dengan menghantar soalan selidik?"
+
+#: templates/web/default/admin/index.html:32
+msgid "Graph of problem creation by status over time"
+msgstr "Graf masalah dibuat dengan status dari masa ke masa"
+
+#: templates/web/default/reports/index.html:8
+msgid "Greyed-out lines are councils that no longer exist."
+msgstr "Garis kelabu adalah majlis yang tidak laji wujud."
+
+#: templates/web/default/questionnaire/index.html:61
+#: templates/web/fixmystreet/questionnaire/index.html:55
+msgid "Has this problem been fixed?"
+msgstr "Adakan masalah ini telah diselesai?"
+
+#: templates/web/default/questionnaire/index.html:74
+#: templates/web/fixmystreet/questionnaire/index.html:68
+msgid "Have you ever reported a problem to a council before, or is this your first time?"
+msgstr "Adakan anda pernah melaporkan masalah kepada majlis, atau inikah pertama kali anda?"
+
+#: templates/web/default/footer.html:15
+#: templates/web/emptyhomes/header.html:33
+#: templates/web/fiksgatami/footer.html:9
+#: templates/web/fiksgatami/nn/footer.html:9
+#: templates/web/fixmybarangay/footer.html:24
+#: templates/web/fixmystreet/footer.html:55
+#: templates/web/zurich/faq/faq-de-ch.html:1
+#: templates/web/zurich/footer.html:21
+#: templates/web/zurich/nav_over_content.html:8
+msgid "Help"
+msgstr "Bantuan"
+
+#: templates/web/default/alert/_list.html:6
+#: templates/web/fixmystreet/alert/_list.html:8
+msgid "Here are the types of local problem alerts for &lsquo;%s&rsquo;."
+msgstr ""
+
+#: templates/web/fixmybarangay/header.html:66
+#: templates/web/fixmystreet/header.html:53
+#: templates/web/zurich/footer.html:11
+msgid "Hi %s"
+msgstr "Hi %s"
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:50
+#: templates/web/default/admin/report_edit.html:51
+#: templates/web/default/admin/update_edit.html:28
+#: templates/web/zurich/admin/header.html:11
+#: templates/web/zurich/admin/header.html:2
+#: templates/web/zurich/admin/report_edit.html:89
+#: templates/web/zurich/admin/report_edit.html:93
+#: templates/web/zurich/admin/stats.html:32
+#: templates/web/zurich/admin/update_edit.html:18
+msgid "Hidden"
+msgstr "Tersembunyi"
+
+#: templates/web/default/around/display_location.html:67
+msgid "Hide old"
+msgstr "Sembunyikan lama"
+
+#: templates/web/default/around/display_location.html:62
+msgid "Hide pins"
+msgstr "Sembunyikan pin"
+
+#: templates/web/default/admin/body_edit.html:79
+msgid "History"
+msgstr "Sejarah"
+
+#: templates/web/default/js/translation_strings.html:31
+msgid "Home"
+msgstr "Home"
+
+#: templates/web/default/index-steps.html:1
+msgid "How to report a problem"
+msgstr "Bagaimana melaporkan masalah"
+
+#: templates/web/default/js/translation_strings.html:33
+msgid "How to send successful reports"
+msgstr "Bagaimana untuk menghantar laporan berjaya"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:733
+msgid "I am afraid you cannot confirm unconfirmed reports."
+msgstr "Anda tidak boleh mengesahkan laporan yang belum disahkan."
+
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:89
+msgid "I'm afraid we couldn't locate your problem in the database.\n"
+msgstr "Masalah anda tidak dapat dijumpai dalam database.\n"
+
+#: perllib/FixMyStreet/App/Controller/Tokens.pm:44
+msgid "I'm afraid we couldn't validate that token, as the report was made too long ago."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Tokens.pm:260
+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 ""
+
+#: templates/web/default/admin/flagged.html:14
+#: templates/web/default/admin/list_updates.html:6
+#: templates/web/default/admin/reports.html:11
+#: templates/web/zurich/admin/index-dm.html:21
+#: templates/web/zurich/admin/index-sdm.html:19
+#: templates/web/zurich/admin/list_updates.html:28
+#: templates/web/zurich/admin/list_updates.html:7
+#: templates/web/zurich/admin/reports.html:11
+msgid "ID"
+msgstr "ID"
+
+#: templates/web/default/admin/body-form.html:24
+#: templates/web/default/admin/body-form.html:25
+msgid ""
+"Identify a <strong>parent</strong> if this body is itself part of another body.\n"
+" For basic installations, you don't need to join bodies in this way."
+msgstr ""
+
+#: templates/web/default/admin/body.html:104
+msgid ""
+"If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n"
+" the menu. Make sure you use the same category name in the bodies if you want this to happen."
+msgstr ""
+
+#: templates/web/default/email_sent.html:19
+msgid "If you do not, your alert will not be activated."
+msgstr "Jika anda tidak, pemberitahuan anda tidak akan diaktifkan."
+
+#: templates/web/default/email_sent.html:15
+msgid "If you do not, your problem will not be posted."
+msgstr "Jika anda tidak, masalah anda tidak akan dipaparkan."
+
+#: templates/web/default/email_sent.html:17
+msgid "If you do not, your update will not be posted."
+msgstr "Jika anda tidak, kemas kini anda tidak akan dipaparkan."
+
+#: templates/web/default/report/new/councils_text_none.html:9
+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 ""
+
+#: templates/web/emptyhomes/report/new/councils_text_none.html:9
+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 ""
+
+#: templates/web/default/auth/token.html:22
+#: templates/web/default/email_sent.html:9
+msgid "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."
+msgstr ""
+
+#: templates/web/default/questionnaire/index.html:86
+#: templates/web/fixmystreet/questionnaire/index.html:77
+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 ""
+
+#: templates/web/default/admin/body.html:120
+msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:200
+#: templates/web/default/admin/body-form.html:201
+msgid ""
+"If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n"
+" its updates. Enable <strong>extended Open311 stauses</strong> if you want to allow extra states to be passed.\n"
+" Check that your cobrand supports this feature before switching it on."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:187
+#: templates/web/default/admin/body-form.html:188
+msgid ""
+"If you've enabled Open311 update-sending above, enable <strong>suppression of alerts</strong> \n"
+" if you do <strong>not</strong> want that user to be notified whenever these updates are created."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:173
+#: templates/web/default/admin/body-form.html:174
+msgid ""
+"If you've enabled Open311 update-sending above, you must identify which \n"
+" FixMyStreet <strong>user</strong> will be attributed as the creator of those updates\n"
+" when they are shown on the site. Enter the ID (number) of that user."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Contact.pm:116
+msgid "Illegal ID"
+msgstr "ID tak sah"
+
+#: perllib/FixMyStreet/App/Controller/Alert.pm:100
+msgid "Illegal feed selection"
+msgstr "Pilihan feed yang tak sah"
+
+#: templates/web/default/dashboard/index.html:142
+#: templates/web/default/dashboard/index.html:144
+#: templates/web/default/report/update-form.html:30
+#: templates/web/default/report/update-form.html:32
+#: templates/web/fixmystreet/report/update-form.html:28
+#: templates/web/fixmystreet/report/update-form.html:30
+msgid "In Progress"
+msgstr "Dijalani"
+
+#: templates/web/default/admin/flagged.html:39
+msgid "In abuse table?"
+msgstr "Dalam table penyalahguna?"
+
+#: templates/web/default/open311/index.html:90
+msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:143
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:38
+#: templates/web/fixmystreet/report/banner.html:19
+#: templates/web/zurich/admin/header.html:2
+#: templates/web/zurich/admin/header.html:8
+#: templates/web/zurich/admin/report_edit.html:102
+#: templates/web/zurich/report/banner.html:15
+msgid "In progress"
+msgstr "Dijalani"
+
+#: templates/web/zurich/admin/report_edit.html:163
+msgid "Include reporter personal details"
+msgstr "Termasuk perincian peribadi pelapor"
+
+#: templates/web/default/admin/stats.html:76
+msgid "Include unconfirmed reports"
+msgstr "Termasuk laporan yang belum disahkan"
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:354
+msgid "Incorrect has_photo value \"%s\""
+msgstr "Nilai has_photo \"%s\" salah"
+
+#: templates/web/zurich/admin/list_updates.html:3
+msgid "Internal notes"
+msgstr "Nota dalaman"
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:48
+msgid "Internal referral"
+msgstr "Rujukan dalaman"
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:339
+msgid "Invalid agency_responsible value %s"
+msgstr "Nilai agency_responsible %s salah"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1105
+msgid "Invalid end date"
+msgstr "Tarikh berakhir yang tak sah"
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:432
+msgid "Invalid format %s specified."
+msgstr "Format dinyatakan %s salah"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1101
+msgid "Invalid start date"
+msgstr "Tarikh mula yang tak sah"
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:37
+#: templates/web/default/dashboard/index.html:142
+#: templates/web/default/dashboard/index.html:143
+#: templates/web/default/report/update-form.html:30
+#: templates/web/default/report/update-form.html:31
+#: templates/web/fixmystreet/report/update-form.html:28
+#: templates/web/fixmystreet/report/update-form.html:29
+msgid "Investigating"
+msgstr "Dalam siasatan"
+
+#: templates/web/emptyhomes/tokens/confirm_problem.html:13
+#: templates/web/emptyhomes/tokens/confirm_problem.html:14
+msgid "It is worth noting however that the process can sometimes be slow, especially if the property is in very poor repair or the owner is unwilling to act. In most cases it can take six months or more before you can expect to see anything change and sometimes there may be considerable barries to a property being brought back into use. This doesn&rsquo;t mean the council isn&rsquo;t doing anything. We encourage councils to update the website so you can see what is happening. It may be a long process, but you reporting your concerns about this property to the council is a valuable first step."
+msgstr ""
+
+#: templates/web/fixmystreet/contact/blurb.html:8
+msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there."
+msgstr ""
+
+#: templates/web/default/auth/general.html:44
+#: templates/web/default/report/new/fill_in_details_form.html:149
+#: templates/web/default/report/update-form.html:104
+#: templates/web/fixmystreet/auth/general.html:46
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:172
+#: templates/web/fixmystreet/report/update-form.html:100
+#: templates/web/zurich/auth/general.html:40
+msgid "Keep me signed in on this computer"
+msgstr "Teruskan log masuk aku dalam komputer ini"
+
+#: templates/web/default/admin/body.html:58
+#: templates/web/zurich/admin/body.html:15
+msgid "Last editor"
+msgstr "Editor terakhir"
+
+#: templates/web/default/admin/report_edit.html:72
+msgid "Last update:"
+msgstr "Kemas kini terakhir:"
+
+#: templates/web/default/admin/problem_row.html:39
+msgid "Last&nbsp;update:"
+msgstr "Kemas kini terakhir:"
+
+#: templates/web/default/admin/body-form.html:222
+msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
+msgstr ""
+
+#: templates/web/default/admin/body.html:14
+#: templates/web/default/admin/body.html:16
+msgid "List all reported problems"
+msgstr "Senaraikan semua laporan masalah"
+
+#: templates/web/default/report/new/fill_in_details_form.html:68
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:51
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:75
+#: templates/web/zurich/report/new/fill_in_details_form.html:51
+msgid "Loading..."
+msgstr "Loading..."
+
+#: templates/web/default/alert/choose.html:1
+#: templates/web/default/alert/choose.html:3
+#: templates/web/default/alert/index.html:1
+#: templates/web/default/alert/index.html:3
+#: templates/web/default/alert/list.html:2
+#: templates/web/default/alert/list.html:5
+#: templates/web/default/alert/updates.html:1
+#: templates/web/default/tokens/confirm_alert.html:1
+#: templates/web/default/tokens/confirm_alert.html:3
+#: templates/web/emptyhomes/alert/index.html:1
+#: templates/web/emptyhomes/alert/index.html:3
+#: templates/web/fixmybarangay/alert/index.html:1
+#: templates/web/fixmybarangay/alert/index.html:3
+#: templates/web/fixmystreet/alert/updates.html:1
+msgid "Local RSS feeds and email alerts"
+msgstr "RSS feed tempatan dan pemberitahuan emel"
+
+#: templates/web/default/alert/list.html:13
+#: templates/web/default/alert/list.html:14
+#: templates/web/default/alert/list.html:2
+#: templates/web/default/alert/list.html:3
+msgid "Local RSS feeds and email alerts for ‘%s’"
+msgstr "RSS feed tempatan dan pemberitahuan emel untuk '%s'"
+
+#: templates/web/default/footer.html:13 templates/web/fiksgatami/footer.html:8
+#: templates/web/fiksgatami/nn/footer.html:8
+#: templates/web/fixmybarangay/footer.html:22
+#: templates/web/fixmystreet/footer.html:53
+msgid "Local alerts"
+msgstr "Pemberitahuan tempatan"
+
+#: templates/web/default/index-steps.html:25
+msgid "Locate the problem on a map of the area"
+msgstr "Mengesan masalah dalam kawasan atas peta"
+
+#: templates/web/default/js/translation_strings.html:43
+msgid "MAP"
+msgstr "PETA"
+
+#: perllib/FixMyStreet/Map/OSM.pm:44
+msgid "Map &copy; <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> and contributors, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA</a>"
+msgstr ""
+
+#: templates/web/default/admin/user-form.html:43
+msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
+msgstr ""
+
+#: templates/web/fixmystreet/contact/index.html:103
+msgid "Message"
+msgstr "Pesanan"
+
+#: templates/web/default/contact/index.html:92
+msgid "Message:"
+msgstr "Pesanan:"
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:440
+msgid "Missing jurisdiction_id"
+msgstr "Kehilangan jurisdiction_id"
+
+#: templates/web/zurich/admin/stats.html:34
+msgid "Moderated by division within one working day"
+msgstr ""
+
+#: templates/web/default/admin/stats.html:11
+msgid "Month"
+msgstr "Bulan"
+
+#: templates/web/default/report/display.html:30
+msgid "More problems nearby"
+msgstr "Lebih masalah terdekat"
+
+#: templates/web/default/admin/bodies.html:16
+#: templates/web/default/admin/body-form.html:18
+#: templates/web/default/admin/flagged.html:16
+#: templates/web/default/admin/flagged.html:37
+#: templates/web/default/admin/list_updates.html:7
+#: templates/web/default/admin/reports.html:13
+#: templates/web/default/admin/users.html:15
+#: templates/web/default/reports/index.html:15
+#: templates/web/emptyhomes/reports/index.html:9
+#: templates/web/fiksgatami/nn/reports/index.html:9
+#: templates/web/fiksgatami/reports/index.html:9
+#: templates/web/fixmybarangay/reports/index.html:15
+#: templates/web/fixmystreet/auth/general.html:56
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:120
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:187
+#: templates/web/fixmystreet/report/update-form.html:136
+#: templates/web/zurich/admin/body-form.html:4
+#: templates/web/zurich/auth/general.html:60
+#: templates/web/zurich/report/new/fill_in_details_form.html:100
+msgid "Name"
+msgstr "Nama"
+
+#: templates/web/default/admin/report_edit.html:66
+#: templates/web/default/admin/update_edit.html:32
+#: templates/web/default/admin/user-form.html:18
+#: templates/web/zurich/admin/report_edit-sdm.html:46
+#: templates/web/zurich/admin/report_edit.html:59
+#: templates/web/zurich/admin/stats.html:41
+msgid "Name:"
+msgstr "Nama:"
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:322
+msgid "Name: %s"
+msgstr "Nama: %s"
+
+#: templates/web/fiksgatami/footer.html:3
+#: templates/web/fiksgatami/nn/footer.html:3
+msgid "Navigation"
+msgstr "Pelayaran"
+
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:188
+#: perllib/FixMyStreet/Geocode/OSM.pm:166
+msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:142
+msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:421
+#: perllib/FixMyStreet/Cobrand/Default.pm:461
+msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:297
+msgid ""
+"Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
+"\n"
+msgstr ""
+
+#: templates/web/default/email_sent.html:3
+msgid "Nearly Done! Now check your email..."
+msgstr "Hampir Dilakukan! Sila periksa emel anda sekarang..."
+
+#: templates/web/default/reports/index.html:16
+#: templates/web/fixmybarangay/reports/index.html:16
+msgid "New <br>problems"
+msgstr "Masalah<br>baru"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:264
+msgid "New body added"
+msgstr "Badan baru ditambahi"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:376
+msgid "New category contact added"
+msgstr "Kategori hubungan baru ditambahi"
+
+#: templates/web/zurich/admin/report_edit-sdm.html:58
+#: templates/web/zurich/admin/report_edit.html:84
+msgid "New internal note:"
+msgstr "Nota dalaman baru:"
+
+#: db/alert_types.pl:18 db/alert_types.pl:22
+msgid "New local problems on FixMyStreet"
+msgstr "Masalah tempatan baru dalam FixMyStreet"
+
+#: db/alert_types_eha.pl:12
+msgid "New local reports on reportemptyhomes.com"
+msgstr "Laporan tempatan baru dalam reportemptyhomes.com"
+
+#: templates/web/emptyhomes/reports/index.html:10
+#: templates/web/fiksgatami/nn/reports/index.html:10
+#: templates/web/fiksgatami/reports/index.html:10
+msgid "New problems"
+msgstr "Masalah baru"
+
+#: db/alert_types.pl:38
+msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet"
+msgstr "Masalah baru untuk {{COUNCIL}} dalam {{WARD}} kawasan pentadbiran dalam FixMyStreet"
+
+#: db/alert_types.pl:26 db/alert_types.pl:30
+msgid "New problems near {{POSTCODE}} on FixMyStreet"
+msgstr "Masalah baru dekat {{POSTCODE}} dalam FixMyStreet"
+
+#: db/alert_types.pl:10
+msgid "New problems on FixMyStreet"
+msgstr "Masalah baru dalam FixMyStreet"
+
+#: db/alert_types.pl:34
+msgid "New problems to {{COUNCIL}} on FixMyStreet"
+msgstr "Masalah baru untuk {{COUNCIL}} dalam FixMyStreet"
+
+#: db/alert_types.pl:42
+msgid "New problems within {{NAME}}'s boundary on FixMyStreet"
+msgstr "Masalah baru dalam sempadan {{NAME}} dalam FixMyStreet"
+
+#: templates/web/zurich/admin/index-sdm.html:4
+msgid "New reports"
+msgstr "Laporan baru"
+
+#: db/alert_types_eha.pl:23
+msgid "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com"
+msgstr "Laporan baru untuk {{COUNCIL}} dalam {{WARD}} kawasan pentadbiran dalam reportemptyhomes.com"
+
+#: db/alert_types_eha.pl:5
+msgid "New reports on reportemptyhomes.com"
+msgstr "Laporan baru dalam reportemptyhomes.com"
+
+#: db/alert_types_eha.pl:16
+msgid "New reports on reportemptyhomes.com near {{POSTCODE}}"
+msgstr "Laporan baru dekat {{POSTCODE}} dalam reportemptyhomes.com"
+
+#: db/alert_types_eha.pl:19
+msgid "New reports to {{COUNCIL}} on reportemptyhomes.com"
+msgstr "Laporan baru untuk {{COUNCIL}} dalam reportemptyhomes.com"
+
+#: db/alert_types_eha.pl:27
+msgid "New reports within {{NAME}}'s boundary on reportemptyhomes.com"
+msgstr "Laporan baru dalam sempadan {{NAME}} dalam reportemptyhomes.com"
+
+#: templates/web/default/admin/questionnaire.html:24
+msgid "New state"
+msgstr "Negeri baru"
+
+#: templates/web/zurich/admin/report_edit-sdm.html:61
+msgid "New update:"
+msgstr "Kemas kini baru:"
+
+#: templates/web/fiksgatami/front/news.html:9
+#: templates/web/fiksgatami/nn/front/news.html:9
+#: templates/web/fixmystreet/front/news.html:8
+msgid "New!"
+msgstr "Baru"
+
+#: templates/web/default/pagination.html:13
+msgid "Next"
+msgstr "Seterusnya"
+
+#: templates/web/default/admin/body.html:68
+#: templates/web/default/admin/body.html:69
+#: templates/web/default/admin/body.html:70
+#: templates/web/default/admin/body_edit.html:4
+#: templates/web/default/admin/list_updates.html:32
+#: templates/web/default/admin/list_updates.html:34
+#: templates/web/default/admin/list_updates.html:35
+#: templates/web/default/admin/problem_row.html:20
+#: templates/web/default/admin/report_edit.html:64
+#: templates/web/default/admin/report_edit.html:77
+#: templates/web/default/admin/update_edit.html:25
+#: templates/web/default/questionnaire/creator_fixed.html:16
+#: templates/web/default/questionnaire/index.html:111
+#: templates/web/default/questionnaire/index.html:68
+#: templates/web/fixmystreet/questionnaire/index.html:101
+#: templates/web/fixmystreet/questionnaire/index.html:62
+msgid "No"
+msgstr "Tidak"
+
+#: templates/web/default/admin/user-form.html:33
+msgid "No body"
+msgstr "Tiada badan"
+
+#: templates/web/default/admin/stats.html:85
+msgid "No council"
+msgstr "Tiada majlis"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:362
+msgid "No council selected"
+msgstr "Tiada majlis dipilihi"
+
+#: templates/web/default/admin/edit-league.html:17
+msgid "No edits have yet been made."
+msgstr "Belum ada edit yang dibuat."
+
+#: templates/web/default/admin/flagged.html:25
+msgid "No flagged problems found."
+msgstr "Belum ada masalah yang ditanda."
+
+#: templates/web/default/admin/flagged.html:58
+msgid "No flagged users found."
+msgstr "Belum ada pengguna yang ditanda."
+
+#: templates/web/zurich/admin/report_edit-sdm.html:68
+msgid "No further updates"
+msgstr "Tiada kemaskini baru."
+
+#: templates/web/default/around/around_map_list_items.html:17
+#: templates/web/fixmystreet/around/around_map_list_items.html:8
+msgid "No problems found."
+msgstr "Tiada masalah."
+
+#: templates/web/default/around/on_map_list_items.html:14
+#: templates/web/fixmystreet/around/on_map_list_items.html:6
+msgid "No problems have been reported yet."
+msgstr "Belum ada masalah yang dilaporkan."
+
+#: templates/web/default/js/translation_strings.html:38
+msgid "No result returned"
+msgstr "Tiada keputusan."
+
+#: templates/web/default/admin/body-form.html:60
+#: templates/web/default/admin/body-form.html:61
+msgid ""
+"No specific areas are currently available, because the <code>MAPIT_URL</code> in\n"
+" your config file is not pointing to a live MapIt service."
+msgstr ""
+
+#: templates/web/default/report/_support.html:3
+#: templates/web/default/report/_support.html:4
+msgid "No supporters"
+msgstr "Tiada penyokong"
+
+#: templates/web/default/admin/body.html:73
+msgid "Non Public"
+msgstr "Bukan Awam"
+
+#: templates/web/default/admin/report_edit.html:30
+#: templates/web/zurich/admin/report_edit-sdm.html:49
+#: templates/web/zurich/admin/report_edit.html:63
+msgid "None"
+msgstr "Tiada"
+
+#: templates/web/default/admin/user-form.html:24
+#: templates/web/default/admin/user-form.html:25
+msgid ""
+"Normal (public) users should not be associated with any <strong>body</strong>.<br>\n"
+" Authorised staff users can be associated with the body they represent.<br>\n"
+" Depending on the implementation, staff users may have access to the dashboard (summary of\n"
+" activity across their body), the ability to hide reports or set special report statuses."
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:46
+#: templates/web/default/report/update-form.html:30
+#: templates/web/default/report/update-form.html:33
+#: templates/web/fixmystreet/report/update-form.html:28
+#: templates/web/fixmystreet/report/update-form.html:31
+msgid "Not Responsible"
+msgstr "Tidak Bertanggungjawab"
+
+#: templates/web/zurich/admin/report_edit-sdm.html:21
+msgid "Not for my subdivision"
+msgstr "Bukan untuk bahagian bawah aku"
+
+#: templates/web/default/admin/questionnaire.html:6
+msgid "Not reported before"
+msgstr "Belum dilaporkan"
+
+#: templates/web/default/report/_main.html:10
+msgid "Not reported to council"
+msgstr "Tidak dilaporkan kepada majlis"
+
+#: templates/web/default/admin/body.html:59
+#: templates/web/default/admin/body_edit.html:87
+#: templates/web/zurich/admin/body.html:16
+msgid "Note"
+msgstr "Nota"
+
+#: templates/web/default/admin/stats.html:51
+msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little"
+msgstr ""
+
+#: templates/web/default/admin/body.html:157
+#: templates/web/default/admin/body_edit.html:44
+#: templates/web/zurich/admin/body.html:47
+msgid "Note:"
+msgstr "ta:"
+
+#: templates/web/default/open311/index.html:75
+msgid "Note: <strong>%s</strong>"
+msgstr "Nota: <strong>%s</strong>"
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:154
+msgid "Now to submit your report&hellip;"
+msgstr ""
+
+#: templates/web/default/report/new/fill_in_details_form.html:131
+msgid "Now to submit your report&hellip; do you have a FixMyStreet password?"
+msgstr ""
+
+#: templates/web/fixmystreet/report/update-form.html:83
+msgid "Now to submit your update&hellip;"
+msgstr "Hantarkan kemas kini anda sekarang&hellip;"
+
+#: templates/web/default/report/update-form.html:86
+msgid "Now to submit your update&hellip; do you have a FixMyStreet password?"
+msgstr "Hantarkan kemas kini anda sekarang&hellip; adakan anda mempunyai kata laluan FixMyStreet?"
+
+#: templates/web/default/js/translation_strings.html:42
+msgid "OK"
+msgstr "OK"
+
+#: templates/web/default/report/display.html:24
+#: templates/web/default/report/update.html:16
+msgid "Offensive? Unsuitable? Tell us"
+msgstr "Serangan? Tidak sesuai? Beritahu kami"
+
+#: templates/web/default/reports/index.html:18
+#: templates/web/fixmybarangay/reports/index.html:18
+msgid "Old / unknown <br>problems"
+msgstr ""
+"Masalah <br>\n"
+"Lama/tidak diketahui"
+
+#: templates/web/fiksgatami/nn/reports/index.html:12
+#: templates/web/fiksgatami/reports/index.html:12
+msgid "Old problems,<br>state unknown"
+msgstr "Masalah lama,<br>Keadaan tidak diketahui"
+
+#: templates/web/default/admin/questionnaire.html:24
+msgid "Old state"
+msgstr "Keadaan lama"
+
+#: templates/web/default/reports/index.html:20
+#: templates/web/fixmybarangay/reports/index.html:20
+msgid "Older <br>fixed"
+msgstr "Lebih tua<br>diselesai"
+
+#: templates/web/default/reports/index.html:17
+#: templates/web/fixmybarangay/reports/index.html:17
+msgid "Older <br>problems"
+msgstr "Lebih tua <br>masalah"
+
+#: templates/web/fiksgatami/nn/reports/index.html:14
+#: templates/web/fiksgatami/reports/index.html:14
+msgid "Older fixed"
+msgstr "Lebih lama diselesai"
+
+#: templates/web/emptyhomes/reports/index.html:11
+#: templates/web/fiksgatami/nn/reports/index.html:11
+#: templates/web/fiksgatami/reports/index.html:11
+msgid "Older problems"
+msgstr "Masalah lama"
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:137
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:36
+#: templates/web/default/admin/report_edit.html:37
+#: templates/web/default/admin/update_edit.html:28
+#: templates/web/default/dashboard/index.html:142
+#: templates/web/default/report/update-form.html:30
+#: templates/web/fixmystreet/report/update-form.html:28
+#: templates/web/zurich/admin/header.html:2
+#: templates/web/zurich/admin/header.html:7
+#: templates/web/zurich/admin/report_edit.html:89
+#: templates/web/zurich/admin/report_edit.html:91
+#: templates/web/zurich/admin/update_edit.html:18
+#: templates/web/zurich/report/banner.html:11
+msgid "Open"
+msgstr "Terbuka"
+
+#: templates/web/default/my/my.html:27 templates/web/fixmystreet/my/my.html:33
+msgid "Open reports"
+msgstr "Laporan terbuka"
+
+#: templates/web/default/open311/index.html:72
+msgid "Open311 API for the mySociety FixMyStreet server"
+msgstr "API Open311 untuk pelayan FixMyStreet mySociety"
+
+#: templates/web/default/open311/index.html:82
+msgid "Open311 initiative web page"
+msgstr "Laman web inisiatif Open311"
+
+#: templates/web/default/open311/index.html:83
+msgid "Open311 specification"
+msgstr "Spesifikasi Open311"
+
+#: templates/web/default/alert/_list.html:58
+#: templates/web/fixmystreet/alert/_list.html:60
+msgid "Or problems reported to:"
+msgstr "Atau masalah dilaporkan kepada:"
+
+#: templates/web/default/alert/_list.html:33
+#: templates/web/fixmystreet/alert/_list.html:36
+msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1057
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:662
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:663
+#: perllib/FixMyStreet/DB/Result/Problem.pm:546
+#: perllib/FixMyStreet/DB/Result/Problem.pm:556
+#: perllib/FixMyStreet/DB/Result/Problem.pm:566
+#: perllib/FixMyStreet/DB/Result/Problem.pm:578
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:369
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:384
+msgid "Other"
+msgstr "Lain-lain"
+
+#: templates/web/default/footer.html:27
+msgid "Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>."
+msgstr "Sumber kode kita adalah terbuka dan <a href=\"http://github.com/mysociety/fixmystreet\">terdapat dalam GitHub</a>."
+
+#: templates/web/default/admin/list_updates.html:8
+msgid "Owner"
+msgstr "Pemilik"
+
+#: templates/web/default/errors/page_error_404_not_found.html:1
+#: templates/web/default/errors/page_error_404_not_found.html:3
+msgid "Page Not Found"
+msgstr "Laman Tidak Dijumpai"
+
+#: templates/web/default/admin/body-form.html:31
+#: templates/web/zurich/admin/body-form.html:14
+msgid "Parent"
+msgstr "Induk"
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:51
+msgid "Partial"
+msgstr "Separa"
+
+#: templates/web/fixmystreet/auth/general.html:59
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:208
+#: templates/web/fixmystreet/report/update-form.html:119
+#: templates/web/zurich/auth/general.html:32
+#: templates/web/zurich/auth/general.html:63
+msgid "Password (optional)"
+msgstr "Kata Laluan (tidah diwajibkan)"
+
+#: templates/web/default/auth/change_password.html:25
+msgid "Password:"
+msgstr "Kata Laluan:"
+
+#: templates/web/default/js/translation_strings.html:45
+msgid "Permalink"
+msgstr "Permalink"
+
+#: templates/web/zurich/report/new/fill_in_details_form.html:106
+msgid "Phone number"
+msgstr "Nombor telefon"
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:138
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:205
+msgid "Phone number (optional)"
+msgstr "Nombor telefon (tidak diwajibkan)"
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:287
+#: templates/web/default/admin/report_edit.html:68
+#: templates/web/default/report/new/fill_in_details_form.html:215
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:138
+#: templates/web/zurich/admin/report_edit-sdm.html:49
+#: templates/web/zurich/admin/report_edit.html:63
+#: templates/web/zurich/admin/stats.html:39
+msgid "Phone:"
+msgstr "Telefon:"
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:92
+#: templates/web/fixmystreet/report/update-form.html:59
+#: templates/web/zurich/admin/index-dm.html:29
+#: templates/web/zurich/admin/index-sdm.html:24
+#: templates/web/zurich/admin/reports.html:16
+#: templates/web/zurich/admin/stats.html:37
+#: templates/web/zurich/report/new/fill_in_details_form.html:68
+msgid "Photo"
+msgstr "Foto"
+
+#: templates/web/default/questionnaire/index.html:99
+#: templates/web/default/report/new/fill_in_details_form.html:102
+#: templates/web/default/report/update-form.html:62
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:99
+#: templates/web/fixmystreet/questionnaire/index.html:90
+msgid "Photo:"
+msgstr "Foto:"
+
+#: templates/web/default/alert/list.html:26
+msgid "Photos of recent nearby reports"
+msgstr "Foto laporan terdekat baru-baru ini "
+
+#: templates/web/default/js/translation_strings.html:30
+msgid "Place pin on map"
+msgstr "Letakkan pin atas peta"
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:38
+#: templates/web/default/dashboard/index.html:142
+#: templates/web/default/dashboard/index.html:143
+#: templates/web/zurich/admin/header.html:2
+#: templates/web/zurich/admin/header.html:9
+#: templates/web/zurich/admin/index-dm.html:9
+#: templates/web/zurich/admin/report_edit.html:89
+#: templates/web/zurich/admin/report_edit.html:92
+msgid "Planned"
+msgstr "Dirancang"
+
+#: templates/web/fixmystreet/questionnaire/index.html:44
+msgid "Please <a class=\"tab_link\" href=\"#report\">take a look</a> at the updates that have been left."
+msgstr ""
+
+#: templates/web/default/report/new/notes.html:6
+#: templates/web/fixmystreet/report/new/notes.html:6
+msgid "Please be polite, concise and to the point."
+msgstr "Sila bersopan, ringkas dan tepat."
+
+#: templates/web/default/auth/change_password.html:12
+#: templates/web/default/auth/change_password.html:17
+msgid "Please check the passwords and try again"
+msgstr "Sila periksa kata laluan dan cuba lagi"
+
+#: templates/web/default/auth/token.html:14
+msgid "Please check your email"
+msgstr "Sila periksa emel anda"
+
+#: templates/web/default/auth/general.html:14
+#: templates/web/default/auth/general.html:8
+#: templates/web/fixmystreet/auth/general.html:15
+#: templates/web/fixmystreet/auth/general.html:9
+#: templates/web/zurich/auth/general.html:3
+#: templates/web/zurich/auth/general.html:9
+msgid "Please check your email address is correct"
+msgstr "Sila periksa sama ada alamat emel anda adalah betul"
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:859
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:878
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:921
+#: perllib/FixMyStreet/DB/Result/Problem.pm:381
+#: templates/web/default/js/translation_strings.html:9
+msgid "Please choose a category"
+msgstr "Sila pilihkan kategori"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:387
+msgid "Please choose a property type"
+msgstr "Sila pilihkan jenis bangunan"
+
+#: templates/web/default/contact/blurb.html:2
+#: templates/web/fixmystreet/contact/blurb.html:12
+msgid ""
+"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 ""
+
+#: templates/web/default/report/new/notes.html:7
+#: templates/web/fixmystreet/report/new/notes.html:7
+msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the service for all users."
+msgstr ""
+
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:46
+msgid "Please do not give address or personal information in this section."
+msgstr "Sila jangan mengisi alamat atau maklumat peribadi dalam bahagian ini."
+
+#: perllib/FixMyStreet/DB/Result/Comment.pm:126
+#: templates/web/default/js/translation_strings.html:2
+msgid "Please enter a message"
+msgstr "Sila masukkan pesanan"
+
+#: templates/web/default/auth/change_password.html:12
+#: templates/web/default/auth/change_password.html:15
+#: templates/web/default/js/translation_strings.html:19
+msgid "Please enter a password"
+msgstr "Sila masukkan kata laluan"
+
+#: perllib/FixMyStreet/App/Controller/Contact.pm:97
+#: perllib/FixMyStreet/DB/Result/Problem.pm:356
+#: templates/web/default/js/translation_strings.html:3
+msgid "Please enter a subject"
+msgstr "Sila masukkan tajuk"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1041
+#: perllib/FixMyStreet/App/Controller/Admin.pm:988
+#: perllib/FixMyStreet/DB/Result/User.pm:115
+#: templates/web/default/js/translation_strings.html:12
+#: templates/web/default/js/translation_strings.html:16
+msgid "Please enter a valid email"
+msgstr "Silah masukkan emel yang benar"
+
+#: perllib/FixMyStreet/App/Controller/Alert.pm:346
+#: perllib/FixMyStreet/App/Controller/Contact.pm:107
+msgid "Please enter a valid email address"
+msgstr "Sila masukkan alamat emel yang benah"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:359
+#: templates/web/default/js/translation_strings.html:4
+msgid "Please enter some details"
+msgstr "Sila masukkan perincian"
+
+#: perllib/FixMyStreet/App/Controller/Contact.pm:96
+#: perllib/FixMyStreet/DB/Result/User.pm:112
+#: templates/web/default/auth/general.html:13
+#: templates/web/default/auth/general.html:8
+#: templates/web/default/js/translation_strings.html:11
+#: templates/web/default/js/translation_strings.html:15
+#: templates/web/fixmystreet/auth/general.html:14
+#: templates/web/fixmystreet/auth/general.html:9
+#: templates/web/zurich/auth/general.html:3
+#: templates/web/zurich/auth/general.html:8
+msgid "Please enter your email"
+msgstr "Sila masukkan emel anda"
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:151
+#: templates/web/zurich/report/new/fill_in_details_form.html:92
+msgid "Please enter your email address"
+msgstr "Sila masukkan alamat emel anda"
+
+#: templates/web/default/js/translation_strings.html:25
+msgid "Please enter your first name"
+msgstr "Sila masukkan nama pertama anda"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:374
+#: templates/web/default/js/translation_strings.html:7
+msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
+msgstr "Sila masukkan nama penuh anda, majlis memerlukan maklumat ini - Jika anda tidak ingin nama anda dikemukakan dalam laman, untik kota dibawah"
+
+#: perllib/FixMyStreet/App/Controller/Contact.pm:95
+#: perllib/FixMyStreet/DB/Result/Comment.pm:123
+#: perllib/FixMyStreet/DB/Result/Problem.pm:367
+#: perllib/FixMyStreet/DB/Result/User.pm:108
+#: templates/web/default/js/translation_strings.html:6
+msgid "Please enter your name"
+msgstr "Sila masukkan nama anda"
+
+#: templates/web/default/js/translation_strings.html:22
+msgid "Please enter your phone number"
+msgstr "Sila masukkan nombor telefon anda"
+
+#: templates/web/default/js/translation_strings.html:26
+msgid "Please enter your second name"
+msgstr "Sila masukkan nama kedua anda"
+
+#: templates/web/default/js/translation_strings.html:24
+msgid "Please enter your title"
+msgstr "Sila masukkan tajuk anda"
+
+#: templates/web/default/auth/sign_out.html:5
+#: templates/web/zurich/auth/sign_out.html:5
+msgid "Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a href=\"/\">front page</a>."
+msgstr "Sila <a href=\"%s\">log masuk lagi</a>, atau balik ke <a href=\"/\">halaman depan</a>."
+
+#: templates/web/emptyhomes/report/new/fill_in_details_text.html:1
+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"
+"to read, as does a lack of punctuation."
+msgstr ""
+
+#: templates/web/default/report/new/fill_in_details_text.html:11
+#: templates/web/default/report/new/fill_in_details_text.html:2
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:10
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:2
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:2
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:8
+msgid "Please fill in details of the problem below."
+msgstr ""
+
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:2
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:3
+msgid ""
+"Please fill in details of the problem below. Leave as much detail as you can, \n"
+"and if possible describe the exact location of\n"
+"the problem (e.g. if there is a streetlight number or road name)."
+msgstr ""
+
+#: templates/web/default/report/new/fill_in_details_text.html:2
+#: templates/web/default/report/new/fill_in_details_text.html:3
+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 ""
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:70
+#: templates/web/zurich/report/new/fill_in_details_form.html:46
+msgid "Please fill in details of the problem."
+msgstr "Sila isikan perincian untuk masalah tersebut"
+
+#: templates/web/default/report/new/fill_in_details_form.html:27
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:26
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:35
+#: templates/web/zurich/report/new/fill_in_details_form.html:20
+msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
+msgid "Please indicate whether you'd like to receive another questionnaire"
+msgstr ""
+
+#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4
+msgid "Please note that updates are not sent to the council."
+msgstr ""
+
+#: templates/web/default/report/update-form.html:7
+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 ""
+
+#: templates/web/default/report/new/fill_in_details_form.html:5
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:5
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:26
+#: templates/web/zurich/report/new/fill_in_details_form.html:11
+msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit."
+msgstr ""
+
+#: templates/web/default/report/new/notes.html:1
+#: templates/web/fixmybarangay/report/new/notes.html:1
+#: templates/web/fixmystreet/report/new/notes.html:1
+msgid "Please note:"
+msgstr "Sila nota:"
+
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:246
+msgid "Please provide some explanation as to why you're reopening this report"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253
+msgid "Please provide some text as well as a photo"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239
+msgid "Please say whether you've ever reported a problem to your council before"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Alert.pm:80
+msgid "Please select the feed you want"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Alert.pm:118
+msgid "Please select the type of alert you want"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235
+msgid "Please state whether or not the problem has been fixed"
+msgstr ""
+
+#: templates/web/default/questionnaire/index.html:50
+msgid "Please take a look at the updates that have been left."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Photo.pm:176
+msgid "Please upload a JPEG image only"
+msgstr "Sila memuat naik imej JPEG sahaja"
+
+#: perllib/FixMyStreet/App/Controller/Photo.pm:183
+msgid "Please upload a JPEG image only\n"
+msgstr "Sila memuat naik imej JPEG sahaja\n"
+
+#: perllib/FixMyStreet/App/Controller/Contact.pm:98
+msgid "Please write a message"
+msgstr "Sila tuliskan pesanan"
+
+#: templates/web/fixmystreet/report/update-form.html:23
+msgid "Please write your update here"
+msgstr "Sila tuliskan kemas kini anda di sini"
+
+#: templates/web/default/contact/index.html:95
+#: templates/web/default/report/update-form.html:109
+#: templates/web/default/report/update-form.html:131
+#: templates/web/default/report/update-form.html:72
+#: templates/web/fixmystreet/contact/index.html:110
+#: templates/web/fixmystreet/report/update-form.html:123
+#: templates/web/fixmystreet/report/update-form.html:71
+#: templates/web/fixmystreet/report/update-form.html:95
+msgid "Post"
+msgstr "Post"
+
+#: templates/web/default/report/updates.html:15
+msgid "Posted anonymously at %s"
+msgstr "Post tanpa nama pada %s"
+
+#: templates/web/default/report/updates.html:22
+msgid "Posted by %s (<strong>%s</strong>) at %s"
+msgstr "Dipostkan oleh %s (<strong>%s</strong>) pada %s"
+
+#: templates/web/default/report/updates.html:24
+msgid "Posted by %s at %s"
+msgstr "Dipostkan oleh %s pada %s"
+
+#: templates/web/default/pagination.html:7
+msgid "Previous"
+msgstr "Sebelumnya"
+
+#: templates/web/default/admin/body.html:173
+#: templates/web/default/admin/body_edit.html:40
+#: templates/web/default/admin/report_edit.html:79
+msgid "Private"
+msgstr "Peribadi"
+
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:108
+msgid "Private information (not shown on site)"
+msgstr "Maklumat peribadi (tidak ditunjukkan dalam laman)"
+
+#: templates/web/default/maps/openlayers.html:86
+msgid "Problem"
+msgstr "Masalah"
+
+#: templates/web/default/admin/timeline.html:22
+msgid "Problem %d created"
+msgstr "Masalah %d diwujudkan"
+
+#: templates/web/default/admin/timeline.html:24
+msgid "Problem %s confirmed"
+msgstr "Masalah %s dipastikan"
+
+#: templates/web/default/admin/timeline.html:26
+msgid "Problem %s sent to council %s"
+msgstr "Masalah %s dihantar kepada majlis %s"
+
+#: templates/web/default/admin/index.html:36
+#: templates/web/zurich/admin/index.html:9
+msgid "Problem breakdown by state"
+msgstr "Pecahan masalah bagi negeri"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:959
+msgid "Problem marked as open."
+msgstr "Masalah ditanda sebagai terbukan"
+
+#: templates/web/default/admin/questionnaire.html:21
+msgid "Problem state change based on survey results"
+msgstr ""
+
+#: templates/web/default/admin/flagged.html:10
+msgid "Problems"
+msgstr "Masalah-masalah"
+
+#: templates/web/default/around/_updates.html:1
+msgid "Problems in this area"
+msgstr "Masalah dalam kawasan ini"
+
+#: templates/web/fixmystreet/around/tabbed_lists.html:4
+#: templates/web/fixmystreet/report/display.html:46
+msgid "Problems nearby"
+msgstr "Masalah terdekat"
+
+#: templates/web/fixmystreet/around/tabbed_lists.html:3
+#: templates/web/fixmystreet/report/display.html:44
+msgid "Problems on the map"
+msgstr "Masalah atas peta"
+
+#: db/alert_types.pl:14
+msgid "Problems recently reported fixed on FixMyStreet"
+msgstr "Masalah yang dilaporkan diselesai pada FixMyStreet baru-baru ini"
+
+#: templates/web/default/alert/_list.html:19
+#: templates/web/fixmystreet/alert/_list.html:21
+msgid "Problems within %.1fkm of this location"
+msgstr "Masalah dalam %.1fkm dalam lokasi ini"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:629
+#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:109
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:184
+#: perllib/FixMyStreet/Cobrand/UK.pm:222
+msgid "Problems within %s"
+msgstr "Masalah dalam %s"
+
+#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117
+#: perllib/FixMyStreet/Cobrand/UK.pm:236
+msgid "Problems within %s ward"
+msgstr "Masalah dalam kawasan pentadbiran %s"
+
+#: templates/web/default/reports/body.html:0
+#: templates/web/default/reports/body.html:24
+msgid "Problems within %s, FixMyStreet"
+msgstr "Masalah dalam %s, FixMyStreet"
+
+#: templates/web/default/alert/_list.html:40
+#: templates/web/fixmybarangay/alert/_list.html:13
+#: templates/web/fixmystreet/alert/_list.html:42
+msgid "Problems within the boundary of:"
+msgstr "Masalah dalam sempadan"
+
+#: db/alert_types_eha.pl:8
+msgid "Properties recently reported as put back to use on reportemptyhomes.com"
+msgstr "Bangunan yang dilaporkan diguna semula dalam reportemptyhomes.com baru-baru ini"
+
+#: templates/web/default/admin/report_edit.html:32
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:115
+msgid "Property address:"
+msgstr "Alamat bangunan"
+
+#: templates/web/default/report/new/category.html:8
+msgid "Property type:"
+msgstr "Jenis bangunan:"
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:64
+msgid "Provide a title"
+msgstr "Sediakan tajuk"
+
+#: templates/web/default/report/update-form.html:3
+#: templates/web/fixmystreet/report/update-form.html:4
+msgid "Provide an update"
+msgstr "Sediakan kemas kini"
+
+#: templates/web/fixmystreet/auth/general.html:53
+msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
+msgstr ""
+
+#: templates/web/default/report/new/fill_in_details_form.html:173
+#: templates/web/default/report/update-form.html:128
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:202
+#: templates/web/fixmystreet/report/update-form.html:116
+msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
+msgstr ""
+
+#: templates/web/default/admin/body.html:60
+#: templates/web/default/admin/body.html:73
+msgid "Public"
+msgstr "Awam"
+
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:44
+msgid "Public information (shown on site)"
+msgstr "Maklumat awam (ditunjukkan dalam laman)"
+
+#: templates/web/zurich/admin/report_edit.html:198
+#: templates/web/zurich/admin/report_edit.html:214
+msgid "Public response:"
+msgstr "Tindak balas awam:"
+
+#: templates/web/zurich/admin/report_edit.html:80
+#: templates/web/zurich/admin/stats.html:38
+msgid "Publish photo"
+msgstr "Terbitkan foto"
+
+#: templates/web/zurich/admin/report_edit.html:222
+msgid "Publish the response"
+msgstr "Terbitkan tindak balas"
+
+#: templates/web/default/questionnaire/completed.html:2
+#: templates/web/default/questionnaire/index.html:0
+#: templates/web/default/questionnaire/index.html:14
+#: templates/web/default/questionnaire/index.html:4
+#: templates/web/fixmystreet/questionnaire/index.html:0
+#: templates/web/fixmystreet/questionnaire/index.html:14
+#: templates/web/fixmystreet/questionnaire/index.html:32
+#: templates/web/fixmystreet/questionnaire/index.html:4
+msgid "Questionnaire"
+msgstr "Soalan selidik"
+
+#: templates/web/default/admin/timeline.html:30
+msgid "Questionnaire %d answered for problem %d, %s to %s"
+msgstr "Soalan selidik %d dijawab untuk masalah %s, %s kepada %s"
+
+#: templates/web/default/admin/timeline.html:28
+msgid "Questionnaire %d sent for problem %d"
+msgstr "Soalan selidik %d dihantar untuk masalah %d"
+
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192
+msgid "Questionnaire filled in by problem reporter"
+msgstr "Soalan selidik diisikan oleh pelapor masalah"
+
+#: templates/web/default/alert/_list.html:21
+#: templates/web/default/around/display_location.html:3
+#: templates/web/default/report/display.html:46
+#: templates/web/default/reports/_rss.html:1
+#: templates/web/fixmystreet/alert/_list.html:22
+#: templates/web/fixmystreet/alert/updates.html:9
+#: templates/web/fixmystreet/report/display.html:61
+msgid "RSS feed"
+msgstr "Feed RSS"
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:265 perllib/FixMyStreet/Cobrand/UK.pm:277
+msgid "RSS feed for %s"
+msgstr "Feed RSS untuk %s"
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+msgid "RSS feed for %s ward, %s"
+msgstr "Feed RSS untuk kawasan pentadbiran %s, %s"
+
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:189
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:197
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:200
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:208
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:218
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:226
+#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303
+msgid "RSS feed of %s"
+msgstr "Feed RSS untuk %s"
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:308
+msgid "RSS feed of %s, within %s ward"
+msgstr "Feed RSS untuk %s, dalam kawasan pentadbiran %s"
+
+#: templates/web/default/alert/_list.html:21
+#: templates/web/fixmystreet/alert/_list.html:22
+msgid "RSS feed of nearby problems"
+msgstr "Feed RSS untuk masalah berdekatan"
+
+#: templates/web/default/reports/_rss.html:1
+msgid "RSS feed of problems in this %s"
+msgstr "Feed RSS untuk masalah dalam %s ini"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:630
+#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:110
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:154
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:183
+#: perllib/FixMyStreet/Cobrand/UK.pm:229
+msgid "RSS feed of problems within %s"
+msgstr "Feed RSS untuk masalah dalam %s"
+
+#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:116
+#: perllib/FixMyStreet/Cobrand/UK.pm:235
+msgid "RSS feed of problems within %s ward"
+msgstr "Feed RSS untuk masalah dalam kawasan pentadbiran %s"
+
+#: templates/web/default/around/display_location.html:3
+#: templates/web/default/around/display_location.html:4
+msgid "RSS feed of recent local problems"
+msgstr "Feed RSS untuk masalah tempatan baru-baru ini"
+
+#: templates/web/default/report/display.html:46
+#: templates/web/fixmystreet/alert/updates.html:9
+#: templates/web/fixmystreet/report/display.html:61
+msgid "RSS feed of updates to this problem"
+msgstr "Feed RSS untuk kemas kini bagi masalah ini"
+
+#: templates/web/default/alert/updates.html:9
+#: templates/web/default/report/display.html:37
+#: templates/web/fixmystreet/alert/updates.html:14
+#: templates/web/fixmystreet/report/display.html:63
+msgid "Receive email when updates are left on this problem."
+msgstr "Terima emel semasa kemas kini ditinggalkan bagi masalah ini"
+
+#: templates/web/default/around/display_location.html:0
+#: templates/web/default/around/display_location.html:32
+msgid "Recent local problems, FixMyStreet"
+msgstr "Masalah tempatan baru-baru ini, FixMyStreet"
+
+#: templates/web/default/reports/index.html:19
+#: templates/web/fixmybarangay/reports/index.html:19
+msgid "Recently <br>fixed"
+msgstr "Diselesai <br>baru-baru ini"
+
+#: templates/web/fiksgatami/nn/reports/index.html:13
+#: templates/web/fiksgatami/reports/index.html:13
+msgid "Recently fixed"
+msgstr "Diselesai baru-baru ini"
+
+#: templates/web/default/index.html:35 templates/web/emptyhomes/index.html:24
+#: templates/web/fixmystreet/index.html:49
+msgid "Recently reported problems"
+msgstr "Masalah yang dilaporkan baru-baru ini"
+
+#: templates/web/default/report/new/notes.html:9
+#: templates/web/fixmystreet/report/new/notes.html:10
+msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website."
+msgstr ""
+
+#: templates/web/fixmybarangay/report/new/notes.html:9
+msgid "Remember that, for the pilot project, FixMyBarangay is only for reporting potholes and streetlights in bgy. Luz or Basak San Nicolas."
+msgstr ""
+
+#: templates/web/default/admin/report_blocks.html:16
+msgid "Remove flag"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:94
+#: templates/web/default/admin/update_edit.html:62
+#: templates/web/zurich/admin/update_edit.html:35
+msgid "Remove photo (can't be undone!)"
+msgstr ""
+
+#: templates/web/emptyhomes/header.html:12
+msgid "Report Empty Homes"
+msgstr ""
+
+#: templates/web/default/footer.html:7 templates/web/emptyhomes/header.html:31
+#: templates/web/fiksgatami/footer.html:5
+#: templates/web/fiksgatami/nn/footer.html:5
+#: templates/web/fixmystreet/footer.html:47
+#: templates/web/zurich/footer.html:17
+#: templates/web/zurich/nav_over_content.html:4
+msgid "Report a problem"
+msgstr ""
+
+#: templates/web/fixmystreet/report/display.html:35
+msgid "Report abuse"
+msgstr ""
+
+#: templates/web/default/report_created.html:1
+#: templates/web/default/report_created.html:3
+msgid "Report created"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Rss.pm:295
+msgid "Report on %s"
+msgstr ""
+
+#: templates/web/default/index.html:14 templates/web/emptyhomes/index.html:5
+#: templates/web/fixmystreet/around/intro.html:1
+#: templates/web/zurich/around/intro.html:1
+msgid "Report, view, or discuss local problems"
+msgstr ""
+
+#: templates/web/default/my/my.html:79
+msgid "Reported %s"
+msgstr ""
+
+#: templates/web/default/my/my.html:77
+msgid "Reported %s, to %s"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:561
+#: templates/web/default/contact/index.html:45
+#: templates/web/fixmystreet/contact/index.html:62
+msgid "Reported anonymously at %s"
+msgstr ""
+
+#: templates/web/default/admin/questionnaire.html:5
+#: templates/web/default/questionnaire/index.html:77
+#: templates/web/fixmystreet/questionnaire/index.html:71
+msgid "Reported before"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:584
+#: templates/web/default/contact/index.html:47
+#: templates/web/fixmystreet/contact/index.html:64
+msgid "Reported by %s at %s"
+msgstr ""
+
+#: templates/web/zurich/report/_main.html:2
+msgid "Reported in the %s category"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:557
+msgid "Reported in the %s category anonymously at %s"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:579
+msgid "Reported in the %s category by %s at %s"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:553
+msgid "Reported via %s anonymously at %s"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:575
+msgid "Reported via %s by %s at %s"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:549
+msgid "Reported via %s in the %s category anonymously at %s"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:569
+msgid "Reported via %s in the %s category by %s at %s"
+msgstr ""
+
+#: templates/web/default/around/around_index.html:1
+#: templates/web/default/js/translation_strings.html:41
+#: templates/web/default/report/new/fill_in_details.html:0
+#: templates/web/default/report/new/fill_in_details.html:3
+#: templates/web/default/report/new/fill_in_details_form.html:1
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:1
+#: templates/web/fixmystreet/around/around_index.html:2
+#: templates/web/fixmystreet/report/new/fill_in_details.html:0
+#: templates/web/fixmystreet/report/new/fill_in_details.html:5
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2
+#: templates/web/zurich/report/new/fill_in_details_form.html:2
+msgid "Reporting a problem"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1186
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:290
+#: templates/web/zurich/header.html:60
+msgid "Reports"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
+#: perllib/FixMyStreet/DB/Result/Problem.pm:399
+msgid "Reports are limited to %s characters in length. Please shorten your report"
+msgstr ""
+
+#: templates/web/zurich/admin/index-sdm.html:7
+msgid "Reports awaiting approval"
+msgstr ""
+
+#: templates/web/default/around/tabbed_lists.html:3
+msgid "Reports on and around the map"
+msgstr ""
+
+#: templates/web/zurich/admin/index-sdm.html:10
+msgid "Reports published"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:71
+msgid "Resend report"
+msgstr ""
+
+#: templates/web/default/js/translation_strings.html:28
+msgid "Right place?"
+msgstr ""
+
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:195
+#: perllib/FixMyStreet/Geocode/OSM.pm:173
+msgid "Road operator for this named road (derived from road reference number and type): %s"
+msgstr ""
+
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:192
+#: perllib/FixMyStreet/Geocode/OSM.pm:170
+msgid "Road operator for this named road (from OpenStreetMap): %s"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1386
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1397
+#: templates/web/default/admin/report_edit.html:90
+#: templates/web/zurich/admin/report_edit.html:76
+msgid "Rotate Left"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1386
+#: templates/web/default/admin/report_edit.html:91
+#: templates/web/zurich/admin/report_edit.html:77
+msgid "Rotate Right"
+msgstr ""
+
+#: templates/web/default/admin/body_edit.html:76
+msgid "Save changes"
+msgstr ""
+
+#: templates/web/default/admin/reports.html:1
+#: templates/web/zurich/admin/reports.html:1
+msgid "Search Reports"
+msgstr ""
+
+#: templates/web/default/admin/users.html:1
+msgid "Search Users"
+msgstr ""
+
+#: templates/web/zurich/header.html:77
+msgid "Search reports"
+msgstr ""
+
+#: templates/web/default/admin/reports.html:5
+#: templates/web/default/admin/users.html:8
+#: templates/web/zurich/admin/reports.html:5
+msgid "Search:"
+msgstr ""
+
+#: templates/web/default/admin/reports.html:26
+msgid "Searching found no reports."
+msgstr ""
+
+#: templates/web/default/admin/users.html:39
+msgid "Searching found no users."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:33
+#: templates/web/zurich/admin/body-form.html:16
+msgid "Select a body"
+msgstr "Pilihkan badan"
+
+#: templates/web/default/admin/body-form.html:71
+#: templates/web/zurich/admin/body-form.html:26
+msgid "Select an area"
+msgstr "Pilihkan kawasan"
+
+#: templates/web/default/alert/_list.html:8
+#: templates/web/fixmystreet/alert/_list.html:10
+msgid "Select which type of alert you'd like and click the button for an RSS feed, or enter your email address to subscribe to an email alert."
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
+msgid "Sent to %s %s later"
+msgstr "Dihantar kepada %s %s kemudian"
+
+#: templates/web/default/admin/report_edit.html:71
+msgid "Sent:"
+msgstr "Dihantar:"
+
+#: templates/web/default/admin/report_edit.html:73
+#: templates/web/zurich/admin/stats.html:45
+msgid "Service:"
+msgstr "Servis:"
+
+#: templates/web/fixmystreet/report/display.html:41
+msgid "Share"
+msgstr "Kongsi"
+
+#: templates/web/default/report/new/fill_in_details_form.html:210
+#: templates/web/default/report/update-form.html:157
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:129
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:197
+#: templates/web/fixmystreet/report/update-form.html:144
+msgid "Show my name publicly"
+msgstr "Tunjukkan nama aku secara umum"
+
+#: templates/web/default/around/display_location.html:69
+msgid "Show old"
+msgstr "Tunjukkan lama"
+
+#: templates/web/default/around/display_location.html:60
+msgid "Show pins"
+msgstr "Tunjukkan pin"
+
+#: templates/web/default/auth/general.html:3
+#: templates/web/default/auth/general.html:49
+#: templates/web/fixmybarangay/header.html:70
+#: templates/web/fixmystreet/auth/general.html:3
+#: templates/web/fixmystreet/auth/general.html:42
+#: templates/web/fixmystreet/auth/general.html:62
+#: templates/web/fixmystreet/header.html:57
+#: templates/web/zurich/auth/general.html:18
+#: templates/web/zurich/auth/general.html:35
+msgid "Sign in"
+msgstr "Log masuk"
+
+#: templates/web/default/auth/general.html:74
+msgid "Sign in by email"
+msgstr "Log masuk dengan emel"
+
+#: templates/web/default/auth/general.html:1
+#: templates/web/fixmystreet/auth/general.html:1
+#: templates/web/zurich/auth/general.html:1
+msgid "Sign in or create an account"
+msgstr "Log masuk atau daftarkan akaun"
+
+#: templates/web/default/auth/sign_out.html:1
+#: templates/web/default/header.html:30
+#: templates/web/emptyhomes/header.html:46
+#: templates/web/fiksgatami/header.html:22
+#: templates/web/fiksgatami/nn/header.html:22
+#: templates/web/zurich/auth/sign_out.html:1
+msgid "Sign out"
+msgstr "Log keluar"
+
+#: templates/web/default/header.html:29
+#: templates/web/emptyhomes/header.html:45
+#: templates/web/fiksgatami/header.html:21
+#: templates/web/fiksgatami/nn/header.html:21
+msgid "Signed in as %s"
+msgstr "Log masuk sebagai %s"
+
+#: templates/web/default/report/new/fill_in_details_text.html:2
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:2
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:2
+msgid "Some categories may require additional information."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:145
+#: templates/web/default/admin/body-form.html:146
+msgid ""
+"Some endpoints require an <strong>API key</strong> to indicate that the reports are being\n"
+" sent from your FixMyStreet installation."
+msgstr ""
+
+#: templates/web/default/alert/index.html:42
+#: templates/web/fixmybarangay/alert/index.html:32
+msgid "Some photos of recent reports"
+msgstr ""
+
+#: perllib/FixMyStreet/App/View/Email.pm:32
+#: perllib/FixMyStreet/App/View/Web.pm:44
+msgid "Some text to localize"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:93
+msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
+msgstr ""
+
+#: templates/web/default/tokens/abuse.html:5
+msgid "Sorry, there has been an error confirming your problem."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:215
+#: perllib/FixMyStreet/Geocode.pm:28 perllib/FixMyStreet/Geocode/Bing.pm:58
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:75
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:95
+#: perllib/FixMyStreet/Geocode/Google.pm:74
+#: perllib/FixMyStreet/Geocode/OSM.pm:66
+msgid "Sorry, we could not find that location."
+msgstr ""
+
+#: perllib/FixMyStreet/Geocode/Bing.pm:53
+#: perllib/FixMyStreet/Geocode/Google.pm:69
+#: perllib/FixMyStreet/Geocode/Zurich.pm:88
+msgid "Sorry, we could not parse that location. Please try again."
+msgstr ""
+
+#: templates/web/fiksgatami/footer.html:16
+#: templates/web/fiksgatami/nn/footer.html:16
+msgid "Source code"
+msgstr "Kod sumber"
+
+#: templates/web/default/admin/stats.html:64
+msgid "Start Date:"
+msgstr "Tarikh bermula:"
+
+#: templates/web/default/admin/flagged.html:18
+#: templates/web/default/admin/list_updates.html:11
+#: templates/web/default/admin/reports.html:15
+#: templates/web/fixmystreet/report/update-form.html:26
+msgid "State"
+msgstr "Negeri"
+
+#: templates/web/default/admin/report_edit.html:34
+#: templates/web/default/admin/update_edit.html:27
+#: templates/web/default/report/update-form.html:28
+#: templates/web/zurich/admin/report_edit-sdm.html:56
+#: templates/web/zurich/admin/report_edit.html:87
+#: templates/web/zurich/admin/update_edit.html:17
+msgid "State:"
+msgstr "Negeri:"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1191
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:305
+#: templates/web/default/admin/stats.html:1
+#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72
+msgid "Stats"
+msgstr "Stats"
+
+#: templates/web/zurich/admin/index-dm.html:23
+#: templates/web/zurich/admin/index-sdm.html:21
+#: templates/web/zurich/admin/reports.html:13
+msgid "Status"
+msgstr "Status"
+
+#: templates/web/default/report/updates.html:10
+msgid "Still open, via questionnaire, %s"
+msgstr "Masuk dibuka, melalui soalan selidik, %s"
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378
+msgid "Subcategory: %s"
+msgstr "Subkategori: %s"
+
+#: templates/web/zurich/admin/index-dm.html:27
+msgid "Subdivision/Body"
+msgstr "Bahagian bawah/Badan"
+
+#: templates/web/fixmystreet/contact/index.html:95
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:60
+msgid "Subject"
+msgstr "Tajuk"
+
+#: templates/web/default/admin/report_edit.html:19
+#: templates/web/default/contact/index.html:83
+#: templates/web/default/report/new/fill_in_details_form.html:52
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:70
+#: templates/web/zurich/admin/report_edit.html:37
+msgid "Subject:"
+msgstr "Tajuk:"
+
+#: templates/web/default/questionnaire/creator_fixed.html:19
+#: templates/web/default/report/new/fill_in_details_form.html:114
+#: templates/web/default/report/new/fill_in_details_form.html:154
+#: templates/web/default/report/new/fill_in_details_form.html:176
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:144
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:142
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:167
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:212
+#: templates/web/zurich/report/new/fill_in_details_form.html:114
+msgid "Submit"
+msgstr "Hantar"
+
+#: templates/web/default/admin/report_edit.html:97
+#: templates/web/default/admin/update_edit.html:65
+#: templates/web/default/admin/user-form.html:55
+#: templates/web/zurich/admin/report_edit-sdm.html:67
+#: templates/web/zurich/admin/report_edit.html:224
+#: templates/web/zurich/admin/update_edit.html:38
+msgid "Submit changes"
+msgstr "Hantar perubahan"
+
+#: templates/web/default/questionnaire/index.html:116
+#: templates/web/fixmystreet/questionnaire/index.html:105
+msgid "Submit questionnaire"
+msgstr "Hantar soalan selidik"
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:133
+#: templates/web/zurich/admin/header.html:2
+#: templates/web/zurich/admin/header.html:6
+#: templates/web/zurich/admin/index-dm.html:23
+#: templates/web/zurich/admin/index-dm.html:6
+#: templates/web/zurich/admin/index-sdm.html:21
+#: templates/web/zurich/admin/report_edit.html:89
+#: templates/web/zurich/admin/report_edit.html:90
+#: templates/web/zurich/admin/reports.html:13
+#: templates/web/zurich/report/banner.html:9
+msgid "Submitted"
+msgstr "Dihantarkan"
+
+#: templates/web/default/alert/updates.html:17
+#: templates/web/default/report/display.html:42
+#: templates/web/fixmystreet/alert/updates.html:23
+#: templates/web/fixmystreet/report/display.html:68
+msgid "Subscribe"
+msgstr "Melanggan"
+
+#: templates/web/default/alert/_list.html:97
+#: templates/web/fixmybarangay/alert/_list.html:42
+#: templates/web/fixmystreet/alert/_list.html:92
+msgid "Subscribe me to an email alert"
+msgstr "Langgankan pemberitahuan emel"
+
+#: templates/web/fixmybarangay/alert/_list.html:6
+msgid "Subscribe to an alert based upon what baranagay you&rsquo;re in:"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1184
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:289
+#: templates/web/default/admin/index.html:1
+#: templates/web/zurich/admin/index-dm.html:1
+#: templates/web/zurich/admin/index-sdm.html:1
+#: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12
+#: templates/web/zurich/header.html:57
+msgid "Summary"
+msgstr "Ringkasan"
+
+#: templates/web/default/reports/index.html:1
+#: templates/web/emptyhomes/reports/index.html:1
+#: templates/web/fiksgatami/nn/reports/index.html:1
+#: templates/web/fiksgatami/reports/index.html:1
+#: templates/web/fixmybarangay/reports/index.html:1
+#: templates/web/zurich/reports/index.html:0
+#: templates/web/zurich/reports/index.html:4
+msgid "Summary reports"
+msgstr "Laporan ringkasan"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1188
+msgid "Survey"
+msgstr "Kajian"
+
+#: templates/web/default/admin/questionnaire.html:1
+msgid "Survey Results"
+msgstr "Hasil Kajian"
+
+#: templates/web/default/admin/list_updates.html:12
+#: templates/web/zurich/admin/list_updates.html:10
+#: templates/web/zurich/admin/list_updates.html:31
+msgid "Text"
+msgstr "Teks"
+
+#: templates/web/default/admin/body.html:18
+msgid "Text only version"
+msgstr "Versi teks sahaja"
+
+#: templates/web/default/admin/update_edit.html:20
+#: templates/web/zurich/admin/update_edit.html:12
+msgid "Text:"
+msgstr "Teks:"
+
+#: templates/web/default/tokens/confirm_update.html:8
+msgid "Thank you &mdash; you can <a href=\"%s\">view your updated problem</a> on the site."
+msgstr ""
+
+#: templates/web/emptyhomes/tokens/confirm_problem.html:7
+#: templates/web/emptyhomes/tokens/confirm_problem.html:8
+msgid "Thank you for reporting an empty property on ReportEmptyHomes.com. We have emailed the lead officer for empty homes in the council responsible with details, and asked them to do whatever they can to get the empty property back into use as soon as possible."
+msgstr ""
+
+#: templates/web/emptyhomes/tokens/confirm_problem.html:31
+msgid ""
+"Thank you for reporting this empty property on ReportEmptyHomes.com.\n"
+"At present the report cannot be sent through to the council for this area. We\n"
+"are working with councils to link them into the system so that as many areas\n"
+"as possible will be covered."
+msgstr ""
+
+#: templates/web/default/tokens/error.html:7
+msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it."
+msgstr ""
+
+#: templates/web/emptyhomes/tokens/confirm_problem.html:25
+#: templates/web/emptyhomes/tokens/confirm_problem.html:26
+msgid "Thank you for using ReportEmptyHomes.com. Your action is already helping to resolve the UK&rsquo;s empty homes crisis."
+msgstr ""
+
+#: templates/web/fixmystreet/around/around_index.html:27
+msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above&nbsp;:"
+msgstr ""
+
+#: templates/web/default/contact/submit.html:8
+msgid "Thanks for your feedback. We'll get back to you as soon as we can!"
+msgstr ""
+
+#: templates/web/default/questionnaire/creator_fixed.html:9
+msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Photo.pm:190
+msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Council.pm:100
+msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Location.pm:124
+msgid "That location does not appear to be in the UK; please try again."
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:63
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:86
+msgid "That postcode was not recognised, sorry."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:704
+msgid "That problem will now be resent."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:117
+msgid "That report cannot be viewed on %s."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:111
+msgid "That report has been removed from FixMyStreet."
+msgstr ""
+
+#: templates/web/default/admin/body.html:115
+msgid ""
+"The <strong>email address</strong> is the destination to which reports about this category will be sent. \n"
+" Other categories for this body may have the same email address."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:119
+#: templates/web/default/admin/body-form.html:120
+msgid ""
+"The <strong>endpoint</strong> is the URL of the service that FixMyStreet will connect to \n"
+" when sending reports to this body."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:132
+#: templates/web/default/admin/body-form.html:133
+msgid ""
+"The <strong>jurisdiction</strong> is only needed if the endpoint is serving more\n"
+" than one. If the body is running its own endpoint, you can usually leave this blank."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:90
+#: templates/web/default/admin/body-form.html:91
+msgid ""
+"The <strong>send method</strong> determines how problem reports will be sent to the body.\n"
+" If you leave this blank, <strong>send method defaults to email</strong>."
+msgstr ""
+
+#: templates/web/default/open311/index.html:92
+msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:11
+#: templates/web/default/admin/body-form.html:12
+msgid ""
+"The body's <strong>name</strong> identifies the body (for example, <em>Borsetshire District Council</em>)\n"
+" and may be displayed publically."
+msgstr ""
+
+#: templates/web/default/auth/token.html:19
+#: templates/web/default/email_sent.html:6
+msgid "The confirmation email <strong>may</strong> take a few minutes to arrive &mdash; <em>please</em> be patient."
+msgstr ""
+
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:2
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:3
+msgid "The council won&rsquo;t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc."
+msgstr ""
+
+#: templates/web/fixmystreet/questionnaire/index.html:43
+msgid "The details of your problem are available from the other tab above."
+msgstr ""
+
+#: templates/web/default/questionnaire/index.html:49
+msgid "The details of your problem are available on the right hand side of this page."
+msgstr ""
+
+#: templates/web/default/admin/edit-league.html:3
+#: templates/web/default/admin/edit-league.html:4
+msgid "The diligency prize league table shows editors' activity (who's been editing the most records)."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60
+#: perllib/FixMyStreet/App/Controller/Reports.pm:72
+msgid "The error was: %s"
+msgstr ""
+
+#: templates/web/default/open311/index.html:88
+msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
+msgstr ""
+
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:187
+#: perllib/FixMyStreet/Geocode/OSM.pm:165
+msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
+msgstr ""
+
+#: db/alert_types.pl:19 db/alert_types.pl:23 db/alert_types.pl:27
+#: db/alert_types.pl:31
+msgid "The latest local problems reported by users"
+msgstr ""
+
+#: db/alert_types_eha.pl:13
+msgid "The latest local reports reported by users"
+msgstr ""
+
+#: db/alert_types.pl:35
+msgid "The latest problems for {{COUNCIL}} reported by users"
+msgstr ""
+
+#: db/alert_types.pl:39
+msgid "The latest problems for {{COUNCIL}} within {{WARD}} ward reported by users"
+msgstr ""
+
+#: db/alert_types.pl:11
+msgid "The latest problems reported by users"
+msgstr ""
+
+#: db/alert_types.pl:15
+msgid "The latest problems reported fixed by users"
+msgstr ""
+
+#: db/alert_types.pl:43
+msgid "The latest problems within {{NAME}}'s boundary reported by users"
+msgstr ""
+
+#: db/alert_types_eha.pl:9
+msgid "The latest properties reported back to use by users"
+msgstr ""
+
+#: db/alert_types_eha.pl:20
+msgid "The latest reports for {{COUNCIL}} reported by users"
+msgstr ""
+
+#: db/alert_types_eha.pl:24
+msgid "The latest reports for {{COUNCIL}} within {{WARD}} ward reported by users"
+msgstr ""
+
+#: db/alert_types_eha.pl:28
+msgid "The latest reports within {{NAME}}'s boundary reported by users"
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:58
+msgid "The list of available areas is being provided by the MapIt service at %s."
+msgstr ""
+
+#: templates/web/default/auth/change_password.html:12
+#: templates/web/default/auth/change_password.html:16
+msgid "The passwords do not match"
+msgstr ""
+
+#: templates/web/default/errors/page_error_404_not_found.html:11
+#: templates/web/default/errors/page_error_404_not_found.html:12
+msgid "The requested URL '%s' was not found on this server"
+msgstr ""
+
+#: templates/web/default/alert/_list.html:14
+#: templates/web/fixmystreet/alert/_list.html:16
+msgid "The simplest alert is our geographic one:"
+msgstr "Pemberitahuan yang paling mudah adalah jenis geografi kita:"
+
+#: templates/web/default/report/new/councils_extra_text.html:1
+#: templates/web/default/report/new/councils_text_some.html:11
+#: templates/web/default/report/new/fill_in_details_form.html:17
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12
+msgid "The subject and details of the problem will be public, plus your name if you give us permission."
+msgstr ""
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:296
+msgid "The user could not locate the problem on a map, but to see the area around the location they entered"
+msgstr ""
+
+#: templates/web/default/admin/user-form.html:12
+#: templates/web/default/admin/user-form.html:13
+msgid ""
+"The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n"
+" Names are not necessarily unique."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Reports.pm:69
+msgid "There was a problem showing the All Reports page. Please try again later."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Contact.pm:121
+#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59
+msgid "There was a problem showing this page. Please try again later."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:755
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134
+#: templates/web/default/auth/general.html:23
+#: templates/web/fixmystreet/auth/general.html:24
+#: templates/web/zurich/auth/general.html:28
+msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the &lsquo;sign in by email&rsquo; section of the form."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Alert.pm:355
+msgid "There was a problem with your email/password combination. Please try again."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:272
+msgid "There was a problem with your update. Please try again."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Contact.pm:125
+msgid "There were problems with your report. Please see below."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:299
+msgid "There were problems with your update. Please see below."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:108
+#: templates/web/default/admin/body-form.html:109
+msgid ""
+"These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.<br>\n"
+" <strong>You don't need to set them if the Send Method is email.</strong>.\n"
+" For more information on Open311, see \n"
+" <a href='http://www.mysociety.org/2013/01/17/open311-explained/' class='admin-offsite-link'>this article</a>.\n"
+" "
+msgstr ""
+
+#: templates/web/default/open311/index.html:79
+msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future."
+msgstr ""
+
+#: templates/web/default/admin/body.html:33
+msgid ""
+"This body covers no area. This means that it has no jurisdiction over problems reported <em>at any location</em>.\n"
+" Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n"
+" Currently, users <strong>cannot report problems to this body</strong>."
+msgstr ""
+
+#: templates/web/default/admin/body.html:43
+msgid "This body has no contacts. This means that currently problems reported to this body <strong>will not be sent</strong>."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:52
+#: templates/web/default/admin/body-form.html:53
+msgid ""
+"This body will only be sent reports for problems that are located in the <strong>area covered</strong>.\n"
+" A body will not receive any reports unless it covers at least one area."
+msgstr ""
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:385
+msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system."
+msgstr ""
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:388
+msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:898
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:968
+#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:131
+#: perllib/FixMyStreet/Cobrand/UK.pm:58
+msgid "This information is required"
+msgstr ""
+
+#: templates/web/default/debug_header.html:3
+msgid "This is a developer site; things might break at any time, and the database will be periodically deleted."
+msgstr ""
+
+#: templates/web/fixmybarangay/reports/index.html:7
+msgid "This is a summary of all reports on this site; select a particular barangay to see the reports sent there."
+msgstr ""
+
+#: templates/web/emptyhomes/reports/index.html:4
+msgid "This is a summary of all reports on this site; select a particular council to see the empty homes news for that area."
+msgstr ""
+
+#: templates/web/default/reports/index.html:7
+#: templates/web/fiksgatami/nn/reports/index.html:4
+#: templates/web/fiksgatami/reports/index.html:4
+msgid "This is a summary of all reports on this site; select a particular council to see the reports sent there."
+msgstr ""
+
+#: templates/web/default/auth/token.html:9
+msgid "This may be because the link is too old or already used, or the address was not copied correctly."
+msgstr ""
+
+#: templates/web/default/report/banner.html:15
+msgid "This problem has been closed"
+msgstr "Masalah ini telah ditutup"
+
+#: templates/web/default/report/banner.html:12
+#: templates/web/default/report/update-form.html:48
+#: templates/web/emptyhomes/report/banner.html:3
+#: templates/web/fixmystreet/report/update-form.html:46
+msgid "This problem has been fixed"
+msgstr "Masalah ini telah diselesai"
+
+#: templates/web/default/report/update-form.html:43
+#: templates/web/fixmystreet/report/update-form.html:40
+msgid "This problem has not been fixed"
+msgstr "Masalah ini belum diselesai"
+
+#: templates/web/default/report/banner.html:19
+msgid "This problem is in progress"
+msgstr "Masalah ini dalam kemajuan"
+
+#: templates/web/default/report/banner.html:9
+msgid "This problem is old and of unknown status."
+msgstr "Masalah ini lama dan dalam keadaan tidak diketahui."
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:130
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:131
+#: templates/web/zurich/report/_main.html:14
+msgid "This report is awaiting moderation."
+msgstr "Laporan ini menunggui sederhana."
+
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88
+msgid "This report is currently marked as closed."
+msgstr "Laporan ini ditanda sebagai ditutupi sekarang."
+
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86
+msgid "This report is currently marked as fixed."
+msgstr "Laporan ini ditanda sebagai diselesai sekarang."
+
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:90
+msgid "This report is currently marked as open."
+msgstr "Laporan ini ditanda sebagai terbuka sekarang."
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:320
+msgid "This report was submitted anonymously"
+msgstr "Laporan ini dikemukakan tanpa nama"
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:289
+msgid "This web page also contains a photo of the problem, provided by the user."
+msgstr "Laman web tersebut juga mengandungi foto masalah, dibekalkan oleh pengguna."
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1187
+#: templates/web/default/admin/timeline.html:1
+msgid "Timeline"
+msgstr "Garis masa"
+
+#: templates/web/default/admin/flagged.html:15
+#: templates/web/default/admin/reports.html:12
+msgid "Title"
+msgstr "Tajuk"
+
+#: templates/web/default/around/_report_banner.html:2
+msgid "To <strong>report a problem</strong>, click on the map at the correct location."
+msgstr "Untuk <strong>melaporkan masalah</strong>, klik lokasi yang betul atas peta."
+
+#: templates/web/default/alert/index.html:27
+msgid "To find out what local alerts we have for you, please enter your postcode or street name and area"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:295
+msgid "To view a map of the precise location of this issue"
+msgstr "Melihat lokasi tepat atas peta bagi isu ini"
+
+#: templates/web/default/admin/index.html:44
+#: templates/web/default/admin/questionnaire.html:24
+#: templates/web/default/admin/stats.html:24
+#: templates/web/default/admin/stats.html:43
+#: templates/web/zurich/admin/stats.html:30
+msgid "Total"
+msgstr "Jumlah"
+
+#: templates/web/default/js/translation_strings.html:29
+msgid "Try again"
+msgstr "Cuba lagi"
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:46
+#: templates/web/default/report/update-form.html:30
+#: templates/web/default/report/update-form.html:33
+#: templates/web/fixmystreet/report/update-form.html:28
+#: templates/web/fixmystreet/report/update-form.html:31
+msgid "Unable to fix"
+msgstr "Tidak dapat diselesai"
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:51
+#: templates/web/default/admin/update_edit.html:28
+#: templates/web/zurich/admin/report_edit-sdm.html:48
+#: templates/web/zurich/admin/report_edit.html:61
+#: templates/web/zurich/admin/update_edit.html:18
+msgid "Unconfirmed"
+msgstr "Belum dipastikan"
+
+#: templates/web/fixmystreet/report/banner.html:9
+msgid "Unknown"
+msgstr "Tidak diketahui"
+
+#: perllib/FixMyStreet/App/Controller/Rss.pm:173
+msgid "Unknown alert type"
+msgstr "Jenis pemberitahuan tak diketahui"
+
+#: templates/web/default/js/translation_strings.html:39
+msgid "Unknown error"
+msgstr "Ralat tidak diketahui"
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:106
+msgid "Unknown problem ID"
+msgstr "ID masalah tidak diketahui"
+
+#: templates/web/fixmystreet/report/update-form.html:19
+msgid "Update"
+msgstr "Kemas kini"
+
+#: templates/web/default/admin/timeline.html:33
+msgid "Update %s created for problem %d; by %s"
+msgstr "Kemaskini %s dibuat untuk masalah %d; oleh %s"
+
+#: templates/web/default/contact/index.html:21
+#: templates/web/fixmystreet/contact/index.html:38
+msgid "Update below added anonymously at %s"
+msgstr "Kemaskini di bawah ditambahkan tanpa nama pada %s"
+
+#: templates/web/default/contact/index.html:23
+#: templates/web/fixmystreet/contact/index.html:40
+msgid "Update below added by %s at %s"
+msgstr "Kemaskini di bawah ditambah oleh %s pada %s"
+
+#: templates/web/default/admin/body-form.html:233
+#: templates/web/zurich/admin/body-form.html:51
+msgid "Update body"
+msgstr "Kemas kini badan"
+
+#: templates/web/default/admin/index.html:38
+msgid "Update breakdown by state"
+msgstr "Pecahan kemaskini mengikuti negeri"
+
+#: db/alert_types.pl:7
+msgid "Update by {{name}}"
+msgstr "Kemas kini dengan {{name}}"
+
+#: templates/web/default/admin/update_edit.html:42
+#: templates/web/zurich/admin/update_edit.html:25
+msgid "Update changed problem state to %s"
+msgstr "Kemas kini mengubahi keadaan masalah kepada %s"
+
+#: templates/web/default/admin/update_edit.html:44
+msgid "Update marked problem as fixed"
+msgstr "Kemas kini menanda masalah sebagai diselesai"
+
+#: templates/web/default/admin/update_edit.html:46
+msgid "Update reopened problem"
+msgstr "Kemas kini masalah dibuka semula"
+
+#: templates/web/default/admin/body.html:83
+msgid "Update statuses"
+msgstr "Status kemas kini"
+
+#: templates/web/default/report/update-form.html:22
+msgid "Update:"
+msgstr "Kemas kini:"
+
+#: templates/web/zurich/admin/index-dm.html:23
+#: templates/web/zurich/admin/index-sdm.html:21
+#: templates/web/zurich/admin/reports.html:13
+msgid "Updated"
+msgstr "Dikemas kinikan"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1007
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1051
+#: perllib/FixMyStreet/App/Controller/Admin.pm:801
+#: perllib/FixMyStreet/App/Controller/Admin.pm:949
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:550
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:619
+msgid "Updated!"
+msgstr "Dikemas kinikan!"
+
+#: templates/web/default/admin/list_updates.html:2
+#: templates/web/default/report/update.html:3
+#: templates/web/fixmystreet/report/update.html:3
+#: templates/web/zurich/admin/list_updates.html:24
+#: templates/web/zurich/report/updates.html:2
+msgid "Updates"
+msgstr "Kemas kini"
+
+#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+#, fuzzy
+msgid "Updates are limited to %s characters in length. Please shorten your update"
+msgstr "Kemas kini adalah diterhad kepada 2000 panjang perkataan. Sila memendekkan kemas kini anda"
+
+#: db/alert_types.pl:5 db/alert_types.pl:6
+msgid "Updates on {{title}}"
+msgstr "Kemas kini atas {{title}}"
+
+#: templates/web/default/report/display.html:0
+#: templates/web/default/report/display.html:5
+#: templates/web/fixmystreet/report/display.html:0
+#: templates/web/fixmystreet/report/display.html:8
+msgid "Updates to this problem, FixMyStreet"
+msgstr "Kemas kini masalah ini, FixMyStreet"
+
+#: templates/web/default/admin/body.html:153
+msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body."
+msgstr "Gunakan <strong>nota</strong> untuk melaporkan maklumat yang hanya dipaparkan kepada admin. Nota tidak akan dipapar secara awam dan tidak akan dihantar kepada badan."
+
+#: templates/web/zurich/admin/list_updates.html:30
+#: templates/web/zurich/admin/list_updates.html:9
+msgid "User"
+msgstr "Pengguna"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1351
+msgid "User flag removed"
+msgstr "Tanda pengguna dipadam"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1323
+msgid "User flagged"
+msgstr "Pengguna ditanda"
+
+#: templates/web/default/admin/users.html:5
+msgid "User search finds matches in users' names and email addresses."
+msgstr "Carian pengguna mencari padanan dalam nama dan alamat emel pengguna."
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1189
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:304
+#: templates/web/default/admin/flagged.html:29
+#: templates/web/zurich/header.html:69
+msgid "Users"
+msgstr "Pengguna"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:371
+#: perllib/FixMyStreet/App/Controller/Admin.pm:401
+msgid "Values updated"
+msgstr "Nilai dikemaskinikan"
+
+#: templates/web/default/admin/report_edit.html:18
+#: templates/web/default/admin/update_edit.html:18
+#: templates/web/zurich/admin/report_edit-sdm.html:24
+#: templates/web/zurich/admin/report_edit.html:23
+#: templates/web/zurich/admin/update_edit.html:10
+msgid "View report on site"
+msgstr "Melihat laporan di laman"
+
+#: templates/web/default/reports/body.html:14
+msgid "View reports by ward"
+msgstr "Melihat laporan dengan kawasan pentadbiran"
+
+#: templates/web/emptyhomes/tokens/confirm_problem.html:39
+msgid "View your report"
+msgstr "Melihat laporan anda"
+
+#: templates/web/default/around/display_location.html:0
+#: templates/web/default/around/display_location.html:34
+msgid "Viewing a location"
+msgstr "Melihat lokasi"
+
+#: templates/web/default/report/display.html:0
+#: templates/web/fixmystreet/report/display.html:0
+msgid "Viewing a problem"
+msgstr "Melihat masalah"
+
+#: templates/web/default/reports/body.html:16
+msgid "Wards of this council"
+msgstr "Kawasan pentadbiran majlis ini"
+
+#: templates/web/default/alert/choose.html:6
+#: templates/web/default/around/around_index.html:13
+#: templates/web/fixmystreet/around/around_index.html:16
+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 "Kita mendapati lebih daripada satu bersesuaian bagi lokasi tersebut. Kita menunjukkan sehingga sepuluh bersesuaian, sila cuba dengan carian lain jika carian anda tidak didapati di sini. "
+
+#: templates/web/default/auth/token.html:8
+msgid "We have not been able to confirm your account - sorry."
+msgstr "Kita belum dapat mengesahkan akaun anda - maaf."
+
+#: templates/web/default/auth/token.html:16
+msgid "We have sent you an email containing a link to confirm your account."
+msgstr "Kita telah menghantarkan anda emel yang mengandungi link untuk mengesahkan akaun anda."
+
+#: templates/web/emptyhomes/tokens/confirm_problem.html:19
+#: templates/web/emptyhomes/tokens/confirm_problem.html:20
+msgid "We may contact you periodically to ask if anything has changed with the property you reported."
+msgstr "Kita mungkin akan menghubungi anda secara berkala demi menyanyai sebarang perubahan dengan bangunan yang dilaporkan anda."
+
+#: templates/web/fixmystreet/report/update-form.html:115
+msgid "We never show your email"
+msgstr "Kita tidak akan mempaprkan emel anda"
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:134
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:201
+#: templates/web/zurich/report/new/fill_in_details_form.html:96
+msgid "We never show your email address or phone number."
+msgstr "Kita tidak akan mempaparkan alamat emel atau nombor telefon anda."
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:394
+msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch."
+msgstr "Kita sedar bahawa masalah ini mungkin tanggungjawab %s; tetapi, pada masa kini kita tiada maklumat hubungan mereka. Jika anda tahu hubungan sewajanya, sila menghubungi mereka"
+
+#: templates/web/default/index-steps.html:31
+msgid "We send it to the council on your behalf"
+msgstr "Kita menghantar kepada majlis bagi pihak anda"
+
+#: templates/web/default/report/new/notes.html:5
+#: templates/web/fixmybarangay/report/new/notes.html:5
+msgid "We will only use your personal information in accordance with our <a href=\"/faq#privacy\">privacy policy.</a>"
+msgstr ""
+
+#: templates/web/fixmystreet/report/new/notes.html:4
+msgid "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>"
+msgstr ""
+
+#: templates/web/emptyhomes/contact/blurb.html:2
+msgid "We&rsquo;d love to hear what you think about this website. Just fill in the form. Please don&rsquo;t contact us about individual empty homes; use the box accessed from <a href=\"/\">the front page</a>."
+msgstr ""
+
+#: templates/web/default/contact/blurb.html:8
+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 ""
+
+#: templates/web/default/admin/body.html:61
+#: templates/web/default/admin/body_edit.html:82
+#: templates/web/zurich/admin/body.html:17
+msgid "When edited"
+msgstr "Bila diedit"
+
+#: templates/web/default/admin/problem_row.html:35
+msgid "When sent"
+msgstr "Bila dihantar"
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:621
+msgid "Whole block of empty flats"
+msgstr "Seluruh blok flat kosong"
+
+#: templates/web/default/open311/index.html:94
+msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>."
+msgstr ""
+
+#: templates/web/fixmystreet/footer.html:24
+msgid "Would you like better integration with FixMyStreet? <a href=\"http://www.mysociety.org/for-councils/fixmystreet/\">Find out about FixMyStreet for councils</a>."
+msgstr ""
+
+#: templates/web/fixmystreet/footer.html:20
+msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>."
+msgstr ""
+
+#: templates/web/default/questionnaire/index.html:106
+#: templates/web/fixmystreet/questionnaire/index.html:96
+msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
+msgstr ""
+
+#: templates/web/default/report/new/notes.html:8
+#: templates/web/fixmybarangay/report/new/notes.html:8
+#: templates/web/fixmystreet/report/new/notes.html:8
+msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
+msgstr ""
+
+#: templates/web/default/admin/stats.html:10
+msgid "Year"
+msgstr "Tahun"
+
+#: templates/web/default/admin/bodies.html:57
+#: templates/web/default/admin/body.html:68
+#: templates/web/default/admin/body.html:69
+#: templates/web/default/admin/body.html:70
+#: templates/web/default/admin/body_edit.html:5
+#: templates/web/default/admin/flagged.html:47
+#: templates/web/default/admin/list_updates.html:32
+#: templates/web/default/admin/list_updates.html:34
+#: templates/web/default/admin/list_updates.html:35
+#: templates/web/default/admin/problem_row.html:20
+#: templates/web/default/admin/report_edit.html:63
+#: templates/web/default/admin/report_edit.html:77
+#: templates/web/default/admin/update_edit.html:24
+#: templates/web/default/admin/users.html:29
+#: templates/web/default/questionnaire/creator_fixed.html:14
+#: templates/web/default/questionnaire/index.html:109
+#: templates/web/default/questionnaire/index.html:66
+#: templates/web/fixmystreet/questionnaire/index.html:60
+#: templates/web/fixmystreet/questionnaire/index.html:99
+msgid "Yes"
+msgstr "Ya"
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:161
+#: templates/web/fixmystreet/report/update-form.html:89
+msgid "Yes I have a password"
+msgstr "Ya aku ada kata laluan"
+
+#: templates/web/default/contact/index.html:37
+#: templates/web/fixmystreet/contact/index.html:54
+msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:"
+msgstr ""
+
+#: templates/web/default/contact/index.html:15
+#: templates/web/fixmystreet/contact/index.html:32
+msgid "You are reporting the following update for being abusive, containing personal information, or similar:"
+msgstr ""
+
+#: templates/web/default/tokens/confirm_problem.html:20
+#: templates/web/default/tokens/confirm_problem.html:21
+#: templates/web/zurich/tokens/confirm_problem.html:6
+#: templates/web/zurich/tokens/confirm_problem.html:8
+msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
+msgstr ""
+
+#: templates/web/default/admin/user-form.html:47
+msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
+msgstr ""
+
+#: templates/web/fixmystreet/contact/index.html:118
+msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
+msgstr ""
+
+#: templates/web/default/admin/flagged.html:5
+msgid ""
+"You can flag any report or user by editing them, and they will be listed on this page.\n"
+" For example, this can useful if you want to keep an eye on a user who has posted inappropriate\n"
+" reports in the past."
+msgstr ""
+
+#: templates/web/default/report/new/councils_text_none.html:19
+#: templates/web/default/report/new/councils_text_none.html:20
+#: templates/web/default/report/new/councils_text_some.html:21
+#: templates/web/default/report/new/councils_text_some.html:22
+msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:81
+msgid "You can mark a body as deleted if you do not want it to be active on the site."
+msgstr ""
+
+#: templates/web/default/js/translation_strings.html:36
+msgid "You declined; please fill in the box above"
+msgstr "Anda menolak; sila isikan kotak di atas"
+
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38
+msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
+msgstr ""
+
+#: templates/web/default/questionnaire/index.html:96
+#: templates/web/default/report/new/fill_in_details_form.html:93
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:90
+#: templates/web/fixmystreet/questionnaire/index.html:87
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:99
+#: templates/web/zurich/report/new/fill_in_details_form.html:75
+msgid "You have already attached a photo to this report, attaching another one will replace it."
+msgstr "Anda telah melampirkan foto untuk laporan ini, lampiran yang lain akan menggantikannya."
+
+#: templates/web/default/report/update-form.html:59
+#: templates/web/fixmystreet/report/update-form.html:56
+msgid "You have already attached a photo to this update, attaching another one will replace it."
+msgstr "Anda telah melampirkan foto untuk kemas kini ini, lampiran yang lain akan menggantikannya."
+
+#: templates/web/default/auth/sign_out.html:3
+#: templates/web/zurich/auth/sign_out.html:3
+msgid "You have been signed out"
+msgstr "Anda telah dilog keluarkan"
+
+#: templates/web/default/report/new/fill_in_details_form.html:7
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:7
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:28
+#: templates/web/zurich/report/new/fill_in_details_form.html:13
+msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. "
+msgstr "Anda telah menunjukkan masalah pada titik atas peta yang ditanda pin hijau. Jika lokasi ini tidak betul, sila klik atas peta lagi."
+
+#: templates/web/default/tokens/confirm_alert.html:7
+msgid "You have successfully confirmed your alert."
+msgstr "Anda telah berjaya memastikan pemberitahuan anda."
+
+#: templates/web/zurich/tokens/confirm_problem.html:6
+msgid "You have successfully confirmed your email address."
+msgstr "Anda telah berjaya memastikan alamat emel anda."
+
+#: templates/web/default/tokens/confirm_problem.html:15
+msgid "You have successfully confirmed your problem"
+msgstr "Anda telah berjaya memastikan masalah anda"
+
+#: templates/web/default/tokens/confirm_update.html:12
+msgid "You have successfully confirmed your update and you can now <a href=\"%s\">view it on the site</a>."
+msgstr "Anda telah berjaya memastikan kemaskini anda dan anda boleh <a href=\"%s\">melihat di laman</a> sekarang."
+
+#: templates/web/default/tokens/confirm_alert.html:11
+msgid "You have successfully created your alert."
+msgstr "Anda telah berjaya menambah pemberitahuan anda."
+
+#: templates/web/default/tokens/confirm_alert.html:9
+msgid "You have successfully deleted your alert."
+msgstr "Anda telah berjaya memadam pemberitahuan anda."
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:762
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:140
+msgid "You have successfully signed in; please check and confirm your details are accurate:"
+msgstr "Anda telah berjaya log masuk; sila semak dan pastikan maklumat anda adalah tepat: "
+
+#: templates/web/default/my/my.html:17 templates/web/fixmystreet/my/my.html:17
+msgid "You haven&rsquo;t created any reports yet. <a href=\"%s\">Report a problem now.</a>"
+msgstr ""
+
+#: templates/web/default/email_sent.html:13
+msgid "You must now click the link in the email we've just sent you."
+msgstr "Anda mesti mengklikkan link dalam emel yang dihantar kepada anda."
+
+#: templates/web/default/admin/index.html:7
+msgid "You need to <a href=\"%s\">add some bodies</a> (such as councils or departments) before any reports can be sent."
+msgstr "Anda perlu <a href=\"%s\">tambah badan</a>(seperti majlis atau jabatan) sebelum laporan mana-mana boleh dihantar."
+
+#: templates/web/default/admin/bodies.html:9
+msgid ""
+"You need to add bodies (such as councils or departments) so that you can then add\n"
+" the categories of problems they can handle (such as potholes or streetlights) and the\n"
+" contacts (such as an email address) to which reports are sent."
+msgstr ""
+"Anda perlu menambahkan badan (majlis atau jabatan) supaya anda boleh menambahkan\n"
+"kategori masalah yang mereka boleh mengendalikan (sepertinya jalan berlubang atau jampu jalan) dan\n"
+"maklumat hubungan (seperti alamat emel) yang laporan akan dihantarkan."
+
+#: templates/web/default/admin/report_edit.html:71
+msgid "You really want to resend?"
+msgstr "Pastikan anda menghantar lagi?"
+
+#: templates/web/default/my/my.html:0 templates/web/default/my/my.html:14
+#: templates/web/default/my/my.html:3 templates/web/fixmystreet/my/my.html:0
+#: templates/web/fixmystreet/my/my.html:14
+#: templates/web/fixmystreet/my/my.html:3
+msgid "Your Reports"
+msgstr "Laporan Anda"
+
+#: templates/web/fixmystreet/alert/_list.html:89
+#: templates/web/fixmystreet/alert/updates.html:19
+#: templates/web/fixmystreet/alert/updates.html:22
+#: templates/web/fixmystreet/contact/index.html:88
+#: templates/web/fixmystreet/report/display.html:65
+#: templates/web/fixmystreet/report/display.html:67
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:115
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:147
+#: templates/web/zurich/report/new/fill_in_details_form.html:88
+msgid "Your email"
+msgstr "Emel Anda"
+
+#: templates/web/fixmystreet/auth/general.html:26
+#: templates/web/fixmystreet/report/update-form.html:80
+#: templates/web/zurich/auth/general.html:30
+#: templates/web/zurich/auth/general.html:58
+msgid "Your email address"
+msgstr "Alamat emel anda"
+
+#: templates/web/default/auth/general.html:27
+msgid "Your email address:"
+msgstr "Alamat emel anda:"
+
+#: templates/web/default/alert/_list.html:92
+#: templates/web/default/report/new/fill_in_details_form.html:124
+#: templates/web/default/report/update-form.html:81
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:133
+#: templates/web/fixmybarangay/alert/_list.html:37
+msgid "Your email:"
+msgstr "Emel anda:"
+
+#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7
+msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>"
+msgstr "Maklumat anda akan digunakan mengikuti <a href=\"/privacy\">dasar privasi</a> kita"
+
+#: templates/web/fixmystreet/auth/general.html:57
+#: templates/web/fixmystreet/contact/index.html:81
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:124
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:192
+#: templates/web/fixmystreet/report/update-form.html:140
+#: templates/web/zurich/auth/general.html:61
+#: templates/web/zurich/report/new/fill_in_details_form.html:104
+msgid "Your name"
+msgstr "Nama anda"
+
+#: templates/web/default/auth/general.html:59
+#: templates/web/default/contact/index.html:68
+#: templates/web/default/report/new/fill_in_details_form.html:203
+#: templates/web/default/report/update-form.html:151
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:124
+msgid "Your name:"
+msgstr "Nama anda:"
+
+#: templates/web/fixmystreet/auth/general.html:41
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:166
+#: templates/web/fixmystreet/report/update-form.html:94
+#: templates/web/zurich/auth/general.html:34
+msgid "Your password"
+msgstr "Kata laluan anda"
+
+#: templates/web/default/auth/change_password.html:6
+msgid "Your password has been changed"
+msgstr "Kata laluan anda telah diubahi"
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:139
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:206
+#: templates/web/zurich/report/new/fill_in_details_form.html:110
+msgid "Your phone number"
+msgstr "Nombor telefon anda"
+
+#: templates/web/fixmystreet/questionnaire/index.html:15
+msgid "Your report"
+msgstr "Laporan anda"
+
+#: templates/web/default/report_created.html:6
+msgid "Your report has been created and will shortly be sent."
+msgstr "Laporan anda telah dibuat dan akan dihantar sebentar."
+
+#: templates/web/default/footer.html:9 templates/web/fiksgatami/footer.html:6
+#: templates/web/fiksgatami/nn/footer.html:6
+#: templates/web/fixmystreet/footer.html:49
+msgid "Your reports"
+msgstr "Laporan anda"
+
+#: templates/web/default/my/my.html:50 templates/web/fixmystreet/my/my.html:56
+msgid "Your updates"
+msgstr "Kemas kini anda"
+
+#: templates/web/default/contact/index.html:76
+msgid "Your&nbsp;email:"
+msgstr "Emel anda:"
+
+#: templates/web/default/admin/timeline.html:4
+msgid "by %s"
+msgstr "dari %s"
+
+#: templates/web/default/reports/body.html:6
+#: templates/web/default/reports/body.html:7
+msgid "council"
+msgstr "majlis"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+msgid "council ref:&nbsp;%s"
+msgstr "Rujukan majlis:&nbsp;%s"
+
+#: templates/web/default/admin/report_edit.html:28
+#: templates/web/zurich/admin/report_edit-sdm.html:43
+#: templates/web/zurich/admin/report_edit.html:57
+msgid "didn't use map"
+msgstr "tidak mengguna peta"
+
+#: templates/web/default/alert/index.html:33
+#: templates/web/fixmystreet/around/postcode_form.html:20
+msgid "e.g. ‘%s’ or ‘%s’"
+msgstr "seperti ‘%s’ atau ‘%s’"
+
+#: templates/web/default/admin/flagged.html:51
+msgid "edit user"
+msgstr "edit pengguna"
+
+#: templates/web/default/admin/index.html:23
+#: templates/web/zurich/admin/index.html:5
+msgid "from %d different users"
+msgstr "dari %d pengguna lain"
+
+#: templates/web/fixmystreet/report/_item.html:17
+#: templates/web/zurich/report/_item.html:16
+msgid "last updated %s"
+msgstr "kemaskini yang lepas %s"
+
+#: perllib/Utils.pm:265
+msgid "less than a minute"
+msgstr "kurang dari seminit"
+
+#: templates/web/default/report/updates.html:57
+msgid "marked as a duplicate report"
+msgstr "ditanda sebagai laporan salinan"
+
+#: templates/web/default/report/updates.html:47
+msgid "marked as action scheduled"
+msgstr "ditanda sebagai tindakan dijadualkan"
+
+#: templates/web/default/report/updates.html:59
+msgid "marked as an internal referral"
+msgstr "ditanda sebagai rujukan dalaman"
+
+#: templates/web/default/report/updates.html:49
+msgid "marked as closed"
+msgstr "ditanda sebagai ditutupi"
+
+#: templates/web/default/report/updates.html:28
+#: templates/web/default/report/updates.html:51
+msgid "marked as fixed"
+msgstr "ditanda sebagai diselesai"
+
+#: templates/web/default/report/updates.html:45
+msgid "marked as in progress"
+msgstr "ditanda sebagai dijalani"
+
+#: templates/web/default/report/updates.html:41
+msgid "marked as investigating"
+msgstr "ditanda sebagai disiasati"
+
+#: templates/web/default/report/updates.html:55
+msgid "marked as not the council's responsibility"
+msgstr "ditanda sebagai bukan tanggungjawab majlis"
+
+#: templates/web/default/report/updates.html:43
+msgid "marked as planned"
+msgstr "ditanda sebagai dijadual"
+
+#: templates/web/default/report/updates.html:53
+msgid "marked as unable to fix"
+msgstr "ditanda sebagai tak boleh dibaiki"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:130
+#: templates/web/default/admin/questionnaire.html:15
+#: templates/web/default/admin/questionnaire.html:16
+msgid "n/a"
+msgstr "tiada"
+
+#: templates/web/default/alert/_list.html:87
+#: templates/web/fixmybarangay/alert/_list.html:32
+#: templates/web/fixmystreet/alert/_list.html:85
+msgid "or"
+msgstr "atau"
+
+#: templates/web/default/js/translation_strings.html:27
+msgid "or locate me automatically"
+msgstr "atau mengesan aku secara automatik"
+
+#: templates/web/default/admin/report_edit.html:25
+#: templates/web/default/admin/report_edit.html:26
+#: templates/web/zurich/admin/report_edit-sdm.html:31
+#: templates/web/zurich/admin/report_edit-sdm.html:32
+#: templates/web/zurich/admin/report_edit-sdm.html:40
+#: templates/web/zurich/admin/report_edit-sdm.html:41
+#: templates/web/zurich/admin/report_edit.html:31
+#: templates/web/zurich/admin/report_edit.html:32
+#: templates/web/zurich/admin/report_edit.html:42
+#: templates/web/zurich/admin/report_edit.html:43
+#: templates/web/zurich/admin/report_edit.html:54
+#: templates/web/zurich/admin/report_edit.html:55
+msgid "originally entered: &ldquo;%s&rdquo;"
+msgstr "pemasukan asal: &ldquo;%s&rdquo;"
+
+#: templates/web/default/admin/report_edit.html:30
+msgid "other areas:"
+msgstr "kawasan lain:"
+
+#: templates/web/default/report/updates.html:29
+#: templates/web/default/report/updates.html:39
+msgid "reopened"
+msgstr "dibuka semula"
+
+#: templates/web/fixmybarangay/header.html:67
+#: templates/web/fixmystreet/header.html:54
+#: templates/web/zurich/footer.html:12
+msgid "sign out"
+msgstr "log keluar"
+
+#: templates/web/default/report/new/fill_in_details_form.html:12
+#: templates/web/default/report/new/fill_in_details_form.html:14
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:12
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:14
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:7
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:9
+msgid "the local council"
+msgstr "majlis tempatan"
+
+#: templates/web/default/report/_main.html:6
+#: templates/web/zurich/report/_main.html:5
+msgid "there is no pin shown as the user did not use the map"
+msgstr "pin tidak ditunjukkan sebab pengguna tidak menggunakan peta"
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:370
+msgid "this type of local problem"
+msgstr "jenis masalah tempatan ini"
+
+#: perllib/Utils.pm:237
+msgid "today"
+msgstr "hari ini"
+
+#: templates/web/default/admin/report_edit.html:28
+#: templates/web/zurich/admin/report_edit-sdm.html:43
+#: templates/web/zurich/admin/report_edit.html:57
+msgid "used map"
+msgstr "peta diguna"
+
+#: templates/web/default/admin/update_edit.html:35
+msgid "user is from same council as problem - %d"
+msgstr "pengguna adalah dari majlis yang sama dengan masalah - %d"
+
+#: templates/web/default/admin/update_edit.html:38
+msgid "user is problem owner"
+msgstr "pengguna adalah pemilik masalah"
+
+#: templates/web/default/reports/body.html:0
+#: templates/web/default/reports/body.html:3
+msgid "ward"
+msgstr "kawasan pentadbiran"
+
+#: templates/web/default/front/stats.html:17
+#, perl-format
+msgid "<big>%s</big> report recently"
+msgid_plural "<big>%s</big> reports recently"
+msgstr[0] "<big>%s</big> laporan baru-baru ini"
+
+#: perllib/Utils.pm:284
+#, perl-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d jam"
+
+#: templates/web/default/report/_support.html:6
+#, perl-format
+msgid "%d supporter"
+msgid_plural "%d supporters"
+msgstr[0] "%d penyokong"
+
+#: perllib/Utils.pm:286
+#, perl-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minit"
+
+#: templates/web/default/front/stats.html:29
+#, perl-format
+msgid "<big>%s</big> update on reports"
+msgid_plural "<big>%s</big> updates on reports"
+msgstr[0] "<big>%s</big> laporan dikemaskini"
+
+#: templates/web/emptyhomes/report/new/councils_text_none.html:3
+#, perl-format
+msgid "We do not yet have details for the council that covers this location."
+msgid_plural "We do not yet have details for the councils that cover this location."
+msgstr[0] "Kita belum ada maklumat tentang majlis yang menutupi lokasi ini"
+
+#: perllib/Utils.pm:280
+#, perl-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "%d minggu"
+
+#: templates/web/default/front/stats.html:12
+#, perl-format
+msgid "<big>%s</big> report in past week"
+msgid_plural "<big>%s</big> reports in past week"
+msgstr[0] "<big>%s</big> laporan di minggu lepas"
+
+#: templates/web/default/front/stats.html:23
+#, perl-format
+msgid "<big>%s</big> fixed in past month"
+msgid_plural "<big>%s</big> fixed in past month"
+msgstr[0] "<big>%s</big> diselesai di bulan lepas"
+
+#: perllib/Utils.pm:282
+#, perl-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d hari"
+
+#: templates/web/default/report/new/councils_text_some.html:14
+#, perl-format
+msgid "We do <strong>not</strong> yet have details for the other council that covers this location."
+msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location."
+msgstr[0] "Kita <strong>belum</strong> ada maklumat tentang majlis lain yang menutupi lokasi ini."
+
+#~ msgid "Click on the map to report a problem"
+#~ msgstr "Klik peta untuk melaporkan masalah"
+
+#~ msgid "First Name"
+#~ msgstr "Nama Pertama"
+
+#~ msgid "Incident Category"
+#~ msgstr "Kategori Kejadian"
+
+#~ msgid "Last Name"
+#~ msgstr "Nama Akhir"
+
+#~ msgid "Name (optional)"
+#~ msgstr "Nama (tidak diwajibkan)"
+
+#~ msgid "Please choose a transport category"
+#~ msgstr "Sila pilihkan kategori pengangkutan"
+
+#~ msgid "Please choose an incident category"
+#~ msgstr "Sila pilihkan kategori kejadian"
+
+#~ msgid "Transport Category"
+#~ msgstr "Kategori pengangkutan"
+
+#~ msgid "Your email (optional)"
+#~ msgstr "Emel Anda (tidak diwajibkan)"
+
+#~ msgid "Your first name"
+#~ msgstr "Nama pertama anda"
+
+#~ msgid "Your last name"
+#~ msgstr "Nama akhir anda"
diff --git a/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po
new file mode 100644
index 000000000..f9bed9d89
--- /dev/null
+++ b/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -0,0 +1,4407 @@
+# FixMyStreet original .po file, autogenerated by gettext-extract.
+# Copyright (C) 2011 UK Citizens Online Democracy
+# This file is distributed under the same license as the main FixMyStreet code.
+# Matthew Somerville <matthew@mysociety.org>, 2011-06-03.
+#
+# Translators:
+# berrycake <berrycake.net@gmail.com>, 2014
+# compunuts <compunuts@yahoo.com>, 2014
+# Soemoe Lwin <htetaunglwin112@gmail.com>, 2014
+# Pyae Sone <gipsyhnh@gmail.com>, 2014
+# chitko <saintjohn769@gmail.com>, 2014
+# Thyu Naung <thyunaung@yahoo.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: fixmystreet\n"
+"Report-Msgid-Bugs-To: matthew@mysociety.org\n"
+"POT-Creation-Date: 2014-05-16 17:30+0100\n"
+"PO-Revision-Date: 2014-03-22 07:59+0000\n"
+"Last-Translator: Soemoe Lwin <htetaunglwin112@gmail.com>\n"
+"Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/fixmystreet/language/my_MM/)\n"
+"Language: my_MM\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:604
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383
+msgid " and "
+msgstr "ႏွင့္"
+
+#: templates/web/default/tokens/confirm_problem.html:15
+#: templates/web/default/tokens/confirm_problem.html:17
+msgid " and <strong>we will now send it to the council</strong>"
+msgstr "ႏွင့္<strong> ေကာင္စီသို႔ ကၽြႏ္ုပ္တို႔မွယခုပင္ပို႔ပါလိမ့္မည္</strong>"
+
+#: templates/web/default/report/new/councils_text_all.html:12
+#: templates/web/default/report/new/councils_text_all.html:19
+#: templates/web/default/report/new/councils_text_all.html:5
+#: templates/web/default/report/new/councils_text_none.html:19
+#: templates/web/default/report/new/councils_text_none.html:21
+#: templates/web/default/report/new/councils_text_some.html:21
+#: templates/web/default/report/new/councils_text_some.html:23
+#: templates/web/default/report/new/councils_text_some.html:5
+#: templates/web/emptyhomes/report/new/councils_text_all.html:3
+msgid " or "
+msgstr "သို႔မဟုတ္"
+
+#: templates/web/default/admin/bodies.html:46
+msgid "%d addresses"
+msgstr "%d လိပ္စာမ်ား"
+
+#: templates/web/default/admin/index.html:25
+msgid "%d confirmed alerts, %d unconfirmed"
+msgstr "%d အတည္ျပဳျခင္းသတိေပးခ်က္ %dအတည္မျပဳရေသး"
+
+#: templates/web/default/admin/index.html:27
+#: templates/web/zurich/admin/index.html:6
+msgid "%d council contacts &ndash; %d confirmed, %d unconfirmed"
+msgstr "%ေကာင္စီအဆက္အသြယ္ &ndash; %d အတည္ျပဳျပီးျပီ %dအတည္မျပဳရေသး"
+
+#: templates/web/default/admin/edit-league.html:12
+msgid "%d edits by %s"
+msgstr "%s မွ %d ကိုျပင္ဆင္ခဲ့သည္"
+
+#: templates/web/default/admin/index.html:24
+msgid "%d live updates"
+msgstr "%d တိုက္ရိုက္အသစ္ရယူျခင္:"
+
+#: templates/web/default/admin/index.html:26
+msgid "%d questionnaires sent &ndash; %d answered (%s%%)"
+msgstr "%d စစ်တမ်းမေးခွန်းလွှာပို့ပြီး &ndash; %d အဖြေ (%s%%)"
+
+#: templates/web/default/pagination.html:10
+msgid "%d to %d of %d"
+msgstr "%d မွ %d ၏ %d သို႔"
+
+#: templates/web/default/reports/body.html:0
+#: templates/web/default/reports/body.html:22
+msgid "%s - Summary reports"
+msgstr "အက်ဥ္းခ်ဳပ္ အစီရင္ခံစာမ်ား"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:653
+msgid "%s ref:&nbsp;%s"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
+msgid "%s ward, %s"
+msgstr "%sရပ္ကြက္၊ %s"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:540
+msgid "%s, reported at %s"
+msgstr "%s သတင္းပို႔သည္မွာ %s"
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:309
+msgid "%s, within %s ward"
+msgstr "%s၊ %s ရပ္ကြက္အတြင္း"
+
+#: templates/web/default/email_sent.html:29
+msgid "(Don't worry &mdash; we'll hang on to your alert while you're checking your email.)"
+msgstr "(စိတ္မပူပါႏွင့္။ သင္ အီးေမးလ္ စစ္ေဆးေနခ်ိန္တြင္ ကၽြႏု္ပ္တို႔က သင္၏ သတိေပးခ်က္ကို ထိန္းသိမ္းထားပါမည္။)"
+
+#: templates/web/default/email_sent.html:25
+msgid "(Don't worry &mdash; we'll hang on to your problem report while you're checking your email.)"
+msgstr "(စိတ္မပူပါႏွင့္။ သင္ အီးေမးလ္ စစ္ေဆးေနခ်ိန္တြင္ ကၽြႏု္ပ္တို႔က သင္၏ ျပႆနာ အစီရင္ခံစာကို ထိန္းသိမ္းထားပါမည္။)"
+
+#: templates/web/default/email_sent.html:27
+msgid "(Don't worry &mdash; we'll hang on to your update while you're checking your email.)"
+msgstr "(စိတ္မပူပါႏွင့္။ သင္ အီးေမးလ္ စစ္ေဆးေနခ်ိန္တြင္ ကၽြႏု္ပ္တို႔က သင္၏ ေနာက္ဆံုး ျပဳျပင္ထားသည့္ အခ်က္အလက္ကို ထိန္းသိမ္းထားပါမည္။)"
+
+#: templates/web/default/admin/report_blocks.html:11
+#: templates/web/default/admin/users.html:29
+msgid "(Email in abuse table)"
+msgstr "(ရိုင္းစိုင္းစြာေျပာသည့္ဇယားတြင္ရွိအီးေမးလ္)"
+
+#: templates/web/default/alert/_list.html:20
+#: templates/web/fixmystreet/alert/_list.html:24
+msgid "(a default distance which covers roughly 200,000 people)"
+msgstr "(လူအေယာက္ ၂၀၀ ၀၀၀ ကိုအၾကမ္းအားျဖင့္လႊမ္းမိုးႏိုင္ေသာပံုမွန္အကြာအေ၀း)"
+
+#: templates/web/default/alert/_list.html:25
+#: templates/web/fixmystreet/alert/_list.html:28
+msgid "(alternatively the RSS feed can be customised, within"
+msgstr "(ေျပာင္းျပန္အားျဖင့္ RSS Feed ကိုျပဳျပင္ႏိုင္ျပီး၊ အေတာအတြင္း"
+
+#: templates/web/default/around/around_map_list_items.html:12
+#: templates/web/default/around/on_map_list_items.html:9
+#: templates/web/fixmystreet/report/_item.html:27
+#: templates/web/zurich/report/_item.html:21
+msgid "(closed)"
+msgstr "(ပိတ္ထားသည္)"
+
+#: templates/web/default/around/around_map_list_items.html:10
+#: templates/web/default/around/on_map_list_items.html:7
+#: templates/web/fixmystreet/report/_item.html:25
+#: templates/web/zurich/report/_item.html:19
+msgid "(fixed)"
+msgstr "(ျပင္ျပီးျပီ)"
+
+#: templates/web/default/index.html:12 templates/web/default/index.html:9
+#: templates/web/fixmystreet/around/intro.html:2
+msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
+msgstr "(ဂရပ္ဖီတီ၊ စည္းကမ္းမဲ့ အမိႈ္က္စြန္႔ပစ္ျခင္း၊ လမ္းေဘးပလက္ေဖာင္းအုတ္ခဲမ်ားက်ိဳးပဲ့မႈ သို႔မဟုတ္ လမ္းမီးမလာျခင္းကဲ့သို႔)"
+
+#: templates/web/default/reports/_list-entry.html:4
+#: templates/web/fixmystreet/report/_item.html:21
+msgid "(not sent to council)"
+msgstr "(ေကာင္စီသို႔မပို႔ပါ)"
+
+#: templates/web/default/report/new/fill_in_details_form.html:217
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:140
+#: templates/web/zurich/report/new/fill_in_details_form.html:100
+msgid "(optional)"
+msgstr "(ေရြးခ်ယ္ႏိုင္ခြင့္)"
+
+#: templates/web/default/reports/_list-entry.html:2
+#: templates/web/fixmystreet/report/_item.html:20
+msgid "(sent to both)"
+msgstr "(ႏွစ္ခုလံုးသို႔ပို႔မည္)"
+
+#: templates/web/default/report/new/fill_in_details_form.html:211
+msgid "(we never show your email address or phone number)"
+msgstr "(သင္၏အီးေမလ္လိပ္စာ သို႔မဟုတ္ ဖုန္းနံပါတ္ကိုကၽြႏ္ုပ္တို႔မွ ဘယ္ေတာ့မွမေဖာ္ျပပါ)"
+
+#: templates/web/default/report/update-form.html:158
+msgid "(we never show your email)"
+msgstr "(သင္၏အီးေမးလ္ကိုကၽြႏ္ုပ္တို႔မွဘယ္ေတာ့မွမေဖာ္ျပပါ)"
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:635
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:662
+#: perllib/FixMyStreet/DB/Result/Problem.pm:379
+msgid "-- Pick a category --"
+msgstr "-- ေခါင္းစဥ္တစ္ခုေရြးပါ --"
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:618
+#: perllib/FixMyStreet/DB/Result/Problem.pm:385
+msgid "-- Pick a property type --"
+msgstr "-- ပစၥည္းအမ်ိဳးအစားကိုေရြးပါ --"
+
+#: templates/web/emptyhomes/front/stats.html:5
+msgid "<big>%s</big> reports"
+msgstr "<big>%s</big> အစီရင္ခံစာ"
+
+#: templates/web/default/admin/body-form.html:42
+#: templates/web/default/admin/body-form.html:43
+msgid ""
+"<code>MAPIT_URL</code> is set (<code>%s</code>) but no <code>MAPIT_TYPES</code>.<br>\n"
+" This is probably why \"area covered\" is empty (below).<br>\n"
+" Maybe add some <code>MAPIT_TYPES</code> to your config file?"
+msgstr ""
+
+#: templates/web/default/questionnaire/completed.html:20
+msgid "<p style=\"font-size:150%\">Thank you very much for filling in our questionnaire; glad to hear it&rsquo;s been fixed.</p>"
+msgstr "<p style=\"font-size:150%\">ကၽြႏ္ုပ္တို႔၏စစ္တမ္းကိုျဖည့္သည့္အတြက္ေက်းဇူးအမ်ားၾကီးတင္ပါသည္။ &rsquo;မ်ား သည္ျပင္ျပီးသြားေၾကာင္းသိရသည့္အတြက္ အမ်ားၾကီး၀မ္းသာပါသည္</p>"
+
+#: templates/web/fiksgatami/questionnaire/completed-open.html:1
+msgid ""
+"<p style=\"font-size:150%\">We&rsquo;re sorry to hear that. We have two\n"
+"suggestions: why not try <a href=\"http://www.norge.no/styresmakter/\">writing\n"
+"direct to your councillor(s)</a> or, if it&rsquo;s a problem that could be\n"
+"fixed by local people working together, why not\n"
+"<a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n"
+"</p>"
+msgstr ""
+
+#: templates/web/fixmystreet/questionnaire/completed-open.html:25
+msgid ""
+"<p style=\"font-size:150%\">We&rsquo;re sorry to hear that. We have two\n"
+"suggestions: why not try <a href=\"http://www.writetothem.com/\">writing direct\n"
+"to your councillor(s)</a> or, if it&rsquo;s a problem that could be fixed by\n"
+"local people working together, why not\n"
+"<a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n"
+"</p>"
+msgstr ""
+
+#: templates/web/default/questionnaire/completed-open.html:6
+msgid ""
+"<p style=\"font-size:150%\">We&rsquo;re sorry to hear that. We have two\n"
+"suggestions: why not try writing to your local representative or, if it&rsquo;s\n"
+"a problem that could be fixed by local people working together, why not\n"
+"<a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n"
+"</p>"
+msgstr ""
+
+#: templates/web/default/questionnaire/index.html:35
+msgid ""
+"<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"
+"time to say so. We think it&rsquo;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 "လူမရွိသည့္ အိမ္မ်ားကို ျပန္လည္အသုံးျပဳရန္ ခက္ခဲပါသည္။ သို႔ေသာ္ ေကာင္းမြန္သည့္ အႀကံေပးအဖြဲ႔က တိုးတက္မႈရွိေအာင္ လုပ္ေဆာင္ေပး သြားမည္ ျဖစ္သလို ဝက္ဆိုက္ေပၚတြင္ ျပဳလုပ္ရမည္မ်ားကို ေဖာ္ျပေပးထားသည္။ ပိုင္ရွင္အေနျဖင့္ ၎အေဆာက္အဦးကို မလိုလားျခင္း သို႔မဟုတ္ ျပင္ဆင္၍မရႏုိင္ေအာင္ ပ်က္စီးေနလွ်င္ အေဆာက္အဦးမ်ားသည္ လေပါင္းမ်ားစြာ လူမေနထိုင္ဘဲ ရွိေနတတ္သည္။ မည္သို႔မွ် မထူးျခားျခင္း သို႔မဟုတ္ အႀကံေပးအဖြဲ႔က ျပဳလုပ္ေနသည့္ အေပၚ သင့္အေနျဖင့္ စိတ္ေက်နပ္မႈမရပါက ယခုအခ်ိန္သည္ ေျပာသင့္သည့္ အခ်ိန္ျဖစ္သည္။ မိမိတို႔အေနျဖင့္ အႀကံဥာဏ္မ်ားအတြက္ ဘယ္လိုျပဳလုပ္ရန္ အႀကံေပးအဖြဲ႔ကို ဖိအားေပးျခင္း သို႔မဟုတ္ အကူအညီေပးႏိုင္သည့္ အျခားလူမ်ားကို ဆက္သြယ္ျခင္းတို႔သည္ ေကာင္းမြန္သည့္ စိတ္ကူးျဖစ္ေၾကာင္း ယူဆပါသည္။ အျခားအသုံးဝင္သည့္ သတင္း အခ်က္အလက္အတြက္ ဒီကိုသြားပါ\n"
+
+#: templates/web/default/questionnaire/index.html:26
+msgid ""
+"<p>Getting empty homes back into use can be difficult. You shouldn&rsquo;t expect\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"
+"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"
+msgstr "လူမရွိသည့္ အိမ္မ်ားကို ျပန္လည္အသုံးျပဳရန္ ခက္ခဲပါသည္။ သို႔ေသာ္ ေကာင္းမြန္သည့္ အႀကံေပးအဖြဲ႔က တိုးတက္မႈရွိေအာင္ လုပ္ေဆာင္ေပး သြားမည္ ျဖစ္သလို ဝက္ဆိုက္ေပၚတြင္ ျပဳလုပ္ရမည္မ်ားကို ေဖာ္ျပေပးထားသည္။ ပိုင္ရွင္အေနျဖင့္ ၎အေဆာက္အဦးကို မလိုလားျခင္း သို႔မဟုတ္ ျပင္ဆင္၍မရႏုိင္ေအာင္ ပ်က္စီးေနလွ်င္ အေဆာက္အဦးမ်ားသည္ လေပါင္းမ်ားစြာ လူမေနထိုင္ဘဲ ရွိေနတတ္သည္။ မည္သို႔မွ် မထူးျခားျခင္း သို႔မဟုတ္ အႀကံေပးအဖြဲ႔က ျပဳလုပ္ေနသည့္ အေပၚ သင့္အေနျဖင့္ စိတ္ေက်နပ္မႈမရပါက ယခုအခ်ိန္သည္ ေျပာသင့္သည့္ အခ်ိန္ျဖစ္သည္။ မိမိတို႔အေနျဖင့္ အႀကံဥာဏ္မ်ားအတြက္ ဘယ္လိုျပဳလုပ္ရန္ အႀကံေပးအဖြဲ႔ကို ဖိအားေပးျခင္း သို႔မဟုတ္ အကူအညီေပးႏိုင္သည့္ အျခားလူမ်ားကို ဆက္သြယ္ျခင္းတို႔သည္ ေကာင္းမြန္သည့္ စိတ္ကူးျဖစ္ေၾကာင္း ယူဆပါသည္။ အျခားအသုံးဝင္သည့္ သတင္း အခ်က္အလက္အတြက္ ဒီကိုသြားပါ\n"
+
+#: templates/web/default/questionnaire/completed.html:9
+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"
+"site and leave an update.</p>"
+msgstr "မိမိတို႔၏ ေမးခြန္းမ်ားကို ေျဖေပးျခင္းအတြက္ ေက်းဇူးအထူးပဲ တင္ပါသည္။ အကယ္၍ သင့္ျပႆနာအေျခအေန ႏွင့္ပတ္သက္ၿပီး သတင္းအခ်က္အလက္တခ်ိဳ႔ လိုအပ္ပါက ဒီဆိုက္ကို ျပန္လာၿပီး update တင္ထားႏိုင္ပါသည္။"
+
+#: templates/web/default/around/_report_banner.html:4
+#: templates/web/default/around/_report_banner.html:5
+msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>"
+msgstr "<small>သင္ေျမပံုကိုမျမင္ရပါက <a href = '%s'rel = 'nofollow'> ဒီအဆင့္ကိုေက်ာ္လိုက္ပါ</a>.</small>"
+
+#: templates/web/default/admin/index.html:22
+#: templates/web/zurich/admin/index.html:4
+msgid "<strong>%d</strong> live problems"
+msgstr "<strong> %d </strong>ဘ၀ျပႆနာမ်ား"
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:183
+msgid "<strong>No</strong> Let me confirm my report by email"
+msgstr "<strong>မဟုတ္ပါ</strong> ကၽြႏ္ုပ္၏အစီရင္ခံစာကိုအီးေမးလ္ျဖင့္အတည္ျပဳမည္"
+
+#: templates/web/fixmystreet/report/update-form.html:110
+msgid "<strong>No</strong> Let me confirm my update by email"
+msgstr "<strong>မဟုတ္ပါ</strong> ကၽြႏ္ုပ္၏အသစ္မြမ္းမံျခင္းကိုအီးေမးလ္ျဖင့္အတည္ျပဳမည္"
+
+#: templates/web/fixmystreet/auth/general.html:50
+#: templates/web/zurich/auth/general.html:51
+msgid "<strong>No</strong> let me sign in by email"
+msgstr "<strong>မဟုတ္ပါ</strong> အီးေမးလ္ျဖင့္၀င္မည္"
+
+#: templates/web/default/auth/general.html:55
+msgid "<strong>No</strong>, I do not, let me sign in by email:"
+msgstr "<strong>မဟုတ္ပါ</strong>မလုပ္ပါ၊အီးေမးလ္ျဖင့္၀င္မည္-"
+
+#: templates/web/default/report/new/fill_in_details_form.html:162
+msgid "<strong>No</strong>, let me confirm my report by email:"
+msgstr "<strong>မဟုတ္ပါ</strong>ကၽြႏ္ုပ္၏အစီရင္ခံစာကိုအီးေမးလ္ျဖင့္အတည္ျပဳမည္ -"
+
+#: templates/web/default/report/update-form.html:117
+msgid "<strong>No</strong>, let me confirm my update by email:"
+msgstr "<strong>မဟုတ္ပါ</strong>ကၽြႏ္ုပ္၏အသစ္မြမ္းမံျခင္းကိုအီးေမလ္ျဖင့္အတည္ျပဳမည္ -"
+
+#: templates/web/default/auth/general.html:37
+#: templates/web/default/report/new/fill_in_details_form.html:140
+#: templates/web/default/report/update-form.html:95
+#: templates/web/fixmystreet/auth/general.html:36
+#: templates/web/fixmystreet/auth/general.html:38
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:159
+#: templates/web/fixmystreet/report/update-form.html:87
+msgid "<strong>Yes</strong> I have a password"
+msgstr "<strong>ဟုတ္ကဲ့</strong> ကၽြႏ္ုပ္တြင္စကား၀ွက္တစ္ခုရွိသည္"
+
+#: templates/web/default/static/about-en-gb.html:1
+#: templates/web/default/static/about-en-gb.html:3
+#: templates/web/emptyhomes/header.html:34
+#: templates/web/emptyhomes/static/about-cy.html:1
+#: templates/web/emptyhomes/static/about-cy.html:3
+#: templates/web/emptyhomes/static/about-en-gb.html:1
+#: templates/web/emptyhomes/static/about-en-gb.html:3
+msgid "About us"
+msgstr "ကၽြႏ္ုပ္တို႔အေၾကာင္း"
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:39
+#: templates/web/default/report/update-form.html:30
+#: templates/web/default/report/update-form.html:31
+#: templates/web/fixmystreet/report/update-form.html:28
+#: templates/web/fixmystreet/report/update-form.html:29
+msgid "Action Scheduled"
+msgstr "လုပ္ေဆာင္မႈကိုအခ်ိန္ဇယားျဖင့္ျပဳလုပ္ျပီး"
+
+#: templates/web/default/admin/body-form.html:3
+#: templates/web/default/admin/body-form.html:4
+msgid ""
+"Add a <strong>body</strong> for each administrative body, such as a council or department\n"
+" to which problem reports can be sent. You can add one or more contacts (for different\n"
+" categories of problem) to each body."
+msgstr "အုပ္ခ်ဳပ္ေရး အဖြဲ႔တစ္ခုခ်င္းစီအတြက္ အဖြဲ႔တစ္ခုကို ေပါင္းထည့္ပါ။ အႀကံေပးအဖြဲ႔ သို႔မဟုတ္ ႒ာနတစ္ခုကဲ့သို႔ အဖြဲ႔ကို ျပႆနာ တင္ျပႏိုင္သည္။ သင့္အေနျဖင့္ အဖြဲ႔တစ္ခုခ်င္းစီကို (ျပႆနာထဲမွ မတူညီသည့္ ျပႆနာမ်ားအတြက္) ဆက္သြယ္ရမည့္လိပ္စာ တစ္ခု သို႔မဟုတ္ အမ်ားကို ေပါင္းထည့္ပါ။"
+
+#: templates/web/default/admin/body.html:45
+msgid "Add a contact using the form below."
+msgstr "ေအာက္ပါပံုစံကိုသံုးျပီးအဆက္အသြယ္တစ္ခုထည့္မည္"
+
+#: templates/web/default/admin/bodies.html:65
+#: templates/web/default/admin/bodies.html:70
+#: templates/web/default/admin/body-form.html:233
+#: templates/web/zurich/admin/body-form.html:51
+msgid "Add body"
+msgstr "စာကိုယ္ထည့္မည္"
+
+#: templates/web/default/admin/body.html:88
+#: templates/web/zurich/admin/body.html:30
+msgid "Add new category"
+msgstr "ေခါင္းစဥ္အသစ္ထည့္မည္"
+
+#: templates/web/default/admin/users.html:45
+msgid "Add user"
+msgstr "အသံုးျပဳသူထည့္မည္"
+
+#: templates/web/default/my/my.html:61 templates/web/fixmystreet/my/my.html:67
+msgid "Added %s"
+msgstr "%sကိုထည့္ျပီးျပီ"
+
+#: templates/web/default/auth/change_password.html:29
+msgid "Again:"
+msgstr "ထပ္မံ၍-"
+
+#: templates/web/default/admin/timeline.html:35
+msgid "Alert %d created for %s, type %s, parameters %s / %s"
+msgstr "Parameters %s/%s ၊ အမ်ိဳးအစား %s ၊ %s အတြက္ %dအသိေပးခ်က္ဖန္တီးျပီး"
+
+#: templates/web/default/admin/timeline.html:37
+msgid "Alert %d disabled (created %s)"
+msgstr "အသိေပးခ်က္%dကိုပိတ္ထားသည္(%sကိုဖန္တီးျပီး)"
+
+#: templates/web/default/report/update-form.html:163
+#: templates/web/fixmystreet/report/update-form.html:148
+msgid "Alert me to future updates"
+msgstr "ေနာက္ထပ္အသစ္မ်ားအတြက္လည္းကၽြႏ္ုပ္ကိုအသိေပးမည္"
+
+#: templates/web/default/reports/index.html:3
+#: templates/web/fixmybarangay/reports/index.html:3
+#: templates/web/zurich/admin/stats.html:5
+#: templates/web/zurich/reports/index.html:15
+msgid "All Reports"
+msgstr "အစီရင္ခံစာအားလံုး"
+
+#: templates/web/default/footer.html:11
+#: templates/web/emptyhomes/header.html:32
+#: templates/web/fiksgatami/footer.html:7
+#: templates/web/fiksgatami/nn/footer.html:7
+#: templates/web/fixmybarangay/footer.html:20
+#: templates/web/fixmystreet/footer.html:51
+#: templates/web/zurich/admin/index-dm.html:12
+#: templates/web/zurich/admin/stats.html:13
+#: templates/web/zurich/footer.html:19
+#: templates/web/zurich/nav_over_content.html:6
+msgid "All reports"
+msgstr "အစီရင္ခံစာအားလံုး"
+
+#: templates/web/default/admin/stats.html:5
+#: templates/web/zurich/admin/stats.html:8
+msgid "All reports between %s and %s"
+msgstr "%s ႏွင့္ %s ၾကားအစီရင္ခံစားအားလံုး"
+
+#: templates/web/default/report/new/councils_text_some.html:2
+msgid "All the information you provide here will be sent to"
+msgstr "သင္ေထာက္ပံ့ေသာအခ်က္အလက္မ်ားအားလံုးကိုပို႔မည့္ေနရာ"
+
+#: templates/web/default/report/new/councils_text_all.html:12
+#: templates/web/default/report/new/councils_text_all.html:13
+msgid "All the information you provide here will be sent to <strong>%s</strong> or <strong>Roads Service</strong>."
+msgstr "သင္ေထာက္ပံ့ေသာအခ်က္အလက္မ်ားအားလံုးကိုပို႔မည့္ေနရာမွာ <strong>%s</strong>သို႔မဟုတ္<strong>လမ္း၀န္ေဆာင္မႈ</strong>"
+
+#: templates/web/default/report/new/councils_text_all.html:5
+#: templates/web/default/report/new/councils_text_all.html:6
+msgid "All the information you provide here will be sent to <strong>%s</strong> or a relevant local body such as <strong>TfL</strong>, via the London Report-It system."
+msgstr ""
+"သင္ေထာက္ပံ့ထားသည့္ သတင္းအခ်က္အလက္အားလုံးကို <strong>%s</strong> သို႔မဟုတ္ the London Report-It system မွတဆင့္\n"
+"<strong>TfL</strong> ကဲ့သို႔ သင့္ေတာ္သည့္ ျပည္တြင္း အဖြဲ႔ကို ေပးပို႔ပါ။"
+
+#: templates/web/default/report/new/councils_text_all.html:19
+#: templates/web/default/report/new/councils_text_all.html:20
+#: templates/web/default/report/new/fill_in_details_form.html:12
+#: templates/web/default/report/new/fill_in_details_form.html:13
+#: templates/web/emptyhomes/report/new/councils_text_all.html:3
+#: templates/web/emptyhomes/report/new/councils_text_all.html:4
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:12
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:13
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:7
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:8
+msgid "All the information you provide here will be sent to <strong>%s</strong>."
+msgstr "သင္ေထာက္ပံ့ေသာအခ်က္အလက္မ်ားအားလံုးကိုပို႔မည့္ေနရာမွာ <strong>%s</strong>သို႔ပို႔မည္"
+
+#: templates/web/default/questionnaire/index.html:60
+#: templates/web/fixmystreet/questionnaire/index.html:54
+msgid "An update marked this problem as fixed."
+msgstr "ေျဖရွင္းထားသည့္ ျပႆနာကို အမွတ္အသားျပဳလုပ္ထားသည္။"
+
+#: templates/web/default/admin/list_updates.html:32
+#: templates/web/default/admin/problem_row.html:20
+msgid "Anonymous"
+msgstr "အမည္မသိ"
+
+#: templates/web/default/admin/report_edit.html:62
+#: templates/web/default/admin/update_edit.html:23
+msgid "Anonymous:"
+msgstr "အမည္မသိ-"
+
+#: templates/web/default/footer.html:26
+msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?"
+msgstr "သင္သည္ <strong>developer</strong> တစ္ေယာက္လား။ FixMyStreet ကို ကူညီလိုပါသလား။"
+
+#: templates/web/fixmystreet/footer.html:19
+msgid "Are you a developer?"
+msgstr "Developer လား"
+
+#: templates/web/fixmystreet/footer.html:23
+msgid "Are you from a council?"
+msgstr "ေကာင္စီကလား"
+
+#: templates/web/default/admin/body-form.html:69
+#: templates/web/zurich/admin/body-form.html:24
+msgid "Area covered"
+msgstr "ဧရိယာလႊမ္းျခံဳ ျခင္း"
+
+#: templates/web/zurich/admin/report_edit.html:144
+#: templates/web/zurich/admin/stats.html:36
+msgid "Assign to different category:"
+msgstr "တျခားေခါင္းစဥ္တစ္ခုသို႔ေျပာင္းလဲသတ္မွတ္မည္ -"
+
+#: templates/web/zurich/admin/report_edit.html:153
+msgid "Assign to external body:"
+msgstr "အပိုစာကိုယ္ကိုသတ္မွတ္မည္ -"
+
+#: templates/web/zurich/admin/report_edit.html:133
+#: templates/web/zurich/admin/report_edit.html:190
+msgid "Assign to subdivision:"
+msgstr "အေသးစိတ္နယ္နမိတ္သို႔သတ္မွတ္မည္-"
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:163
+#: templates/web/zurich/report/updates.html:11
+msgid "Assigned to %s"
+msgstr "%s သို႔ လြဲအပ္မည္"
+
+#: templates/web/default/open311/index.html:86
+msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date."
+msgstr ""
+
+#: templates/web/default/open311/index.html:78
+msgid "At the moment only searching for and looking at reports work."
+msgstr "အခုေလာေလာဆယ္ အစီရင္ခံစာမ်ားကို ရွာေဖြျခင္း၊ၾကည့္ရႈျခင္းသာျပဳလုပ္ႏိုင္ေသးသည္"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:334
+#: templates/web/zurich/report/_item.html:11
+msgid "Awaiting moderation"
+msgstr "စိစစ္ျခင္းကိုေစာင့္ဆိုင္းေနတုန္း"
+
+#: templates/web/default/js/translation_strings.html:32
+msgid "Back"
+msgstr "ေနာက္သို႔"
+
+#: templates/web/default/admin/report_blocks.html:11
+msgid "Ban email address"
+msgstr "အီးေမးလ္လိပ္စာကိုပိ္တ္ပင္မည္"
+
+#: templates/web/fixmybarangay/report/new/notes.html:7
+msgid "Be sure to choose the right category, because we use that to determine to whom the report is sent."
+msgstr "ေခါင္းစဥ္ကိုေသခ်ာေရြးပါ၊ အဘယ္ေၾကာင့္ဆိုေသာ္ ထိုေခါင္းစဥ္ကိုၾကည့္ျပီးဒီအစီရင္ခံစာကိုဘယ္သူ႔ကိုပို႔မည္ဆုိတာဆံုးျဖတ္ေသာေၾကာင့္ျဖစ္သည္။"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1185
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:297
+#: templates/web/default/admin/bodies.html:1
+#: templates/web/zurich/header.html:64
+msgid "Bodies"
+msgstr "စာကိုယ္မ်ား"
+
+#: templates/web/default/admin/flagged.html:17
+#: templates/web/default/admin/reports.html:14
+#: templates/web/default/admin/users.html:17
+msgid "Body"
+msgstr "စာကိုယ္"
+
+#: templates/web/default/admin/user-form.html:32
+msgid "Body:"
+msgstr "စာကိုယ္ -"
+
+#: templates/web/fiksgatami/footer.html:16
+#: templates/web/fiksgatami/nn/footer.html:16
+msgid "Built by <a href=\"http://www.mysociety.org/\">mySociety</a> and maintained by <a href=\"http://www.nuug.no/\">NUUG</a>"
+msgstr "<a href=\"http://www.mysociety.org/\">mySociety</a>မွတည္ေဆာက္ျပီး <a href=\"http://www.nuug.no/\">NUUG</a> မွထိန္းသိမ္းသည္"
+
+#: templates/web/default/admin/stats.html:80
+msgid "By Date"
+msgstr "ေန႔စြဲအားျဖင့္"
+
+#: templates/web/fixmystreet/around/_report_banner.html:10
+#: templates/web/fixmystreet/around/_report_banner.html:9
+msgid "Can't see the map? <a href='%s' rel='nofollow'>Skip this step</a>"
+msgstr "ေျမပံုကိုမျမင္ဘူးလား။ <a href='%s' rel='nofollow'>ဒီအဆင့္ကိုေက်ာ္မည္</a> "
+
+#: templates/web/default/admin/bodies.html:20
+#: templates/web/default/admin/body.html:53
+#: templates/web/default/admin/index.html:44
+#: templates/web/default/report/new/category.html:10
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:74
+#: templates/web/zurich/admin/body.html:13
+#: templates/web/zurich/admin/index-dm.html:23
+#: templates/web/zurich/admin/index-sdm.html:21
+#: templates/web/zurich/admin/reports.html:13
+#: templates/web/zurich/admin/stats.html:50
+#: templates/web/zurich/report/new/fill_in_details_form.html:50
+msgid "Category"
+msgstr "အမ်ိဳးအစား"
+
+#: templates/web/default/admin/index.html:42
+msgid "Category fix rate for problems > 4 weeks old"
+msgstr ""
+
+#: templates/web/default/admin/body.html:109
+#: templates/web/default/admin/body_edit.html:23
+#: templates/web/default/admin/report_edit.html:61
+#: templates/web/default/report/new/fill_in_details_form.html:67
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:50
+#: templates/web/zurich/admin/body.html:36
+#: templates/web/zurich/admin/report_edit-sdm.html:45
+#: templates/web/zurich/admin/report_edit.html:143
+msgid "Category:"
+msgstr "အမ်ိဳးအစား -"
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374
+msgid "Category: %s"
+msgstr "အမ်ိဳးအစား - %s"
+
+#: templates/web/default/auth/change_password.html:1
+#: templates/web/default/auth/change_password.html:3
+#: templates/web/default/auth/change_password.html:33
+msgid "Change Password"
+msgstr "စကား၀ွက္ေျပာင္းမည္"
+
+#: templates/web/default/admin/body.html:131
+msgid ""
+"Check <strong>confirmed</strong> to indicate that this contact has been confirmed as correct.\n"
+" If you are not sure of the origin or validity of the contact, leave this unchecked."
+msgstr ""
+
+#: templates/web/default/admin/body.html:142
+msgid ""
+"Check <strong>deleted</strong> to remove the category from use. \n"
+" It will not appear as an available category in the drop-down menu on the report-a-problem page."
+msgstr ""
+
+#: templates/web/default/admin/body.html:162
+msgid ""
+"Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n"
+" <br>\n"
+" Normally, categories are not private.\n"
+" <br>\n"
+" This is suitable for issues that you want to allow users to report to the body, but for which there is no public\n"
+" interest in displaying the report. In the UK, we've used this for services like requesting an extra rubbish bin\n"
+" at a specific address."
+msgstr ""
+
+#: templates/web/default/admin/body.html:101
+msgid ""
+"Choose a <strong>category</strong> name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n"
+" to the body too. These will appear in the drop-down menu on the report-a-problem page."
+msgstr ""
+
+#: templates/web/default/admin/stats.html:65
+#: templates/web/default/admin/stats.html:71
+msgid "Click here or enter as dd/mm/yyyy"
+msgstr "ဒီေနရာကိုႏွိပ္ပါ သို႔ dd/mm/yyyy ကဲ့သို႔ရိုက္ထည့္ပါ"
+
+#: templates/web/default/js/translation_strings.html:47
+#: templates/web/fixmystreet/around/_report_banner.html:2
+msgid "Click map to report a problem"
+msgstr "ျပႆနာတစ္ခုကိုအစီရင္ခံစာတင္ရင္ေျမပံုကိုႏွိပ္ပါ"
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:140
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:45
+#: templates/web/default/admin/report_edit.html:47
+#: templates/web/default/dashboard/index.html:142
+#: templates/web/default/dashboard/index.html:144
+#: templates/web/fixmystreet/report/banner.html:15
+#: templates/web/zurich/admin/header.html:10
+#: templates/web/zurich/admin/header.html:12
+#: templates/web/zurich/admin/header.html:2
+#: templates/web/zurich/admin/report_edit.html:100
+#: templates/web/zurich/admin/report_edit.html:98
+#: templates/web/zurich/admin/stats.html:31
+#: templates/web/zurich/report/banner.html:13
+msgid "Closed"
+msgstr "ပိတ္မည္"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:748
+msgid "Closed by council"
+msgstr "ေကာင္စီမွပိတ္ထားသည္"
+
+#: templates/web/default/my/my.html:37 templates/web/fixmystreet/my/my.html:43
+msgid "Closed reports"
+msgstr "အစီရင္ခံစာကိုပိတ္မည္"
+
+#: templates/web/default/admin/problem_row.html:38
+msgid "Closed:"
+msgstr "ပိတ္မည္-"
+
+#: templates/web/default/around/tabbed_lists.html:11
+#: templates/web/default/around/tabbed_lists.html:12
+msgid "Closest nearby problems <small>(within&nbsp;%skm)</small>"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:23
+#: templates/web/zurich/admin/report_edit-sdm.html:36
+#: templates/web/zurich/admin/report_edit.html:49
+msgid "Co-ordinates:"
+msgstr ""
+
+#: templates/web/default/admin/list_updates.html:10
+msgid "Cobrand"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:75
+#: templates/web/default/admin/update_edit.html:50
+msgid "Cobrand data:"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:74
+#: templates/web/default/admin/update_edit.html:49
+msgid "Cobrand:"
+msgstr ""
+
+#: templates/web/default/admin/config_page.html:1
+msgid "Configuration"
+msgstr "အစီအစဥ္သတ္မွတ္ျခင္း"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:421
+msgid "Configuration updated - contacts will be generated automatically later"
+msgstr ""
+
+#: templates/web/default/admin/body_edit.html:47
+msgid "Configure Endpoint"
+msgstr ""
+
+#: templates/web/default/admin/body.html:62
+msgid "Confirm"
+msgstr "အတည္ျပဳမည္"
+
+#: templates/web/default/auth/token.html:1
+msgid "Confirm account"
+msgstr "အေကာင့္ကိုအတည္ျပဳမည္"
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:177
+#: templates/web/fixmystreet/report/update-form.html:105
+msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated."
+msgstr ""
+
+#: templates/web/default/questionnaire/creator_fixed.html:1
+#: templates/web/default/tokens/confirm_problem.html:1
+#: templates/web/default/tokens/confirm_problem.html:3
+#: templates/web/default/tokens/confirm_update.html:1
+#: templates/web/default/tokens/confirm_update.html:3
+#: templates/web/emptyhomes/tokens/confirm_problem.html:1
+#: templates/web/emptyhomes/tokens/confirm_problem.html:3
+#: templates/web/zurich/tokens/confirm_problem.html:1
+#: templates/web/zurich/tokens/confirm_problem.html:3
+msgid "Confirmation"
+msgstr "အတည္ျပဳျခင္း"
+
+#: templates/web/default/admin/body.html:137
+#: templates/web/default/admin/body.html:55
+#: templates/web/default/admin/body_edit.html:32
+#: templates/web/default/admin/body_edit.html:84
+#: templates/web/zurich/admin/stats.html:40
+msgid "Confirmed"
+msgstr "အတည္ျပဳခဲ့သည္"
+
+#: templates/web/default/admin/stats.html:5
+msgid "Confirmed reports between %s and %s"
+msgstr "%s ႏွင့္ %s ၾကားအစီရင္ခံစာကိုအတည္ျပဳမည္"
+
+#: templates/web/default/admin/list_updates.html:39
+#: templates/web/default/admin/problem_row.html:36
+#: templates/web/default/admin/report_edit.html:70
+msgid "Confirmed:"
+msgstr "အတည္ျပဳခဲ့ခ်ိန္-"
+
+#: templates/web/fiksgatami/footer.html:10
+#: templates/web/fiksgatami/nn/footer.html:10
+msgid "Contact"
+msgstr "ဆက္သြယ္ရန္"
+
+#: templates/web/default/footer.html:24
+msgid "Contact FixMyStreet"
+msgstr "FixMyStreet ကိုဆက္သြယ္မည္"
+
+#: templates/web/default/contact/index.html:1
+#: templates/web/default/contact/index.html:2
+#: templates/web/default/contact/submit.html:1
+#: templates/web/fixmystreet/contact/index.html:1
+#: templates/web/fixmystreet/contact/index.html:2
+msgid "Contact Us"
+msgstr "ကၽြႏ္ုပ္တို႔ႏွင့္ဆက္သြယ္ပါ"
+
+#: templates/web/default/contact/index.html:6
+#: templates/web/default/contact/submit.html:3
+#: templates/web/fixmystreet/contact/index.html:22
+msgid "Contact the team"
+msgstr "အဖြဲ႕ႏွင့္ဆက္သြယ္ပါ"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1319
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1347
+msgid "Could not find user"
+msgstr "အသံုးျပဳသူရွာမေတြ႕ပါ"
+
+#: templates/web/default/js/translation_strings.html:37
+msgid "Could not look up location"
+msgstr "တည္ေနရာကိုရွာမေတြ႕ပါ"
+
+#: templates/web/default/admin/list_updates.html:9
+msgid "Council"
+msgstr "ေကာင္စီ"
+
+#: templates/web/default/admin/body.html:1
+#: templates/web/default/admin/body_edit.html:1
+#: templates/web/zurich/admin/body.html:1
+msgid "Council contacts for %s"
+msgstr "%sအတြက္ေကာင္စီအဆက္အသြယ္"
+
+#: templates/web/default/admin/stats.html:84
+msgid "Council:"
+msgstr "ေကာင္စီ-"
+
+#: templates/web/default/admin/stats.html:12
+#: templates/web/default/admin/stats.html:32
+#: templates/web/zurich/admin/stats.html:45
+#: templates/web/zurich/admin/stats.html:50
+msgid "Count"
+msgstr "အေရအတြက္"
+
+#: templates/web/default/email_sent.html:1
+msgid "Create a report"
+msgstr "အစီရင္ခံစာတစ္ခုကိုဖန္တီးမည္"
+
+#: templates/web/default/admin/body.html:179
+#: templates/web/zurich/admin/body.html:53
+msgid "Create category"
+msgstr "အမ်ိဳးအစားဖန္တီးမည္"
+
+#: templates/web/default/admin/problem_row.html:34
+#: templates/web/zurich/admin/list_updates.html:29
+#: templates/web/zurich/admin/list_updates.html:8
+msgid "Created"
+msgstr "ဖန္တီးမည္"
+
+#: templates/web/default/admin/list_updates.html:38
+#: templates/web/default/admin/report_edit.html:69
+#: templates/web/default/admin/update_edit.html:51
+#: templates/web/zurich/admin/report_edit-sdm.html:50
+#: templates/web/zurich/admin/report_edit.html:64
+#: templates/web/zurich/admin/update_edit.html:29
+msgid "Created:"
+msgstr "ဖန္တီးခဲ့ခ်ိန္-"
+
+#: templates/web/default/admin/stats.html:31
+msgid "Current state"
+msgstr "ယခုအေျခအေန"
+
+#: templates/web/default/admin/bodies.html:7
+#: templates/web/default/admin/index.html:5
+msgid "Currently no bodies have been created."
+msgstr "ယခုေလာေလာဆယ္ စာကိုယ္ ကိုမဖန္တီးရေသးပါ"
+
+#: templates/web/default/dashboard/index.html:6
+#: templates/web/default/dashboard/index.html:7
+msgid "Dashboard"
+msgstr ""
+
+#: templates/web/zurich/admin/stats.html:35
+msgid "Dealt with by subdivision within 5 working days"
+msgstr ""
+
+#: templates/web/default/admin/bodies.html:22
+#: templates/web/default/admin/body.html:148
+#: templates/web/default/admin/body.html:56
+#: templates/web/default/admin/body_edit.html:37
+#: templates/web/default/admin/body_edit.html:85
+msgid "Deleted"
+msgstr "ဖ်က္ျပီးျပီ"
+
+#: templates/web/zurich/admin/index-dm.html:22
+#: templates/web/zurich/admin/index-sdm.html:20
+#: templates/web/zurich/admin/reports.html:12
+msgid "Description"
+msgstr "ေဖာ္ျပခ်က္"
+
+#: templates/web/default/js/translation_strings.html:34
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66
+#: templates/web/zurich/report/new/fill_in_details_form.html:42
+msgid "Details"
+msgstr "အေသးစိတ္အခ်က္အလက္"
+
+#: templates/web/default/admin/report_edit.html:20
+#: templates/web/default/report/new/fill_in_details_form.html:61
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:79
+#: templates/web/zurich/admin/report_edit-sdm.html:28
+#: templates/web/zurich/admin/report_edit.html:28
+#: templates/web/zurich/admin/report_edit.html:38
+msgid "Details:"
+msgstr "အေသးစိတ္အခ်က္အလက္မ်ား-"
+
+#: templates/web/default/admin/body.html:57
+msgid "Devolved"
+msgstr "တစ္ေယာက္မွတစ္ေယာက္လက္လြဲျခင္း"
+
+#: templates/web/default/admin/edit-league.html:8
+msgid "Diligency prize league table"
+msgstr ""
+
+#: templates/web/fixmystreet/auth/general.html:30
+msgid "Do you have a FixMyBarangay password?"
+msgstr "FixMyBarangay ၏စကား၀ွက္ရွိပါသလား။"
+
+#: templates/web/default/auth/general.html:32
+#: templates/web/fixmystreet/auth/general.html:32
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:155
+#: templates/web/fixmystreet/report/update-form.html:84
+msgid "Do you have a FixMyStreet password?"
+msgstr "FixMyStreet ၏စကား၀ွက္ရွိပါသလား။"
+
+#: templates/web/default/questionnaire/index.html:70
+#: templates/web/fixmystreet/questionnaire/index.html:64
+msgid "Don&rsquo;t know"
+msgstr ""
+
+#: templates/web/fixmystreet/contact/index.html:115
+msgid "Don't like forms?"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:47
+#: templates/web/default/report/update-form.html:30
+#: templates/web/default/report/update-form.html:32
+#: templates/web/fixmystreet/report/update-form.html:28
+#: templates/web/fixmystreet/report/update-form.html:30
+msgid "Duplicate"
+msgstr "ႏွစ္ခုျပဳလုပ္မည္"
+
+#: templates/web/default/admin/body.html:90
+msgid ""
+"Each contact for the body has a category, which is displayed to the public. \n"
+" Different categories <strong>can have the same contact</strong> (email address).\n"
+" This means you can add many categories even if you only have one contact for the body.\n"
+" "
+msgstr ""
+
+#: templates/web/default/admin/list_updates.html:42
+#: templates/web/default/admin/problem_row.html:41
+#: templates/web/default/admin/users.html:31
+#: templates/web/zurich/admin/problem_row.html:42
+msgid "Edit"
+msgstr "ျပင္ဆင္မည္"
+
+#: templates/web/default/admin/body.html:189
+#: templates/web/zurich/admin/body.html:64
+msgid "Edit body details"
+msgstr "စာကိုယ္ကိုအေသးစိတ္ျပင္မည္"
+
+#: templates/web/default/admin/report_edit.html:1
+#: templates/web/zurich/admin/report_edit-sdm.html:2
+#: templates/web/zurich/admin/report_edit-sdm.html:4
+#: templates/web/zurich/admin/report_edit.html:2
+#: templates/web/zurich/admin/report_edit.html:5
+msgid "Editing problem %d"
+msgstr "%dျပႆနာကိုျပင္ဆင္ေနသည္"
+
+#: templates/web/default/admin/update_edit.html:1
+#: templates/web/zurich/admin/update_edit.html:1
+msgid "Editing update %d"
+msgstr "အသစ္မြမ္းမံျခင္း %dကိုျပင္ဆင္ေနသည္"
+
+#: templates/web/default/admin/user_edit.html:1
+msgid "Editing user %d"
+msgstr "%dအသံုးျပဳသူကိုျပင္ဆင္ေနသည္"
+
+#: templates/web/default/admin/body_edit.html:86
+msgid "Editor"
+msgstr "အယ္ဒီတာ"
+
+#: templates/web/default/admin/bodies.html:18
+#: templates/web/default/admin/body.html:54
+#: templates/web/default/admin/body_edit.html:83
+#: templates/web/default/admin/flagged.html:38
+#: templates/web/default/admin/users.html:16
+#: templates/web/fixmystreet/auth/general.html:20
+#: templates/web/fixmystreet/report/update-form.html:76
+#: templates/web/zurich/admin/body-form.html:9
+#: templates/web/zurich/admin/body.html:14
+#: templates/web/zurich/auth/general.html:24
+#: templates/web/zurich/auth/general.html:54
+msgid "Email"
+msgstr "အီးေမးလ္"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1295
+msgid "Email added to abuse list"
+msgstr "အလြဲသံုးသည့္စာရင္းထဲတြင္အီးေမးလ္ထည့္ျပီး"
+
+#: templates/web/default/admin/body.html:126
+msgid "Email address:"
+msgstr "အီးေမးလ္လိပ္စာ-"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1292
+msgid "Email already in abuse list"
+msgstr "အလြဲသံုးသည့္စာရင္းထဲတြင္အီးေမးလ္ရွိျပီး"
+
+#: templates/web/default/around/_updates.html:5
+msgid "Email me new local problems"
+msgstr "ေဒသအတြင္းျပႆနာအသစ္မ်ားကိုကၽြႏ္ုပ္ထံသို႔အီးေမးလ္ပို႔မည္"
+
+#: templates/web/default/report/display.html:34
+msgid "Email me updates"
+msgstr "အသစ္မြမ္းမံမႈမ်ားကိုကၽြႏ္ုပ္ထံသို႕အီးေမးလ္ပို႔မည္"
+
+#: templates/web/default/admin/body_edit.html:26
+#: templates/web/default/admin/report_edit.html:67
+#: templates/web/default/admin/update_edit.html:33
+#: templates/web/default/admin/user-form.html:20
+#: templates/web/default/alert/updates.html:13
+#: templates/web/default/report/display.html:38
+#: templates/web/zurich/admin/body.html:41
+#: templates/web/zurich/admin/report_edit-sdm.html:47
+#: templates/web/zurich/admin/report_edit.html:60
+msgid "Email:"
+msgstr "အီးေမးလ္-"
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:323
+msgid "Email: %s"
+msgstr "အီးေမးလ္ -%s"
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:620
+msgid "Empty flat or maisonette"
+msgstr "တိုက္ခန္းအလြတ္သို႔မဟုတ္ maisonette"
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:619
+msgid "Empty house or bungalow"
+msgstr "အိမ္အလြတ္သို႔မဟုတ္ဘန္ဂလိုအလြတ္"
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:622
+msgid "Empty office or other commercial"
+msgstr "ရံုးအလြတ္သို႔မဟုတ္တျခားစီးပြားေရးအလြတ္"
+
+#: templates/web/emptyhomes/report/new/form_heading.html:1
+msgid "Empty property details form"
+msgstr "အလြတ္ပိုင္ဆိုင္မႈအေသးစိတ္အခ်က္အလက္ပံုစံ"
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:623
+msgid "Empty pub or bar"
+msgstr "အလြတ္အရက္ဆိုင္သို႔မဟုတ္ဘား"
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:624
+msgid "Empty public building - school, hospital, etc."
+msgstr "အမ်ားျပည္သူႏွင့္ဆိုင္ေသာတိုက္အလြတ္-ေက်ာင္း၊ေဆးရံုစသည္ျဖင့္.."
+
+#: templates/web/default/admin/body-form.html:158
+#: templates/web/default/admin/body-form.html:159
+msgid ""
+"Enable <strong>Open311 update-sending</strong> if the endpoint will send and receive\n"
+" updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n"
+" For more information, see \n"
+" <a href='http://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:215
+#: templates/web/default/admin/body-form.html:216
+msgid ""
+"Enable this <strong>can be devolved</strong> setting if one or more contacts have a \n"
+" different endpoint (and send method) from the body's. For example, if reports for some categories of\n"
+" problem must be emailed, while others can be sent over Open311."
+msgstr ""
+
+#: templates/web/default/admin/stats.html:70
+msgid "End Date:"
+msgstr "ျပီးသည့္ရက္-"
+
+#: templates/web/default/admin/body-form.html:126
+msgid "Endpoint"
+msgstr "ျပီးဆံုးမွတ္-"
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:72
+msgid "Enter a Z&uuml;rich street name"
+msgstr "လမ္းနာမည္ ျဖည့္စြက္ပါ"
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:18
+msgid "Enter a nearby UK postcode, or street name and area"
+msgstr "ယူေကအနီးနားရွိ စာတိုက္နံပါတ္၊သို႔မဟုတ္လမ္းအမည္ႏွင့္ဧရိယာရိုက္ထည့္ပါ"
+
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:25
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:37
+msgid "Enter a nearby postcode, or street name and area"
+msgstr "အနီးနားရွိ စာတိုက္နံပါတ္၊သို႔မဟုတ္လမ္းအမည္ႏွင့္ဧရိယာရိုက္ထည့္ပါ"
+
+#: templates/web/default/around/postcode_form.html:2
+#: templates/web/fixmystreet/around/postcode_form.html:11
+msgid "Enter a nearby street name and area"
+msgstr "အနီးနားရွိလမ္းအမည္ႏွင့္ဧရိယာကိုရိုက္ထည့္ပါ"
+
+#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:9
+#, fuzzy
+msgid "Enter a nearby street name and area, postal code or district in Delhi"
+msgstr "အနီးနားရွိလမ္းအမည္ႏွင့္ဧရိယာကိုရိုက္ထည့္ပါ"
+
+#: templates/web/default/auth/general.html:64
+#: templates/web/default/report/new/fill_in_details_form.html:169
+#: templates/web/default/report/update-form.html:124
+msgid "Enter a new password:"
+msgstr "စကား၀ွက္အသစ္တစ္ခုရိုက္ထည့္ပါ-"
+
+#: templates/web/fixmystreet/auth/general.html:61
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:211
+#: templates/web/fixmystreet/report/update-form.html:122
+#: templates/web/zurich/auth/general.html:65
+msgid "Enter a password"
+msgstr "စကား၀ွက္ရိုက္ထည့္ပါ"
+
+#: templates/web/default/index-steps.html:26
+msgid "Enter details of the problem"
+msgstr "ျပႆနာ၏အေသးစိတ္အခ်က္အလက္မ်ားကိုရိုက္ထည့္ပါ"
+
+#: templates/web/default/auth/token.html:5
+#: templates/web/default/errors/generic.html:1
+#: templates/web/default/errors/generic.html:3
+#: templates/web/default/tokens/abuse.html:1
+#: templates/web/default/tokens/abuse.html:3
+#: templates/web/default/tokens/error.html:1
+#: templates/web/default/tokens/error.html:3
+msgid "Error"
+msgstr "အမွားအယြင္း"
+
+#: templates/web/default/admin/body.html:11
+#: templates/web/default/admin/body_edit.html:18
+msgid "Example postcode %s"
+msgstr "နမူနာစာတိုက္ေသတၱာနံပါတ္ %s"
+
+#: templates/web/default/open311/index.html:96
+msgid "Examples:"
+msgstr "နမူနာမ်ား -"
+
+#: templates/web/default/admin/report_edit.html:76
+msgid "Extra data:"
+msgstr "ေနာက္ထပ္အခ်က္အလက္မ်ား-"
+
+#: templates/web/default/contact/submit.html:15
+msgid "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>."
+msgstr ""
+
+#: templates/web/zurich/admin/index-dm.html:33
+#: templates/web/zurich/admin/index-sdm.html:30
+msgid "Filter report list"
+msgstr "အစီရင္ခံစာစာရင္းကိုစစ္ထုတ္မည္"
+
+#: templates/web/emptyhomes/front/stats.html:6
+msgid "Find latest local and national news"
+msgstr "ေဒသတြင္းႏွင့္ႏိုင္ငံ၏သတင္းမ်ားကိုရွာမည္"
+
+#: templates/web/default/questionnaire/index.html:79
+#: templates/web/fixmystreet/questionnaire/index.html:73
+msgid "First time"
+msgstr "ပထမအၾကိမ္"
+
+#: templates/web/default/admin/body.html:37
+msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
+msgstr ""
+
+#: templates/web/fiksgatami/header.html:16
+#: templates/web/fiksgatami/nn/header.html:16
+msgid "Fix<span id=\"my\">My</span>Street"
+msgstr "ကၽြႏ္ုပ္<span id =\"my\">လမ္းကို</span>ျပင္ေပးပါ"
+
+#: templates/web/default/header.html:24
+msgid "FixMyStreet"
+msgstr "ကၽြႏု္ပ္လမ္းကိုျပင္ေပးပါ"
+
+#: templates/web/default/admin/header.html:10
+msgid "FixMyStreet admin:"
+msgstr "FixMyStreet ၏ အုပ္ခ်ဳပ္သူ"
+
+#: templates/web/default/alert/index.html:11
+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"
+"within a certain distance of a particular location."
+msgstr "FixMyStreet တြင္ သီးျခား အုပ္ခ်ဳပ္ေရးဌာန သို႔မဟုတ္ ေကာင္စီတစ္ခုအတြင္းရိွ ျပႆနာမ်ားအတြက္ သတိေပးခ်က္မ်ားႏွင့္ တစ္ဦးခ်င္းစီ၏ တိက်ေသခ်ာသည့္ တည္ေနရာ အကြာအေဝး အတြင္းရိွ ျပႆနာအားလံုးတို႔ အပါအဝင္ ျပည္တြင္း ျပႆနာမ်ား အတြက္ ကြဲျပားျခားနားေသာ RSS feed မ်ားႏွင့္ အီးေမးလ္ သတိေပးခ်က္မ်ား ရိွသည္။"
+
+#: templates/web/default/alert/_list.html:71
+#: templates/web/fixmystreet/alert/_list.html:73
+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"
+"for the county council."
+msgstr ""
+
+#: templates/web/default/admin/index.html:44
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:41
+#: templates/web/default/admin/report_edit.html:42
+#: templates/web/default/dashboard/index.html:142
+#: templates/web/default/dashboard/index.html:144
+#: templates/web/default/report/update-form.html:30
+#: templates/web/default/report/update-form.html:34
+#: templates/web/fixmystreet/report/banner.html:12
+#: templates/web/fixmystreet/report/update-form.html:28
+#: templates/web/fixmystreet/report/update-form.html:32
+msgid "Fixed"
+msgstr "ျပင္ျပီးျပီ"
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:43
+msgid "Fixed - Council"
+msgstr "ျပင္ျပီးျပီ-ေကာင္စီ"
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:42
+msgid "Fixed - User"
+msgstr "ျပင္ျပီးျပီ-အသံုးျပဳသူ"
+
+#: templates/web/default/my/my.html:32 templates/web/fixmystreet/my/my.html:38
+msgid "Fixed reports"
+msgstr "ျပင္ျပီးေၾကာင္းအစီရင္ခံစာ"
+
+#: templates/web/default/admin/problem_row.html:37
+msgid "Fixed:"
+msgstr "ျပင္ျပီးျပီ"
+
+#: templates/web/default/admin/body-form.html:84
+#: templates/web/zurich/admin/body-form.html:36
+msgid "Flag as deleted"
+msgstr "ဖ်က္ျပီးျပီဟုသတ္မွတ္မည္"
+
+#: templates/web/default/admin/report_blocks.html:16
+msgid "Flag user"
+msgstr "သတ္မွတ္သည့္အသံုးျပဳသူ"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1190
+#: templates/web/default/admin/users.html:19
+msgid "Flagged"
+msgstr ""
+
+#: templates/web/default/admin/flagged.html:1
+msgid "Flagged reports and users"
+msgstr "အမွတ္အသားျပဳလုပ္ထားသည့္ အသံုးျပဳသူမ်ားကို ေဖာ္ျပျခင္း"
+
+#: templates/web/default/admin/user-form.html:45
+msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
+msgstr ""
+
+#: templates/web/default/admin/flagged.html:31
+msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:78
+#: templates/web/default/admin/user-form.html:51
+msgid "Flagged:"
+msgstr "အမွတ္အသားျပဳလုပ္ထားျခင္း"
+
+#: templates/web/default/reports/_ward-list.html:3
+#: templates/web/fixmystreet/reports/_ward-list.html:4
+msgid "Follow a ward link to view only reports within that ward."
+msgstr "ရပ္ကြက္ထဲမွအစီရင္ခံစာမ်ားကိုသာၾကည့္ရန္ရပ္ကြက္လင့္ခ္ကိုလိုက္ၾကည့္ပါ"
+
+#: templates/web/default/admin/report_edit.html:30
+msgid "For council(s):"
+msgstr "ေကာင္စီ(မ်ား)အတြက္ -"
+
+#: templates/web/default/admin/body-form.html:65
+msgid "For more information, see <a href='http://code.fixmystreet.com/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>."
+msgstr ""
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:176
+#: templates/web/fixmystreet/report/update-form.html:104
+msgid "Forgotten your password?"
+msgstr "သင္၏စကား၀ွက္ေမ့သြားျပီလား။"
+
+#: templates/web/default/faq/faq-en-gb.html:1
+#: templates/web/emptyhomes/faq/faq-cy.html:1
+#: templates/web/emptyhomes/faq/faq-en-gb.html:1
+#: templates/web/fiksgatami/faq/faq-nb.html:1
+#: templates/web/fiksgatami/nn/faq/faq-nn.html:1
+#: templates/web/fixmybarangay/faq/faq-en-gb.html:1
+#: templates/web/fixmystreet/faq/faq-en-gb.html:1
+#: templates/web/fixmystreet/static/privacy.html:1
+msgid "Frequently Asked Questions"
+msgstr "မၾကာခဏေမးေသာေမးခြန္းမ်ား"
+
+#: templates/web/default/open311/index.html:138
+msgid "GeoRSS on Google Maps"
+msgstr "Google Maps ေပၚက GeoRSS"
+
+#: templates/web/fixmystreet/around/_updates.html:3
+#: templates/web/fixmystreet/report/display.html:38
+msgid "Get updates"
+msgstr "မြမ္းမံထားေသာအသစ္မ်ားရယူရန္"
+
+#: templates/web/fixmystreet/reports/_rss.html:4
+#: templates/web/fixmystreet/reports/_rss.html:9
+msgid "Get updates of %s problems"
+msgstr "%ျပႆနာ၏အသစ္မြမ္းမံမႈမ်ားရယူရန္"
+
+#: templates/web/fixmystreet/reports/_rss.html:11
+#: templates/web/fixmystreet/reports/_rss.html:4
+msgid "Get updates of problems in this %s"
+msgstr ""
+
+#: templates/web/default/alert/_list.html:83
+#: templates/web/fixmybarangay/alert/_list.html:28
+#: templates/web/fixmystreet/alert/_list.html:82
+msgid "Give me an RSS feed"
+msgstr "ကၽြႏ္ုပ္ကို RSS Feed ေပးပါ"
+
+#: templates/web/default/alert/index.html:34
+#: templates/web/default/around/postcode_form.html:8
+#: templates/web/fixmystreet/around/postcode_form.html:21
+#: templates/web/zurich/admin/stats.html:26
+msgid "Go"
+msgstr "သြားမည္"
+
+#: templates/web/default/admin/report_edit.html:77
+msgid "Going to send questionnaire?"
+msgstr "စစ္တမ္းကိုပို႔ေတာ့မွာလား။"
+
+#: templates/web/default/admin/index.html:32
+msgid "Graph of problem creation by status over time"
+msgstr ""
+
+#: templates/web/default/reports/index.html:8
+msgid "Greyed-out lines are councils that no longer exist."
+msgstr ""
+
+#: templates/web/default/questionnaire/index.html:61
+#: templates/web/fixmystreet/questionnaire/index.html:55
+msgid "Has this problem been fixed?"
+msgstr "ဒီျပႆနာကိုေျဖရွင္းျပီးျပီလား"
+
+#: templates/web/default/questionnaire/index.html:74
+#: templates/web/fixmystreet/questionnaire/index.html:68
+msgid "Have you ever reported a problem to a council before, or is this your first time?"
+msgstr "ယခင္က ေကာင္စီထံ ျပႆနာမ်ား အစီရင္ခံဖူးသလား။ သို႔မဟုတ္ ဒါက ပထမဦးဆံုး အႀကိမ္လား?"
+
+#: templates/web/default/footer.html:15
+#: templates/web/emptyhomes/header.html:33
+#: templates/web/fiksgatami/footer.html:9
+#: templates/web/fiksgatami/nn/footer.html:9
+#: templates/web/fixmybarangay/footer.html:24
+#: templates/web/fixmystreet/footer.html:55
+#: templates/web/zurich/faq/faq-de-ch.html:1
+#: templates/web/zurich/footer.html:21
+#: templates/web/zurich/nav_over_content.html:8
+msgid "Help"
+msgstr "အကူအညီ"
+
+#: templates/web/default/alert/_list.html:6
+#: templates/web/fixmystreet/alert/_list.html:8
+msgid "Here are the types of local problem alerts for &lsquo;%s&rsquo;."
+msgstr ""
+
+#: templates/web/fixmybarangay/header.html:66
+#: templates/web/fixmystreet/header.html:53
+#: templates/web/zurich/footer.html:11
+msgid "Hi %s"
+msgstr "မဂၤလာပါ%s"
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:50
+#: templates/web/default/admin/report_edit.html:51
+#: templates/web/default/admin/update_edit.html:28
+#: templates/web/zurich/admin/header.html:11
+#: templates/web/zurich/admin/header.html:2
+#: templates/web/zurich/admin/report_edit.html:89
+#: templates/web/zurich/admin/report_edit.html:93
+#: templates/web/zurich/admin/stats.html:32
+#: templates/web/zurich/admin/update_edit.html:18
+msgid "Hidden"
+msgstr "ေဖ်ာက္ထားေသာ"
+
+#: templates/web/default/around/display_location.html:67
+msgid "Hide old"
+msgstr "အေဟာင္းေဖ်ာက္ထားေသာ"
+
+#: templates/web/default/around/display_location.html:62
+msgid "Hide pins"
+msgstr ""
+
+#: templates/web/default/admin/body_edit.html:79
+msgid "History"
+msgstr "ရာဇ၀င္"
+
+#: templates/web/default/js/translation_strings.html:31
+msgid "Home"
+msgstr "ပင္မ"
+
+#: templates/web/default/index-steps.html:1
+msgid "How to report a problem"
+msgstr "ျပႆနာကိုဘယ္လိုအစီရင္ခံစာတင္မလဲ။"
+
+#: templates/web/default/js/translation_strings.html:33
+msgid "How to send successful reports"
+msgstr "ေကာင္းမြန္ေသာအစီရင္ခံစာကိုဘယ္လိုပို႔မလဲ"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:733
+msgid "I am afraid you cannot confirm unconfirmed reports."
+msgstr "အတည္မျပဳရေသးေသာအစီရင္ခံစာကိုသင္အတည္မျပဳရေသးပါ"
+
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:89
+msgid "I'm afraid we couldn't locate your problem in the database.\n"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Tokens.pm:44
+msgid "I'm afraid we couldn't validate that token, as the report was made too long ago."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Tokens.pm:260
+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 ""
+
+#: templates/web/default/admin/flagged.html:14
+#: templates/web/default/admin/list_updates.html:6
+#: templates/web/default/admin/reports.html:11
+#: templates/web/zurich/admin/index-dm.html:21
+#: templates/web/zurich/admin/index-sdm.html:19
+#: templates/web/zurich/admin/list_updates.html:28
+#: templates/web/zurich/admin/list_updates.html:7
+#: templates/web/zurich/admin/reports.html:11
+msgid "ID"
+msgstr "အိုင္ဒီ"
+
+#: templates/web/default/admin/body-form.html:24
+#: templates/web/default/admin/body-form.html:25
+msgid ""
+"Identify a <strong>parent</strong> if this body is itself part of another body.\n"
+" For basic installations, you don't need to join bodies in this way."
+msgstr ""
+
+#: templates/web/default/admin/body.html:104
+msgid ""
+"If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n"
+" the menu. Make sure you use the same category name in the bodies if you want this to happen."
+msgstr ""
+
+#: templates/web/default/email_sent.html:19
+msgid "If you do not, your alert will not be activated."
+msgstr "သင္မျပဳလုပ္ပါကသင္၏အသိေပးျခင္းကိုအတည္မျပဳေပးႏိုင္ပါ"
+
+#: templates/web/default/email_sent.html:15
+msgid "If you do not, your problem will not be posted."
+msgstr "သင္မျပဳလုပ္ပါကသင္၏ျပႆနာကိုမတင္ႏိုင္ပါ"
+
+#: templates/web/default/email_sent.html:17
+msgid "If you do not, your update will not be posted."
+msgstr "သင္မျပဳလုပ္ပါကသင္၏မြမ္းမံမႈကိုမတင္ႏိုင္ပါ"
+
+#: templates/web/default/report/new/councils_text_none.html:9
+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 "ျပႆနာ တစ္ခုကို ဤေနရာတြင္ တင္သြင္းပါက ျပႆနာ၏ အေသးစိတ္ အခ်က္အလက္ကို အမ်ားျပည္သူ ျမင္ေတြ႕ႏိုင္သည္။ သို႔ေသာ္ ျပႆနာကို ေကာင္စီထံ အစီရင္ခံမည္ မဟုတ္ပါ။"
+
+#: templates/web/emptyhomes/report/new/councils_text_none.html:9
+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 ""
+
+#: templates/web/default/auth/token.html:22
+#: templates/web/default/email_sent.html:9
+msgid "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."
+msgstr ""
+
+#: templates/web/default/questionnaire/index.html:86
+#: templates/web/fixmystreet/questionnaire/index.html:77
+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 ""
+
+#: templates/web/default/admin/body.html:120
+msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:200
+#: templates/web/default/admin/body-form.html:201
+msgid ""
+"If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n"
+" its updates. Enable <strong>extended Open311 stauses</strong> if you want to allow extra states to be passed.\n"
+" Check that your cobrand supports this feature before switching it on."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:187
+#: templates/web/default/admin/body-form.html:188
+msgid ""
+"If you've enabled Open311 update-sending above, enable <strong>suppression of alerts</strong> \n"
+" if you do <strong>not</strong> want that user to be notified whenever these updates are created."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:173
+#: templates/web/default/admin/body-form.html:174
+msgid ""
+"If you've enabled Open311 update-sending above, you must identify which \n"
+" FixMyStreet <strong>user</strong> will be attributed as the creator of those updates\n"
+" when they are shown on the site. Enter the ID (number) of that user."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Contact.pm:116
+msgid "Illegal ID"
+msgstr "တရားမ၀င္ေသာအိုင္ဒီ"
+
+#: perllib/FixMyStreet/App/Controller/Alert.pm:100
+msgid "Illegal feed selection"
+msgstr "တရားမ၀င္ေသာအိုင္ဒီ"
+
+#: templates/web/default/dashboard/index.html:142
+#: templates/web/default/dashboard/index.html:144
+#: templates/web/default/report/update-form.html:30
+#: templates/web/default/report/update-form.html:32
+#: templates/web/fixmystreet/report/update-form.html:28
+#: templates/web/fixmystreet/report/update-form.html:30
+msgid "In Progress"
+msgstr "လုပ္ေဆာင္ေနဆဲ"
+
+#: templates/web/default/admin/flagged.html:39
+msgid "In abuse table?"
+msgstr ""
+
+#: templates/web/default/open311/index.html:90
+msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:143
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:38
+#: templates/web/fixmystreet/report/banner.html:19
+#: templates/web/zurich/admin/header.html:2
+#: templates/web/zurich/admin/header.html:8
+#: templates/web/zurich/admin/report_edit.html:102
+#: templates/web/zurich/report/banner.html:15
+msgid "In progress"
+msgstr "လုပ္ေဆာင္ေနဆဲ"
+
+#: templates/web/zurich/admin/report_edit.html:163
+msgid "Include reporter personal details"
+msgstr ""
+
+#: templates/web/default/admin/stats.html:76
+msgid "Include unconfirmed reports"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:354
+msgid "Incorrect has_photo value \"%s\""
+msgstr ""
+
+#: templates/web/zurich/admin/list_updates.html:3
+msgid "Internal notes"
+msgstr "အတြင္းမွတ္စု"
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:48
+msgid "Internal referral"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:339
+msgid "Invalid agency_responsible value %s"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1105
+msgid "Invalid end date"
+msgstr "ေနာက္ဆံုးေန႔မမွန္ကန္ပါ"
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:432
+msgid "Invalid format %s specified."
+msgstr "ပံုစံ %s သည္မမွန္ကန္ပါ"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1101
+msgid "Invalid start date"
+msgstr "စမည့္ရက္မမွန္ကန္ပါ"
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:37
+#: templates/web/default/dashboard/index.html:142
+#: templates/web/default/dashboard/index.html:143
+#: templates/web/default/report/update-form.html:30
+#: templates/web/default/report/update-form.html:31
+#: templates/web/fixmystreet/report/update-form.html:28
+#: templates/web/fixmystreet/report/update-form.html:29
+msgid "Investigating"
+msgstr "စံုစမ္းစစ္ေဆးေနဆဲ"
+
+#: templates/web/emptyhomes/tokens/confirm_problem.html:13
+#: templates/web/emptyhomes/tokens/confirm_problem.html:14
+msgid "It is worth noting however that the process can sometimes be slow, especially if the property is in very poor repair or the owner is unwilling to act. In most cases it can take six months or more before you can expect to see anything change and sometimes there may be considerable barries to a property being brought back into use. This doesn&rsquo;t mean the council isn&rsquo;t doing anything. We encourage councils to update the website so you can see what is happening. It may be a long process, but you reporting your concerns about this property to the council is a valuable first step."
+msgstr ""
+
+#: templates/web/fixmystreet/contact/blurb.html:8
+msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there."
+msgstr ""
+
+#: templates/web/default/auth/general.html:44
+#: templates/web/default/report/new/fill_in_details_form.html:149
+#: templates/web/default/report/update-form.html:104
+#: templates/web/fixmystreet/auth/general.html:46
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:172
+#: templates/web/fixmystreet/report/update-form.html:100
+#: templates/web/zurich/auth/general.html:40
+msgid "Keep me signed in on this computer"
+msgstr "ဒီကြန္ျပဴတာမွာ၀င္ေနေအာင္ျပဳလုပ္မည္"
+
+#: templates/web/default/admin/body.html:58
+#: templates/web/zurich/admin/body.html:15
+msgid "Last editor"
+msgstr "ေနာက္ဆံုးအယ္ဒီတာ"
+
+#: templates/web/default/admin/report_edit.html:72
+msgid "Last update:"
+msgstr "ေနာက္ဆံုးအသစ္မြမ္းမံျခင္း-"
+
+#: templates/web/default/admin/problem_row.html:39
+msgid "Last&nbsp;update:"
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:222
+msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
+msgstr ""
+
+#: templates/web/default/admin/body.html:14
+#: templates/web/default/admin/body.html:16
+msgid "List all reported problems"
+msgstr "အစီရင္ခံစာတင္ျပီးေသာျပႆနာစာရင္းအားလံုး"
+
+#: templates/web/default/report/new/fill_in_details_form.html:68
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:51
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:75
+#: templates/web/zurich/report/new/fill_in_details_form.html:51
+msgid "Loading..."
+msgstr "ဖြင့္ေနသည္"
+
+#: templates/web/default/alert/choose.html:1
+#: templates/web/default/alert/choose.html:3
+#: templates/web/default/alert/index.html:1
+#: templates/web/default/alert/index.html:3
+#: templates/web/default/alert/list.html:2
+#: templates/web/default/alert/list.html:5
+#: templates/web/default/alert/updates.html:1
+#: templates/web/default/tokens/confirm_alert.html:1
+#: templates/web/default/tokens/confirm_alert.html:3
+#: templates/web/emptyhomes/alert/index.html:1
+#: templates/web/emptyhomes/alert/index.html:3
+#: templates/web/fixmybarangay/alert/index.html:1
+#: templates/web/fixmybarangay/alert/index.html:3
+#: templates/web/fixmystreet/alert/updates.html:1
+msgid "Local RSS feeds and email alerts"
+msgstr "ျပည္တြင္း RSS feed မ်ားႏွင့္ အီးေမးလ္ သတိေပးခ်က္မ်ား"
+
+#: templates/web/default/alert/list.html:13
+#: templates/web/default/alert/list.html:14
+#: templates/web/default/alert/list.html:2
+#: templates/web/default/alert/list.html:3
+msgid "Local RSS feeds and email alerts for ‘%s’"
+msgstr "‘%s’ အတြက္ ျပည္တြင္း RSS feed မ်ားႏွင့္ အီးေမးလ္ သတိေပးခ်က္မ်ား"
+
+#: templates/web/default/footer.html:13 templates/web/fiksgatami/footer.html:8
+#: templates/web/fiksgatami/nn/footer.html:8
+#: templates/web/fixmybarangay/footer.html:22
+#: templates/web/fixmystreet/footer.html:53
+msgid "Local alerts"
+msgstr "ေဒသတြင္းအသိေပးခ်က္"
+
+#: templates/web/default/index-steps.html:25
+msgid "Locate the problem on a map of the area"
+msgstr "ဧရိယာ၏ေျမပံုတစ္ခုတြင္ျပႆနာကိုေနရာသတ္မွတ္မည္"
+
+#: templates/web/default/js/translation_strings.html:43
+msgid "MAP"
+msgstr "ေျမပံု"
+
+#: perllib/FixMyStreet/Map/OSM.pm:44
+msgid "Map &copy; <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> and contributors, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA</a>"
+msgstr ""
+
+#: templates/web/default/admin/user-form.html:43
+msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
+msgstr ""
+
+#: templates/web/fixmystreet/contact/index.html:103
+msgid "Message"
+msgstr "စာ"
+
+#: templates/web/default/contact/index.html:92
+msgid "Message:"
+msgstr "စာ-"
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:440
+msgid "Missing jurisdiction_id"
+msgstr ""
+
+#: templates/web/zurich/admin/stats.html:34
+msgid "Moderated by division within one working day"
+msgstr ""
+
+#: templates/web/default/admin/stats.html:11
+msgid "Month"
+msgstr "လ"
+
+#: templates/web/default/report/display.html:30
+msgid "More problems nearby"
+msgstr "အနီးနားရွိျပႆနာမ်ားစြာ"
+
+#: templates/web/default/admin/bodies.html:16
+#: templates/web/default/admin/body-form.html:18
+#: templates/web/default/admin/flagged.html:16
+#: templates/web/default/admin/flagged.html:37
+#: templates/web/default/admin/list_updates.html:7
+#: templates/web/default/admin/reports.html:13
+#: templates/web/default/admin/users.html:15
+#: templates/web/default/reports/index.html:15
+#: templates/web/emptyhomes/reports/index.html:9
+#: templates/web/fiksgatami/nn/reports/index.html:9
+#: templates/web/fiksgatami/reports/index.html:9
+#: templates/web/fixmybarangay/reports/index.html:15
+#: templates/web/fixmystreet/auth/general.html:56
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:120
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:187
+#: templates/web/fixmystreet/report/update-form.html:136
+#: templates/web/zurich/admin/body-form.html:4
+#: templates/web/zurich/auth/general.html:60
+#: templates/web/zurich/report/new/fill_in_details_form.html:100
+msgid "Name"
+msgstr "အမည္"
+
+#: templates/web/default/admin/report_edit.html:66
+#: templates/web/default/admin/update_edit.html:32
+#: templates/web/default/admin/user-form.html:18
+#: templates/web/zurich/admin/report_edit-sdm.html:46
+#: templates/web/zurich/admin/report_edit.html:59
+#: templates/web/zurich/admin/stats.html:41
+msgid "Name:"
+msgstr "အမည္-"
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:322
+msgid "Name: %s"
+msgstr "အမည္ - %s"
+
+#: templates/web/fiksgatami/footer.html:3
+#: templates/web/fiksgatami/nn/footer.html:3
+msgid "Navigation"
+msgstr ""
+
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:188
+#: perllib/FixMyStreet/Geocode/OSM.pm:166
+msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:142
+msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:421
+#: perllib/FixMyStreet/Cobrand/Default.pm:461
+msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:297
+msgid ""
+"Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
+"\n"
+msgstr ""
+
+#: templates/web/default/email_sent.html:3
+msgid "Nearly Done! Now check your email..."
+msgstr "လုပ္ေဆာင္မႈနီးပါးျပီးပါျပီ၊ သင္၏အီးေမးလ္ကိုစစ္ေဆးပါ"
+
+#: templates/web/default/reports/index.html:16
+#: templates/web/fixmybarangay/reports/index.html:16
+msgid "New <br>problems"
+msgstr "အသစ္<br>ျပႆနာမ်ား"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:264
+msgid "New body added"
+msgstr "စာကိုယ္အသစ္ထည့္ျပီးျပီ"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:376
+msgid "New category contact added"
+msgstr "ေခါင္းစဥ္အသစ္အဆက္အသြယ္ထည့္ျပီးျပီ"
+
+#: templates/web/zurich/admin/report_edit-sdm.html:58
+#: templates/web/zurich/admin/report_edit.html:84
+msgid "New internal note:"
+msgstr "အတြင္းမွတ္စုအသစ္-"
+
+#: db/alert_types.pl:18 db/alert_types.pl:22
+msgid "New local problems on FixMyStreet"
+msgstr "ကၽြႏ္ုပ္လမ္းကိုျပင္ေပးပါတြင္ေဒသတြင္းျပႆနာအသစ္မ်ား"
+
+#: db/alert_types_eha.pl:12
+msgid "New local reports on reportemptyhomes.com"
+msgstr "reportemptyhomes.com မွ ျပည္တြင္း အစီရင္ခံစာသစ္မ်ား"
+
+#: templates/web/emptyhomes/reports/index.html:10
+#: templates/web/fiksgatami/nn/reports/index.html:10
+#: templates/web/fiksgatami/reports/index.html:10
+msgid "New problems"
+msgstr "ျပႆနာအသစ္မ်ား"
+
+#: db/alert_types.pl:38
+msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet"
+msgstr ""
+
+#: db/alert_types.pl:26 db/alert_types.pl:30
+msgid "New problems near {{POSTCODE}} on FixMyStreet"
+msgstr ""
+
+#: db/alert_types.pl:10
+msgid "New problems on FixMyStreet"
+msgstr "ကၽြႏ္ုပ္လမ္းကိုျပင္ေပးပါတြင္ျပႆနာအသစ္မ်ား"
+
+#: db/alert_types.pl:34
+msgid "New problems to {{COUNCIL}} on FixMyStreet"
+msgstr ""
+
+#: db/alert_types.pl:42
+msgid "New problems within {{NAME}}'s boundary on FixMyStreet"
+msgstr ""
+
+#: templates/web/zurich/admin/index-sdm.html:4
+msgid "New reports"
+msgstr "အစီရင္ခံစာအသစ္မ်ား"
+
+#: db/alert_types_eha.pl:23
+msgid "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com"
+msgstr ""
+
+#: db/alert_types_eha.pl:5
+msgid "New reports on reportemptyhomes.com"
+msgstr ""
+
+#: db/alert_types_eha.pl:16
+msgid "New reports on reportemptyhomes.com near {{POSTCODE}}"
+msgstr ""
+
+#: db/alert_types_eha.pl:19
+msgid "New reports to {{COUNCIL}} on reportemptyhomes.com"
+msgstr ""
+
+#: db/alert_types_eha.pl:27
+msgid "New reports within {{NAME}}'s boundary on reportemptyhomes.com"
+msgstr ""
+
+#: templates/web/default/admin/questionnaire.html:24
+msgid "New state"
+msgstr "ျမိဳ႕အသစ္"
+
+#: templates/web/zurich/admin/report_edit-sdm.html:61
+msgid "New update:"
+msgstr "အသစ္မြမ္းမံမႈ - "
+
+#: templates/web/fiksgatami/front/news.html:9
+#: templates/web/fiksgatami/nn/front/news.html:9
+#: templates/web/fixmystreet/front/news.html:8
+msgid "New!"
+msgstr "အသစ္"
+
+#: templates/web/default/pagination.html:13
+msgid "Next"
+msgstr "ေနာက္သို႔"
+
+#: templates/web/default/admin/body.html:68
+#: templates/web/default/admin/body.html:69
+#: templates/web/default/admin/body.html:70
+#: templates/web/default/admin/body_edit.html:4
+#: templates/web/default/admin/list_updates.html:32
+#: templates/web/default/admin/list_updates.html:34
+#: templates/web/default/admin/list_updates.html:35
+#: templates/web/default/admin/problem_row.html:20
+#: templates/web/default/admin/report_edit.html:64
+#: templates/web/default/admin/report_edit.html:77
+#: templates/web/default/admin/update_edit.html:25
+#: templates/web/default/questionnaire/creator_fixed.html:16
+#: templates/web/default/questionnaire/index.html:111
+#: templates/web/default/questionnaire/index.html:68
+#: templates/web/fixmystreet/questionnaire/index.html:101
+#: templates/web/fixmystreet/questionnaire/index.html:62
+msgid "No"
+msgstr "မရွိပါ"
+
+#: templates/web/default/admin/user-form.html:33
+msgid "No body"
+msgstr "စာကိုယ္မရွိ"
+
+#: templates/web/default/admin/stats.html:85
+msgid "No council"
+msgstr "ေကာင္စီမရွိ"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:362
+msgid "No council selected"
+msgstr "မည္သည့္ေကာင္စီမွမေရြးရေသးပါ"
+
+#: templates/web/default/admin/edit-league.html:17
+msgid "No edits have yet been made."
+msgstr ""
+
+#: templates/web/default/admin/flagged.html:25
+msgid "No flagged problems found."
+msgstr ""
+
+#: templates/web/default/admin/flagged.html:58
+msgid "No flagged users found."
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:68
+msgid "No further updates"
+msgstr "အသစ္မြမ္းမံမႈမ်ားမေတြ႕ပါ"
+
+#: templates/web/default/around/around_map_list_items.html:17
+#: templates/web/fixmystreet/around/around_map_list_items.html:8
+msgid "No problems found."
+msgstr "ျပႆနာမ်ားမေတြ႕ပါ"
+
+#: templates/web/default/around/on_map_list_items.html:14
+#: templates/web/fixmystreet/around/on_map_list_items.html:6
+msgid "No problems have been reported yet."
+msgstr "မည္သည့္ျပႆနာမွအစီရင္မခံရေသးပါ"
+
+#: templates/web/default/js/translation_strings.html:38
+msgid "No result returned"
+msgstr "ရလဒ္မေတြ႕ပါ"
+
+#: templates/web/default/admin/body-form.html:60
+#: templates/web/default/admin/body-form.html:61
+msgid ""
+"No specific areas are currently available, because the <code>MAPIT_URL</code> in\n"
+" your config file is not pointing to a live MapIt service."
+msgstr ""
+
+#: templates/web/default/report/_support.html:3
+#: templates/web/default/report/_support.html:4
+msgid "No supporters"
+msgstr "ေထာက္ပံ့ေပးမည့္သူမရွိပါ"
+
+#: templates/web/default/admin/body.html:73
+msgid "Non Public"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:30
+#: templates/web/zurich/admin/report_edit-sdm.html:49
+#: templates/web/zurich/admin/report_edit.html:63
+msgid "None"
+msgstr "ဘာမွမဟုတ္"
+
+#: templates/web/default/admin/user-form.html:24
+#: templates/web/default/admin/user-form.html:25
+msgid ""
+"Normal (public) users should not be associated with any <strong>body</strong>.<br>\n"
+" Authorised staff users can be associated with the body they represent.<br>\n"
+" Depending on the implementation, staff users may have access to the dashboard (summary of\n"
+" activity across their body), the ability to hide reports or set special report statuses."
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:46
+#: templates/web/default/report/update-form.html:30
+#: templates/web/default/report/update-form.html:33
+#: templates/web/fixmystreet/report/update-form.html:28
+#: templates/web/fixmystreet/report/update-form.html:31
+msgid "Not Responsible"
+msgstr "တာ၀န္ယူမႈမရွိျခင္း"
+
+#: templates/web/zurich/admin/report_edit-sdm.html:21
+msgid "Not for my subdivision"
+msgstr "ကၽြႏ္ုပ္၏အေသးစိတ္နယ္နမိတ္အတြက္မဟုတ္ပါ"
+
+#: templates/web/default/admin/questionnaire.html:6
+msgid "Not reported before"
+msgstr "ယခင္ကအစီရင္မခံရေသး"
+
+#: templates/web/default/report/_main.html:10
+msgid "Not reported to council"
+msgstr "ေကာင္စီသို႔အစီရင္မခံရေသး"
+
+#: templates/web/default/admin/body.html:59
+#: templates/web/default/admin/body_edit.html:87
+#: templates/web/zurich/admin/body.html:16
+msgid "Note"
+msgstr "မွတ္စု"
+
+#: templates/web/default/admin/stats.html:51
+msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little"
+msgstr ""
+
+#: templates/web/default/admin/body.html:157
+#: templates/web/default/admin/body_edit.html:44
+#: templates/web/zurich/admin/body.html:47
+msgid "Note:"
+msgstr "မွတ္စု -"
+
+#: templates/web/default/open311/index.html:75
+msgid "Note: <strong>%s</strong>"
+msgstr "မွတ္စု <strong> %s </strong>"
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:154
+msgid "Now to submit your report&hellip;"
+msgstr "ယခုသင္၏အစီရင္ခံစာကိုသြင္းႏိုင္ပါျပီ &hellip;"
+
+#: templates/web/default/report/new/fill_in_details_form.html:131
+msgid "Now to submit your report&hellip; do you have a FixMyStreet password?"
+msgstr ""
+
+#: templates/web/fixmystreet/report/update-form.html:83
+msgid "Now to submit your update&hellip;"
+msgstr ""
+
+#: templates/web/default/report/update-form.html:86
+msgid "Now to submit your update&hellip; do you have a FixMyStreet password?"
+msgstr ""
+
+#: templates/web/default/js/translation_strings.html:42
+msgid "OK"
+msgstr "အိုေက"
+
+#: templates/web/default/report/display.html:24
+#: templates/web/default/report/update.html:16
+msgid "Offensive? Unsuitable? Tell us"
+msgstr "ထိခိုက္ေစႏိုင္ေသာ၊မသင့္ေတာ္ဘူးလား၊ ကၽြႏ္ုပ္တို႔ကိုေျပာပါ"
+
+#: templates/web/default/reports/index.html:18
+#: templates/web/fixmybarangay/reports/index.html:18
+msgid "Old / unknown <br>problems"
+msgstr "အေဟာင္း၊အမည္မသိ <br>ျပႆနာမ်ား"
+
+#: templates/web/fiksgatami/nn/reports/index.html:12
+#: templates/web/fiksgatami/reports/index.html:12
+msgid "Old problems,<br>state unknown"
+msgstr "ျပႆနာအေဟာင္းမ်ား<br>ျပည္နယ္မသိပါ"
+
+#: templates/web/default/admin/questionnaire.html:24
+msgid "Old state"
+msgstr "ျပည္နယ္အေဟာင္း"
+
+#: templates/web/default/reports/index.html:20
+#: templates/web/fixmybarangay/reports/index.html:20
+msgid "Older <br>fixed"
+msgstr "ပို၍ေဟာင္းေသာ <br> ျပင္ျပီးျပီ"
+
+#: templates/web/default/reports/index.html:17
+#: templates/web/fixmybarangay/reports/index.html:17
+msgid "Older <br>problems"
+msgstr "ပို၍ေဟာင္းေသာ<br>ျပႆနာမ်ား"
+
+#: templates/web/fiksgatami/nn/reports/index.html:14
+#: templates/web/fiksgatami/reports/index.html:14
+msgid "Older fixed"
+msgstr "ျပင္ဆင္ျပီးေသာအေဟာင္းမ်ား"
+
+#: templates/web/emptyhomes/reports/index.html:11
+#: templates/web/fiksgatami/nn/reports/index.html:11
+#: templates/web/fiksgatami/reports/index.html:11
+msgid "Older problems"
+msgstr "ျပႆနာအေဟာင္းမ်ား"
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:137
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:36
+#: templates/web/default/admin/report_edit.html:37
+#: templates/web/default/admin/update_edit.html:28
+#: templates/web/default/dashboard/index.html:142
+#: templates/web/default/report/update-form.html:30
+#: templates/web/fixmystreet/report/update-form.html:28
+#: templates/web/zurich/admin/header.html:2
+#: templates/web/zurich/admin/header.html:7
+#: templates/web/zurich/admin/report_edit.html:89
+#: templates/web/zurich/admin/report_edit.html:91
+#: templates/web/zurich/admin/update_edit.html:18
+#: templates/web/zurich/report/banner.html:11
+msgid "Open"
+msgstr "ဖြင့္မည္"
+
+#: templates/web/default/my/my.html:27 templates/web/fixmystreet/my/my.html:33
+msgid "Open reports"
+msgstr "အစီရင္ခံစာကိုဖြင့္မည္"
+
+#: templates/web/default/open311/index.html:72
+msgid "Open311 API for the mySociety FixMyStreet server"
+msgstr "mySociety FixMyStreet ဆာဗာအတြက္ ၃၁၁ API ကိုဖြင့္မည္"
+
+#: templates/web/default/open311/index.html:82
+msgid "Open311 initiative web page"
+msgstr ""
+
+#: templates/web/default/open311/index.html:83
+msgid "Open311 specification"
+msgstr ""
+
+#: templates/web/default/alert/_list.html:58
+#: templates/web/fixmystreet/alert/_list.html:60
+msgid "Or problems reported to:"
+msgstr "သို႔မဟုတ္ ျပႆနာမ်ားကိုတင္ျပရန္ေနရာမွာ-"
+
+#: templates/web/default/alert/_list.html:33
+#: templates/web/fixmystreet/alert/_list.html:36
+msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1057
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:662
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:663
+#: perllib/FixMyStreet/DB/Result/Problem.pm:546
+#: perllib/FixMyStreet/DB/Result/Problem.pm:556
+#: perllib/FixMyStreet/DB/Result/Problem.pm:566
+#: perllib/FixMyStreet/DB/Result/Problem.pm:578
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:369
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:384
+msgid "Other"
+msgstr "တျခား"
+
+#: templates/web/default/footer.html:27
+msgid "Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>."
+msgstr ""
+
+#: templates/web/default/admin/list_updates.html:8
+msgid "Owner"
+msgstr "ပိုင္ရွင္"
+
+#: templates/web/default/errors/page_error_404_not_found.html:1
+#: templates/web/default/errors/page_error_404_not_found.html:3
+msgid "Page Not Found"
+msgstr "စာမ်က္ႏွာရွာမေတြ႕ပါ"
+
+#: templates/web/default/admin/body-form.html:31
+#: templates/web/zurich/admin/body-form.html:14
+msgid "Parent"
+msgstr "ပင္မ"
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:51
+msgid "Partial"
+msgstr "တစ္၀က္"
+
+#: templates/web/fixmystreet/auth/general.html:59
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:208
+#: templates/web/fixmystreet/report/update-form.html:119
+#: templates/web/zurich/auth/general.html:32
+#: templates/web/zurich/auth/general.html:63
+msgid "Password (optional)"
+msgstr "စကား၀ွက္(ထည့္ခ်င္မွထည့္ပါ)"
+
+#: templates/web/default/auth/change_password.html:25
+msgid "Password:"
+msgstr "စကား၀ွက္-"
+
+#: templates/web/default/js/translation_strings.html:45
+msgid "Permalink"
+msgstr "အျမဲတမ္းလင့္ခ္"
+
+#: templates/web/zurich/report/new/fill_in_details_form.html:106
+msgid "Phone number"
+msgstr "ဖုန္းနံပါတ္"
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:138
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:205
+msgid "Phone number (optional)"
+msgstr "ဖုန္းနံပါတ္(ထည့္ခ်င္မွထည့္ပါ)"
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:287
+#: templates/web/default/admin/report_edit.html:68
+#: templates/web/default/report/new/fill_in_details_form.html:215
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:138
+#: templates/web/zurich/admin/report_edit-sdm.html:49
+#: templates/web/zurich/admin/report_edit.html:63
+#: templates/web/zurich/admin/stats.html:39
+msgid "Phone:"
+msgstr "ဖုန္း-"
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:92
+#: templates/web/fixmystreet/report/update-form.html:59
+#: templates/web/zurich/admin/index-dm.html:29
+#: templates/web/zurich/admin/index-sdm.html:24
+#: templates/web/zurich/admin/reports.html:16
+#: templates/web/zurich/admin/stats.html:37
+#: templates/web/zurich/report/new/fill_in_details_form.html:68
+msgid "Photo"
+msgstr "ဓာတ္ပံု"
+
+#: templates/web/default/questionnaire/index.html:99
+#: templates/web/default/report/new/fill_in_details_form.html:102
+#: templates/web/default/report/update-form.html:62
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:99
+#: templates/web/fixmystreet/questionnaire/index.html:90
+msgid "Photo:"
+msgstr "ဓာတ္ပံု-"
+
+#: templates/web/default/alert/list.html:26
+msgid "Photos of recent nearby reports"
+msgstr "မၾကာေသးခင္ကအနီးအနားက အစီရင္ခံစာမ်ား၏ဓာတ္ပံု"
+
+#: templates/web/default/js/translation_strings.html:30
+msgid "Place pin on map"
+msgstr "ေျမပံုတြင္ပင္တစ္ခုထားမည္"
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:38
+#: templates/web/default/dashboard/index.html:142
+#: templates/web/default/dashboard/index.html:143
+#: templates/web/zurich/admin/header.html:2
+#: templates/web/zurich/admin/header.html:9
+#: templates/web/zurich/admin/index-dm.html:9
+#: templates/web/zurich/admin/report_edit.html:89
+#: templates/web/zurich/admin/report_edit.html:92
+msgid "Planned"
+msgstr "စီစဥ္ထားသည့္အတိုင္း"
+
+#: templates/web/fixmystreet/questionnaire/index.html:44
+msgid "Please <a class=\"tab_link\" href=\"#report\">take a look</a> at the updates that have been left."
+msgstr ""
+
+#: templates/web/default/report/new/notes.html:6
+#: templates/web/fixmystreet/report/new/notes.html:6
+msgid "Please be polite, concise and to the point."
+msgstr ""
+
+#: templates/web/default/auth/change_password.html:12
+#: templates/web/default/auth/change_password.html:17
+msgid "Please check the passwords and try again"
+msgstr "စကား၀ွက္ကိုျပန္စစ္ေဆးျပီးျပန္ၾကိဳးစားပါ"
+
+#: templates/web/default/auth/token.html:14
+msgid "Please check your email"
+msgstr "သင္၏အီးေမးလ္ကိုစစ္ပါ"
+
+#: templates/web/default/auth/general.html:14
+#: templates/web/default/auth/general.html:8
+#: templates/web/fixmystreet/auth/general.html:15
+#: templates/web/fixmystreet/auth/general.html:9
+#: templates/web/zurich/auth/general.html:3
+#: templates/web/zurich/auth/general.html:9
+msgid "Please check your email address is correct"
+msgstr "သင္၏အီးေမးလ္လိပ္စာမွန္၊မမွန္ကိုစစ္ေဆးပါ"
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:859
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:878
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:921
+#: perllib/FixMyStreet/DB/Result/Problem.pm:381
+#: templates/web/default/js/translation_strings.html:9
+msgid "Please choose a category"
+msgstr "ေခါင္းစဥ္တစ္ခုကိုေရြးပါ"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:387
+msgid "Please choose a property type"
+msgstr "ပစၥည္းအမ်ိဳးအစားတစ္ခုကိုေရြးပါ"
+
+#: templates/web/default/contact/blurb.html:2
+#: templates/web/fixmystreet/contact/blurb.html:12
+msgid ""
+"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 ""
+
+#: templates/web/default/report/new/notes.html:7
+#: templates/web/fixmystreet/report/new/notes.html:7
+msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the service for all users."
+msgstr ""
+
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:46
+msgid "Please do not give address or personal information in this section."
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Comment.pm:126
+#: templates/web/default/js/translation_strings.html:2
+msgid "Please enter a message"
+msgstr "စာတစ္ခုရိုက္ထည့္ပါ"
+
+#: templates/web/default/auth/change_password.html:12
+#: templates/web/default/auth/change_password.html:15
+#: templates/web/default/js/translation_strings.html:19
+msgid "Please enter a password"
+msgstr "စကား၀ွက္တစ္ခုရိုက္ထည့္ပါ"
+
+#: perllib/FixMyStreet/App/Controller/Contact.pm:97
+#: perllib/FixMyStreet/DB/Result/Problem.pm:356
+#: templates/web/default/js/translation_strings.html:3
+msgid "Please enter a subject"
+msgstr "ေခါင္းစီးတစ္ခုရိုက္ထည့္ပါ"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1041
+#: perllib/FixMyStreet/App/Controller/Admin.pm:988
+#: perllib/FixMyStreet/DB/Result/User.pm:115
+#: templates/web/default/js/translation_strings.html:12
+#: templates/web/default/js/translation_strings.html:16
+msgid "Please enter a valid email"
+msgstr "မွန္ကန္ေသာအီးေမးလ္တစ္ခုရိုက္ထည့္ပါ"
+
+#: perllib/FixMyStreet/App/Controller/Alert.pm:346
+#: perllib/FixMyStreet/App/Controller/Contact.pm:107
+msgid "Please enter a valid email address"
+msgstr "မွန္ကန္ေသာအီးေမးလ္လိပ္စာတစ္ခုရိုက္ထည့္ပါ"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:359
+#: templates/web/default/js/translation_strings.html:4
+msgid "Please enter some details"
+msgstr "တစ္ခ်ိဳ႕အခ်က္အလက္မ်ားကိုရိုက္ထည့္ပါ"
+
+#: perllib/FixMyStreet/App/Controller/Contact.pm:96
+#: perllib/FixMyStreet/DB/Result/User.pm:112
+#: templates/web/default/auth/general.html:13
+#: templates/web/default/auth/general.html:8
+#: templates/web/default/js/translation_strings.html:11
+#: templates/web/default/js/translation_strings.html:15
+#: templates/web/fixmystreet/auth/general.html:14
+#: templates/web/fixmystreet/auth/general.html:9
+#: templates/web/zurich/auth/general.html:3
+#: templates/web/zurich/auth/general.html:8
+msgid "Please enter your email"
+msgstr "သင္၏အီးေမးလ္ကိုရိုက္ထည့္ပါ"
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:151
+#: templates/web/zurich/report/new/fill_in_details_form.html:92
+msgid "Please enter your email address"
+msgstr "သင္၏အီးေမးလ္လိပ္စာကိုရိုက္ထည့္ပါ"
+
+#: templates/web/default/js/translation_strings.html:25
+msgid "Please enter your first name"
+msgstr "သင္၏ပထမအမည္ကိုရိုက္ထည့္ပါ"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:374
+#: templates/web/default/js/translation_strings.html:7
+msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Contact.pm:95
+#: perllib/FixMyStreet/DB/Result/Comment.pm:123
+#: perllib/FixMyStreet/DB/Result/Problem.pm:367
+#: perllib/FixMyStreet/DB/Result/User.pm:108
+#: templates/web/default/js/translation_strings.html:6
+msgid "Please enter your name"
+msgstr "သင္၏အမည္ကိုရိုက္ထည့္ပါ"
+
+#: templates/web/default/js/translation_strings.html:22
+msgid "Please enter your phone number"
+msgstr "သင္၏ဖုန္းနံပါတ္ကိုရိုက္ထည့္ပါ"
+
+#: templates/web/default/js/translation_strings.html:26
+msgid "Please enter your second name"
+msgstr "သင္၏ဒုတိယအမည္ကိုရိုက္ထည့္ပါ"
+
+#: templates/web/default/js/translation_strings.html:24
+msgid "Please enter your title"
+msgstr "သင္၏ေခါင္းစဥ္ကိုရိုက္ထည့္ပါ"
+
+#: templates/web/default/auth/sign_out.html:5
+#: templates/web/zurich/auth/sign_out.html:5
+msgid "Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a href=\"/\">front page</a>."
+msgstr "ျပန္လည္ ဝင္ေရာက္ပါ သို႔မဟုတ္ အေရွ႕စာမ်က္ႏွာကို ျပန္သြားပါ။"
+
+#: templates/web/emptyhomes/report/new/fill_in_details_text.html:1
+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"
+"to read, as does a lack of punctuation."
+msgstr ""
+
+#: templates/web/default/report/new/fill_in_details_text.html:11
+#: templates/web/default/report/new/fill_in_details_text.html:2
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:10
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:2
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:2
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:8
+msgid "Please fill in details of the problem below."
+msgstr ""
+
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:2
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:3
+msgid ""
+"Please fill in details of the problem below. Leave as much detail as you can, \n"
+"and if possible describe the exact location of\n"
+"the problem (e.g. if there is a streetlight number or road name)."
+msgstr ""
+
+#: templates/web/default/report/new/fill_in_details_text.html:2
+#: templates/web/default/report/new/fill_in_details_text.html:3
+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 ""
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:70
+#: templates/web/zurich/report/new/fill_in_details_form.html:46
+msgid "Please fill in details of the problem."
+msgstr ""
+
+#: templates/web/default/report/new/fill_in_details_form.html:27
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:26
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:35
+#: templates/web/zurich/report/new/fill_in_details_form.html:20
+msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
+msgid "Please indicate whether you'd like to receive another questionnaire"
+msgstr ""
+
+#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4
+msgid "Please note that updates are not sent to the council."
+msgstr "အသစ္မြမ္းမံမႈမ်ားသည္ေကာင္စီသို႔မပို႔ရေသးဘူးဆိုတာမွတ္သားေစလိုပါသည္"
+
+#: templates/web/default/report/update-form.html:7
+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 ""
+
+#: templates/web/default/report/new/fill_in_details_form.html:5
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:5
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:26
+#: templates/web/zurich/report/new/fill_in_details_form.html:11
+msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit."
+msgstr ""
+
+#: templates/web/default/report/new/notes.html:1
+#: templates/web/fixmybarangay/report/new/notes.html:1
+#: templates/web/fixmystreet/report/new/notes.html:1
+msgid "Please note:"
+msgstr "ေက်းဇူးျပဳျပီးမွတ္သားပါ-"
+
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:246
+msgid "Please provide some explanation as to why you're reopening this report"
+msgstr "သင္ဘာလို႔ဒီသတင္းပို႔ခ်က္ကိုျပန္ဖြင့္ရသလဲဆိုသည့္ရွင္းလင္းခ်က္ကိုေျပာျပေပးပါ"
+
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253
+msgid "Please provide some text as well as a photo"
+msgstr "စာအနည္းငယ္ႏွင့္ဓာတ္ပံုတစ္ပံုကိုလည္းေဖာ္ျပေပးပါ"
+
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239
+msgid "Please say whether you've ever reported a problem to your council before"
+msgstr "သင္၏ေကာင္စီသို႔သင္ယခင္ကသတင္းပို႔ဖူးေၾကာင္းေျပာျပေပးပါ"
+
+#: perllib/FixMyStreet/App/Controller/Alert.pm:80
+msgid "Please select the feed you want"
+msgstr "သင္လိုခ်င္ေသာ feed ကိုေရြးပါ"
+
+#: perllib/FixMyStreet/App/Controller/Alert.pm:118
+msgid "Please select the type of alert you want"
+msgstr "သင္လိုခ်င္ေသာ အသိေပးခ်က္အမ်ိဳးအစားမ်ားကိုေရြးပါ"
+
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235
+msgid "Please state whether or not the problem has been fixed"
+msgstr "ျပႆနာေျဖရွင္းျပီးျပီ၊မရွင္းျပီးျပီကိုေဖာ္ျပပါ"
+
+#: templates/web/default/questionnaire/index.html:50
+msgid "Please take a look at the updates that have been left."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Photo.pm:176
+msgid "Please upload a JPEG image only"
+msgstr "JPEG ပံုတစ္ပံုသာတင္ရန္"
+
+#: perllib/FixMyStreet/App/Controller/Photo.pm:183
+msgid "Please upload a JPEG image only\n"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Contact.pm:98
+msgid "Please write a message"
+msgstr "စာတစ္ေၾကာင္းေရးပါ"
+
+#: templates/web/fixmystreet/report/update-form.html:23
+msgid "Please write your update here"
+msgstr "သင္၏အသစ္မြမ္းမံမႈကိုဒီေနရာမွာေရးပါ"
+
+#: templates/web/default/contact/index.html:95
+#: templates/web/default/report/update-form.html:109
+#: templates/web/default/report/update-form.html:131
+#: templates/web/default/report/update-form.html:72
+#: templates/web/fixmystreet/contact/index.html:110
+#: templates/web/fixmystreet/report/update-form.html:123
+#: templates/web/fixmystreet/report/update-form.html:71
+#: templates/web/fixmystreet/report/update-form.html:95
+msgid "Post"
+msgstr "တင္မည္"
+
+#: templates/web/default/report/updates.html:15
+msgid "Posted anonymously at %s"
+msgstr "%sမွာ အမည္မသိကဲ့သို႔တင္မည္"
+
+#: templates/web/default/report/updates.html:22
+msgid "Posted by %s (<strong>%s</strong>) at %s"
+msgstr "%s မွာ %s(<strong>%s</strong>)မွတင္ခဲ့သည္"
+
+#: templates/web/default/report/updates.html:24
+msgid "Posted by %s at %s"
+msgstr "%s မွာ %s မွတင္ခဲ့သည္"
+
+#: templates/web/default/pagination.html:7
+msgid "Previous"
+msgstr "ယခင္က"
+
+#: templates/web/default/admin/body.html:173
+#: templates/web/default/admin/body_edit.html:40
+#: templates/web/default/admin/report_edit.html:79
+msgid "Private"
+msgstr "ကိုယ္ပိုင္"
+
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:108
+msgid "Private information (not shown on site)"
+msgstr "ကိုယ္ပိုင္အခ်က္အလက္(ဆိုဒ္တြင္မေဖာ္ျပပါ)"
+
+#: templates/web/default/maps/openlayers.html:86
+msgid "Problem"
+msgstr "ျပႆနာ"
+
+#: templates/web/default/admin/timeline.html:22
+msgid "Problem %d created"
+msgstr "ျပႆနာ %dကိုဖန္တီးခဲ့"
+
+#: templates/web/default/admin/timeline.html:24
+msgid "Problem %s confirmed"
+msgstr "ျပႆနာ %s သည္အတည္ျဖစ္ခဲ့သည္"
+
+#: templates/web/default/admin/timeline.html:26
+msgid "Problem %s sent to council %s"
+msgstr "ေကာင္စီ %s သို႔ ျပႆနာ %s ကိုပို႔လိုက္ပါျပီ"
+
+#: templates/web/default/admin/index.html:36
+#: templates/web/zurich/admin/index.html:9
+msgid "Problem breakdown by state"
+msgstr "ျပည္နယ္မွ ျပႆနာကိုထပ္မံခြဲစိတ္လိုက္သည္"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:959
+msgid "Problem marked as open."
+msgstr "ျပႆနာကို ဖြင့္ထားသည္"
+
+#: templates/web/default/admin/questionnaire.html:21
+msgid "Problem state change based on survey results"
+msgstr "စစ္ေဆးမႈရလဒ္မ်ားအေပၚတြင္ မူတည္ၿပီး ျပႆနာ အေျခအေန ေျပာင္းလဲသည္။"
+
+#: templates/web/default/admin/flagged.html:10
+msgid "Problems"
+msgstr "ျပႆနာမ်ား"
+
+#: templates/web/default/around/_updates.html:1
+msgid "Problems in this area"
+msgstr "ဒီဧရိယာအတြင္းရွိျပႆနာမ်ား"
+
+#: templates/web/fixmystreet/around/tabbed_lists.html:4
+#: templates/web/fixmystreet/report/display.html:46
+msgid "Problems nearby"
+msgstr "အနီးနားရွိျပႆနာမ်ား"
+
+#: templates/web/fixmystreet/around/tabbed_lists.html:3
+#: templates/web/fixmystreet/report/display.html:44
+msgid "Problems on the map"
+msgstr "ေျမပံုေပၚက ျပႆနာမ်ား"
+
+#: db/alert_types.pl:14
+msgid "Problems recently reported fixed on FixMyStreet"
+msgstr "FixMyStreet ေပၚတြင္ လတ္တေလာ တင္ျပထားသည့္ ျပႆနာမ်ားကို ျပင္ဆင္ထားၿပီး ျဖစ္သည္။"
+
+#: templates/web/default/alert/_list.html:19
+#: templates/web/fixmystreet/alert/_list.html:21
+msgid "Problems within %.1fkm of this location"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:629
+#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:109
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:184
+#: perllib/FixMyStreet/Cobrand/UK.pm:222
+msgid "Problems within %s"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117
+#: perllib/FixMyStreet/Cobrand/UK.pm:236
+msgid "Problems within %s ward"
+msgstr ""
+
+#: templates/web/default/reports/body.html:0
+#: templates/web/default/reports/body.html:24
+msgid "Problems within %s, FixMyStreet"
+msgstr ""
+
+#: templates/web/default/alert/_list.html:40
+#: templates/web/fixmybarangay/alert/_list.html:13
+#: templates/web/fixmystreet/alert/_list.html:42
+msgid "Problems within the boundary of:"
+msgstr ""
+
+#: db/alert_types_eha.pl:8
+msgid "Properties recently reported as put back to use on reportemptyhomes.com"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:32
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:115
+msgid "Property address:"
+msgstr ""
+
+#: templates/web/default/report/new/category.html:8
+msgid "Property type:"
+msgstr ""
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:64
+msgid "Provide a title"
+msgstr ""
+
+#: templates/web/default/report/update-form.html:3
+#: templates/web/fixmystreet/report/update-form.html:4
+msgid "Provide an update"
+msgstr ""
+
+#: templates/web/fixmystreet/auth/general.html:53
+msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
+msgstr "နာမည္ႏွင့္ စကားဝွက္ကို မထည့္သြင္းခ်င္လွ်င္ ရသည္။ နံပါတ္ႏွင့္ စကားဝွက္ ထည့္သြင္းပါက ျပႆနာမ်ားကို တင္ျပျခင္း၊ update မ်ား ျပဳလုပ္ျခင္းႏွင့္ အစီရင္ခံစာမ်ား စီမံခန္႔ခြဲျခင္းတို႔ကို ပိုမိုလြယ္ကူစြာ ျပဳလုပ္ႏိုင္မည္။"
+
+#: templates/web/default/report/new/fill_in_details_form.html:173
+#: templates/web/default/report/update-form.html:128
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:202
+#: templates/web/fixmystreet/report/update-form.html:116
+msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
+msgstr "စကားဝွက္ကို မထည့္သြင္းခ်င္လွ်င္ ရသည္။ စကားဝွက္ ထည့္သြင္းပါက ျပႆနာမ်ားကို တင္ျပျခင္း၊ update မ်ား ျပဳလုပ္ျခင္းႏွင့္ အစီရင္ခံစာမ်ား စီမံခန္႔ခြဲျခင္းတို႔ကို ပိုမိုလြယ္ကူစြာ ျပဳလုပ္ႏိုင္မည္။"
+
+#: templates/web/default/admin/body.html:60
+#: templates/web/default/admin/body.html:73
+msgid "Public"
+msgstr ""
+
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:44
+msgid "Public information (shown on site)"
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit.html:198
+#: templates/web/zurich/admin/report_edit.html:214
+msgid "Public response:"
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit.html:80
+#: templates/web/zurich/admin/stats.html:38
+msgid "Publish photo"
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit.html:222
+msgid "Publish the response"
+msgstr ""
+
+#: templates/web/default/questionnaire/completed.html:2
+#: templates/web/default/questionnaire/index.html:0
+#: templates/web/default/questionnaire/index.html:14
+#: templates/web/default/questionnaire/index.html:4
+#: templates/web/fixmystreet/questionnaire/index.html:0
+#: templates/web/fixmystreet/questionnaire/index.html:14
+#: templates/web/fixmystreet/questionnaire/index.html:32
+#: templates/web/fixmystreet/questionnaire/index.html:4
+msgid "Questionnaire"
+msgstr "စစ္တမ္းေမးခြန္းလႊာ"
+
+#: templates/web/default/admin/timeline.html:30
+msgid "Questionnaire %d answered for problem %d, %s to %s"
+msgstr "%d, %s ျပႆနာ အတြက္ %d မွ %s ထံ ေျဖၾကားထားသည့္ စစ္တမ္းေမးခြန္းလႊာ"
+
+#: templates/web/default/admin/timeline.html:28
+msgid "Questionnaire %d sent for problem %d"
+msgstr "%d ျပႆနာ အတြက္ %d ေပးပို႔သည့္ စစ္တမ္းေမးခြန္းလႊာ"
+
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192
+msgid "Questionnaire filled in by problem reporter"
+msgstr "ျပႆနာ အစီရင္ခံသူ ျဖည့္စြက္ရမည့္ စစ္တမ္းေမးခြန္းလႊာ"
+
+#: templates/web/default/alert/_list.html:21
+#: templates/web/default/around/display_location.html:3
+#: templates/web/default/report/display.html:46
+#: templates/web/default/reports/_rss.html:1
+#: templates/web/fixmystreet/alert/_list.html:22
+#: templates/web/fixmystreet/alert/updates.html:9
+#: templates/web/fixmystreet/report/display.html:61
+msgid "RSS feed"
+msgstr "RSS feed"
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:265 perllib/FixMyStreet/Cobrand/UK.pm:277
+msgid "RSS feed for %s"
+msgstr "%s အတြက္ RSS feed"
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+msgid "RSS feed for %s ward, %s"
+msgstr "%s အုပ္ခ်ဳဳပ္ေရးဌာန %s အတြက္ RSS feed"
+
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:189
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:197
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:200
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:208
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:218
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:226
+#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303
+msgid "RSS feed of %s"
+msgstr "%s ၏ RSS feed"
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:308
+msgid "RSS feed of %s, within %s ward"
+msgstr "%s အုပ္ခ်ဳပ္ေရးဌာန အတြင္းရိွ %s ၏ RSS feed"
+
+#: templates/web/default/alert/_list.html:21
+#: templates/web/fixmystreet/alert/_list.html:22
+msgid "RSS feed of nearby problems"
+msgstr "အနီးအနားရိွ ျပႆနာမ်ား၏ RSS feed"
+
+#: templates/web/default/reports/_rss.html:1
+msgid "RSS feed of problems in this %s"
+msgstr "ဒီ %s ရိွ ျပႆနာမ်ား၏ RSS feed"
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:630
+#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:110
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:154
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:183
+#: perllib/FixMyStreet/Cobrand/UK.pm:229
+msgid "RSS feed of problems within %s"
+msgstr "%s အတြင္းရိွ ျပႆနာမ်ား၏ RSS feed"
+
+#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:116
+#: perllib/FixMyStreet/Cobrand/UK.pm:235
+msgid "RSS feed of problems within %s ward"
+msgstr "%s အုပ္ခ်ဳပ္ေရးဌာန အတြင္းရိွ ျပႆနာမ်ား၏ RSS feed"
+
+#: templates/web/default/around/display_location.html:3
+#: templates/web/default/around/display_location.html:4
+msgid "RSS feed of recent local problems"
+msgstr "လတ္တေလာ ျပည္တြင္း ျပႆနာမ်ား အတြက္ RSS feed"
+
+#: templates/web/default/report/display.html:46
+#: templates/web/fixmystreet/alert/updates.html:9
+#: templates/web/fixmystreet/report/display.html:61
+msgid "RSS feed of updates to this problem"
+msgstr "လက္ရိွ ျပႆနာကို update ျပဳလုပ္ထားသည့္ RSS feed"
+
+#: templates/web/default/alert/updates.html:9
+#: templates/web/default/report/display.html:37
+#: templates/web/fixmystreet/alert/updates.html:14
+#: templates/web/fixmystreet/report/display.html:63
+msgid "Receive email when updates are left on this problem."
+msgstr ""
+
+#: templates/web/default/around/display_location.html:0
+#: templates/web/default/around/display_location.html:32
+msgid "Recent local problems, FixMyStreet"
+msgstr "လတ္တေလာ ျပည္တြင္း ျပႆနာမာ်ား"
+
+#: templates/web/default/reports/index.html:19
+#: templates/web/fixmybarangay/reports/index.html:19
+msgid "Recently <br>fixed"
+msgstr "မၾကာေသးမီက <br> ျပင္ဆင္ၿပီး"
+
+#: templates/web/fiksgatami/nn/reports/index.html:13
+#: templates/web/fiksgatami/reports/index.html:13
+msgid "Recently fixed"
+msgstr "မၾကာေသးမီက ျပင္ဆင္ထားၿပီး"
+
+#: templates/web/default/index.html:35 templates/web/emptyhomes/index.html:24
+#: templates/web/fixmystreet/index.html:49
+msgid "Recently reported problems"
+msgstr "ျပႆနာမ်ားကို မၾကာေသးမီက အစီရင္ခံ တင္ျပၿပီး"
+
+#: templates/web/default/report/new/notes.html:9
+#: templates/web/fixmystreet/report/new/notes.html:10
+msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website."
+msgstr ""
+
+#: templates/web/fixmybarangay/report/new/notes.html:9
+msgid "Remember that, for the pilot project, FixMyBarangay is only for reporting potholes and streetlights in bgy. Luz or Basak San Nicolas."
+msgstr ""
+
+#: templates/web/default/admin/report_blocks.html:16
+msgid "Remove flag"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:94
+#: templates/web/default/admin/update_edit.html:62
+#: templates/web/zurich/admin/update_edit.html:35
+msgid "Remove photo (can't be undone!)"
+msgstr "ဓာတ္ပံု ဖယ္ရွားရန္ (မၿပီးေျမာက္ႏိုင္ပါ)"
+
+#: templates/web/emptyhomes/header.html:12
+msgid "Report Empty Homes"
+msgstr ""
+
+#: templates/web/default/footer.html:7 templates/web/emptyhomes/header.html:31
+#: templates/web/fiksgatami/footer.html:5
+#: templates/web/fiksgatami/nn/footer.html:5
+#: templates/web/fixmystreet/footer.html:47
+#: templates/web/zurich/footer.html:17
+#: templates/web/zurich/nav_over_content.html:4
+msgid "Report a problem"
+msgstr "ျပႆနာကို အစီရင္ခံ တင္ျပရန္"
+
+#: templates/web/fixmystreet/report/display.html:35
+msgid "Report abuse"
+msgstr ""
+
+#: templates/web/default/report_created.html:1
+#: templates/web/default/report_created.html:3
+msgid "Report created"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Rss.pm:295
+msgid "Report on %s"
+msgstr ""
+
+#: templates/web/default/index.html:14 templates/web/emptyhomes/index.html:5
+#: templates/web/fixmystreet/around/intro.html:1
+#: templates/web/zurich/around/intro.html:1
+msgid "Report, view, or discuss local problems"
+msgstr "ေဒသတြင္း ျပႆနာမ်ားကို အစီရင္ခံျခင္း၊ ၾကည့္႐ႈျခင္းႏွင့္ ေဆြးေႏြးျခင္း"
+
+#: templates/web/default/my/my.html:79
+msgid "Reported %s"
+msgstr ""
+
+#: templates/web/default/my/my.html:77
+msgid "Reported %s, to %s"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:561
+#: templates/web/default/contact/index.html:45
+#: templates/web/fixmystreet/contact/index.html:62
+msgid "Reported anonymously at %s"
+msgstr ""
+
+#: templates/web/default/admin/questionnaire.html:5
+#: templates/web/default/questionnaire/index.html:77
+#: templates/web/fixmystreet/questionnaire/index.html:71
+msgid "Reported before"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:584
+#: templates/web/default/contact/index.html:47
+#: templates/web/fixmystreet/contact/index.html:64
+msgid "Reported by %s at %s"
+msgstr ""
+
+#: templates/web/zurich/report/_main.html:2
+msgid "Reported in the %s category"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:557
+msgid "Reported in the %s category anonymously at %s"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:579
+msgid "Reported in the %s category by %s at %s"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:553
+msgid "Reported via %s anonymously at %s"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:575
+msgid "Reported via %s by %s at %s"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:549
+msgid "Reported via %s in the %s category anonymously at %s"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:569
+msgid "Reported via %s in the %s category by %s at %s"
+msgstr ""
+
+#: templates/web/default/around/around_index.html:1
+#: templates/web/default/js/translation_strings.html:41
+#: templates/web/default/report/new/fill_in_details.html:0
+#: templates/web/default/report/new/fill_in_details.html:3
+#: templates/web/default/report/new/fill_in_details_form.html:1
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:1
+#: templates/web/fixmystreet/around/around_index.html:2
+#: templates/web/fixmystreet/report/new/fill_in_details.html:0
+#: templates/web/fixmystreet/report/new/fill_in_details.html:5
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2
+#: templates/web/zurich/report/new/fill_in_details_form.html:2
+msgid "Reporting a problem"
+msgstr "ျပႆနာကို အစီရင္ခံ တင္ျပျခင္း"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1186
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:290
+#: templates/web/zurich/header.html:60
+msgid "Reports"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
+#: perllib/FixMyStreet/DB/Result/Problem.pm:399
+msgid "Reports are limited to %s characters in length. Please shorten your report"
+msgstr ""
+
+#: templates/web/zurich/admin/index-sdm.html:7
+msgid "Reports awaiting approval"
+msgstr ""
+
+#: templates/web/default/around/tabbed_lists.html:3
+msgid "Reports on and around the map"
+msgstr ""
+
+#: templates/web/zurich/admin/index-sdm.html:10
+msgid "Reports published"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:71
+msgid "Resend report"
+msgstr "အစီရင္ခံ ျပန္လည္ေပးပို႔ရန္"
+
+#: templates/web/default/js/translation_strings.html:28
+msgid "Right place?"
+msgstr ""
+
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:195
+#: perllib/FixMyStreet/Geocode/OSM.pm:173
+msgid "Road operator for this named road (derived from road reference number and type): %s"
+msgstr ""
+
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:192
+#: perllib/FixMyStreet/Geocode/OSM.pm:170
+msgid "Road operator for this named road (from OpenStreetMap): %s"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1386
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1397
+#: templates/web/default/admin/report_edit.html:90
+#: templates/web/zurich/admin/report_edit.html:76
+msgid "Rotate Left"
+msgstr "ဘယ္ဘက္ကို လွည့္ပါ"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1386
+#: templates/web/default/admin/report_edit.html:91
+#: templates/web/zurich/admin/report_edit.html:77
+msgid "Rotate Right"
+msgstr "ညာဘက္ကို လွည့္ပါ"
+
+#: templates/web/default/admin/body_edit.html:76
+msgid "Save changes"
+msgstr "ေျပာင္းလဲမႈမ်ားကို သိမ္းဆည္းရန္"
+
+#: templates/web/default/admin/reports.html:1
+#: templates/web/zurich/admin/reports.html:1
+msgid "Search Reports"
+msgstr "အစီရင္ခံစာမ်ားကို ရွာေဖြရန္"
+
+#: templates/web/default/admin/users.html:1
+msgid "Search Users"
+msgstr ""
+
+#: templates/web/zurich/header.html:77
+msgid "Search reports"
+msgstr "အစီရင္ခံစာမ်ားကို ရွာေဖြရန္"
+
+#: templates/web/default/admin/reports.html:5
+#: templates/web/default/admin/users.html:8
+#: templates/web/zurich/admin/reports.html:5
+msgid "Search:"
+msgstr ""
+
+#: templates/web/default/admin/reports.html:26
+msgid "Searching found no reports."
+msgstr ""
+
+#: templates/web/default/admin/users.html:39
+msgid "Searching found no users."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:33
+#: templates/web/zurich/admin/body-form.html:16
+msgid "Select a body"
+msgstr "စာကိုယ္တစ္ခုကို ေရြးပါ။"
+
+#: templates/web/default/admin/body-form.html:71
+#: templates/web/zurich/admin/body-form.html:26
+msgid "Select an area"
+msgstr "ဧရိယာတစ္ခုကို ေရြးပါ။"
+
+#: templates/web/default/alert/_list.html:8
+#: templates/web/fixmystreet/alert/_list.html:10
+msgid "Select which type of alert you'd like and click the button for an RSS feed, or enter your email address to subscribe to an email alert."
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
+msgid "Sent to %s %s later"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:71
+msgid "Sent:"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:73
+#: templates/web/zurich/admin/stats.html:45
+msgid "Service:"
+msgstr ""
+
+#: templates/web/fixmystreet/report/display.html:41
+msgid "Share"
+msgstr ""
+
+#: templates/web/default/report/new/fill_in_details_form.html:210
+#: templates/web/default/report/update-form.html:157
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:129
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:197
+#: templates/web/fixmystreet/report/update-form.html:144
+msgid "Show my name publicly"
+msgstr ""
+
+#: templates/web/default/around/display_location.html:69
+msgid "Show old"
+msgstr ""
+
+#: templates/web/default/around/display_location.html:60
+msgid "Show pins"
+msgstr ""
+
+#: templates/web/default/auth/general.html:3
+#: templates/web/default/auth/general.html:49
+#: templates/web/fixmybarangay/header.html:70
+#: templates/web/fixmystreet/auth/general.html:3
+#: templates/web/fixmystreet/auth/general.html:42
+#: templates/web/fixmystreet/auth/general.html:62
+#: templates/web/fixmystreet/header.html:57
+#: templates/web/zurich/auth/general.html:18
+#: templates/web/zurich/auth/general.html:35
+msgid "Sign in"
+msgstr "ဝင္ရန္"
+
+#: templates/web/default/auth/general.html:74
+msgid "Sign in by email"
+msgstr "အီးေမးလ္ျဖင့္ ဝင္ရန္"
+
+#: templates/web/default/auth/general.html:1
+#: templates/web/fixmystreet/auth/general.html:1
+#: templates/web/zurich/auth/general.html:1
+msgid "Sign in or create an account"
+msgstr "ဝင္ရန္ သို႔မဟုတ္ အေကာင့္တစ္ခု ဖန္တီးရန္"
+
+#: templates/web/default/auth/sign_out.html:1
+#: templates/web/default/header.html:30
+#: templates/web/emptyhomes/header.html:46
+#: templates/web/fiksgatami/header.html:22
+#: templates/web/fiksgatami/nn/header.html:22
+#: templates/web/zurich/auth/sign_out.html:1
+msgid "Sign out"
+msgstr ""
+
+#: templates/web/default/header.html:29
+#: templates/web/emptyhomes/header.html:45
+#: templates/web/fiksgatami/header.html:21
+#: templates/web/fiksgatami/nn/header.html:21
+msgid "Signed in as %s"
+msgstr "%s အေနျဖင့္ ဝင္ထားသည္"
+
+#: templates/web/default/report/new/fill_in_details_text.html:2
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:2
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:2
+msgid "Some categories may require additional information."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:145
+#: templates/web/default/admin/body-form.html:146
+msgid ""
+"Some endpoints require an <strong>API key</strong> to indicate that the reports are being\n"
+" sent from your FixMyStreet installation."
+msgstr ""
+
+#: templates/web/default/alert/index.html:42
+#: templates/web/fixmybarangay/alert/index.html:32
+msgid "Some photos of recent reports"
+msgstr ""
+
+#: perllib/FixMyStreet/App/View/Email.pm:32
+#: perllib/FixMyStreet/App/View/Web.pm:44
+msgid "Some text to localize"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:93
+msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
+msgstr ""
+
+#: templates/web/default/tokens/abuse.html:5
+msgid "Sorry, there has been an error confirming your problem."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:215
+#: perllib/FixMyStreet/Geocode.pm:28 perllib/FixMyStreet/Geocode/Bing.pm:58
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:75
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:95
+#: perllib/FixMyStreet/Geocode/Google.pm:74
+#: perllib/FixMyStreet/Geocode/OSM.pm:66
+msgid "Sorry, we could not find that location."
+msgstr ""
+
+#: perllib/FixMyStreet/Geocode/Bing.pm:53
+#: perllib/FixMyStreet/Geocode/Google.pm:69
+#: perllib/FixMyStreet/Geocode/Zurich.pm:88
+msgid "Sorry, we could not parse that location. Please try again."
+msgstr ""
+
+#: templates/web/fiksgatami/footer.html:16
+#: templates/web/fiksgatami/nn/footer.html:16
+msgid "Source code"
+msgstr ""
+
+#: templates/web/default/admin/stats.html:64
+msgid "Start Date:"
+msgstr ""
+
+#: templates/web/default/admin/flagged.html:18
+#: templates/web/default/admin/list_updates.html:11
+#: templates/web/default/admin/reports.html:15
+#: templates/web/fixmystreet/report/update-form.html:26
+msgid "State"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:34
+#: templates/web/default/admin/update_edit.html:27
+#: templates/web/default/report/update-form.html:28
+#: templates/web/zurich/admin/report_edit-sdm.html:56
+#: templates/web/zurich/admin/report_edit.html:87
+#: templates/web/zurich/admin/update_edit.html:17
+msgid "State:"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1191
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:305
+#: templates/web/default/admin/stats.html:1
+#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72
+msgid "Stats"
+msgstr ""
+
+#: templates/web/zurich/admin/index-dm.html:23
+#: templates/web/zurich/admin/index-sdm.html:21
+#: templates/web/zurich/admin/reports.html:13
+msgid "Status"
+msgstr ""
+
+#: templates/web/default/report/updates.html:10
+msgid "Still open, via questionnaire, %s"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378
+msgid "Subcategory: %s"
+msgstr ""
+
+#: templates/web/zurich/admin/index-dm.html:27
+msgid "Subdivision/Body"
+msgstr ""
+
+#: templates/web/fixmystreet/contact/index.html:95
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:60
+msgid "Subject"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:19
+#: templates/web/default/contact/index.html:83
+#: templates/web/default/report/new/fill_in_details_form.html:52
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:70
+#: templates/web/zurich/admin/report_edit.html:37
+msgid "Subject:"
+msgstr ""
+
+#: templates/web/default/questionnaire/creator_fixed.html:19
+#: templates/web/default/report/new/fill_in_details_form.html:114
+#: templates/web/default/report/new/fill_in_details_form.html:154
+#: templates/web/default/report/new/fill_in_details_form.html:176
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:144
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:142
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:167
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:212
+#: templates/web/zurich/report/new/fill_in_details_form.html:114
+msgid "Submit"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:97
+#: templates/web/default/admin/update_edit.html:65
+#: templates/web/default/admin/user-form.html:55
+#: templates/web/zurich/admin/report_edit-sdm.html:67
+#: templates/web/zurich/admin/report_edit.html:224
+#: templates/web/zurich/admin/update_edit.html:38
+msgid "Submit changes"
+msgstr ""
+
+#: templates/web/default/questionnaire/index.html:116
+#: templates/web/fixmystreet/questionnaire/index.html:105
+msgid "Submit questionnaire"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:133
+#: templates/web/zurich/admin/header.html:2
+#: templates/web/zurich/admin/header.html:6
+#: templates/web/zurich/admin/index-dm.html:23
+#: templates/web/zurich/admin/index-dm.html:6
+#: templates/web/zurich/admin/index-sdm.html:21
+#: templates/web/zurich/admin/report_edit.html:89
+#: templates/web/zurich/admin/report_edit.html:90
+#: templates/web/zurich/admin/reports.html:13
+#: templates/web/zurich/report/banner.html:9
+msgid "Submitted"
+msgstr ""
+
+#: templates/web/default/alert/updates.html:17
+#: templates/web/default/report/display.html:42
+#: templates/web/fixmystreet/alert/updates.html:23
+#: templates/web/fixmystreet/report/display.html:68
+msgid "Subscribe"
+msgstr ""
+
+#: templates/web/default/alert/_list.html:97
+#: templates/web/fixmybarangay/alert/_list.html:42
+#: templates/web/fixmystreet/alert/_list.html:92
+msgid "Subscribe me to an email alert"
+msgstr ""
+
+#: templates/web/fixmybarangay/alert/_list.html:6
+msgid "Subscribe to an alert based upon what baranagay you&rsquo;re in:"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1184
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:289
+#: templates/web/default/admin/index.html:1
+#: templates/web/zurich/admin/index-dm.html:1
+#: templates/web/zurich/admin/index-sdm.html:1
+#: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12
+#: templates/web/zurich/header.html:57
+msgid "Summary"
+msgstr "အက်ဥ္းခ်ဳပ္"
+
+#: templates/web/default/reports/index.html:1
+#: templates/web/emptyhomes/reports/index.html:1
+#: templates/web/fiksgatami/nn/reports/index.html:1
+#: templates/web/fiksgatami/reports/index.html:1
+#: templates/web/fixmybarangay/reports/index.html:1
+#: templates/web/zurich/reports/index.html:0
+#: templates/web/zurich/reports/index.html:4
+msgid "Summary reports"
+msgstr "အစီရင္ခံစာအက်ဥ္းခ်ဳပ္"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1188
+msgid "Survey"
+msgstr "စစ္တမ္း"
+
+#: templates/web/default/admin/questionnaire.html:1
+msgid "Survey Results"
+msgstr "စစ္တမ္းရလဒ္"
+
+#: templates/web/default/admin/list_updates.html:12
+#: templates/web/zurich/admin/list_updates.html:10
+#: templates/web/zurich/admin/list_updates.html:31
+msgid "Text"
+msgstr "စာ"
+
+#: templates/web/default/admin/body.html:18
+msgid "Text only version"
+msgstr "စာဗားရွင္းသာ"
+
+#: templates/web/default/admin/update_edit.html:20
+#: templates/web/zurich/admin/update_edit.html:12
+msgid "Text:"
+msgstr "စာ-"
+
+#: templates/web/default/tokens/confirm_update.html:8
+msgid "Thank you &mdash; you can <a href=\"%s\">view your updated problem</a> on the site."
+msgstr "ေက်းဇူးတင္ပါသည္။ ျပဳျပင္မြမ္းမံထားသည့္ သင္၏ ျပႆနာကို ဆိုက္ေပၚတြင္ ၾကည့္႐ႈႏိုင္သည္။"
+
+#: templates/web/emptyhomes/tokens/confirm_problem.html:7
+#: templates/web/emptyhomes/tokens/confirm_problem.html:8
+msgid "Thank you for reporting an empty property on ReportEmptyHomes.com. We have emailed the lead officer for empty homes in the council responsible with details, and asked them to do whatever they can to get the empty property back into use as soon as possible."
+msgstr ""
+
+#: templates/web/emptyhomes/tokens/confirm_problem.html:31
+msgid ""
+"Thank you for reporting this empty property on ReportEmptyHomes.com.\n"
+"At present the report cannot be sent through to the council for this area. We\n"
+"are working with councils to link them into the system so that as many areas\n"
+"as possible will be covered."
+msgstr ""
+
+#: templates/web/default/tokens/error.html:7
+msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it."
+msgstr ""
+
+#: templates/web/emptyhomes/tokens/confirm_problem.html:25
+#: templates/web/emptyhomes/tokens/confirm_problem.html:26
+msgid "Thank you for using ReportEmptyHomes.com. Your action is already helping to resolve the UK&rsquo;s empty homes crisis."
+msgstr ""
+
+#: templates/web/fixmystreet/around/around_index.html:27
+msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above&nbsp;:"
+msgstr ""
+
+#: templates/web/default/contact/submit.html:8
+msgid "Thanks for your feedback. We'll get back to you as soon as we can!"
+msgstr ""
+
+#: templates/web/default/questionnaire/creator_fixed.html:9
+msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?"
+msgstr "ေက်းဇူးတင္ပါသည္။ ျပင္ဆင္ၿပီး ျဖစ္ေၾကာင္း ၾကားသိရ၍ ဝမ္းသာမိပါသည္။ သင့္အေနျဖင့္ ယခင္က ေကာင္စီထံ ျပႆနာတစ္ခုကို အစီရင္ခံတင္ျပဖူးပါသလား?"
+
+#: perllib/FixMyStreet/App/Controller/Photo.pm:190
+msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Council.pm:100
+msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Location.pm:124
+msgid "That location does not appear to be in the UK; please try again."
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:63
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:86
+msgid "That postcode was not recognised, sorry."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:704
+msgid "That problem will now be resent."
+msgstr "ထိုျပႆနာကိုယခုပင္ျပန္ပို႔ပါမည္"
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:117
+msgid "That report cannot be viewed on %s."
+msgstr "ဒီအစီရင္ခံစာကို %s ေပၚတြင္မၾကည့္ႏိုင္ပါ"
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:111
+msgid "That report has been removed from FixMyStreet."
+msgstr "ကၽြႏ္ုပ္လမ္းကိုျပင္ေပးပါ မွဒီအစီရင္ခံစာကိုဖယ္ျပီးပါျပီ"
+
+#: templates/web/default/admin/body.html:115
+msgid ""
+"The <strong>email address</strong> is the destination to which reports about this category will be sent. \n"
+" Other categories for this body may have the same email address."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:119
+#: templates/web/default/admin/body-form.html:120
+msgid ""
+"The <strong>endpoint</strong> is the URL of the service that FixMyStreet will connect to \n"
+" when sending reports to this body."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:132
+#: templates/web/default/admin/body-form.html:133
+msgid ""
+"The <strong>jurisdiction</strong> is only needed if the endpoint is serving more\n"
+" than one. If the body is running its own endpoint, you can usually leave this blank."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:90
+#: templates/web/default/admin/body-form.html:91
+msgid ""
+"The <strong>send method</strong> determines how problem reports will be sent to the body.\n"
+" If you leave this blank, <strong>send method defaults to email</strong>."
+msgstr ""
+
+#: templates/web/default/open311/index.html:92
+msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:11
+#: templates/web/default/admin/body-form.html:12
+msgid ""
+"The body's <strong>name</strong> identifies the body (for example, <em>Borsetshire District Council</em>)\n"
+" and may be displayed publically."
+msgstr ""
+
+#: templates/web/default/auth/token.html:19
+#: templates/web/default/email_sent.html:6
+msgid "The confirmation email <strong>may</strong> take a few minutes to arrive &mdash; <em>please</em> be patient."
+msgstr ""
+
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:2
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:3
+msgid "The council won&rsquo;t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc."
+msgstr ""
+
+#: templates/web/fixmystreet/questionnaire/index.html:43
+msgid "The details of your problem are available from the other tab above."
+msgstr ""
+
+#: templates/web/default/questionnaire/index.html:49
+msgid "The details of your problem are available on the right hand side of this page."
+msgstr ""
+
+#: templates/web/default/admin/edit-league.html:3
+#: templates/web/default/admin/edit-league.html:4
+msgid "The diligency prize league table shows editors' activity (who's been editing the most records)."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60
+#: perllib/FixMyStreet/App/Controller/Reports.pm:72
+msgid "The error was: %s"
+msgstr "ခ်ိဳ႕ယြင္းမႈမွာ - %s"
+
+#: templates/web/default/open311/index.html:88
+msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
+msgstr ""
+
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:187
+#: perllib/FixMyStreet/Geocode/OSM.pm:165
+msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
+msgstr ""
+
+#: db/alert_types.pl:19 db/alert_types.pl:23 db/alert_types.pl:27
+#: db/alert_types.pl:31
+msgid "The latest local problems reported by users"
+msgstr "အသံုးျပဳသူမ်ားမွေပးပို႔လာေသာေဒသတြင္း ျပႆနာအသစ္မ်ား"
+
+#: db/alert_types_eha.pl:13
+msgid "The latest local reports reported by users"
+msgstr "အသံုးျပဳသူမ်ားမွေပးပို႔လာေသာေဒသတြင္းအစီရင္ခံစာအသစ္မ်ား"
+
+#: db/alert_types.pl:35
+msgid "The latest problems for {{COUNCIL}} reported by users"
+msgstr "သံုးစြဲသူမ်ားမွ{{ေကာင္စီ}} အတြက္ေပးပို႔လာေသာျပႆနာအသစ္မ်ား"
+
+#: db/alert_types.pl:39
+msgid "The latest problems for {{COUNCIL}} within {{WARD}} ward reported by users"
+msgstr ""
+
+#: db/alert_types.pl:11
+msgid "The latest problems reported by users"
+msgstr "အသံုးျပဳသူမ်ားမွေပးပို႔လာေသာျပႆနာအသစ္မ်ား"
+
+#: db/alert_types.pl:15
+msgid "The latest problems reported fixed by users"
+msgstr "အသံုးျပဳသူမ်ားမွျပင္ျပီးသြားေသာေနာက္ဆံုးျပႆနာမ်ား"
+
+#: db/alert_types.pl:43
+msgid "The latest problems within {{NAME}}'s boundary reported by users"
+msgstr ""
+
+#: db/alert_types_eha.pl:9
+msgid "The latest properties reported back to use by users"
+msgstr ""
+
+#: db/alert_types_eha.pl:20
+msgid "The latest reports for {{COUNCIL}} reported by users"
+msgstr ""
+
+#: db/alert_types_eha.pl:24
+msgid "The latest reports for {{COUNCIL}} within {{WARD}} ward reported by users"
+msgstr ""
+
+#: db/alert_types_eha.pl:28
+msgid "The latest reports within {{NAME}}'s boundary reported by users"
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:58
+msgid "The list of available areas is being provided by the MapIt service at %s."
+msgstr ""
+
+#: templates/web/default/auth/change_password.html:12
+#: templates/web/default/auth/change_password.html:16
+msgid "The passwords do not match"
+msgstr "စကား၀ွက္မ်ားသည္မတူညီပါ"
+
+#: templates/web/default/errors/page_error_404_not_found.html:11
+#: templates/web/default/errors/page_error_404_not_found.html:12
+msgid "The requested URL '%s' was not found on this server"
+msgstr "သင္ေတာင္းဆိုေသာ URL %s ကိုဒီဆာဗာမွာရွာမေတြ႕ပါ"
+
+#: templates/web/default/alert/_list.html:14
+#: templates/web/fixmystreet/alert/_list.html:16
+msgid "The simplest alert is our geographic one:"
+msgstr ""
+
+#: templates/web/default/report/new/councils_extra_text.html:1
+#: templates/web/default/report/new/councils_text_some.html:11
+#: templates/web/default/report/new/fill_in_details_form.html:17
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12
+msgid "The subject and details of the problem will be public, plus your name if you give us permission."
+msgstr ""
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:296
+msgid "The user could not locate the problem on a map, but to see the area around the location they entered"
+msgstr ""
+
+#: templates/web/default/admin/user-form.html:12
+#: templates/web/default/admin/user-form.html:13
+msgid ""
+"The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n"
+" Names are not necessarily unique."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Reports.pm:69
+msgid "There was a problem showing the All Reports page. Please try again later."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Contact.pm:121
+#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59
+msgid "There was a problem showing this page. Please try again later."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:755
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134
+#: templates/web/default/auth/general.html:23
+#: templates/web/fixmystreet/auth/general.html:24
+#: templates/web/zurich/auth/general.html:28
+msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the &lsquo;sign in by email&rsquo; section of the form."
+msgstr "အီးေမးလ္ႏွင့္ လ်ွိဳ႕ဝွက္နံပါတ္တြင္ ျပႆနာ ျဖစ္ေပၚခဲ့ပါသည္။ သင္၏ လွ်ိဳ႕ဝွက္နံပါတ္ကို မမွတ္မိပါက သို႔မဟုတ္ မရိွေသးပါက ေလွ်က္လႊာ၏ \"အီးေမးလ္ျဖင့္ ဝင္ရန္\" ေနရာတြင္ ျဖည့္ပါ။"
+
+#: perllib/FixMyStreet/App/Controller/Alert.pm:355
+msgid "There was a problem with your email/password combination. Please try again."
+msgstr "အီးေမးလ္ သို႔မဟုတ္ စကားဝွက္တြင္ ျပႆနာ ျဖစ္ေပၚခဲ့ပါသည္။ ျပန္လည္ ႀကိဳးစားပါ။"
+
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:272
+msgid "There was a problem with your update. Please try again."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Contact.pm:125
+msgid "There were problems with your report. Please see below."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:299
+msgid "There were problems with your update. Please see below."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:108
+#: templates/web/default/admin/body-form.html:109
+msgid ""
+"These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.<br>\n"
+" <strong>You don't need to set them if the Send Method is email.</strong>.\n"
+" For more information on Open311, see \n"
+" <a href='http://www.mysociety.org/2013/01/17/open311-explained/' class='admin-offsite-link'>this article</a>.\n"
+" "
+msgstr ""
+
+#: templates/web/default/open311/index.html:79
+msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future."
+msgstr ""
+
+#: templates/web/default/admin/body.html:33
+msgid ""
+"This body covers no area. This means that it has no jurisdiction over problems reported <em>at any location</em>.\n"
+" Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n"
+" Currently, users <strong>cannot report problems to this body</strong>."
+msgstr ""
+
+#: templates/web/default/admin/body.html:43
+msgid "This body has no contacts. This means that currently problems reported to this body <strong>will not be sent</strong>."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:52
+#: templates/web/default/admin/body-form.html:53
+msgid ""
+"This body will only be sent reports for problems that are located in the <strong>area covered</strong>.\n"
+" A body will not receive any reports unless it covers at least one area."
+msgstr ""
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:385
+msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system."
+msgstr ""
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:388
+msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:898
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:968
+#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:131
+#: perllib/FixMyStreet/Cobrand/UK.pm:58
+msgid "This information is required"
+msgstr "ဒီအခ်က္အလက္ ျဖည့္စြက္ရန္ လိုအပ္သည္"
+
+#: templates/web/default/debug_header.html:3
+msgid "This is a developer site; things might break at any time, and the database will be periodically deleted."
+msgstr ""
+
+#: templates/web/fixmybarangay/reports/index.html:7
+msgid "This is a summary of all reports on this site; select a particular barangay to see the reports sent there."
+msgstr ""
+
+#: templates/web/emptyhomes/reports/index.html:4
+msgid "This is a summary of all reports on this site; select a particular council to see the empty homes news for that area."
+msgstr ""
+
+#: templates/web/default/reports/index.html:7
+#: templates/web/fiksgatami/nn/reports/index.html:4
+#: templates/web/fiksgatami/reports/index.html:4
+msgid "This is a summary of all reports on this site; select a particular council to see the reports sent there."
+msgstr ""
+
+#: templates/web/default/auth/token.html:9
+msgid "This may be because the link is too old or already used, or the address was not copied correctly."
+msgstr ""
+
+#: templates/web/default/report/banner.html:15
+msgid "This problem has been closed"
+msgstr "ဒီျပႆနာကိုပိတ္ထားျပီးျဖစ္သည္။"
+
+#: templates/web/default/report/banner.html:12
+#: templates/web/default/report/update-form.html:48
+#: templates/web/emptyhomes/report/banner.html:3
+#: templates/web/fixmystreet/report/update-form.html:46
+msgid "This problem has been fixed"
+msgstr "ဒီျပႆနာကိုေျဖရွင္းျပီးပါျပီ"
+
+#: templates/web/default/report/update-form.html:43
+#: templates/web/fixmystreet/report/update-form.html:40
+msgid "This problem has not been fixed"
+msgstr "ဒီျပႆနာကိုမေျဖရွင္းရေသးပါ"
+
+#: templates/web/default/report/banner.html:19
+msgid "This problem is in progress"
+msgstr "ဒီျပႆနာကိုေျဖရွင္းေနဆဲျဖစ္သည္"
+
+#: templates/web/default/report/banner.html:9
+msgid "This problem is old and of unknown status."
+msgstr "ဒီျပႆနာသည္အရမ္းၾကာျပီျဖစ္ျပီး အေျခအေနကိုမသိရပါ"
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:130
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:131
+#: templates/web/zurich/report/_main.html:14
+msgid "This report is awaiting moderation."
+msgstr "ဒီအစီရင္ခံစာသည္အတည္ျပဳျခင္းကိုေစာင့္ဆိုင္းေနဆဲျဖစ္သည္"
+
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88
+msgid "This report is currently marked as closed."
+msgstr "ဒီျပႆနာကို ပိတ္ထားသည္ဟုေလာေလာဆယ္သတ္မွတ္ထားသည္"
+
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86
+msgid "This report is currently marked as fixed."
+msgstr "ဒီျပႆနာကိုေလာေလာဆယ္ေျဖရွင္းျပီးျပီဟုသတ္မွတ္ထားသည္"
+
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:90
+msgid "This report is currently marked as open."
+msgstr "ဒီအစီရင္ခံစာကိုယခုေလာေလာဆယ္ဖြင့္ထားသည္"
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:320
+msgid "This report was submitted anonymously"
+msgstr "ဒီအစီရင္ခံစာကိုအမည္မသိသူမွတင္သြင္းခဲ့သည္"
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:289
+msgid "This web page also contains a photo of the problem, provided by the user."
+msgstr "ဒီ web စာမ်က္ႏွာသည္ အသံုးျပဳသူမွရိုက္ထားေသာ ျပႆနာ၏ဓာတ္ပံုတစ္ပံုပါ၀င္သည္"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1187
+#: templates/web/default/admin/timeline.html:1
+msgid "Timeline"
+msgstr ""
+
+#: templates/web/default/admin/flagged.html:15
+#: templates/web/default/admin/reports.html:12
+msgid "Title"
+msgstr ""
+
+#: templates/web/default/around/_report_banner.html:2
+msgid "To <strong>report a problem</strong>, click on the map at the correct location."
+msgstr ""
+
+#: templates/web/default/alert/index.html:27
+msgid "To find out what local alerts we have for you, please enter your postcode or street name and area"
+msgstr "ျပည္တြင္း သတိေပးခ်က္မ်ား ေဖာ္ျပရန္အတြက္ သင္၏ စာတိုက္ေသတၲာအမွတ္ သို႔မဟုတ္ လမ္းနာမည္ႏွင့္ ဧရိယာကို ထည့္သြင္းပါ။"
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:295
+msgid "To view a map of the precise location of this issue"
+msgstr ""
+
+#: templates/web/default/admin/index.html:44
+#: templates/web/default/admin/questionnaire.html:24
+#: templates/web/default/admin/stats.html:24
+#: templates/web/default/admin/stats.html:43
+#: templates/web/zurich/admin/stats.html:30
+msgid "Total"
+msgstr ""
+
+#: templates/web/default/js/translation_strings.html:29
+msgid "Try again"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:46
+#: templates/web/default/report/update-form.html:30
+#: templates/web/default/report/update-form.html:33
+#: templates/web/fixmystreet/report/update-form.html:28
+#: templates/web/fixmystreet/report/update-form.html:31
+msgid "Unable to fix"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:51
+#: templates/web/default/admin/update_edit.html:28
+#: templates/web/zurich/admin/report_edit-sdm.html:48
+#: templates/web/zurich/admin/report_edit.html:61
+#: templates/web/zurich/admin/update_edit.html:18
+msgid "Unconfirmed"
+msgstr ""
+
+#: templates/web/fixmystreet/report/banner.html:9
+msgid "Unknown"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Rss.pm:173
+msgid "Unknown alert type"
+msgstr ""
+
+#: templates/web/default/js/translation_strings.html:39
+msgid "Unknown error"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:106
+msgid "Unknown problem ID"
+msgstr ""
+
+#: templates/web/fixmystreet/report/update-form.html:19
+msgid "Update"
+msgstr ""
+
+#: templates/web/default/admin/timeline.html:33
+msgid "Update %s created for problem %d; by %s"
+msgstr ""
+
+#: templates/web/default/contact/index.html:21
+#: templates/web/fixmystreet/contact/index.html:38
+msgid "Update below added anonymously at %s"
+msgstr ""
+
+#: templates/web/default/contact/index.html:23
+#: templates/web/fixmystreet/contact/index.html:40
+msgid "Update below added by %s at %s"
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:233
+#: templates/web/zurich/admin/body-form.html:51
+msgid "Update body"
+msgstr ""
+
+#: templates/web/default/admin/index.html:38
+msgid "Update breakdown by state"
+msgstr ""
+
+#: db/alert_types.pl:7
+msgid "Update by {{name}}"
+msgstr ""
+
+#: templates/web/default/admin/update_edit.html:42
+#: templates/web/zurich/admin/update_edit.html:25
+msgid "Update changed problem state to %s"
+msgstr ""
+
+#: templates/web/default/admin/update_edit.html:44
+msgid "Update marked problem as fixed"
+msgstr ""
+
+#: templates/web/default/admin/update_edit.html:46
+msgid "Update reopened problem"
+msgstr ""
+
+#: templates/web/default/admin/body.html:83
+msgid "Update statuses"
+msgstr ""
+
+#: templates/web/default/report/update-form.html:22
+msgid "Update:"
+msgstr ""
+
+#: templates/web/zurich/admin/index-dm.html:23
+#: templates/web/zurich/admin/index-sdm.html:21
+#: templates/web/zurich/admin/reports.html:13
+msgid "Updated"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1007
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1051
+#: perllib/FixMyStreet/App/Controller/Admin.pm:801
+#: perllib/FixMyStreet/App/Controller/Admin.pm:949
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:550
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:619
+msgid "Updated!"
+msgstr ""
+
+#: templates/web/default/admin/list_updates.html:2
+#: templates/web/default/report/update.html:3
+#: templates/web/fixmystreet/report/update.html:3
+#: templates/web/zurich/admin/list_updates.html:24
+#: templates/web/zurich/report/updates.html:2
+msgid "Updates"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+msgid "Updates are limited to %s characters in length. Please shorten your update"
+msgstr ""
+
+#: db/alert_types.pl:5 db/alert_types.pl:6
+msgid "Updates on {{title}}"
+msgstr ""
+
+#: templates/web/default/report/display.html:0
+#: templates/web/default/report/display.html:5
+#: templates/web/fixmystreet/report/display.html:0
+#: templates/web/fixmystreet/report/display.html:8
+msgid "Updates to this problem, FixMyStreet"
+msgstr "ဒီျပႆနာမ်ားကို FixMyStreet သို႔တင္ျပပါ။"
+
+#: templates/web/default/admin/body.html:153
+msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body."
+msgstr "စီမံသူတြင္သာ ေဖာ္ျပေပးသည့္ အေသးစိတ္ကို မွတ္တမ္းတင္ရန္ မွတ္စုကို အသုံးျပဳပါ။ မွတ္စုမ်ားကို လူအမ်ားမေတြ႔ျမင္ရ သလို အဖြဲ႔ထံသို႔လည္း မေပးပို႔ႏိုင္ပါ။"
+
+#: templates/web/zurich/admin/list_updates.html:30
+#: templates/web/zurich/admin/list_updates.html:9
+msgid "User"
+msgstr "အသံုးျပဳသူ"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1351
+msgid "User flag removed"
+msgstr "သုံးစြဲသူ အမွတ္အသား ျပဳလုပ္ျခင္းကို ဖယ္ရွားလိုက္သည္။"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1323
+msgid "User flagged"
+msgstr "သုုံးစြဲသူက အမွတ္အသား ျပဳလုပ္ျခင္း"
+
+#: templates/web/default/admin/users.html:5
+msgid "User search finds matches in users' names and email addresses."
+msgstr "သုံးစြဲသူရွာေဖြမႈသည္ ၎တို႔၏ အီးေမးလိပ္စာႏွင့္ နာမည္မ်ားရွိ တူညီမႈမ်ားကို ေတြ႔ရွိႏိုင္သည္။ "
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1189
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:304
+#: templates/web/default/admin/flagged.html:29
+#: templates/web/zurich/header.html:69
+msgid "Users"
+msgstr "အသံုးျပဳသူမ်ား"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:371
+#: perllib/FixMyStreet/App/Controller/Admin.pm:401
+msgid "Values updated"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:18
+#: templates/web/default/admin/update_edit.html:18
+#: templates/web/zurich/admin/report_edit-sdm.html:24
+#: templates/web/zurich/admin/report_edit.html:23
+#: templates/web/zurich/admin/update_edit.html:10
+msgid "View report on site"
+msgstr "ဆိုက္ေပၚတြင္ အစီရင္ခံစာ ၾကည့္႐ႈျခင္း"
+
+#: templates/web/default/reports/body.html:14
+msgid "View reports by ward"
+msgstr ""
+
+#: templates/web/emptyhomes/tokens/confirm_problem.html:39
+msgid "View your report"
+msgstr "သင္၏ အစီရင္ခံစာကို ၾကည့္႐ႈျခင္း"
+
+#: templates/web/default/around/display_location.html:0
+#: templates/web/default/around/display_location.html:34
+msgid "Viewing a location"
+msgstr "တည္ေနရာကို စိစစ္ျခင္း"
+
+#: templates/web/default/report/display.html:0
+#: templates/web/fixmystreet/report/display.html:0
+msgid "Viewing a problem"
+msgstr "ျပႆနာကို စိစစ္ျခင္း"
+
+#: templates/web/default/reports/body.html:16
+msgid "Wards of this council"
+msgstr "ေကာင္စီအဖြဲ႔မ်ား"
+
+#: templates/web/default/alert/choose.html:6
+#: templates/web/default/around/around_index.html:13
+#: templates/web/fixmystreet/around/around_index.html:16
+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 "ယခုတည္ေနရာ အတြက္ တစ္ခုထက္ပိုသည့္ ေနရာမ်ား ေတြ႔ရွိထားပါသည္။ တူညီသည့္ ေနရာဆယ္ခုကို ေတြ႔ရွိထားပါသည္။ ယခုတည္ေနရာ မဟုတ္ပါက အျခားရွာေဖြမႈမ်ား ထပ္မံျပဳလုပ္ပါ။"
+
+#: templates/web/default/auth/token.html:8
+msgid "We have not been able to confirm your account - sorry."
+msgstr "သင့္ account ကိုအတည္ မျပဳႏိုင္ေသးပါ- ဝမ္းနည္းပါတယ္။"
+
+#: templates/web/default/auth/token.html:16
+msgid "We have sent you an email containing a link to confirm your account."
+msgstr "မိမိတို႔သည္ သင့္ account ကိုအတည္ျပဳေပးမည့္ လင့္ခ္ပါဝင္ေသာ အီးေမးကို ေပးပို႔ထားပါသည္။"
+
+#: templates/web/emptyhomes/tokens/confirm_problem.html:19
+#: templates/web/emptyhomes/tokens/confirm_problem.html:20
+msgid "We may contact you periodically to ask if anything has changed with the property you reported."
+msgstr "သင္တင္ျပထားသည့္ ပစၥည္းဥစၥာမ်ား အေျပာင္းအလဲရွိလာပါက မိမိတို႔အေနျဖင့္ ဆက္သြယ္ ေမးျမန္းမႈမ်ား ျပဳလုပ္သြားဖြယ္ ရွိပါသည္။"
+
+#: templates/web/fixmystreet/report/update-form.html:115
+msgid "We never show your email"
+msgstr "သင့္အီးေမးလိပ္စာကို ျပသ သြားမည္မဟုတ္ပါ။"
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:134
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:201
+#: templates/web/zurich/report/new/fill_in_details_form.html:96
+msgid "We never show your email address or phone number."
+msgstr "မိမိတို႔သည္ သင့္ဖုန္းနံပါတ္ သို႔မဟုတ္ အီးေမးလိပ္စာကို ျပသသြားမည္ မဟုတ္ပါ"
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:394
+msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch."
+msgstr "မိမိတို႔သည္ %s; ၏တာဝန္ျဖစ္ေၾကာင္း သတိျပဳမိေသာ္လည္း မိမိတို႔တြင္ ၎တို႔ကို ဆက္သြယ္ရန္ အေသးစိတ္ မရွိေသးပါ။ အကယ္၍ သင့္ေတာ္သည့္ လိပ္စာရွိပါက ေက်းဇူးျပဳၿပီး ဆက္သြယ္ေပးပါ။"
+
+#: templates/web/default/index-steps.html:31
+msgid "We send it to the council on your behalf"
+msgstr "သင္၏ကိုယ္စား ေကာင္စီထံ ကၽြန္ေတာ္တို႔ ေပးပို႔ပါမည္"
+
+#: templates/web/default/report/new/notes.html:5
+#: templates/web/fixmybarangay/report/new/notes.html:5
+msgid "We will only use your personal information in accordance with our <a href=\"/faq#privacy\">privacy policy.</a>"
+msgstr "မိမိတို႔၏ privancy ေပၚလစီႏွင့္ အညီ သင့္၏တစ္ကိုယ္ရည္ အခ်က္အလက္မ်ားကို အသုံးျပဳသြားမည္ ျဖစ္ပါသည္။"
+
+#: templates/web/fixmystreet/report/new/notes.html:4
+msgid "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>"
+msgstr "မိမိတို႔၏ privacy ေပၚလစီႏွင့္အညီ သင့္၏ တစ္ကိုယ္ရည္ အခ်က္အလက္မ်ားကို အသုံးျပဳသြားမည္ ျဖစ္ပါသည္။"
+
+#: templates/web/emptyhomes/contact/blurb.html:2
+msgid "We&rsquo;d love to hear what you think about this website. Just fill in the form. Please don&rsquo;t contact us about individual empty homes; use the box accessed from <a href=\"/\">the front page</a>."
+msgstr "မိမိတို႔အေနျဖင့္ ယခုဝက္ဆိုက္ႏွင့္ ပတ္သက္သည့္ အျမင္မ်ားကို သိလိုပါသည္။ ပုံစံတြင္ ျဖည့္ေပးပါ။ ေရွ႔ဆုံး စာမ်က္ႏွာမွ ေနရာလြတ္ အသုံးျပဳ၍ လြတ္ေနသည့္ ေနရာ တစ္ခုခ်င္းစီႏွင့္ ပတ္သက္ၿပီး ဆက္သြယ္ျခင္း မျပဳရန္ ေမတၱာရပ္ခံပါသည္။"
+
+#: templates/web/default/contact/blurb.html:8
+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 "မိမိတို႔အေနနဲ႔ ယခုဆိုက္နဲ႔ ပတ္သက္သည့္ အႀကံဥာဏ္မ်ား သိလိုပါသည္။ ပုံစံတြင္ျဖည့္ျခင္း သို႔မဟုတ္ <a href='mailto:%s'>%s</a>: သို႔ အီးေမး ေပးပို႔ႏိုင္ပါသည္။"
+
+#: templates/web/default/admin/body.html:61
+#: templates/web/default/admin/body_edit.html:82
+#: templates/web/zurich/admin/body.html:17
+msgid "When edited"
+msgstr "ျပင္ဆင္ခဲ့သည့္ အခ်ိန္"
+
+#: templates/web/default/admin/problem_row.html:35
+msgid "When sent"
+msgstr "ေပးပို႔ခဲ့သည့္ အခ်ိန္"
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:621
+msgid "Whole block of empty flats"
+msgstr "တိုက္ခန္းလြတ္မ်ား ရွိရာ ဘေလာက္"
+
+#: templates/web/default/open311/index.html:94
+msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>."
+msgstr ""
+"ေတာင္းဆို ရွာေဖြမႈမ်ားႏွင့္ အတူ အုပ္ခ်ဳပ္ေရးတစ္ခုစီကို ေပးပို႔သည့္ ေတာင္းဆိုခ်က္မ်ားကို ကန္႔သတ္ရန္ ေအဂ်င္စီတာဝန္ အတြက္ရွာေဖြမႈမ်ားလည္း ျဖစ္\n"
+"ႏိုင္ေခ် ျဖစ္သည္။ ရွာေဖြမႈသည္ အုပ္ခ်ဳပ္ေရး အေထာက္အထားျဖစ္ၿပီး MaPit မွေထာက္ပံ့ ေပးထားသည္။"
+
+#: templates/web/fixmystreet/footer.html:24
+msgid "Would you like better integration with FixMyStreet? <a href=\"http://www.mysociety.org/for-councils/fixmystreet/\">Find out about FixMyStreet for councils</a>."
+msgstr "FixMyStreet ႏွင့္ အေကာင္းဆံုး ေပါင္းစပ္ေဆာင္ရြက္ခ်င္ပါသလား? <a href=\"http://www.mysociety.org/for-councils/fixmystreet/\"> ေကာင္စီမ်ားအတြက္ FixMyStreet ကို ရွာေဖြပါ။"
+
+#: templates/web/fixmystreet/footer.html:20
+msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>."
+msgstr "FixMyStreet တြင္ ပံ့ပိုးကူညီခ်င္ပါသလား? ကၽြႏု္ပ္တို႔၏ code က open source ျဖစ္ၿပီး GitHub တြင္ ရယူႏိုင္သည္။"
+
+#: templates/web/default/questionnaire/index.html:106
+#: templates/web/fixmystreet/questionnaire/index.html:96
+msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
+msgstr "သင့္အေနျဖင့္ ေလးပတ္အတြင္း အျခားေမးခြန္းမ်ား ရရွိလိုၿပီး အေျခအေနကို သတိရေစရန္ သတိေပးလိုပါသလား။"
+
+#: templates/web/default/report/new/notes.html:8
+#: templates/web/fixmybarangay/report/new/notes.html:8
+#: templates/web/fixmystreet/report/new/notes.html:8
+msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
+msgstr "မက္ေဆ့ခ်္ တစ္ခုလုံးကို စာလုံးအႀကီးမ်ား ျဖင့္ ေရးျခင္းသည္ ဖတ္ရခက္ခဲၿပီး ပုဒ္ျဖတ္ပုဒ္ရပ္ ကိုလည္း ေပ်ာက္ေစသည္။"
+
+#: templates/web/default/admin/stats.html:10
+msgid "Year"
+msgstr "ခုႏွစ္"
+
+#: templates/web/default/admin/bodies.html:57
+#: templates/web/default/admin/body.html:68
+#: templates/web/default/admin/body.html:69
+#: templates/web/default/admin/body.html:70
+#: templates/web/default/admin/body_edit.html:5
+#: templates/web/default/admin/flagged.html:47
+#: templates/web/default/admin/list_updates.html:32
+#: templates/web/default/admin/list_updates.html:34
+#: templates/web/default/admin/list_updates.html:35
+#: templates/web/default/admin/problem_row.html:20
+#: templates/web/default/admin/report_edit.html:63
+#: templates/web/default/admin/report_edit.html:77
+#: templates/web/default/admin/update_edit.html:24
+#: templates/web/default/admin/users.html:29
+#: templates/web/default/questionnaire/creator_fixed.html:14
+#: templates/web/default/questionnaire/index.html:109
+#: templates/web/default/questionnaire/index.html:66
+#: templates/web/fixmystreet/questionnaire/index.html:60
+#: templates/web/fixmystreet/questionnaire/index.html:99
+msgid "Yes"
+msgstr "ဟုတ္သည္။"
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:161
+#: templates/web/fixmystreet/report/update-form.html:89
+msgid "Yes I have a password"
+msgstr "ကၽြႏု္ပ္တြင္ စကားဝွက္တစ္ခု ရိွသည္"
+
+#: templates/web/default/contact/index.html:37
+#: templates/web/fixmystreet/contact/index.html:54
+msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:"
+msgstr "တစ္ကိုယ္ရည္ အခ်က္အလက္မ်ား သို႔မဟုတ္ တူညီသည့္အရာမ်ား ေစာ္ကားခံရအတြက္ ေဖာ္ျပျပႆနာ အစီရင္ခံစာကို ရသည္။"
+
+#: templates/web/default/contact/index.html:15
+#: templates/web/fixmystreet/contact/index.html:32
+msgid "You are reporting the following update for being abusive, containing personal information, or similar:"
+msgstr "သင့္အေနျဖင့္ ေစာ္ကားခံေနရေၾကာင္း ျပန္လည္မြမ္းမံထားသည္ တို႔ကေဖာ္ျပေနၿပီး ထိုထဲတြင္ တစ္ကုိယ္ရည္ အခ်က္အလက္ သို႔မဟုတ္ တူညီသည့္ အခ်က္အလက္မ်ား ပါဝင္သည္။"
+
+#: templates/web/default/tokens/confirm_problem.html:20
+#: templates/web/default/tokens/confirm_problem.html:21
+#: templates/web/zurich/tokens/confirm_problem.html:6
+#: templates/web/zurich/tokens/confirm_problem.html:8
+msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
+msgstr "သင့္အေနျဖင့္ ယခုဆိုက္တြင္ ျပႆနာကို ၾကည့္ရူႏိုင္သည္။"
+
+#: templates/web/default/admin/user-form.html:47
+msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
+msgstr "သင့္အေနျဖင့္ ယဥ္ေက်းမႈမရွိေသာ သုံးစြဲသူ၏ အီးေမးလ္ကို ၎တို႔ဖန္တီးထားေသာ အလိုအေလ်ာက္ ဖုံးထားေသာ(မေပးပို႔ေသာ) အစီရင္ခံစာမ်ား ျဖစ္သည့္ ယဥ္ေက်းမႈမရွိေသာ စာရင္းတြင္ ထည့္သြင္းထားႏိုင္သည္။"
+
+#: templates/web/fixmystreet/contact/index.html:118
+msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
+msgstr ""
+
+#: templates/web/default/admin/flagged.html:5
+msgid ""
+"You can flag any report or user by editing them, and they will be listed on this page.\n"
+" For example, this can useful if you want to keep an eye on a user who has posted inappropriate\n"
+" reports in the past."
+msgstr "သင့္အေနျဖင့္မည္သည့္ report ကိုမဆုိ သို႔မဟုတ္ သုံးစြဲသူကို ျပင္ဆင္လိုပါက အမွတ္အသား ျပဳလုပ္ႏိုင္ၿပီး ၎တို႔သည္ စာမ်က္ႏွာေပၚတြင္ ေဖာ္ျပခံရမည္ ျဖစ္သည္။ ဥပမာ အတိတ္တြင္ မသင့္ေလွ်ာ္သည့္ အစီရင္ခံစာမ်ား တင္သူမ်ားကို ေစာင့္ၾကည့္လိုပါက အသုံးဝင္လာမည္ ျဖစ္သည္။"
+
+#: templates/web/default/report/new/councils_text_none.html:19
+#: templates/web/default/report/new/councils_text_none.html:20
+#: templates/web/default/report/new/councils_text_some.html:21
+#: templates/web/default/report/new/councils_text_some.html:22
+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 "သင့္အေနျဖင့္ ကၽြႏု္ပ္တို႔ကို %s အတြက္ ျပည္တြင္း ျပႆနာမ်ားကို အီးေမးလ္ လိပ္စာျဖင့္ ဆက္သြယ္၍ ရွာေဖြႏိုင္ၿပီး <a href='mailto:%s'>%s</a> ရွိ ကၽြႏု္ပ္တို႔ထံသို႔ အီးေမးလ္ ေပးပို႔ႏိုင္သည္။"
+
+#: templates/web/default/admin/body-form.html:81
+msgid "You can mark a body as deleted if you do not want it to be active on the site."
+msgstr "ဆိုက္ေပၚတြင္ ရွိေနမေစခ်င္လွ်င္ ဖ်က္ထားေသာ အဖြဲ႔ကို အမွတ္အသား ျပဳလုပ္ႏိုင္သည္။"
+
+#: templates/web/default/js/translation_strings.html:36
+msgid "You declined; please fill in the box above"
+msgstr "ျငင္းပယ္လိုက္သည္။ ေက်းဇူးျပဳ၍ အေပၚက အကြက္တြင္ ျဖည့္ေပးပါ။"
+
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38
+msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
+msgstr ""
+"သင္သည္ ဒီေမးခြန္းကို ေျဖရွင္းၿပီးသား ျဖစ္ပါသည္။ သင့္မွာ ေမးခြန္းရွိပါက ေက်းဇူးျပဳၿပီးေတာ့ a href='%s'> ကိုဆက္သြယ္ပါ။ သို႔မဟုတ္ <a href='%s'>\n"
+"မွာ သင့္ျပႆနာကို သြားေရာက္ ၾကည့္ရူႏိုင္ပါသည္။ \n"
+"\n"
+
+#: templates/web/default/questionnaire/index.html:96
+#: templates/web/default/report/new/fill_in_details_form.html:93
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:90
+#: templates/web/fixmystreet/questionnaire/index.html:87
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:99
+#: templates/web/zurich/report/new/fill_in_details_form.html:75
+msgid "You have already attached a photo to this report, attaching another one will replace it."
+msgstr "ဒီအစီရင္ခံစာတြင္ ဓာတ္ပုံတြဲတင္ထားၿပီ ျဖစ္ၿပီး အျခားတစ္ခု တြဲတင္ျခင္းသည္ အရင္ေနရာတြင္ အစားထိုးသြားပါမည္။"
+
+#: templates/web/default/report/update-form.html:59
+#: templates/web/fixmystreet/report/update-form.html:56
+msgid "You have already attached a photo to this update, attaching another one will replace it."
+msgstr "ယခု ျပင္ဆင္မြမ္းမံမႈကို ဓာတ္ပုံျဖင့္ တြဲတင္ထားၿပီး ျဖစ္ၿပီး အျခားတစ္ခုတြဲတင္လွ်င္ အရင္ေနရာတြင္ အစားထိုးေပးသြားမည္ ျဖစ္သည္။"
+
+#: templates/web/default/auth/sign_out.html:3
+#: templates/web/zurich/auth/sign_out.html:3
+msgid "You have been signed out"
+msgstr "ထြက္ခြာၿပီး ျဖစ္သည္။"
+
+#: templates/web/default/report/new/fill_in_details_form.html:7
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:7
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:28
+#: templates/web/zurich/report/new/fill_in_details_form.html:13
+msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. "
+msgstr ""
+"ေျမပုံေပၚတြင္ အစိမ္းေရာင္ ပင္အပ္ ျဖင့္အမွတ္အသားျပဳထားသည့္ ေနရာတြင္ ျပႆနာကို ေတြ႔ႏိုင္သည္။ အကယ္၍ လက္ရွိတည္ေနရာမဟုတ္ပါက ေျမပုံကို\n"
+"ထပ္ႏွိပ္ပါ။"
+
+#: templates/web/default/tokens/confirm_alert.html:7
+msgid "You have successfully confirmed your alert."
+msgstr "သင္၏ သတိေပးခ်က္ကို ေအာင္ျမင္စြာ အတည္ျပဳၿပီး ျဖစ္သည္"
+
+#: templates/web/zurich/tokens/confirm_problem.html:6
+msgid "You have successfully confirmed your email address."
+msgstr "သင္၏ အီးေမးလ္လိပ္စာကို ေအာင္ျမင္စြာ အတည္ျပဳၿပီး ျဖစ္သည္"
+
+#: templates/web/default/tokens/confirm_problem.html:15
+msgid "You have successfully confirmed your problem"
+msgstr "သင္၏ ျပႆနာကို ေအာင္ျမင္စြာ အတည္ျပဳၿပီး ျဖစ္သည္"
+
+#: templates/web/default/tokens/confirm_update.html:12
+msgid "You have successfully confirmed your update and you can now <a href=\"%s\">view it on the site</a>."
+msgstr "သင္၏ ျပဳျပင္မြမ္းမံမႈကို ေအာင္ျမင္စြာ အတည္ျပဳၿပီး ျဖစ္သည္။ ၎ကို ဆိုက္ေပၚတြင္ ၾကည့္႐ႈႏိုင္သည္။"
+
+#: templates/web/default/tokens/confirm_alert.html:11
+msgid "You have successfully created your alert."
+msgstr "သင္၏ သတိေပးခ်က္ကို ေအာင္ျမင္စြာ ဖန္တီးၿပီး ျဖစ္သည္"
+
+#: templates/web/default/tokens/confirm_alert.html:9
+msgid "You have successfully deleted your alert."
+msgstr "သင္၏ သတိေပးခ်က္ကို ေအာင္ျမင္စြာ ပယ္ဖ်က္ၿပီး ျဖစ္သည္"
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:762
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:140
+msgid "You have successfully signed in; please check and confirm your details are accurate:"
+msgstr "သင္ ေအာင္ျမင္စြာ ဝင္ေရာက္ႏိုင္ခဲ့ပါၿပီ။ သင္၏ အေသးစိတ္ အခ်က္အလက္ မွန္ကန္မႈ ရိွ မရိွ စစ္ေဆးၿပီး အတည္ျပဳပါ။"
+
+#: templates/web/default/my/my.html:17 templates/web/fixmystreet/my/my.html:17
+msgid "You haven&rsquo;t created any reports yet. <a href=\"%s\">Report a problem now.</a>"
+msgstr ""
+
+#: templates/web/default/email_sent.html:13
+msgid "You must now click the link in the email we've just sent you."
+msgstr "ယခု ကၽြႏု္ပ္တို႔ ေပးပို႔လိုက္သည့္ အီးေမးလ္ရိွ လင့္ခ္ကို ႏွိပ္ပါ။"
+
+#: templates/web/default/admin/index.html:7
+msgid "You need to <a href=\"%s\">add some bodies</a> (such as councils or departments) before any reports can be sent."
+msgstr "အစီအရင္ခံစာမ်ား မေပးပို႔မီ (ေကာင္စီမ်ား သို႔မဟုတ္ ႒ာနမ်ားကဲ့သို႔) အဖြဲ႔တခ်ိဳ႔ကို ထည့္သြင္းရန္ လိုအပ္သည္"
+
+#: templates/web/default/admin/bodies.html:9
+msgid ""
+"You need to add bodies (such as councils or departments) so that you can then add\n"
+" the categories of problems they can handle (such as potholes or streetlights) and the\n"
+" contacts (such as an email address) to which reports are sent."
+msgstr "သင့္အေနျဖင့္ (ေကာင္စီမ်ားႏွင့္ ႒ာနကဲ့သို႔) အဖြဲ႔မ်ား ထည့္သြင္းႏိုင္ရန္ လိုအပ္ေသာေၾကာင့္ သင့္အေနျဖင့္ (က်င္း၊ခ်ိဳင့္မ်ား သို႔မဟုတ္ လမ္းမီးတိုင္ကဲ့သုိ႔) ကိုင္တြယ္ႏိုင္သည့္ ျပႆနာမ်ားကို ထည့္သြင္းႏိုင္သလို (အီးေမးလ္ လိပ္စာ ကဲ့သို႔) အဆက္အသြယ္မ်ားျဖင့္ အစီအရင္ခံစာမ်ားကို ေပးပို႔ႏိုင္သည္။"
+
+#: templates/web/default/admin/report_edit.html:71
+msgid "You really want to resend?"
+msgstr "သင္ အမွန္တကယ္ ျပန္လည္ ေပးပို႔ခ်င္ပါသလား?"
+
+#: templates/web/default/my/my.html:0 templates/web/default/my/my.html:14
+#: templates/web/default/my/my.html:3 templates/web/fixmystreet/my/my.html:0
+#: templates/web/fixmystreet/my/my.html:14
+#: templates/web/fixmystreet/my/my.html:3
+msgid "Your Reports"
+msgstr "သင္၏ အစီရင္ခံစာမ်ား"
+
+#: templates/web/fixmystreet/alert/_list.html:89
+#: templates/web/fixmystreet/alert/updates.html:19
+#: templates/web/fixmystreet/alert/updates.html:22
+#: templates/web/fixmystreet/contact/index.html:88
+#: templates/web/fixmystreet/report/display.html:65
+#: templates/web/fixmystreet/report/display.html:67
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:115
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:147
+#: templates/web/zurich/report/new/fill_in_details_form.html:88
+msgid "Your email"
+msgstr "သင္၏ အီးေမးလ္"
+
+#: templates/web/fixmystreet/auth/general.html:26
+#: templates/web/fixmystreet/report/update-form.html:80
+#: templates/web/zurich/auth/general.html:30
+#: templates/web/zurich/auth/general.html:58
+msgid "Your email address"
+msgstr "သင္၏ အီးေမးလ္လိပ္စာ"
+
+#: templates/web/default/auth/general.html:27
+msgid "Your email address:"
+msgstr "သင္၏ အီးေမးလ္လိပ္စာ"
+
+#: templates/web/default/alert/_list.html:92
+#: templates/web/default/report/new/fill_in_details_form.html:124
+#: templates/web/default/report/update-form.html:81
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:133
+#: templates/web/fixmybarangay/alert/_list.html:37
+msgid "Your email:"
+msgstr "သင္၏ အီးေမးလ္"
+
+#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7
+msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>"
+msgstr "သင့္၏အခ်က္အလက္မ်ားကို ကၽြႏု္ပ္တို႔၏ သီးသန္႔တည္ရွိမႈ ေပၚလစီ ႏွင့္အညီ အသုံးျပဳသြားမည္ ျဖစ္သည္။"
+
+#: templates/web/fixmystreet/auth/general.html:57
+#: templates/web/fixmystreet/contact/index.html:81
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:124
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:192
+#: templates/web/fixmystreet/report/update-form.html:140
+#: templates/web/zurich/auth/general.html:61
+#: templates/web/zurich/report/new/fill_in_details_form.html:104
+msgid "Your name"
+msgstr "သင့္အမည္"
+
+#: templates/web/default/auth/general.html:59
+#: templates/web/default/contact/index.html:68
+#: templates/web/default/report/new/fill_in_details_form.html:203
+#: templates/web/default/report/update-form.html:151
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:124
+msgid "Your name:"
+msgstr "သင့္အမည္"
+
+#: templates/web/fixmystreet/auth/general.html:41
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:166
+#: templates/web/fixmystreet/report/update-form.html:94
+#: templates/web/zurich/auth/general.html:34
+msgid "Your password"
+msgstr "သင္၏ စကားဝွက္"
+
+#: templates/web/default/auth/change_password.html:6
+msgid "Your password has been changed"
+msgstr "သင္၏ စကားဝွက္ကို ေျပာင္းလဲၿပီးျဖစ္သည္"
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:139
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:206
+#: templates/web/zurich/report/new/fill_in_details_form.html:110
+msgid "Your phone number"
+msgstr "သင္၏ ဖုန္းနံပါတ္"
+
+#: templates/web/fixmystreet/questionnaire/index.html:15
+msgid "Your report"
+msgstr "သင္၏ အစီရင္ခံစာ"
+
+#: templates/web/default/report_created.html:6
+msgid "Your report has been created and will shortly be sent."
+msgstr "သင္၏ အစီရင္ခံစာကို ဖန္တီးၿပီးပါၿပီ။ မၾကာခင္ ေပးပို႔ပါမည္။"
+
+#: templates/web/default/footer.html:9 templates/web/fiksgatami/footer.html:6
+#: templates/web/fiksgatami/nn/footer.html:6
+#: templates/web/fixmystreet/footer.html:49
+msgid "Your reports"
+msgstr "သင္၏ အစီရင္ခံစာမ်ား"
+
+#: templates/web/default/my/my.html:50 templates/web/fixmystreet/my/my.html:56
+msgid "Your updates"
+msgstr "သင္၏ မြမ္းမံျပင္ဆင္ထားမႈမ်ား"
+
+#: templates/web/default/contact/index.html:76
+msgid "Your&nbsp;email:"
+msgstr "သင္၏ &nbsp; အီးေမးလ္"
+
+#: templates/web/default/admin/timeline.html:4
+msgid "by %s"
+msgstr "%s မွ"
+
+#: templates/web/default/reports/body.html:6
+#: templates/web/default/reports/body.html:7
+msgid "council"
+msgstr "ေကာင္စီ"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+msgid "council ref:&nbsp;%s"
+msgstr "ေကာင္စီ ရည္ညႊန္းခ်က္"
+
+#: templates/web/default/admin/report_edit.html:28
+#: templates/web/zurich/admin/report_edit-sdm.html:43
+#: templates/web/zurich/admin/report_edit.html:57
+msgid "didn't use map"
+msgstr "ေျမပံု မသံုးခဲ့ပါ"
+
+#: templates/web/default/alert/index.html:33
+#: templates/web/fixmystreet/around/postcode_form.html:20
+msgid "e.g. ‘%s’ or ‘%s’"
+msgstr "ဥပမာ ‘%s’ သို႔မဟုတ္ ‘%s’"
+
+#: templates/web/default/admin/flagged.html:51
+msgid "edit user"
+msgstr "သုံးစြဲသူအား ျပင္ဆင္ျခင္း"
+
+#: templates/web/default/admin/index.html:23
+#: templates/web/zurich/admin/index.html:5
+msgid "from %d different users"
+msgstr "%d မွ မတူညီေသာ သုံးစြဲသူမ်ား"
+
+#: templates/web/fixmystreet/report/_item.html:17
+#: templates/web/zurich/report/_item.html:16
+msgid "last updated %s"
+msgstr "ေနာက္ဆုံး ျပဳျပင္မြမ္းမံမႈမ်ား"
+
+#: perllib/Utils.pm:265
+msgid "less than a minute"
+msgstr "တစ္မိနစ္ခန္႔သာ"
+
+#: templates/web/default/report/updates.html:57
+msgid "marked as a duplicate report"
+msgstr "အစီရင္ခံစာ တူညီေနေၾကာင္း အမွတ္အသား ျပဳလုပ္ထားသည္"
+
+#: templates/web/default/report/updates.html:47
+msgid "marked as action scheduled"
+msgstr "ျပဳျပင္ထားေသာ အခ်ိန္ဇယားကို အမွတ္အသားျပဳလုပ္ပါ"
+
+#: templates/web/default/report/updates.html:59
+msgid "marked as an internal referral"
+msgstr "အတြင္းတြင္ လႊဲေျပာင္းထားသည္ကို အမွတ္အသားျပဳလုပ္ပါ"
+
+#: templates/web/default/report/updates.html:49
+msgid "marked as closed"
+msgstr "ပိတ္ထားသည့္ အမွတ္အသား ျပဳလုပ္ထားသည္"
+
+#: templates/web/default/report/updates.html:28
+#: templates/web/default/report/updates.html:51
+msgid "marked as fixed"
+msgstr "ျပင္ဆင္ထားသည့္ အမွတ္အသား ျပဳလုပ္ထားသည္"
+
+#: templates/web/default/report/updates.html:45
+msgid "marked as in progress"
+msgstr "ဆက္လက္လုပ္ေဆာင္ေနဆဲ အမွတ္အသား ျပဳလုပ္ထားသည္"
+
+#: templates/web/default/report/updates.html:41
+msgid "marked as investigating"
+msgstr "စံုစမ္းစစ္ေဆးေနဆဲ အမွတ္အသား ျပဳလုပ္ထားသည္"
+
+#: templates/web/default/report/updates.html:55
+msgid "marked as not the council's responsibility"
+msgstr "ေကာင္စီ၏ တာဝန္မဟုတ္ေၾကာင္း အမွတ္အသား ျပဳလုပ္ထားသည္"
+
+#: templates/web/default/report/updates.html:43
+msgid "marked as planned"
+msgstr "စီစဥ္ထားၿပီးျဖစ္ေၾကာင္း အမွတ္အသား ျပဳလုပ္ထားသည္"
+
+#: templates/web/default/report/updates.html:53
+msgid "marked as unable to fix"
+msgstr "ျပင္ဆင္၍ မရေၾကာင္း အမွတ္အသား ျပဳလုပ္ထားသည္"
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:130
+#: templates/web/default/admin/questionnaire.html:15
+#: templates/web/default/admin/questionnaire.html:16
+msgid "n/a"
+msgstr "မအားေသးပါ"
+
+#: templates/web/default/alert/_list.html:87
+#: templates/web/fixmybarangay/alert/_list.html:32
+#: templates/web/fixmystreet/alert/_list.html:85
+msgid "or"
+msgstr "သို႔မဟုတ္"
+
+#: templates/web/default/js/translation_strings.html:27
+msgid "or locate me automatically"
+msgstr "သို႔မဟုတ္ အလိုအေလ်ာက္ လမ္းညႊန္ပါ"
+
+#: templates/web/default/admin/report_edit.html:25
+#: templates/web/default/admin/report_edit.html:26
+#: templates/web/zurich/admin/report_edit-sdm.html:31
+#: templates/web/zurich/admin/report_edit-sdm.html:32
+#: templates/web/zurich/admin/report_edit-sdm.html:40
+#: templates/web/zurich/admin/report_edit-sdm.html:41
+#: templates/web/zurich/admin/report_edit.html:31
+#: templates/web/zurich/admin/report_edit.html:32
+#: templates/web/zurich/admin/report_edit.html:42
+#: templates/web/zurich/admin/report_edit.html:43
+#: templates/web/zurich/admin/report_edit.html:54
+#: templates/web/zurich/admin/report_edit.html:55
+msgid "originally entered: &ldquo;%s&rdquo;"
+msgstr "နဂိုဝင္ေရာက္ထားမႈ: &ldquo;%s&rdquo;"
+
+#: templates/web/default/admin/report_edit.html:30
+msgid "other areas:"
+msgstr "အျခား ဧရိယာမ်ား"
+
+#: templates/web/default/report/updates.html:29
+#: templates/web/default/report/updates.html:39
+msgid "reopened"
+msgstr "ျပန္ဖြင့္ပါ"
+
+#: templates/web/fixmybarangay/header.html:67
+#: templates/web/fixmystreet/header.html:54
+#: templates/web/zurich/footer.html:12
+msgid "sign out"
+msgstr "ထြက္ရန္"
+
+#: templates/web/default/report/new/fill_in_details_form.html:12
+#: templates/web/default/report/new/fill_in_details_form.html:14
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:12
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:14
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:7
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:9
+msgid "the local council"
+msgstr "ျပည္တြင္းေကာင္စီ"
+
+#: templates/web/default/report/_main.html:6
+#: templates/web/zurich/report/_main.html:5
+msgid "there is no pin shown as the user did not use the map"
+msgstr "အသုံးျပဳသူ မသုံးသည့္ ေျမပုံကို ပင္အပ္ျဖင့္ မေဖာ္ျပထားပါ"
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:370
+msgid "this type of local problem"
+msgstr "ေဒသတြင္း ျပႆနာသာျဖစ္သည္။"
+
+#: perllib/Utils.pm:237
+msgid "today"
+msgstr "ယေန႔"
+
+#: templates/web/default/admin/report_edit.html:28
+#: templates/web/zurich/admin/report_edit-sdm.html:43
+#: templates/web/zurich/admin/report_edit.html:57
+msgid "used map"
+msgstr "ေျမပံု အသံုးျပဳထားၿပီး"
+
+#: templates/web/default/admin/update_edit.html:35
+msgid "user is from same council as problem - %d"
+msgstr "အသုံးျပဳသူသည္ တူညီသည့္ ေကာင္စီမွျဖစ္လွ်င္ ျပႆနာျဖစ္သည္။"
+
+#: templates/web/default/admin/update_edit.html:38
+msgid "user is problem owner"
+msgstr "အသုံးျပဳသူပ ျပႆနာပိုင္ရွင္ ျဖစ္သည္"
+
+#: templates/web/default/reports/body.html:0
+#: templates/web/default/reports/body.html:3
+msgid "ward"
+msgstr "အုပ္ခ်ဳပ္ေရးဌာန"
+
+#: templates/web/default/front/stats.html:17
+#, perl-format
+msgid "<big>%s</big> report recently"
+msgid_plural "<big>%s</big> reports recently"
+msgstr[0] "<big>%s</big> လတ္တေလာ တင္ျပထားေသာ အစီရင္ခံစာမ်ား"
+
+#: perllib/Utils.pm:284
+#, perl-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d အခ်ိန္မ်ား"
+
+#: templates/web/default/report/_support.html:6
+#, perl-format
+msgid "%d supporter"
+msgid_plural "%d supporters"
+msgstr[0] "%d ေထာက္ပံ့ေပးသူမ်ား"
+
+#: perllib/Utils.pm:286
+#, perl-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d မိနစ္မ်ား"
+
+#: templates/web/default/front/stats.html:29
+#, perl-format
+msgid "<big>%s</big> update on reports"
+msgid_plural "<big>%s</big> updates on reports"
+msgstr[0] "<big>%s</big> ျပဳျပင္မြမ္းမံထားသည့္ အစီရင္ခံစာမ်ား"
+
+#: templates/web/emptyhomes/report/new/councils_text_none.html:3
+#, perl-format
+msgid "We do not yet have details for the council that covers this location."
+msgid_plural "We do not yet have details for the councils that cover this location."
+msgstr[0] "ကၽြႏု္ပ္တို႔သည္ ယခုေနရာကိုႏွင့္ ပတ္သက္သည့္ ေကာင္စီမ်ားအတြက္ အေသးစိတ္မရွိေသးပါ"
+
+#: perllib/Utils.pm:280
+#, perl-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] "%d ရက္သတၱပတ္မ်ား"
+
+#: templates/web/default/front/stats.html:12
+#, perl-format
+msgid "<big>%s</big> report in past week"
+msgid_plural "<big>%s</big> reports in past week"
+msgstr[0] "<big>%s</big> ၿပီးခဲ့သည့္ ရက္သတၱပတ္က အစီရင္ခံစာမ်ား"
+
+#: templates/web/default/front/stats.html:23
+#, perl-format
+msgid "<big>%s</big> fixed in past month"
+msgid_plural "<big>%s</big> fixed in past month"
+msgstr[0] "<big>%s</big> ၿပီးခဲ့သည့္လက ျပဳျပင္ထားမႈ"
+
+#: perllib/Utils.pm:282
+#, perl-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d ရက္မ်ား"
+
+#: templates/web/default/report/new/councils_text_some.html:14
+#, perl-format
+msgid "We do <strong>not</strong> yet have details for the other council that covers this location."
+msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location."
+msgstr[0] "ကၽြႏု္ပ္တို႔တြင္ ဒီတည္ေနရာႏွင့္ ပတ္သက္သည့္ အျခားေကာင္အတြက္ အေသးစိတ္မရွိေသးပါ။"
+
+#~ msgid "Click on the map to report a problem"
+#~ msgstr "ျပႆနာတစ္ခုကိုအစီရင္ခံစာတင္ရင္ေျမပံုေပၚကိုႏွိပ္ပါ"
+
+#~ msgid "First Name"
+#~ msgstr "ပထမအမည္"
+
+#~ msgid "Last Name"
+#~ msgstr "နာမည္ေနာက္ဆံုးစာလံုး"
+
+#~ msgid "Name (optional)"
+#~ msgstr "အမည္(ေရြးခ်ယ္ပိုင္ခြင့္ရွိသည္)"
+
+#~ msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
+#~ msgstr "စကားဝွက္ကို မထည့္သြင္းခ်င္လွ်င္ ရသည္။ စကားဝွက္ ထည့္သြင္းပါက ျပႆနာမ်ားကို တင္ျပျခင္း၊ update မ်ား ျပဳလုပ္ျခင္းႏွင့္ အစီရင္ခံစာမ်ား စီမံခန္႔ခြဲျခင္းတို႔ကို ပိုမိုလြယ္ကူစြာ ျပဳလုပ္ႏိုင္မည္။"
+
+#~ msgid "Your email (optional)"
+#~ msgstr "သင္၏ အီးေမးလ္ (မထည့္ခ်င္လည္း ရသည္)"
+
+#~ msgid "Your first name"
+#~ msgstr "သင့္နာမည္၏ အေရွ႕စာလံုး"
+
+#~ msgid "Your last name"
+#~ msgstr "သင့္နာမည္၏ ေနာက္ဆံုးစာလံုး"
diff --git a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
index 9b12958eb..6b918cd11 100644
--- a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -4,18 +4,17 @@
# Matthew Somerville <matthew@mysociety.org>, 2011-06-03.
#
# Translators:
-# Anders Einar Hilden <hildenae@gmail.com>, 2012
+# Anders Einar Hilden <hildenae@gmail.com>, 2012-2013
# Guttorm Flatabø <post@guttormflatabo.com>, 2013
-# Anders Einar Hilden <hildenae@gmail.com>, 2013
# pere <pere-transifex@hungry.com>, 2012
# Petter Reinholdtsen <pere@hungry.com>, 2011
msgid ""
msgstr ""
"Project-Id-Version: fixmystreet\n"
"Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2013-11-12 13:15+0000\n"
-"PO-Revision-Date: 2013-09-05 16:55+0000\n"
-"Last-Translator: mysociety <transifex@mysociety.org>\n"
+"POT-Creation-Date: 2014-05-16 17:30+0100\n"
+"PO-Revision-Date: 2013-11-20 13:29+0000\n"
+"Last-Translator: Anders Einar Hilden <hildenae@gmail.com>\n"
"Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/fixmystreet/language/nb_NO/)\n"
"Language: nb_NO\n"
"MIME-Version: 1.0\n"
@@ -23,25 +22,25 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:373
+#: perllib/FixMyStreet/DB/Result/Problem.pm:604
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383
msgid " and "
msgstr " og "
-#: templates/web/default/tokens/confirm_problem.html:14
+#: templates/web/default/tokens/confirm_problem.html:15
#: templates/web/default/tokens/confirm_problem.html:17
msgid " and <strong>we will now send it to the council</strong>"
msgstr " og <strong>vi sender det nå til administrasjonen</strong>"
-#: templates/web/default/report/new/councils_text_all.html:11
-#: templates/web/default/report/new/councils_text_all.html:18
-#: templates/web/default/report/new/councils_text_all.html:4
-#: templates/web/default/report/new/councils_text_none.html:11
-#: templates/web/default/report/new/councils_text_none.html:14
-#: templates/web/default/report/new/councils_text_some.html:20
+#: templates/web/default/report/new/councils_text_all.html:12
+#: templates/web/default/report/new/councils_text_all.html:19
+#: templates/web/default/report/new/councils_text_all.html:5
+#: templates/web/default/report/new/councils_text_none.html:19
+#: templates/web/default/report/new/councils_text_none.html:21
+#: templates/web/default/report/new/councils_text_some.html:21
#: templates/web/default/report/new/councils_text_some.html:23
#: templates/web/default/report/new/councils_text_some.html:5
-#: templates/web/emptyhomes/report/new/councils_text_all.html:2
+#: templates/web/emptyhomes/report/new/councils_text_all.html:3
msgid " or "
msgstr " eller "
@@ -79,19 +78,19 @@ msgstr "%d til %d av %d"
msgid "%s - Summary reports"
msgstr "%s - oppsummeringsrapporter"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:653
msgid "%s ref:&nbsp;%s"
msgstr "%s ref:&nbsp;%s"
-#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
msgid "%s ward, %s"
msgstr "%s bydel, %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:538
+#: perllib/FixMyStreet/DB/Result/Problem.pm:540
msgid "%s, reported at %s"
msgstr "%s, rapportert %s"
-#: perllib/FixMyStreet/Cobrand/UK.pm:303 perllib/FixMyStreet/Cobrand/UK.pm:315
+#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:309
msgid "%s, within %s ward"
msgstr "%s, innefor bydel %s"
@@ -122,30 +121,27 @@ msgstr "(en standardavstand som dekker en befolkning på omtrent 200 000)"
msgid "(alternatively the RSS feed can be customised, within"
msgstr "(alternativt kan RSS-strømmen tilpasses, innenfor"
-#: templates/web/bromley/report/_item.html:22
#: templates/web/default/around/around_map_list_items.html:12
#: templates/web/default/around/on_map_list_items.html:9
-#: templates/web/fixmystreet/report/_item.html:22
+#: templates/web/fixmystreet/report/_item.html:27
#: templates/web/zurich/report/_item.html:21
msgid "(closed)"
msgstr "(lukket)"
-#: templates/web/bromley/report/_item.html:20
#: templates/web/default/around/around_map_list_items.html:10
#: templates/web/default/around/on_map_list_items.html:7
-#: templates/web/fixmystreet/report/_item.html:20
+#: templates/web/fixmystreet/report/_item.html:25
#: templates/web/zurich/report/_item.html:19
msgid "(fixed)"
msgstr "(løst)"
-#: templates/web/default/index.html:12 templates/web/default/index.html:8
+#: templates/web/default/index.html:12 templates/web/default/index.html:9
#: templates/web/fixmystreet/around/intro.html:2
msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
msgstr "(som tagging, søppel, hull i veien, eller ødelagte gatelys)"
-#: templates/web/bromley/report/_item.html:16
#: templates/web/default/reports/_list-entry.html:4
-#: templates/web/fixmystreet/report/_item.html:16
+#: templates/web/fixmystreet/report/_item.html:21
msgid "(not sent to council)"
msgstr "(ikke rapportert til administrasjonen)"
@@ -155,9 +151,8 @@ msgstr "(ikke rapportert til administrasjonen)"
msgid "(optional)"
msgstr "(valgfritt)"
-#: templates/web/bromley/report/_item.html:15
#: templates/web/default/reports/_list-entry.html:2
-#: templates/web/fixmystreet/report/_item.html:15
+#: templates/web/fixmystreet/report/_item.html:20
msgid "(sent to both)"
msgstr "(sendt til begge)"
@@ -169,8 +164,8 @@ msgstr "(vi viser aldri din e-postadresse eller telefonnummer)"
msgid "(we never show your email)"
msgstr "(vi viser aldri din e-postadresse)"
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:637
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:664
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:635
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:662
#: perllib/FixMyStreet/DB/Result/Problem.pm:379
msgid "-- Pick a category --"
msgstr "-- Velg en kategori --"
@@ -190,7 +185,7 @@ msgid ""
"<code>MAPIT_URL</code> is set (<code>%s</code>) but no <code>MAPIT_TYPES</code>.<br>\n"
" This is probably why \"area covered\" is empty (below).<br>\n"
" Maybe add some <code>MAPIT_TYPES</code> to your config file?"
-msgstr ""
+msgstr "<code>MAPIT_URL</code> er satt (<code>%s</code>) men ingen <code>MAPIT_TYPES</code>.<br>Dette er antagelig hvorfor \"dekket område\" er tom (under).<br>Kanskje du skal legge til noen <code>MAPIT_TYPES</code> i konfigurasjonsfilen?"
#: templates/web/default/questionnaire/completed.html:20
msgid "<p style=\"font-size:150%\">Thank you very much for filling in our questionnaire; glad to hear it&rsquo;s been fixed.</p>"
@@ -210,7 +205,7 @@ msgstr ""
"representanter</a>, eller hvis det er et problem som kan fikses\n"
"av folk i nabolaget som jobber sammen, hva med å <a href=\"http://www.pledgebank.com/new\">publisere en utfordring om å bidra</a>?</p>"
-#: templates/web/fixmystreet/questionnaire/completed-open.html:6
+#: templates/web/fixmystreet/questionnaire/completed-open.html:25
msgid ""
"<p style=\"font-size:150%\">We&rsquo;re sorry to hear that. We have two\n"
"suggestions: why not try <a href=\"http://www.writetothem.com/\">writing direct\n"
@@ -282,7 +277,7 @@ msgstr ""
"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>"
-#: templates/web/default/around/_report_banner.html:3
+#: templates/web/default/around/_report_banner.html:4
#: templates/web/default/around/_report_banner.html:5
msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>"
msgstr "<small>Hvis du ikke kan se kartet, <a href='%s' rel='nofollow'>hopp over dette steget</a>.</small>"
@@ -337,8 +332,6 @@ msgstr "<strong>Ja</strong> Jeg har et passord"
msgid "About us"
msgstr "Om oss"
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:81
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:39
#: templates/web/default/report/update-form.html:30
@@ -358,7 +351,7 @@ msgstr ""
#: templates/web/default/admin/body.html:45
msgid "Add a contact using the form below."
-msgstr ""
+msgstr "Legg til en kontakt ved å bruke formen under."
#: templates/web/default/admin/bodies.html:65
#: templates/web/default/admin/bodies.html:70
@@ -376,7 +369,7 @@ msgstr "Legg til ny kategori"
msgid "Add user"
msgstr "Legg til bruker"
-#: templates/web/default/my/my.html:56 templates/web/fixmystreet/my/my.html:60
+#: templates/web/default/my/my.html:61 templates/web/fixmystreet/my/my.html:67
msgid "Added %s"
msgstr "La til %s"
@@ -392,7 +385,6 @@ msgstr "Varsel %d opprettet for %s, type %s, parameter %s / %s"
msgid "Alert %d disabled (created %s)"
msgstr "Varsel %d koblet ut (opprettet %s)"
-#: templates/web/bromley/report/display.html:209
#: templates/web/default/report/update-form.html:163
#: templates/web/fixmystreet/report/update-form.html:148
msgid "Alert me to future updates"
@@ -405,17 +397,12 @@ msgstr "Send meg varsel ved fremtidige oppdateringer"
msgid "All Reports"
msgstr "Alle rapporter"
-#: templates/web/barnet/footer.html:20 templates/web/bromley/footer.html:21
-#: templates/web/bromley/header.html:77 templates/web/default/footer.html:11
+#: templates/web/default/footer.html:11
#: templates/web/emptyhomes/header.html:32
#: templates/web/fiksgatami/footer.html:7
#: templates/web/fiksgatami/nn/footer.html:7
-#: templates/web/fixmindelo/footer.html:41
#: templates/web/fixmybarangay/footer.html:20
-#: templates/web/fixmystreet/footer.html:48
-#: templates/web/oxfordshire/footer.html:23
-#: templates/web/oxfordshire/header.html:67
-#: templates/web/reading/footer.html:8 templates/web/stevenage/footer.html:43
+#: templates/web/fixmystreet/footer.html:51
#: templates/web/zurich/admin/index-dm.html:12
#: templates/web/zurich/admin/stats.html:13
#: templates/web/zurich/footer.html:19
@@ -432,27 +419,25 @@ msgstr "Alle rapporter mellom %s og %s"
msgid "All the information you provide here will be sent to"
msgstr "All informasjonen du har lagt inn her vil bli sendt til"
-#: templates/web/default/report/new/councils_text_all.html:11
+#: templates/web/default/report/new/councils_text_all.html:12
#: templates/web/default/report/new/councils_text_all.html:13
msgid "All the information you provide here will be sent to <strong>%s</strong> or <strong>Roads Service</strong>."
msgstr "All informasjon du legger inn her vil bli sendt til <strong>%s</strong>."
-#: templates/web/default/report/new/councils_text_all.html:4
+#: templates/web/default/report/new/councils_text_all.html:5
#: templates/web/default/report/new/councils_text_all.html:6
msgid "All the information you provide here will be sent to <strong>%s</strong> or a relevant local body such as <strong>TfL</strong>, via the London Report-It system."
msgstr "All informasjonen du gir oss her vil bli sendt til <strong>%s</strong> eller en relevant lokal etat som <strong>TfL</strong>, via systemet London Report-It."
-#: templates/web/bromley/report/new/fill_in_details_form.html:4
-#: templates/web/bromley/report/new/fill_in_details_form.html:6
-#: templates/web/default/report/new/councils_text_all.html:18
+#: templates/web/default/report/new/councils_text_all.html:19
#: templates/web/default/report/new/councils_text_all.html:20
-#: templates/web/default/report/new/fill_in_details_form.html:11
+#: templates/web/default/report/new/fill_in_details_form.html:12
#: templates/web/default/report/new/fill_in_details_form.html:13
-#: templates/web/emptyhomes/report/new/councils_text_all.html:2
+#: templates/web/emptyhomes/report/new/councils_text_all.html:3
#: templates/web/emptyhomes/report/new/councils_text_all.html:4
-#: templates/web/emptyhomes/report/new/fill_in_details_form.html:11
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:12
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:13
-#: templates/web/fixmystreet/report/new/fill_in_details_form.html:6
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:7
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:8
msgid "All the information you provide here will be sent to <strong>%s</strong>."
msgstr "All informasjonen du har lagt inn her vil bli sendt til <strong>%s</strong>."
@@ -476,13 +461,11 @@ msgstr "Anonym:"
msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?"
msgstr "Er du en <strong>utvikler</strong>? Kunne du tenke deg å bidra til FiksGataMi?"
-#: templates/web/fixmystreet/footer.html:16
-#: templates/web/stevenage/footer.html:17
+#: templates/web/fixmystreet/footer.html:19
msgid "Are you a developer?"
msgstr "Er du en utvikler?"
-#: templates/web/fixmystreet/footer.html:20
-#: templates/web/stevenage/footer.html:21
+#: templates/web/fixmystreet/footer.html:23
msgid "Are you from a council?"
msgstr "Er du fra den lokale administrasjonen?"
@@ -505,7 +488,7 @@ msgstr "Tildel til ekstern administrasjon:"
msgid "Assign to subdivision:"
msgstr "Tildelt underavdeling:"
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:141
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:163
#: templates/web/zurich/report/updates.html:11
msgid "Assigned to %s"
msgstr "Tildelt %s"
@@ -524,7 +507,6 @@ msgid "Awaiting moderation"
msgstr "Avventer moderasjon"
#: templates/web/default/js/translation_strings.html:32
-#: templates/web/oxfordshire/js/translation_strings.html:26
msgid "Back"
msgstr "Tilbake"
@@ -536,8 +518,8 @@ msgstr "Bannlys epostadresse"
msgid "Be sure to choose the right category, because we use that to determine to whom the report is sent."
msgstr "Pass på å velge riktig kategori, da vi bruker denne for å avgjøre hvem vi skal sende rapporten til."
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1176
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:249
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1185
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:297
#: templates/web/default/admin/bodies.html:1
#: templates/web/zurich/header.html:64
msgid "Bodies"
@@ -563,18 +545,15 @@ msgid "By Date"
msgstr "På dato"
#: templates/web/fixmystreet/around/_report_banner.html:10
-#: templates/web/fixmystreet/around/_report_banner.html:8
+#: templates/web/fixmystreet/around/_report_banner.html:9
msgid "Can't see the map? <a href='%s' rel='nofollow'>Skip this step</a>"
msgstr "Hvis du ikke kan se kartet, <a href='%s' rel='nofollow'>hopp over dette steget</a>."
-#: templates/web/bromley/report/new/fill_in_details_form.html:68
#: templates/web/default/admin/bodies.html:20
#: templates/web/default/admin/body.html:53
#: templates/web/default/admin/index.html:44
#: templates/web/default/report/new/category.html:10
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:74
-#: templates/web/seesomething/report/new/category.html:6
-#: templates/web/southampton/report/new/category.html:3
#: templates/web/zurich/admin/body.html:13
#: templates/web/zurich/admin/index-dm.html:23
#: templates/web/zurich/admin/index-sdm.html:21
@@ -599,7 +578,7 @@ msgstr "Løsningsrate fordelt på kategori for problemer > 4 uker gamle"
msgid "Category:"
msgstr "Kategori:"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:366
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374
msgid "Category: %s"
msgstr "Kategori: %s"
@@ -641,28 +620,23 @@ msgstr ""
#: templates/web/default/admin/stats.html:65
#: templates/web/default/admin/stats.html:71
msgid "Click here or enter as dd/mm/yyyy"
-msgstr ""
+msgstr "Klikk her eller tast inn dato på formater dd/mm/åååå"
#: templates/web/default/js/translation_strings.html:47
#: templates/web/fixmystreet/around/_report_banner.html:2
msgid "Click map to report a problem"
msgstr "Klikk i kartet for å rapportere et problem"
-#: templates/web/oxfordshire/js/translation_strings.html:39
-#, fuzzy
-msgid "Click on the map to report a problem"
-msgstr "Klikk i kartet for å rapportere et problem"
-
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:118
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:140
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:45
#: templates/web/default/admin/report_edit.html:47
#: templates/web/default/dashboard/index.html:142
#: templates/web/default/dashboard/index.html:144
#: templates/web/fixmystreet/report/banner.html:15
-#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:10
#: templates/web/zurich/admin/header.html:12
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/report_edit.html:100
#: templates/web/zurich/admin/report_edit.html:98
#: templates/web/zurich/admin/stats.html:31
@@ -670,11 +644,11 @@ msgstr "Klikk i kartet for å rapportere et problem"
msgid "Closed"
msgstr "Lukket"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:744
+#: perllib/FixMyStreet/DB/Result/Problem.pm:748
msgid "Closed by council"
msgstr "(ikke rapportert til administrasjonen)"
-#: templates/web/default/my/my.html:32 templates/web/fixmystreet/my/my.html:36
+#: templates/web/default/my/my.html:37 templates/web/fixmystreet/my/my.html:43
msgid "Closed reports"
msgstr "Fiksede rapporter"
@@ -682,7 +656,7 @@ msgstr "Fiksede rapporter"
msgid "Closed:"
msgstr "Lukket:"
-#: templates/web/default/around/tabbed_lists.html:10
+#: templates/web/default/around/tabbed_lists.html:11
#: templates/web/default/around/tabbed_lists.html:12
msgid "Closest nearby problems <small>(within&nbsp;%skm)</small>"
msgstr "De nærmeste problemene <small>(innenfor&nbsp;%skm)</small>"
@@ -708,9 +682,8 @@ msgid "Cobrand:"
msgstr "Merkevaresamarbeid:"
#: templates/web/default/admin/config_page.html:1
-#, fuzzy
msgid "Configuration"
-msgstr "Bekreftelse"
+msgstr "Oppsett"
#: perllib/FixMyStreet/App/Controller/Admin.pm:421
msgid "Configuration updated - contacts will be generated automatically later"
@@ -740,8 +713,6 @@ msgstr "Bekreft via epost under, og oppgi et nytt passord der. Når du har bekre
#: templates/web/default/tokens/confirm_update.html:3
#: templates/web/emptyhomes/tokens/confirm_problem.html:1
#: templates/web/emptyhomes/tokens/confirm_problem.html:3
-#: templates/web/southampton/tokens/confirm_problem.html:1
-#: templates/web/southampton/tokens/confirm_problem.html:3
#: templates/web/zurich/tokens/confirm_problem.html:1
#: templates/web/zurich/tokens/confirm_problem.html:3
msgid "Confirmation"
@@ -774,7 +745,6 @@ msgstr "Kontakt"
msgid "Contact FixMyStreet"
msgstr "Kontakt FiksGataMi"
-#: templates/web/bromley/contact/submit.html:1
#: templates/web/default/contact/index.html:1
#: templates/web/default/contact/index.html:2
#: templates/web/default/contact/submit.html:1
@@ -783,20 +753,18 @@ msgstr "Kontakt FiksGataMi"
msgid "Contact Us"
msgstr "Kontakt oss"
-#: templates/web/bromley/contact/submit.html:3
#: templates/web/default/contact/index.html:6
#: templates/web/default/contact/submit.html:3
-#: templates/web/fixmystreet/contact/index.html:19
+#: templates/web/fixmystreet/contact/index.html:22
msgid "Contact the team"
msgstr "Kontakt prosjektgruppen"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1310
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1338
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1319
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1347
msgid "Could not find user"
msgstr "Kunne ikke finne bruker"
#: templates/web/default/js/translation_strings.html:37
-#: templates/web/oxfordshire/js/translation_strings.html:31
msgid "Could not look up location"
msgstr "Klarte ikke finne posisjon"
@@ -851,11 +819,10 @@ msgstr "Gjeldende tilstand"
#: templates/web/default/admin/bodies.html:7
#: templates/web/default/admin/index.html:5
-#, fuzzy
msgid "Currently no bodies have been created."
-msgstr "Ingen problemer er rapportert"
+msgstr ""
-#: templates/web/default/dashboard/index.html:5
+#: templates/web/default/dashboard/index.html:6
#: templates/web/default/dashboard/index.html:7
msgid "Dashboard"
msgstr "Oversikt"
@@ -878,11 +845,8 @@ msgstr "Slettet"
msgid "Description"
msgstr "Beskrivelse"
-#: templates/web/bromley/report/new/fill_in_details_form.html:54
#: templates/web/default/js/translation_strings.html:34
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66
-#: templates/web/oxfordshire/js/translation_strings.html:28
-#: templates/web/seesomething/report/new/fill_in_details_form.html:16
#: templates/web/zurich/report/new/fill_in_details_form.html:42
msgid "Details"
msgstr "Detaljer"
@@ -920,8 +884,10 @@ msgstr "Har du et FiksGataMi-passord?"
msgid "Don&rsquo;t know"
msgstr "Vet ikke"
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:82
+#: templates/web/fixmystreet/contact/index.html:115
+msgid "Don't like forms?"
+msgstr ""
+
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:47
#: templates/web/default/report/update-form.html:30
@@ -952,9 +918,9 @@ msgid "Edit body details"
msgstr "Rediger detaljer for administrasjon"
#: templates/web/default/admin/report_edit.html:1
-#: templates/web/zurich/admin/report_edit-sdm.html:1
+#: templates/web/zurich/admin/report_edit-sdm.html:2
#: templates/web/zurich/admin/report_edit-sdm.html:4
-#: templates/web/zurich/admin/report_edit.html:1
+#: templates/web/zurich/admin/report_edit.html:2
#: templates/web/zurich/admin/report_edit.html:5
msgid "Editing problem %d"
msgstr "Rediger problem %d"
@@ -972,7 +938,6 @@ msgstr "Redigerer bruker %d"
msgid "Editor"
msgstr "Oppdatert av"
-#: templates/web/bromley/report/display.html:128
#: templates/web/default/admin/bodies.html:18
#: templates/web/default/admin/body.html:54
#: templates/web/default/admin/body_edit.html:83
@@ -980,7 +945,6 @@ msgstr "Oppdatert av"
#: templates/web/default/admin/users.html:16
#: templates/web/fixmystreet/auth/general.html:20
#: templates/web/fixmystreet/report/update-form.html:76
-#: templates/web/seesomething/auth/general.html:20
#: templates/web/zurich/admin/body-form.html:9
#: templates/web/zurich/admin/body.html:14
#: templates/web/zurich/auth/general.html:24
@@ -988,16 +952,15 @@ msgstr "Oppdatert av"
msgid "Email"
msgstr "E-post"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1286
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1295
msgid "Email added to abuse list"
msgstr "Epost lagt til misbruksliste"
#: templates/web/default/admin/body.html:126
-#, fuzzy
msgid "Email address:"
-msgstr "Din e-postadresse:"
+msgstr "E-postadresse:"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1283
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1292
msgid "Email already in abuse list"
msgstr "Epost allerede i misbrukslisten"
@@ -1021,7 +984,7 @@ msgstr "Send meg oppdateringer"
msgid "Email:"
msgstr "E-post:"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:318
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:323
msgid "Email: %s"
msgstr "E-post: %s"
@@ -1067,15 +1030,14 @@ msgid ""
msgstr ""
#: templates/web/default/admin/stats.html:70
-#, fuzzy
msgid "End Date:"
-msgstr "Slutt-dag:"
+msgstr "Slutt-dato:"
#: templates/web/default/admin/body-form.html:126
msgid "Endpoint"
msgstr "Endepunkt"
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:71
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:72
msgid "Enter a Z&uuml;rich street name"
msgstr "Skriv inn et veinavn i Z&uuml;rich"
@@ -1084,26 +1046,26 @@ msgid "Enter a nearby UK postcode, or street name and area"
msgstr "Skriv inn et britisk postnummer i nærheten, eller veinavn og sted"
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:25
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:37
msgid "Enter a nearby postcode, or street name and area"
msgstr "Skriv inn postnummer i nærheten, eller veinavn og sted"
-#: templates/web/default/around/postcode_form.html:1
#: templates/web/default/around/postcode_form.html:2
-#: templates/web/fixmystreet/around/postcode_form.html:10
#: templates/web/fixmystreet/around/postcode_form.html:11
-#: templates/web/seesomething/around/postcode_form.html:3
-#: templates/web/seesomething/around/postcode_form.html:4
msgid "Enter a nearby street name and area"
msgstr "Skriv inn et veinavn og sted"
+#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:9
+#, fuzzy
+msgid "Enter a nearby street name and area, postal code or district in Delhi"
+msgstr "Skriv inn et veinavn og sted"
+
#: templates/web/default/auth/general.html:64
#: templates/web/default/report/new/fill_in_details_form.html:169
#: templates/web/default/report/update-form.html:124
msgid "Enter a new password:"
msgstr "Skriv inn et nytt passord:"
-#: templates/web/bromley/report/display.html:150
-#: templates/web/bromley/report/new/fill_in_details_form.html:189
#: templates/web/fixmystreet/auth/general.html:61
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:211
#: templates/web/fixmystreet/report/update-form.html:122
@@ -1138,7 +1100,6 @@ msgstr "Eksempler:"
msgid "Extra data:"
msgstr "Ekstra data:"
-#: templates/web/bromley/contact/submit.html:14
#: templates/web/default/contact/submit.html:15
msgid "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>."
msgstr "Klarte ikke å sende melding. Vennligst prøv igjen senere eller <a href=\"mailto:%s\">send oss en e-post</a>."
@@ -1152,12 +1113,6 @@ msgstr "Filtrer rapportliste"
msgid "Find latest local and national news"
msgstr "Finn nyeste lokale og nasjonale nyheter"
-#: templates/web/bromley/report/display.html:191
-#: templates/web/bromley/report/new/fill_in_details_form.html:113
-#: templates/web/bromley/report/new/fill_in_details_form.html:160
-msgid "First Name"
-msgstr "Fornavn"
-
#: templates/web/default/questionnaire/index.html:79
#: templates/web/fixmystreet/questionnaire/index.html:73
msgid "First time"
@@ -1200,8 +1155,6 @@ msgid ""
"for the county council."
msgstr "FiksGataMi sender forskjellige kategorier problemer til forskjellige administrasjoner, problemer som gjelder flere administrasjoner blir sendt til alle de det gjelder."
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:84
#: templates/web/default/admin/index.html:44
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:41
@@ -1226,7 +1179,7 @@ msgstr "Løst - Administrasjon"
msgid "Fixed - User"
msgstr "Løst - Bruker"
-#: templates/web/default/my/my.html:27 templates/web/fixmystreet/my/my.html:31
+#: templates/web/default/my/my.html:32 templates/web/fixmystreet/my/my.html:38
msgid "Fixed reports"
msgstr "Fiksede rapporter"
@@ -1237,13 +1190,13 @@ msgstr "Løst:"
#: templates/web/default/admin/body-form.html:84
#: templates/web/zurich/admin/body-form.html:36
msgid "Flag as deleted"
-msgstr ""
+msgstr "Merk som slettet"
#: templates/web/default/admin/report_blocks.html:16
msgid "Flag user"
msgstr "Flag bruker"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1181
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1190
#: templates/web/default/admin/users.html:19
msgid "Flagged"
msgstr "Flagget:"
@@ -1288,11 +1241,9 @@ msgstr "Glemt passordet ditt?"
#: templates/web/emptyhomes/faq/faq-en-gb.html:1
#: templates/web/fiksgatami/faq/faq-nb.html:1
#: templates/web/fiksgatami/nn/faq/faq-nn.html:1
-#: templates/web/fixmindelo/faq/faq-pt-cv.html:1
#: templates/web/fixmybarangay/faq/faq-en-gb.html:1
#: templates/web/fixmystreet/faq/faq-en-gb.html:1
#: templates/web/fixmystreet/static/privacy.html:1
-#: templates/web/oxfordshire/faq/faq-en-gb.html:1
msgid "Frequently Asked Questions"
msgstr "Ofte spurte spørsmål"
@@ -1300,19 +1251,18 @@ msgstr "Ofte spurte spørsmål"
msgid "GeoRSS on Google Maps"
msgstr "GeoRSS på Google Maps"
-#: templates/web/bromley/report/display.html:30
#: templates/web/fixmystreet/around/_updates.html:3
#: templates/web/fixmystreet/report/display.html:38
msgid "Get updates"
msgstr "Få oppdateringer"
-#: templates/web/fixmystreet/reports/_rss.html:3
+#: templates/web/fixmystreet/reports/_rss.html:4
#: templates/web/fixmystreet/reports/_rss.html:9
msgid "Get updates of %s problems"
msgstr "Få oppdateringer for problemer i denne %s"
#: templates/web/fixmystreet/reports/_rss.html:11
-#: templates/web/fixmystreet/reports/_rss.html:3
+#: templates/web/fixmystreet/reports/_rss.html:4
msgid "Get updates of problems in this %s"
msgstr "Få oppdateringer for problemer i denne %s"
@@ -1325,7 +1275,6 @@ msgstr "Gi meg en RSS-strøm"
#: templates/web/default/alert/index.html:34
#: templates/web/default/around/postcode_form.html:8
#: templates/web/fixmystreet/around/postcode_form.html:21
-#: templates/web/seesomething/around/postcode_form.html:10
#: templates/web/zurich/admin/stats.html:26
msgid "Go"
msgstr "Fortsett"
@@ -1352,19 +1301,12 @@ msgstr "Har dette problemet blitt løst?"
msgid "Have you ever reported a problem to a council before, or is this your first time?"
msgstr "Har du rapportert et problem til en administrasjon før, eller er dette første gangen?"
-#: templates/web/barnet/footer.html:24 templates/web/bromley/footer.html:25
-#: templates/web/bromley/header.html:81 templates/web/default/footer.html:15
+#: templates/web/default/footer.html:15
#: templates/web/emptyhomes/header.html:33
#: templates/web/fiksgatami/footer.html:9
#: templates/web/fiksgatami/nn/footer.html:9
-#: templates/web/fixmindelo/footer.html:45
#: templates/web/fixmybarangay/footer.html:24
-#: templates/web/fixmystreet/footer.html:52
-#: templates/web/oxfordshire/footer.html:27
-#: templates/web/oxfordshire/header.html:75
-#: templates/web/reading/footer.html:10
-#: templates/web/seesomething/footer.html:13
-#: templates/web/stevenage/footer.html:47
+#: templates/web/fixmystreet/footer.html:55
#: templates/web/zurich/faq/faq-de-ch.html:1
#: templates/web/zurich/footer.html:21
#: templates/web/zurich/nav_over_content.html:8
@@ -1376,13 +1318,9 @@ msgstr "Hjelp"
msgid "Here are the types of local problem alerts for &lsquo;%s&rsquo;."
msgstr "Her er de forskjellige typene lokale problemvarsler for &lsquo;%s&rsquo;."
-#: templates/web/barnet/header.html:70 templates/web/bromley/header.html:64
-#: templates/web/bromley/header.html:99
#: templates/web/fixmybarangay/header.html:66
-#: templates/web/fixmystreet/header.html:50
-#: templates/web/oxfordshire/header.html:111
-#: templates/web/oxfordshire/header.html:47
-#: templates/web/stevenage/header.html:97 templates/web/zurich/footer.html:11
+#: templates/web/fixmystreet/header.html:53
+#: templates/web/zurich/footer.html:11
msgid "Hi %s"
msgstr "Hei, %s"
@@ -1390,8 +1328,8 @@ msgstr "Hei, %s"
#: templates/web/default/admin/report_edit.html:50
#: templates/web/default/admin/report_edit.html:51
#: templates/web/default/admin/update_edit.html:28
-#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:11
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/report_edit.html:89
#: templates/web/zurich/admin/report_edit.html:93
#: templates/web/zurich/admin/stats.html:32
@@ -1412,7 +1350,6 @@ msgid "History"
msgstr "Historie"
#: templates/web/default/js/translation_strings.html:31
-#: templates/web/oxfordshire/js/translation_strings.html:25
msgid "Home"
msgstr "Hjem"
@@ -1421,7 +1358,6 @@ msgid "How to report a problem"
msgstr "Hvordan rapportere et problem"
#: templates/web/default/js/translation_strings.html:33
-#: templates/web/oxfordshire/js/translation_strings.html:27
msgid "How to send successful reports"
msgstr "Hvordan sende inn rapporter som løses"
@@ -1437,7 +1373,7 @@ msgstr "Jeg er redd vi ikke klarte å finne ditt problem i databasen.\n"
msgid "I'm afraid we couldn't validate that token, as the report was made too long ago."
msgstr "Jeg er redd vi ikke kunne verifisere den referansen, da det er for lenge siden rapporten ble laget."
-#: perllib/FixMyStreet/App/Controller/Tokens.pm:259
+#: perllib/FixMyStreet/App/Controller/Tokens.pm:260
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 webadressen fra en e-post, sjekk at du har kopiert den korrekt.\n"
@@ -1477,7 +1413,6 @@ msgstr "Hvis du ikke gjør dette vil ikke din rapport bli publisert"
msgid "If you do not, your update will not be posted."
msgstr "Hvis du ikke gjør dette vil ikke din oppdatering bli publisert"
-#: templates/web/default/report/new/councils_text_none.html:8
#: templates/web/default/report/new/councils_text_none.html:9
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 emne og detaljer for problemet være offentlig, men problemet vil <strong>ikke</strong> bli rapportert til administrasjonen."
@@ -1529,7 +1464,7 @@ msgid ""
" when they are shown on the site. Enter the ID (number) of that user."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Contact.pm:111
+#: perllib/FixMyStreet/App/Controller/Contact.pm:116
msgid "Illegal ID"
msgstr "Ugyldig ID"
@@ -1537,8 +1472,6 @@ msgstr "Ugyldig ID"
msgid "Illegal feed selection"
msgstr "Ugyldig valg av feed"
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:82
#: templates/web/default/dashboard/index.html:142
#: templates/web/default/dashboard/index.html:144
#: templates/web/default/report/update-form.html:30
@@ -1549,29 +1482,24 @@ msgid "In Progress"
msgstr "Under arbeid"
#: templates/web/default/admin/flagged.html:39
-#, fuzzy
msgid "In abuse table?"
-msgstr "(Epost i misbrukstabellen)"
+msgstr ""
#: templates/web/default/open311/index.html:90
msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
msgstr "I tillegg er følgende attributter som ikke er del av Open311 v2-spesifikasjonen returnert: agency_sent_datetime, title (også returnert som del av description), interface_used, comment_count, requestor_name (kun tilstede hvis innsender tillot at navnet kunne vises på dette nettstedet)."
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:121
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:143
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:38
#: templates/web/fixmystreet/report/banner.html:19
-#: templates/web/zurich/admin/header.html:1
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/header.html:8
#: templates/web/zurich/admin/report_edit.html:102
#: templates/web/zurich/report/banner.html:15
msgid "In progress"
msgstr "Under arbeid"
-#: templates/web/seesomething/report/new/fill_in_details_form.html:38
-msgid "Incident Category"
-msgstr "Hendelseskategori"
-
#: templates/web/zurich/admin/report_edit.html:163
msgid "Include reporter personal details"
msgstr "Inkluder rapporørens personlige detaljer"
@@ -1585,9 +1513,8 @@ msgid "Incorrect has_photo value \"%s\""
msgstr "Feil has_photo-verdi \"%s\""
#: templates/web/zurich/admin/list_updates.html:3
-#, fuzzy
msgid "Internal notes"
-msgstr "Interne notater:"
+msgstr ""
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:48
@@ -1598,7 +1525,7 @@ msgstr ""
msgid "Invalid agency_responsible value %s"
msgstr "Ugyldig agency_responsible-verdi %s"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1096
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1105
msgid "Invalid end date"
msgstr "Ugyldig slutt-dato"
@@ -1606,12 +1533,10 @@ msgstr "Ugyldig slutt-dato"
msgid "Invalid format %s specified."
msgstr "Ugyldig format %s oppgitt."
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1092
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1101
msgid "Invalid start date"
msgstr "Ugyldig startdato"
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:81
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:37
#: templates/web/default/dashboard/index.html:142
@@ -1623,30 +1548,25 @@ msgstr "Ugyldig startdato"
msgid "Investigating"
msgstr "Undersøkes"
-#: templates/web/emptyhomes/tokens/confirm_problem.html:12
+#: templates/web/emptyhomes/tokens/confirm_problem.html:13
#: templates/web/emptyhomes/tokens/confirm_problem.html:14
msgid "It is worth noting however that the process can sometimes be slow, especially if the property is in very poor repair or the owner is unwilling to act. In most cases it can take six months or more before you can expect to see anything change and sometimes there may be considerable barries to a property being brought back into use. This doesn&rsquo;t mean the council isn&rsquo;t doing anything. We encourage councils to update the website so you can see what is happening. It may be a long process, but you reporting your concerns about this property to the council is a valuable first step."
msgstr "Det er verdt å merke seg imidlertid at prosessen kan være treg, spesielt hvis eiendommen er i svært dårlig reparasjon eller eieren ikke er villig til å handle. I de fleste tilfeller kan det ta seks måneder eller mer før du kan forvente å se noe endring og noen ganger kan det være betydelige hindre før en eiendom blir brakt tilbake i bruk. Dette betyr ikke at kommunen ikke gjør noe. Vi oppfordrer kommunene til å oppdatere nettsiden slik at du kan se hva som skjer. Det kan være en lang prosess, men det at du rapportere dine bekymringer om denne eiendommen til rådet er en verdifull første skritt."
-#: templates/web/bromley/report/display.html:168
-#: templates/web/bromley/report/new/fill_in_details_form.html:209
+#: templates/web/fixmystreet/contact/blurb.html:8
+msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there."
+msgstr ""
+
#: templates/web/default/auth/general.html:44
#: templates/web/default/report/new/fill_in_details_form.html:149
#: templates/web/default/report/update-form.html:104
#: templates/web/fixmystreet/auth/general.html:46
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:172
#: templates/web/fixmystreet/report/update-form.html:100
-#: templates/web/seesomething/auth/general.html:35
#: templates/web/zurich/auth/general.html:40
msgid "Keep me signed in on this computer"
msgstr "Husk min innlogging på denne datamaskinen"
-#: templates/web/bromley/report/display.html:197
-#: templates/web/bromley/report/new/fill_in_details_form.html:119
-#: templates/web/bromley/report/new/fill_in_details_form.html:166
-msgid "Last Name"
-msgstr "Etternavn"
-
#: templates/web/default/admin/body.html:58
#: templates/web/zurich/admin/body.html:15
msgid "Last editor"
@@ -1669,11 +1589,9 @@ msgstr ""
msgid "List all reported problems"
msgstr "List alle rapporterte problemer"
-#: templates/web/bromley/report/new/fill_in_details_form.html:69
#: templates/web/default/report/new/fill_in_details_form.html:68
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:51
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:75
-#: templates/web/seesomething/report/new/fill_in_details_form.html:25
#: templates/web/zurich/report/new/fill_in_details_form.html:51
msgid "Loading..."
msgstr "Laster..."
@@ -1682,7 +1600,7 @@ msgstr "Laster..."
#: templates/web/default/alert/choose.html:3
#: templates/web/default/alert/index.html:1
#: templates/web/default/alert/index.html:3
-#: templates/web/default/alert/list.html:1
+#: templates/web/default/alert/list.html:2
#: templates/web/default/alert/list.html:5
#: templates/web/default/alert/updates.html:1
#: templates/web/default/tokens/confirm_alert.html:1
@@ -1695,23 +1613,17 @@ msgstr "Laster..."
msgid "Local RSS feeds and email alerts"
msgstr "Lokal RSS-strøm og e-postvarsel"
-#: templates/web/default/alert/list.html:1
-#: templates/web/default/alert/list.html:12
+#: templates/web/default/alert/list.html:13
#: templates/web/default/alert/list.html:14
+#: templates/web/default/alert/list.html:2
#: templates/web/default/alert/list.html:3
msgid "Local RSS feeds and email alerts for ‘%s’"
msgstr "Lokal RSS-strøm og e-postvarsel for ‘%s’"
-#: templates/web/barnet/footer.html:22 templates/web/bromley/footer.html:23
-#: templates/web/bromley/header.html:79 templates/web/default/footer.html:13
-#: templates/web/fiksgatami/footer.html:8
+#: templates/web/default/footer.html:13 templates/web/fiksgatami/footer.html:8
#: templates/web/fiksgatami/nn/footer.html:8
-#: templates/web/fixmindelo/footer.html:43
#: templates/web/fixmybarangay/footer.html:22
-#: templates/web/fixmystreet/footer.html:50
-#: templates/web/oxfordshire/footer.html:25
-#: templates/web/oxfordshire/header.html:71
-#: templates/web/reading/footer.html:9 templates/web/stevenage/footer.html:45
+#: templates/web/fixmystreet/footer.html:53
msgid "Local alerts"
msgstr "Lokale varsler"
@@ -1720,7 +1632,6 @@ msgid "Locate the problem on a map of the area"
msgstr "Lokaliser problemet på kartet over området"
#: templates/web/default/js/translation_strings.html:43
-#: templates/web/oxfordshire/js/translation_strings.html:37
msgid "MAP"
msgstr "KART"
@@ -1732,11 +1643,11 @@ msgstr "Kart &copy; <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\">Op
msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
msgstr ""
-#: templates/web/fixmystreet/contact/index.html:98
+#: templates/web/fixmystreet/contact/index.html:103
msgid "Message"
msgstr "Melding"
-#: templates/web/default/contact/index.html:90
+#: templates/web/default/contact/index.html:92
msgid "Message:"
msgstr "Melding:"
@@ -1778,10 +1689,6 @@ msgstr "Flere problemer i nærheten"
msgid "Name"
msgstr "Navn"
-#: templates/web/seesomething/report/new/fill_in_details_form.html:74
-msgid "Name (optional)"
-msgstr "Navn (valgfritt)"
-
#: templates/web/default/admin/report_edit.html:66
#: templates/web/default/admin/update_edit.html:32
#: templates/web/default/admin/user-form.html:18
@@ -1791,30 +1698,30 @@ msgstr "Navn (valgfritt)"
msgid "Name:"
msgstr "Navn:"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:317
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:322
msgid "Name: %s"
msgstr "Navn: %s"
#: templates/web/fiksgatami/footer.html:3
#: templates/web/fiksgatami/nn/footer.html:3
-#: templates/web/reading/footer.html:4
msgid "Navigation"
msgstr "Navigasjon"
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:188
#: perllib/FixMyStreet/Geocode/OSM.pm:166
msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
msgstr "Nærmeste navngitte vei til nålen plassert på kartet (automatisk generert ved hjelp av OpenStreetMap): %s%s"
-#: perllib/FixMyStreet/Cobrand/UK.pm:148
+#: perllib/FixMyStreet/Cobrand/UK.pm:142
msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
msgstr "Nærmeste postnummer til nålen plassert på kartet (automatisk generert): %s (%sm unna)"
-#: perllib/FixMyStreet/Cobrand/Default.pm:418
-#: perllib/FixMyStreet/Cobrand/Default.pm:458
+#: perllib/FixMyStreet/Cobrand/Default.pm:421
+#: perllib/FixMyStreet/Cobrand/Default.pm:461
msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
msgstr "Nærmeste vei til nålen plassert på kartet (automatisk generert ved hjelp av Bing Maps): %s"
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:273
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:297
msgid ""
"Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
"\n"
@@ -1841,9 +1748,8 @@ msgstr "Ny kategorikontakt lagt til"
#: templates/web/zurich/admin/report_edit-sdm.html:58
#: templates/web/zurich/admin/report_edit.html:84
-#, fuzzy
msgid "New internal note:"
-msgstr "Interne notater:"
+msgstr ""
#: db/alert_types.pl:18 db/alert_types.pl:22
msgid "New local problems on FixMyStreet"
@@ -1957,14 +1863,12 @@ msgid "No edits have yet been made."
msgstr "Ingenting endringer har blitt gjort."
#: templates/web/default/admin/flagged.html:25
-#, fuzzy
msgid "No flagged problems found."
-msgstr "Ingen flaggede problemer ble funnet"
+msgstr ""
#: templates/web/default/admin/flagged.html:58
-#, fuzzy
msgid "No flagged users found."
-msgstr "Ingen flaggede brukere ble funnet"
+msgstr ""
#: templates/web/zurich/admin/report_edit-sdm.html:68
msgid "No further updates"
@@ -1981,7 +1885,6 @@ msgid "No problems have been reported yet."
msgstr "Ingen problemer er rapportert"
#: templates/web/default/js/translation_strings.html:38
-#: templates/web/oxfordshire/js/translation_strings.html:32
msgid "No result returned"
msgstr "Ingen resultater returnert"
@@ -1992,7 +1895,7 @@ msgid ""
" your config file is not pointing to a live MapIt service."
msgstr ""
-#: templates/web/default/report/_support.html:2
+#: templates/web/default/report/_support.html:3
#: templates/web/default/report/_support.html:4
msgid "No supporters"
msgstr "Ingen støttespillere"
@@ -2016,8 +1919,6 @@ msgid ""
" activity across their body), the ability to hide reports or set special report statuses."
msgstr ""
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:83
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:46
#: templates/web/default/report/update-form.html:30
@@ -2076,7 +1977,6 @@ msgid "Now to submit your update&hellip; do you have a FixMyStreet password?"
msgstr "På tide å registrere din oppdatering&hellip; har du et FiksGataMi-passord?"
#: templates/web/default/js/translation_strings.html:42
-#: templates/web/oxfordshire/js/translation_strings.html:36
msgid "OK"
msgstr "OK"
@@ -2120,8 +2020,7 @@ msgstr "Eldre løste"
msgid "Older problems"
msgstr "Eldre problemer"
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:115
-#: templates/web/bromley/report/display.html:80
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:137
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:36
#: templates/web/default/admin/report_edit.html:37
@@ -2129,7 +2028,7 @@ msgstr "Eldre problemer"
#: templates/web/default/dashboard/index.html:142
#: templates/web/default/report/update-form.html:30
#: templates/web/fixmystreet/report/update-form.html:28
-#: templates/web/zurich/admin/header.html:1
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/header.html:7
#: templates/web/zurich/admin/report_edit.html:89
#: templates/web/zurich/admin/report_edit.html:91
@@ -2138,7 +2037,7 @@ msgstr "Eldre problemer"
msgid "Open"
msgstr "Åpen"
-#: templates/web/default/my/my.html:22 templates/web/fixmystreet/my/my.html:26
+#: templates/web/default/my/my.html:27 templates/web/fixmystreet/my/my.html:33
msgid "Open reports"
msgstr "Åpne rapporter"
@@ -2164,15 +2063,15 @@ msgstr "Eller problemer meldt til:"
msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
msgstr "Eller du kan abonnere på varsel basert på bydel eller administrasjon du hører inn under:"
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1053
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:664
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:665
-#: perllib/FixMyStreet/DB/Result/Problem.pm:544
-#: perllib/FixMyStreet/DB/Result/Problem.pm:554
-#: perllib/FixMyStreet/DB/Result/Problem.pm:564
-#: perllib/FixMyStreet/DB/Result/Problem.pm:576
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:361
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1057
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:662
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:663
+#: perllib/FixMyStreet/DB/Result/Problem.pm:546
+#: perllib/FixMyStreet/DB/Result/Problem.pm:556
+#: perllib/FixMyStreet/DB/Result/Problem.pm:566
+#: perllib/FixMyStreet/DB/Result/Problem.pm:578
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:369
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:384
msgid "Other"
msgstr "Annet"
@@ -2199,8 +2098,6 @@ msgstr "Forelder"
msgid "Partial"
msgstr "Delvis"
-#: templates/web/bromley/report/display.html:147
-#: templates/web/bromley/report/new/fill_in_details_form.html:186
#: templates/web/fixmystreet/auth/general.html:59
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:208
#: templates/web/fixmystreet/report/update-form.html:119
@@ -2218,19 +2115,15 @@ msgid "Permalink"
msgstr ""
#: templates/web/zurich/report/new/fill_in_details_form.html:106
-#, fuzzy
msgid "Phone number"
-msgstr "Ditt telefonnummer"
+msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:136
-#: templates/web/bromley/report/new/fill_in_details_form.html:183
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:138
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:205
-#: templates/web/seesomething/report/new/fill_in_details_form.html:89
msgid "Phone number (optional)"
msgstr "Telefonnummer (valgfritt)"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:282
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:287
#: templates/web/default/admin/report_edit.html:68
#: templates/web/default/report/new/fill_in_details_form.html:215
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:138
@@ -2240,11 +2133,8 @@ msgstr "Telefonnummer (valgfritt)"
msgid "Phone:"
msgstr "Telefon:"
-#: templates/web/bromley/report/display.html:111
-#: templates/web/bromley/report/new/fill_in_details_form.html:104
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:92
#: templates/web/fixmystreet/report/update-form.html:59
-#: templates/web/seesomething/report/new/fill_in_details_form.html:52
#: templates/web/zurich/admin/index-dm.html:29
#: templates/web/zurich/admin/index-sdm.html:24
#: templates/web/zurich/admin/reports.html:16
@@ -2266,7 +2156,6 @@ msgid "Photos of recent nearby reports"
msgstr "Bilder av nye problemer i nærheten"
#: templates/web/default/js/translation_strings.html:30
-#: templates/web/oxfordshire/js/translation_strings.html:24
msgid "Place pin on map"
msgstr "Plasser tegnestiften på kartet"
@@ -2274,7 +2163,7 @@ msgstr "Plasser tegnestiften på kartet"
#: templates/web/default/admin/report_edit.html:38
#: templates/web/default/dashboard/index.html:142
#: templates/web/default/dashboard/index.html:143
-#: templates/web/zurich/admin/header.html:1
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/header.html:9
#: templates/web/zurich/admin/index-dm.html:9
#: templates/web/zurich/admin/report_edit.html:89
@@ -2288,7 +2177,6 @@ msgstr "Vennligst <a class=\"tab_link\" href=\"#report\">se over</a> oppdatering
#: templates/web/default/report/new/notes.html:6
#: templates/web/fixmystreet/report/new/notes.html:6
-#: templates/web/oxfordshire/report/new/notes.html:5
msgid "Please be polite, concise and to the point."
msgstr "Vær høflig, poengtert og kortfattet."
@@ -2305,20 +2193,16 @@ msgstr "Vennligst sjekk e-posten du oppgav"
#: templates/web/default/auth/general.html:8
#: templates/web/fixmystreet/auth/general.html:15
#: templates/web/fixmystreet/auth/general.html:9
-#: templates/web/seesomething/auth/general.html:15
-#: templates/web/seesomething/auth/general.html:9
#: templates/web/zurich/auth/general.html:3
#: templates/web/zurich/auth/general.html:9
msgid "Please check your email address is correct"
msgstr "Vennligst sjekk at du har skrevet en gyldig e-postadresse"
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:848
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:855
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:874
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:917
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:859
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:878
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:921
#: perllib/FixMyStreet/DB/Result/Problem.pm:381
#: templates/web/default/js/translation_strings.html:9
-#: templates/web/oxfordshire/js/translation_strings.html:9
msgid "Please choose a category"
msgstr "Velg en kategori"
@@ -2326,19 +2210,8 @@ msgstr "Velg en kategori"
msgid "Please choose a property type"
msgstr "Velg en type egenskap"
-#: templates/web/seesomething/js/translation_strings.html:6
-msgid "Please choose a transport category"
-msgstr "Vennligst velg en transportkategori"
-
-#: templates/web/seesomething/js/translation_strings.html:7
-msgid "Please choose an incident category"
-msgstr "Vennligst velg en hendelseskategori"
-
-#: templates/web/bromley/report/new/fill_in_details_form.html:64
-msgid "Please describe the exact location of the report. Example: “2 dumped mattresses outside Number 19 Stockwell Close”"
-msgstr "Vennligst beskriv den nøyaktige posisjonen til problemet. For eksempel: «2 madrasser dumpet utenfor Jernbanegata 19»"
-
#: templates/web/default/contact/blurb.html:2
+#: templates/web/fixmystreet/contact/blurb.html:12
msgid ""
"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"
@@ -2350,7 +2223,6 @@ msgstr ""
#: templates/web/default/report/new/notes.html:7
#: templates/web/fixmystreet/report/new/notes.html:7
-#: templates/web/oxfordshire/report/new/notes.html:6
msgid "Please do not be abusive&nbsp;&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."
@@ -2360,7 +2232,6 @@ msgstr "Vennligst ikke skriv inn adresser eller personlig informasjon her,"
#: perllib/FixMyStreet/DB/Result/Comment.pm:126
#: templates/web/default/js/translation_strings.html:2
-#: templates/web/oxfordshire/js/translation_strings.html:2
msgid "Please enter a message"
msgstr "Vennligst legg til en melding"
@@ -2373,19 +2244,14 @@ msgstr "Skriv inn et passord"
#: perllib/FixMyStreet/App/Controller/Contact.pm:97
#: perllib/FixMyStreet/DB/Result/Problem.pm:356
#: templates/web/default/js/translation_strings.html:3
-#: templates/web/oxfordshire/js/translation_strings.html:3
msgid "Please enter a subject"
msgstr "Vennligst legg inn et emne"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1032
-#: perllib/FixMyStreet/App/Controller/Admin.pm:979
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1041
+#: perllib/FixMyStreet/App/Controller/Admin.pm:988
#: perllib/FixMyStreet/DB/Result/User.pm:115
#: templates/web/default/js/translation_strings.html:12
#: templates/web/default/js/translation_strings.html:16
-#: templates/web/oxfordshire/js/translation_strings.html:12
-#: templates/web/oxfordshire/js/translation_strings.html:16
-#: templates/web/seesomething/js/translation_strings.html:10
-#: templates/web/seesomething/js/translation_strings.html:13
msgid "Please enter a valid email"
msgstr "Legg til en gyldig e-post"
@@ -2396,8 +2262,6 @@ msgstr "Legg inn din e-post"
#: perllib/FixMyStreet/DB/Result/Problem.pm:359
#: templates/web/default/js/translation_strings.html:4
-#: templates/web/oxfordshire/js/translation_strings.html:4
-#: templates/web/seesomething/js/translation_strings.html:2
msgid "Please enter some details"
msgstr "Legg inn opplysninger om problemet"
@@ -2409,32 +2273,22 @@ msgstr "Legg inn opplysninger om problemet"
#: templates/web/default/js/translation_strings.html:15
#: templates/web/fixmystreet/auth/general.html:14
#: templates/web/fixmystreet/auth/general.html:9
-#: templates/web/oxfordshire/js/translation_strings.html:11
-#: templates/web/oxfordshire/js/translation_strings.html:15
-#: templates/web/seesomething/auth/general.html:14
-#: templates/web/seesomething/auth/general.html:9
-#: templates/web/seesomething/js/translation_strings.html:9
#: templates/web/zurich/auth/general.html:3
#: templates/web/zurich/auth/general.html:8
msgid "Please enter your email"
msgstr "Legg inn din e-post"
-#: templates/web/bromley/report/new/fill_in_details_form.html:149
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:151
-#: templates/web/seesomething/report/new/fill_in_details_form.html:85
#: templates/web/zurich/report/new/fill_in_details_form.html:92
msgid "Please enter your email address"
msgstr "Vennligst tast inn din e-postadresse"
#: templates/web/default/js/translation_strings.html:25
-#: templates/web/oxfordshire/js/translation_strings.html:19
msgid "Please enter your first name"
msgstr "Vennligst tast inn ditt fornavn"
#: perllib/FixMyStreet/DB/Result/Problem.pm:374
#: templates/web/default/js/translation_strings.html:7
-#: templates/web/oxfordshire/js/translation_strings.html:7
-#: templates/web/seesomething/js/translation_strings.html:4
msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
msgstr "Vennligst legg inn ditt fulle navn, administrasjoner som mottar ditt problem trenger dette - hvis du ikke ønsker at ditt navn skal vises, fjern haken under"
@@ -2443,22 +2297,18 @@ msgstr "Vennligst legg inn ditt fulle navn, administrasjoner som mottar ditt pro
#: perllib/FixMyStreet/DB/Result/Problem.pm:367
#: perllib/FixMyStreet/DB/Result/User.pm:108
#: templates/web/default/js/translation_strings.html:6
-#: templates/web/oxfordshire/js/translation_strings.html:6
msgid "Please enter your name"
msgstr "Legg inn ditt navn"
#: templates/web/default/js/translation_strings.html:22
-#, fuzzy
msgid "Please enter your phone number"
-msgstr "Vennligst tast inn ditt mellomnavn"
+msgstr ""
#: templates/web/default/js/translation_strings.html:26
-#: templates/web/oxfordshire/js/translation_strings.html:20
msgid "Please enter your second name"
msgstr "Vennligst tast inn ditt mellomnavn"
#: templates/web/default/js/translation_strings.html:24
-#: templates/web/oxfordshire/js/translation_strings.html:18
msgid "Please enter your title"
msgstr "Vennligst legg inn din tittel"
@@ -2483,16 +2333,16 @@ msgstr ""
"og rett på sak, skriver du meldingen i bare store bokstaver blir den vanskelig\n"
"å lese, det samme gjør manglende tegnsetting."
-#: templates/web/default/report/new/fill_in_details_text.html:1
#: templates/web/default/report/new/fill_in_details_text.html:11
-#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1
+#: templates/web/default/report/new/fill_in_details_text.html:2
#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:10
-#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:2
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:2
#: templates/web/fixmystreet/report/new/fill_in_details_text.html:8
msgid "Please fill in details of the problem below."
msgstr "Vennligst fyll ut detaljer om problemet under"
-#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:2
#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:3
msgid ""
"Please fill in details of the problem below. Leave as much detail as you can, \n"
@@ -2502,7 +2352,7 @@ msgstr ""
"Vennligst fyll inn detaljene om problemet under. Legg inn så mange detaljer som du kan, og om mulig beskriv eksakt plassering for problemet (f.eks. på en vegg), hva det er, hvor lenge det har\n"
"vært der, osv."
-#: templates/web/default/report/new/fill_in_details_text.html:1
+#: templates/web/default/report/new/fill_in_details_text.html:2
#: templates/web/default/report/new/fill_in_details_text.html:3
msgid ""
"Please fill in details of the problem below. The council won't be able\n"
@@ -2516,12 +2366,10 @@ msgstr ""
"vært der, en beskrivelse (og et bilde av problemet hvis du har et), osv."
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:70
-#: templates/web/seesomething/report/new/fill_in_details_form.html:20
#: templates/web/zurich/report/new/fill_in_details_form.html:46
msgid "Please fill in details of the problem."
msgstr "Vennligst fyll ut detaljer om problemet."
-#: templates/web/bromley/report/new/fill_in_details_form.html:28
#: templates/web/default/report/new/fill_in_details_form.html:27
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:26
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:35
@@ -2535,7 +2383,7 @@ msgstr ""
msgid "Please indicate whether you'd like to receive another questionnaire"
msgstr "Vennligst indiker om du ønsker å motta et nytt spørreskjema"
-#: templates/web/fixmystreet/report/updates-sidebar-notes.html:3
+#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4
msgid "Please note that updates are not sent to the council."
msgstr "Vær oppmerksom på at oppdaterginger ikke blir videresendt til administrasjonen."
@@ -2543,11 +2391,6 @@ msgstr "Vær oppmerksom på at oppdaterginger ikke blir videresendt til administ
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 administrasjonen. 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>"
-#: templates/web/barnet/report/updates-sidebar-notes.html:1
-msgid "Please note that updates are not sent to the relevant department. 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 vil bli sendt til administrasjonen. Dersom du legger igjen navnet ditt vil det være synlig for alle. Din informasjon vil kun bli brukt i henhold til våre <a href=\"/faq#privacy\">personvernsregler</a>"
-
-#: templates/web/bromley/report/new/fill_in_details_form.html:23
#: templates/web/default/report/new/fill_in_details_form.html:5
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:5
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:26
@@ -2558,7 +2401,6 @@ msgstr "Merk at din rapport <strong>ennå ikke er sendt</strong. Velg en katego
#: templates/web/default/report/new/notes.html:1
#: templates/web/fixmybarangay/report/new/notes.html:1
#: templates/web/fixmystreet/report/new/notes.html:1
-#: templates/web/oxfordshire/report/new/notes.html:1
msgid "Please note:"
msgstr "Vennligst merk deg:"
@@ -2603,19 +2445,15 @@ msgstr "Vennligst last opp kun JPEG eller JPG-bilder\n"
msgid "Please write a message"
msgstr "Skriv inn en melding"
-#: templates/web/bromley/report/display.html:70
#: templates/web/fixmystreet/report/update-form.html:23
msgid "Please write your update here"
msgstr "Vennligst skriv inn din oppdatering her"
-#: templates/web/bromley/report/display.html:123
-#: templates/web/bromley/report/display.html:151
-#: templates/web/bromley/report/display.html:163
-#: templates/web/default/contact/index.html:93
+#: templates/web/default/contact/index.html:95
#: templates/web/default/report/update-form.html:109
#: templates/web/default/report/update-form.html:131
#: templates/web/default/report/update-form.html:72
-#: templates/web/fixmystreet/contact/index.html:105
+#: templates/web/fixmystreet/contact/index.html:110
#: templates/web/fixmystreet/report/update-form.html:123
#: templates/web/fixmystreet/report/update-form.html:71
#: templates/web/fixmystreet/report/update-form.html:95
@@ -2648,7 +2486,7 @@ msgstr "Privat"
msgid "Private information (not shown on site)"
msgstr "Privat informasjon (vises ikke på websiden)"
-#: templates/web/default/maps/openlayers.html:85
+#: templates/web/default/maps/openlayers.html:86
msgid "Problem"
msgstr "Problem"
@@ -2669,7 +2507,7 @@ msgstr "Problem %s sendt til administrasjon %s"
msgid "Problem breakdown by state"
msgstr "Tilstandsfordeling av problemer"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:950
+#: perllib/FixMyStreet/App/Controller/Admin.pm:959
msgid "Problem marked as open."
msgstr "Problem markert som åpent."
@@ -2685,7 +2523,6 @@ msgstr "Problemer"
msgid "Problems in this area"
msgstr "Problemer i dette området"
-#: templates/web/bromley/report/display.html:31
#: templates/web/fixmystreet/around/tabbed_lists.html:4
#: templates/web/fixmystreet/report/display.html:46
msgid "Problems nearby"
@@ -2705,15 +2542,16 @@ msgstr "Problemer nylig rapportert fikset på FiksGataMi"
msgid "Problems within %.1fkm of this location"
msgstr "Problemer innenfor %.1fkm av denne posisjonen"
-#: perllib/FixMyStreet/Cobrand/Default.pm:626
+#: perllib/FixMyStreet/Cobrand/Default.pm:629
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:109
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155
-#: perllib/FixMyStreet/Cobrand/UK.pm:228
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:184
+#: perllib/FixMyStreet/Cobrand/UK.pm:222
msgid "Problems within %s"
msgstr "Problemer innenfor %s"
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117
-#: perllib/FixMyStreet/Cobrand/UK.pm:242
+#: perllib/FixMyStreet/Cobrand/UK.pm:236
msgid "Problems within %s ward"
msgstr "Problemer innenfor %s bydel"
@@ -2741,12 +2579,10 @@ msgstr "Eiendomsadresse:"
msgid "Property type:"
msgstr "Type egenskap:"
-#: templates/web/bromley/report/new/fill_in_details_form.html:52
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:64
msgid "Provide a title"
msgstr "Oppgi en tittel"
-#: templates/web/bromley/report/display.html:57
#: templates/web/default/report/update-form.html:3
#: templates/web/fixmystreet/report/update-form.html:4
msgid "Provide an update"
@@ -2756,11 +2592,6 @@ msgstr "Bidra med en oppdatering"
msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:180
-msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
-msgstr "Det er valgfritt å oppgi et passord, men om du gjør det vil det bli enklere for deg å rapportere problemer, legge inn oppdateringer og holde oversikt over dine rapporter."
-
-#: templates/web/bromley/report/display.html:144
#: templates/web/default/report/new/fill_in_details_form.html:173
#: templates/web/default/report/update-form.html:128
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:202
@@ -2791,7 +2622,6 @@ msgstr "Publiser bilde"
msgid "Publish the response"
msgstr "Publiser svar"
-#: templates/web/default/questionnaire/completed.html:1
#: templates/web/default/questionnaire/completed.html:2
#: templates/web/default/questionnaire/index.html:0
#: templates/web/default/questionnaire/index.html:14
@@ -2815,9 +2645,7 @@ msgstr "Spørreskjema %d sendt for problem %d"
msgid "Questionnaire filled in by problem reporter"
msgstr "Spørreskjema fylt inn av feilrapportøren"
-#: templates/web/bromley/report/display.html:37
#: templates/web/default/alert/_list.html:21
-#: templates/web/default/around/display_location.html:1
#: templates/web/default/around/display_location.html:3
#: templates/web/default/report/display.html:46
#: templates/web/default/reports/_rss.html:1
@@ -2827,11 +2655,11 @@ msgstr "Spørreskjema fylt inn av feilrapportøren"
msgid "RSS feed"
msgstr "RSS-strøm"
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:265 perllib/FixMyStreet/Cobrand/UK.pm:277
msgid "RSS feed for %s"
msgstr "RSS-strøm for %s"
-#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289
+#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
msgid "RSS feed for %s ward, %s"
msgstr "RSS-strøm for %s bydel, %s"
@@ -2839,11 +2667,15 @@ msgstr "RSS-strøm for %s bydel, %s"
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:189
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:197
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:309
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:200
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:208
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:218
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:226
+#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303
msgid "RSS feed of %s"
msgstr "RSS-strøm fra %s"
-#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:314
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:308
msgid "RSS feed of %s, within %s ward"
msgstr "RSS-strøm av %s, innenfor %s bydel"
@@ -2856,31 +2688,30 @@ msgstr "RSS-strøm med problemer i nærheten"
msgid "RSS feed of problems in this %s"
msgstr "RSS-strøm for problemer i denne %s"
-#: perllib/FixMyStreet/Cobrand/Default.pm:627
+#: perllib/FixMyStreet/Cobrand/Default.pm:630
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:110
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:154
-#: perllib/FixMyStreet/Cobrand/UK.pm:235
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:183
+#: perllib/FixMyStreet/Cobrand/UK.pm:229
msgid "RSS feed of problems within %s"
msgstr "RSS-strøm for problemer innenfor %s"
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:116
-#: perllib/FixMyStreet/Cobrand/UK.pm:241
+#: perllib/FixMyStreet/Cobrand/UK.pm:235
msgid "RSS feed of problems within %s ward"
msgstr "RSS-strøm for problemer innenfor %s bydel"
-#: templates/web/default/around/display_location.html:1
+#: templates/web/default/around/display_location.html:3
#: templates/web/default/around/display_location.html:4
msgid "RSS feed of recent local problems"
msgstr "RSS-strøm med nylige lokale problemer"
-#: templates/web/bromley/report/display.html:37
#: templates/web/default/report/display.html:46
#: templates/web/fixmystreet/alert/updates.html:9
#: templates/web/fixmystreet/report/display.html:61
msgid "RSS feed of updates to this problem"
msgstr "RSS-strøm med oppdateringer for dette problemet"
-#: templates/web/bromley/report/display.html:39
#: templates/web/default/alert/updates.html:9
#: templates/web/default/report/display.html:37
#: templates/web/fixmystreet/alert/updates.html:14
@@ -2904,7 +2735,7 @@ msgid "Recently fixed"
msgstr "Nylig løste problemer"
#: templates/web/default/index.html:35 templates/web/emptyhomes/index.html:24
-#: templates/web/fixmystreet/index.html:45
+#: templates/web/fixmystreet/index.html:49
msgid "Recently reported problems"
msgstr "Nylig meldte problemer"
@@ -2921,8 +2752,8 @@ msgstr "Husk at for testprosjektet er FixMyBarangay kun veihull og manglende lys
msgid "Remove flag"
msgstr "Fjern flagg"
-#: templates/web/default/admin/report_edit.html:89
-#: templates/web/default/admin/update_edit.html:57
+#: templates/web/default/admin/report_edit.html:94
+#: templates/web/default/admin/update_edit.html:62
#: templates/web/zurich/admin/update_edit.html:35
msgid "Remove photo (can't be undone!)"
msgstr "Fjern bilde (kan ikke gjøres om!)"
@@ -2931,29 +2762,21 @@ msgstr "Fjern bilde (kan ikke gjøres om!)"
msgid "Report Empty Homes"
msgstr "Rapporter tomme hjem"
-#: templates/web/barnet/footer.html:16 templates/web/bromley/footer.html:17
#: templates/web/default/footer.html:7 templates/web/emptyhomes/header.html:31
#: templates/web/fiksgatami/footer.html:5
#: templates/web/fiksgatami/nn/footer.html:5
-#: templates/web/fixmindelo/footer.html:37
-#: templates/web/fixmystreet/footer.html:44
-#: templates/web/oxfordshire/footer.html:19
-#: templates/web/reading/footer.html:6
-#: templates/web/seesomething/footer.html:11
-#: templates/web/stevenage/footer.html:39 templates/web/zurich/footer.html:17
+#: templates/web/fixmystreet/footer.html:47
+#: templates/web/zurich/footer.html:17
#: templates/web/zurich/nav_over_content.html:4
msgid "Report a problem"
msgstr "Rapporter et problem"
-#: templates/web/bromley/report/display.html:28
#: templates/web/fixmystreet/report/display.html:35
msgid "Report abuse"
msgstr "Rapporter misbruk"
#: templates/web/default/report_created.html:1
#: templates/web/default/report_created.html:3
-#: templates/web/seesomething/report_created.html:0
-#: templates/web/seesomething/report_created.html:8
msgid "Report created"
msgstr "Rapport opprettet"
@@ -2963,22 +2786,21 @@ msgstr "Rapport på %s"
#: templates/web/default/index.html:14 templates/web/emptyhomes/index.html:5
#: templates/web/fixmystreet/around/intro.html:1
-#: templates/web/stevenage/around/intro.html:1
#: templates/web/zurich/around/intro.html:1
msgid "Report, view, or discuss local problems"
msgstr "Rapporter, finn eller diskuter lokale problemer"
-#: templates/web/default/my/my.html:74
+#: templates/web/default/my/my.html:79
msgid "Reported %s"
msgstr "Rapportert %s"
-#: templates/web/default/my/my.html:72
+#: templates/web/default/my/my.html:77
msgid "Reported %s, to %s"
msgstr "Rapportert %s, til %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:559
+#: perllib/FixMyStreet/DB/Result/Problem.pm:561
#: templates/web/default/contact/index.html:45
-#: templates/web/fixmystreet/contact/index.html:58
+#: templates/web/fixmystreet/contact/index.html:62
msgid "Reported anonymously at %s"
msgstr "Rapportert anonymt %s"
@@ -2988,9 +2810,9 @@ msgstr "Rapportert anonymt %s"
msgid "Reported before"
msgstr "Rapportert tidligere"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:582
+#: perllib/FixMyStreet/DB/Result/Problem.pm:584
#: templates/web/default/contact/index.html:47
-#: templates/web/fixmystreet/contact/index.html:60
+#: templates/web/fixmystreet/contact/index.html:64
msgid "Reported by %s at %s"
msgstr "Publisert av %s %s"
@@ -2998,27 +2820,27 @@ msgstr "Publisert av %s %s"
msgid "Reported in the %s category"
msgstr "Rapportert i kategorien %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:555
+#: perllib/FixMyStreet/DB/Result/Problem.pm:557
msgid "Reported in the %s category anonymously at %s"
msgstr "Rapportert i kategorien %s anonymt %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:577
+#: perllib/FixMyStreet/DB/Result/Problem.pm:579
msgid "Reported in the %s category by %s at %s"
msgstr "Rapportert i kategorien %s av %s %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:551
+#: perllib/FixMyStreet/DB/Result/Problem.pm:553
msgid "Reported via %s anonymously at %s"
msgstr "Publisert av %s anonymt %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:573
+#: perllib/FixMyStreet/DB/Result/Problem.pm:575
msgid "Reported via %s by %s at %s"
msgstr "Rapporter av %s av %s %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:547
+#: perllib/FixMyStreet/DB/Result/Problem.pm:549
msgid "Reported via %s in the %s category anonymously at %s"
msgstr "Rapportert av %s i kategorien %s anonymt %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:567
+#: perllib/FixMyStreet/DB/Result/Problem.pm:569
msgid "Reported via %s in the %s category by %s at %s"
msgstr "Rapportert av %s i kategorien %s av %s %s"
@@ -3032,25 +2854,20 @@ msgstr "Rapportert av %s i kategorien %s av %s %s"
#: templates/web/fixmystreet/report/new/fill_in_details.html:0
#: templates/web/fixmystreet/report/new/fill_in_details.html:5
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2
-#: templates/web/oxfordshire/js/translation_strings.html:35
-#: templates/web/seesomething/around/around_index.html:1
-#: templates/web/seesomething/report/new/fill_in_details_form.html:3
#: templates/web/zurich/report/new/fill_in_details_form.html:2
msgid "Reporting a problem"
msgstr "Legger til et problem"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1177
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:242
-#: templates/web/seesomething/admin/stats.html:1
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1186
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:290
#: templates/web/zurich/header.html:60
msgid "Reports"
msgstr "Rapporter"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:393
-#: perllib/FixMyStreet/DB/Result/Problem.pm:397
-#, fuzzy
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
+#: perllib/FixMyStreet/DB/Result/Problem.pm:399
msgid "Reports are limited to %s characters in length. Please shorten your report"
-msgstr "Rapporter er begrenset til 2000 tegn i lengde. Vennligst skriv en kortere tekst"
+msgstr ""
#: templates/web/zurich/admin/index-sdm.html:7
msgid "Reports awaiting approval"
@@ -3069,27 +2886,28 @@ msgid "Resend report"
msgstr "Send rapport på nytt"
#: templates/web/default/js/translation_strings.html:28
-#: templates/web/oxfordshire/js/translation_strings.html:22
msgid "Right place?"
msgstr "Riktig sted?"
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:195
#: perllib/FixMyStreet/Geocode/OSM.pm:173
msgid "Road operator for this named road (derived from road reference number and type): %s"
msgstr "Veioperatør for denne navngitte veien (utledet fra veiens referansenummer og type) %s"
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:192
#: perllib/FixMyStreet/Geocode/OSM.pm:170
msgid "Road operator for this named road (from OpenStreetMap): %s"
msgstr "Veioperatør for denne navngitte veien (fra OpenStreetMap): %s"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1377
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1388
-#: templates/web/default/admin/report_edit.html:85
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1386
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1397
+#: templates/web/default/admin/report_edit.html:90
#: templates/web/zurich/admin/report_edit.html:76
msgid "Rotate Left"
msgstr "Roter til venstre"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1377
-#: templates/web/default/admin/report_edit.html:86
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1386
+#: templates/web/default/admin/report_edit.html:91
#: templates/web/zurich/admin/report_edit.html:77
msgid "Rotate Right"
msgstr "Roter til høyre"
@@ -3118,9 +2936,8 @@ msgid "Search:"
msgstr "Søk:"
#: templates/web/default/admin/reports.html:26
-#, fuzzy
msgid "Searching found no reports."
-msgstr "Søk i rapporter"
+msgstr ""
#: templates/web/default/admin/users.html:39
msgid "Searching found no users."
@@ -3141,7 +2958,7 @@ msgstr "Velg et område"
msgid "Select which type of alert you'd like and click the button for an RSS feed, or enter your email address to subscribe to an email alert."
msgstr "Velg hvilken type varsel du ønsker og klikk på knappen for en RSS-kilde, eller skriv inn din e-postadresse for å abonnere på et e-postvarsel."
-#: perllib/FixMyStreet/DB/Result/Problem.pm:664
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
msgid "Sent to %s %s later"
msgstr "Sendt til %s %s senere"
@@ -3158,9 +2975,6 @@ msgstr "Tjeneste:"
msgid "Share"
msgstr "Dele"
-#: templates/web/bromley/report/display.html:205
-#: templates/web/bromley/report/new/fill_in_details_form.html:129
-#: templates/web/bromley/report/new/fill_in_details_form.html:175
#: templates/web/default/report/new/fill_in_details_form.html:210
#: templates/web/default/report/update-form.html:157
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:129
@@ -3183,11 +2997,7 @@ msgstr "Vis nåler"
#: templates/web/fixmystreet/auth/general.html:3
#: templates/web/fixmystreet/auth/general.html:42
#: templates/web/fixmystreet/auth/general.html:62
-#: templates/web/fixmystreet/header.html:54
-#: templates/web/oxfordshire/header.html:115
-#: templates/web/seesomething/auth/general.html:3
-#: templates/web/seesomething/auth/general.html:39
-#: templates/web/stevenage/header.html:101
+#: templates/web/fixmystreet/header.html:57
#: templates/web/zurich/auth/general.html:18
#: templates/web/zurich/auth/general.html:35
msgid "Sign in"
@@ -3199,20 +3009,15 @@ msgstr "Logg inn via epost"
#: templates/web/default/auth/general.html:1
#: templates/web/fixmystreet/auth/general.html:1
-#: templates/web/seesomething/auth/general.html:1
#: templates/web/zurich/auth/general.html:1
msgid "Sign in or create an account"
msgstr "Logg inn eller opprett en konto"
-#: templates/web/bromley/auth/sign_out.html:1
#: templates/web/default/auth/sign_out.html:1
#: templates/web/default/header.html:30
#: templates/web/emptyhomes/header.html:46
#: templates/web/fiksgatami/header.html:22
#: templates/web/fiksgatami/nn/header.html:22
-#: templates/web/lichfielddc/header.html:177
-#: templates/web/reading/header.html:33
-#: templates/web/seesomething/auth/sign_out.html:1
#: templates/web/zurich/auth/sign_out.html:1
msgid "Sign out"
msgstr "Logg ut"
@@ -3221,14 +3026,12 @@ msgstr "Logg ut"
#: templates/web/emptyhomes/header.html:45
#: templates/web/fiksgatami/header.html:21
#: templates/web/fiksgatami/nn/header.html:21
-#: templates/web/lichfielddc/header.html:177
-#: templates/web/reading/header.html:32
msgid "Signed in as %s"
msgstr "Logget inn som %s"
-#: templates/web/default/report/new/fill_in_details_text.html:1
-#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1
-#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1
+#: templates/web/default/report/new/fill_in_details_text.html:2
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:2
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:2
msgid "Some categories may require additional information."
msgstr "Noen kategorier krever kanskje mer informasjon"
@@ -3259,6 +3062,8 @@ msgstr "Beklager, men det oppsto et problem når vi forsøkte å bekrefte proble
#: perllib/FixMyStreet/App/Controller/Report/New.pm:215
#: perllib/FixMyStreet/Geocode.pm:28 perllib/FixMyStreet/Geocode/Bing.pm:58
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:75
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:95
#: perllib/FixMyStreet/Geocode/Google.pm:74
#: perllib/FixMyStreet/Geocode/OSM.pm:66
msgid "Sorry, we could not find that location."
@@ -3266,7 +3071,7 @@ msgstr "Beklager, vi kunne ikke finne det stedet."
#: perllib/FixMyStreet/Geocode/Bing.pm:53
#: perllib/FixMyStreet/Geocode/Google.pm:69
-#: perllib/FixMyStreet/Geocode/Zurich.pm:87
+#: perllib/FixMyStreet/Geocode/Zurich.pm:88
msgid "Sorry, we could not parse that location. Please try again."
msgstr "Beklager, vi kunne ikke tolke den posisjonen. Vennligst prøv på nytt."
@@ -3276,11 +3081,9 @@ msgid "Source code"
msgstr "Kildekode"
#: templates/web/default/admin/stats.html:64
-#, fuzzy
msgid "Start Date:"
-msgstr "Startdag:"
+msgstr ""
-#: templates/web/bromley/report/display.html:78
#: templates/web/default/admin/flagged.html:18
#: templates/web/default/admin/list_updates.html:11
#: templates/web/default/admin/reports.html:15
@@ -3297,8 +3100,8 @@ msgstr "Tilstand"
msgid "State:"
msgstr "Tilstand:"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1182
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:257
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1191
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:305
#: templates/web/default/admin/stats.html:1
#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72
msgid "Stats"
@@ -3314,7 +3117,7 @@ msgstr "Status"
msgid "Still open, via questionnaire, %s"
msgstr "Fortsatt åpen via spørreskjema, %s"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:370
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378
msgid "Subcategory: %s"
msgstr "Underkategori: %s"
@@ -3322,8 +3125,7 @@ msgstr "Underkategori: %s"
msgid "Subdivision/Body"
msgstr "Underavdeling/administrasjon"
-#: templates/web/bromley/report/new/fill_in_details_form.html:48
-#: templates/web/fixmystreet/contact/index.html:91
+#: templates/web/fixmystreet/contact/index.html:95
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:60
msgid "Subject"
msgstr "Emne"
@@ -3336,9 +3138,6 @@ msgstr "Emne"
msgid "Subject:"
msgstr "Emne:"
-#: templates/web/bromley/report/new/fill_in_details_form.html:140
-#: templates/web/bromley/report/new/fill_in_details_form.html:190
-#: templates/web/bromley/report/new/fill_in_details_form.html:204
#: templates/web/default/questionnaire/creator_fixed.html:19
#: templates/web/default/report/new/fill_in_details_form.html:114
#: templates/web/default/report/new/fill_in_details_form.html:154
@@ -3347,13 +3146,12 @@ msgstr "Emne:"
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:142
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:167
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:212
-#: templates/web/seesomething/report/new/fill_in_details_form.html:93
#: templates/web/zurich/report/new/fill_in_details_form.html:114
msgid "Submit"
msgstr "Send inn"
-#: templates/web/default/admin/report_edit.html:92
-#: templates/web/default/admin/update_edit.html:60
+#: templates/web/default/admin/report_edit.html:97
+#: templates/web/default/admin/update_edit.html:65
#: templates/web/default/admin/user-form.html:55
#: templates/web/zurich/admin/report_edit-sdm.html:67
#: templates/web/zurich/admin/report_edit.html:224
@@ -3366,8 +3164,8 @@ msgstr "Send inn endringer"
msgid "Submit questionnaire"
msgstr "Send inn spørreskjema"
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:111
-#: templates/web/zurich/admin/header.html:1
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:133
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/header.html:6
#: templates/web/zurich/admin/index-dm.html:23
#: templates/web/zurich/admin/index-dm.html:6
@@ -3379,7 +3177,6 @@ msgstr "Send inn spørreskjema"
msgid "Submitted"
msgstr "Sendt inn"
-#: templates/web/bromley/report/display.html:44
#: templates/web/default/alert/updates.html:17
#: templates/web/default/report/display.html:42
#: templates/web/fixmystreet/alert/updates.html:23
@@ -3397,8 +3194,8 @@ msgstr "Jeg ønsker å abonnere på e-postvarsel"
msgid "Subscribe to an alert based upon what baranagay you&rsquo;re in:"
msgstr "Abonner på varsel basert på hvilket distrikt du hører inn under:"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1175
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:241
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1184
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:289
#: templates/web/default/admin/index.html:1
#: templates/web/zurich/admin/index-dm.html:1
#: templates/web/zurich/admin/index-sdm.html:1
@@ -3417,7 +3214,7 @@ msgstr "Oppsummering"
msgid "Summary reports"
msgstr "Oppsummeringsrapporter"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1179
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1188
msgid "Survey"
msgstr "Spørreundersøkelse"
@@ -3440,17 +3237,15 @@ msgstr "Tekst-versjon"
msgid "Text:"
msgstr "Tekst:"
-#: templates/web/default/tokens/confirm_update.html:7
#: templates/web/default/tokens/confirm_update.html:8
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\">se på ditt oppdaterte problem</a> her hos oss."
-#: templates/web/emptyhomes/tokens/confirm_problem.html:6
+#: templates/web/emptyhomes/tokens/confirm_problem.html:7
#: templates/web/emptyhomes/tokens/confirm_problem.html:8
msgid "Thank you for reporting an empty property on ReportEmptyHomes.com. We have emailed the lead officer for empty homes in the council responsible with details, and asked them to do whatever they can to get the empty property back into use as soon as possible."
msgstr "Takk for rapporten om en tomt eiendom på ReportEmptyHomes.com. Vi har sendt en e-post til den avnsvarlige for tomme eiendommer i administrasjonen med detaljene, og bedt dem om å gjøre hva de kan for å få den tomme eiendommen i bruk igjen så snart som mulig."
-#: templates/web/emptyhomes/tokens/confirm_problem.html:30
#: templates/web/emptyhomes/tokens/confirm_problem.html:31
msgid ""
"Thank you for reporting this empty property on ReportEmptyHomes.com.\n"
@@ -3466,7 +3261,7 @@ msgstr ""
msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it."
msgstr "Takk for at du forsøker å bekrefte din oppdatering eller ditt problem. Vi ser ut til å ha en feil hos oss, så <a href=\"%s\">vær så snill å fortell oss hva som skjedde</a> så skal vi se på saken."
-#: templates/web/emptyhomes/tokens/confirm_problem.html:24
+#: templates/web/emptyhomes/tokens/confirm_problem.html:25
#: templates/web/emptyhomes/tokens/confirm_problem.html:26
msgid "Thank you for using ReportEmptyHomes.com. Your action is already helping to resolve the UK&rsquo;s empty homes crisis."
msgstr "Takk for at du bruker ReportEmptyHomes.com. Ditt bidrag bidrar allerede for å løse UKs tomme hjem-krise."
@@ -3487,15 +3282,16 @@ msgstr "Takk, glad for å høre at problemet er fikset! Vi vil gjerne spørre de
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."
-#: perllib/FixMyStreet/App/Controller/Council.pm:90
+#: perllib/FixMyStreet/App/Controller/Council.pm:100
msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
msgstr "Det stedet dekkes ikke av noen administrasjon, kanskje det er til havs eller utenfor lander - vennligst forsøk et annet sted."
-#: perllib/FixMyStreet/App/Controller/Location.pm:123
+#: perllib/FixMyStreet/App/Controller/Location.pm:124
msgid "That location does not appear to be in the UK; please try again."
msgstr "Det stedet virker ikke å være i Storbritannia. Vennligst prøv igjen."
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:63
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:79
#: perllib/FixMyStreet/Cobrand/UK.pm:86
msgid "That postcode was not recognised, sorry."
msgstr "Det postnummeret ble ikke gjenkjent, beklager."
@@ -3555,7 +3351,7 @@ msgstr ""
msgid "The confirmation email <strong>may</strong> take a few minutes to arrive &mdash; <em>please</em> be patient."
msgstr "Bekreftelsese-posten <strong>kan</strong> bruke noen minutter før den kommer frem &mdash; så vær tålmodig."
-#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:2
#: templates/web/fixmystreet/report/new/fill_in_details_text.html:3
msgid "The council won&rsquo;t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc."
msgstr ""
@@ -3586,6 +3382,7 @@ msgstr "Feilen var: %s"
msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
msgstr "De følgende Open311 v2-atributtene blir returnert for hver forespørsel: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:187
#: perllib/FixMyStreet/Geocode/OSM.pm:165
msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
msgstr "Følgende informasjon om nærmeste vei kan være unøyaktig eller irrelevant, hvis problemet er nær flere veier eller nær en vei uten navn registrert i OpenStreetmap."
@@ -3644,7 +3441,7 @@ msgstr ""
msgid "The passwords do not match"
msgstr "Passordene er ikke like"
-#: templates/web/default/errors/page_error_404_not_found.html:10
+#: templates/web/default/errors/page_error_404_not_found.html:11
#: templates/web/default/errors/page_error_404_not_found.html:12
msgid "The requested URL '%s' was not found on this server"
msgstr "Den forespurte URL '%s' ble ikke funnet på denne tjeneren"
@@ -3654,9 +3451,7 @@ msgstr "Den forespurte URL '%s' ble ikke funnet på denne tjeneren"
msgid "The simplest alert is our geographic one:"
msgstr "Den enkleste meldingen er vår geografiske:"
-#: templates/web/barnet/report/new/councils_text_all.html:3
#: templates/web/default/report/new/councils_extra_text.html:1
-#: templates/web/default/report/new/councils_text_some.html:10
#: templates/web/default/report/new/councils_text_some.html:11
#: templates/web/default/report/new/fill_in_details_form.html:17
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12
@@ -3665,7 +3460,7 @@ msgstr ""
"Tittelen og detaljene for problemet vil bli offentlig, pluss navnet ditt\n"
"hvis du gir oss tillatelse til det."
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:291
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:296
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"
@@ -3680,16 +3475,15 @@ msgstr ""
msgid "There was a problem showing the All Reports page. Please try again later."
msgstr "Det var problemer med å vise 'Alle rapporter'-siden. Vennligst prøv igjen senere."
-#: perllib/FixMyStreet/App/Controller/Contact.pm:116
+#: perllib/FixMyStreet/App/Controller/Contact.pm:121
#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59
msgid "There was a problem showing this page. Please try again later."
msgstr "Det var problemer med å vise denne siden. Vennligst prøv igjen senere."
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:747
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:755
#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134
#: templates/web/default/auth/general.html:23
#: templates/web/fixmystreet/auth/general.html:24
-#: templates/web/seesomething/auth/general.html:24
#: templates/web/zurich/auth/general.html:28
msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the &lsquo;sign in by email&rsquo; section of the form."
msgstr "Det var problemer med din e-post/passord-kombinasjon. Hvis du har glemt ditt passord, eller hvis du ikke har et, vennligst fyll inn «Logg inn via e-post»-delen av skjemaet"
@@ -3702,7 +3496,7 @@ msgstr "Det var problemer med din epost/passord-kombinasjon. Vær så snill å
msgid "There was a problem with your update. Please try again."
msgstr "Det var problemer med din oppdatering. Vær så snill å forsøk igjen."
-#: perllib/FixMyStreet/App/Controller/Contact.pm:120
+#: perllib/FixMyStreet/App/Controller/Contact.pm:125
msgid "There were problems with your report. Please see below."
msgstr "Det var problemer med din rapport. Vennligst se under."
@@ -3742,16 +3536,16 @@ msgid ""
" A body will not receive any reports unless it covers at least one area."
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:375
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:385
msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system."
msgstr "Denne e-posten har blitt sendt til begge administrasjonene som dekker stedet for problemet, da brukeren ikke kategoriserte det. Vær så snill å ignorere den hvis dere ikke er korrekt administrasjon for å håndtere denne saken, eller gi oss beskjed om hvilken kategori av problemer dette er så vi kan legge det til i vårt system."
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:388
msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue."
msgstr "Denne e-posten har blitt sendt til flere administrasjoner som dekker stedet for problemet, da den valgte kategorien er tilgjengelig for disse. Vær så snill å ignorere e-posten hvis dere ikke er korrekt administrasjon for å håndtere denne saken."
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:894
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:964
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:898
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:968
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:131
#: perllib/FixMyStreet/Cobrand/UK.pm:58
msgid "This information is required"
@@ -3783,7 +3577,6 @@ msgstr "Dette kan være fordi lenken er for gammel eller allerede brukt, eller a
msgid "This problem has been closed"
msgstr "Dette problemet er lukket"
-#: templates/web/bromley/report/display.html:98
#: templates/web/default/report/banner.html:12
#: templates/web/default/report/update-form.html:48
#: templates/web/emptyhomes/report/banner.html:3
@@ -3791,7 +3584,6 @@ msgstr "Dette problemet er lukket"
msgid "This problem has been fixed"
msgstr "Dette problemet er løst"
-#: templates/web/bromley/report/display.html:92
#: templates/web/default/report/update-form.html:43
#: templates/web/fixmystreet/report/update-form.html:40
msgid "This problem has not been fixed"
@@ -3805,33 +3597,33 @@ msgstr "Dette problemet er under arbeid"
msgid "This problem is old and of unknown status."
msgstr "Dette problemet er gammel og med ukjent status."
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:108
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:109
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:130
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:131
#: templates/web/zurich/report/_main.html:14
msgid "This report is awaiting moderation."
msgstr "Denne rapporten avventer moderasjon"
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88
msgid "This report is currently marked as closed."
msgstr "Denne rapporten er for tiden markert som lukket."
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86
msgid "This report is currently marked as fixed."
msgstr "Denne rapporten er for tiden markert som fikset."
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:90
msgid "This report is currently marked as open."
msgstr "Denne rapporten er for tiden markert som åpen."
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:320
msgid "This report was submitted anonymously"
msgstr "Denne rapporten ble rapportert anonymt"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:284
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:289
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."
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1178
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1187
#: templates/web/default/admin/timeline.html:1
msgid "Timeline"
msgstr "Tidslinje"
@@ -3849,7 +3641,7 @@ msgstr "For å <strong>rapportere et problem</strong>, klikk på riktig sted på
msgid "To find out what local alerts we have for you, please enter your postcode or street name and area"
msgstr "Du finner lokale problemer ved å søke på ditt postnummer, veinavn eller sted"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:290
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:295
msgid "To view a map of the precise location of this issue"
msgstr "For å se en kart med en mer presis plassering for dette problemet."
@@ -3861,17 +3653,10 @@ msgstr "For å se en kart med en mer presis plassering for dette problemet."
msgid "Total"
msgstr "Totalt"
-#: templates/web/seesomething/report/new/fill_in_details_form.html:24
-msgid "Transport Category"
-msgstr "Transportkategori"
-
#: templates/web/default/js/translation_strings.html:29
-#: templates/web/oxfordshire/js/translation_strings.html:23
msgid "Try again"
msgstr "Prøv igjen"
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:83
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:46
#: templates/web/default/report/update-form.html:30
@@ -3899,7 +3684,6 @@ msgid "Unknown alert type"
msgstr "Ukjent varsel-type"
#: templates/web/default/js/translation_strings.html:39
-#: templates/web/oxfordshire/js/translation_strings.html:33
msgid "Unknown error"
msgstr "Ukjent feil"
@@ -3907,7 +3691,6 @@ msgstr "Ukjent feil"
msgid "Unknown problem ID"
msgstr "Ukjent problem-Id"
-#: templates/web/bromley/report/display.html:66
#: templates/web/fixmystreet/report/update-form.html:19
msgid "Update"
msgstr "Oppdatering"
@@ -3917,12 +3700,12 @@ msgid "Update %s created for problem %d; by %s"
msgstr "Oppdatering %s opprettet for problem %d, av %s"
#: templates/web/default/contact/index.html:21
-#: templates/web/fixmystreet/contact/index.html:34
+#: templates/web/fixmystreet/contact/index.html:38
msgid "Update below added anonymously at %s"
msgstr "Oppdateringen under lagt inn anonymt %s"
#: templates/web/default/contact/index.html:23
-#: templates/web/fixmystreet/contact/index.html:36
+#: templates/web/fixmystreet/contact/index.html:40
msgid "Update below added by %s at %s"
msgstr "Oppdateringen under lagt til av %s %s"
@@ -3966,12 +3749,12 @@ msgstr "Oppdatering:"
msgid "Updated"
msgstr "Oppdatert"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1042
-#: perllib/FixMyStreet/App/Controller/Admin.pm:796
-#: perllib/FixMyStreet/App/Controller/Admin.pm:940
-#: perllib/FixMyStreet/App/Controller/Admin.pm:998
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:487
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:556
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1007
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1051
+#: perllib/FixMyStreet/App/Controller/Admin.pm:801
+#: perllib/FixMyStreet/App/Controller/Admin.pm:949
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:550
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:619
msgid "Updated!"
msgstr "Oppdatert!"
@@ -3983,16 +3766,15 @@ msgstr "Oppdatert!"
msgid "Updates"
msgstr "Oppdateringer"
-#: perllib/FixMyStreet/DB/Result/Comment.pm:131
-msgid "Updates are limited to 2000 characters in length. Please shorten your update"
+#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+#, fuzzy
+msgid "Updates are limited to %s characters in length. Please shorten your update"
msgstr "Oppdateringer er begrenset til 2000 tegn i lengde. Vennligst skriv en kortere tekst."
#: db/alert_types.pl:5 db/alert_types.pl:6
msgid "Updates on {{title}}"
msgstr "Oppdateringer av {{title}}"
-#: templates/web/bromley/report/display.html:0
-#: templates/web/bromley/report/display.html:8
#: templates/web/default/report/display.html:0
#: templates/web/default/report/display.html:5
#: templates/web/fixmystreet/report/display.html:0
@@ -4006,15 +3788,14 @@ msgstr ""
#: templates/web/zurich/admin/list_updates.html:30
#: templates/web/zurich/admin/list_updates.html:9
-#, fuzzy
msgid "User"
-msgstr "Brukere"
+msgstr "Bruker"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1342
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1351
msgid "User flag removed"
msgstr "Brukerflagg fjernet"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1314
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1323
msgid "User flagged"
msgstr "Bruker flagget"
@@ -4022,8 +3803,8 @@ msgstr "Bruker flagget"
msgid "User search finds matches in users' names and email addresses."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:256
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1189
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:304
#: templates/web/default/admin/flagged.html:29
#: templates/web/zurich/header.html:69
msgid "Users"
@@ -4052,12 +3833,9 @@ msgstr "Vis din rapport"
#: templates/web/default/around/display_location.html:0
#: templates/web/default/around/display_location.html:34
-#: templates/web/seesomething/around/display_location.html:0
-#: templates/web/seesomething/around/display_location.html:16
msgid "Viewing a location"
msgstr "Ser på et sted"
-#: templates/web/bromley/report/display.html:0
#: templates/web/default/report/display.html:0
#: templates/web/fixmystreet/report/display.html:0
msgid "Viewing a problem"
@@ -4070,7 +3848,6 @@ msgstr "Bydeler innenfor denne administrasjonen"
#: templates/web/default/alert/choose.html:6
#: templates/web/default/around/around_index.html:13
#: templates/web/fixmystreet/around/around_index.html:16
-#: templates/web/seesomething/around/around_index.html:13
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."
@@ -4082,25 +3859,22 @@ msgstr "Vi har ikke klart å bekrefte din konto - beklager."
msgid "We have sent you an email containing a link to confirm your account."
msgstr "Vi har sendt deg en epost som inneholder link for å bekrefte din konto."
-#: templates/web/emptyhomes/tokens/confirm_problem.html:18
+#: templates/web/emptyhomes/tokens/confirm_problem.html:19
#: templates/web/emptyhomes/tokens/confirm_problem.html:20
msgid "We may contact you periodically to ask if anything has changed with the property you reported."
msgstr "Det kan hende vi periodisk tar kontakt med deg for å spørre om noe har endret seg med eiedommen du rapporterte."
-#: templates/web/bromley/report/display.html:143
#: templates/web/fixmystreet/report/update-form.html:115
msgid "We never show your email"
msgstr "Vi viser aldri din e-postadresse"
-#: templates/web/bromley/report/new/fill_in_details_form.html:133
-#: templates/web/bromley/report/new/fill_in_details_form.html:179
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:134
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:201
#: templates/web/zurich/report/new/fill_in_details_form.html:96
msgid "We never show your email address or phone number."
msgstr "Vi viser aldri din e-postadresse eller ditt telefonnummer"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:384
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:394
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."
@@ -4108,14 +3882,12 @@ msgstr "Vi innser at %s kan være ansvarlig for dette problemet, men vi mangler
msgid "We send it to the council on your behalf"
msgstr "Vi sender til administrasjon på dine vegne"
-#: templates/web/bromley/report/new/fill_in_details_form.html:217
#: templates/web/default/report/new/notes.html:5
#: templates/web/fixmybarangay/report/new/notes.html:5
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>"
#: templates/web/fixmystreet/report/new/notes.html:4
-#: templates/web/oxfordshire/report/new/notes.html:4
msgid "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>"
msgstr "Vi vil kun bruke personlige informasjon om deg i henhold til våre <a href=\"/faq#privacy\">personvernsregler.</a>"
@@ -4145,13 +3917,11 @@ msgstr "Hel blokk med tomme leiligheter"
msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>."
msgstr "Når du søker etter forespørsler, så er det også mulig å søke etter agency_responsible for å begrense det til forespørsler som er sendt til en enkelt adminstrasjon. Søktetermen er administrasjons-IDen som oppgitt av <a href=\"%s\">MaPit</a>."
-#: templates/web/fixmystreet/footer.html:21
-#: templates/web/stevenage/footer.html:22
+#: templates/web/fixmystreet/footer.html:24
msgid "Would you like better integration with FixMyStreet? <a href=\"http://www.mysociety.org/for-councils/fixmystreet/\">Find out about FixMyStreet for councils</a>."
msgstr "Ønsker dere bedre integrasjon med FiksGataMi? <a href=\"/for-councils\"> Finn ut mer om FiksGataMi for administrajoner</a>."
-#: templates/web/fixmystreet/footer.html:17
-#: templates/web/stevenage/footer.html:18
+#: templates/web/fixmystreet/footer.html:20
msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>."
msgstr "Ønsker du å bidra til FiksGataMi? Kildekoden vår er fri programvare og <a href=\"http://github.com/mysociety/fixmystreet\">tilgjengelig på GitHub</a>."
@@ -4163,7 +3933,6 @@ msgstr "Kunne du tenke deg å motta en ny forespørsel om 4 uker, som minner deg
#: templates/web/default/report/new/notes.html:8
#: templates/web/fixmybarangay/report/new/notes.html:8
#: templates/web/fixmystreet/report/new/notes.html:8
-#: templates/web/oxfordshire/report/new/notes.html:7
msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
msgstr "Når du skriver meldingen din med kun store bokstaver blir den vanskelig å lese. Det samme gjelder manglende tegnsetting."
@@ -4193,26 +3962,24 @@ msgstr "År"
msgid "Yes"
msgstr "Ja"
-#: templates/web/bromley/report/display.html:157
-#: templates/web/bromley/report/new/fill_in_details_form.html:198
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:161
#: templates/web/fixmystreet/report/update-form.html:89
msgid "Yes I have a password"
msgstr "<strong>Ja</strong>, jeg har et passord"
#: templates/web/default/contact/index.html:37
-#: templates/web/fixmystreet/contact/index.html:50
+#: templates/web/fixmystreet/contact/index.html:54
msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:"
msgstr "Du rapporterer at følgende problem er støtende, inneholder personlig informasjon eller lignende:"
#: templates/web/default/contact/index.html:15
-#: templates/web/fixmystreet/contact/index.html:28
+#: templates/web/fixmystreet/contact/index.html:32
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:"
-#: templates/web/default/tokens/confirm_problem.html:19
+#: templates/web/default/tokens/confirm_problem.html:20
#: templates/web/default/tokens/confirm_problem.html:21
-#: templates/web/zurich/tokens/confirm_problem.html:5
+#: templates/web/zurich/tokens/confirm_problem.html:6
#: templates/web/zurich/tokens/confirm_problem.html:8
msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
msgstr "Du kan <a href=\"%s%s\">lese om problemet på denne siden</a>."
@@ -4221,6 +3988,10 @@ msgstr "Du kan <a href=\"%s%s\">lese om problemet på denne siden</a>."
msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
msgstr ""
+#: templates/web/fixmystreet/contact/index.html:118
+msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
+msgstr ""
+
#: templates/web/default/admin/flagged.html:5
msgid ""
"You can flag any report or user by editing them, and they will be listed on this page.\n"
@@ -4228,9 +3999,9 @@ msgid ""
" reports in the past."
msgstr ""
-#: templates/web/default/report/new/councils_text_none.html:11
-#: templates/web/default/report/new/councils_text_none.html:13
-#: templates/web/default/report/new/councils_text_some.html:20
+#: templates/web/default/report/new/councils_text_none.html:19
+#: templates/web/default/report/new/councils_text_none.html:20
+#: templates/web/default/report/new/councils_text_some.html:21
#: templates/web/default/report/new/councils_text_some.html:22
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 "Du kan hjelpe oss ved å finne en kontakt-e-post for lokale problemer i %s, og sende den via e-post til oss på <a href='mailto:%s'>%s</a>."
@@ -4240,7 +4011,6 @@ msgid "You can mark a body as deleted if you do not want it to be active on the
msgstr ""
#: templates/web/default/js/translation_strings.html:36
-#: templates/web/oxfordshire/js/translation_strings.html:30
msgid "You declined; please fill in the box above"
msgstr "Du avviste; vennligst fyll inn boksen ovenfor"
@@ -4248,30 +4018,25 @@ msgstr "Du avviste; vennligst fyll inn boksen ovenfor"
msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
msgstr "Du har allerede besvart dette spørreskjemaet. Hvis du har spørsmål, vennligst <a href='%s'>ta kontakt</a>, eller <a href='%s'>se på ditt problem</a>.\n"
-#: templates/web/bromley/report/new/fill_in_details_form.html:97
#: templates/web/default/questionnaire/index.html:96
#: templates/web/default/report/new/fill_in_details_form.html:93
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:90
#: templates/web/fixmystreet/questionnaire/index.html:87
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:99
-#: templates/web/seesomething/report/new/fill_in_details_form.html:59
#: templates/web/zurich/report/new/fill_in_details_form.html:75
msgid "You have already attached a photo to this report, attaching another one will replace it."
msgstr "Du har allerede lagt ved et bilde til dette problemet. Å legge ved et annet vil bytte ut dette."
-#: templates/web/bromley/report/display.html:108
#: templates/web/default/report/update-form.html:59
#: templates/web/fixmystreet/report/update-form.html:56
msgid "You have already attached a photo to this update, attaching another one will replace it."
msgstr "Du har allerede lagt ved et bilde til denne oppdateringen. Å legge ved et annet vil bytte ut dette."
#: templates/web/default/auth/sign_out.html:3
-#: templates/web/seesomething/auth/sign_out.html:3
#: templates/web/zurich/auth/sign_out.html:3
msgid "You have been signed out"
msgstr "Du er allerede logget ut"
-#: templates/web/bromley/report/new/fill_in_details_form.html:25
#: templates/web/default/report/new/fill_in_details_form.html:7
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:7
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:28
@@ -4283,17 +4048,14 @@ msgstr "Du har plassert problemet ved punktet i kartet som er markert med en gr
msgid "You have successfully confirmed your alert."
msgstr "Du har nå lykkes med å bekrefte ditt varsel."
-#: templates/web/zurich/tokens/confirm_problem.html:5
#: templates/web/zurich/tokens/confirm_problem.html:6
msgid "You have successfully confirmed your email address."
msgstr "Du har nå lykkes med å bekrefte din e-postadresse."
-#: templates/web/default/tokens/confirm_problem.html:14
#: templates/web/default/tokens/confirm_problem.html:15
msgid "You have successfully confirmed your problem"
msgstr "Du har nå lykkes med å bekrefte ditt problem"
-#: templates/web/default/tokens/confirm_update.html:11
#: templates/web/default/tokens/confirm_update.html:12
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\">og kan se den på dette nettstedet</a>."
@@ -4306,11 +4068,15 @@ msgstr "Du har lykkes med å opprette ditt varsel."
msgid "You have successfully deleted your alert."
msgstr "Sletting av ditt varsel var vellykket."
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:754
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:762
#: perllib/FixMyStreet/App/Controller/Report/Update.pm:140
msgid "You have successfully signed in; please check and confirm your details are accurate:"
msgstr "Du har lykkes med å logge inn. Vennligst sjekk og bekreft at dine detaljer er korrekte:"
+#: templates/web/default/my/my.html:17 templates/web/fixmystreet/my/my.html:17
+msgid "You haven&rsquo;t created any reports yet. <a href=\"%s\">Report a problem now.</a>"
+msgstr ""
+
#: templates/web/default/email_sent.html:13
msgid "You must now click the link in the email we've just sent you."
msgstr "Du må nå åpne lenken i e-posten vi akkurat sendte deg."
@@ -4337,13 +4103,10 @@ msgstr "Ønsker du virkelig å sende på nytt?"
msgid "Your Reports"
msgstr "Dine rapporter"
-#: templates/web/bromley/report/display.html:41
-#: templates/web/bromley/report/display.html:43
-#: templates/web/bromley/report/new/fill_in_details_form.html:145
#: templates/web/fixmystreet/alert/_list.html:89
#: templates/web/fixmystreet/alert/updates.html:19
#: templates/web/fixmystreet/alert/updates.html:22
-#: templates/web/fixmystreet/contact/index.html:84
+#: templates/web/fixmystreet/contact/index.html:88
#: templates/web/fixmystreet/report/display.html:65
#: templates/web/fixmystreet/report/display.html:67
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:115
@@ -4352,14 +4115,8 @@ msgstr "Dine rapporter"
msgid "Your email"
msgstr "Din e-post"
-#: templates/web/seesomething/report/new/fill_in_details_form.html:81
-msgid "Your email (optional)"
-msgstr "Din e-postadresse (valgfritt)"
-
-#: templates/web/bromley/report/display.html:132
#: templates/web/fixmystreet/auth/general.html:26
#: templates/web/fixmystreet/report/update-form.html:80
-#: templates/web/seesomething/auth/general.html:26
#: templates/web/zurich/auth/general.html:30
#: templates/web/zurich/auth/general.html:58
msgid "Your email address"
@@ -4377,28 +4134,15 @@ msgstr "Din e-postadresse:"
msgid "Your email:"
msgstr "Din e-post"
-#: templates/web/bromley/report/display.html:195
-#: templates/web/bromley/report/new/fill_in_details_form.html:117
-#: templates/web/bromley/report/new/fill_in_details_form.html:164
-msgid "Your first name"
-msgstr "Ditt fornavn"
-
-#: templates/web/fixmystreet/report/updates-sidebar-notes.html:5
+#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7
msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>"
msgstr "Vi vil kun bruke personlig informasjon om deg i henhold til våre <a href=\"/faq#privacy\">personvernsregler.</a>"
-#: templates/web/bromley/report/display.html:201
-#: templates/web/bromley/report/new/fill_in_details_form.html:123
-#: templates/web/bromley/report/new/fill_in_details_form.html:170
-msgid "Your last name"
-msgstr "Ditt etternavn"
-
#: templates/web/fixmystreet/auth/general.html:57
-#: templates/web/fixmystreet/contact/index.html:77
+#: templates/web/fixmystreet/contact/index.html:81
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:124
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:192
#: templates/web/fixmystreet/report/update-form.html:140
-#: templates/web/seesomething/report/new/fill_in_details_form.html:79
#: templates/web/zurich/auth/general.html:61
#: templates/web/zurich/report/new/fill_in_details_form.html:104
msgid "Your name"
@@ -4412,12 +4156,9 @@ msgstr "Ditt navn"
msgid "Your name:"
msgstr "Ditt navn:"
-#: templates/web/bromley/report/display.html:162
-#: templates/web/bromley/report/new/fill_in_details_form.html:203
#: templates/web/fixmystreet/auth/general.html:41
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:166
#: templates/web/fixmystreet/report/update-form.html:94
-#: templates/web/seesomething/auth/general.html:30
#: templates/web/zurich/auth/general.html:34
msgid "Your password"
msgstr "Ditt passord"
@@ -4426,11 +4167,8 @@ msgstr "Ditt passord"
msgid "Your password has been changed"
msgstr "Ditt passord har blitt endret"
-#: templates/web/bromley/report/new/fill_in_details_form.html:137
-#: templates/web/bromley/report/new/fill_in_details_form.html:184
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:139
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:206
-#: templates/web/seesomething/report/new/fill_in_details_form.html:90
#: templates/web/zurich/report/new/fill_in_details_form.html:110
msgid "Your phone number"
msgstr "Ditt telefonnummer"
@@ -4443,19 +4181,13 @@ msgstr "Dine rapporter"
msgid "Your report has been created and will shortly be sent."
msgstr "Din rapport har blitt opprettet og vil bli sendt innen kort tid."
-#: templates/web/barnet/footer.html:18 templates/web/bromley/footer.html:19
-#: templates/web/bromley/header.html:75 templates/web/default/footer.html:9
-#: templates/web/fiksgatami/footer.html:6
+#: templates/web/default/footer.html:9 templates/web/fiksgatami/footer.html:6
#: templates/web/fiksgatami/nn/footer.html:6
-#: templates/web/fixmindelo/footer.html:39
-#: templates/web/fixmystreet/footer.html:46
-#: templates/web/oxfordshire/footer.html:21
-#: templates/web/oxfordshire/header.html:63
-#: templates/web/reading/footer.html:7 templates/web/stevenage/footer.html:41
+#: templates/web/fixmystreet/footer.html:49
msgid "Your reports"
msgstr "Dine oppdateringer"
-#: templates/web/default/my/my.html:45 templates/web/fixmystreet/my/my.html:49
+#: templates/web/default/my/my.html:50 templates/web/fixmystreet/my/my.html:56
msgid "Your updates"
msgstr "Dine oppdateringer"
@@ -4472,7 +4204,7 @@ msgstr "av %s"
msgid "council"
msgstr "administrasjon"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
msgid "council ref:&nbsp;%s"
msgstr "administrasjonsreferanse:&nbsp;%s"
@@ -4484,37 +4216,34 @@ msgstr "brukte ikke kart"
#: templates/web/default/alert/index.html:33
#: templates/web/fixmystreet/around/postcode_form.html:20
-#: templates/web/seesomething/around/postcode_form.html:9
msgid "e.g. ‘%s’ or ‘%s’"
msgstr "for eksempel «%s» eller «%s»"
#: templates/web/default/admin/flagged.html:51
-#, fuzzy
msgid "edit user"
-msgstr "Legg til bruker"
+msgstr "rediger bruker"
#: templates/web/default/admin/index.html:23
#: templates/web/zurich/admin/index.html:5
msgid "from %d different users"
msgstr "fra %d forskjellige brukere"
-#: templates/web/bromley/report/_item.html:12
-#: templates/web/fixmystreet/report/_item.html:12
+#: templates/web/fixmystreet/report/_item.html:17
#: templates/web/zurich/report/_item.html:16
msgid "last updated %s"
msgstr "sist oppdatert %s"
-#: perllib/Utils.pm:263
+#: perllib/Utils.pm:265
msgid "less than a minute"
msgstr "mindre enn et minutt"
#: templates/web/default/report/updates.html:57
msgid "marked as a duplicate report"
-msgstr ""
+msgstr "markert som duplisert rapport"
#: templates/web/default/report/updates.html:47
msgid "marked as action scheduled"
-msgstr ""
+msgstr "markert som planlagt"
#: templates/web/default/report/updates.html:59
msgid "marked as an internal referral"
@@ -4522,7 +4251,7 @@ msgstr ""
#: templates/web/default/report/updates.html:49
msgid "marked as closed"
-msgstr ""
+msgstr "markert som lukket"
#: templates/web/default/report/updates.html:28
#: templates/web/default/report/updates.html:51
@@ -4531,23 +4260,23 @@ msgstr "markert som fikset"
#: templates/web/default/report/updates.html:45
msgid "marked as in progress"
-msgstr ""
+msgstr "markert som under arbeid"
#: templates/web/default/report/updates.html:41
msgid "marked as investigating"
-msgstr ""
+msgstr "markert som undersøkes"
#: templates/web/default/report/updates.html:55
msgid "marked as not the council's responsibility"
-msgstr ""
+msgstr "markert som ikke administrasjonens ansvar"
#: templates/web/default/report/updates.html:43
msgid "marked as planned"
-msgstr ""
+msgstr "markert som planlagt"
#: templates/web/default/report/updates.html:53
msgid "marked as unable to fix"
-msgstr ""
+msgstr "marker som uløselig"
#: perllib/FixMyStreet/App/Controller/Admin.pm:130
#: templates/web/default/admin/questionnaire.html:15
@@ -4562,21 +4291,20 @@ msgid "or"
msgstr "eller"
#: templates/web/default/js/translation_strings.html:27
-#: templates/web/oxfordshire/js/translation_strings.html:21
msgid "or locate me automatically"
msgstr "eller finn min posisjon automatisk"
-#: templates/web/default/admin/report_edit.html:24
+#: templates/web/default/admin/report_edit.html:25
#: templates/web/default/admin/report_edit.html:26
-#: templates/web/zurich/admin/report_edit-sdm.html:30
+#: templates/web/zurich/admin/report_edit-sdm.html:31
#: templates/web/zurich/admin/report_edit-sdm.html:32
-#: templates/web/zurich/admin/report_edit-sdm.html:39
+#: templates/web/zurich/admin/report_edit-sdm.html:40
#: templates/web/zurich/admin/report_edit-sdm.html:41
-#: templates/web/zurich/admin/report_edit.html:30
+#: templates/web/zurich/admin/report_edit.html:31
#: templates/web/zurich/admin/report_edit.html:32
-#: templates/web/zurich/admin/report_edit.html:41
+#: templates/web/zurich/admin/report_edit.html:42
#: templates/web/zurich/admin/report_edit.html:43
-#: templates/web/zurich/admin/report_edit.html:53
+#: templates/web/zurich/admin/report_edit.html:54
#: templates/web/zurich/admin/report_edit.html:55
msgid "originally entered: &ldquo;%s&rdquo;"
msgstr "opprinnelig lagt inn: &ldquo;%s&rdquo;"
@@ -4590,23 +4318,17 @@ msgstr "andre områder:"
msgid "reopened"
msgstr "åpnet på nytt"
-#: templates/web/barnet/header.html:71 templates/web/bromley/header.html:100
-#: templates/web/bromley/header.html:65
#: templates/web/fixmybarangay/header.html:67
-#: templates/web/fixmystreet/header.html:51
-#: templates/web/oxfordshire/header.html:112
-#: templates/web/oxfordshire/header.html:48
-#: templates/web/stevenage/header.html:98 templates/web/zurich/footer.html:12
+#: templates/web/fixmystreet/header.html:54
+#: templates/web/zurich/footer.html:12
msgid "sign out"
msgstr "logg ut"
-#: templates/web/bromley/report/new/fill_in_details_form.html:4
-#: templates/web/bromley/report/new/fill_in_details_form.html:7
-#: templates/web/default/report/new/fill_in_details_form.html:11
+#: templates/web/default/report/new/fill_in_details_form.html:12
#: templates/web/default/report/new/fill_in_details_form.html:14
-#: templates/web/emptyhomes/report/new/fill_in_details_form.html:11
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:12
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:14
-#: templates/web/fixmystreet/report/new/fill_in_details_form.html:6
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:7
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:9
msgid "the local council"
msgstr "den lokale administrasjonen"
@@ -4616,11 +4338,11 @@ msgstr "den lokale administrasjonen"
msgid "there is no pin shown as the user did not use the map"
msgstr "Det vises ingen nål på grunn av at brukeren ikke brukte kartet"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:362
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:370
msgid "this type of local problem"
msgstr "denne type lokalt problem"
-#: perllib/Utils.pm:235
+#: perllib/Utils.pm:237
msgid "today"
msgstr "idag"
@@ -4650,7 +4372,7 @@ msgid_plural "<big>%s</big> reports recently"
msgstr[0] "<big>%s</big> rapportert<br>nylig"
msgstr[1] "<big>%s</big> rapportert<br>nylig"
-#: perllib/Utils.pm:282
+#: perllib/Utils.pm:284
#, perl-format
msgid "%d hour"
msgid_plural "%d hours"
@@ -4664,7 +4386,7 @@ msgid_plural "%d supporters"
msgstr[0] "%d støttespiller"
msgstr[1] "%d støttespillere"
-#: perllib/Utils.pm:284
+#: perllib/Utils.pm:286
#, perl-format
msgid "%d minute"
msgid_plural "%d minutes"
@@ -4685,7 +4407,7 @@ msgid_plural "We do not yet have details for the councils that cover this locati
msgstr[0] "Vi har ennå ikke detaljer for administrasjonen som dekker dette stedet."
msgstr[1] "Vi har ennå ikke detaljer for administrasjonene som dekker dette stedet."
-#: perllib/Utils.pm:278
+#: perllib/Utils.pm:280
#, perl-format
msgid "%d week"
msgid_plural "%d weeks"
@@ -4706,6 +4428,13 @@ 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/Utils.pm:282
+#, perl-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d dag"
+msgstr[1] "%d dager"
+
#: templates/web/default/report/new/councils_text_some.html:14
#, perl-format
msgid "We do <strong>not</strong> yet have details for the other council that covers this location."
@@ -4713,25 +4442,44 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils
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."
-#: perllib/Utils.pm:280
-#, perl-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d dag"
-msgstr[1] "%d dager"
+#~ msgid "Click on the map to report a problem"
+#~ msgstr "Klikk i kartet for å rapportere et problem"
-#, fuzzy
-#~ msgid "The email field is required"
-#~ msgstr "Denne informasjonen er påkrevd"
+#~ msgid "First Name"
+#~ msgstr "Fornavn"
+
+#~ msgid "Incident Category"
+#~ msgstr "Hendelseskategori"
+
+#~ msgid "Last Name"
+#~ msgstr "Etternavn"
+
+#~ msgid "Name (optional)"
+#~ msgstr "Navn (valgfritt)"
+
+#~ msgid "Please choose a transport category"
+#~ msgstr "Vennligst velg en transportkategori"
+
+#~ msgid "Please choose an incident category"
+#~ msgstr "Vennligst velg en hendelseskategori"
+
+#~ msgid "Please describe the exact location of the report. Example: “2 dumped mattresses outside Number 19 Stockwell Close”"
+#~ msgstr "Vennligst beskriv den nøyaktige posisjonen til problemet. For eksempel: «2 madrasser dumpet utenfor Jernbanegata 19»"
+
+#~ msgid "Please note that updates are not sent to the relevant department. 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 vil bli sendt til administrasjonen. Dersom du legger igjen navnet ditt vil det være synlig for alle. Din informasjon vil kun bli brukt i henhold til våre <a href=\"/faq#privacy\">personvernsregler</a>"
+
+#~ msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
+#~ msgstr "Det er valgfritt å oppgi et passord, men om du gjør det vil det bli enklere for deg å rapportere problemer, legge inn oppdateringer og holde oversikt over dine rapporter."
-#~ msgid "End Year:"
-#~ msgstr "Sluttår:"
+#~ msgid "Transport Category"
+#~ msgstr "Transportkategori"
-#~ msgid "End month:"
-#~ msgstr "Sluttmåned:"
+#~ msgid "Your email (optional)"
+#~ msgstr "Din e-postadresse (valgfritt)"
-#~ msgid "Start Year:"
-#~ msgstr "Startår:"
+#~ msgid "Your first name"
+#~ msgstr "Ditt fornavn"
-#~ msgid "Start month:"
-#~ msgstr "Startmåned:"
+#~ msgid "Your last name"
+#~ msgstr "Ditt etternavn"
diff --git a/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po
index 2494f35e5..185cdba1a 100644
--- a/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/nl_NL.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: 2013-11-12 13:15+0000\n"
-"PO-Revision-Date: 2013-09-05 16:55+0000\n"
+"POT-Creation-Date: 2014-05-16 17:30+0100\n"
+"PO-Revision-Date: 2013-11-20 13:29+0000\n"
"Last-Translator: mysociety <transifex@mysociety.org>\n"
"Language-Team: Dutch (Netherlands) (http://www.transifex.com/projects/p/fixmystreet/language/nl_NL/)\n"
"Language: nl_NL\n"
@@ -19,25 +19,25 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:373
+#: perllib/FixMyStreet/DB/Result/Problem.pm:604
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383
msgid " and "
msgstr "en"
-#: templates/web/default/tokens/confirm_problem.html:14
+#: templates/web/default/tokens/confirm_problem.html:15
#: templates/web/default/tokens/confirm_problem.html:17
msgid " and <strong>we will now send it to the council</strong>"
msgstr "en <strong>we zullen het nu naar de gemeente sturen</strong>"
-#: templates/web/default/report/new/councils_text_all.html:11
-#: templates/web/default/report/new/councils_text_all.html:18
-#: templates/web/default/report/new/councils_text_all.html:4
-#: templates/web/default/report/new/councils_text_none.html:11
-#: templates/web/default/report/new/councils_text_none.html:14
-#: templates/web/default/report/new/councils_text_some.html:20
+#: templates/web/default/report/new/councils_text_all.html:12
+#: templates/web/default/report/new/councils_text_all.html:19
+#: templates/web/default/report/new/councils_text_all.html:5
+#: templates/web/default/report/new/councils_text_none.html:19
+#: templates/web/default/report/new/councils_text_none.html:21
+#: templates/web/default/report/new/councils_text_some.html:21
#: templates/web/default/report/new/councils_text_some.html:23
#: templates/web/default/report/new/councils_text_some.html:5
-#: templates/web/emptyhomes/report/new/councils_text_all.html:2
+#: templates/web/emptyhomes/report/new/councils_text_all.html:3
msgid " or "
msgstr "of"
@@ -75,19 +75,19 @@ msgstr ""
msgid "%s - Summary reports"
msgstr "%s - Overzichtsverslagen"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:653
msgid "%s ref:&nbsp;%s"
msgstr "%s ref:&nbsp;%s"
-#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
msgid "%s ward, %s"
msgstr "%s district, %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:538
+#: perllib/FixMyStreet/DB/Result/Problem.pm:540
msgid "%s, reported at %s"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/UK.pm:303 perllib/FixMyStreet/Cobrand/UK.pm:315
+#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:309
msgid "%s, within %s ward"
msgstr "%s, in %s district"
@@ -118,30 +118,27 @@ msgstr "(een stand afstand waarbinnen ongeveer 200.000 mensen leven)"
msgid "(alternatively the RSS feed can be customised, within"
msgstr "(als alternatief kan je de RSS feed aanpassen binnen"
-#: templates/web/bromley/report/_item.html:22
#: templates/web/default/around/around_map_list_items.html:12
#: templates/web/default/around/on_map_list_items.html:9
-#: templates/web/fixmystreet/report/_item.html:22
+#: templates/web/fixmystreet/report/_item.html:27
#: templates/web/zurich/report/_item.html:21
msgid "(closed)"
msgstr "(gesloten)"
-#: templates/web/bromley/report/_item.html:20
#: templates/web/default/around/around_map_list_items.html:10
#: templates/web/default/around/on_map_list_items.html:7
-#: templates/web/fixmystreet/report/_item.html:20
+#: templates/web/fixmystreet/report/_item.html:25
#: templates/web/zurich/report/_item.html:19
msgid "(fixed)"
msgstr "(opgelost)"
-#: templates/web/default/index.html:12 templates/web/default/index.html:8
+#: templates/web/default/index.html:12 templates/web/default/index.html:9
#: templates/web/fixmystreet/around/intro.html:2
msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
msgstr "(zoals graffiti, zwerfafval, losliggende tegels of straatverlichting) "
-#: templates/web/bromley/report/_item.html:16
#: templates/web/default/reports/_list-entry.html:4
-#: templates/web/fixmystreet/report/_item.html:16
+#: templates/web/fixmystreet/report/_item.html:21
msgid "(not sent to council)"
msgstr "(niet verstuurd naar de gemeente)"
@@ -151,9 +148,8 @@ msgstr "(niet verstuurd naar de gemeente)"
msgid "(optional)"
msgstr "(optioneel)"
-#: templates/web/bromley/report/_item.html:15
#: templates/web/default/reports/_list-entry.html:2
-#: templates/web/fixmystreet/report/_item.html:15
+#: templates/web/fixmystreet/report/_item.html:20
msgid "(sent to both)"
msgstr "(verstuurd naar beide)"
@@ -165,8 +161,8 @@ msgstr "(we zullen je telefoonnummer of e-mailadres niet tonen)"
msgid "(we never show your email)"
msgstr "(we zullen je e-mailadres niet tonen)"
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:637
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:664
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:635
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:662
#: perllib/FixMyStreet/DB/Result/Problem.pm:379
msgid "-- Pick a category --"
msgstr "-- Kies een categorie --"
@@ -202,7 +198,7 @@ msgid ""
"</p>"
msgstr "<p style=\"font-size:150%\">We vinden dat spijtig om te horen. Je kan proberen om direct een raadslid aan te schrijven, of samen met de buurt het probleem te verhelpen.</p>"
-#: templates/web/fixmystreet/questionnaire/completed-open.html:6
+#: templates/web/fixmystreet/questionnaire/completed-open.html:25
msgid ""
"<p style=\"font-size:150%\">We&rsquo;re sorry to hear that. We have two\n"
"suggestions: why not try <a href=\"http://www.writetothem.com/\">writing direct\n"
@@ -252,7 +248,7 @@ msgid ""
"site and leave an update.</p>"
msgstr "<p>Bedankt voor het invullen van de vragenlijst. Als je meer informatie over de status van je probleem krijgt, kom dan alsjeblieft terug naar de site om een update te plaatsen.</p>"
-#: templates/web/default/around/_report_banner.html:3
+#: templates/web/default/around/_report_banner.html:4
#: templates/web/default/around/_report_banner.html:5
msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>"
msgstr "<small>Als je geen kaart ziet, <a href='%s' rel='nofollow'>sla dan deze stap over</a>.</small>"
@@ -307,8 +303,6 @@ msgstr "<strong>Ja</strong, ik heb een wachtwoord"
msgid "About us"
msgstr "Over ons"
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:81
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:39
#: templates/web/default/report/update-form.html:30
@@ -346,7 +340,7 @@ msgstr "Voeg een nieuwe categorie toe"
msgid "Add user"
msgstr ""
-#: templates/web/default/my/my.html:56 templates/web/fixmystreet/my/my.html:60
+#: templates/web/default/my/my.html:61 templates/web/fixmystreet/my/my.html:67
msgid "Added %s"
msgstr "%s toegevoegd"
@@ -362,7 +356,6 @@ msgstr "Melding %d gemaakt voor %s, type %s, parameters %s / %s"
msgid "Alert %d disabled (created %s)"
msgstr "Melding %d inactief gemaakt (gemaakt %s)"
-#: templates/web/bromley/report/display.html:209
#: templates/web/default/report/update-form.html:163
#: templates/web/fixmystreet/report/update-form.html:148
msgid "Alert me to future updates"
@@ -375,17 +368,12 @@ msgstr "Meld het me als er updates zijn"
msgid "All Reports"
msgstr "Alle meldingen"
-#: templates/web/barnet/footer.html:20 templates/web/bromley/footer.html:21
-#: templates/web/bromley/header.html:77 templates/web/default/footer.html:11
+#: templates/web/default/footer.html:11
#: templates/web/emptyhomes/header.html:32
#: templates/web/fiksgatami/footer.html:7
#: templates/web/fiksgatami/nn/footer.html:7
-#: templates/web/fixmindelo/footer.html:41
#: templates/web/fixmybarangay/footer.html:20
-#: templates/web/fixmystreet/footer.html:48
-#: templates/web/oxfordshire/footer.html:23
-#: templates/web/oxfordshire/header.html:67
-#: templates/web/reading/footer.html:8 templates/web/stevenage/footer.html:43
+#: templates/web/fixmystreet/footer.html:51
#: templates/web/zurich/admin/index-dm.html:12
#: templates/web/zurich/admin/stats.html:13
#: templates/web/zurich/footer.html:19
@@ -402,27 +390,25 @@ msgstr ""
msgid "All the information you provide here will be sent to"
msgstr "Alle informatie die je ingevuld hebt zal worden verstuurd naar"
-#: templates/web/default/report/new/councils_text_all.html:11
+#: templates/web/default/report/new/councils_text_all.html:12
#: templates/web/default/report/new/councils_text_all.html:13
msgid "All the information you provide here will be sent to <strong>%s</strong> or <strong>Roads Service</strong>."
msgstr "Alle informatie die je hier opgeeft zal worden verzonden naar <strong>%s</strong> of <strong>de wegbeheerder</strong>."
-#: templates/web/default/report/new/councils_text_all.html:4
+#: templates/web/default/report/new/councils_text_all.html:5
#: templates/web/default/report/new/councils_text_all.html:6
msgid "All the information you provide here will be sent to <strong>%s</strong> or a relevant local body such as <strong>TfL</strong>, via the London Report-It system."
msgstr "Alle informatie die je hier opgeeft zal worden verzonden naar <strong>%s</strong> of naar een een relevante partij zoals <strong>TfL</strong>, via het London Report-It systeem."
-#: templates/web/bromley/report/new/fill_in_details_form.html:4
-#: templates/web/bromley/report/new/fill_in_details_form.html:6
-#: templates/web/default/report/new/councils_text_all.html:18
+#: templates/web/default/report/new/councils_text_all.html:19
#: templates/web/default/report/new/councils_text_all.html:20
-#: templates/web/default/report/new/fill_in_details_form.html:11
+#: templates/web/default/report/new/fill_in_details_form.html:12
#: templates/web/default/report/new/fill_in_details_form.html:13
-#: templates/web/emptyhomes/report/new/councils_text_all.html:2
+#: templates/web/emptyhomes/report/new/councils_text_all.html:3
#: templates/web/emptyhomes/report/new/councils_text_all.html:4
-#: templates/web/emptyhomes/report/new/fill_in_details_form.html:11
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:12
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:13
-#: templates/web/fixmystreet/report/new/fill_in_details_form.html:6
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:7
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:8
msgid "All the information you provide here will be sent to <strong>%s</strong>."
msgstr "Alle informatie die je hier opgeeft zal worden verzonden naar <strong>%s</strong>."
@@ -446,13 +432,11 @@ msgstr "Anoniem:"
msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?"
msgstr "Ben je een <strong>ontwikkelaar</strong>? Wil je bijdragen aan FixMyStreet?"
-#: templates/web/fixmystreet/footer.html:16
-#: templates/web/stevenage/footer.html:17
+#: templates/web/fixmystreet/footer.html:19
msgid "Are you a developer?"
msgstr "Ben je een ontwikkelaar?"
-#: templates/web/fixmystreet/footer.html:20
-#: templates/web/stevenage/footer.html:21
+#: templates/web/fixmystreet/footer.html:23
msgid "Are you from a council?"
msgstr "Ben je van een gemeente?"
@@ -475,7 +459,7 @@ msgstr ""
msgid "Assign to subdivision:"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:141
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:163
#: templates/web/zurich/report/updates.html:11
msgid "Assigned to %s"
msgstr ""
@@ -494,7 +478,6 @@ msgid "Awaiting moderation"
msgstr ""
#: templates/web/default/js/translation_strings.html:32
-#: templates/web/oxfordshire/js/translation_strings.html:26
msgid "Back"
msgstr ""
@@ -506,8 +489,8 @@ msgstr "Verban e-mailadres"
msgid "Be sure to choose the right category, because we use that to determine to whom the report is sent."
msgstr "Kies je categorie nauwkeurig, op basis hiervan bepalen we waarheen je melding wordt verzonden."
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1176
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:249
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1185
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:297
#: templates/web/default/admin/bodies.html:1
#: templates/web/zurich/header.html:64
msgid "Bodies"
@@ -533,18 +516,15 @@ msgid "By Date"
msgstr "Op datum"
#: templates/web/fixmystreet/around/_report_banner.html:10
-#: templates/web/fixmystreet/around/_report_banner.html:8
+#: templates/web/fixmystreet/around/_report_banner.html:9
msgid "Can't see the map? <a href='%s' rel='nofollow'>Skip this step</a>"
msgstr "Kan je de kaart niet zien? <a href='%s' rel='nofollow'>Sla deze stap over</a>"
-#: templates/web/bromley/report/new/fill_in_details_form.html:68
#: templates/web/default/admin/bodies.html:20
#: templates/web/default/admin/body.html:53
#: templates/web/default/admin/index.html:44
#: templates/web/default/report/new/category.html:10
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:74
-#: templates/web/seesomething/report/new/category.html:6
-#: templates/web/southampton/report/new/category.html:3
#: templates/web/zurich/admin/body.html:13
#: templates/web/zurich/admin/index-dm.html:23
#: templates/web/zurich/admin/index-sdm.html:21
@@ -569,7 +549,7 @@ msgstr "Doorloopsnelheid voor problemen in categorie >4 weken oud"
msgid "Category:"
msgstr "Categorie:"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:366
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374
msgid "Category: %s"
msgstr "Categorie: %s"
@@ -618,21 +598,16 @@ msgstr ""
msgid "Click map to report a problem"
msgstr "Klik op de kaart om een probleem te melden"
-#: templates/web/oxfordshire/js/translation_strings.html:39
-#, fuzzy
-msgid "Click on the map to report a problem"
-msgstr "Klik op de kaart om een probleem te melden"
-
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:118
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:140
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:45
#: templates/web/default/admin/report_edit.html:47
#: templates/web/default/dashboard/index.html:142
#: templates/web/default/dashboard/index.html:144
#: templates/web/fixmystreet/report/banner.html:15
-#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:10
#: templates/web/zurich/admin/header.html:12
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/report_edit.html:100
#: templates/web/zurich/admin/report_edit.html:98
#: templates/web/zurich/admin/stats.html:31
@@ -640,11 +615,11 @@ msgstr "Klik op de kaart om een probleem te melden"
msgid "Closed"
msgstr "Gesloten"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:744
+#: perllib/FixMyStreet/DB/Result/Problem.pm:748
msgid "Closed by council"
msgstr "Gesloten door gemeente"
-#: templates/web/default/my/my.html:32 templates/web/fixmystreet/my/my.html:36
+#: templates/web/default/my/my.html:37 templates/web/fixmystreet/my/my.html:43
msgid "Closed reports"
msgstr "Gesloten meldingen"
@@ -652,7 +627,7 @@ msgstr "Gesloten meldingen"
msgid "Closed:"
msgstr "Gesloten:"
-#: templates/web/default/around/tabbed_lists.html:10
+#: templates/web/default/around/tabbed_lists.html:11
#: templates/web/default/around/tabbed_lists.html:12
msgid "Closest nearby problems <small>(within&nbsp;%skm)</small>"
msgstr "Dichtstbijzijnde problemen <small>(binnen %skm)</small>"
@@ -678,9 +653,8 @@ msgid "Cobrand:"
msgstr "Cobrand:"
#: templates/web/default/admin/config_page.html:1
-#, fuzzy
msgid "Configuration"
-msgstr "Bevestiging"
+msgstr ""
#: perllib/FixMyStreet/App/Controller/Admin.pm:421
msgid "Configuration updated - contacts will be generated automatically later"
@@ -710,8 +684,6 @@ msgstr "Bevestig door e-mail beneden en kies een wachtwoord. Als je bevestigd wo
#: templates/web/default/tokens/confirm_update.html:3
#: templates/web/emptyhomes/tokens/confirm_problem.html:1
#: templates/web/emptyhomes/tokens/confirm_problem.html:3
-#: templates/web/southampton/tokens/confirm_problem.html:1
-#: templates/web/southampton/tokens/confirm_problem.html:3
#: templates/web/zurich/tokens/confirm_problem.html:1
#: templates/web/zurich/tokens/confirm_problem.html:3
msgid "Confirmation"
@@ -744,7 +716,6 @@ msgstr "Contactpersoon"
msgid "Contact FixMyStreet"
msgstr "Neem contact op met FixMyStreet"
-#: templates/web/bromley/contact/submit.html:1
#: templates/web/default/contact/index.html:1
#: templates/web/default/contact/index.html:2
#: templates/web/default/contact/submit.html:1
@@ -753,20 +724,18 @@ msgstr "Neem contact op met FixMyStreet"
msgid "Contact Us"
msgstr "Contacteer ons"
-#: templates/web/bromley/contact/submit.html:3
#: templates/web/default/contact/index.html:6
#: templates/web/default/contact/submit.html:3
-#: templates/web/fixmystreet/contact/index.html:19
+#: templates/web/fixmystreet/contact/index.html:22
msgid "Contact the team"
msgstr "Neem contact op met het team"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1310
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1338
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1319
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1347
msgid "Could not find user"
msgstr "Kan de gebruiker niet vinden"
#: templates/web/default/js/translation_strings.html:37
-#: templates/web/oxfordshire/js/translation_strings.html:31
msgid "Could not look up location"
msgstr ""
@@ -821,11 +790,10 @@ msgstr "Huidige status"
#: templates/web/default/admin/bodies.html:7
#: templates/web/default/admin/index.html:5
-#, fuzzy
msgid "Currently no bodies have been created."
-msgstr "Er zijn nog geen problemen gemeld."
+msgstr ""
-#: templates/web/default/dashboard/index.html:5
+#: templates/web/default/dashboard/index.html:6
#: templates/web/default/dashboard/index.html:7
msgid "Dashboard"
msgstr "Dashboard"
@@ -848,11 +816,8 @@ msgstr "Verwijderd"
msgid "Description"
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:54
#: templates/web/default/js/translation_strings.html:34
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66
-#: templates/web/oxfordshire/js/translation_strings.html:28
-#: templates/web/seesomething/report/new/fill_in_details_form.html:16
#: templates/web/zurich/report/new/fill_in_details_form.html:42
msgid "Details"
msgstr "Details"
@@ -890,8 +855,10 @@ msgstr "Heb je een FixMyStreet wachtwoord?"
msgid "Don&rsquo;t know"
msgstr "Geen idee"
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:82
+#: templates/web/fixmystreet/contact/index.html:115
+msgid "Don't like forms?"
+msgstr ""
+
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:47
#: templates/web/default/report/update-form.html:30
@@ -922,9 +889,9 @@ msgid "Edit body details"
msgstr ""
#: templates/web/default/admin/report_edit.html:1
-#: templates/web/zurich/admin/report_edit-sdm.html:1
+#: templates/web/zurich/admin/report_edit-sdm.html:2
#: templates/web/zurich/admin/report_edit-sdm.html:4
-#: templates/web/zurich/admin/report_edit.html:1
+#: templates/web/zurich/admin/report_edit.html:2
#: templates/web/zurich/admin/report_edit.html:5
msgid "Editing problem %d"
msgstr "Bewerk melding %d"
@@ -942,7 +909,6 @@ msgstr "Bewerk gebruiker %d"
msgid "Editor"
msgstr "Redacteur"
-#: templates/web/bromley/report/display.html:128
#: templates/web/default/admin/bodies.html:18
#: templates/web/default/admin/body.html:54
#: templates/web/default/admin/body_edit.html:83
@@ -950,7 +916,6 @@ msgstr "Redacteur"
#: templates/web/default/admin/users.html:16
#: templates/web/fixmystreet/auth/general.html:20
#: templates/web/fixmystreet/report/update-form.html:76
-#: templates/web/seesomething/auth/general.html:20
#: templates/web/zurich/admin/body-form.html:9
#: templates/web/zurich/admin/body.html:14
#: templates/web/zurich/auth/general.html:24
@@ -958,16 +923,15 @@ msgstr "Redacteur"
msgid "Email"
msgstr "Email"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1286
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1295
msgid "Email added to abuse list"
msgstr "Email toegevoegd aan zwarte lijst"
#: templates/web/default/admin/body.html:126
-#, fuzzy
msgid "Email address:"
-msgstr "Jouw e-mailadres:"
+msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1283
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1292
msgid "Email already in abuse list"
msgstr "Email staat al op zwarte lijst"
@@ -991,7 +955,7 @@ msgstr "Email me updates"
msgid "Email:"
msgstr "Email:"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:318
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:323
msgid "Email: %s"
msgstr ""
@@ -1037,15 +1001,14 @@ msgid ""
msgstr ""
#: templates/web/default/admin/stats.html:70
-#, fuzzy
msgid "End Date:"
-msgstr "Einddag:"
+msgstr ""
#: templates/web/default/admin/body-form.html:126
msgid "Endpoint"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:71
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:72
msgid "Enter a Z&uuml;rich street name"
msgstr ""
@@ -1054,26 +1017,26 @@ msgid "Enter a nearby UK postcode, or street name and area"
msgstr "Vul een dichtstbijzijnde UK postcode, of straatnaam en plaats in"
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:25
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:37
msgid "Enter a nearby postcode, or street name and area"
msgstr "Geef dichtstbijzijnde postcode, of straatnaam en plaats"
-#: templates/web/default/around/postcode_form.html:1
#: templates/web/default/around/postcode_form.html:2
-#: templates/web/fixmystreet/around/postcode_form.html:10
#: templates/web/fixmystreet/around/postcode_form.html:11
-#: templates/web/seesomething/around/postcode_form.html:3
-#: templates/web/seesomething/around/postcode_form.html:4
msgid "Enter a nearby street name and area"
msgstr "Geef dichtstbijzijnde straatnaam en plaats"
+#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:9
+#, fuzzy
+msgid "Enter a nearby street name and area, postal code or district in Delhi"
+msgstr "Geef dichtstbijzijnde straatnaam en plaats"
+
#: templates/web/default/auth/general.html:64
#: templates/web/default/report/new/fill_in_details_form.html:169
#: templates/web/default/report/update-form.html:124
msgid "Enter a new password:"
msgstr "Geef nieuw wachtwoord:"
-#: templates/web/bromley/report/display.html:150
-#: templates/web/bromley/report/new/fill_in_details_form.html:189
#: templates/web/fixmystreet/auth/general.html:61
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:211
#: templates/web/fixmystreet/report/update-form.html:122
@@ -1108,7 +1071,6 @@ msgstr "Voorbeelden:"
msgid "Extra data:"
msgstr "Extra info:"
-#: templates/web/bromley/contact/submit.html:14
#: templates/web/default/contact/submit.html:15
msgid "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>."
msgstr "Fout opgetreden bij het versturen van het bericht. Probeer het later nog eens of <a href=\"mailto:%s\">mail ons</a>."
@@ -1122,12 +1084,6 @@ msgstr ""
msgid "Find latest local and national news"
msgstr ""
-#: templates/web/bromley/report/display.html:191
-#: templates/web/bromley/report/new/fill_in_details_form.html:113
-#: templates/web/bromley/report/new/fill_in_details_form.html:160
-msgid "First Name"
-msgstr "Voornaam"
-
#: templates/web/default/questionnaire/index.html:79
#: templates/web/fixmystreet/questionnaire/index.html:73
msgid "First time"
@@ -1168,8 +1124,6 @@ msgid ""
"for the county council."
msgstr "FixMyStreet heeft diverse categorieën per gemeente voor problemen daarom kan het voorkomen dat problemen binnen de gemeentegrenzen niet getoond worden in een bepaalde gemeente."
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:84
#: templates/web/default/admin/index.html:44
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:41
@@ -1194,7 +1148,7 @@ msgstr "Opgelost - Gemeente"
msgid "Fixed - User"
msgstr "Opgelost - Gebruiker"
-#: templates/web/default/my/my.html:27 templates/web/fixmystreet/my/my.html:31
+#: templates/web/default/my/my.html:32 templates/web/fixmystreet/my/my.html:38
msgid "Fixed reports"
msgstr "Opgeloste meldingen"
@@ -1211,7 +1165,7 @@ msgstr ""
msgid "Flag user"
msgstr "Gemarkeerde gebruikr"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1181
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1190
#: templates/web/default/admin/users.html:19
msgid "Flagged"
msgstr "Gemarkeerd"
@@ -1256,11 +1210,9 @@ msgstr "Wachtwoord vergeten?"
#: templates/web/emptyhomes/faq/faq-en-gb.html:1
#: templates/web/fiksgatami/faq/faq-nb.html:1
#: templates/web/fiksgatami/nn/faq/faq-nn.html:1
-#: templates/web/fixmindelo/faq/faq-pt-cv.html:1
#: templates/web/fixmybarangay/faq/faq-en-gb.html:1
#: templates/web/fixmystreet/faq/faq-en-gb.html:1
#: templates/web/fixmystreet/static/privacy.html:1
-#: templates/web/oxfordshire/faq/faq-en-gb.html:1
msgid "Frequently Asked Questions"
msgstr "Veelgestelde Vragen"
@@ -1268,19 +1220,18 @@ msgstr "Veelgestelde Vragen"
msgid "GeoRSS on Google Maps"
msgstr "GeoRSS op Google Maps"
-#: templates/web/bromley/report/display.html:30
#: templates/web/fixmystreet/around/_updates.html:3
#: templates/web/fixmystreet/report/display.html:38
msgid "Get updates"
msgstr "Updates ontvangen"
-#: templates/web/fixmystreet/reports/_rss.html:3
+#: templates/web/fixmystreet/reports/_rss.html:4
#: templates/web/fixmystreet/reports/_rss.html:9
msgid "Get updates of %s problems"
msgstr "Updates over %s problemen ontvangen"
#: templates/web/fixmystreet/reports/_rss.html:11
-#: templates/web/fixmystreet/reports/_rss.html:3
+#: templates/web/fixmystreet/reports/_rss.html:4
msgid "Get updates of problems in this %s"
msgstr "Updates in deze %s ontvangen"
@@ -1293,7 +1244,6 @@ msgstr "Geef me een RSS feed"
#: templates/web/default/alert/index.html:34
#: templates/web/default/around/postcode_form.html:8
#: templates/web/fixmystreet/around/postcode_form.html:21
-#: templates/web/seesomething/around/postcode_form.html:10
#: templates/web/zurich/admin/stats.html:26
msgid "Go"
msgstr "Gaan"
@@ -1320,19 +1270,12 @@ msgstr "Is dit probleem opgelost?"
msgid "Have you ever reported a problem to a council before, or is this your first time?"
msgstr "Heb je al eens eerder een probleem aan de gemeente gemeld, of is dit jouw eerste keer?"
-#: templates/web/barnet/footer.html:24 templates/web/bromley/footer.html:25
-#: templates/web/bromley/header.html:81 templates/web/default/footer.html:15
+#: templates/web/default/footer.html:15
#: templates/web/emptyhomes/header.html:33
#: templates/web/fiksgatami/footer.html:9
#: templates/web/fiksgatami/nn/footer.html:9
-#: templates/web/fixmindelo/footer.html:45
#: templates/web/fixmybarangay/footer.html:24
-#: templates/web/fixmystreet/footer.html:52
-#: templates/web/oxfordshire/footer.html:27
-#: templates/web/oxfordshire/header.html:75
-#: templates/web/reading/footer.html:10
-#: templates/web/seesomething/footer.html:13
-#: templates/web/stevenage/footer.html:47
+#: templates/web/fixmystreet/footer.html:55
#: templates/web/zurich/faq/faq-de-ch.html:1
#: templates/web/zurich/footer.html:21
#: templates/web/zurich/nav_over_content.html:8
@@ -1344,13 +1287,9 @@ msgstr "Help"
msgid "Here are the types of local problem alerts for &lsquo;%s&rsquo;."
msgstr "Hier zijn de soorten meldingen van lokale problemen voor '%s'."
-#: templates/web/barnet/header.html:70 templates/web/bromley/header.html:64
-#: templates/web/bromley/header.html:99
#: templates/web/fixmybarangay/header.html:66
-#: templates/web/fixmystreet/header.html:50
-#: templates/web/oxfordshire/header.html:111
-#: templates/web/oxfordshire/header.html:47
-#: templates/web/stevenage/header.html:97 templates/web/zurich/footer.html:11
+#: templates/web/fixmystreet/header.html:53
+#: templates/web/zurich/footer.html:11
msgid "Hi %s"
msgstr "Hoi %s"
@@ -1358,8 +1297,8 @@ msgstr "Hoi %s"
#: templates/web/default/admin/report_edit.html:50
#: templates/web/default/admin/report_edit.html:51
#: templates/web/default/admin/update_edit.html:28
-#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:11
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/report_edit.html:89
#: templates/web/zurich/admin/report_edit.html:93
#: templates/web/zurich/admin/stats.html:32
@@ -1380,7 +1319,6 @@ msgid "History"
msgstr "Geschiedenis"
#: templates/web/default/js/translation_strings.html:31
-#: templates/web/oxfordshire/js/translation_strings.html:25
msgid "Home"
msgstr ""
@@ -1389,7 +1327,6 @@ msgid "How to report a problem"
msgstr "Hoe een melding maken"
#: templates/web/default/js/translation_strings.html:33
-#: templates/web/oxfordshire/js/translation_strings.html:27
msgid "How to send successful reports"
msgstr ""
@@ -1405,7 +1342,7 @@ msgstr "Ik ben bang dat we je melding niet kunnen vinden in onze database.\n"
msgid "I'm afraid we couldn't validate that token, as the report was made too long ago."
msgstr "Ik ben bang dat we je token niet kunnen valideren omdat de melding te oud is."
-#: perllib/FixMyStreet/App/Controller/Tokens.pm:259
+#: perllib/FixMyStreet/App/Controller/Tokens.pm:260
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 "Ik ben bang dat we je token niet kunnen valideren. Als je de URL uit een e-mail hebt gekopieerd kan je controleren of je hem volledig hebt gekopieerd.\n"
@@ -1445,7 +1382,6 @@ msgstr ""
msgid "If you do not, your update will not be posted."
msgstr ""
-#: templates/web/default/report/new/councils_text_none.html:8
#: templates/web/default/report/new/councils_text_none.html:9
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 "Het onderwerp en details van het probleem worden publiek zichtbaar als je deze instuurt, maar het probleem zal <strong>niet</strong> worden verzonden aan de gemeente."
@@ -1494,7 +1430,7 @@ msgid ""
" when they are shown on the site. Enter the ID (number) of that user."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Contact.pm:111
+#: perllib/FixMyStreet/App/Controller/Contact.pm:116
msgid "Illegal ID"
msgstr "Illegaal ID"
@@ -1502,8 +1438,6 @@ msgstr "Illegaal ID"
msgid "Illegal feed selection"
msgstr "Illegale RSS feed selectie"
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:82
#: templates/web/default/dashboard/index.html:142
#: templates/web/default/dashboard/index.html:144
#: templates/web/default/report/update-form.html:30
@@ -1514,29 +1448,24 @@ msgid "In Progress"
msgstr "In Behandeling"
#: templates/web/default/admin/flagged.html:39
-#, fuzzy
msgid "In abuse table?"
-msgstr "(Email in misbruiktabel)"
+msgstr ""
#: templates/web/default/open311/index.html:90
msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
msgstr "Daarnaast worden de volgende attributen, die niet onderdeel zijn van de Open311 v2 specificatie meegestuurd: agency_sent_datetime, title (ook meegestuurd als onderdeel van de description), interface_used, comment_count, requestor_name (alleen aanwezig als deze getoond mag worden op de site)."
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:121
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:143
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:38
#: templates/web/fixmystreet/report/banner.html:19
-#: templates/web/zurich/admin/header.html:1
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/header.html:8
#: templates/web/zurich/admin/report_edit.html:102
#: templates/web/zurich/report/banner.html:15
msgid "In progress"
msgstr "In Behandeling"
-#: templates/web/seesomething/report/new/fill_in_details_form.html:38
-msgid "Incident Category"
-msgstr ""
-
#: templates/web/zurich/admin/report_edit.html:163
msgid "Include reporter personal details"
msgstr ""
@@ -1562,7 +1491,7 @@ msgstr ""
msgid "Invalid agency_responsible value %s"
msgstr "Ongeldige agency_responsible waarde %s"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1096
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1105
msgid "Invalid end date"
msgstr "Ongeldige einddatum"
@@ -1570,12 +1499,10 @@ msgstr "Ongeldige einddatum"
msgid "Invalid format %s specified."
msgstr "Ongeldig formaat %s gespecifieerd"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1092
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1101
msgid "Invalid start date"
msgstr "Ongeldige startdatum"
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:81
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:37
#: templates/web/default/dashboard/index.html:142
@@ -1587,30 +1514,25 @@ msgstr "Ongeldige startdatum"
msgid "Investigating"
msgstr "Onderzoeken"
-#: templates/web/emptyhomes/tokens/confirm_problem.html:12
+#: templates/web/emptyhomes/tokens/confirm_problem.html:13
#: templates/web/emptyhomes/tokens/confirm_problem.html:14
msgid "It is worth noting however that the process can sometimes be slow, especially if the property is in very poor repair or the owner is unwilling to act. In most cases it can take six months or more before you can expect to see anything change and sometimes there may be considerable barries to a property being brought back into use. This doesn&rsquo;t mean the council isn&rsquo;t doing anything. We encourage councils to update the website so you can see what is happening. It may be a long process, but you reporting your concerns about this property to the council is a valuable first step."
msgstr "It is worth noting however that the process can sometimes be slow, especially if the property is in very poor repair or the owner is unwilling to act. In most cases it can take six months or more before you can expect to see anything change and sometimes there may be considerable barries to a property being brought back into use. This doesn&rsquo;t mean the council isn&rsquo;t doing anything. We encourage councils to update the website so you can see what is happening. It may be a long process, but you reporting your concerns about this property to the council is a valuable first step."
-#: templates/web/bromley/report/display.html:168
-#: templates/web/bromley/report/new/fill_in_details_form.html:209
+#: templates/web/fixmystreet/contact/blurb.html:8
+msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there."
+msgstr ""
+
#: templates/web/default/auth/general.html:44
#: templates/web/default/report/new/fill_in_details_form.html:149
#: templates/web/default/report/update-form.html:104
#: templates/web/fixmystreet/auth/general.html:46
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:172
#: templates/web/fixmystreet/report/update-form.html:100
-#: templates/web/seesomething/auth/general.html:35
#: templates/web/zurich/auth/general.html:40
msgid "Keep me signed in on this computer"
msgstr "Hou me ingelogd op deze computer"
-#: templates/web/bromley/report/display.html:197
-#: templates/web/bromley/report/new/fill_in_details_form.html:119
-#: templates/web/bromley/report/new/fill_in_details_form.html:166
-msgid "Last Name"
-msgstr "Achternaam"
-
#: templates/web/default/admin/body.html:58
#: templates/web/zurich/admin/body.html:15
msgid "Last editor"
@@ -1633,11 +1555,9 @@ msgstr ""
msgid "List all reported problems"
msgstr "Toon alle meldingen"
-#: templates/web/bromley/report/new/fill_in_details_form.html:69
#: templates/web/default/report/new/fill_in_details_form.html:68
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:51
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:75
-#: templates/web/seesomething/report/new/fill_in_details_form.html:25
#: templates/web/zurich/report/new/fill_in_details_form.html:51
msgid "Loading..."
msgstr "Laden..."
@@ -1646,7 +1566,7 @@ msgstr "Laden..."
#: templates/web/default/alert/choose.html:3
#: templates/web/default/alert/index.html:1
#: templates/web/default/alert/index.html:3
-#: templates/web/default/alert/list.html:1
+#: templates/web/default/alert/list.html:2
#: templates/web/default/alert/list.html:5
#: templates/web/default/alert/updates.html:1
#: templates/web/default/tokens/confirm_alert.html:1
@@ -1659,23 +1579,17 @@ msgstr "Laden..."
msgid "Local RSS feeds and email alerts"
msgstr "Lokale RSS feeds en e-mail meldingen"
-#: templates/web/default/alert/list.html:1
-#: templates/web/default/alert/list.html:12
+#: templates/web/default/alert/list.html:13
#: templates/web/default/alert/list.html:14
+#: templates/web/default/alert/list.html:2
#: templates/web/default/alert/list.html:3
msgid "Local RSS feeds and email alerts for ‘%s’"
msgstr "Lokale RSS feeds en e-mail meldingen voor '%s'"
-#: templates/web/barnet/footer.html:22 templates/web/bromley/footer.html:23
-#: templates/web/bromley/header.html:79 templates/web/default/footer.html:13
-#: templates/web/fiksgatami/footer.html:8
+#: templates/web/default/footer.html:13 templates/web/fiksgatami/footer.html:8
#: templates/web/fiksgatami/nn/footer.html:8
-#: templates/web/fixmindelo/footer.html:43
#: templates/web/fixmybarangay/footer.html:22
-#: templates/web/fixmystreet/footer.html:50
-#: templates/web/oxfordshire/footer.html:25
-#: templates/web/oxfordshire/header.html:71
-#: templates/web/reading/footer.html:9 templates/web/stevenage/footer.html:45
+#: templates/web/fixmystreet/footer.html:53
msgid "Local alerts"
msgstr "Lokale melding"
@@ -1684,7 +1598,6 @@ msgid "Locate the problem on a map of the area"
msgstr "Vind het probleem op de kaart van de omgeving"
#: templates/web/default/js/translation_strings.html:43
-#: templates/web/oxfordshire/js/translation_strings.html:37
msgid "MAP"
msgstr ""
@@ -1696,11 +1609,11 @@ msgstr "Kaart &copy; <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\">O
msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
msgstr ""
-#: templates/web/fixmystreet/contact/index.html:98
+#: templates/web/fixmystreet/contact/index.html:103
msgid "Message"
msgstr "Bericht"
-#: templates/web/default/contact/index.html:90
+#: templates/web/default/contact/index.html:92
msgid "Message:"
msgstr "Bericht:"
@@ -1742,10 +1655,6 @@ msgstr "Meer problemen dichtbij"
msgid "Name"
msgstr "Naam"
-#: templates/web/seesomething/report/new/fill_in_details_form.html:74
-msgid "Name (optional)"
-msgstr ""
-
#: templates/web/default/admin/report_edit.html:66
#: templates/web/default/admin/update_edit.html:32
#: templates/web/default/admin/user-form.html:18
@@ -1755,30 +1664,30 @@ msgstr ""
msgid "Name:"
msgstr "Naam:"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:317
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:322
msgid "Name: %s"
msgstr ""
#: templates/web/fiksgatami/footer.html:3
#: templates/web/fiksgatami/nn/footer.html:3
-#: templates/web/reading/footer.html:4
msgid "Navigation"
msgstr "Navigatie:"
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:188
#: perllib/FixMyStreet/Geocode/OSM.pm:166
msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
msgstr "Dichtstbijzijnde straat met naam voor lokatie op de kaart (automatisch gegenereerd via OpenStreetMap): %s%s"
-#: perllib/FixMyStreet/Cobrand/UK.pm:148
+#: perllib/FixMyStreet/Cobrand/UK.pm:142
msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
msgstr "Dichtstbijzijnde postcode voor lokatie op de kaart (automatisch gegenereerd): %s (%sm afstand)"
-#: perllib/FixMyStreet/Cobrand/Default.pm:418
-#: perllib/FixMyStreet/Cobrand/Default.pm:458
+#: perllib/FixMyStreet/Cobrand/Default.pm:421
+#: perllib/FixMyStreet/Cobrand/Default.pm:461
msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
msgstr "Dichtstbijzijnde straat voor lokatie op de kaart (automatisch gegenereerd via Bing Maps): %s"
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:273
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:297
msgid ""
"Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
"\n"
@@ -1920,14 +1829,12 @@ msgid "No edits have yet been made."
msgstr "Geen bewerkingen gedaan."
#: templates/web/default/admin/flagged.html:25
-#, fuzzy
msgid "No flagged problems found."
-msgstr "Geen gemarkeerde problemen gevonden"
+msgstr ""
#: templates/web/default/admin/flagged.html:58
-#, fuzzy
msgid "No flagged users found."
-msgstr "Geen gemarkeerde gebruikers gevonden"
+msgstr ""
#: templates/web/zurich/admin/report_edit-sdm.html:68
msgid "No further updates"
@@ -1944,7 +1851,6 @@ msgid "No problems have been reported yet."
msgstr "Er zijn nog geen problemen gemeld."
#: templates/web/default/js/translation_strings.html:38
-#: templates/web/oxfordshire/js/translation_strings.html:32
msgid "No result returned"
msgstr ""
@@ -1955,7 +1861,7 @@ msgid ""
" your config file is not pointing to a live MapIt service."
msgstr ""
-#: templates/web/default/report/_support.html:2
+#: templates/web/default/report/_support.html:3
#: templates/web/default/report/_support.html:4
msgid "No supporters"
msgstr "Geen medestanders"
@@ -1979,8 +1885,6 @@ msgid ""
" activity across their body), the ability to hide reports or set special report statuses."
msgstr ""
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:83
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:46
#: templates/web/default/report/update-form.html:30
@@ -2039,7 +1943,6 @@ msgid "Now to submit your update&hellip; do you have a FixMyStreet password?"
msgstr "Nu om je update te verzend&hellip; heb je een FixMyStreet wachtwoord?"
#: templates/web/default/js/translation_strings.html:42
-#: templates/web/oxfordshire/js/translation_strings.html:36
msgid "OK"
msgstr ""
@@ -2083,8 +1986,7 @@ msgstr "Ouder opgelost"
msgid "Older problems"
msgstr "Oudere problemen"
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:115
-#: templates/web/bromley/report/display.html:80
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:137
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:36
#: templates/web/default/admin/report_edit.html:37
@@ -2092,7 +1994,7 @@ msgstr "Oudere problemen"
#: templates/web/default/dashboard/index.html:142
#: templates/web/default/report/update-form.html:30
#: templates/web/fixmystreet/report/update-form.html:28
-#: templates/web/zurich/admin/header.html:1
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/header.html:7
#: templates/web/zurich/admin/report_edit.html:89
#: templates/web/zurich/admin/report_edit.html:91
@@ -2101,7 +2003,7 @@ msgstr "Oudere problemen"
msgid "Open"
msgstr "Open"
-#: templates/web/default/my/my.html:22 templates/web/fixmystreet/my/my.html:26
+#: templates/web/default/my/my.html:27 templates/web/fixmystreet/my/my.html:33
msgid "Open reports"
msgstr "Open meldingen"
@@ -2127,15 +2029,15 @@ msgstr "Of problemen gemeld aan:"
msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
msgstr "Of je kan je abonneren op een melding gebaseerd op welke gemeente je woont:"
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1053
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:664
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:665
-#: perllib/FixMyStreet/DB/Result/Problem.pm:544
-#: perllib/FixMyStreet/DB/Result/Problem.pm:554
-#: perllib/FixMyStreet/DB/Result/Problem.pm:564
-#: perllib/FixMyStreet/DB/Result/Problem.pm:576
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:361
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1057
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:662
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:663
+#: perllib/FixMyStreet/DB/Result/Problem.pm:546
+#: perllib/FixMyStreet/DB/Result/Problem.pm:556
+#: perllib/FixMyStreet/DB/Result/Problem.pm:566
+#: perllib/FixMyStreet/DB/Result/Problem.pm:578
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:369
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:384
msgid "Other"
msgstr "Anders"
@@ -2162,8 +2064,6 @@ msgstr ""
msgid "Partial"
msgstr "Gedeeltelijk"
-#: templates/web/bromley/report/display.html:147
-#: templates/web/bromley/report/new/fill_in_details_form.html:186
#: templates/web/fixmystreet/auth/general.html:59
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:208
#: templates/web/fixmystreet/report/update-form.html:119
@@ -2181,19 +2081,15 @@ msgid "Permalink"
msgstr ""
#: templates/web/zurich/report/new/fill_in_details_form.html:106
-#, fuzzy
msgid "Phone number"
-msgstr "Je telefoonnummer"
+msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:136
-#: templates/web/bromley/report/new/fill_in_details_form.html:183
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:138
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:205
-#: templates/web/seesomething/report/new/fill_in_details_form.html:89
msgid "Phone number (optional)"
msgstr "Telefoonnummer (optioneel)"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:282
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:287
#: templates/web/default/admin/report_edit.html:68
#: templates/web/default/report/new/fill_in_details_form.html:215
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:138
@@ -2203,11 +2099,8 @@ msgstr "Telefoonnummer (optioneel)"
msgid "Phone:"
msgstr "Telefoonnummer:"
-#: templates/web/bromley/report/display.html:111
-#: templates/web/bromley/report/new/fill_in_details_form.html:104
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:92
#: templates/web/fixmystreet/report/update-form.html:59
-#: templates/web/seesomething/report/new/fill_in_details_form.html:52
#: templates/web/zurich/admin/index-dm.html:29
#: templates/web/zurich/admin/index-sdm.html:24
#: templates/web/zurich/admin/reports.html:16
@@ -2229,7 +2122,6 @@ msgid "Photos of recent nearby reports"
msgstr "Foto's van recente meldingen dichtbij"
#: templates/web/default/js/translation_strings.html:30
-#: templates/web/oxfordshire/js/translation_strings.html:24
msgid "Place pin on map"
msgstr ""
@@ -2237,7 +2129,7 @@ msgstr ""
#: templates/web/default/admin/report_edit.html:38
#: templates/web/default/dashboard/index.html:142
#: templates/web/default/dashboard/index.html:143
-#: templates/web/zurich/admin/header.html:1
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/header.html:9
#: templates/web/zurich/admin/index-dm.html:9
#: templates/web/zurich/admin/report_edit.html:89
@@ -2251,7 +2143,6 @@ msgstr "<a class=\"tab_link\" href=\"#report\">Neem een kijkje</a> bij de update
#: templates/web/default/report/new/notes.html:6
#: templates/web/fixmystreet/report/new/notes.html:6
-#: templates/web/oxfordshire/report/new/notes.html:5
msgid "Please be polite, concise and to the point."
msgstr "Wees beleefd, precies en beknopt"
@@ -2268,20 +2159,16 @@ msgstr "Controleer je e-mail"
#: templates/web/default/auth/general.html:8
#: templates/web/fixmystreet/auth/general.html:15
#: templates/web/fixmystreet/auth/general.html:9
-#: templates/web/seesomething/auth/general.html:15
-#: templates/web/seesomething/auth/general.html:9
#: templates/web/zurich/auth/general.html:3
#: templates/web/zurich/auth/general.html:9
msgid "Please check your email address is correct"
msgstr "Controleer of je e-mailadres klopt"
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:848
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:855
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:874
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:917
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:859
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:878
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:921
#: perllib/FixMyStreet/DB/Result/Problem.pm:381
#: templates/web/default/js/translation_strings.html:9
-#: templates/web/oxfordshire/js/translation_strings.html:9
msgid "Please choose a category"
msgstr "Kies een categorie"
@@ -2289,19 +2176,8 @@ msgstr "Kies een categorie"
msgid "Please choose a property type"
msgstr "Kies een pand type"
-#: templates/web/seesomething/js/translation_strings.html:6
-msgid "Please choose a transport category"
-msgstr ""
-
-#: templates/web/seesomething/js/translation_strings.html:7
-msgid "Please choose an incident category"
-msgstr ""
-
-#: templates/web/bromley/report/new/fill_in_details_form.html:64
-msgid "Please describe the exact location of the report. Example: “2 dumped mattresses outside Number 19 Stockwell Close”"
-msgstr "Beschrijf de lokatie gedetailleerd. Bijvoorbeeld: \"2 matrassen achtergelaten bij Spoorlaan 19\""
-
#: templates/web/default/contact/blurb.html:2
+#: templates/web/fixmystreet/contact/blurb.html:12
msgid ""
"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"
@@ -2310,7 +2186,6 @@ msgstr "Maak alsjeblieft <strong>geen</strong> meldingen van problemen via dit f
#: templates/web/default/report/new/notes.html:7
#: templates/web/fixmystreet/report/new/notes.html:7
-#: templates/web/oxfordshire/report/new/notes.html:6
msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the service for all users."
msgstr ""
@@ -2320,7 +2195,6 @@ msgstr ""
#: perllib/FixMyStreet/DB/Result/Comment.pm:126
#: templates/web/default/js/translation_strings.html:2
-#: templates/web/oxfordshire/js/translation_strings.html:2
msgid "Please enter a message"
msgstr "Geef bericht in"
@@ -2333,19 +2207,14 @@ msgstr "Geef wachtwoord"
#: perllib/FixMyStreet/App/Controller/Contact.pm:97
#: perllib/FixMyStreet/DB/Result/Problem.pm:356
#: templates/web/default/js/translation_strings.html:3
-#: templates/web/oxfordshire/js/translation_strings.html:3
msgid "Please enter a subject"
msgstr "Geef onderwerp"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1032
-#: perllib/FixMyStreet/App/Controller/Admin.pm:979
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1041
+#: perllib/FixMyStreet/App/Controller/Admin.pm:988
#: perllib/FixMyStreet/DB/Result/User.pm:115
#: templates/web/default/js/translation_strings.html:12
#: templates/web/default/js/translation_strings.html:16
-#: templates/web/oxfordshire/js/translation_strings.html:12
-#: templates/web/oxfordshire/js/translation_strings.html:16
-#: templates/web/seesomething/js/translation_strings.html:10
-#: templates/web/seesomething/js/translation_strings.html:13
msgid "Please enter a valid email"
msgstr "Geef een geldig e-mailadres"
@@ -2356,8 +2225,6 @@ msgstr "Geef een geldig e-mailadres"
#: perllib/FixMyStreet/DB/Result/Problem.pm:359
#: templates/web/default/js/translation_strings.html:4
-#: templates/web/oxfordshire/js/translation_strings.html:4
-#: templates/web/seesomething/js/translation_strings.html:2
msgid "Please enter some details"
msgstr "Geef details"
@@ -2369,32 +2236,22 @@ msgstr "Geef details"
#: templates/web/default/js/translation_strings.html:15
#: templates/web/fixmystreet/auth/general.html:14
#: templates/web/fixmystreet/auth/general.html:9
-#: templates/web/oxfordshire/js/translation_strings.html:11
-#: templates/web/oxfordshire/js/translation_strings.html:15
-#: templates/web/seesomething/auth/general.html:14
-#: templates/web/seesomething/auth/general.html:9
-#: templates/web/seesomething/js/translation_strings.html:9
#: templates/web/zurich/auth/general.html:3
#: templates/web/zurich/auth/general.html:8
msgid "Please enter your email"
msgstr "Geef een geldig e-mailadres"
-#: templates/web/bromley/report/new/fill_in_details_form.html:149
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:151
-#: templates/web/seesomething/report/new/fill_in_details_form.html:85
#: templates/web/zurich/report/new/fill_in_details_form.html:92
msgid "Please enter your email address"
msgstr "Geef een geldig e-mailadres"
#: templates/web/default/js/translation_strings.html:25
-#: templates/web/oxfordshire/js/translation_strings.html:19
msgid "Please enter your first name"
msgstr "Geef je voornaam"
#: perllib/FixMyStreet/DB/Result/Problem.pm:374
#: templates/web/default/js/translation_strings.html:7
-#: templates/web/oxfordshire/js/translation_strings.html:7
-#: templates/web/seesomething/js/translation_strings.html:4
msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
msgstr "Geef je volledige naam, gemeentes hebben deze informatie nodig. Mocht je niet willen dat je naam op de site getoond wordt, haal dan de vink beneden weg."
@@ -2403,22 +2260,18 @@ msgstr "Geef je volledige naam, gemeentes hebben deze informatie nodig. Mocht je
#: perllib/FixMyStreet/DB/Result/Problem.pm:367
#: perllib/FixMyStreet/DB/Result/User.pm:108
#: templates/web/default/js/translation_strings.html:6
-#: templates/web/oxfordshire/js/translation_strings.html:6
msgid "Please enter your name"
msgstr "Geef je naam"
#: templates/web/default/js/translation_strings.html:22
-#, fuzzy
msgid "Please enter your phone number"
-msgstr "Geef je tweede naam"
+msgstr ""
#: templates/web/default/js/translation_strings.html:26
-#: templates/web/oxfordshire/js/translation_strings.html:20
msgid "Please enter your second name"
msgstr "Geef je tweede naam"
#: templates/web/default/js/translation_strings.html:24
-#: templates/web/oxfordshire/js/translation_strings.html:18
msgid "Please enter your title"
msgstr "Geef je titel"
@@ -2437,16 +2290,16 @@ msgid ""
"to read, as does a lack of punctuation."
msgstr "Geef details van het leegstaande pand beneden. Vermeld welk type pand het is bijvoorbeeld een leegstaande woning, flatgebouw, kantoor etc. Vertel ook iets over de staat en andere informatie die je relevant lijkt. Je hoeft niet het adres te vermelden. Wees beleefd, helder en beknopt. Je bericht in volledige kapitalen schrijven maakt je bericht moeilijk leesbaar, net zoals het ontbreken van interpunctie."
-#: templates/web/default/report/new/fill_in_details_text.html:1
#: templates/web/default/report/new/fill_in_details_text.html:11
-#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1
+#: templates/web/default/report/new/fill_in_details_text.html:2
#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:10
-#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:2
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:2
#: templates/web/fixmystreet/report/new/fill_in_details_text.html:8
msgid "Please fill in details of the problem below."
msgstr "Vul de details van het probleem beneden in."
-#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:2
#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:3
msgid ""
"Please fill in details of the problem below. Leave as much detail as you can, \n"
@@ -2454,7 +2307,7 @@ msgid ""
"the problem (e.g. if there is a streetlight number or road name)."
msgstr "Vul zoveel mogelijk details van het probleem beneden in. Vermeld, indien mogelijk, ook de exacte locatie van het probleem (bijvoorbeeld lantarenpaalnummer of straatnaam)."
-#: templates/web/default/report/new/fill_in_details_text.html:1
+#: templates/web/default/report/new/fill_in_details_text.html:2
#: templates/web/default/report/new/fill_in_details_text.html:3
msgid ""
"Please fill in details of the problem below. The council won't be able\n"
@@ -2464,12 +2317,10 @@ msgid ""
msgstr "Vul zoveel mogelijk details van het probleem beneden in. De gemeente kan niet helpen als ze niet genoeg informatie hebben. Vermeld daarom indien mogelijk de exacte locatie (bijvoorbeeld: op muur), wat het is, hoelang het zich al voordoet en een beschrijving (of foto als je die hebt) etc."
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:70
-#: templates/web/seesomething/report/new/fill_in_details_form.html:20
#: templates/web/zurich/report/new/fill_in_details_form.html:46
msgid "Please fill in details of the problem."
msgstr "Vul de details van het probleem in."
-#: templates/web/bromley/report/new/fill_in_details_form.html:28
#: templates/web/default/report/new/fill_in_details_form.html:27
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:26
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:35
@@ -2481,7 +2332,7 @@ msgstr "Vul zoveel mogelijk details in het veld beneden in. Vermeld ook de locat
msgid "Please indicate whether you'd like to receive another questionnaire"
msgstr "Geef aan of je een vragenlijst wilt ontvangen"
-#: templates/web/fixmystreet/report/updates-sidebar-notes.html:3
+#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4
msgid "Please note that updates are not sent to the council."
msgstr "Let op, updates worden niet aan de gemeente verzonden."
@@ -2489,11 +2340,6 @@ msgstr "Let op, updates worden niet aan de gemeente verzonden."
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 "Let op, updates worden niet aan de gemeente verzonden. Als je je naam achterlaat zal het publiekelijk getoond worden. Jouw gegevens worden alleen gebruikt volgens de vermeldingen van onze <a href=\"/faq#privacy\">privacy policy</a>"
-#: templates/web/barnet/report/updates-sidebar-notes.html:1
-msgid "Please note that updates are not sent to the relevant department. 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 "Let op, updates worden niet aan de gemeente verzonden. Als je je naam achterlaat zal het publiekelijk getoond worden. Jouw gegevens worden alleen gebruikt volgens de vermeldingen van onze <a href=\"/faq#privacy\">privacy policy</a>"
-
-#: templates/web/bromley/report/new/fill_in_details_form.html:23
#: templates/web/default/report/new/fill_in_details_form.html:5
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:5
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:26
@@ -2504,7 +2350,6 @@ msgstr "Let op dat je melding <strong>nog niet is verzonden</strong>. Kies een c
#: templates/web/default/report/new/notes.html:1
#: templates/web/fixmybarangay/report/new/notes.html:1
#: templates/web/fixmystreet/report/new/notes.html:1
-#: templates/web/oxfordshire/report/new/notes.html:1
msgid "Please note:"
msgstr "Let op:"
@@ -2549,19 +2394,15 @@ msgstr "Upload alleen JPEG foto's\n"
msgid "Please write a message"
msgstr "Schrijf een bericht"
-#: templates/web/bromley/report/display.html:70
#: templates/web/fixmystreet/report/update-form.html:23
msgid "Please write your update here"
msgstr "Schrijf je update hier"
-#: templates/web/bromley/report/display.html:123
-#: templates/web/bromley/report/display.html:151
-#: templates/web/bromley/report/display.html:163
-#: templates/web/default/contact/index.html:93
+#: templates/web/default/contact/index.html:95
#: templates/web/default/report/update-form.html:109
#: templates/web/default/report/update-form.html:131
#: templates/web/default/report/update-form.html:72
-#: templates/web/fixmystreet/contact/index.html:105
+#: templates/web/fixmystreet/contact/index.html:110
#: templates/web/fixmystreet/report/update-form.html:123
#: templates/web/fixmystreet/report/update-form.html:71
#: templates/web/fixmystreet/report/update-form.html:95
@@ -2594,7 +2435,7 @@ msgstr "Privé"
msgid "Private information (not shown on site)"
msgstr ""
-#: templates/web/default/maps/openlayers.html:85
+#: templates/web/default/maps/openlayers.html:86
msgid "Problem"
msgstr "Probleem"
@@ -2615,7 +2456,7 @@ msgstr "Probleem %s verzonden naar gemeente %s"
msgid "Problem breakdown by state"
msgstr "Probleem verdeeld per status"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:950
+#: perllib/FixMyStreet/App/Controller/Admin.pm:959
msgid "Problem marked as open."
msgstr "Probleem gemarkeerd als open"
@@ -2631,7 +2472,6 @@ msgstr "Problemen"
msgid "Problems in this area"
msgstr "Problemen in dit gebied"
-#: templates/web/bromley/report/display.html:31
#: templates/web/fixmystreet/around/tabbed_lists.html:4
#: templates/web/fixmystreet/report/display.html:46
msgid "Problems nearby"
@@ -2651,15 +2491,16 @@ msgstr "Recent gemelde problemen op FixMyStreet"
msgid "Problems within %.1fkm of this location"
msgstr "Problemen binnen een straal van %.1fkm van deze lokatie"
-#: perllib/FixMyStreet/Cobrand/Default.pm:626
+#: perllib/FixMyStreet/Cobrand/Default.pm:629
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:109
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155
-#: perllib/FixMyStreet/Cobrand/UK.pm:228
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:184
+#: perllib/FixMyStreet/Cobrand/UK.pm:222
msgid "Problems within %s"
msgstr "Problemen binnen %s"
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117
-#: perllib/FixMyStreet/Cobrand/UK.pm:242
+#: perllib/FixMyStreet/Cobrand/UK.pm:236
msgid "Problems within %s ward"
msgstr "Problemen binnen wijk %s"
@@ -2687,12 +2528,10 @@ msgstr ""
msgid "Property type:"
msgstr "Pand soort:"
-#: templates/web/bromley/report/new/fill_in_details_form.html:52
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:64
msgid "Provide a title"
msgstr "Geef een titel op"
-#: templates/web/bromley/report/display.html:57
#: templates/web/default/report/update-form.html:3
#: templates/web/fixmystreet/report/update-form.html:4
msgid "Provide an update"
@@ -2702,11 +2541,6 @@ msgstr "Geef een update"
msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:180
-msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
-msgstr "Het is optioneel om een wachtwoord op de geven, maar hiermee is het makkelijker om in de toekomst problemen te melden, updates te plaatsen en je meldingen te beheren."
-
-#: templates/web/bromley/report/display.html:144
#: templates/web/default/report/new/fill_in_details_form.html:173
#: templates/web/default/report/update-form.html:128
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:202
@@ -2737,7 +2571,6 @@ msgstr ""
msgid "Publish the response"
msgstr ""
-#: templates/web/default/questionnaire/completed.html:1
#: templates/web/default/questionnaire/completed.html:2
#: templates/web/default/questionnaire/index.html:0
#: templates/web/default/questionnaire/index.html:14
@@ -2761,9 +2594,7 @@ msgstr "Vragenlijst %d verzonden voor probleem %d"
msgid "Questionnaire filled in by problem reporter"
msgstr "Vragenlijst ingevuld door melder"
-#: templates/web/bromley/report/display.html:37
#: templates/web/default/alert/_list.html:21
-#: templates/web/default/around/display_location.html:1
#: templates/web/default/around/display_location.html:3
#: templates/web/default/report/display.html:46
#: templates/web/default/reports/_rss.html:1
@@ -2773,11 +2604,11 @@ msgstr "Vragenlijst ingevuld door melder"
msgid "RSS feed"
msgstr "RSS feed"
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:265 perllib/FixMyStreet/Cobrand/UK.pm:277
msgid "RSS feed for %s"
msgstr "RSS feed voor %s"
-#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289
+#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
msgid "RSS feed for %s ward, %s"
msgstr "RSS feed voor wijk %s, %s"
@@ -2785,11 +2616,15 @@ msgstr "RSS feed voor wijk %s, %s"
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:189
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:197
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:309
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:200
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:208
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:218
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:226
+#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303
msgid "RSS feed of %s"
msgstr "RSS feed van %s"
-#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:314
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:308
msgid "RSS feed of %s, within %s ward"
msgstr "RSS feed van %s, binnen wijk %s"
@@ -2802,31 +2637,30 @@ msgstr "RSS feed van nabije problemen"
msgid "RSS feed of problems in this %s"
msgstr "RSS feed van problemen in dit %s"
-#: perllib/FixMyStreet/Cobrand/Default.pm:627
+#: perllib/FixMyStreet/Cobrand/Default.pm:630
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:110
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:154
-#: perllib/FixMyStreet/Cobrand/UK.pm:235
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:183
+#: perllib/FixMyStreet/Cobrand/UK.pm:229
msgid "RSS feed of problems within %s"
msgstr "RSS feed van problemen binnen %s"
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:116
-#: perllib/FixMyStreet/Cobrand/UK.pm:241
+#: perllib/FixMyStreet/Cobrand/UK.pm:235
msgid "RSS feed of problems within %s ward"
msgstr "RSS feed van problemen in wijk %s"
-#: templates/web/default/around/display_location.html:1
+#: templates/web/default/around/display_location.html:3
#: templates/web/default/around/display_location.html:4
msgid "RSS feed of recent local problems"
msgstr "RSS feed van recente lokale problemen"
-#: templates/web/bromley/report/display.html:37
#: templates/web/default/report/display.html:46
#: templates/web/fixmystreet/alert/updates.html:9
#: templates/web/fixmystreet/report/display.html:61
msgid "RSS feed of updates to this problem"
msgstr "RSS feed van updates voor dit probleem"
-#: templates/web/bromley/report/display.html:39
#: templates/web/default/alert/updates.html:9
#: templates/web/default/report/display.html:37
#: templates/web/fixmystreet/alert/updates.html:14
@@ -2850,7 +2684,7 @@ msgid "Recently fixed"
msgstr "Recent opgelost"
#: templates/web/default/index.html:35 templates/web/emptyhomes/index.html:24
-#: templates/web/fixmystreet/index.html:45
+#: templates/web/fixmystreet/index.html:49
msgid "Recently reported problems"
msgstr "Recent gemelde problemen"
@@ -2867,8 +2701,8 @@ msgstr "Onthoud dat, tijdens dit proefproject, FixMyBarangary alleen te gebruike
msgid "Remove flag"
msgstr "Verwijder markering"
-#: templates/web/default/admin/report_edit.html:89
-#: templates/web/default/admin/update_edit.html:57
+#: templates/web/default/admin/report_edit.html:94
+#: templates/web/default/admin/update_edit.html:62
#: templates/web/zurich/admin/update_edit.html:35
msgid "Remove photo (can't be undone!)"
msgstr "Verwijder foto (kan niet ongedaan worden!)"
@@ -2877,29 +2711,21 @@ msgstr "Verwijder foto (kan niet ongedaan worden!)"
msgid "Report Empty Homes"
msgstr "Meld Leegstaand Pand"
-#: templates/web/barnet/footer.html:16 templates/web/bromley/footer.html:17
#: templates/web/default/footer.html:7 templates/web/emptyhomes/header.html:31
#: templates/web/fiksgatami/footer.html:5
#: templates/web/fiksgatami/nn/footer.html:5
-#: templates/web/fixmindelo/footer.html:37
-#: templates/web/fixmystreet/footer.html:44
-#: templates/web/oxfordshire/footer.html:19
-#: templates/web/reading/footer.html:6
-#: templates/web/seesomething/footer.html:11
-#: templates/web/stevenage/footer.html:39 templates/web/zurich/footer.html:17
+#: templates/web/fixmystreet/footer.html:47
+#: templates/web/zurich/footer.html:17
#: templates/web/zurich/nav_over_content.html:4
msgid "Report a problem"
msgstr "Meld een probleem"
-#: templates/web/bromley/report/display.html:28
#: templates/web/fixmystreet/report/display.html:35
msgid "Report abuse"
msgstr "Meld misbruik"
#: templates/web/default/report_created.html:1
#: templates/web/default/report_created.html:3
-#: templates/web/seesomething/report_created.html:0
-#: templates/web/seesomething/report_created.html:8
msgid "Report created"
msgstr ""
@@ -2909,22 +2735,21 @@ msgstr "Meld op %s"
#: templates/web/default/index.html:14 templates/web/emptyhomes/index.html:5
#: templates/web/fixmystreet/around/intro.html:1
-#: templates/web/stevenage/around/intro.html:1
#: templates/web/zurich/around/intro.html:1
msgid "Report, view, or discuss local problems"
msgstr "Meld, bekijk of discussier over lokale problemen"
-#: templates/web/default/my/my.html:74
+#: templates/web/default/my/my.html:79
msgid "Reported %s"
msgstr "Gemeld %s"
-#: templates/web/default/my/my.html:72
+#: templates/web/default/my/my.html:77
msgid "Reported %s, to %s"
msgstr "Gemeld %s aan %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:559
+#: perllib/FixMyStreet/DB/Result/Problem.pm:561
#: templates/web/default/contact/index.html:45
-#: templates/web/fixmystreet/contact/index.html:58
+#: templates/web/fixmystreet/contact/index.html:62
msgid "Reported anonymously at %s"
msgstr "Anoniem gemeld bij %s"
@@ -2934,9 +2759,9 @@ msgstr "Anoniem gemeld bij %s"
msgid "Reported before"
msgstr "Eerder gemeld"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:582
+#: perllib/FixMyStreet/DB/Result/Problem.pm:584
#: templates/web/default/contact/index.html:47
-#: templates/web/fixmystreet/contact/index.html:60
+#: templates/web/fixmystreet/contact/index.html:64
msgid "Reported by %s at %s"
msgstr "Gemeld door %s bij %s"
@@ -2944,27 +2769,27 @@ msgstr "Gemeld door %s bij %s"
msgid "Reported in the %s category"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:555
+#: perllib/FixMyStreet/DB/Result/Problem.pm:557
msgid "Reported in the %s category anonymously at %s"
msgstr "Anoniem gemeld in de categorie %s bij %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:577
+#: perllib/FixMyStreet/DB/Result/Problem.pm:579
msgid "Reported in the %s category by %s at %s"
msgstr "Gemeld in de categorie %s door %s bij %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:551
+#: perllib/FixMyStreet/DB/Result/Problem.pm:553
msgid "Reported via %s anonymously at %s"
msgstr "Anoniem door %s gemeld bij %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:573
+#: perllib/FixMyStreet/DB/Result/Problem.pm:575
msgid "Reported via %s by %s at %s"
msgstr "Gemeld door %s door %s bij %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:547
+#: perllib/FixMyStreet/DB/Result/Problem.pm:549
msgid "Reported via %s in the %s category anonymously at %s"
msgstr "Anoniem gemeld bij %s in de categorie %s door %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:567
+#: perllib/FixMyStreet/DB/Result/Problem.pm:569
msgid "Reported via %s in the %s category by %s at %s"
msgstr "Gemeld door %s in de categorie %s door %s bij %s"
@@ -2978,22 +2803,18 @@ msgstr "Gemeld door %s in de categorie %s door %s bij %s"
#: templates/web/fixmystreet/report/new/fill_in_details.html:0
#: templates/web/fixmystreet/report/new/fill_in_details.html:5
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2
-#: templates/web/oxfordshire/js/translation_strings.html:35
-#: templates/web/seesomething/around/around_index.html:1
-#: templates/web/seesomething/report/new/fill_in_details_form.html:3
#: templates/web/zurich/report/new/fill_in_details_form.html:2
msgid "Reporting a problem"
msgstr "Meld een probleem"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1177
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:242
-#: templates/web/seesomething/admin/stats.html:1
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1186
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:290
#: templates/web/zurich/header.html:60
msgid "Reports"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:393
-#: perllib/FixMyStreet/DB/Result/Problem.pm:397
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
+#: perllib/FixMyStreet/DB/Result/Problem.pm:399
msgid "Reports are limited to %s characters in length. Please shorten your report"
msgstr ""
@@ -3014,27 +2835,28 @@ msgid "Resend report"
msgstr "Herstuur melding"
#: templates/web/default/js/translation_strings.html:28
-#: templates/web/oxfordshire/js/translation_strings.html:22
msgid "Right place?"
msgstr ""
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:195
#: perllib/FixMyStreet/Geocode/OSM.pm:173
msgid "Road operator for this named road (derived from road reference number and type): %s"
msgstr "Wegbeheerder voor deze straat (afgeleid van wegnummer en type): %s"
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:192
#: perllib/FixMyStreet/Geocode/OSM.pm:170
msgid "Road operator for this named road (from OpenStreetMap): %s"
msgstr "Wegbeheerder voor deze straat (uit OpenStreetMap): %s"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1377
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1388
-#: templates/web/default/admin/report_edit.html:85
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1386
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1397
+#: templates/web/default/admin/report_edit.html:90
#: templates/web/zurich/admin/report_edit.html:76
msgid "Rotate Left"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1377
-#: templates/web/default/admin/report_edit.html:86
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1386
+#: templates/web/default/admin/report_edit.html:91
#: templates/web/zurich/admin/report_edit.html:77
msgid "Rotate Right"
msgstr ""
@@ -3063,9 +2885,8 @@ msgid "Search:"
msgstr "Zoek:"
#: templates/web/default/admin/reports.html:26
-#, fuzzy
msgid "Searching found no reports."
-msgstr "Zoek Meldingen"
+msgstr ""
#: templates/web/default/admin/users.html:39
msgid "Searching found no users."
@@ -3086,7 +2907,7 @@ msgstr ""
msgid "Select which type of alert you'd like and click the button for an RSS feed, or enter your email address to subscribe to an email alert."
msgstr "Selecteer op welke melding je wilt hebben en klik op de knop om een RSS feed te maken, of vul je e-mailadres in om je abonneren op een e-mailmelding."
-#: perllib/FixMyStreet/DB/Result/Problem.pm:664
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
msgid "Sent to %s %s later"
msgstr "Verzonden aan %s %s later"
@@ -3103,9 +2924,6 @@ msgstr "Service:"
msgid "Share"
msgstr "Deel"
-#: templates/web/bromley/report/display.html:205
-#: templates/web/bromley/report/new/fill_in_details_form.html:129
-#: templates/web/bromley/report/new/fill_in_details_form.html:175
#: templates/web/default/report/new/fill_in_details_form.html:210
#: templates/web/default/report/update-form.html:157
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:129
@@ -3128,11 +2946,7 @@ msgstr "Toon spelden"
#: templates/web/fixmystreet/auth/general.html:3
#: templates/web/fixmystreet/auth/general.html:42
#: templates/web/fixmystreet/auth/general.html:62
-#: templates/web/fixmystreet/header.html:54
-#: templates/web/oxfordshire/header.html:115
-#: templates/web/seesomething/auth/general.html:3
-#: templates/web/seesomething/auth/general.html:39
-#: templates/web/stevenage/header.html:101
+#: templates/web/fixmystreet/header.html:57
#: templates/web/zurich/auth/general.html:18
#: templates/web/zurich/auth/general.html:35
msgid "Sign in"
@@ -3144,20 +2958,15 @@ msgstr "Inloggen via e-mail"
#: templates/web/default/auth/general.html:1
#: templates/web/fixmystreet/auth/general.html:1
-#: templates/web/seesomething/auth/general.html:1
#: templates/web/zurich/auth/general.html:1
msgid "Sign in or create an account"
msgstr "Inloggen of maak een account"
-#: templates/web/bromley/auth/sign_out.html:1
#: templates/web/default/auth/sign_out.html:1
#: templates/web/default/header.html:30
#: templates/web/emptyhomes/header.html:46
#: templates/web/fiksgatami/header.html:22
#: templates/web/fiksgatami/nn/header.html:22
-#: templates/web/lichfielddc/header.html:177
-#: templates/web/reading/header.html:33
-#: templates/web/seesomething/auth/sign_out.html:1
#: templates/web/zurich/auth/sign_out.html:1
msgid "Sign out"
msgstr "Uitloggen"
@@ -3166,14 +2975,12 @@ msgstr "Uitloggen"
#: templates/web/emptyhomes/header.html:45
#: templates/web/fiksgatami/header.html:21
#: templates/web/fiksgatami/nn/header.html:21
-#: templates/web/lichfielddc/header.html:177
-#: templates/web/reading/header.html:32
msgid "Signed in as %s"
msgstr "Ingelogd als %s"
-#: templates/web/default/report/new/fill_in_details_text.html:1
-#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1
-#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1
+#: templates/web/default/report/new/fill_in_details_text.html:2
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:2
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:2
msgid "Some categories may require additional information."
msgstr "Sommige categorie&euml;n hebben extra informatie nodig."
@@ -3204,6 +3011,8 @@ msgstr ""
#: perllib/FixMyStreet/App/Controller/Report/New.pm:215
#: perllib/FixMyStreet/Geocode.pm:28 perllib/FixMyStreet/Geocode/Bing.pm:58
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:75
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:95
#: perllib/FixMyStreet/Geocode/Google.pm:74
#: perllib/FixMyStreet/Geocode/OSM.pm:66
msgid "Sorry, we could not find that location."
@@ -3211,7 +3020,7 @@ msgstr ""
#: perllib/FixMyStreet/Geocode/Bing.pm:53
#: perllib/FixMyStreet/Geocode/Google.pm:69
-#: perllib/FixMyStreet/Geocode/Zurich.pm:87
+#: perllib/FixMyStreet/Geocode/Zurich.pm:88
msgid "Sorry, we could not parse that location. Please try again."
msgstr ""
@@ -3221,11 +3030,9 @@ msgid "Source code"
msgstr ""
#: templates/web/default/admin/stats.html:64
-#, fuzzy
msgid "Start Date:"
-msgstr "Laatste update:"
+msgstr ""
-#: templates/web/bromley/report/display.html:78
#: templates/web/default/admin/flagged.html:18
#: templates/web/default/admin/list_updates.html:11
#: templates/web/default/admin/reports.html:15
@@ -3242,8 +3049,8 @@ msgstr ""
msgid "State:"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1182
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:257
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1191
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:305
#: templates/web/default/admin/stats.html:1
#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72
msgid "Stats"
@@ -3259,7 +3066,7 @@ msgstr ""
msgid "Still open, via questionnaire, %s"
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:370
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378
msgid "Subcategory: %s"
msgstr ""
@@ -3267,8 +3074,7 @@ msgstr ""
msgid "Subdivision/Body"
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:48
-#: templates/web/fixmystreet/contact/index.html:91
+#: templates/web/fixmystreet/contact/index.html:95
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:60
msgid "Subject"
msgstr ""
@@ -3281,9 +3087,6 @@ msgstr ""
msgid "Subject:"
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:140
-#: templates/web/bromley/report/new/fill_in_details_form.html:190
-#: templates/web/bromley/report/new/fill_in_details_form.html:204
#: templates/web/default/questionnaire/creator_fixed.html:19
#: templates/web/default/report/new/fill_in_details_form.html:114
#: templates/web/default/report/new/fill_in_details_form.html:154
@@ -3292,13 +3095,12 @@ msgstr ""
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:142
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:167
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:212
-#: templates/web/seesomething/report/new/fill_in_details_form.html:93
#: templates/web/zurich/report/new/fill_in_details_form.html:114
msgid "Submit"
msgstr ""
-#: templates/web/default/admin/report_edit.html:92
-#: templates/web/default/admin/update_edit.html:60
+#: templates/web/default/admin/report_edit.html:97
+#: templates/web/default/admin/update_edit.html:65
#: templates/web/default/admin/user-form.html:55
#: templates/web/zurich/admin/report_edit-sdm.html:67
#: templates/web/zurich/admin/report_edit.html:224
@@ -3311,8 +3113,8 @@ msgstr ""
msgid "Submit questionnaire"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:111
-#: templates/web/zurich/admin/header.html:1
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:133
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/header.html:6
#: templates/web/zurich/admin/index-dm.html:23
#: templates/web/zurich/admin/index-dm.html:6
@@ -3324,7 +3126,6 @@ msgstr ""
msgid "Submitted"
msgstr ""
-#: templates/web/bromley/report/display.html:44
#: templates/web/default/alert/updates.html:17
#: templates/web/default/report/display.html:42
#: templates/web/fixmystreet/alert/updates.html:23
@@ -3342,8 +3143,8 @@ msgstr ""
msgid "Subscribe to an alert based upon what baranagay you&rsquo;re in:"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1175
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:241
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1184
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:289
#: templates/web/default/admin/index.html:1
#: templates/web/zurich/admin/index-dm.html:1
#: templates/web/zurich/admin/index-sdm.html:1
@@ -3362,7 +3163,7 @@ msgstr ""
msgid "Summary reports"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1179
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1188
msgid "Survey"
msgstr ""
@@ -3385,17 +3186,15 @@ msgstr ""
msgid "Text:"
msgstr ""
-#: templates/web/default/tokens/confirm_update.html:7
#: templates/web/default/tokens/confirm_update.html:8
msgid "Thank you &mdash; you can <a href=\"%s\">view your updated problem</a> on the site."
msgstr ""
-#: templates/web/emptyhomes/tokens/confirm_problem.html:6
+#: templates/web/emptyhomes/tokens/confirm_problem.html:7
#: templates/web/emptyhomes/tokens/confirm_problem.html:8
msgid "Thank you for reporting an empty property on ReportEmptyHomes.com. We have emailed the lead officer for empty homes in the council responsible with details, and asked them to do whatever they can to get the empty property back into use as soon as possible."
msgstr ""
-#: templates/web/emptyhomes/tokens/confirm_problem.html:30
#: templates/web/emptyhomes/tokens/confirm_problem.html:31
msgid ""
"Thank you for reporting this empty property on ReportEmptyHomes.com.\n"
@@ -3408,7 +3207,7 @@ msgstr ""
msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it."
msgstr ""
-#: templates/web/emptyhomes/tokens/confirm_problem.html:24
+#: templates/web/emptyhomes/tokens/confirm_problem.html:25
#: templates/web/emptyhomes/tokens/confirm_problem.html:26
msgid "Thank you for using ReportEmptyHomes.com. Your action is already helping to resolve the UK&rsquo;s empty homes crisis."
msgstr ""
@@ -3429,15 +3228,16 @@ msgstr ""
msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Council.pm:90
+#: perllib/FixMyStreet/App/Controller/Council.pm:100
msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Location.pm:123
+#: perllib/FixMyStreet/App/Controller/Location.pm:124
msgid "That location does not appear to be in the UK; please try again."
msgstr ""
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:63
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:79
#: perllib/FixMyStreet/Cobrand/UK.pm:86
msgid "That postcode was not recognised, sorry."
msgstr ""
@@ -3497,7 +3297,7 @@ msgstr ""
msgid "The confirmation email <strong>may</strong> take a few minutes to arrive &mdash; <em>please</em> be patient."
msgstr ""
-#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:2
#: templates/web/fixmystreet/report/new/fill_in_details_text.html:3
msgid "The council won&rsquo;t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc."
msgstr ""
@@ -3524,6 +3324,7 @@ msgstr "De foutmelding was: %s"
msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
msgstr "De volgende Open311 v2 attributen worden teruggegeven voor elke aanvraag: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code en service_name."
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:187
#: perllib/FixMyStreet/Geocode/OSM.pm:165
msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
msgstr "De volgende informatie over de dichtstbijzijnde weg kan onjuist of niet relevant zijn als het probleem zich dichtbij verschillende wegen, of dichtbij een weg zonder naam bevind."
@@ -3582,7 +3383,7 @@ msgstr ""
msgid "The passwords do not match"
msgstr "Wachtwoorden komen niet overeen"
-#: templates/web/default/errors/page_error_404_not_found.html:10
+#: templates/web/default/errors/page_error_404_not_found.html:11
#: templates/web/default/errors/page_error_404_not_found.html:12
msgid "The requested URL '%s' was not found on this server"
msgstr "De opgevraagde URL '%s' is niet gevonden op de server"
@@ -3592,16 +3393,14 @@ msgstr "De opgevraagde URL '%s' is niet gevonden op de server"
msgid "The simplest alert is our geographic one:"
msgstr "De simpelste melding is onze geografische:"
-#: templates/web/barnet/report/new/councils_text_all.html:3
#: templates/web/default/report/new/councils_extra_text.html:1
-#: templates/web/default/report/new/councils_text_some.html:10
#: templates/web/default/report/new/councils_text_some.html:11
#: templates/web/default/report/new/fill_in_details_form.html:17
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12
msgid "The subject and details of the problem will be public, plus your name if you give us permission."
msgstr "Het onderwerp en de details van het probleem zijn publiek, als je toestemming geeft wordt je naam ook getoond."
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:291
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:296
msgid "The user could not locate the problem on a map, but to see the area around the location they entered"
msgstr "The gebruiker kon het probleem niet vinden op de kaart, maar het gebied rond de lokatie wordt op de kaart getoond"
@@ -3616,16 +3415,15 @@ msgstr ""
msgid "There was a problem showing the All Reports page. Please try again later."
msgstr "Er was een probleem bij het tonen van de Alle Meldingen pagina. Probeer het later nog eens."
-#: perllib/FixMyStreet/App/Controller/Contact.pm:116
+#: perllib/FixMyStreet/App/Controller/Contact.pm:121
#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59
msgid "There was a problem showing this page. Please try again later."
msgstr "Er was een probleem bij het tonen van deze pagina. Probeer het later nog eens."
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:747
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:755
#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134
#: templates/web/default/auth/general.html:23
#: templates/web/fixmystreet/auth/general.html:24
-#: templates/web/seesomething/auth/general.html:24
#: templates/web/zurich/auth/general.html:28
msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the &lsquo;sign in by email&rsquo; section of the form."
msgstr "Er was een probleem met je e-mailadres/wachtwoord combinatie. Als je het wachtwoord niet kunt herinneren, of je hebt er geen een, vul dan het formulier &lsquo;inloggen via email&rsquo; in."
@@ -3638,7 +3436,7 @@ msgstr "Er was een probleem met je e-mailadres/wachtwoord combinatie. Probeer he
msgid "There was a problem with your update. Please try again."
msgstr "Er was een probleem met je update. Probeer het later nog eens."
-#: perllib/FixMyStreet/App/Controller/Contact.pm:120
+#: perllib/FixMyStreet/App/Controller/Contact.pm:125
msgid "There were problems with your report. Please see below."
msgstr "Er was een probleem met je melding. Zie beneden."
@@ -3678,16 +3476,16 @@ msgid ""
" A body will not receive any reports unless it covers at least one area."
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:375
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:385
msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system."
msgstr "Deze e-mail is naar meerdere contactpersonen gestuurd die mogelijk geïnteresseerd zijn in deze lokatie omdat de gebruiker geen categorie heeft aangegeven. Negeer deze melding als je niet de juiste contactpersoon bent, of laat ons weten in welke categorie dit probleem valt zodat we dit kunnen toevoegen aan ons systeem."
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:388
msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue."
msgstr "Deze e-mail is naar meerdere contactpersonen gestuurd die mogelijk geïnteresseerd zijn in deze lokatie. Negeer deze melding als je niet de juiste contactpersoon bent."
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:894
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:964
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:898
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:968
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:131
#: perllib/FixMyStreet/Cobrand/UK.pm:58
msgid "This information is required"
@@ -3719,7 +3517,6 @@ msgstr ""
msgid "This problem has been closed"
msgstr "Dit probleem is gesloten"
-#: templates/web/bromley/report/display.html:98
#: templates/web/default/report/banner.html:12
#: templates/web/default/report/update-form.html:48
#: templates/web/emptyhomes/report/banner.html:3
@@ -3727,7 +3524,6 @@ msgstr "Dit probleem is gesloten"
msgid "This problem has been fixed"
msgstr "Dit probleem is opgelost"
-#: templates/web/bromley/report/display.html:92
#: templates/web/default/report/update-form.html:43
#: templates/web/fixmystreet/report/update-form.html:40
msgid "This problem has not been fixed"
@@ -3741,33 +3537,33 @@ msgstr "Aan dit probleem wordt gewerkt"
msgid "This problem is old and of unknown status."
msgstr "Dit probleem is oud, en de status is onbekend."
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:108
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:109
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:130
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:131
#: templates/web/zurich/report/_main.html:14
msgid "This report is awaiting moderation."
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88
msgid "This report is currently marked as closed."
msgstr "Deze melding is momenteel gemarkeerd als gesloten."
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86
msgid "This report is currently marked as fixed."
msgstr "Deze melding is momenteel gemarkeerd als opgelost."
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:90
msgid "This report is currently marked as open."
msgstr "Deze melding is momenteel gemarkeerd als openstaand."
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:320
msgid "This report was submitted anonymously"
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:284
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:289
msgid "This web page also contains a photo of the problem, provided by the user."
msgstr "Deze pagina bevat een door de gebruiker aangeleverde foto van het probleem."
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1178
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1187
#: templates/web/default/admin/timeline.html:1
msgid "Timeline"
msgstr "Tijdslijn"
@@ -3785,7 +3581,7 @@ msgstr "Klik op de kaart op de juiste lokatie om <strong>een probleem te melden<
msgid "To find out what local alerts we have for you, please enter your postcode or street name and area"
msgstr "Vul je postcode of straatnaam en plaats in om te kijken welke lokale meldingen we voor je hebben."
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:290
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:295
msgid "To view a map of the precise location of this issue"
msgstr ""
@@ -3797,17 +3593,10 @@ msgstr ""
msgid "Total"
msgstr ""
-#: templates/web/seesomething/report/new/fill_in_details_form.html:24
-msgid "Transport Category"
-msgstr ""
-
#: templates/web/default/js/translation_strings.html:29
-#: templates/web/oxfordshire/js/translation_strings.html:23
msgid "Try again"
msgstr ""
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:83
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:46
#: templates/web/default/report/update-form.html:30
@@ -3835,7 +3624,6 @@ msgid "Unknown alert type"
msgstr ""
#: templates/web/default/js/translation_strings.html:39
-#: templates/web/oxfordshire/js/translation_strings.html:33
msgid "Unknown error"
msgstr ""
@@ -3843,7 +3631,6 @@ msgstr ""
msgid "Unknown problem ID"
msgstr ""
-#: templates/web/bromley/report/display.html:66
#: templates/web/fixmystreet/report/update-form.html:19
msgid "Update"
msgstr ""
@@ -3853,12 +3640,12 @@ msgid "Update %s created for problem %d; by %s"
msgstr ""
#: templates/web/default/contact/index.html:21
-#: templates/web/fixmystreet/contact/index.html:34
+#: templates/web/fixmystreet/contact/index.html:38
msgid "Update below added anonymously at %s"
msgstr ""
#: templates/web/default/contact/index.html:23
-#: templates/web/fixmystreet/contact/index.html:36
+#: templates/web/fixmystreet/contact/index.html:40
msgid "Update below added by %s at %s"
msgstr ""
@@ -3902,12 +3689,12 @@ msgstr ""
msgid "Updated"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1042
-#: perllib/FixMyStreet/App/Controller/Admin.pm:796
-#: perllib/FixMyStreet/App/Controller/Admin.pm:940
-#: perllib/FixMyStreet/App/Controller/Admin.pm:998
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:487
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:556
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1007
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1051
+#: perllib/FixMyStreet/App/Controller/Admin.pm:801
+#: perllib/FixMyStreet/App/Controller/Admin.pm:949
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:550
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:619
msgid "Updated!"
msgstr ""
@@ -3919,16 +3706,14 @@ msgstr ""
msgid "Updates"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Comment.pm:131
-msgid "Updates are limited to 2000 characters in length. Please shorten your update"
+#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+msgid "Updates are limited to %s characters in length. Please shorten your update"
msgstr ""
#: db/alert_types.pl:5 db/alert_types.pl:6
msgid "Updates on {{title}}"
msgstr ""
-#: templates/web/bromley/report/display.html:0
-#: templates/web/bromley/report/display.html:8
#: templates/web/default/report/display.html:0
#: templates/web/default/report/display.html:5
#: templates/web/fixmystreet/report/display.html:0
@@ -3945,11 +3730,11 @@ msgstr ""
msgid "User"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1342
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1351
msgid "User flag removed"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1314
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1323
msgid "User flagged"
msgstr ""
@@ -3957,8 +3742,8 @@ msgstr ""
msgid "User search finds matches in users' names and email addresses."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:256
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1189
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:304
#: templates/web/default/admin/flagged.html:29
#: templates/web/zurich/header.html:69
msgid "Users"
@@ -3987,12 +3772,9 @@ msgstr ""
#: templates/web/default/around/display_location.html:0
#: templates/web/default/around/display_location.html:34
-#: templates/web/seesomething/around/display_location.html:0
-#: templates/web/seesomething/around/display_location.html:16
msgid "Viewing a location"
msgstr ""
-#: templates/web/bromley/report/display.html:0
#: templates/web/default/report/display.html:0
#: templates/web/fixmystreet/report/display.html:0
msgid "Viewing a problem"
@@ -4005,7 +3787,6 @@ msgstr ""
#: templates/web/default/alert/choose.html:6
#: templates/web/default/around/around_index.html:13
#: templates/web/fixmystreet/around/around_index.html:16
-#: templates/web/seesomething/around/around_index.html:13
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 ""
@@ -4017,25 +3798,22 @@ msgstr ""
msgid "We have sent you an email containing a link to confirm your account."
msgstr ""
-#: templates/web/emptyhomes/tokens/confirm_problem.html:18
+#: templates/web/emptyhomes/tokens/confirm_problem.html:19
#: templates/web/emptyhomes/tokens/confirm_problem.html:20
msgid "We may contact you periodically to ask if anything has changed with the property you reported."
msgstr ""
-#: templates/web/bromley/report/display.html:143
#: templates/web/fixmystreet/report/update-form.html:115
msgid "We never show your email"
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:133
-#: templates/web/bromley/report/new/fill_in_details_form.html:179
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:134
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:201
#: templates/web/zurich/report/new/fill_in_details_form.html:96
msgid "We never show your email address or phone number."
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:384
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:394
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 ""
@@ -4043,14 +3821,12 @@ msgstr ""
msgid "We send it to the council on your behalf"
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:217
#: templates/web/default/report/new/notes.html:5
#: templates/web/fixmybarangay/report/new/notes.html:5
msgid "We will only use your personal information in accordance with our <a href=\"/faq#privacy\">privacy policy.</a>"
msgstr ""
#: templates/web/fixmystreet/report/new/notes.html:4
-#: templates/web/oxfordshire/report/new/notes.html:4
msgid "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>"
msgstr ""
@@ -4080,13 +3856,11 @@ msgstr ""
msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>."
msgstr ""
-#: templates/web/fixmystreet/footer.html:21
-#: templates/web/stevenage/footer.html:22
+#: templates/web/fixmystreet/footer.html:24
msgid "Would you like better integration with FixMyStreet? <a href=\"http://www.mysociety.org/for-councils/fixmystreet/\">Find out about FixMyStreet for councils</a>."
msgstr ""
-#: templates/web/fixmystreet/footer.html:17
-#: templates/web/stevenage/footer.html:18
+#: templates/web/fixmystreet/footer.html:20
msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>."
msgstr ""
@@ -4098,7 +3872,6 @@ msgstr ""
#: templates/web/default/report/new/notes.html:8
#: templates/web/fixmybarangay/report/new/notes.html:8
#: templates/web/fixmystreet/report/new/notes.html:8
-#: templates/web/oxfordshire/report/new/notes.html:7
msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
msgstr "Je bericht is moeilijk leesbaar als deze alleen uit hoofdletters bestaat of geen interpunctie heeft."
@@ -4128,26 +3901,24 @@ msgstr "Jaar"
msgid "Yes"
msgstr "Ja"
-#: templates/web/bromley/report/display.html:157
-#: templates/web/bromley/report/new/fill_in_details_form.html:198
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:161
#: templates/web/fixmystreet/report/update-form.html:89
msgid "Yes I have a password"
msgstr "Ja, ik heb een wachtwoord"
#: templates/web/default/contact/index.html:37
-#: templates/web/fixmystreet/contact/index.html:50
+#: templates/web/fixmystreet/contact/index.html:54
msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:"
msgstr "Je meld het volgende probleem als beledigend, persoonlijke informatie bevattend of gelijkend aan:"
#: templates/web/default/contact/index.html:15
-#: templates/web/fixmystreet/contact/index.html:28
+#: templates/web/fixmystreet/contact/index.html:32
msgid "You are reporting the following update for being abusive, containing personal information, or similar:"
msgstr "Je meld het volgende update als beledigend, persoonlijke informatie bevattend of gelijkend aan:"
-#: templates/web/default/tokens/confirm_problem.html:19
+#: templates/web/default/tokens/confirm_problem.html:20
#: templates/web/default/tokens/confirm_problem.html:21
-#: templates/web/zurich/tokens/confirm_problem.html:5
+#: templates/web/zurich/tokens/confirm_problem.html:6
#: templates/web/zurich/tokens/confirm_problem.html:8
msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
msgstr ""
@@ -4156,6 +3927,10 @@ msgstr ""
msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
msgstr ""
+#: templates/web/fixmystreet/contact/index.html:118
+msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
+msgstr ""
+
#: templates/web/default/admin/flagged.html:5
msgid ""
"You can flag any report or user by editing them, and they will be listed on this page.\n"
@@ -4163,9 +3938,9 @@ msgid ""
" reports in the past."
msgstr ""
-#: templates/web/default/report/new/councils_text_none.html:11
-#: templates/web/default/report/new/councils_text_none.html:13
-#: templates/web/default/report/new/councils_text_some.html:20
+#: templates/web/default/report/new/councils_text_none.html:19
+#: templates/web/default/report/new/councils_text_none.html:20
+#: templates/web/default/report/new/councils_text_some.html:21
#: templates/web/default/report/new/councils_text_some.html:22
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 "Je kan ons helpen met het vinden van een e-mailadres voor lokale problemen voor %s door deze naar ons te mailen op <a href='mailto:%s'>%s</a>."
@@ -4175,7 +3950,6 @@ msgid "You can mark a body as deleted if you do not want it to be active on the
msgstr ""
#: templates/web/default/js/translation_strings.html:36
-#: templates/web/oxfordshire/js/translation_strings.html:30
msgid "You declined; please fill in the box above"
msgstr ""
@@ -4183,30 +3957,25 @@ msgstr ""
msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
msgstr "Je hebt deze vragenlijst al ingevuld. Als je vragen hebt kan je <a href='%s'>contact opnemen</a> of <a href='%s'>je probleem bekijken</a>.\n"
-#: templates/web/bromley/report/new/fill_in_details_form.html:97
#: templates/web/default/questionnaire/index.html:96
#: templates/web/default/report/new/fill_in_details_form.html:93
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:90
#: templates/web/fixmystreet/questionnaire/index.html:87
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:99
-#: templates/web/seesomething/report/new/fill_in_details_form.html:59
#: templates/web/zurich/report/new/fill_in_details_form.html:75
msgid "You have already attached a photo to this report, attaching another one will replace it."
msgstr "Je hebt al een foto toegevoegd aan deze melding, als je nog een foto toevoegt overschrijft deze die."
-#: templates/web/bromley/report/display.html:108
#: templates/web/default/report/update-form.html:59
#: templates/web/fixmystreet/report/update-form.html:56
msgid "You have already attached a photo to this update, attaching another one will replace it."
msgstr "Je hebt al een foto toegevoegd aan deze update, als je nog een foto toevoegt overschrijft deze die."
#: templates/web/default/auth/sign_out.html:3
-#: templates/web/seesomething/auth/sign_out.html:3
#: templates/web/zurich/auth/sign_out.html:3
msgid "You have been signed out"
msgstr "Je bent uitgelogd"
-#: templates/web/bromley/report/new/fill_in_details_form.html:25
#: templates/web/default/report/new/fill_in_details_form.html:7
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:7
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:28
@@ -4218,17 +3987,14 @@ msgstr "Je hebt een probleem aangewezen op de plek gemarkeerd met een groene spe
msgid "You have successfully confirmed your alert."
msgstr "Je hebt je melding succesvol bevestigd."
-#: templates/web/zurich/tokens/confirm_problem.html:5
#: templates/web/zurich/tokens/confirm_problem.html:6
msgid "You have successfully confirmed your email address."
msgstr ""
-#: templates/web/default/tokens/confirm_problem.html:14
#: templates/web/default/tokens/confirm_problem.html:15
msgid "You have successfully confirmed your problem"
msgstr "Je hebt je probleem succesvol bevestigd"
-#: templates/web/default/tokens/confirm_update.html:11
#: templates/web/default/tokens/confirm_update.html:12
msgid "You have successfully confirmed your update and you can now <a href=\"%s\">view it on the site</a>."
msgstr "Je hebt je update succesvol bevestigd. Je kan het <a href=\"%s\">nu bekijken op de site</a>."
@@ -4241,11 +4007,15 @@ msgstr "Je hebt je melding gemaakt."
msgid "You have successfully deleted your alert."
msgstr "Je hebt je melding verwijdert."
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:754
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:762
#: perllib/FixMyStreet/App/Controller/Report/Update.pm:140
msgid "You have successfully signed in; please check and confirm your details are accurate:"
msgstr "Je bent ingelogd; controleer of je gegevens nog kloppen:"
+#: templates/web/default/my/my.html:17 templates/web/fixmystreet/my/my.html:17
+msgid "You haven&rsquo;t created any reports yet. <a href=\"%s\">Report a problem now.</a>"
+msgstr ""
+
#: templates/web/default/email_sent.html:13
msgid "You must now click the link in the email we've just sent you."
msgstr ""
@@ -4272,13 +4042,10 @@ msgstr "Weet je zeker dat je dit opnieuw wilt versturen?"
msgid "Your Reports"
msgstr "Jouw meldingen"
-#: templates/web/bromley/report/display.html:41
-#: templates/web/bromley/report/display.html:43
-#: templates/web/bromley/report/new/fill_in_details_form.html:145
#: templates/web/fixmystreet/alert/_list.html:89
#: templates/web/fixmystreet/alert/updates.html:19
#: templates/web/fixmystreet/alert/updates.html:22
-#: templates/web/fixmystreet/contact/index.html:84
+#: templates/web/fixmystreet/contact/index.html:88
#: templates/web/fixmystreet/report/display.html:65
#: templates/web/fixmystreet/report/display.html:67
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:115
@@ -4287,14 +4054,8 @@ msgstr "Jouw meldingen"
msgid "Your email"
msgstr "Jouw e-mail"
-#: templates/web/seesomething/report/new/fill_in_details_form.html:81
-msgid "Your email (optional)"
-msgstr ""
-
-#: templates/web/bromley/report/display.html:132
#: templates/web/fixmystreet/auth/general.html:26
#: templates/web/fixmystreet/report/update-form.html:80
-#: templates/web/seesomething/auth/general.html:26
#: templates/web/zurich/auth/general.html:30
#: templates/web/zurich/auth/general.html:58
msgid "Your email address"
@@ -4312,28 +4073,15 @@ msgstr "Jouw e-mailadres:"
msgid "Your email:"
msgstr "Jouw e-mail:"
-#: templates/web/bromley/report/display.html:195
-#: templates/web/bromley/report/new/fill_in_details_form.html:117
-#: templates/web/bromley/report/new/fill_in_details_form.html:164
-msgid "Your first name"
-msgstr "Jouw voornaam"
-
-#: templates/web/fixmystreet/report/updates-sidebar-notes.html:5
+#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7
msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>"
msgstr "Je informatie wordt alleen gebruikt zoals vermeld in onze <a href=\"/privacy\">privacy policy</a>"
-#: templates/web/bromley/report/display.html:201
-#: templates/web/bromley/report/new/fill_in_details_form.html:123
-#: templates/web/bromley/report/new/fill_in_details_form.html:170
-msgid "Your last name"
-msgstr "Jouw achternaam"
-
#: templates/web/fixmystreet/auth/general.html:57
-#: templates/web/fixmystreet/contact/index.html:77
+#: templates/web/fixmystreet/contact/index.html:81
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:124
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:192
#: templates/web/fixmystreet/report/update-form.html:140
-#: templates/web/seesomething/report/new/fill_in_details_form.html:79
#: templates/web/zurich/auth/general.html:61
#: templates/web/zurich/report/new/fill_in_details_form.html:104
msgid "Your name"
@@ -4347,12 +4095,9 @@ msgstr "Jouw naam"
msgid "Your name:"
msgstr "Jouw naam:"
-#: templates/web/bromley/report/display.html:162
-#: templates/web/bromley/report/new/fill_in_details_form.html:203
#: templates/web/fixmystreet/auth/general.html:41
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:166
#: templates/web/fixmystreet/report/update-form.html:94
-#: templates/web/seesomething/auth/general.html:30
#: templates/web/zurich/auth/general.html:34
msgid "Your password"
msgstr "Jouw wachtwoord"
@@ -4361,11 +4106,8 @@ msgstr "Jouw wachtwoord"
msgid "Your password has been changed"
msgstr "Je wachtwoord is gewijzigd"
-#: templates/web/bromley/report/new/fill_in_details_form.html:137
-#: templates/web/bromley/report/new/fill_in_details_form.html:184
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:139
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:206
-#: templates/web/seesomething/report/new/fill_in_details_form.html:90
#: templates/web/zurich/report/new/fill_in_details_form.html:110
msgid "Your phone number"
msgstr "Je telefoonnummer"
@@ -4378,19 +4120,13 @@ msgstr "Jouw melding"
msgid "Your report has been created and will shortly be sent."
msgstr ""
-#: templates/web/barnet/footer.html:18 templates/web/bromley/footer.html:19
-#: templates/web/bromley/header.html:75 templates/web/default/footer.html:9
-#: templates/web/fiksgatami/footer.html:6
+#: templates/web/default/footer.html:9 templates/web/fiksgatami/footer.html:6
#: templates/web/fiksgatami/nn/footer.html:6
-#: templates/web/fixmindelo/footer.html:39
-#: templates/web/fixmystreet/footer.html:46
-#: templates/web/oxfordshire/footer.html:21
-#: templates/web/oxfordshire/header.html:63
-#: templates/web/reading/footer.html:7 templates/web/stevenage/footer.html:41
+#: templates/web/fixmystreet/footer.html:49
msgid "Your reports"
msgstr "Jouw meldingen"
-#: templates/web/default/my/my.html:45 templates/web/fixmystreet/my/my.html:49
+#: templates/web/default/my/my.html:50 templates/web/fixmystreet/my/my.html:56
msgid "Your updates"
msgstr "Jouw updates"
@@ -4407,7 +4143,7 @@ msgstr "door %s"
msgid "council"
msgstr "gemeente"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
msgid "council ref:&nbsp;%s"
msgstr "gemeente ref.: %s"
@@ -4419,27 +4155,24 @@ msgstr "kaart niet gebruikt"
#: templates/web/default/alert/index.html:33
#: templates/web/fixmystreet/around/postcode_form.html:20
-#: templates/web/seesomething/around/postcode_form.html:9
msgid "e.g. ‘%s’ or ‘%s’"
msgstr "bv. '%s' of '%s'"
#: templates/web/default/admin/flagged.html:51
-#, fuzzy
msgid "edit user"
-msgstr "Bewerk gebruiker %d"
+msgstr ""
#: templates/web/default/admin/index.html:23
#: templates/web/zurich/admin/index.html:5
msgid "from %d different users"
msgstr "door %d verschillende gebruikers"
-#: templates/web/bromley/report/_item.html:12
-#: templates/web/fixmystreet/report/_item.html:12
+#: templates/web/fixmystreet/report/_item.html:17
#: templates/web/zurich/report/_item.html:16
msgid "last updated %s"
msgstr ""
-#: perllib/Utils.pm:263
+#: perllib/Utils.pm:265
msgid "less than a minute"
msgstr "minder dan een minuut"
@@ -4497,21 +4230,20 @@ msgid "or"
msgstr "of"
#: templates/web/default/js/translation_strings.html:27
-#: templates/web/oxfordshire/js/translation_strings.html:21
msgid "or locate me automatically"
msgstr ""
-#: templates/web/default/admin/report_edit.html:24
+#: templates/web/default/admin/report_edit.html:25
#: templates/web/default/admin/report_edit.html:26
-#: templates/web/zurich/admin/report_edit-sdm.html:30
+#: templates/web/zurich/admin/report_edit-sdm.html:31
#: templates/web/zurich/admin/report_edit-sdm.html:32
-#: templates/web/zurich/admin/report_edit-sdm.html:39
+#: templates/web/zurich/admin/report_edit-sdm.html:40
#: templates/web/zurich/admin/report_edit-sdm.html:41
-#: templates/web/zurich/admin/report_edit.html:30
+#: templates/web/zurich/admin/report_edit.html:31
#: templates/web/zurich/admin/report_edit.html:32
-#: templates/web/zurich/admin/report_edit.html:41
+#: templates/web/zurich/admin/report_edit.html:42
#: templates/web/zurich/admin/report_edit.html:43
-#: templates/web/zurich/admin/report_edit.html:53
+#: templates/web/zurich/admin/report_edit.html:54
#: templates/web/zurich/admin/report_edit.html:55
msgid "originally entered: &ldquo;%s&rdquo;"
msgstr ""
@@ -4525,23 +4257,17 @@ msgstr ""
msgid "reopened"
msgstr ""
-#: templates/web/barnet/header.html:71 templates/web/bromley/header.html:100
-#: templates/web/bromley/header.html:65
#: templates/web/fixmybarangay/header.html:67
-#: templates/web/fixmystreet/header.html:51
-#: templates/web/oxfordshire/header.html:112
-#: templates/web/oxfordshire/header.html:48
-#: templates/web/stevenage/header.html:98 templates/web/zurich/footer.html:12
+#: templates/web/fixmystreet/header.html:54
+#: templates/web/zurich/footer.html:12
msgid "sign out"
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:4
-#: templates/web/bromley/report/new/fill_in_details_form.html:7
-#: templates/web/default/report/new/fill_in_details_form.html:11
+#: templates/web/default/report/new/fill_in_details_form.html:12
#: templates/web/default/report/new/fill_in_details_form.html:14
-#: templates/web/emptyhomes/report/new/fill_in_details_form.html:11
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:12
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:14
-#: templates/web/fixmystreet/report/new/fill_in_details_form.html:6
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:7
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:9
msgid "the local council"
msgstr ""
@@ -4551,11 +4277,11 @@ msgstr ""
msgid "there is no pin shown as the user did not use the map"
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:362
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:370
msgid "this type of local problem"
msgstr ""
-#: perllib/Utils.pm:235
+#: perllib/Utils.pm:237
msgid "today"
msgstr ""
@@ -4585,7 +4311,7 @@ msgid_plural "<big>%s</big> reports recently"
msgstr[0] ""
msgstr[1] ""
-#: perllib/Utils.pm:282
+#: perllib/Utils.pm:284
#, perl-format
msgid "%d hour"
msgid_plural "%d hours"
@@ -4599,7 +4325,7 @@ msgid_plural "%d supporters"
msgstr[0] ""
msgstr[1] ""
-#: perllib/Utils.pm:284
+#: perllib/Utils.pm:286
#, perl-format
msgid "%d minute"
msgid_plural "%d minutes"
@@ -4620,7 +4346,7 @@ msgid_plural "We do not yet have details for the councils that cover this locati
msgstr[0] ""
msgstr[1] ""
-#: perllib/Utils.pm:278
+#: perllib/Utils.pm:280
#, perl-format
msgid "%d week"
msgid_plural "%d weeks"
@@ -4641,26 +4367,37 @@ msgid_plural "<big>%s</big> fixed in past month"
msgstr[0] ""
msgstr[1] ""
-#: templates/web/default/report/new/councils_text_some.html:14
+#: perllib/Utils.pm:282
#, perl-format
-msgid "We do <strong>not</strong> yet have details for the other council that covers this location."
-msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location."
+msgid "%d day"
+msgid_plural "%d days"
msgstr[0] ""
msgstr[1] ""
-#: perllib/Utils.pm:280
+#: templates/web/default/report/new/councils_text_some.html:14
#, perl-format
-msgid "%d day"
-msgid_plural "%d days"
+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] ""
-#, fuzzy
-#~ msgid "The email field is required"
-#~ msgstr "Deze informatie is verplicht"
+#~ msgid "First Name"
+#~ msgstr "Voornaam"
+
+#~ msgid "Last Name"
+#~ msgstr "Achternaam"
+
+#~ msgid "Please describe the exact location of the report. Example: “2 dumped mattresses outside Number 19 Stockwell Close”"
+#~ msgstr "Beschrijf de lokatie gedetailleerd. Bijvoorbeeld: \"2 matrassen achtergelaten bij Spoorlaan 19\""
+
+#~ msgid "Please note that updates are not sent to the relevant department. 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 "Let op, updates worden niet aan de gemeente verzonden. Als je je naam achterlaat zal het publiekelijk getoond worden. Jouw gegevens worden alleen gebruikt volgens de vermeldingen van onze <a href=\"/faq#privacy\">privacy policy</a>"
+
+#~ msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
+#~ msgstr "Het is optioneel om een wachtwoord op de geven, maar hiermee is het makkelijker om in de toekomst problemen te melden, updates te plaatsen en je meldingen te beheren."
-#~ msgid "End Year:"
-#~ msgstr "Eindjaar:"
+#~ msgid "Your first name"
+#~ msgstr "Jouw voornaam"
-#~ msgid "End month:"
-#~ msgstr "Eindmaand:"
+#~ msgid "Your last name"
+#~ msgstr "Jouw achternaam"
diff --git a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
index 1a6443d78..0e55cfdc1 100644
--- a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -11,8 +11,8 @@ msgid ""
msgstr ""
"Project-Id-Version: fixmystreet\n"
"Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2013-11-12 13:15+0000\n"
-"PO-Revision-Date: 2013-09-05 16:55+0000\n"
+"POT-Creation-Date: 2014-05-16 17:30+0100\n"
+"PO-Revision-Date: 2013-11-20 13:29+0000\n"
"Last-Translator: mysociety <transifex@mysociety.org>\n"
"Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/fixmystreet/language/nn_NO/)\n"
"Language: nn_NO\n"
@@ -21,25 +21,25 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:373
+#: perllib/FixMyStreet/DB/Result/Problem.pm:604
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383
msgid " and "
msgstr " og "
-#: templates/web/default/tokens/confirm_problem.html:14
+#: templates/web/default/tokens/confirm_problem.html:15
#: templates/web/default/tokens/confirm_problem.html:17
msgid " and <strong>we will now send it to the council</strong>"
msgstr " og <strong>vi sender det no til administrasjonen</strong>"
-#: templates/web/default/report/new/councils_text_all.html:11
-#: templates/web/default/report/new/councils_text_all.html:18
-#: templates/web/default/report/new/councils_text_all.html:4
-#: templates/web/default/report/new/councils_text_none.html:11
-#: templates/web/default/report/new/councils_text_none.html:14
-#: templates/web/default/report/new/councils_text_some.html:20
+#: templates/web/default/report/new/councils_text_all.html:12
+#: templates/web/default/report/new/councils_text_all.html:19
+#: templates/web/default/report/new/councils_text_all.html:5
+#: templates/web/default/report/new/councils_text_none.html:19
+#: templates/web/default/report/new/councils_text_none.html:21
+#: templates/web/default/report/new/councils_text_some.html:21
#: templates/web/default/report/new/councils_text_some.html:23
#: templates/web/default/report/new/councils_text_some.html:5
-#: templates/web/emptyhomes/report/new/councils_text_all.html:2
+#: templates/web/emptyhomes/report/new/councils_text_all.html:3
msgid " or "
msgstr " eller "
@@ -77,19 +77,19 @@ msgstr ""
msgid "%s - Summary reports"
msgstr "%s – oppsummeringsrapportar"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:653
msgid "%s ref:&nbsp;%s"
msgstr "%s ref:&nbsp;%s"
-#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
msgid "%s ward, %s"
msgstr "%s bydel, %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:538
+#: perllib/FixMyStreet/DB/Result/Problem.pm:540
msgid "%s, reported at %s"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/UK.pm:303 perllib/FixMyStreet/Cobrand/UK.pm:315
+#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:309
msgid "%s, within %s ward"
msgstr "%s, innanfor bydelen %s"
@@ -120,30 +120,27 @@ msgstr "(ein standardavstand som dekkjer ein folkesetnad på omtrent 200 000)"
msgid "(alternatively the RSS feed can be customised, within"
msgstr "(alternativt kan RSS-straumen tilpassast, innanfor"
-#: templates/web/bromley/report/_item.html:22
#: templates/web/default/around/around_map_list_items.html:12
#: templates/web/default/around/on_map_list_items.html:9
-#: templates/web/fixmystreet/report/_item.html:22
+#: templates/web/fixmystreet/report/_item.html:27
#: templates/web/zurich/report/_item.html:21
msgid "(closed)"
msgstr "(lukka)"
-#: templates/web/bromley/report/_item.html:20
#: templates/web/default/around/around_map_list_items.html:10
#: templates/web/default/around/on_map_list_items.html:7
-#: templates/web/fixmystreet/report/_item.html:20
+#: templates/web/fixmystreet/report/_item.html:25
#: templates/web/zurich/report/_item.html:19
msgid "(fixed)"
msgstr "(løyst)"
-#: templates/web/default/index.html:12 templates/web/default/index.html:8
+#: templates/web/default/index.html:12 templates/web/default/index.html:9
#: templates/web/fixmystreet/around/intro.html:2
msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
msgstr "(som tagging, søppel, hol i vegen, eller øydelagte gatelys)"
-#: templates/web/bromley/report/_item.html:16
#: templates/web/default/reports/_list-entry.html:4
-#: templates/web/fixmystreet/report/_item.html:16
+#: templates/web/fixmystreet/report/_item.html:21
msgid "(not sent to council)"
msgstr "(ikkje rapportert til administrasjonen)"
@@ -153,9 +150,8 @@ msgstr "(ikkje rapportert til administrasjonen)"
msgid "(optional)"
msgstr "(valfritt)"
-#: templates/web/bromley/report/_item.html:15
#: templates/web/default/reports/_list-entry.html:2
-#: templates/web/fixmystreet/report/_item.html:15
+#: templates/web/fixmystreet/report/_item.html:20
msgid "(sent to both)"
msgstr "(sendt til begge)"
@@ -167,8 +163,8 @@ msgstr "(vi viser aldri e-postadressa di eller telefonnummeret ditt)"
msgid "(we never show your email)"
msgstr "(vi viser aldri e-postadressa di)"
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:637
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:664
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:635
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:662
#: perllib/FixMyStreet/DB/Result/Problem.pm:379
msgid "-- Pick a category --"
msgstr "-- Vel ein kategori --"
@@ -204,7 +200,7 @@ msgid ""
"</p>"
msgstr ""
-#: templates/web/fixmystreet/questionnaire/completed-open.html:6
+#: templates/web/fixmystreet/questionnaire/completed-open.html:25
msgid ""
"<p style=\"font-size:150%\">We&rsquo;re sorry to hear that. We have two\n"
"suggestions: why not try <a href=\"http://www.writetothem.com/\">writing direct\n"
@@ -257,7 +253,7 @@ msgstr ""
"informasjon om status for problemet ditt, ver så snill og kom tilbake\n"
"til nettstaden og legg igjen ei oppdatering.</p>"
-#: templates/web/default/around/_report_banner.html:3
+#: templates/web/default/around/_report_banner.html:4
#: templates/web/default/around/_report_banner.html:5
msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>"
msgstr "<small>Viss du ikkje kan sjå kartet, <a href='%s' rel='nofollow'>hopp over dette steget</a>.</small>"
@@ -312,8 +308,6 @@ msgstr "<strong>Ja</strong>, eg har eit passord"
msgid "About us"
msgstr "Om oss"
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:81
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:39
#: templates/web/default/report/update-form.html:30
@@ -351,7 +345,7 @@ msgstr "Legg til ny kategori"
msgid "Add user"
msgstr ""
-#: templates/web/default/my/my.html:56 templates/web/fixmystreet/my/my.html:60
+#: templates/web/default/my/my.html:61 templates/web/fixmystreet/my/my.html:67
msgid "Added %s"
msgstr "La til %s"
@@ -367,7 +361,6 @@ msgstr "Varsel %d oppretta for %s, type %s, parameter %s / %s"
msgid "Alert %d disabled (created %s)"
msgstr "Varsel %d kobla ut (oppretta %s)"
-#: templates/web/bromley/report/display.html:209
#: templates/web/default/report/update-form.html:163
#: templates/web/fixmystreet/report/update-form.html:148
msgid "Alert me to future updates"
@@ -380,17 +373,12 @@ msgstr "Send meg varsel ved framtidige oppdateringar"
msgid "All Reports"
msgstr ""
-#: templates/web/barnet/footer.html:20 templates/web/bromley/footer.html:21
-#: templates/web/bromley/header.html:77 templates/web/default/footer.html:11
+#: templates/web/default/footer.html:11
#: templates/web/emptyhomes/header.html:32
#: templates/web/fiksgatami/footer.html:7
#: templates/web/fiksgatami/nn/footer.html:7
-#: templates/web/fixmindelo/footer.html:41
#: templates/web/fixmybarangay/footer.html:20
-#: templates/web/fixmystreet/footer.html:48
-#: templates/web/oxfordshire/footer.html:23
-#: templates/web/oxfordshire/header.html:67
-#: templates/web/reading/footer.html:8 templates/web/stevenage/footer.html:43
+#: templates/web/fixmystreet/footer.html:51
#: templates/web/zurich/admin/index-dm.html:12
#: templates/web/zurich/admin/stats.html:13
#: templates/web/zurich/footer.html:19
@@ -407,27 +395,25 @@ msgstr ""
msgid "All the information you provide here will be sent to"
msgstr "All informasjonen du har lagt inn her vil sendast til"
-#: templates/web/default/report/new/councils_text_all.html:11
+#: templates/web/default/report/new/councils_text_all.html:12
#: templates/web/default/report/new/councils_text_all.html:13
msgid "All the information you provide here will be sent to <strong>%s</strong> or <strong>Roads Service</strong>."
msgstr ""
-#: templates/web/default/report/new/councils_text_all.html:4
+#: templates/web/default/report/new/councils_text_all.html:5
#: templates/web/default/report/new/councils_text_all.html:6
msgid "All the information you provide here will be sent to <strong>%s</strong> or a relevant local body such as <strong>TfL</strong>, via the London Report-It system."
msgstr "All informasjonen du gjev oss her vil sendast til <strong>%s</strong> eller ein relevant lokal etat som <strong>TfL</strong>, via systemet London Report-It."
-#: templates/web/bromley/report/new/fill_in_details_form.html:4
-#: templates/web/bromley/report/new/fill_in_details_form.html:6
-#: templates/web/default/report/new/councils_text_all.html:18
+#: templates/web/default/report/new/councils_text_all.html:19
#: templates/web/default/report/new/councils_text_all.html:20
-#: templates/web/default/report/new/fill_in_details_form.html:11
+#: templates/web/default/report/new/fill_in_details_form.html:12
#: templates/web/default/report/new/fill_in_details_form.html:13
-#: templates/web/emptyhomes/report/new/councils_text_all.html:2
+#: templates/web/emptyhomes/report/new/councils_text_all.html:3
#: templates/web/emptyhomes/report/new/councils_text_all.html:4
-#: templates/web/emptyhomes/report/new/fill_in_details_form.html:11
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:12
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:13
-#: templates/web/fixmystreet/report/new/fill_in_details_form.html:6
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:7
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:8
msgid "All the information you provide here will be sent to <strong>%s</strong>."
msgstr "All informasjonen du har lagt inn her vil sendast til <strong>%s</strong>."
@@ -451,13 +437,11 @@ msgstr "Anonym:"
msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?"
msgstr ""
-#: templates/web/fixmystreet/footer.html:16
-#: templates/web/stevenage/footer.html:17
+#: templates/web/fixmystreet/footer.html:19
msgid "Are you a developer?"
msgstr ""
-#: templates/web/fixmystreet/footer.html:20
-#: templates/web/stevenage/footer.html:21
+#: templates/web/fixmystreet/footer.html:23
msgid "Are you from a council?"
msgstr ""
@@ -480,7 +464,7 @@ msgstr ""
msgid "Assign to subdivision:"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:141
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:163
#: templates/web/zurich/report/updates.html:11
msgid "Assigned to %s"
msgstr ""
@@ -499,7 +483,6 @@ msgid "Awaiting moderation"
msgstr ""
#: templates/web/default/js/translation_strings.html:32
-#: templates/web/oxfordshire/js/translation_strings.html:26
msgid "Back"
msgstr ""
@@ -511,8 +494,8 @@ msgstr "Bannlys e-postadresse"
msgid "Be sure to choose the right category, because we use that to determine to whom the report is sent."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1176
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:249
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1185
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:297
#: templates/web/default/admin/bodies.html:1
#: templates/web/zurich/header.html:64
msgid "Bodies"
@@ -538,18 +521,15 @@ msgid "By Date"
msgstr "På dato"
#: templates/web/fixmystreet/around/_report_banner.html:10
-#: templates/web/fixmystreet/around/_report_banner.html:8
+#: templates/web/fixmystreet/around/_report_banner.html:9
msgid "Can't see the map? <a href='%s' rel='nofollow'>Skip this step</a>"
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:68
#: templates/web/default/admin/bodies.html:20
#: templates/web/default/admin/body.html:53
#: templates/web/default/admin/index.html:44
#: templates/web/default/report/new/category.html:10
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:74
-#: templates/web/seesomething/report/new/category.html:6
-#: templates/web/southampton/report/new/category.html:3
#: templates/web/zurich/admin/body.html:13
#: templates/web/zurich/admin/index-dm.html:23
#: templates/web/zurich/admin/index-sdm.html:21
@@ -574,7 +554,7 @@ msgstr "Løysingsrate fordelt på kategori for problem > 4 veker gamle"
msgid "Category:"
msgstr "Kategori:"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:366
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374
msgid "Category: %s"
msgstr "Kategori: %s"
@@ -623,21 +603,16 @@ msgstr ""
msgid "Click map to report a problem"
msgstr ""
-#: templates/web/oxfordshire/js/translation_strings.html:39
-#, fuzzy
-msgid "Click on the map to report a problem"
-msgstr "Korleis rapportera eit problem"
-
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:118
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:140
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:45
#: templates/web/default/admin/report_edit.html:47
#: templates/web/default/dashboard/index.html:142
#: templates/web/default/dashboard/index.html:144
#: templates/web/fixmystreet/report/banner.html:15
-#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:10
#: templates/web/zurich/admin/header.html:12
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/report_edit.html:100
#: templates/web/zurich/admin/report_edit.html:98
#: templates/web/zurich/admin/stats.html:31
@@ -645,11 +620,11 @@ msgstr "Korleis rapportera eit problem"
msgid "Closed"
msgstr "Lukka"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:744
+#: perllib/FixMyStreet/DB/Result/Problem.pm:748
msgid "Closed by council"
msgstr "(ikkje rapportert til administrasjonen)"
-#: templates/web/default/my/my.html:32 templates/web/fixmystreet/my/my.html:36
+#: templates/web/default/my/my.html:37 templates/web/fixmystreet/my/my.html:43
msgid "Closed reports"
msgstr "Lukka rapportar"
@@ -657,7 +632,7 @@ msgstr "Lukka rapportar"
msgid "Closed:"
msgstr "Lukka:"
-#: templates/web/default/around/tabbed_lists.html:10
+#: templates/web/default/around/tabbed_lists.html:11
#: templates/web/default/around/tabbed_lists.html:12
msgid "Closest nearby problems <small>(within&nbsp;%skm)</small>"
msgstr "Dei næraste problema <small>(innanfor&nbsp;%skm)</small>"
@@ -683,9 +658,8 @@ msgid "Cobrand:"
msgstr "Merkevaresamarbeid:"
#: templates/web/default/admin/config_page.html:1
-#, fuzzy
msgid "Configuration"
-msgstr "Stadfesting"
+msgstr ""
#: perllib/FixMyStreet/App/Controller/Admin.pm:421
msgid "Configuration updated - contacts will be generated automatically later"
@@ -715,8 +689,6 @@ msgstr ""
#: templates/web/default/tokens/confirm_update.html:3
#: templates/web/emptyhomes/tokens/confirm_problem.html:1
#: templates/web/emptyhomes/tokens/confirm_problem.html:3
-#: templates/web/southampton/tokens/confirm_problem.html:1
-#: templates/web/southampton/tokens/confirm_problem.html:3
#: templates/web/zurich/tokens/confirm_problem.html:1
#: templates/web/zurich/tokens/confirm_problem.html:3
msgid "Confirmation"
@@ -749,7 +721,6 @@ msgstr "Kontakt"
msgid "Contact FixMyStreet"
msgstr "Kontakt FiksGataMi"
-#: templates/web/bromley/contact/submit.html:1
#: templates/web/default/contact/index.html:1
#: templates/web/default/contact/index.html:2
#: templates/web/default/contact/submit.html:1
@@ -758,20 +729,18 @@ msgstr "Kontakt FiksGataMi"
msgid "Contact Us"
msgstr "Kontakt oss"
-#: templates/web/bromley/contact/submit.html:3
#: templates/web/default/contact/index.html:6
#: templates/web/default/contact/submit.html:3
-#: templates/web/fixmystreet/contact/index.html:19
+#: templates/web/fixmystreet/contact/index.html:22
msgid "Contact the team"
msgstr "Kontakt prosjektgruppa"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1310
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1338
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1319
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1347
msgid "Could not find user"
msgstr "Kunne ikkje finna brukaren"
#: templates/web/default/js/translation_strings.html:37
-#: templates/web/oxfordshire/js/translation_strings.html:31
msgid "Could not look up location"
msgstr ""
@@ -826,11 +795,10 @@ msgstr "Gjeldande tilstand"
#: templates/web/default/admin/bodies.html:7
#: templates/web/default/admin/index.html:5
-#, fuzzy
msgid "Currently no bodies have been created."
-msgstr "Ingen problem er rapporterte"
+msgstr ""
-#: templates/web/default/dashboard/index.html:5
+#: templates/web/default/dashboard/index.html:6
#: templates/web/default/dashboard/index.html:7
msgid "Dashboard"
msgstr ""
@@ -853,11 +821,8 @@ msgstr "Sletta"
msgid "Description"
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:54
#: templates/web/default/js/translation_strings.html:34
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66
-#: templates/web/oxfordshire/js/translation_strings.html:28
-#: templates/web/seesomething/report/new/fill_in_details_form.html:16
#: templates/web/zurich/report/new/fill_in_details_form.html:42
msgid "Details"
msgstr ""
@@ -895,8 +860,10 @@ msgstr "Har du eit FiksGataMi-passord?"
msgid "Don&rsquo;t know"
msgstr "Veit ikkje"
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:82
+#: templates/web/fixmystreet/contact/index.html:115
+msgid "Don't like forms?"
+msgstr ""
+
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:47
#: templates/web/default/report/update-form.html:30
@@ -927,9 +894,9 @@ msgid "Edit body details"
msgstr ""
#: templates/web/default/admin/report_edit.html:1
-#: templates/web/zurich/admin/report_edit-sdm.html:1
+#: templates/web/zurich/admin/report_edit-sdm.html:2
#: templates/web/zurich/admin/report_edit-sdm.html:4
-#: templates/web/zurich/admin/report_edit.html:1
+#: templates/web/zurich/admin/report_edit.html:2
#: templates/web/zurich/admin/report_edit.html:5
msgid "Editing problem %d"
msgstr "Rediger problem %d"
@@ -947,7 +914,6 @@ msgstr "Redigerer brukar %d"
msgid "Editor"
msgstr "Oppdatert av"
-#: templates/web/bromley/report/display.html:128
#: templates/web/default/admin/bodies.html:18
#: templates/web/default/admin/body.html:54
#: templates/web/default/admin/body_edit.html:83
@@ -955,7 +921,6 @@ msgstr "Oppdatert av"
#: templates/web/default/admin/users.html:16
#: templates/web/fixmystreet/auth/general.html:20
#: templates/web/fixmystreet/report/update-form.html:76
-#: templates/web/seesomething/auth/general.html:20
#: templates/web/zurich/admin/body-form.html:9
#: templates/web/zurich/admin/body.html:14
#: templates/web/zurich/auth/general.html:24
@@ -963,16 +928,15 @@ msgstr "Oppdatert av"
msgid "Email"
msgstr "E-post"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1286
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1295
msgid "Email added to abuse list"
msgstr "E-post lagd til misbrukliste"
#: templates/web/default/admin/body.html:126
-#, fuzzy
msgid "Email address:"
-msgstr "e-postadressa di:"
+msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1283
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1292
msgid "Email already in abuse list"
msgstr "E-post allereie i misbruklista"
@@ -996,7 +960,7 @@ msgstr "Send meg oppdateringar"
msgid "Email:"
msgstr "E-post:"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:318
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:323
msgid "Email: %s"
msgstr ""
@@ -1042,15 +1006,14 @@ msgid ""
msgstr ""
#: templates/web/default/admin/stats.html:70
-#, fuzzy
msgid "End Date:"
-msgstr "Sluttdag:"
+msgstr ""
#: templates/web/default/admin/body-form.html:126
msgid "Endpoint"
msgstr ""
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:71
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:72
msgid "Enter a Z&uuml;rich street name"
msgstr ""
@@ -1059,26 +1022,25 @@ msgid "Enter a nearby UK postcode, or street name and area"
msgstr ""
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:25
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:37
msgid "Enter a nearby postcode, or street name and area"
msgstr "Skriv inn postnummer i nærleiken, eller vegnamn og stad"
-#: templates/web/default/around/postcode_form.html:1
#: templates/web/default/around/postcode_form.html:2
-#: templates/web/fixmystreet/around/postcode_form.html:10
#: templates/web/fixmystreet/around/postcode_form.html:11
-#: templates/web/seesomething/around/postcode_form.html:3
-#: templates/web/seesomething/around/postcode_form.html:4
msgid "Enter a nearby street name and area"
msgstr ""
+#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:9
+msgid "Enter a nearby street name and area, postal code or district in Delhi"
+msgstr ""
+
#: templates/web/default/auth/general.html:64
#: templates/web/default/report/new/fill_in_details_form.html:169
#: templates/web/default/report/update-form.html:124
msgid "Enter a new password:"
msgstr "Skriv inn eit nytt passord:"
-#: templates/web/bromley/report/display.html:150
-#: templates/web/bromley/report/new/fill_in_details_form.html:189
#: templates/web/fixmystreet/auth/general.html:61
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:211
#: templates/web/fixmystreet/report/update-form.html:122
@@ -1113,7 +1075,6 @@ msgstr "Døme:"
msgid "Extra data:"
msgstr ""
-#: templates/web/bromley/contact/submit.html:14
#: templates/web/default/contact/submit.html:15
msgid "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>."
msgstr "Klarte ikkje å senda meldinga. Ver venleg og prøv igjen seinare eller <a href=\"mailto:%s\">send oss ein e-post</a>."
@@ -1127,12 +1088,6 @@ msgstr ""
msgid "Find latest local and national news"
msgstr ""
-#: templates/web/bromley/report/display.html:191
-#: templates/web/bromley/report/new/fill_in_details_form.html:113
-#: templates/web/bromley/report/new/fill_in_details_form.html:160
-msgid "First Name"
-msgstr ""
-
#: templates/web/default/questionnaire/index.html:79
#: templates/web/fixmystreet/questionnaire/index.html:73
msgid "First time"
@@ -1175,8 +1130,6 @@ msgid ""
"for the county council."
msgstr "FiksGataMi sender ulike kategoriar problem til ulike administrasjonar, problem som gjeld fleire administrasjonar vert send til alle dei det gjeld."
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:84
#: templates/web/default/admin/index.html:44
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:41
@@ -1201,7 +1154,7 @@ msgstr "Løyst – Administrasjon"
msgid "Fixed - User"
msgstr "Løyst – Brukar"
-#: templates/web/default/my/my.html:27 templates/web/fixmystreet/my/my.html:31
+#: templates/web/default/my/my.html:32 templates/web/fixmystreet/my/my.html:38
msgid "Fixed reports"
msgstr "Løyste rapportar"
@@ -1218,7 +1171,7 @@ msgstr ""
msgid "Flag user"
msgstr "Flagg brukar"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1181
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1190
#: templates/web/default/admin/users.html:19
msgid "Flagged"
msgstr "Flagga:"
@@ -1263,11 +1216,9 @@ msgstr ""
#: templates/web/emptyhomes/faq/faq-en-gb.html:1
#: templates/web/fiksgatami/faq/faq-nb.html:1
#: templates/web/fiksgatami/nn/faq/faq-nn.html:1
-#: templates/web/fixmindelo/faq/faq-pt-cv.html:1
#: templates/web/fixmybarangay/faq/faq-en-gb.html:1
#: templates/web/fixmystreet/faq/faq-en-gb.html:1
#: templates/web/fixmystreet/static/privacy.html:1
-#: templates/web/oxfordshire/faq/faq-en-gb.html:1
msgid "Frequently Asked Questions"
msgstr "Ofte spurde spurnader"
@@ -1275,19 +1226,18 @@ msgstr "Ofte spurde spurnader"
msgid "GeoRSS on Google Maps"
msgstr "GeoRSS på Google Maps"
-#: templates/web/bromley/report/display.html:30
#: templates/web/fixmystreet/around/_updates.html:3
#: templates/web/fixmystreet/report/display.html:38
msgid "Get updates"
msgstr ""
-#: templates/web/fixmystreet/reports/_rss.html:3
+#: templates/web/fixmystreet/reports/_rss.html:4
#: templates/web/fixmystreet/reports/_rss.html:9
msgid "Get updates of %s problems"
msgstr ""
#: templates/web/fixmystreet/reports/_rss.html:11
-#: templates/web/fixmystreet/reports/_rss.html:3
+#: templates/web/fixmystreet/reports/_rss.html:4
msgid "Get updates of problems in this %s"
msgstr ""
@@ -1300,7 +1250,6 @@ msgstr "Gje meg ein RSS-straum"
#: templates/web/default/alert/index.html:34
#: templates/web/default/around/postcode_form.html:8
#: templates/web/fixmystreet/around/postcode_form.html:21
-#: templates/web/seesomething/around/postcode_form.html:10
#: templates/web/zurich/admin/stats.html:26
msgid "Go"
msgstr "Hald fram"
@@ -1327,19 +1276,12 @@ msgstr "Har dette problemet vorte løyst?"
msgid "Have you ever reported a problem to a council before, or is this your first time?"
msgstr "Har du rapportert eit problem til ein administrasjon før, eller er dette første gongen?"
-#: templates/web/barnet/footer.html:24 templates/web/bromley/footer.html:25
-#: templates/web/bromley/header.html:81 templates/web/default/footer.html:15
+#: templates/web/default/footer.html:15
#: templates/web/emptyhomes/header.html:33
#: templates/web/fiksgatami/footer.html:9
#: templates/web/fiksgatami/nn/footer.html:9
-#: templates/web/fixmindelo/footer.html:45
#: templates/web/fixmybarangay/footer.html:24
-#: templates/web/fixmystreet/footer.html:52
-#: templates/web/oxfordshire/footer.html:27
-#: templates/web/oxfordshire/header.html:75
-#: templates/web/reading/footer.html:10
-#: templates/web/seesomething/footer.html:13
-#: templates/web/stevenage/footer.html:47
+#: templates/web/fixmystreet/footer.html:55
#: templates/web/zurich/faq/faq-de-ch.html:1
#: templates/web/zurich/footer.html:21
#: templates/web/zurich/nav_over_content.html:8
@@ -1351,13 +1293,9 @@ msgstr "Hjelp"
msgid "Here are the types of local problem alerts for &lsquo;%s&rsquo;."
msgstr "Her er dei ulike typane lokale problemvarsel for &laquo;%s&raquo;."
-#: templates/web/barnet/header.html:70 templates/web/bromley/header.html:64
-#: templates/web/bromley/header.html:99
#: templates/web/fixmybarangay/header.html:66
-#: templates/web/fixmystreet/header.html:50
-#: templates/web/oxfordshire/header.html:111
-#: templates/web/oxfordshire/header.html:47
-#: templates/web/stevenage/header.html:97 templates/web/zurich/footer.html:11
+#: templates/web/fixmystreet/header.html:53
+#: templates/web/zurich/footer.html:11
msgid "Hi %s"
msgstr ""
@@ -1365,8 +1303,8 @@ msgstr ""
#: templates/web/default/admin/report_edit.html:50
#: templates/web/default/admin/report_edit.html:51
#: templates/web/default/admin/update_edit.html:28
-#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:11
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/report_edit.html:89
#: templates/web/zurich/admin/report_edit.html:93
#: templates/web/zurich/admin/stats.html:32
@@ -1387,7 +1325,6 @@ msgid "History"
msgstr "Historie"
#: templates/web/default/js/translation_strings.html:31
-#: templates/web/oxfordshire/js/translation_strings.html:25
msgid "Home"
msgstr ""
@@ -1396,7 +1333,6 @@ msgid "How to report a problem"
msgstr "Korleis rapportera eit problem"
#: templates/web/default/js/translation_strings.html:33
-#: templates/web/oxfordshire/js/translation_strings.html:27
msgid "How to send successful reports"
msgstr ""
@@ -1412,7 +1348,7 @@ msgstr "Eg er redd vi ikkje klarte å finna problemet ditt i databasen.\n"
msgid "I'm afraid we couldn't validate that token, as the report was made too long ago."
msgstr "Eg er redd vi ikkje kunne verifisera den referansen, då det er for lenge sidan rapporten vart laga."
-#: perllib/FixMyStreet/App/Controller/Tokens.pm:259
+#: perllib/FixMyStreet/App/Controller/Tokens.pm:260
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 "Eg er redd vi ikkje kunne verifisera den referansen. Viss du kopierte nettadressa frå ein e-post, sjekk at du har kopiert ho korrekt.\n"
@@ -1452,7 +1388,6 @@ msgstr ""
msgid "If you do not, your update will not be posted."
msgstr ""
-#: templates/web/default/report/new/councils_text_none.html:8
#: templates/web/default/report/new/councils_text_none.html:9
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 "Viss du sender inn eit problem hit, så vil emnet og detaljar for problemet vera offentlege, men problemet vil <strong>ikkje</strong> rapporterast til administrasjonen."
@@ -1504,7 +1439,7 @@ msgid ""
" when they are shown on the site. Enter the ID (number) of that user."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Contact.pm:111
+#: perllib/FixMyStreet/App/Controller/Contact.pm:116
msgid "Illegal ID"
msgstr "Ugyldig ID"
@@ -1512,8 +1447,6 @@ msgstr "Ugyldig ID"
msgid "Illegal feed selection"
msgstr "Ugyldig val av straum"
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:82
#: templates/web/default/dashboard/index.html:142
#: templates/web/default/dashboard/index.html:144
#: templates/web/default/report/update-form.html:30
@@ -1524,29 +1457,24 @@ msgid "In Progress"
msgstr "Under arbeid"
#: templates/web/default/admin/flagged.html:39
-#, fuzzy
msgid "In abuse table?"
-msgstr "(Epost i misbruktabellen)"
+msgstr ""
#: templates/web/default/open311/index.html:90
msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
msgstr "I tillegg er følgjande attributt som ikkje er del av Open311 v2-spesifikasjonen returnert: agency_sent_datetime, title (òg returnert som del av description), interface_used, comment_count, requestor_name (berre tilstades viss innsendar tillét at namnet kunne visast på denne nettstaden)."
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:121
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:143
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:38
#: templates/web/fixmystreet/report/banner.html:19
-#: templates/web/zurich/admin/header.html:1
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/header.html:8
#: templates/web/zurich/admin/report_edit.html:102
#: templates/web/zurich/report/banner.html:15
msgid "In progress"
msgstr ""
-#: templates/web/seesomething/report/new/fill_in_details_form.html:38
-msgid "Incident Category"
-msgstr ""
-
#: templates/web/zurich/admin/report_edit.html:163
msgid "Include reporter personal details"
msgstr ""
@@ -1572,7 +1500,7 @@ msgstr ""
msgid "Invalid agency_responsible value %s"
msgstr "Ugyldig agency_responsible-verdi %s"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1096
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1105
msgid "Invalid end date"
msgstr "Ugyldig slutt-dato"
@@ -1580,12 +1508,10 @@ msgstr "Ugyldig slutt-dato"
msgid "Invalid format %s specified."
msgstr "Ugyldig format %s oppgjeve."
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1092
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1101
msgid "Invalid start date"
msgstr "Ugyldig startdato"
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:81
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:37
#: templates/web/default/dashboard/index.html:142
@@ -1597,30 +1523,25 @@ msgstr "Ugyldig startdato"
msgid "Investigating"
msgstr "Undersøkjer"
-#: templates/web/emptyhomes/tokens/confirm_problem.html:12
+#: templates/web/emptyhomes/tokens/confirm_problem.html:13
#: templates/web/emptyhomes/tokens/confirm_problem.html:14
msgid "It is worth noting however that the process can sometimes be slow, especially if the property is in very poor repair or the owner is unwilling to act. In most cases it can take six months or more before you can expect to see anything change and sometimes there may be considerable barries to a property being brought back into use. This doesn&rsquo;t mean the council isn&rsquo;t doing anything. We encourage councils to update the website so you can see what is happening. It may be a long process, but you reporting your concerns about this property to the council is a valuable first step."
msgstr ""
-#: templates/web/bromley/report/display.html:168
-#: templates/web/bromley/report/new/fill_in_details_form.html:209
+#: templates/web/fixmystreet/contact/blurb.html:8
+msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there."
+msgstr ""
+
#: templates/web/default/auth/general.html:44
#: templates/web/default/report/new/fill_in_details_form.html:149
#: templates/web/default/report/update-form.html:104
#: templates/web/fixmystreet/auth/general.html:46
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:172
#: templates/web/fixmystreet/report/update-form.html:100
-#: templates/web/seesomething/auth/general.html:35
#: templates/web/zurich/auth/general.html:40
msgid "Keep me signed in on this computer"
msgstr "Hugs mi innlogging på denne datamaskina"
-#: templates/web/bromley/report/display.html:197
-#: templates/web/bromley/report/new/fill_in_details_form.html:119
-#: templates/web/bromley/report/new/fill_in_details_form.html:166
-msgid "Last Name"
-msgstr ""
-
#: templates/web/default/admin/body.html:58
#: templates/web/zurich/admin/body.html:15
msgid "Last editor"
@@ -1643,11 +1564,9 @@ msgstr ""
msgid "List all reported problems"
msgstr "Vis alle rapporterte problem"
-#: templates/web/bromley/report/new/fill_in_details_form.html:69
#: templates/web/default/report/new/fill_in_details_form.html:68
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:51
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:75
-#: templates/web/seesomething/report/new/fill_in_details_form.html:25
#: templates/web/zurich/report/new/fill_in_details_form.html:51
msgid "Loading..."
msgstr "Lastar …"
@@ -1656,7 +1575,7 @@ msgstr "Lastar …"
#: templates/web/default/alert/choose.html:3
#: templates/web/default/alert/index.html:1
#: templates/web/default/alert/index.html:3
-#: templates/web/default/alert/list.html:1
+#: templates/web/default/alert/list.html:2
#: templates/web/default/alert/list.html:5
#: templates/web/default/alert/updates.html:1
#: templates/web/default/tokens/confirm_alert.html:1
@@ -1669,23 +1588,17 @@ msgstr "Lastar …"
msgid "Local RSS feeds and email alerts"
msgstr "Lokal RSS-straum og e-postvarsel"
-#: templates/web/default/alert/list.html:1
-#: templates/web/default/alert/list.html:12
+#: templates/web/default/alert/list.html:13
#: templates/web/default/alert/list.html:14
+#: templates/web/default/alert/list.html:2
#: templates/web/default/alert/list.html:3
msgid "Local RSS feeds and email alerts for ‘%s’"
msgstr "Lokal RSS-straum og e-postvarsel for «%s»"
-#: templates/web/barnet/footer.html:22 templates/web/bromley/footer.html:23
-#: templates/web/bromley/header.html:79 templates/web/default/footer.html:13
-#: templates/web/fiksgatami/footer.html:8
+#: templates/web/default/footer.html:13 templates/web/fiksgatami/footer.html:8
#: templates/web/fiksgatami/nn/footer.html:8
-#: templates/web/fixmindelo/footer.html:43
#: templates/web/fixmybarangay/footer.html:22
-#: templates/web/fixmystreet/footer.html:50
-#: templates/web/oxfordshire/footer.html:25
-#: templates/web/oxfordshire/header.html:71
-#: templates/web/reading/footer.html:9 templates/web/stevenage/footer.html:45
+#: templates/web/fixmystreet/footer.html:53
msgid "Local alerts"
msgstr "Lokale varsel"
@@ -1694,7 +1607,6 @@ msgid "Locate the problem on a map of the area"
msgstr "Lokaliser problemet på kartet over området"
#: templates/web/default/js/translation_strings.html:43
-#: templates/web/oxfordshire/js/translation_strings.html:37
msgid "MAP"
msgstr ""
@@ -1706,11 +1618,11 @@ msgstr "Kart © <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\">OpenSt
msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
msgstr ""
-#: templates/web/fixmystreet/contact/index.html:98
+#: templates/web/fixmystreet/contact/index.html:103
msgid "Message"
msgstr ""
-#: templates/web/default/contact/index.html:90
+#: templates/web/default/contact/index.html:92
msgid "Message:"
msgstr "Melding:"
@@ -1752,10 +1664,6 @@ msgstr "Fleire problem i nærleiken"
msgid "Name"
msgstr "Namn"
-#: templates/web/seesomething/report/new/fill_in_details_form.html:74
-msgid "Name (optional)"
-msgstr ""
-
#: templates/web/default/admin/report_edit.html:66
#: templates/web/default/admin/update_edit.html:32
#: templates/web/default/admin/user-form.html:18
@@ -1765,30 +1673,30 @@ msgstr ""
msgid "Name:"
msgstr "Namn:"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:317
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:322
msgid "Name: %s"
msgstr ""
#: templates/web/fiksgatami/footer.html:3
#: templates/web/fiksgatami/nn/footer.html:3
-#: templates/web/reading/footer.html:4
msgid "Navigation"
msgstr "Navigasjon"
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:188
#: perllib/FixMyStreet/Geocode/OSM.pm:166
msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
msgstr "Næraste namngjevne veg til nålen plassert på kartet (automatisk generert ved hjelp av OpenStreetMap): %s%s"
-#: perllib/FixMyStreet/Cobrand/UK.pm:148
+#: perllib/FixMyStreet/Cobrand/UK.pm:142
msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
msgstr "Næraste postnummer til nålen plassert på kartet (automatisk generert): %s (%sm unna)"
-#: perllib/FixMyStreet/Cobrand/Default.pm:418
-#: perllib/FixMyStreet/Cobrand/Default.pm:458
+#: perllib/FixMyStreet/Cobrand/Default.pm:421
+#: perllib/FixMyStreet/Cobrand/Default.pm:461
msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
msgstr "Næraste veg til nålen plassert på karta (automatisk generert ved hjelp av Bing Maps): %s"
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:273
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:297
msgid ""
"Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
"\n"
@@ -1928,14 +1836,12 @@ msgid "No edits have yet been made."
msgstr "Ingen endringar er gjort."
#: templates/web/default/admin/flagged.html:25
-#, fuzzy
msgid "No flagged problems found."
-msgstr "Fann ingen flagga problem"
+msgstr ""
#: templates/web/default/admin/flagged.html:58
-#, fuzzy
msgid "No flagged users found."
-msgstr "Fann ingen flagga brukarar"
+msgstr ""
#: templates/web/zurich/admin/report_edit-sdm.html:68
msgid "No further updates"
@@ -1952,7 +1858,6 @@ msgid "No problems have been reported yet."
msgstr "Ingen problem er rapporterte"
#: templates/web/default/js/translation_strings.html:38
-#: templates/web/oxfordshire/js/translation_strings.html:32
msgid "No result returned"
msgstr ""
@@ -1963,7 +1868,7 @@ msgid ""
" your config file is not pointing to a live MapIt service."
msgstr ""
-#: templates/web/default/report/_support.html:2
+#: templates/web/default/report/_support.html:3
#: templates/web/default/report/_support.html:4
msgid "No supporters"
msgstr ""
@@ -1987,8 +1892,6 @@ msgid ""
" activity across their body), the ability to hide reports or set special report statuses."
msgstr ""
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:83
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:46
#: templates/web/default/report/update-form.html:30
@@ -2047,7 +1950,6 @@ msgid "Now to submit your update&hellip; do you have a FixMyStreet password?"
msgstr "På tide å registrera oppdateringa di, har du eit FiksGataMi-passord?"
#: templates/web/default/js/translation_strings.html:42
-#: templates/web/oxfordshire/js/translation_strings.html:36
msgid "OK"
msgstr ""
@@ -2091,8 +1993,7 @@ msgstr "Eldre løyste"
msgid "Older problems"
msgstr "Eldre problem"
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:115
-#: templates/web/bromley/report/display.html:80
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:137
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:36
#: templates/web/default/admin/report_edit.html:37
@@ -2100,7 +2001,7 @@ msgstr "Eldre problem"
#: templates/web/default/dashboard/index.html:142
#: templates/web/default/report/update-form.html:30
#: templates/web/fixmystreet/report/update-form.html:28
-#: templates/web/zurich/admin/header.html:1
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/header.html:7
#: templates/web/zurich/admin/report_edit.html:89
#: templates/web/zurich/admin/report_edit.html:91
@@ -2109,7 +2010,7 @@ msgstr "Eldre problem"
msgid "Open"
msgstr "Opne"
-#: templates/web/default/my/my.html:22 templates/web/fixmystreet/my/my.html:26
+#: templates/web/default/my/my.html:27 templates/web/fixmystreet/my/my.html:33
msgid "Open reports"
msgstr "Opne rapportar"
@@ -2135,15 +2036,15 @@ msgstr "Eller problem meldt til:"
msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
msgstr "Eller du kan abonnera på varsel basert på bydel eller administrasjon du høyrer til under:"
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1053
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:664
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:665
-#: perllib/FixMyStreet/DB/Result/Problem.pm:544
-#: perllib/FixMyStreet/DB/Result/Problem.pm:554
-#: perllib/FixMyStreet/DB/Result/Problem.pm:564
-#: perllib/FixMyStreet/DB/Result/Problem.pm:576
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:361
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1057
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:662
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:663
+#: perllib/FixMyStreet/DB/Result/Problem.pm:546
+#: perllib/FixMyStreet/DB/Result/Problem.pm:556
+#: perllib/FixMyStreet/DB/Result/Problem.pm:566
+#: perllib/FixMyStreet/DB/Result/Problem.pm:578
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:369
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:384
msgid "Other"
msgstr "Anna"
@@ -2170,8 +2071,6 @@ msgstr ""
msgid "Partial"
msgstr "Delvis"
-#: templates/web/bromley/report/display.html:147
-#: templates/web/bromley/report/new/fill_in_details_form.html:186
#: templates/web/fixmystreet/auth/general.html:59
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:208
#: templates/web/fixmystreet/report/update-form.html:119
@@ -2192,15 +2091,12 @@ msgstr ""
msgid "Phone number"
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:136
-#: templates/web/bromley/report/new/fill_in_details_form.html:183
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:138
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:205
-#: templates/web/seesomething/report/new/fill_in_details_form.html:89
msgid "Phone number (optional)"
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:282
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:287
#: templates/web/default/admin/report_edit.html:68
#: templates/web/default/report/new/fill_in_details_form.html:215
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:138
@@ -2210,11 +2106,8 @@ msgstr ""
msgid "Phone:"
msgstr "Telefon:"
-#: templates/web/bromley/report/display.html:111
-#: templates/web/bromley/report/new/fill_in_details_form.html:104
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:92
#: templates/web/fixmystreet/report/update-form.html:59
-#: templates/web/seesomething/report/new/fill_in_details_form.html:52
#: templates/web/zurich/admin/index-dm.html:29
#: templates/web/zurich/admin/index-sdm.html:24
#: templates/web/zurich/admin/reports.html:16
@@ -2236,7 +2129,6 @@ msgid "Photos of recent nearby reports"
msgstr "Bilete av nye problem i nærleiken"
#: templates/web/default/js/translation_strings.html:30
-#: templates/web/oxfordshire/js/translation_strings.html:24
msgid "Place pin on map"
msgstr ""
@@ -2244,7 +2136,7 @@ msgstr ""
#: templates/web/default/admin/report_edit.html:38
#: templates/web/default/dashboard/index.html:142
#: templates/web/default/dashboard/index.html:143
-#: templates/web/zurich/admin/header.html:1
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/header.html:9
#: templates/web/zurich/admin/index-dm.html:9
#: templates/web/zurich/admin/report_edit.html:89
@@ -2258,7 +2150,6 @@ msgstr ""
#: templates/web/default/report/new/notes.html:6
#: templates/web/fixmystreet/report/new/notes.html:6
-#: templates/web/oxfordshire/report/new/notes.html:5
msgid "Please be polite, concise and to the point."
msgstr "Ver høfleg, poengtert og kortfatta."
@@ -2275,20 +2166,16 @@ msgstr "Ver venleg og sjekk e-posten du oppgav"
#: templates/web/default/auth/general.html:8
#: templates/web/fixmystreet/auth/general.html:15
#: templates/web/fixmystreet/auth/general.html:9
-#: templates/web/seesomething/auth/general.html:15
-#: templates/web/seesomething/auth/general.html:9
#: templates/web/zurich/auth/general.html:3
#: templates/web/zurich/auth/general.html:9
msgid "Please check your email address is correct"
msgstr "Ver venleg og sjekk at du har skrive ei gyldig e-postadresse"
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:848
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:855
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:874
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:917
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:859
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:878
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:921
#: perllib/FixMyStreet/DB/Result/Problem.pm:381
#: templates/web/default/js/translation_strings.html:9
-#: templates/web/oxfordshire/js/translation_strings.html:9
msgid "Please choose a category"
msgstr "Vel ein kategori"
@@ -2296,19 +2183,8 @@ msgstr "Vel ein kategori"
msgid "Please choose a property type"
msgstr "Vel ein type eigenskap"
-#: templates/web/seesomething/js/translation_strings.html:6
-msgid "Please choose a transport category"
-msgstr ""
-
-#: templates/web/seesomething/js/translation_strings.html:7
-msgid "Please choose an incident category"
-msgstr ""
-
-#: templates/web/bromley/report/new/fill_in_details_form.html:64
-msgid "Please describe the exact location of the report. Example: “2 dumped mattresses outside Number 19 Stockwell Close”"
-msgstr ""
-
#: templates/web/default/contact/blurb.html:2
+#: templates/web/fixmystreet/contact/blurb.html:12
msgid ""
"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"
@@ -2317,7 +2193,6 @@ msgstr "Ver venleg og <strong>ikkje</strong> rapporter feil gjennom denne sida;
#: templates/web/default/report/new/notes.html:7
#: templates/web/fixmystreet/report/new/notes.html:7
-#: templates/web/oxfordshire/report/new/notes.html:6
msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the service for all users."
msgstr ""
@@ -2327,7 +2202,6 @@ msgstr ""
#: perllib/FixMyStreet/DB/Result/Comment.pm:126
#: templates/web/default/js/translation_strings.html:2
-#: templates/web/oxfordshire/js/translation_strings.html:2
msgid "Please enter a message"
msgstr "Ver venleg og skriv ei melding"
@@ -2340,19 +2214,14 @@ msgstr "Skriv inn eit passord"
#: perllib/FixMyStreet/App/Controller/Contact.pm:97
#: perllib/FixMyStreet/DB/Result/Problem.pm:356
#: templates/web/default/js/translation_strings.html:3
-#: templates/web/oxfordshire/js/translation_strings.html:3
msgid "Please enter a subject"
msgstr "Ver venleg og legg inn eit emne"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1032
-#: perllib/FixMyStreet/App/Controller/Admin.pm:979
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1041
+#: perllib/FixMyStreet/App/Controller/Admin.pm:988
#: perllib/FixMyStreet/DB/Result/User.pm:115
#: templates/web/default/js/translation_strings.html:12
#: templates/web/default/js/translation_strings.html:16
-#: templates/web/oxfordshire/js/translation_strings.html:12
-#: templates/web/oxfordshire/js/translation_strings.html:16
-#: templates/web/seesomething/js/translation_strings.html:10
-#: templates/web/seesomething/js/translation_strings.html:13
msgid "Please enter a valid email"
msgstr "Ver venleg og legg til ein gyldig e-post"
@@ -2363,8 +2232,6 @@ msgstr "Ver venleg og legg inn e-postadressa di"
#: perllib/FixMyStreet/DB/Result/Problem.pm:359
#: templates/web/default/js/translation_strings.html:4
-#: templates/web/oxfordshire/js/translation_strings.html:4
-#: templates/web/seesomething/js/translation_strings.html:2
msgid "Please enter some details"
msgstr "Ver venleg og legg inn opplysningar om problemet"
@@ -2376,32 +2243,22 @@ msgstr "Ver venleg og legg inn opplysningar om problemet"
#: templates/web/default/js/translation_strings.html:15
#: templates/web/fixmystreet/auth/general.html:14
#: templates/web/fixmystreet/auth/general.html:9
-#: templates/web/oxfordshire/js/translation_strings.html:11
-#: templates/web/oxfordshire/js/translation_strings.html:15
-#: templates/web/seesomething/auth/general.html:14
-#: templates/web/seesomething/auth/general.html:9
-#: templates/web/seesomething/js/translation_strings.html:9
#: templates/web/zurich/auth/general.html:3
#: templates/web/zurich/auth/general.html:8
msgid "Please enter your email"
msgstr "Ver venleg og legg inn e-posten din"
-#: templates/web/bromley/report/new/fill_in_details_form.html:149
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:151
-#: templates/web/seesomething/report/new/fill_in_details_form.html:85
#: templates/web/zurich/report/new/fill_in_details_form.html:92
msgid "Please enter your email address"
msgstr ""
#: templates/web/default/js/translation_strings.html:25
-#: templates/web/oxfordshire/js/translation_strings.html:19
msgid "Please enter your first name"
msgstr ""
#: perllib/FixMyStreet/DB/Result/Problem.pm:374
#: templates/web/default/js/translation_strings.html:7
-#: templates/web/oxfordshire/js/translation_strings.html:7
-#: templates/web/seesomething/js/translation_strings.html:4
msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
msgstr ""
@@ -2410,22 +2267,18 @@ msgstr ""
#: perllib/FixMyStreet/DB/Result/Problem.pm:367
#: perllib/FixMyStreet/DB/Result/User.pm:108
#: templates/web/default/js/translation_strings.html:6
-#: templates/web/oxfordshire/js/translation_strings.html:6
msgid "Please enter your name"
msgstr "Ver venleg og legg inn namnet ditt"
#: templates/web/default/js/translation_strings.html:22
-#, fuzzy
msgid "Please enter your phone number"
-msgstr "Ver venleg og legg inn namnet ditt"
+msgstr ""
#: templates/web/default/js/translation_strings.html:26
-#: templates/web/oxfordshire/js/translation_strings.html:20
msgid "Please enter your second name"
msgstr ""
#: templates/web/default/js/translation_strings.html:24
-#: templates/web/oxfordshire/js/translation_strings.html:18
msgid "Please enter your title"
msgstr ""
@@ -2444,16 +2297,16 @@ msgid ""
"to read, as does a lack of punctuation."
msgstr ""
-#: templates/web/default/report/new/fill_in_details_text.html:1
#: templates/web/default/report/new/fill_in_details_text.html:11
-#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1
+#: templates/web/default/report/new/fill_in_details_text.html:2
#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:10
-#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:2
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:2
#: templates/web/fixmystreet/report/new/fill_in_details_text.html:8
msgid "Please fill in details of the problem below."
msgstr "Ver venleg og fyll ut detaljar om problemet under."
-#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:2
#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:3
msgid ""
"Please fill in details of the problem below. Leave as much detail as you can, \n"
@@ -2461,7 +2314,7 @@ msgid ""
"the problem (e.g. if there is a streetlight number or road name)."
msgstr ""
-#: templates/web/default/report/new/fill_in_details_text.html:1
+#: templates/web/default/report/new/fill_in_details_text.html:2
#: templates/web/default/report/new/fill_in_details_text.html:3
msgid ""
"Please fill in details of the problem below. The council won't be able\n"
@@ -2476,12 +2329,10 @@ msgstr ""
"skildring (og eit bilete av problemet viss du har eit), osb."
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:70
-#: templates/web/seesomething/report/new/fill_in_details_form.html:20
#: templates/web/zurich/report/new/fill_in_details_form.html:46
msgid "Please fill in details of the problem."
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:28
#: templates/web/default/report/new/fill_in_details_form.html:27
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:26
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:35
@@ -2495,7 +2346,7 @@ msgstr ""
msgid "Please indicate whether you'd like to receive another questionnaire"
msgstr "Ver venleg og indiker om du ynskjer å motta eit nytt spørjeskjema"
-#: templates/web/fixmystreet/report/updates-sidebar-notes.html:3
+#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4
msgid "Please note that updates are not sent to the council."
msgstr ""
@@ -2506,11 +2357,6 @@ msgstr ""
"legg igjen namnet ditt så vil det vera offentleg tilgjengeleg.\n"
"Informasjonen din vil berre brukast i samsvar med <a href=\"/faq#privacy\">personvernpolicyen vår</a>"
-#: templates/web/barnet/report/updates-sidebar-notes.html:1
-msgid "Please note that updates are not sent to the relevant department. 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 ""
-
-#: templates/web/bromley/report/new/fill_in_details_form.html:23
#: templates/web/default/report/new/fill_in_details_form.html:5
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:5
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:26
@@ -2521,7 +2367,6 @@ msgstr "Merk at rapporten din <strong>enno ikkje er send</strong. Vel ein kateg
#: templates/web/default/report/new/notes.html:1
#: templates/web/fixmybarangay/report/new/notes.html:1
#: templates/web/fixmystreet/report/new/notes.html:1
-#: templates/web/oxfordshire/report/new/notes.html:1
msgid "Please note:"
msgstr "Merk:"
@@ -2566,19 +2411,15 @@ msgstr ""
msgid "Please write a message"
msgstr "Skriv inn ei melding"
-#: templates/web/bromley/report/display.html:70
#: templates/web/fixmystreet/report/update-form.html:23
msgid "Please write your update here"
msgstr ""
-#: templates/web/bromley/report/display.html:123
-#: templates/web/bromley/report/display.html:151
-#: templates/web/bromley/report/display.html:163
-#: templates/web/default/contact/index.html:93
+#: templates/web/default/contact/index.html:95
#: templates/web/default/report/update-form.html:109
#: templates/web/default/report/update-form.html:131
#: templates/web/default/report/update-form.html:72
-#: templates/web/fixmystreet/contact/index.html:105
+#: templates/web/fixmystreet/contact/index.html:110
#: templates/web/fixmystreet/report/update-form.html:123
#: templates/web/fixmystreet/report/update-form.html:71
#: templates/web/fixmystreet/report/update-form.html:95
@@ -2611,7 +2452,7 @@ msgstr ""
msgid "Private information (not shown on site)"
msgstr ""
-#: templates/web/default/maps/openlayers.html:85
+#: templates/web/default/maps/openlayers.html:86
msgid "Problem"
msgstr "Problem"
@@ -2632,7 +2473,7 @@ msgstr "Problem %s sendt til administrasjon %s"
msgid "Problem breakdown by state"
msgstr "Tilstandsfordeling av problem"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:950
+#: perllib/FixMyStreet/App/Controller/Admin.pm:959
msgid "Problem marked as open."
msgstr "Problem markert som ope."
@@ -2648,7 +2489,6 @@ msgstr "Problem"
msgid "Problems in this area"
msgstr "Problem i dette området"
-#: templates/web/bromley/report/display.html:31
#: templates/web/fixmystreet/around/tabbed_lists.html:4
#: templates/web/fixmystreet/report/display.html:46
msgid "Problems nearby"
@@ -2668,15 +2508,16 @@ msgstr "Problem nyleg rapportert fiksa på FiksGataMi"
msgid "Problems within %.1fkm of this location"
msgstr "Problem innanfor %.1fkm av denne posisjonen"
-#: perllib/FixMyStreet/Cobrand/Default.pm:626
+#: perllib/FixMyStreet/Cobrand/Default.pm:629
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:109
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155
-#: perllib/FixMyStreet/Cobrand/UK.pm:228
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:184
+#: perllib/FixMyStreet/Cobrand/UK.pm:222
msgid "Problems within %s"
msgstr "Problem innanfor %s"
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117
-#: perllib/FixMyStreet/Cobrand/UK.pm:242
+#: perllib/FixMyStreet/Cobrand/UK.pm:236
msgid "Problems within %s ward"
msgstr "Problem innanfor %s bydel"
@@ -2704,12 +2545,10 @@ msgstr ""
msgid "Property type:"
msgstr "Type eigenskap:"
-#: templates/web/bromley/report/new/fill_in_details_form.html:52
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:64
msgid "Provide a title"
msgstr ""
-#: templates/web/bromley/report/display.html:57
#: templates/web/default/report/update-form.html:3
#: templates/web/fixmystreet/report/update-form.html:4
msgid "Provide an update"
@@ -2719,11 +2558,6 @@ msgstr "Bidra med ei oppdatering"
msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:180
-msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
-msgstr ""
-
-#: templates/web/bromley/report/display.html:144
#: templates/web/default/report/new/fill_in_details_form.html:173
#: templates/web/default/report/update-form.html:128
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:202
@@ -2754,7 +2588,6 @@ msgstr ""
msgid "Publish the response"
msgstr ""
-#: templates/web/default/questionnaire/completed.html:1
#: templates/web/default/questionnaire/completed.html:2
#: templates/web/default/questionnaire/index.html:0
#: templates/web/default/questionnaire/index.html:14
@@ -2778,9 +2611,7 @@ msgstr "Spørjeskjema %d sendt for problem %d"
msgid "Questionnaire filled in by problem reporter"
msgstr "Spørjeskjema fylt inn av feilrapportøren"
-#: templates/web/bromley/report/display.html:37
#: templates/web/default/alert/_list.html:21
-#: templates/web/default/around/display_location.html:1
#: templates/web/default/around/display_location.html:3
#: templates/web/default/report/display.html:46
#: templates/web/default/reports/_rss.html:1
@@ -2790,11 +2621,11 @@ msgstr "Spørjeskjema fylt inn av feilrapportøren"
msgid "RSS feed"
msgstr "RSS-straum"
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:265 perllib/FixMyStreet/Cobrand/UK.pm:277
msgid "RSS feed for %s"
msgstr "RSS-straum for %s"
-#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289
+#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
msgid "RSS feed for %s ward, %s"
msgstr "RSS-straum for %s bydel, %s"
@@ -2802,11 +2633,15 @@ msgstr "RSS-straum for %s bydel, %s"
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:189
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:197
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:309
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:200
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:208
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:218
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:226
+#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303
msgid "RSS feed of %s"
msgstr "RSS-straum frå %s"
-#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:314
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:308
msgid "RSS feed of %s, within %s ward"
msgstr "RSS-straum av %s, innanfor %s bydel"
@@ -2819,31 +2654,30 @@ msgstr "RSS-straum med problem i nærleiken"
msgid "RSS feed of problems in this %s"
msgstr "RSS-straum for problem i denne %s-en"
-#: perllib/FixMyStreet/Cobrand/Default.pm:627
+#: perllib/FixMyStreet/Cobrand/Default.pm:630
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:110
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:154
-#: perllib/FixMyStreet/Cobrand/UK.pm:235
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:183
+#: perllib/FixMyStreet/Cobrand/UK.pm:229
msgid "RSS feed of problems within %s"
msgstr "RSS-straum for problem innanfor %s"
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:116
-#: perllib/FixMyStreet/Cobrand/UK.pm:241
+#: perllib/FixMyStreet/Cobrand/UK.pm:235
msgid "RSS feed of problems within %s ward"
msgstr "RSS-straum for problem innanfor %s bydel"
-#: templates/web/default/around/display_location.html:1
+#: templates/web/default/around/display_location.html:3
#: templates/web/default/around/display_location.html:4
msgid "RSS feed of recent local problems"
msgstr "RSS-straum med nye lokale problem"
-#: templates/web/bromley/report/display.html:37
#: templates/web/default/report/display.html:46
#: templates/web/fixmystreet/alert/updates.html:9
#: templates/web/fixmystreet/report/display.html:61
msgid "RSS feed of updates to this problem"
msgstr "RSS-straum med oppdateringar for dette problemet"
-#: templates/web/bromley/report/display.html:39
#: templates/web/default/alert/updates.html:9
#: templates/web/default/report/display.html:37
#: templates/web/fixmystreet/alert/updates.html:14
@@ -2867,7 +2701,7 @@ msgid "Recently fixed"
msgstr "Nyleg løyste problem"
#: templates/web/default/index.html:35 templates/web/emptyhomes/index.html:24
-#: templates/web/fixmystreet/index.html:45
+#: templates/web/fixmystreet/index.html:49
msgid "Recently reported problems"
msgstr "Nyleg melde problem"
@@ -2884,8 +2718,8 @@ msgstr ""
msgid "Remove flag"
msgstr "Fjern flagg"
-#: templates/web/default/admin/report_edit.html:89
-#: templates/web/default/admin/update_edit.html:57
+#: templates/web/default/admin/report_edit.html:94
+#: templates/web/default/admin/update_edit.html:62
#: templates/web/zurich/admin/update_edit.html:35
msgid "Remove photo (can't be undone!)"
msgstr "Fjern bilete (kan ikkje gjerast om!)"
@@ -2894,29 +2728,21 @@ msgstr "Fjern bilete (kan ikkje gjerast om!)"
msgid "Report Empty Homes"
msgstr "Rapporter tomme heimar"
-#: templates/web/barnet/footer.html:16 templates/web/bromley/footer.html:17
#: templates/web/default/footer.html:7 templates/web/emptyhomes/header.html:31
#: templates/web/fiksgatami/footer.html:5
#: templates/web/fiksgatami/nn/footer.html:5
-#: templates/web/fixmindelo/footer.html:37
-#: templates/web/fixmystreet/footer.html:44
-#: templates/web/oxfordshire/footer.html:19
-#: templates/web/reading/footer.html:6
-#: templates/web/seesomething/footer.html:11
-#: templates/web/stevenage/footer.html:39 templates/web/zurich/footer.html:17
+#: templates/web/fixmystreet/footer.html:47
+#: templates/web/zurich/footer.html:17
#: templates/web/zurich/nav_over_content.html:4
msgid "Report a problem"
msgstr "Rapporter eit problem"
-#: templates/web/bromley/report/display.html:28
#: templates/web/fixmystreet/report/display.html:35
msgid "Report abuse"
msgstr ""
#: templates/web/default/report_created.html:1
#: templates/web/default/report_created.html:3
-#: templates/web/seesomething/report_created.html:0
-#: templates/web/seesomething/report_created.html:8
msgid "Report created"
msgstr ""
@@ -2926,22 +2752,21 @@ msgstr "Rapport på %s"
#: templates/web/default/index.html:14 templates/web/emptyhomes/index.html:5
#: templates/web/fixmystreet/around/intro.html:1
-#: templates/web/stevenage/around/intro.html:1
#: templates/web/zurich/around/intro.html:1
msgid "Report, view, or discuss local problems"
msgstr "Rapporter, finn eller diskuter lokale problem"
-#: templates/web/default/my/my.html:74
+#: templates/web/default/my/my.html:79
msgid "Reported %s"
msgstr "Rapportert %s"
-#: templates/web/default/my/my.html:72
+#: templates/web/default/my/my.html:77
msgid "Reported %s, to %s"
msgstr "Rapportert %s, til %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:559
+#: perllib/FixMyStreet/DB/Result/Problem.pm:561
#: templates/web/default/contact/index.html:45
-#: templates/web/fixmystreet/contact/index.html:58
+#: templates/web/fixmystreet/contact/index.html:62
msgid "Reported anonymously at %s"
msgstr "Rapportert anonymt %s"
@@ -2951,9 +2776,9 @@ msgstr "Rapportert anonymt %s"
msgid "Reported before"
msgstr "Rapportert tidlegare"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:582
+#: perllib/FixMyStreet/DB/Result/Problem.pm:584
#: templates/web/default/contact/index.html:47
-#: templates/web/fixmystreet/contact/index.html:60
+#: templates/web/fixmystreet/contact/index.html:64
msgid "Reported by %s at %s"
msgstr "Publisert av %s %s"
@@ -2961,27 +2786,27 @@ msgstr "Publisert av %s %s"
msgid "Reported in the %s category"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:555
+#: perllib/FixMyStreet/DB/Result/Problem.pm:557
msgid "Reported in the %s category anonymously at %s"
msgstr "Rapportert i kategorien %s anonymt %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:577
+#: perllib/FixMyStreet/DB/Result/Problem.pm:579
msgid "Reported in the %s category by %s at %s"
msgstr "Rapportert i kategorien %s av %s %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:551
+#: perllib/FixMyStreet/DB/Result/Problem.pm:553
msgid "Reported via %s anonymously at %s"
msgstr "Publisert av %s anonymt %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:573
+#: perllib/FixMyStreet/DB/Result/Problem.pm:575
msgid "Reported via %s by %s at %s"
msgstr "Rapportert av %s av %s %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:547
+#: perllib/FixMyStreet/DB/Result/Problem.pm:549
msgid "Reported via %s in the %s category anonymously at %s"
msgstr "Rapportert av %s i kategorien %s anonymt %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:567
+#: perllib/FixMyStreet/DB/Result/Problem.pm:569
msgid "Reported via %s in the %s category by %s at %s"
msgstr "Rapportert av %s i kategorien %s av %s %s"
@@ -2995,22 +2820,18 @@ msgstr "Rapportert av %s i kategorien %s av %s %s"
#: templates/web/fixmystreet/report/new/fill_in_details.html:0
#: templates/web/fixmystreet/report/new/fill_in_details.html:5
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2
-#: templates/web/oxfordshire/js/translation_strings.html:35
-#: templates/web/seesomething/around/around_index.html:1
-#: templates/web/seesomething/report/new/fill_in_details_form.html:3
#: templates/web/zurich/report/new/fill_in_details_form.html:2
msgid "Reporting a problem"
msgstr "Legger til eit problem"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1177
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:242
-#: templates/web/seesomething/admin/stats.html:1
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1186
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:290
#: templates/web/zurich/header.html:60
msgid "Reports"
msgstr ""
-#: perllib/FixMyStreet/DB/Result/Problem.pm:393
-#: perllib/FixMyStreet/DB/Result/Problem.pm:397
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
+#: perllib/FixMyStreet/DB/Result/Problem.pm:399
msgid "Reports are limited to %s characters in length. Please shorten your report"
msgstr ""
@@ -3031,27 +2852,28 @@ msgid "Resend report"
msgstr "Send rapport på nytt"
#: templates/web/default/js/translation_strings.html:28
-#: templates/web/oxfordshire/js/translation_strings.html:22
msgid "Right place?"
msgstr ""
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:195
#: perllib/FixMyStreet/Geocode/OSM.pm:173
msgid "Road operator for this named road (derived from road reference number and type): %s"
msgstr "Vegoperatør for denne namngjevne vegen (utleia frå vegreferansenummer og type): %s"
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:192
#: perllib/FixMyStreet/Geocode/OSM.pm:170
msgid "Road operator for this named road (from OpenStreetMap): %s"
msgstr "Vegoperatør for denne namngjevne vegen (frå OpenStreetMap): %s"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1377
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1388
-#: templates/web/default/admin/report_edit.html:85
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1386
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1397
+#: templates/web/default/admin/report_edit.html:90
#: templates/web/zurich/admin/report_edit.html:76
msgid "Rotate Left"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1377
-#: templates/web/default/admin/report_edit.html:86
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1386
+#: templates/web/default/admin/report_edit.html:91
#: templates/web/zurich/admin/report_edit.html:77
msgid "Rotate Right"
msgstr ""
@@ -3080,9 +2902,8 @@ msgid "Search:"
msgstr "Søk:"
#: templates/web/default/admin/reports.html:26
-#, fuzzy
msgid "Searching found no reports."
-msgstr "Søk i rapportar"
+msgstr ""
#: templates/web/default/admin/users.html:39
msgid "Searching found no users."
@@ -3103,7 +2924,7 @@ msgstr ""
msgid "Select which type of alert you'd like and click the button for an RSS feed, or enter your email address to subscribe to an email alert."
msgstr "Vel kva for ein type varsel du ynskjer og klikk på knappen for ei RSS-kjelde, eller skriv inn e-postadressa di for å abonnera på eit e-postvarsel."
-#: perllib/FixMyStreet/DB/Result/Problem.pm:664
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
msgid "Sent to %s %s later"
msgstr "Sendt til %s %s seinare"
@@ -3120,9 +2941,6 @@ msgstr "Teneste:"
msgid "Share"
msgstr ""
-#: templates/web/bromley/report/display.html:205
-#: templates/web/bromley/report/new/fill_in_details_form.html:129
-#: templates/web/bromley/report/new/fill_in_details_form.html:175
#: templates/web/default/report/new/fill_in_details_form.html:210
#: templates/web/default/report/update-form.html:157
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:129
@@ -3145,11 +2963,7 @@ msgstr "Vis nåler"
#: templates/web/fixmystreet/auth/general.html:3
#: templates/web/fixmystreet/auth/general.html:42
#: templates/web/fixmystreet/auth/general.html:62
-#: templates/web/fixmystreet/header.html:54
-#: templates/web/oxfordshire/header.html:115
-#: templates/web/seesomething/auth/general.html:3
-#: templates/web/seesomething/auth/general.html:39
-#: templates/web/stevenage/header.html:101
+#: templates/web/fixmystreet/header.html:57
#: templates/web/zurich/auth/general.html:18
#: templates/web/zurich/auth/general.html:35
msgid "Sign in"
@@ -3161,20 +2975,15 @@ msgstr "Logg inn via epost"
#: templates/web/default/auth/general.html:1
#: templates/web/fixmystreet/auth/general.html:1
-#: templates/web/seesomething/auth/general.html:1
#: templates/web/zurich/auth/general.html:1
msgid "Sign in or create an account"
msgstr "Logg inn eller opprett ein konto"
-#: templates/web/bromley/auth/sign_out.html:1
#: templates/web/default/auth/sign_out.html:1
#: templates/web/default/header.html:30
#: templates/web/emptyhomes/header.html:46
#: templates/web/fiksgatami/header.html:22
#: templates/web/fiksgatami/nn/header.html:22
-#: templates/web/lichfielddc/header.html:177
-#: templates/web/reading/header.html:33
-#: templates/web/seesomething/auth/sign_out.html:1
#: templates/web/zurich/auth/sign_out.html:1
msgid "Sign out"
msgstr "Logg ut"
@@ -3183,14 +2992,12 @@ msgstr "Logg ut"
#: templates/web/emptyhomes/header.html:45
#: templates/web/fiksgatami/header.html:21
#: templates/web/fiksgatami/nn/header.html:21
-#: templates/web/lichfielddc/header.html:177
-#: templates/web/reading/header.html:32
msgid "Signed in as %s"
msgstr "Logga inn som %s"
-#: templates/web/default/report/new/fill_in_details_text.html:1
-#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1
-#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1
+#: templates/web/default/report/new/fill_in_details_text.html:2
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:2
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:2
msgid "Some categories may require additional information."
msgstr "Somme kategoriar krev kanskje meir informasjon"
@@ -3221,6 +3028,8 @@ msgstr "Orsak, men det oppstod eit problem når vi freista å stadfesta problemr
#: perllib/FixMyStreet/App/Controller/Report/New.pm:215
#: perllib/FixMyStreet/Geocode.pm:28 perllib/FixMyStreet/Geocode/Bing.pm:58
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:75
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:95
#: perllib/FixMyStreet/Geocode/Google.pm:74
#: perllib/FixMyStreet/Geocode/OSM.pm:66
msgid "Sorry, we could not find that location."
@@ -3228,7 +3037,7 @@ msgstr "Orsak, vi kunne ikkje finna den staden."
#: perllib/FixMyStreet/Geocode/Bing.pm:53
#: perllib/FixMyStreet/Geocode/Google.pm:69
-#: perllib/FixMyStreet/Geocode/Zurich.pm:87
+#: perllib/FixMyStreet/Geocode/Zurich.pm:88
msgid "Sorry, we could not parse that location. Please try again."
msgstr "Orsak, vi kunne ikkje tolka den posisjonen. Ver venleg og prøv på nytt."
@@ -3238,11 +3047,9 @@ msgid "Source code"
msgstr "Kjeldekode"
#: templates/web/default/admin/stats.html:64
-#, fuzzy
msgid "Start Date:"
-msgstr "Startdag:"
+msgstr ""
-#: templates/web/bromley/report/display.html:78
#: templates/web/default/admin/flagged.html:18
#: templates/web/default/admin/list_updates.html:11
#: templates/web/default/admin/reports.html:15
@@ -3259,8 +3066,8 @@ msgstr "Tilstand"
msgid "State:"
msgstr "Tilstand:"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1182
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:257
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1191
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:305
#: templates/web/default/admin/stats.html:1
#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72
msgid "Stats"
@@ -3276,7 +3083,7 @@ msgstr ""
msgid "Still open, via questionnaire, %s"
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:370
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378
msgid "Subcategory: %s"
msgstr ""
@@ -3284,8 +3091,7 @@ msgstr ""
msgid "Subdivision/Body"
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:48
-#: templates/web/fixmystreet/contact/index.html:91
+#: templates/web/fixmystreet/contact/index.html:95
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:60
msgid "Subject"
msgstr ""
@@ -3298,9 +3104,6 @@ msgstr ""
msgid "Subject:"
msgstr "Emne:"
-#: templates/web/bromley/report/new/fill_in_details_form.html:140
-#: templates/web/bromley/report/new/fill_in_details_form.html:190
-#: templates/web/bromley/report/new/fill_in_details_form.html:204
#: templates/web/default/questionnaire/creator_fixed.html:19
#: templates/web/default/report/new/fill_in_details_form.html:114
#: templates/web/default/report/new/fill_in_details_form.html:154
@@ -3309,13 +3112,12 @@ msgstr "Emne:"
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:142
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:167
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:212
-#: templates/web/seesomething/report/new/fill_in_details_form.html:93
#: templates/web/zurich/report/new/fill_in_details_form.html:114
msgid "Submit"
msgstr "Send inn"
-#: templates/web/default/admin/report_edit.html:92
-#: templates/web/default/admin/update_edit.html:60
+#: templates/web/default/admin/report_edit.html:97
+#: templates/web/default/admin/update_edit.html:65
#: templates/web/default/admin/user-form.html:55
#: templates/web/zurich/admin/report_edit-sdm.html:67
#: templates/web/zurich/admin/report_edit.html:224
@@ -3328,8 +3130,8 @@ msgstr "Send inn endringar"
msgid "Submit questionnaire"
msgstr "Send inn spørjeskjema"
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:111
-#: templates/web/zurich/admin/header.html:1
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:133
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/header.html:6
#: templates/web/zurich/admin/index-dm.html:23
#: templates/web/zurich/admin/index-dm.html:6
@@ -3341,7 +3143,6 @@ msgstr "Send inn spørjeskjema"
msgid "Submitted"
msgstr ""
-#: templates/web/bromley/report/display.html:44
#: templates/web/default/alert/updates.html:17
#: templates/web/default/report/display.html:42
#: templates/web/fixmystreet/alert/updates.html:23
@@ -3359,8 +3160,8 @@ msgstr "Eg ynskjer å abonnera på e-postvarsel"
msgid "Subscribe to an alert based upon what baranagay you&rsquo;re in:"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1175
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:241
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1184
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:289
#: templates/web/default/admin/index.html:1
#: templates/web/zurich/admin/index-dm.html:1
#: templates/web/zurich/admin/index-sdm.html:1
@@ -3379,7 +3180,7 @@ msgstr "Oppsummering"
msgid "Summary reports"
msgstr "Oppsummeringsrapportar"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1179
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1188
msgid "Survey"
msgstr ""
@@ -3402,17 +3203,15 @@ msgstr "Tekst-utgåve"
msgid "Text:"
msgstr "Tekst:"
-#: templates/web/default/tokens/confirm_update.html:7
#: templates/web/default/tokens/confirm_update.html:8
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\">sjå på det oppdaterte problemet ditt</a> her hos oss."
-#: templates/web/emptyhomes/tokens/confirm_problem.html:6
+#: templates/web/emptyhomes/tokens/confirm_problem.html:7
#: templates/web/emptyhomes/tokens/confirm_problem.html:8
msgid "Thank you for reporting an empty property on ReportEmptyHomes.com. We have emailed the lead officer for empty homes in the council responsible with details, and asked them to do whatever they can to get the empty property back into use as soon as possible."
msgstr ""
-#: templates/web/emptyhomes/tokens/confirm_problem.html:30
#: templates/web/emptyhomes/tokens/confirm_problem.html:31
msgid ""
"Thank you for reporting this empty property on ReportEmptyHomes.com.\n"
@@ -3428,7 +3227,7 @@ msgstr ""
"ditt. Det ser ut til at vi har ein feil hos oss, så <a href=\"%s\">ver\n"
"så snill og fortel oss kva som skjedde</a>, så skal vi sjå på saka."
-#: templates/web/emptyhomes/tokens/confirm_problem.html:24
+#: templates/web/emptyhomes/tokens/confirm_problem.html:25
#: templates/web/emptyhomes/tokens/confirm_problem.html:26
msgid "Thank you for using ReportEmptyHomes.com. Your action is already helping to resolve the UK&rsquo;s empty homes crisis."
msgstr ""
@@ -3451,15 +3250,16 @@ msgstr "Takk, glad for å høyra at problemet er løyst! Vi vil gjerne spørja d
msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
msgstr "Biletet ser ikkje ut til å ha vorte lasta opp riktig (%s), prøv på nytt."
-#: perllib/FixMyStreet/App/Controller/Council.pm:90
+#: perllib/FixMyStreet/App/Controller/Council.pm:100
msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Location.pm:123
+#: perllib/FixMyStreet/App/Controller/Location.pm:124
msgid "That location does not appear to be in the UK; please try again."
msgstr ""
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:63
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:79
#: perllib/FixMyStreet/Cobrand/UK.pm:86
msgid "That postcode was not recognised, sorry."
msgstr "Det postnummeret vart ikkje gjenkjent, orsak."
@@ -3519,7 +3319,7 @@ msgstr ""
msgid "The confirmation email <strong>may</strong> take a few minutes to arrive &mdash; <em>please</em> be patient."
msgstr "Stadfestingse-posten <strong>kan</strong> bruka nokre minutt før han kjem fram &mdash; så ver tålmodig."
-#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:2
#: templates/web/fixmystreet/report/new/fill_in_details_text.html:3
msgid "The council won&rsquo;t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc."
msgstr ""
@@ -3546,6 +3346,7 @@ msgstr "Feilen var: %s"
msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
msgstr "Dei følgjande Open311 v2-attributtene vert returnerte for kvar førespurnad: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code og service_name."
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:187
#: perllib/FixMyStreet/Geocode/OSM.pm:165
msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
msgstr "Følgjande informasjon om næraste veg kan vera unøyaktig eller irrelevant, viss problemet er nær fleire vegar eller nær ein veg utan namn registrert i OpenStreetmap."
@@ -3604,7 +3405,7 @@ msgstr ""
msgid "The passwords do not match"
msgstr "Passorda er ikkje like"
-#: templates/web/default/errors/page_error_404_not_found.html:10
+#: templates/web/default/errors/page_error_404_not_found.html:11
#: templates/web/default/errors/page_error_404_not_found.html:12
msgid "The requested URL '%s' was not found on this server"
msgstr "Fann ikkje URL-en «%s» på denne tenaren"
@@ -3614,9 +3415,7 @@ msgstr "Fann ikkje URL-en «%s» på denne tenaren"
msgid "The simplest alert is our geographic one:"
msgstr "Den enklaste meldinga er den geografiske:"
-#: templates/web/barnet/report/new/councils_text_all.html:3
#: templates/web/default/report/new/councils_extra_text.html:1
-#: templates/web/default/report/new/councils_text_some.html:10
#: templates/web/default/report/new/councils_text_some.html:11
#: templates/web/default/report/new/fill_in_details_form.html:17
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12
@@ -3625,7 +3424,7 @@ msgstr ""
"Tittelen og detaljane for problemet vil verta offentlege, pluss namnet ditt\n"
"viss du gjev oss lov til det."
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:291
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:296
msgid "The user could not locate the problem on a map, but to see the area around the location they entered"
msgstr "Brukaren kunne ikkje plassera problemet på eit kart, men sjekk områdde rundt staden dei skreiv inn"
@@ -3640,16 +3439,15 @@ msgstr ""
msgid "There was a problem showing the All Reports page. Please try again later."
msgstr "Det oppstod problem med å visa «Alle rapportar»-sida. Ver venleg og prøv igjen seinare."
-#: perllib/FixMyStreet/App/Controller/Contact.pm:116
+#: perllib/FixMyStreet/App/Controller/Contact.pm:121
#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59
msgid "There was a problem showing this page. Please try again later."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:747
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:755
#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134
#: templates/web/default/auth/general.html:23
#: templates/web/fixmystreet/auth/general.html:24
-#: templates/web/seesomething/auth/general.html:24
#: templates/web/zurich/auth/general.html:28
msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the &lsquo;sign in by email&rsquo; section of the form."
msgstr ""
@@ -3662,7 +3460,7 @@ msgstr "Det var problem med e-post/passord-kombinasjonen din. Ver venleg og prø
msgid "There was a problem with your update. Please try again."
msgstr "Det var problem med oppdateringa di. Ver venleg og prøv igjen."
-#: perllib/FixMyStreet/App/Controller/Contact.pm:120
+#: perllib/FixMyStreet/App/Controller/Contact.pm:125
msgid "There were problems with your report. Please see below."
msgstr "Det var problem med rapporten din. Ver venleg og sjå under."
@@ -3702,16 +3500,16 @@ msgid ""
" A body will not receive any reports unless it covers at least one area."
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:375
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:385
msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system."
msgstr "Denne e-posten er sendt til begge administrasjonane som dekkjer staden for problemet, sidan brukaren ikkje kategoriserte det. Ver venleg og ignorer e-posten viss de ikkje er korrekt administrasjon for å handtera denne saka, eller gjev oss melding om kva for ein kategori av problem dette er så vi kan leggja det til i systemet vårt."
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:388
msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue."
msgstr "Denne e-posten er sendt til fleire administrasjonar som dekkjer staden for problemet, sidan den valde kategorien er tilgjengeleg for desse. Ver venleg og ignorer e-posten viss de ikkje er korrekt administrasjon for å handtera denne saka."
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:894
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:964
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:898
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:968
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:131
#: perllib/FixMyStreet/Cobrand/UK.pm:58
msgid "This information is required"
@@ -3743,7 +3541,6 @@ msgstr ""
msgid "This problem has been closed"
msgstr "Dette problemet er lukka"
-#: templates/web/bromley/report/display.html:98
#: templates/web/default/report/banner.html:12
#: templates/web/default/report/update-form.html:48
#: templates/web/emptyhomes/report/banner.html:3
@@ -3751,7 +3548,6 @@ msgstr "Dette problemet er lukka"
msgid "This problem has been fixed"
msgstr "Dette problemet er løyst"
-#: templates/web/bromley/report/display.html:92
#: templates/web/default/report/update-form.html:43
#: templates/web/fixmystreet/report/update-form.html:40
msgid "This problem has not been fixed"
@@ -3765,33 +3561,33 @@ msgstr "Dette problemet er under arbeid"
msgid "This problem is old and of unknown status."
msgstr "Dette problemet er gammalt og med ukjend status."
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:108
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:109
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:130
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:131
#: templates/web/zurich/report/_main.html:14
msgid "This report is awaiting moderation."
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88
msgid "This report is currently marked as closed."
msgstr "Denne rapporten er for tida markert som lukka."
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86
msgid "This report is currently marked as fixed."
msgstr "Denne rapporten er for tida markert som fiksa."
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:90
msgid "This report is currently marked as open."
msgstr "Denne rapporten er for tida markert som open."
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:320
msgid "This report was submitted anonymously"
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:284
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:289
msgid "This web page also contains a photo of the problem, provided by the user."
msgstr "Denne nettsida inneheld òg eit bilete av problemet, sendt inn av brukaren."
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1178
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1187
#: templates/web/default/admin/timeline.html:1
msgid "Timeline"
msgstr "Tidslinje"
@@ -3809,7 +3605,7 @@ msgstr ""
msgid "To find out what local alerts we have for you, please enter your postcode or street name and area"
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:290
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:295
msgid "To view a map of the precise location of this issue"
msgstr "For å sjå eit kart med ei meir presis plassering for dette problemet"
@@ -3821,17 +3617,10 @@ msgstr "For å sjå eit kart med ei meir presis plassering for dette problemet"
msgid "Total"
msgstr "Totalt"
-#: templates/web/seesomething/report/new/fill_in_details_form.html:24
-msgid "Transport Category"
-msgstr ""
-
#: templates/web/default/js/translation_strings.html:29
-#: templates/web/oxfordshire/js/translation_strings.html:23
msgid "Try again"
msgstr ""
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:83
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:46
#: templates/web/default/report/update-form.html:30
@@ -3859,7 +3648,6 @@ msgid "Unknown alert type"
msgstr "Ukjend varsel-type"
#: templates/web/default/js/translation_strings.html:39
-#: templates/web/oxfordshire/js/translation_strings.html:33
msgid "Unknown error"
msgstr ""
@@ -3867,7 +3655,6 @@ msgstr ""
msgid "Unknown problem ID"
msgstr "Ukjend problem-ID"
-#: templates/web/bromley/report/display.html:66
#: templates/web/fixmystreet/report/update-form.html:19
msgid "Update"
msgstr ""
@@ -3877,12 +3664,12 @@ msgid "Update %s created for problem %d; by %s"
msgstr "Oppdatering %s oppretta for problem %d, av %s"
#: templates/web/default/contact/index.html:21
-#: templates/web/fixmystreet/contact/index.html:34
+#: templates/web/fixmystreet/contact/index.html:38
msgid "Update below added anonymously at %s"
msgstr "Oppdateringa under vart lagt inn anonymt %s"
#: templates/web/default/contact/index.html:23
-#: templates/web/fixmystreet/contact/index.html:36
+#: templates/web/fixmystreet/contact/index.html:40
msgid "Update below added by %s at %s"
msgstr "Oppdateringa under vart lagt til av %s %s"
@@ -3926,12 +3713,12 @@ msgstr "Oppdatering:"
msgid "Updated"
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1042
-#: perllib/FixMyStreet/App/Controller/Admin.pm:796
-#: perllib/FixMyStreet/App/Controller/Admin.pm:940
-#: perllib/FixMyStreet/App/Controller/Admin.pm:998
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:487
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:556
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1007
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1051
+#: perllib/FixMyStreet/App/Controller/Admin.pm:801
+#: perllib/FixMyStreet/App/Controller/Admin.pm:949
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:550
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:619
msgid "Updated!"
msgstr "Oppdatert!"
@@ -3943,16 +3730,14 @@ msgstr "Oppdatert!"
msgid "Updates"
msgstr "Oppdateringar"
-#: perllib/FixMyStreet/DB/Result/Comment.pm:131
-msgid "Updates are limited to 2000 characters in length. Please shorten your update"
+#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+msgid "Updates are limited to %s characters in length. Please shorten your update"
msgstr ""
#: db/alert_types.pl:5 db/alert_types.pl:6
msgid "Updates on {{title}}"
msgstr "Oppdateringar av {{title}}"
-#: templates/web/bromley/report/display.html:0
-#: templates/web/bromley/report/display.html:8
#: templates/web/default/report/display.html:0
#: templates/web/default/report/display.html:5
#: templates/web/fixmystreet/report/display.html:0
@@ -3966,15 +3751,14 @@ msgstr ""
#: templates/web/zurich/admin/list_updates.html:30
#: templates/web/zurich/admin/list_updates.html:9
-#, fuzzy
msgid "User"
-msgstr "Brukarar"
+msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1342
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1351
msgid "User flag removed"
msgstr "Brukarflagg fjerna"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1314
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1323
msgid "User flagged"
msgstr "Brukar flagga"
@@ -3982,8 +3766,8 @@ msgstr "Brukar flagga"
msgid "User search finds matches in users' names and email addresses."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:256
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1189
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:304
#: templates/web/default/admin/flagged.html:29
#: templates/web/zurich/header.html:69
msgid "Users"
@@ -4012,12 +3796,9 @@ msgstr "Vis rapporten din"
#: templates/web/default/around/display_location.html:0
#: templates/web/default/around/display_location.html:34
-#: templates/web/seesomething/around/display_location.html:0
-#: templates/web/seesomething/around/display_location.html:16
msgid "Viewing a location"
msgstr "Ser på ein stad"
-#: templates/web/bromley/report/display.html:0
#: templates/web/default/report/display.html:0
#: templates/web/fixmystreet/report/display.html:0
msgid "Viewing a problem"
@@ -4030,7 +3811,6 @@ msgstr "Bydelar innanfor denne administrasjonen"
#: templates/web/default/alert/choose.html:6
#: templates/web/default/around/around_index.html:13
#: templates/web/fixmystreet/around/around_index.html:16
-#: templates/web/seesomething/around/around_index.html:13
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 fann meir ein eitt treff for den staden. Vi viser opp til ti treff, så prøv eit anna søk viss staden din ikkje er her."
@@ -4042,25 +3822,22 @@ msgstr ""
msgid "We have sent you an email containing a link to confirm your account."
msgstr "Vi har sendt deg ein epost som inneheld ei lenkje for å stadfesta kontoen din."
-#: templates/web/emptyhomes/tokens/confirm_problem.html:18
+#: templates/web/emptyhomes/tokens/confirm_problem.html:19
#: templates/web/emptyhomes/tokens/confirm_problem.html:20
msgid "We may contact you periodically to ask if anything has changed with the property you reported."
msgstr "Det kan hende vi periodisk tek kontakt med deg for å spørja om noko har endra seg med eiedommen du rapporterte."
-#: templates/web/bromley/report/display.html:143
#: templates/web/fixmystreet/report/update-form.html:115
msgid "We never show your email"
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:133
-#: templates/web/bromley/report/new/fill_in_details_form.html:179
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:134
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:201
#: templates/web/zurich/report/new/fill_in_details_form.html:96
msgid "We never show your email address or phone number."
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:384
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:394
msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch."
msgstr "Vi innser at %s kan vera ansvarleg for dette problemet, men vi manglar for tida kontaktinformasjon for dei. Viss du veit om ei eigna kontaktadresse, ta kontakt med oss."
@@ -4068,14 +3845,12 @@ msgstr "Vi innser at %s kan vera ansvarleg for dette problemet, men vi manglar f
msgid "We send it to the council on your behalf"
msgstr "Vi sender til administrasjon på dine vegner"
-#: templates/web/bromley/report/new/fill_in_details_form.html:217
#: templates/web/default/report/new/notes.html:5
#: templates/web/fixmybarangay/report/new/notes.html:5
msgid "We will only use your personal information in accordance with our <a href=\"/faq#privacy\">privacy policy.</a>"
msgstr "Vi vil berre bruka personleg informasjon om deg i samsvar med <a href=\"/faq#privacy\">personvernpolicyen</a> vår."
#: templates/web/fixmystreet/report/new/notes.html:4
-#: templates/web/oxfordshire/report/new/notes.html:4
msgid "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>"
msgstr ""
@@ -4105,13 +3880,11 @@ msgstr "Heil blokk med tomme leilegheiter"
msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>."
msgstr "Når du søkjer etter førespurnader, så er det òg mogleg å søkja etter agency_responsible for å avgrensa det til førespurnader som er sendt til ein einskild adminstrasjon. Søkjetermen er administrasjonssida som du får frå <a href=\"%s\">MaPit</a>."
-#: templates/web/fixmystreet/footer.html:21
-#: templates/web/stevenage/footer.html:22
+#: templates/web/fixmystreet/footer.html:24
msgid "Would you like better integration with FixMyStreet? <a href=\"http://www.mysociety.org/for-councils/fixmystreet/\">Find out about FixMyStreet for councils</a>."
msgstr ""
-#: templates/web/fixmystreet/footer.html:17
-#: templates/web/stevenage/footer.html:18
+#: templates/web/fixmystreet/footer.html:20
msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>."
msgstr ""
@@ -4123,7 +3896,6 @@ msgstr "Kunne du tenkja deg å motta ein ny førespurnad om 4 veker, som minner
#: templates/web/default/report/new/notes.html:8
#: templates/web/fixmybarangay/report/new/notes.html:8
#: templates/web/fixmystreet/report/new/notes.html:8
-#: templates/web/oxfordshire/report/new/notes.html:7
msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
msgstr "Når du skriv meldinga di med berre store bokstavar vert ho vanskeleg å lesa. Det same gjeld manglande tegnsetting."
@@ -4153,26 +3925,24 @@ msgstr "År"
msgid "Yes"
msgstr "Ja"
-#: templates/web/bromley/report/display.html:157
-#: templates/web/bromley/report/new/fill_in_details_form.html:198
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:161
#: templates/web/fixmystreet/report/update-form.html:89
msgid "Yes I have a password"
msgstr ""
#: templates/web/default/contact/index.html:37
-#: templates/web/fixmystreet/contact/index.html:50
+#: templates/web/fixmystreet/contact/index.html:54
msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:"
msgstr "Du rapporterer at følgjande problem er støytande, inneheld personleg informasjon eller liknande:"
#: templates/web/default/contact/index.html:15
-#: templates/web/fixmystreet/contact/index.html:28
+#: templates/web/fixmystreet/contact/index.html:32
msgid "You are reporting the following update for being abusive, containing personal information, or similar:"
msgstr "Du rapporterer at følgjande oppdatering er støytande, inneheld personleg informasjon, eller liknande:"
-#: templates/web/default/tokens/confirm_problem.html:19
+#: templates/web/default/tokens/confirm_problem.html:20
#: templates/web/default/tokens/confirm_problem.html:21
-#: templates/web/zurich/tokens/confirm_problem.html:5
+#: templates/web/zurich/tokens/confirm_problem.html:6
#: templates/web/zurich/tokens/confirm_problem.html:8
msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
msgstr ""
@@ -4181,6 +3951,10 @@ msgstr ""
msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
msgstr ""
+#: templates/web/fixmystreet/contact/index.html:118
+msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
+msgstr ""
+
#: templates/web/default/admin/flagged.html:5
msgid ""
"You can flag any report or user by editing them, and they will be listed on this page.\n"
@@ -4188,9 +3962,9 @@ msgid ""
" reports in the past."
msgstr ""
-#: templates/web/default/report/new/councils_text_none.html:11
-#: templates/web/default/report/new/councils_text_none.html:13
-#: templates/web/default/report/new/councils_text_some.html:20
+#: templates/web/default/report/new/councils_text_none.html:19
+#: templates/web/default/report/new/councils_text_none.html:20
+#: templates/web/default/report/new/councils_text_some.html:21
#: templates/web/default/report/new/councils_text_some.html:22
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 "Du kan hjelpa oss ved å finna ein kontakt-e-post for lokale problem i %s, og senda han via e-post til oss på <a href='mailto:%s'>%s</a>."
@@ -4200,7 +3974,6 @@ msgid "You can mark a body as deleted if you do not want it to be active on the
msgstr ""
#: templates/web/default/js/translation_strings.html:36
-#: templates/web/oxfordshire/js/translation_strings.html:30
msgid "You declined; please fill in the box above"
msgstr ""
@@ -4208,30 +3981,25 @@ msgstr ""
msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
msgstr "Du har allereie svart på dette spørjeskjemaet. Viss du har spurnader, ver venleg og <a href='%s'>ta kontakt</a>, eller <a href='%s'>sjå på problemet ditt</a>.\n"
-#: templates/web/bromley/report/new/fill_in_details_form.html:97
#: templates/web/default/questionnaire/index.html:96
#: templates/web/default/report/new/fill_in_details_form.html:93
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:90
#: templates/web/fixmystreet/questionnaire/index.html:87
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:99
-#: templates/web/seesomething/report/new/fill_in_details_form.html:59
#: templates/web/zurich/report/new/fill_in_details_form.html:75
msgid "You have already attached a photo to this report, attaching another one will replace it."
msgstr "Du har allereie lagt ved eit bilete til dette problemet. Å leggja ved eit anna vil byta ut dette."
-#: templates/web/bromley/report/display.html:108
#: templates/web/default/report/update-form.html:59
#: templates/web/fixmystreet/report/update-form.html:56
msgid "You have already attached a photo to this update, attaching another one will replace it."
msgstr "Du har allereie lagt ved eit bilete til denne oppdateringa. Å leggja ved eit anna vil byta ut dette."
#: templates/web/default/auth/sign_out.html:3
-#: templates/web/seesomething/auth/sign_out.html:3
#: templates/web/zurich/auth/sign_out.html:3
msgid "You have been signed out"
msgstr "Du er allereie logga ut"
-#: templates/web/bromley/report/new/fill_in_details_form.html:25
#: templates/web/default/report/new/fill_in_details_form.html:7
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:7
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:28
@@ -4243,17 +4011,14 @@ msgstr ""
msgid "You have successfully confirmed your alert."
msgstr "Du har no stadfesta varselet ditt."
-#: templates/web/zurich/tokens/confirm_problem.html:5
#: templates/web/zurich/tokens/confirm_problem.html:6
msgid "You have successfully confirmed your email address."
msgstr ""
-#: templates/web/default/tokens/confirm_problem.html:14
#: templates/web/default/tokens/confirm_problem.html:15
msgid "You have successfully confirmed your problem"
msgstr "Du har no stadfesta problemet ditt"
-#: templates/web/default/tokens/confirm_update.html:11
#: templates/web/default/tokens/confirm_update.html:12
msgid "You have successfully confirmed your update and you can now <a href=\"%s\">view it on the site</a>."
msgstr "Du har no stadfesta oppdateringa di <a href=\"%s\">og kan sjå ho på denne nettstaden</a>."
@@ -4266,11 +4031,15 @@ msgstr "Du har oppretta varselet ditt."
msgid "You have successfully deleted your alert."
msgstr "Sletting av varselet ditt var vellukka."
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:754
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:762
#: perllib/FixMyStreet/App/Controller/Report/Update.pm:140
msgid "You have successfully signed in; please check and confirm your details are accurate:"
msgstr "Du har no logga inn. Ver venleg og sjekk og stadfest at detaljane dine er korrekte:"
+#: templates/web/default/my/my.html:17 templates/web/fixmystreet/my/my.html:17
+msgid "You haven&rsquo;t created any reports yet. <a href=\"%s\">Report a problem now.</a>"
+msgstr ""
+
#: templates/web/default/email_sent.html:13
msgid "You must now click the link in the email we've just sent you."
msgstr ""
@@ -4297,13 +4066,10 @@ msgstr "Ynskjer du verkeleg å senda på nytt?"
msgid "Your Reports"
msgstr "Rapportane dine"
-#: templates/web/bromley/report/display.html:41
-#: templates/web/bromley/report/display.html:43
-#: templates/web/bromley/report/new/fill_in_details_form.html:145
#: templates/web/fixmystreet/alert/_list.html:89
#: templates/web/fixmystreet/alert/updates.html:19
#: templates/web/fixmystreet/alert/updates.html:22
-#: templates/web/fixmystreet/contact/index.html:84
+#: templates/web/fixmystreet/contact/index.html:88
#: templates/web/fixmystreet/report/display.html:65
#: templates/web/fixmystreet/report/display.html:67
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:115
@@ -4312,14 +4078,8 @@ msgstr "Rapportane dine"
msgid "Your email"
msgstr ""
-#: templates/web/seesomething/report/new/fill_in_details_form.html:81
-msgid "Your email (optional)"
-msgstr ""
-
-#: templates/web/bromley/report/display.html:132
#: templates/web/fixmystreet/auth/general.html:26
#: templates/web/fixmystreet/report/update-form.html:80
-#: templates/web/seesomething/auth/general.html:26
#: templates/web/zurich/auth/general.html:30
#: templates/web/zurich/auth/general.html:58
msgid "Your email address"
@@ -4337,28 +4097,15 @@ msgstr "e-postadressa di:"
msgid "Your email:"
msgstr "E-posten din"
-#: templates/web/bromley/report/display.html:195
-#: templates/web/bromley/report/new/fill_in_details_form.html:117
-#: templates/web/bromley/report/new/fill_in_details_form.html:164
-msgid "Your first name"
-msgstr ""
-
-#: templates/web/fixmystreet/report/updates-sidebar-notes.html:5
+#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7
msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>"
msgstr ""
-#: templates/web/bromley/report/display.html:201
-#: templates/web/bromley/report/new/fill_in_details_form.html:123
-#: templates/web/bromley/report/new/fill_in_details_form.html:170
-msgid "Your last name"
-msgstr ""
-
#: templates/web/fixmystreet/auth/general.html:57
-#: templates/web/fixmystreet/contact/index.html:77
+#: templates/web/fixmystreet/contact/index.html:81
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:124
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:192
#: templates/web/fixmystreet/report/update-form.html:140
-#: templates/web/seesomething/report/new/fill_in_details_form.html:79
#: templates/web/zurich/auth/general.html:61
#: templates/web/zurich/report/new/fill_in_details_form.html:104
msgid "Your name"
@@ -4372,12 +4119,9 @@ msgstr ""
msgid "Your name:"
msgstr "Namnet ditt:"
-#: templates/web/bromley/report/display.html:162
-#: templates/web/bromley/report/new/fill_in_details_form.html:203
#: templates/web/fixmystreet/auth/general.html:41
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:166
#: templates/web/fixmystreet/report/update-form.html:94
-#: templates/web/seesomething/auth/general.html:30
#: templates/web/zurich/auth/general.html:34
msgid "Your password"
msgstr ""
@@ -4386,11 +4130,8 @@ msgstr ""
msgid "Your password has been changed"
msgstr "Passordet ditt har vorte endra"
-#: templates/web/bromley/report/new/fill_in_details_form.html:137
-#: templates/web/bromley/report/new/fill_in_details_form.html:184
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:139
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:206
-#: templates/web/seesomething/report/new/fill_in_details_form.html:90
#: templates/web/zurich/report/new/fill_in_details_form.html:110
msgid "Your phone number"
msgstr ""
@@ -4403,19 +4144,13 @@ msgstr ""
msgid "Your report has been created and will shortly be sent."
msgstr ""
-#: templates/web/barnet/footer.html:18 templates/web/bromley/footer.html:19
-#: templates/web/bromley/header.html:75 templates/web/default/footer.html:9
-#: templates/web/fiksgatami/footer.html:6
+#: templates/web/default/footer.html:9 templates/web/fiksgatami/footer.html:6
#: templates/web/fiksgatami/nn/footer.html:6
-#: templates/web/fixmindelo/footer.html:39
-#: templates/web/fixmystreet/footer.html:46
-#: templates/web/oxfordshire/footer.html:21
-#: templates/web/oxfordshire/header.html:63
-#: templates/web/reading/footer.html:7 templates/web/stevenage/footer.html:41
+#: templates/web/fixmystreet/footer.html:49
msgid "Your reports"
msgstr "Oppdateringane dine"
-#: templates/web/default/my/my.html:45 templates/web/fixmystreet/my/my.html:49
+#: templates/web/default/my/my.html:50 templates/web/fixmystreet/my/my.html:56
msgid "Your updates"
msgstr "Oppdateringane dine"
@@ -4432,7 +4167,7 @@ msgstr "av %s"
msgid "council"
msgstr "administrasjon"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
msgid "council ref:&nbsp;%s"
msgstr ""
@@ -4444,27 +4179,24 @@ msgstr "brukte ikkje kart"
#: templates/web/default/alert/index.html:33
#: templates/web/fixmystreet/around/postcode_form.html:20
-#: templates/web/seesomething/around/postcode_form.html:9
msgid "e.g. ‘%s’ or ‘%s’"
msgstr ""
#: templates/web/default/admin/flagged.html:51
-#, fuzzy
msgid "edit user"
-msgstr "Redigerer brukar %d"
+msgstr ""
#: templates/web/default/admin/index.html:23
#: templates/web/zurich/admin/index.html:5
msgid "from %d different users"
msgstr "frå %d ulike brukarar"
-#: templates/web/bromley/report/_item.html:12
-#: templates/web/fixmystreet/report/_item.html:12
+#: templates/web/fixmystreet/report/_item.html:17
#: templates/web/zurich/report/_item.html:16
msgid "last updated %s"
msgstr ""
-#: perllib/Utils.pm:263
+#: perllib/Utils.pm:265
msgid "less than a minute"
msgstr "mindre enn eitt minutt"
@@ -4522,21 +4254,20 @@ msgid "or"
msgstr "eller"
#: templates/web/default/js/translation_strings.html:27
-#: templates/web/oxfordshire/js/translation_strings.html:21
msgid "or locate me automatically"
msgstr ""
-#: templates/web/default/admin/report_edit.html:24
+#: templates/web/default/admin/report_edit.html:25
#: templates/web/default/admin/report_edit.html:26
-#: templates/web/zurich/admin/report_edit-sdm.html:30
+#: templates/web/zurich/admin/report_edit-sdm.html:31
#: templates/web/zurich/admin/report_edit-sdm.html:32
-#: templates/web/zurich/admin/report_edit-sdm.html:39
+#: templates/web/zurich/admin/report_edit-sdm.html:40
#: templates/web/zurich/admin/report_edit-sdm.html:41
-#: templates/web/zurich/admin/report_edit.html:30
+#: templates/web/zurich/admin/report_edit.html:31
#: templates/web/zurich/admin/report_edit.html:32
-#: templates/web/zurich/admin/report_edit.html:41
+#: templates/web/zurich/admin/report_edit.html:42
#: templates/web/zurich/admin/report_edit.html:43
-#: templates/web/zurich/admin/report_edit.html:53
+#: templates/web/zurich/admin/report_edit.html:54
#: templates/web/zurich/admin/report_edit.html:55
msgid "originally entered: &ldquo;%s&rdquo;"
msgstr ""
@@ -4550,23 +4281,17 @@ msgstr "andre område:"
msgid "reopened"
msgstr "opna på nytt"
-#: templates/web/barnet/header.html:71 templates/web/bromley/header.html:100
-#: templates/web/bromley/header.html:65
#: templates/web/fixmybarangay/header.html:67
-#: templates/web/fixmystreet/header.html:51
-#: templates/web/oxfordshire/header.html:112
-#: templates/web/oxfordshire/header.html:48
-#: templates/web/stevenage/header.html:98 templates/web/zurich/footer.html:12
+#: templates/web/fixmystreet/header.html:54
+#: templates/web/zurich/footer.html:12
msgid "sign out"
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:4
-#: templates/web/bromley/report/new/fill_in_details_form.html:7
-#: templates/web/default/report/new/fill_in_details_form.html:11
+#: templates/web/default/report/new/fill_in_details_form.html:12
#: templates/web/default/report/new/fill_in_details_form.html:14
-#: templates/web/emptyhomes/report/new/fill_in_details_form.html:11
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:12
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:14
-#: templates/web/fixmystreet/report/new/fill_in_details_form.html:6
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:7
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:9
msgid "the local council"
msgstr "den lokale administrasjonen"
@@ -4576,11 +4301,11 @@ msgstr "den lokale administrasjonen"
msgid "there is no pin shown as the user did not use the map"
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:362
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:370
msgid "this type of local problem"
msgstr "denne typen lokalt problem"
-#: perllib/Utils.pm:235
+#: perllib/Utils.pm:237
msgid "today"
msgstr "i dag"
@@ -4610,7 +4335,7 @@ msgid_plural "<big>%s</big> reports recently"
msgstr[0] "<big>%s</big> rapport nyleg"
msgstr[1] "<big>%s</big> rapportar nyleg"
-#: perllib/Utils.pm:282
+#: perllib/Utils.pm:284
#, perl-format
msgid "%d hour"
msgid_plural "%d hours"
@@ -4624,7 +4349,7 @@ msgid_plural "%d supporters"
msgstr[0] ""
msgstr[1] ""
-#: perllib/Utils.pm:284
+#: perllib/Utils.pm:286
#, perl-format
msgid "%d minute"
msgid_plural "%d minutes"
@@ -4645,7 +4370,7 @@ msgid_plural "We do not yet have details for the councils that cover this locati
msgstr[0] "Vi har enno ikkje detaljar for administrasjonen som dekkjer denne staden."
msgstr[1] "Vi har enno ikkje detaljar for administrasjonane som dekkjer denne staden."
-#: perllib/Utils.pm:278
+#: perllib/Utils.pm:280
#, perl-format
msgid "%d week"
msgid_plural "%d weeks"
@@ -4666,32 +4391,16 @@ msgid_plural "<big>%s</big> fixed in past month"
msgstr[0] "<big>%s</big> løyst siste månad"
msgstr[1] "<big>%s</big> løyst siste månad"
-#: templates/web/default/report/new/councils_text_some.html:14
-#, perl-format
-msgid "We do <strong>not</strong> yet have details for the other council that covers this location."
-msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location."
-msgstr[0] "Vi har enno <strong>ikkje</strong> detaljane for den andre administrasjonen som dekkjer denne staden."
-msgstr[1] "Vi har enno <strong>ikkje</strong> detaljane for dei andre administrasjonane som dekkjer denne staden."
-
-#: perllib/Utils.pm:280
+#: perllib/Utils.pm:282
#, perl-format
msgid "%d day"
msgid_plural "%d days"
msgstr[0] ""
msgstr[1] ""
-#, fuzzy
-#~ msgid "The email field is required"
-#~ msgstr "Denne informasjonen er påkravd"
-
-#~ msgid "End Year:"
-#~ msgstr "Sluttår:"
-
-#~ msgid "End month:"
-#~ msgstr "Sluttmånad:"
-
-#~ msgid "Start Year:"
-#~ msgstr "Startår:"
-
-#~ msgid "Start month:"
-#~ msgstr "Startmånad:"
+#: templates/web/default/report/new/councils_text_some.html:14
+#, perl-format
+msgid "We do <strong>not</strong> yet have details for the other council that covers this location."
+msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location."
+msgstr[0] "Vi har enno <strong>ikkje</strong> detaljane for den andre administrasjonen som dekkjer denne staden."
+msgstr[1] "Vi har enno <strong>ikkje</strong> detaljane for dei andre administrasjonane som dekkjer denne staden."
diff --git a/locale/pt_CV.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/pt_CV.UTF-8/LC_MESSAGES/FixMyStreet.po
index 6b1f6ad2d..35bdb81d4 100644
--- a/locale/pt_CV.UTF-8/LC_MESSAGES/FixMyStreet.po
+++ b/locale/pt_CV.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -5,41 +5,40 @@
#
# Translators:
# fixmindelo <francisco.martins@recortes.cv>, 2013
-# fixmindelo <francisco.martins@recortes.cv>, 2013
# mysociety <transifex@mysociety.org>, 2013
msgid ""
msgstr ""
"Project-Id-Version: fixmystreet\n"
"Report-Msgid-Bugs-To: matthew@mysociety.org\n"
-"POT-Creation-Date: 2013-11-12 13:15+0000\n"
-"PO-Revision-Date: 2013-09-23 14:48+0000\n"
+"POT-Creation-Date: 2014-05-16 17:30+0100\n"
+"PO-Revision-Date: 2013-11-20 13:29+0000\n"
"Last-Translator: mysociety <transifex@mysociety.org>\n"
"Language-Team: Portuguese (http://www.transifex.com/projects/p/fixmystreet/language/pt/)\n"
-"Language: pt_CV\n"
+"Language: pt\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:602
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:373
+#: perllib/FixMyStreet/DB/Result/Problem.pm:604
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383
msgid " and "
msgstr "e"
-#: templates/web/default/tokens/confirm_problem.html:14
+#: templates/web/default/tokens/confirm_problem.html:15
#: templates/web/default/tokens/confirm_problem.html:17
msgid " and <strong>we will now send it to the council</strong>"
msgstr " e <strong>agora vamos enviá-lo ao Conselho</strong>"
-#: templates/web/default/report/new/councils_text_all.html:11
-#: templates/web/default/report/new/councils_text_all.html:18
-#: templates/web/default/report/new/councils_text_all.html:4
-#: templates/web/default/report/new/councils_text_none.html:11
-#: templates/web/default/report/new/councils_text_none.html:14
-#: templates/web/default/report/new/councils_text_some.html:20
+#: templates/web/default/report/new/councils_text_all.html:12
+#: templates/web/default/report/new/councils_text_all.html:19
+#: templates/web/default/report/new/councils_text_all.html:5
+#: templates/web/default/report/new/councils_text_none.html:19
+#: templates/web/default/report/new/councils_text_none.html:21
+#: templates/web/default/report/new/councils_text_some.html:21
#: templates/web/default/report/new/councils_text_some.html:23
#: templates/web/default/report/new/councils_text_some.html:5
-#: templates/web/emptyhomes/report/new/councils_text_all.html:2
+#: templates/web/emptyhomes/report/new/councils_text_all.html:3
msgid " or "
msgstr "ou"
@@ -77,19 +76,19 @@ msgstr "%d de %d de %d"
msgid "%s - Summary reports"
msgstr "%s - relat￳rios resumidos"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+#: perllib/FixMyStreet/DB/Result/Problem.pm:653
msgid "%s ref:&nbsp;%s"
msgstr "%s ref:&nbsp;%s"
-#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
msgid "%s ward, %s"
msgstr "%s ala, %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:538
+#: perllib/FixMyStreet/DB/Result/Problem.pm:540
msgid "%s, reported at %s"
msgstr "%s, reportou em %s"
-#: perllib/FixMyStreet/Cobrand/UK.pm:303 perllib/FixMyStreet/Cobrand/UK.pm:315
+#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:309
msgid "%s, within %s ward"
msgstr "%s, %s dentro da ala"
@@ -124,30 +123,27 @@ msgstr "(A distância padrão, que abrange cerca de 50 mil pessoas)"
msgid "(alternatively the RSS feed can be customised, within"
msgstr "(Alternativamente o feed RSS pode ser personalizado, dentro de"
-#: templates/web/bromley/report/_item.html:22
#: templates/web/default/around/around_map_list_items.html:12
#: templates/web/default/around/on_map_list_items.html:9
-#: templates/web/fixmystreet/report/_item.html:22
+#: templates/web/fixmystreet/report/_item.html:27
#: templates/web/zurich/report/_item.html:21
msgid "(closed)"
msgstr "(fechado)"
-#: templates/web/bromley/report/_item.html:20
#: templates/web/default/around/around_map_list_items.html:10
#: templates/web/default/around/on_map_list_items.html:7
-#: templates/web/fixmystreet/report/_item.html:20
+#: templates/web/fixmystreet/report/_item.html:25
#: templates/web/zurich/report/_item.html:19
msgid "(fixed)"
msgstr "(Fixo)"
-#: templates/web/default/index.html:12 templates/web/default/index.html:8
+#: templates/web/default/index.html:12 templates/web/default/index.html:9
#: templates/web/fixmystreet/around/intro.html:2
msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
msgstr "(Como ruas e pavimentos esburacados, grafits, arvores caidas, lajes partidas, entulhos, lixo, pardeiros, vandalismo, postes quebrados, vazamentos de agua e esgotos, ou iluminação pública)"
-#: templates/web/bromley/report/_item.html:16
#: templates/web/default/reports/_list-entry.html:4
-#: templates/web/fixmystreet/report/_item.html:16
+#: templates/web/fixmystreet/report/_item.html:21
msgid "(not sent to council)"
msgstr "(Não reportar ao conselho)"
@@ -157,9 +153,8 @@ msgstr "(Não reportar ao conselho)"
msgid "(optional)"
msgstr "(opcional)"
-#: templates/web/bromley/report/_item.html:15
#: templates/web/default/reports/_list-entry.html:2
-#: templates/web/fixmystreet/report/_item.html:15
+#: templates/web/fixmystreet/report/_item.html:20
msgid "(sent to both)"
msgstr "(remeter para ambos)"
@@ -171,8 +166,8 @@ msgstr "(é confidencial seu email e seu numero de telefone)"
msgid "(we never show your email)"
msgstr "(seu email não será divulgado)"
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:637
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:664
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:635
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:662
#: perllib/FixMyStreet/DB/Result/Problem.pm:379
msgid "-- Pick a category --"
msgstr "-- Escolha uma categoria --"
@@ -216,7 +211,7 @@ msgstr ""
"\"<a Href=\\\"http://www.pledgebank.com/new\\\"> fazer e divulgar um compromisso </a> \\ N\"\n"
"\"</P>\""
-#: templates/web/fixmystreet/questionnaire/completed-open.html:6
+#: templates/web/fixmystreet/questionnaire/completed-open.html:25
msgid ""
"<p style=\"font-size:150%\">We&rsquo;re sorry to hear that. We have two\n"
"suggestions: why not try <a href=\"http://www.writetothem.com/\">writing direct\n"
@@ -303,7 +298,7 @@ msgstr ""
"obter mais algumas informações sobre o status do seu problema, por favor, volte para o ⏎\n"
"local e deixar uma atualização. </p>"
-#: templates/web/default/around/_report_banner.html:3
+#: templates/web/default/around/_report_banner.html:4
#: templates/web/default/around/_report_banner.html:5
msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>"
msgstr "<small> Se você não pode localizar no mapa, <a href='%s' rel='nofollow'> saltar esta etapa </a>. </small>"
@@ -358,8 +353,6 @@ msgstr "<strong> Sim </strong> Eu tenho password"
msgid "About us"
msgstr "Acerca de nós"
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:81
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:39
#: templates/web/default/report/update-form.html:30
@@ -397,7 +390,7 @@ msgstr "Adicionar nova categoria"
msgid "Add user"
msgstr "Adicionar user"
-#: templates/web/default/my/my.html:56 templates/web/fixmystreet/my/my.html:60
+#: templates/web/default/my/my.html:61 templates/web/fixmystreet/my/my.html:67
msgid "Added %s"
msgstr "Adicionado %s"
@@ -413,7 +406,6 @@ msgstr "Alerta %d criado por %s, tipo %s, os parâmetros %s / %s"
msgid "Alert %d disabled (created %s)"
msgstr "Alerta %d desativada (criado %s)"
-#: templates/web/bromley/report/display.html:209
#: templates/web/default/report/update-form.html:163
#: templates/web/fixmystreet/report/update-form.html:148
msgid "Alert me to future updates"
@@ -426,17 +418,12 @@ msgstr "Avise-me de atualizações futuras"
msgid "All Reports"
msgstr "Todos os Relatórios"
-#: templates/web/barnet/footer.html:20 templates/web/bromley/footer.html:21
-#: templates/web/bromley/header.html:77 templates/web/default/footer.html:11
+#: templates/web/default/footer.html:11
#: templates/web/emptyhomes/header.html:32
#: templates/web/fiksgatami/footer.html:7
#: templates/web/fiksgatami/nn/footer.html:7
-#: templates/web/fixmindelo/footer.html:41
#: templates/web/fixmybarangay/footer.html:20
-#: templates/web/fixmystreet/footer.html:48
-#: templates/web/oxfordshire/footer.html:23
-#: templates/web/oxfordshire/header.html:67
-#: templates/web/reading/footer.html:8 templates/web/stevenage/footer.html:43
+#: templates/web/fixmystreet/footer.html:51
#: templates/web/zurich/admin/index-dm.html:12
#: templates/web/zurich/admin/stats.html:13
#: templates/web/zurich/footer.html:19
@@ -453,27 +440,25 @@ msgstr "Todos os relatórios entre %s e %s"
msgid "All the information you provide here will be sent to"
msgstr "Todas as informações que você fornecer aqui serão enviados para fixmindelo@gmail.com"
-#: templates/web/default/report/new/councils_text_all.html:11
+#: templates/web/default/report/new/councils_text_all.html:12
#: templates/web/default/report/new/councils_text_all.html:13
msgid "All the information you provide here will be sent to <strong>%s</strong> or <strong>Roads Service</strong>."
msgstr "Todas as informações que você fornecer aqui serão enviados para <strong>%s</strong> ou <strong> Entradas de Serviço </strong>."
-#: templates/web/default/report/new/councils_text_all.html:4
+#: templates/web/default/report/new/councils_text_all.html:5
#: templates/web/default/report/new/councils_text_all.html:6
msgid "All the information you provide here will be sent to <strong>%s</strong> or a relevant local body such as <strong>TfL</strong>, via the London Report-It system."
msgstr "Todas as informações que você fornecer aqui serão enviados para <strong>%s</strong> ou um corpo local relevantes, tais como <strong> TfL </strong>, através do Relatório-It sistema Mindelo."
-#: templates/web/bromley/report/new/fill_in_details_form.html:4
-#: templates/web/bromley/report/new/fill_in_details_form.html:6
-#: templates/web/default/report/new/councils_text_all.html:18
+#: templates/web/default/report/new/councils_text_all.html:19
#: templates/web/default/report/new/councils_text_all.html:20
-#: templates/web/default/report/new/fill_in_details_form.html:11
+#: templates/web/default/report/new/fill_in_details_form.html:12
#: templates/web/default/report/new/fill_in_details_form.html:13
-#: templates/web/emptyhomes/report/new/councils_text_all.html:2
+#: templates/web/emptyhomes/report/new/councils_text_all.html:3
#: templates/web/emptyhomes/report/new/councils_text_all.html:4
-#: templates/web/emptyhomes/report/new/fill_in_details_form.html:11
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:12
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:13
-#: templates/web/fixmystreet/report/new/fill_in_details_form.html:6
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:7
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:8
msgid "All the information you provide here will be sent to <strong>%s</strong>."
msgstr "Todas as informações que você fornecer aqui serão enviados para <strong>%s</strong>"
@@ -497,13 +482,11 @@ msgstr "Anonimo:"
msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?"
msgstr "Você é um desenvolvedor <strong> </strong> Gostaria de contribuir para FixMyStreet?"
-#: templates/web/fixmystreet/footer.html:16
-#: templates/web/stevenage/footer.html:17
+#: templates/web/fixmystreet/footer.html:19
msgid "Are you a developer?"
msgstr "Você é um desenvolvedor?"
-#: templates/web/fixmystreet/footer.html:20
-#: templates/web/stevenage/footer.html:21
+#: templates/web/fixmystreet/footer.html:23
msgid "Are you from a council?"
msgstr "Você pertence á ao Conselho?"
@@ -526,7 +509,7 @@ msgstr "Atribuir ao órgão externo:"
msgid "Assign to subdivision:"
msgstr "Atribuir a subdivisão:"
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:141
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:163
#: templates/web/zurich/report/updates.html:11
msgid "Assigned to %s"
msgstr "Designado para %s"
@@ -545,7 +528,6 @@ msgid "Awaiting moderation"
msgstr "Aguardando moderação"
#: templates/web/default/js/translation_strings.html:32
-#: templates/web/oxfordshire/js/translation_strings.html:26
msgid "Back"
msgstr "Voltar"
@@ -557,8 +539,8 @@ msgstr "Ban endereço de e-mail"
msgid "Be sure to choose the right category, because we use that to determine to whom the report is sent."
msgstr "Tenha certeza de escolher a categoria correta, porque temos de nusar isso para determinar a quem o relatório é enviado."
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1176
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:249
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1185
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:297
#: templates/web/default/admin/bodies.html:1
#: templates/web/zurich/header.html:64
msgid "Bodies"
@@ -584,18 +566,15 @@ msgid "By Date"
msgstr "Por data"
#: templates/web/fixmystreet/around/_report_banner.html:10
-#: templates/web/fixmystreet/around/_report_banner.html:8
+#: templates/web/fixmystreet/around/_report_banner.html:9
msgid "Can't see the map? <a href='%s' rel='nofollow'>Skip this step</a>"
msgstr "Não pode ver a localizaçao no mapa <a href='%s' rel='nofollow'> Salte esta etapa </a>"
-#: templates/web/bromley/report/new/fill_in_details_form.html:68
#: templates/web/default/admin/bodies.html:20
#: templates/web/default/admin/body.html:53
#: templates/web/default/admin/index.html:44
#: templates/web/default/report/new/category.html:10
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:74
-#: templates/web/seesomething/report/new/category.html:6
-#: templates/web/southampton/report/new/category.html:3
#: templates/web/zurich/admin/body.html:13
#: templates/web/zurich/admin/index-dm.html:23
#: templates/web/zurich/admin/index-sdm.html:21
@@ -620,7 +599,7 @@ msgstr "Categoria para cada correção taxa para problemas> 4 semanas, um mes"
msgid "Category:"
msgstr "Categoria:"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:366
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374
msgid "Category: %s"
msgstr "Categoria: %s"
@@ -669,21 +648,16 @@ msgstr ""
msgid "Click map to report a problem"
msgstr "Click no mapa para reportar um porblema "
-#: templates/web/oxfordshire/js/translation_strings.html:39
-#, fuzzy
-msgid "Click on the map to report a problem"
-msgstr "Click no mapa para reportar um porblema "
-
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:118
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:140
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:45
#: templates/web/default/admin/report_edit.html:47
#: templates/web/default/dashboard/index.html:142
#: templates/web/default/dashboard/index.html:144
#: templates/web/fixmystreet/report/banner.html:15
-#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:10
#: templates/web/zurich/admin/header.html:12
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/report_edit.html:100
#: templates/web/zurich/admin/report_edit.html:98
#: templates/web/zurich/admin/stats.html:31
@@ -691,11 +665,11 @@ msgstr "Click no mapa para reportar um porblema "
msgid "Closed"
msgstr "Fechado"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:744
+#: perllib/FixMyStreet/DB/Result/Problem.pm:748
msgid "Closed by council"
msgstr "Fechado pelo Conselho"
-#: templates/web/default/my/my.html:32 templates/web/fixmystreet/my/my.html:36
+#: templates/web/default/my/my.html:37 templates/web/fixmystreet/my/my.html:43
msgid "Closed reports"
msgstr "Reports Fechados"
@@ -703,7 +677,7 @@ msgstr "Reports Fechados"
msgid "Closed:"
msgstr "Fechado"
-#: templates/web/default/around/tabbed_lists.html:10
+#: templates/web/default/around/tabbed_lists.html:11
#: templates/web/default/around/tabbed_lists.html:12
msgid "Closest nearby problems <small>(within&nbsp;%skm)</small>"
msgstr "Problemas mais proximos <small> (within&nbsp;%skm) </small>"
@@ -729,9 +703,8 @@ msgid "Cobrand:"
msgstr "Cobrand:"
#: templates/web/default/admin/config_page.html:1
-#, fuzzy
msgid "Configuration"
-msgstr "Confirmação"
+msgstr ""
#: perllib/FixMyStreet/App/Controller/Admin.pm:421
msgid "Configuration updated - contacts will be generated automatically later"
@@ -761,8 +734,6 @@ msgstr "Confirme por e-mail abaixo, proporcionando uma nova senha nesse ponto. Q
#: templates/web/default/tokens/confirm_update.html:3
#: templates/web/emptyhomes/tokens/confirm_problem.html:1
#: templates/web/emptyhomes/tokens/confirm_problem.html:3
-#: templates/web/southampton/tokens/confirm_problem.html:1
-#: templates/web/southampton/tokens/confirm_problem.html:3
#: templates/web/zurich/tokens/confirm_problem.html:1
#: templates/web/zurich/tokens/confirm_problem.html:3
msgid "Confirmation"
@@ -795,7 +766,6 @@ msgstr "Contacto"
msgid "Contact FixMyStreet"
msgstr "Contact FixMyStreetMindelo"
-#: templates/web/bromley/contact/submit.html:1
#: templates/web/default/contact/index.html:1
#: templates/web/default/contact/index.html:2
#: templates/web/default/contact/submit.html:1
@@ -804,20 +774,18 @@ msgstr "Contact FixMyStreetMindelo"
msgid "Contact Us"
msgstr "Fale connosco"
-#: templates/web/bromley/contact/submit.html:3
#: templates/web/default/contact/index.html:6
#: templates/web/default/contact/submit.html:3
-#: templates/web/fixmystreet/contact/index.html:19
+#: templates/web/fixmystreet/contact/index.html:22
msgid "Contact the team"
msgstr "Fale com a equipe"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1310
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1338
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1319
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1347
msgid "Could not find user"
msgstr "Não foi possível encontrar usuário"
#: templates/web/default/js/translation_strings.html:37
-#: templates/web/oxfordshire/js/translation_strings.html:31
msgid "Could not look up location"
msgstr "Não olhar para cima da localização"
@@ -872,11 +840,10 @@ msgstr "Estado actual"
#: templates/web/default/admin/bodies.html:7
#: templates/web/default/admin/index.html:5
-#, fuzzy
msgid "Currently no bodies have been created."
-msgstr "Nenhuns problemas foram ianda reportados"
+msgstr ""
-#: templates/web/default/dashboard/index.html:5
+#: templates/web/default/dashboard/index.html:6
#: templates/web/default/dashboard/index.html:7
msgid "Dashboard"
msgstr "Painel de instrumentos"
@@ -899,11 +866,8 @@ msgstr "Excluidos"
msgid "Description"
msgstr "Descripçaoi"
-#: templates/web/bromley/report/new/fill_in_details_form.html:54
#: templates/web/default/js/translation_strings.html:34
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66
-#: templates/web/oxfordshire/js/translation_strings.html:28
-#: templates/web/seesomething/report/new/fill_in_details_form.html:16
#: templates/web/zurich/report/new/fill_in_details_form.html:42
msgid "Details"
msgstr "DEtalhes"
@@ -941,8 +905,10 @@ msgstr "Você tem uma senha FixMyStreetMindelo?"
msgid "Don&rsquo;t know"
msgstr "Não sei"
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:82
+#: templates/web/fixmystreet/contact/index.html:115
+msgid "Don't like forms?"
+msgstr ""
+
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:47
#: templates/web/default/report/update-form.html:30
@@ -973,9 +939,9 @@ msgid "Edit body details"
msgstr "Editar os detalhes do corpo"
#: templates/web/default/admin/report_edit.html:1
-#: templates/web/zurich/admin/report_edit-sdm.html:1
+#: templates/web/zurich/admin/report_edit-sdm.html:2
#: templates/web/zurich/admin/report_edit-sdm.html:4
-#: templates/web/zurich/admin/report_edit.html:1
+#: templates/web/zurich/admin/report_edit.html:2
#: templates/web/zurich/admin/report_edit.html:5
msgid "Editing problem %d"
msgstr "Editando problema %d"
@@ -993,7 +959,6 @@ msgstr "Edição de usuário %d"
msgid "Editor"
msgstr "Editar"
-#: templates/web/bromley/report/display.html:128
#: templates/web/default/admin/bodies.html:18
#: templates/web/default/admin/body.html:54
#: templates/web/default/admin/body_edit.html:83
@@ -1001,7 +966,6 @@ msgstr "Editar"
#: templates/web/default/admin/users.html:16
#: templates/web/fixmystreet/auth/general.html:20
#: templates/web/fixmystreet/report/update-form.html:76
-#: templates/web/seesomething/auth/general.html:20
#: templates/web/zurich/admin/body-form.html:9
#: templates/web/zurich/admin/body.html:14
#: templates/web/zurich/auth/general.html:24
@@ -1009,16 +973,15 @@ msgstr "Editar"
msgid "Email"
msgstr "Email"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1286
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1295
msgid "Email added to abuse list"
msgstr "Email adicionado a lista de abusos"
#: templates/web/default/admin/body.html:126
-#, fuzzy
msgid "Email address:"
-msgstr "O seu endereço de email:"
+msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1283
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1292
msgid "Email already in abuse list"
msgstr "E-mail já está na lista abusos"
@@ -1042,7 +1005,7 @@ msgstr "Envie-me atualizações"
msgid "Email:"
msgstr "Email:"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:318
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:323
msgid "Email: %s"
msgstr "Email: %s"
@@ -1088,15 +1051,14 @@ msgid ""
msgstr ""
#: templates/web/default/admin/stats.html:70
-#, fuzzy
msgid "End Date:"
-msgstr "Fim do dia:"
+msgstr ""
#: templates/web/default/admin/body-form.html:126
msgid "Endpoint"
msgstr "Endpoint"
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:71
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:72
msgid "Enter a Z&uuml;rich street name"
msgstr "Digite um nome de uma rua de Mindelo"
@@ -1105,26 +1067,26 @@ msgid "Enter a nearby UK postcode, or street name and area"
msgstr "Inserir um código postal de Mindelo nas proximidades da area, zona, rua ou local"
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:25
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:37
msgid "Enter a nearby postcode, or street name and area"
msgstr "Inserir um código postal perto, ou nome da rua, zona ou local"
-#: templates/web/default/around/postcode_form.html:1
#: templates/web/default/around/postcode_form.html:2
-#: templates/web/fixmystreet/around/postcode_form.html:10
#: templates/web/fixmystreet/around/postcode_form.html:11
-#: templates/web/seesomething/around/postcode_form.html:3
-#: templates/web/seesomething/around/postcode_form.html:4
msgid "Enter a nearby street name and area"
msgstr "Digite um nome de rua nas proximidades e área"
+#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:9
+#, fuzzy
+msgid "Enter a nearby street name and area, postal code or district in Delhi"
+msgstr "Digite um nome de rua nas proximidades e área"
+
#: templates/web/default/auth/general.html:64
#: templates/web/default/report/new/fill_in_details_form.html:169
#: templates/web/default/report/update-form.html:124
msgid "Enter a new password:"
msgstr "Digite uma nova senha:"
-#: templates/web/bromley/report/display.html:150
-#: templates/web/bromley/report/new/fill_in_details_form.html:189
#: templates/web/fixmystreet/auth/general.html:61
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:211
#: templates/web/fixmystreet/report/update-form.html:122
@@ -1159,7 +1121,6 @@ msgstr "Exemplos:"
msgid "Extra data:"
msgstr "Dados adicionais:"
-#: templates/web/bromley/contact/submit.html:14
#: templates/web/default/contact/submit.html:15
msgid "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>."
msgstr "Falha ao enviar a mensagem. Por favor, tente novamente, ou <a href=\"mailto:%s\"> email nós </a>."
@@ -1173,12 +1134,6 @@ msgstr "Filtrar relatorio"
msgid "Find latest local and national news"
msgstr "Encontre as últimas notícias locais e nacionais"
-#: templates/web/bromley/report/display.html:191
-#: templates/web/bromley/report/new/fill_in_details_form.html:113
-#: templates/web/bromley/report/new/fill_in_details_form.html:160
-msgid "First Name"
-msgstr "Primeiro Nome"
-
#: templates/web/default/questionnaire/index.html:79
#: templates/web/fixmystreet/questionnaire/index.html:73
msgid "First time"
@@ -1228,8 +1183,6 @@ msgstr ""
"alertas do Conselho, mas só vai aparecer o \"No limite\" alerta ⏎\n"
"para o conselho do condado."
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:84
#: templates/web/default/admin/index.html:44
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:41
@@ -1254,7 +1207,7 @@ msgstr "Corrigido - Conselho"
msgid "Fixed - User"
msgstr "Corrigido - Usuario"
-#: templates/web/default/my/my.html:27 templates/web/fixmystreet/my/my.html:31
+#: templates/web/default/my/my.html:32 templates/web/fixmystreet/my/my.html:38
msgid "Fixed reports"
msgstr "Reports Corrigidos"
@@ -1271,7 +1224,7 @@ msgstr ""
msgid "Flag user"
msgstr "Bandeira - Usuario"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1181
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1190
#: templates/web/default/admin/users.html:19
msgid "Flagged"
msgstr "Marcado"
@@ -1316,11 +1269,9 @@ msgstr "Esqueceu sua senha?"
#: templates/web/emptyhomes/faq/faq-en-gb.html:1
#: templates/web/fiksgatami/faq/faq-nb.html:1
#: templates/web/fiksgatami/nn/faq/faq-nn.html:1
-#: templates/web/fixmindelo/faq/faq-pt-cv.html:1
#: templates/web/fixmybarangay/faq/faq-en-gb.html:1
#: templates/web/fixmystreet/faq/faq-en-gb.html:1
#: templates/web/fixmystreet/static/privacy.html:1
-#: templates/web/oxfordshire/faq/faq-en-gb.html:1
msgid "Frequently Asked Questions"
msgstr "Perguntas mais frequentes"
@@ -1328,19 +1279,18 @@ msgstr "Perguntas mais frequentes"
msgid "GeoRSS on Google Maps"
msgstr "GeoRSS no Google Maps"
-#: templates/web/bromley/report/display.html:30
#: templates/web/fixmystreet/around/_updates.html:3
#: templates/web/fixmystreet/report/display.html:38
msgid "Get updates"
msgstr "Receba as atualizações"
-#: templates/web/fixmystreet/reports/_rss.html:3
+#: templates/web/fixmystreet/reports/_rss.html:4
#: templates/web/fixmystreet/reports/_rss.html:9
msgid "Get updates of %s problems"
msgstr "Receba as atualizações de problemas fix de %s"
#: templates/web/fixmystreet/reports/_rss.html:11
-#: templates/web/fixmystreet/reports/_rss.html:3
+#: templates/web/fixmystreet/reports/_rss.html:4
msgid "Get updates of problems in this %s"
msgstr "Receba as atualizações de problemas neste %s"
@@ -1353,7 +1303,6 @@ msgstr "Dê-me um feed RSS"
#: templates/web/default/alert/index.html:34
#: templates/web/default/around/postcode_form.html:8
#: templates/web/fixmystreet/around/postcode_form.html:21
-#: templates/web/seesomething/around/postcode_form.html:10
#: templates/web/zurich/admin/stats.html:26
msgid "Go"
msgstr " Ir"
@@ -1380,19 +1329,12 @@ msgstr "Este problema já foi fixado, relatado?"
msgid "Have you ever reported a problem to a council before, or is this your first time?"
msgstr "Alguma vez voce ja relatou algum problema ao Conselho, ou é a sua primeira vez?"
-#: templates/web/barnet/footer.html:24 templates/web/bromley/footer.html:25
-#: templates/web/bromley/header.html:81 templates/web/default/footer.html:15
+#: templates/web/default/footer.html:15
#: templates/web/emptyhomes/header.html:33
#: templates/web/fiksgatami/footer.html:9
#: templates/web/fiksgatami/nn/footer.html:9
-#: templates/web/fixmindelo/footer.html:45
#: templates/web/fixmybarangay/footer.html:24
-#: templates/web/fixmystreet/footer.html:52
-#: templates/web/oxfordshire/footer.html:27
-#: templates/web/oxfordshire/header.html:75
-#: templates/web/reading/footer.html:10
-#: templates/web/seesomething/footer.html:13
-#: templates/web/stevenage/footer.html:47
+#: templates/web/fixmystreet/footer.html:55
#: templates/web/zurich/faq/faq-de-ch.html:1
#: templates/web/zurich/footer.html:21
#: templates/web/zurich/nav_over_content.html:8
@@ -1404,13 +1346,9 @@ msgstr "Ajuda"
msgid "Here are the types of local problem alerts for &lsquo;%s&rsquo;."
msgstr "Aqui estão os tipos de alertas de problemas locais para relatar fixed; %s';."
-#: templates/web/barnet/header.html:70 templates/web/bromley/header.html:64
-#: templates/web/bromley/header.html:99
#: templates/web/fixmybarangay/header.html:66
-#: templates/web/fixmystreet/header.html:50
-#: templates/web/oxfordshire/header.html:111
-#: templates/web/oxfordshire/header.html:47
-#: templates/web/stevenage/header.html:97 templates/web/zurich/footer.html:11
+#: templates/web/fixmystreet/header.html:53
+#: templates/web/zurich/footer.html:11
msgid "Hi %s"
msgstr "Oi %s"
@@ -1418,8 +1356,8 @@ msgstr "Oi %s"
#: templates/web/default/admin/report_edit.html:50
#: templates/web/default/admin/report_edit.html:51
#: templates/web/default/admin/update_edit.html:28
-#: templates/web/zurich/admin/header.html:1
#: templates/web/zurich/admin/header.html:11
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/report_edit.html:89
#: templates/web/zurich/admin/report_edit.html:93
#: templates/web/zurich/admin/stats.html:32
@@ -1440,7 +1378,6 @@ msgid "History"
msgstr "History pins"
#: templates/web/default/js/translation_strings.html:31
-#: templates/web/oxfordshire/js/translation_strings.html:25
msgid "Home"
msgstr "Home"
@@ -1449,7 +1386,6 @@ msgid "How to report a problem"
msgstr "Como reportar um problema"
#: templates/web/default/js/translation_strings.html:33
-#: templates/web/oxfordshire/js/translation_strings.html:27
msgid "How to send successful reports"
msgstr "Como enviar relatorios com sucesso"
@@ -1465,7 +1401,7 @@ msgstr "Receio que não foi possível localizar o seu problema no banco de dados
msgid "I'm afraid we couldn't validate that token, as the report was made too long ago."
msgstr "Receio que não pôde validar esse token, como o relatório foi feito há muito tempo."
-#: perllib/FixMyStreet/App/Controller/Tokens.pm:259
+#: perllib/FixMyStreet/App/Controller/Tokens.pm:260
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 "Receio que não poderia confirmar se token. Se você copiou o URL de um e-mail, verifique se você copiou exatamente.\n"
@@ -1505,7 +1441,6 @@ msgstr "Se você não fizer isso, o problema não será publicado"
msgid "If you do not, your update will not be posted."
msgstr "se você não fizer isso, a sua atualização não será publicada"
-#: templates/web/default/report/new/councils_text_none.html:8
#: templates/web/default/report/new/councils_text_none.html:9
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 ""
@@ -1566,7 +1501,7 @@ msgid ""
" when they are shown on the site. Enter the ID (number) of that user."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Contact.pm:111
+#: perllib/FixMyStreet/App/Controller/Contact.pm:116
msgid "Illegal ID"
msgstr "ID ilegal"
@@ -1574,8 +1509,6 @@ msgstr "ID ilegal"
msgid "Illegal feed selection"
msgstr "Seleção de feed ilegal"
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:82
#: templates/web/default/dashboard/index.html:142
#: templates/web/default/dashboard/index.html:144
#: templates/web/default/report/update-form.html:30
@@ -1586,29 +1519,24 @@ msgid "In Progress"
msgstr "Em andamento"
#: templates/web/default/admin/flagged.html:39
-#, fuzzy
msgid "In abuse table?"
-msgstr "(E-mail na tabela de abuso)"
+msgstr ""
#: templates/web/default/open311/index.html:90
msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
msgstr "Além disso, os seguintes atributos que não fazem parte da especificação v2 Open311 são retornados: agency_sent_datetime, título (também retornou como parte da descrição), interface_used, comment_count, requestor_name (presente apenas se solicitante permitido o nome a ser mostrado neste site) ."
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:121
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:143
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:38
#: templates/web/fixmystreet/report/banner.html:19
-#: templates/web/zurich/admin/header.html:1
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/header.html:8
#: templates/web/zurich/admin/report_edit.html:102
#: templates/web/zurich/report/banner.html:15
msgid "In progress"
msgstr "Em andamento"
-#: templates/web/seesomething/report/new/fill_in_details_form.html:38
-msgid "Incident Category"
-msgstr "Categoria incidente"
-
#: templates/web/zurich/admin/report_edit.html:163
msgid "Include reporter personal details"
msgstr "Incluir reports detalhes perssoais"
@@ -1622,9 +1550,8 @@ msgid "Incorrect has_photo value \"%s\""
msgstr "Foto_has valor incorreto \"%s\""
#: templates/web/zurich/admin/list_updates.html:3
-#, fuzzy
msgid "Internal notes"
-msgstr "Notas internas"
+msgstr ""
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:48
@@ -1635,7 +1562,7 @@ msgstr ""
msgid "Invalid agency_responsible value %s"
msgstr "Agencia_responsavel valor %s inválido"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1096
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1105
msgid "Invalid end date"
msgstr "Invalido data final"
@@ -1643,12 +1570,10 @@ msgstr "Invalido data final"
msgid "Invalid format %s specified."
msgstr "Formato inválido%s especificado."
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1092
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1101
msgid "Invalid start date"
msgstr "Data de inicio invalida"
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:81
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:37
#: templates/web/default/dashboard/index.html:142
@@ -1660,30 +1585,25 @@ msgstr "Data de inicio invalida"
msgid "Investigating"
msgstr "Investigando"
-#: templates/web/emptyhomes/tokens/confirm_problem.html:12
+#: templates/web/emptyhomes/tokens/confirm_problem.html:13
#: templates/web/emptyhomes/tokens/confirm_problem.html:14
msgid "It is worth noting however that the process can sometimes be slow, especially if the property is in very poor repair or the owner is unwilling to act. In most cases it can take six months or more before you can expect to see anything change and sometimes there may be considerable barries to a property being brought back into use. This doesn&rsquo;t mean the council isn&rsquo;t doing anything. We encourage councils to update the website so you can see what is happening. It may be a long process, but you reporting your concerns about this property to the council is a valuable first step."
msgstr "É interessante notar, porém, que o processo pode ser lento às vezes, especialmente se o imóvel está em muito mau estado de conservação ou o proprietário não está disposto a agir. Na maioria dos casos pode demorar seis meses ou mais antes que você pode esperar para ver nada mudam e às vezes pode haver barreiras consideráveis ​​para a propriedade que está sendo trazido de volta ao uso. Isso não significa que o município não está fazendo nada. Nós encorajamos conselhos para atualizar o site para que você possa ver o que está acontecendo. Pode ser um processo longo, mas você relatar suas preocupações sobre este imóvel para o município é um primeiro passo importante."
-#: templates/web/bromley/report/display.html:168
-#: templates/web/bromley/report/new/fill_in_details_form.html:209
+#: templates/web/fixmystreet/contact/blurb.html:8
+msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there."
+msgstr ""
+
#: templates/web/default/auth/general.html:44
#: templates/web/default/report/new/fill_in_details_form.html:149
#: templates/web/default/report/update-form.html:104
#: templates/web/fixmystreet/auth/general.html:46
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:172
#: templates/web/fixmystreet/report/update-form.html:100
-#: templates/web/seesomething/auth/general.html:35
#: templates/web/zurich/auth/general.html:40
msgid "Keep me signed in on this computer"
msgstr "Manter-me logado neste computador"
-#: templates/web/bromley/report/display.html:197
-#: templates/web/bromley/report/new/fill_in_details_form.html:119
-#: templates/web/bromley/report/new/fill_in_details_form.html:166
-msgid "Last Name"
-msgstr "Ultimo Nome"
-
#: templates/web/default/admin/body.html:58
#: templates/web/zurich/admin/body.html:15
msgid "Last editor"
@@ -1706,11 +1626,9 @@ msgstr ""
msgid "List all reported problems"
msgstr "Listar todos os problemas relatados"
-#: templates/web/bromley/report/new/fill_in_details_form.html:69
#: templates/web/default/report/new/fill_in_details_form.html:68
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:51
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:75
-#: templates/web/seesomething/report/new/fill_in_details_form.html:25
#: templates/web/zurich/report/new/fill_in_details_form.html:51
msgid "Loading..."
msgstr "Carregando ..."
@@ -1719,7 +1637,7 @@ msgstr "Carregando ..."
#: templates/web/default/alert/choose.html:3
#: templates/web/default/alert/index.html:1
#: templates/web/default/alert/index.html:3
-#: templates/web/default/alert/list.html:1
+#: templates/web/default/alert/list.html:2
#: templates/web/default/alert/list.html:5
#: templates/web/default/alert/updates.html:1
#: templates/web/default/tokens/confirm_alert.html:1
@@ -1732,23 +1650,17 @@ msgstr "Carregando ..."
msgid "Local RSS feeds and email alerts"
msgstr "RSS feeds e alertas de e-mail locais"
-#: templates/web/default/alert/list.html:1
-#: templates/web/default/alert/list.html:12
+#: templates/web/default/alert/list.html:13
#: templates/web/default/alert/list.html:14
+#: templates/web/default/alert/list.html:2
#: templates/web/default/alert/list.html:3
msgid "Local RSS feeds and email alerts for ‘%s’"
msgstr "RSS feeds e alertas de e-mail locais para '%s'"
-#: templates/web/barnet/footer.html:22 templates/web/bromley/footer.html:23
-#: templates/web/bromley/header.html:79 templates/web/default/footer.html:13
-#: templates/web/fiksgatami/footer.html:8
+#: templates/web/default/footer.html:13 templates/web/fiksgatami/footer.html:8
#: templates/web/fiksgatami/nn/footer.html:8
-#: templates/web/fixmindelo/footer.html:43
#: templates/web/fixmybarangay/footer.html:22
-#: templates/web/fixmystreet/footer.html:50
-#: templates/web/oxfordshire/footer.html:25
-#: templates/web/oxfordshire/header.html:71
-#: templates/web/reading/footer.html:9 templates/web/stevenage/footer.html:45
+#: templates/web/fixmystreet/footer.html:53
msgid "Local alerts"
msgstr "Alertas locais"
@@ -1757,7 +1669,6 @@ msgid "Locate the problem on a map of the area"
msgstr "Localize o problema em um mapa da área ou zona"
#: templates/web/default/js/translation_strings.html:43
-#: templates/web/oxfordshire/js/translation_strings.html:37
msgid "MAP"
msgstr "Mapa"
@@ -1769,11 +1680,11 @@ msgstr "Mapa © <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\"> OpenS
msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
msgstr ""
-#: templates/web/fixmystreet/contact/index.html:98
+#: templates/web/fixmystreet/contact/index.html:103
msgid "Message"
msgstr "Menssagem"
-#: templates/web/default/contact/index.html:90
+#: templates/web/default/contact/index.html:92
msgid "Message:"
msgstr "Menssagem"
@@ -1815,10 +1726,6 @@ msgstr "Mais problemas próximos"
msgid "Name"
msgstr "Nome"
-#: templates/web/seesomething/report/new/fill_in_details_form.html:74
-msgid "Name (optional)"
-msgstr "Nome (opcional)"
-
#: templates/web/default/admin/report_edit.html:66
#: templates/web/default/admin/update_edit.html:32
#: templates/web/default/admin/user-form.html:18
@@ -1828,30 +1735,30 @@ msgstr "Nome (opcional)"
msgid "Name:"
msgstr "Nome:"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:317
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:322
msgid "Name: %s"
msgstr "Nome: %s"
#: templates/web/fiksgatami/footer.html:3
#: templates/web/fiksgatami/nn/footer.html:3
-#: templates/web/reading/footer.html:4
msgid "Navigation"
msgstr "Navegaçao"
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:188
#: perllib/FixMyStreet/Geocode/OSM.pm:166
msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
msgstr "Nomeado rodoviário mais próximo ao pino colocado no mapa (gerado automaticamente usando OpenStreetMap): %s%s"
-#: perllib/FixMyStreet/Cobrand/UK.pm:148
+#: perllib/FixMyStreet/Cobrand/UK.pm:142
msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
msgstr "Código postal mais próximo do pino colocado no mapa (gerado automaticamente): %s (%sm distância)"
-#: perllib/FixMyStreet/Cobrand/Default.pm:418
-#: perllib/FixMyStreet/Cobrand/Default.pm:458
+#: perllib/FixMyStreet/Cobrand/Default.pm:421
+#: perllib/FixMyStreet/Cobrand/Default.pm:461
msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
msgstr "Estrada mais próxima para o pino colocado no mapa (gerado automaticamente por Bing Maps): %s"
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:273
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:297
msgid ""
"Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
"\n"
@@ -1879,9 +1786,8 @@ msgstr "Novo contato de categoria adicionado"
#: templates/web/zurich/admin/report_edit-sdm.html:58
#: templates/web/zurich/admin/report_edit.html:84
-#, fuzzy
msgid "New internal note:"
-msgstr "Notas internas"
+msgstr ""
#: db/alert_types.pl:18 db/alert_types.pl:22
msgid "New local problems on FixMyStreet"
@@ -1995,14 +1901,12 @@ msgid "No edits have yet been made."
msgstr "Nenhum ediçao efectuada"
#: templates/web/default/admin/flagged.html:25
-#, fuzzy
msgid "No flagged problems found."
-msgstr "Nenhum problema sinalizado"
+msgstr ""
#: templates/web/default/admin/flagged.html:58
-#, fuzzy
msgid "No flagged users found."
-msgstr "Nenhum usuário sinalizado encontrado"
+msgstr ""
#: templates/web/zurich/admin/report_edit-sdm.html:68
msgid "No further updates"
@@ -2019,7 +1923,6 @@ msgid "No problems have been reported yet."
msgstr "Nenhuns problemas foram ianda reportados"
#: templates/web/default/js/translation_strings.html:38
-#: templates/web/oxfordshire/js/translation_strings.html:32
msgid "No result returned"
msgstr "Nenhum resultado retornado"
@@ -2030,7 +1933,7 @@ msgid ""
" your config file is not pointing to a live MapIt service."
msgstr ""
-#: templates/web/default/report/_support.html:2
+#: templates/web/default/report/_support.html:3
#: templates/web/default/report/_support.html:4
msgid "No supporters"
msgstr "Não apoiantes"
@@ -2054,8 +1957,6 @@ msgid ""
" activity across their body), the ability to hide reports or set special report statuses."
msgstr ""
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:83
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:46
#: templates/web/default/report/update-form.html:30
@@ -2114,7 +2015,6 @@ msgid "Now to submit your update&hellip; do you have a FixMyStreet password?"
msgstr "Agora, para apresentar a sua atualização ... você tem de ter uma senha FixMyStreetMindelo?"
#: templates/web/default/js/translation_strings.html:42
-#: templates/web/oxfordshire/js/translation_strings.html:36
msgid "OK"
msgstr "OK"
@@ -2158,8 +2058,7 @@ msgstr "Mais antigo fixed"
msgid "Older problems"
msgstr "Problemas mais antigos"
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:115
-#: templates/web/bromley/report/display.html:80
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:137
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:36
#: templates/web/default/admin/report_edit.html:37
@@ -2167,7 +2066,7 @@ msgstr "Problemas mais antigos"
#: templates/web/default/dashboard/index.html:142
#: templates/web/default/report/update-form.html:30
#: templates/web/fixmystreet/report/update-form.html:28
-#: templates/web/zurich/admin/header.html:1
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/header.html:7
#: templates/web/zurich/admin/report_edit.html:89
#: templates/web/zurich/admin/report_edit.html:91
@@ -2176,7 +2075,7 @@ msgstr "Problemas mais antigos"
msgid "Open"
msgstr "Aberto"
-#: templates/web/default/my/my.html:22 templates/web/fixmystreet/my/my.html:26
+#: templates/web/default/my/my.html:27 templates/web/fixmystreet/my/my.html:33
msgid "Open reports"
msgstr "Relatorios abertos"
@@ -2202,15 +2101,15 @@ msgstr "Ou os problemas relatados para:"
msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
msgstr "Ou você pode se inscrever em um alerta baseado no que ala, zona ou conselho você está inserido"
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:1053
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:664
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:665
-#: perllib/FixMyStreet/DB/Result/Problem.pm:544
-#: perllib/FixMyStreet/DB/Result/Problem.pm:554
-#: perllib/FixMyStreet/DB/Result/Problem.pm:564
-#: perllib/FixMyStreet/DB/Result/Problem.pm:576
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:361
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1057
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:662
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:663
+#: perllib/FixMyStreet/DB/Result/Problem.pm:546
+#: perllib/FixMyStreet/DB/Result/Problem.pm:556
+#: perllib/FixMyStreet/DB/Result/Problem.pm:566
+#: perllib/FixMyStreet/DB/Result/Problem.pm:578
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:369
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:384
msgid "Other"
msgstr "Outro"
@@ -2237,8 +2136,6 @@ msgstr "Parente"
msgid "Partial"
msgstr "Parcial"
-#: templates/web/bromley/report/display.html:147
-#: templates/web/bromley/report/new/fill_in_details_form.html:186
#: templates/web/fixmystreet/auth/general.html:59
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:208
#: templates/web/fixmystreet/report/update-form.html:119
@@ -2256,19 +2153,15 @@ msgid "Permalink"
msgstr ""
#: templates/web/zurich/report/new/fill_in_details_form.html:106
-#, fuzzy
msgid "Phone number"
-msgstr "Telefone "
+msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:136
-#: templates/web/bromley/report/new/fill_in_details_form.html:183
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:138
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:205
-#: templates/web/seesomething/report/new/fill_in_details_form.html:89
msgid "Phone number (optional)"
msgstr "Telefone (opcional)"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:282
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:287
#: templates/web/default/admin/report_edit.html:68
#: templates/web/default/report/new/fill_in_details_form.html:215
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:138
@@ -2278,11 +2171,8 @@ msgstr "Telefone (opcional)"
msgid "Phone:"
msgstr "Telefone:"
-#: templates/web/bromley/report/display.html:111
-#: templates/web/bromley/report/new/fill_in_details_form.html:104
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:92
#: templates/web/fixmystreet/report/update-form.html:59
-#: templates/web/seesomething/report/new/fill_in_details_form.html:52
#: templates/web/zurich/admin/index-dm.html:29
#: templates/web/zurich/admin/index-sdm.html:24
#: templates/web/zurich/admin/reports.html:16
@@ -2304,7 +2194,6 @@ msgid "Photos of recent nearby reports"
msgstr "Fotos de relatórios recentes mais proximos"
#: templates/web/default/js/translation_strings.html:30
-#: templates/web/oxfordshire/js/translation_strings.html:24
msgid "Place pin on map"
msgstr "Coloque a fix pin no mapa"
@@ -2312,7 +2201,7 @@ msgstr "Coloque a fix pin no mapa"
#: templates/web/default/admin/report_edit.html:38
#: templates/web/default/dashboard/index.html:142
#: templates/web/default/dashboard/index.html:143
-#: templates/web/zurich/admin/header.html:1
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/header.html:9
#: templates/web/zurich/admin/index-dm.html:9
#: templates/web/zurich/admin/report_edit.html:89
@@ -2326,7 +2215,6 @@ msgstr "<a Class=\"tab_link\" href=\"#report\"> dar uma olhada </a> nas atualiza
#: templates/web/default/report/new/notes.html:6
#: templates/web/fixmystreet/report/new/notes.html:6
-#: templates/web/oxfordshire/report/new/notes.html:5
msgid "Please be polite, concise and to the point."
msgstr "Por favor, seja educado, objectivo, conciso e direto ao ponto."
@@ -2343,20 +2231,16 @@ msgstr "Favor verificar seu email"
#: templates/web/default/auth/general.html:8
#: templates/web/fixmystreet/auth/general.html:15
#: templates/web/fixmystreet/auth/general.html:9
-#: templates/web/seesomething/auth/general.html:15
-#: templates/web/seesomething/auth/general.html:9
#: templates/web/zurich/auth/general.html:3
#: templates/web/zurich/auth/general.html:9
msgid "Please check your email address is correct"
msgstr "Favor verificar se seu email esta correcto"
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:848
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:855
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:874
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:917
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:859
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:878
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:921
#: perllib/FixMyStreet/DB/Result/Problem.pm:381
#: templates/web/default/js/translation_strings.html:9
-#: templates/web/oxfordshire/js/translation_strings.html:9
msgid "Please choose a category"
msgstr "Escolher uma categoria"
@@ -2364,19 +2248,8 @@ msgstr "Escolher uma categoria"
msgid "Please choose a property type"
msgstr "Por favor, escolha um tipo de imóvel"
-#: templates/web/seesomething/js/translation_strings.html:6
-msgid "Please choose a transport category"
-msgstr "Por favor escolha uma categoria de transporte"
-
-#: templates/web/seesomething/js/translation_strings.html:7
-msgid "Please choose an incident category"
-msgstr "Por favor escolha uma categoria incidente"
-
-#: templates/web/bromley/report/new/fill_in_details_form.html:64
-msgid "Please describe the exact location of the report. Example: “2 dumped mattresses outside Number 19 Stockwell Close”"
-msgstr "Por favor, descreva a localização exata do relatório. Exemplo: \"2 postes iluminaçao partidos na rua lisboa\""
-
#: templates/web/default/contact/blurb.html:2
+#: templates/web/fixmystreet/contact/blurb.html:12
msgid ""
"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"
@@ -2388,7 +2261,6 @@ msgstr ""
#: templates/web/default/report/new/notes.html:7
#: templates/web/fixmystreet/report/new/notes.html:7
-#: templates/web/oxfordshire/report/new/notes.html:6
msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the service for all users."
msgstr ""
"Por favor, o Faça <strong> Localidade: Não </strong> relatar Problemas atraves dEste Formulário; Point Of Sale de ir par ⏎\n"
@@ -2401,7 +2273,6 @@ msgstr "Por favor, não fornecer o endereço ou informações pessoais nesta se
#: perllib/FixMyStreet/DB/Result/Comment.pm:126
#: templates/web/default/js/translation_strings.html:2
-#: templates/web/oxfordshire/js/translation_strings.html:2
msgid "Please enter a message"
msgstr "Por favor insira uma mensagem"
@@ -2414,19 +2285,14 @@ msgstr "Por favor insira uma password"
#: perllib/FixMyStreet/App/Controller/Contact.pm:97
#: perllib/FixMyStreet/DB/Result/Problem.pm:356
#: templates/web/default/js/translation_strings.html:3
-#: templates/web/oxfordshire/js/translation_strings.html:3
msgid "Please enter a subject"
msgstr "Por favor insira um assunto"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1032
-#: perllib/FixMyStreet/App/Controller/Admin.pm:979
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1041
+#: perllib/FixMyStreet/App/Controller/Admin.pm:988
#: perllib/FixMyStreet/DB/Result/User.pm:115
#: templates/web/default/js/translation_strings.html:12
#: templates/web/default/js/translation_strings.html:16
-#: templates/web/oxfordshire/js/translation_strings.html:12
-#: templates/web/oxfordshire/js/translation_strings.html:16
-#: templates/web/seesomething/js/translation_strings.html:10
-#: templates/web/seesomething/js/translation_strings.html:13
msgid "Please enter a valid email"
msgstr "Por favor insira um email valido"
@@ -2437,8 +2303,6 @@ msgstr "Por favor insira um endereço de e-mail válido"
#: perllib/FixMyStreet/DB/Result/Problem.pm:359
#: templates/web/default/js/translation_strings.html:4
-#: templates/web/oxfordshire/js/translation_strings.html:4
-#: templates/web/seesomething/js/translation_strings.html:2
msgid "Please enter some details"
msgstr "Por favor, insira alguns detalhes"
@@ -2450,32 +2314,22 @@ msgstr "Por favor, insira alguns detalhes"
#: templates/web/default/js/translation_strings.html:15
#: templates/web/fixmystreet/auth/general.html:14
#: templates/web/fixmystreet/auth/general.html:9
-#: templates/web/oxfordshire/js/translation_strings.html:11
-#: templates/web/oxfordshire/js/translation_strings.html:15
-#: templates/web/seesomething/auth/general.html:14
-#: templates/web/seesomething/auth/general.html:9
-#: templates/web/seesomething/js/translation_strings.html:9
#: templates/web/zurich/auth/general.html:3
#: templates/web/zurich/auth/general.html:8
msgid "Please enter your email"
msgstr "Digite seu e-mail"
-#: templates/web/bromley/report/new/fill_in_details_form.html:149
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:151
-#: templates/web/seesomething/report/new/fill_in_details_form.html:85
#: templates/web/zurich/report/new/fill_in_details_form.html:92
msgid "Please enter your email address"
msgstr "Por favor, insira o seu endereço de email"
#: templates/web/default/js/translation_strings.html:25
-#: templates/web/oxfordshire/js/translation_strings.html:19
msgid "Please enter your first name"
msgstr "Digite seu primeiro nome"
#: perllib/FixMyStreet/DB/Result/Problem.pm:374
#: templates/web/default/js/translation_strings.html:7
-#: templates/web/oxfordshire/js/translation_strings.html:7
-#: templates/web/seesomething/js/translation_strings.html:4
msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
msgstr "Por favor, insira o seu nome completo, os conselhos precisam desta informação - se você não quiser que seu nome seja mostrado no site, desmarque a caixa abaixo"
@@ -2484,22 +2338,18 @@ msgstr "Por favor, insira o seu nome completo, os conselhos precisam desta infor
#: perllib/FixMyStreet/DB/Result/Problem.pm:367
#: perllib/FixMyStreet/DB/Result/User.pm:108
#: templates/web/default/js/translation_strings.html:6
-#: templates/web/oxfordshire/js/translation_strings.html:6
msgid "Please enter your name"
msgstr "Digite seu nome"
#: templates/web/default/js/translation_strings.html:22
-#, fuzzy
msgid "Please enter your phone number"
-msgstr "Digite seu segundo nome, apelido"
+msgstr ""
#: templates/web/default/js/translation_strings.html:26
-#: templates/web/oxfordshire/js/translation_strings.html:20
msgid "Please enter your second name"
msgstr "Digite seu segundo nome, apelido"
#: templates/web/default/js/translation_strings.html:24
-#: templates/web/oxfordshire/js/translation_strings.html:18
msgid "Please enter your title"
msgstr "Por favor, insira o seu título"
@@ -2523,16 +2373,16 @@ msgstr ""
"Não há nenhuma necessidade para você dar o endereço exato. Por favor, seja educado, conciso ⏎\n"
"e direto ao ponto, escrever a mensagem inteiramente em letras maiúsculas torna difícil ⏎"
-#: templates/web/default/report/new/fill_in_details_text.html:1
#: templates/web/default/report/new/fill_in_details_text.html:11
-#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1
+#: templates/web/default/report/new/fill_in_details_text.html:2
#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:10
-#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:2
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:2
#: templates/web/fixmystreet/report/new/fill_in_details_text.html:8
msgid "Please fill in details of the problem below."
msgstr "Por favor, preencha os detalhes do problema abaixo."
-#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:2
#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:3
msgid ""
"Please fill in details of the problem below. Leave as much detail as you can, \n"
@@ -2543,7 +2393,7 @@ msgstr ""
"e se possível descrever a localização exata de ⏎\n"
"o problema (por exemplo, se existe um número de rua ou o nome da rua, zona. lugar, praça, beco, ruela, etc)."
-#: templates/web/default/report/new/fill_in_details_text.html:1
+#: templates/web/default/report/new/fill_in_details_text.html:2
#: templates/web/default/report/new/fill_in_details_text.html:3
msgid ""
"Please fill in details of the problem below. The council won't be able\n"
@@ -2557,12 +2407,10 @@ msgstr ""
"foto do problema se você tiver um), etc"
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:70
-#: templates/web/seesomething/report/new/fill_in_details_form.html:20
#: templates/web/zurich/report/new/fill_in_details_form.html:46
msgid "Please fill in details of the problem."
msgstr "Por favor, preencha os detalhes do problema."
-#: templates/web/bromley/report/new/fill_in_details_form.html:28
#: templates/web/default/report/new/fill_in_details_form.html:27
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:26
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:35
@@ -2574,7 +2422,7 @@ msgstr "Por favor, preencha o formulário abaixo com detalhes do problema e desc
msgid "Please indicate whether you'd like to receive another questionnaire"
msgstr "Por favor, indique se você gostaria de receber um outro questionário"
-#: templates/web/fixmystreet/report/updates-sidebar-notes.html:3
+#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4
msgid "Please note that updates are not sent to the council."
msgstr "Por favor, note que as atualizações não são enviadas para o conselho."
@@ -2582,11 +2430,6 @@ msgstr "Por favor, note que as atualizações não são enviadas para o conselho
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 "Por favor, note que as atualizações Localidade: Não São enviadas par o Conselho. Se Você. deixar Seu Nome Será, Público. SUAS Informations Só Serao utilizadas according to Nossa <a href=\"/faq#privacy\"> Politica de Privacidade </a>"
-#: templates/web/barnet/report/updates-sidebar-notes.html:1
-msgid "Please note that updates are not sent to the relevant department. 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 "Por favor, note que as atualizações não são enviadas para o departamento competente. Se você deixar seu nome será público. Suas informações só serão utilizadas de acordo com nossa <a href=\"/faq#privacy\"> política de privacidade </a>"
-
-#: templates/web/bromley/report/new/fill_in_details_form.html:23
#: templates/web/default/report/new/fill_in_details_form.html:5
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:5
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:26
@@ -2597,7 +2440,6 @@ msgstr "Por favor, note o relatório ainda não foi enviado <strong> </strong>.
#: templates/web/default/report/new/notes.html:1
#: templates/web/fixmybarangay/report/new/notes.html:1
#: templates/web/fixmystreet/report/new/notes.html:1
-#: templates/web/oxfordshire/report/new/notes.html:1
msgid "Please note:"
msgstr "Favor notar:"
@@ -2642,19 +2484,15 @@ msgstr "Faça upload de uma imagem JPEG \n"
msgid "Please write a message"
msgstr "Por favor, escreva uma mensagem"
-#: templates/web/bromley/report/display.html:70
#: templates/web/fixmystreet/report/update-form.html:23
msgid "Please write your update here"
msgstr "Por favor, escreva a sua atualização aqui"
-#: templates/web/bromley/report/display.html:123
-#: templates/web/bromley/report/display.html:151
-#: templates/web/bromley/report/display.html:163
-#: templates/web/default/contact/index.html:93
+#: templates/web/default/contact/index.html:95
#: templates/web/default/report/update-form.html:109
#: templates/web/default/report/update-form.html:131
#: templates/web/default/report/update-form.html:72
-#: templates/web/fixmystreet/contact/index.html:105
+#: templates/web/fixmystreet/contact/index.html:110
#: templates/web/fixmystreet/report/update-form.html:123
#: templates/web/fixmystreet/report/update-form.html:71
#: templates/web/fixmystreet/report/update-form.html:95
@@ -2687,7 +2525,7 @@ msgstr "Privado"
msgid "Private information (not shown on site)"
msgstr "Informações privadas (não mostrado no site)"
-#: templates/web/default/maps/openlayers.html:85
+#: templates/web/default/maps/openlayers.html:86
msgid "Problem"
msgstr "Problema"
@@ -2708,7 +2546,7 @@ msgstr "Problema %s enviado ao conselho %s"
msgid "Problem breakdown by state"
msgstr "Colapso problema por estado"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:950
+#: perllib/FixMyStreet/App/Controller/Admin.pm:959
msgid "Problem marked as open."
msgstr "Problema marcado como aberto."
@@ -2724,7 +2562,6 @@ msgstr "Problemas"
msgid "Problems in this area"
msgstr "Problemas nesta área"
-#: templates/web/bromley/report/display.html:31
#: templates/web/fixmystreet/around/tabbed_lists.html:4
#: templates/web/fixmystreet/report/display.html:46
msgid "Problems nearby"
@@ -2744,15 +2581,16 @@ msgstr "Problemas relatados recentemente fixados em FixMyStreetMindelo"
msgid "Problems within %.1fkm of this location"
msgstr "Problemas dentro de %.1fkm deste local"
-#: perllib/FixMyStreet/Cobrand/Default.pm:626
+#: perllib/FixMyStreet/Cobrand/Default.pm:629
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:109
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155
-#: perllib/FixMyStreet/Cobrand/UK.pm:228
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:184
+#: perllib/FixMyStreet/Cobrand/UK.pm:222
msgid "Problems within %s"
msgstr "Problemas dentro de %s"
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117
-#: perllib/FixMyStreet/Cobrand/UK.pm:242
+#: perllib/FixMyStreet/Cobrand/UK.pm:236
msgid "Problems within %s ward"
msgstr "Problemas dentro de %s ala"
@@ -2780,12 +2618,10 @@ msgstr "Endereço do imóvel:"
msgid "Property type:"
msgstr "Tipo de propriedade:"
-#: templates/web/bromley/report/new/fill_in_details_form.html:52
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:64
msgid "Provide a title"
msgstr "Dê um título"
-#: templates/web/bromley/report/display.html:57
#: templates/web/default/report/update-form.html:3
#: templates/web/fixmystreet/report/update-form.html:4
msgid "Provide an update"
@@ -2795,11 +2631,6 @@ msgstr "Fornecer uma atualização"
msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
msgstr ""
-#: templates/web/bromley/report/new/fill_in_details_form.html:180
-msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
-msgstr "Fornecer uma senha é opcional, mas isso vai permitir que você mais facilmente relatar problemas futuros, deixe as atualizações e gerenciar seus relatórios."
-
-#: templates/web/bromley/report/display.html:144
#: templates/web/default/report/new/fill_in_details_form.html:173
#: templates/web/default/report/update-form.html:128
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:202
@@ -2830,7 +2661,6 @@ msgstr "Publicar foto"
msgid "Publish the response"
msgstr "Publicar a resposta"
-#: templates/web/default/questionnaire/completed.html:1
#: templates/web/default/questionnaire/completed.html:2
#: templates/web/default/questionnaire/index.html:0
#: templates/web/default/questionnaire/index.html:14
@@ -2854,9 +2684,7 @@ msgstr "Questionário %d enviou para o problema de %d"
msgid "Questionnaire filled in by problem reporter"
msgstr "Questionário preenchido por problema repórter"
-#: templates/web/bromley/report/display.html:37
#: templates/web/default/alert/_list.html:21
-#: templates/web/default/around/display_location.html:1
#: templates/web/default/around/display_location.html:3
#: templates/web/default/report/display.html:46
#: templates/web/default/reports/_rss.html:1
@@ -2866,11 +2694,11 @@ msgstr "Questionário preenchido por problema repórter"
msgid "RSS feed"
msgstr "RSS feed"
-#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+#: perllib/FixMyStreet/Cobrand/UK.pm:265 perllib/FixMyStreet/Cobrand/UK.pm:277
msgid "RSS feed for %s"
msgstr "RSS feed para %s"
-#: perllib/FixMyStreet/Cobrand/UK.pm:277 perllib/FixMyStreet/Cobrand/UK.pm:289
+#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
msgid "RSS feed for %s ward, %s"
msgstr "RSS feed for %s ala,%s"
@@ -2878,11 +2706,15 @@ msgstr "RSS feed for %s ala,%s"
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:189
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:197
-#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:309
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:200
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:208
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:218
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:226
+#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303
msgid "RSS feed of %s"
msgstr "RSS feed de %s"
-#: perllib/FixMyStreet/Cobrand/UK.pm:302 perllib/FixMyStreet/Cobrand/UK.pm:314
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:308
msgid "RSS feed of %s, within %s ward"
msgstr "RSS feed de %s, %s problemas pendentes"
@@ -2895,31 +2727,30 @@ msgstr "RSS feed dos problemas próximos"
msgid "RSS feed of problems in this %s"
msgstr "RSS feed dos problemas nesta %s"
-#: perllib/FixMyStreet/Cobrand/Default.pm:627
+#: perllib/FixMyStreet/Cobrand/Default.pm:630
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:110
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:154
-#: perllib/FixMyStreet/Cobrand/UK.pm:235
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:183
+#: perllib/FixMyStreet/Cobrand/UK.pm:229
msgid "RSS feed of problems within %s"
msgstr "RSS feed dos Problemas Nesta %s"
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:116
-#: perllib/FixMyStreet/Cobrand/UK.pm:241
+#: perllib/FixMyStreet/Cobrand/UK.pm:235
msgid "RSS feed of problems within %s ward"
msgstr "RSS feed dos problemas dentro de %s ala"
-#: templates/web/default/around/display_location.html:1
+#: templates/web/default/around/display_location.html:3
#: templates/web/default/around/display_location.html:4
msgid "RSS feed of recent local problems"
msgstr "RSS feed dos problemas locais recentes"
-#: templates/web/bromley/report/display.html:37
#: templates/web/default/report/display.html:46
#: templates/web/fixmystreet/alert/updates.html:9
#: templates/web/fixmystreet/report/display.html:61
msgid "RSS feed of updates to this problem"
msgstr "RSS feed de atualizações para este problema"
-#: templates/web/bromley/report/display.html:39
#: templates/web/default/alert/updates.html:9
#: templates/web/default/report/display.html:37
#: templates/web/fixmystreet/alert/updates.html:14
@@ -2943,7 +2774,7 @@ msgid "Recently fixed"
msgstr "Problemas recentemente fixados"
#: templates/web/default/index.html:35 templates/web/emptyhomes/index.html:24
-#: templates/web/fixmystreet/index.html:45
+#: templates/web/fixmystreet/index.html:49
msgid "Recently reported problems"
msgstr "Problemas recentemente reportados"
@@ -2960,8 +2791,8 @@ msgstr "Lembre-se que, para o projeto piloto, FixMyStreet é apenas para relatar
msgid "Remove flag"
msgstr "Remover bandeira"
-#: templates/web/default/admin/report_edit.html:89
-#: templates/web/default/admin/update_edit.html:57
+#: templates/web/default/admin/report_edit.html:94
+#: templates/web/default/admin/update_edit.html:62
#: templates/web/zurich/admin/update_edit.html:35
msgid "Remove photo (can't be undone!)"
msgstr "Remover foto (não pode ser desfeita!)"
@@ -2970,29 +2801,21 @@ msgstr "Remover foto (não pode ser desfeita!)"
msgid "Report Empty Homes"
msgstr "Relatório Casas vazias, pardeeiros."
-#: templates/web/barnet/footer.html:16 templates/web/bromley/footer.html:17
#: templates/web/default/footer.html:7 templates/web/emptyhomes/header.html:31
#: templates/web/fiksgatami/footer.html:5
#: templates/web/fiksgatami/nn/footer.html:5
-#: templates/web/fixmindelo/footer.html:37
-#: templates/web/fixmystreet/footer.html:44
-#: templates/web/oxfordshire/footer.html:19
-#: templates/web/reading/footer.html:6
-#: templates/web/seesomething/footer.html:11
-#: templates/web/stevenage/footer.html:39 templates/web/zurich/footer.html:17
+#: templates/web/fixmystreet/footer.html:47
+#: templates/web/zurich/footer.html:17
#: templates/web/zurich/nav_over_content.html:4
msgid "Report a problem"
msgstr "Comunicar um problema"
-#: templates/web/bromley/report/display.html:28
#: templates/web/fixmystreet/report/display.html:35
msgid "Report abuse"
msgstr "Denunciar um abuso"
#: templates/web/default/report_created.html:1
#: templates/web/default/report_created.html:3
-#: templates/web/seesomething/report_created.html:0
-#: templates/web/seesomething/report_created.html:8
msgid "Report created"
msgstr "Relatorio criado"
@@ -3002,22 +2825,21 @@ msgstr "Relatório sobre %s"
#: templates/web/default/index.html:14 templates/web/emptyhomes/index.html:5
#: templates/web/fixmystreet/around/intro.html:1
-#: templates/web/stevenage/around/intro.html:1
#: templates/web/zurich/around/intro.html:1
msgid "Report, view, or discuss local problems"
msgstr "Relatório, vista, ou discutir os problemas locais"
-#: templates/web/default/my/my.html:74
+#: templates/web/default/my/my.html:79
msgid "Reported %s"
msgstr "Relatado %s"
-#: templates/web/default/my/my.html:72
+#: templates/web/default/my/my.html:77
msgid "Reported %s, to %s"
msgstr "Reportados %s, para %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:559
+#: perllib/FixMyStreet/DB/Result/Problem.pm:561
#: templates/web/default/contact/index.html:45
-#: templates/web/fixmystreet/contact/index.html:58
+#: templates/web/fixmystreet/contact/index.html:62
msgid "Reported anonymously at %s"
msgstr "Relatado anonimamente em %s"
@@ -3027,9 +2849,9 @@ msgstr "Relatado anonimamente em %s"
msgid "Reported before"
msgstr "Relatado antes"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:582
+#: perllib/FixMyStreet/DB/Result/Problem.pm:584
#: templates/web/default/contact/index.html:47
-#: templates/web/fixmystreet/contact/index.html:60
+#: templates/web/fixmystreet/contact/index.html:64
msgid "Reported by %s at %s"
msgstr "Relatado por %s em %s"
@@ -3037,27 +2859,27 @@ msgstr "Relatado por %s em %s"
msgid "Reported in the %s category"
msgstr "Relatado na categoria %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:555
+#: perllib/FixMyStreet/DB/Result/Problem.pm:557
msgid "Reported in the %s category anonymously at %s"
msgstr "Relatado na categoria %s anonimamente em %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:577
+#: perllib/FixMyStreet/DB/Result/Problem.pm:579
msgid "Reported in the %s category by %s at %s"
msgstr "Relatado na categoria %s por %s em %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:551
+#: perllib/FixMyStreet/DB/Result/Problem.pm:553
msgid "Reported via %s anonymously at %s"
msgstr "Relatado por %s anonimamente em %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:573
+#: perllib/FixMyStreet/DB/Result/Problem.pm:575
msgid "Reported via %s by %s at %s"
msgstr "Relatado por %s por%s em %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:547
+#: perllib/FixMyStreet/DB/Result/Problem.pm:549
msgid "Reported via %s in the %s category anonymously at %s"
msgstr "Relatado por %s na categoria %s anonimamente em %s"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:567
+#: perllib/FixMyStreet/DB/Result/Problem.pm:569
msgid "Reported via %s in the %s category by %s at %s"
msgstr "Relatado por %s na categoria %s por %s em %s"
@@ -3071,25 +2893,20 @@ msgstr "Relatado por %s na categoria %s por %s em %s"
#: templates/web/fixmystreet/report/new/fill_in_details.html:0
#: templates/web/fixmystreet/report/new/fill_in_details.html:5
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2
-#: templates/web/oxfordshire/js/translation_strings.html:35
-#: templates/web/seesomething/around/around_index.html:1
-#: templates/web/seesomething/report/new/fill_in_details_form.html:3
#: templates/web/zurich/report/new/fill_in_details_form.html:2
msgid "Reporting a problem"
msgstr "Relatando um problema"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1177
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:242
-#: templates/web/seesomething/admin/stats.html:1
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1186
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:290
#: templates/web/zurich/header.html:60
msgid "Reports"
msgstr "Relatórios"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:393
-#: perllib/FixMyStreet/DB/Result/Problem.pm:397
-#, fuzzy
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
+#: perllib/FixMyStreet/DB/Result/Problem.pm:399
msgid "Reports are limited to %s characters in length. Please shorten your report"
-msgstr "Os relatórios são limitadas a 2000 caracteres. Por favor, encurtar o seu relatório"
+msgstr ""
#: templates/web/zurich/admin/index-sdm.html:7
msgid "Reports awaiting approval"
@@ -3108,27 +2925,28 @@ msgid "Resend report"
msgstr "Reenviar relatório"
#: templates/web/default/js/translation_strings.html:28
-#: templates/web/oxfordshire/js/translation_strings.html:22
msgid "Right place?"
msgstr "Lugar certo?"
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:195
#: perllib/FixMyStreet/Geocode/OSM.pm:173
msgid "Road operator for this named road (derived from road reference number and type): %s"
msgstr "Operador de estrada por esta estrada chamada (derivado do número de referência estrada e tipo): %s"
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:192
#: perllib/FixMyStreet/Geocode/OSM.pm:170
msgid "Road operator for this named road (from OpenStreetMap): %s"
msgstr "Operador de estrada por esta estrada chamada (a partir de OpenStreetMap): %s"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1377
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1388
-#: templates/web/default/admin/report_edit.html:85
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1386
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1397
+#: templates/web/default/admin/report_edit.html:90
#: templates/web/zurich/admin/report_edit.html:76
msgid "Rotate Left"
msgstr "Girar para a esquerda"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1377
-#: templates/web/default/admin/report_edit.html:86
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1386
+#: templates/web/default/admin/report_edit.html:91
#: templates/web/zurich/admin/report_edit.html:77
msgid "Rotate Right"
msgstr "Girar para a direita"
@@ -3157,9 +2975,8 @@ msgid "Search:"
msgstr "Pesquisar:"
#: templates/web/default/admin/reports.html:26
-#, fuzzy
msgid "Searching found no reports."
-msgstr "elatórios de pesquisa"
+msgstr ""
#: templates/web/default/admin/users.html:39
msgid "Searching found no users."
@@ -3180,7 +2997,7 @@ msgstr "Selecione uma área"
msgid "Select which type of alert you'd like and click the button for an RSS feed, or enter your email address to subscribe to an email alert."
msgstr "Selecione o tipo de alerta fixstreet que você gostaria de receber e clique no botão para um feed RSS ou introduza o seu endereço de email para assinar um alerta de e-mail."
-#: perllib/FixMyStreet/DB/Result/Problem.pm:664
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
msgid "Sent to %s %s later"
msgstr "Enviado para %s %s mais tarde"
@@ -3197,9 +3014,6 @@ msgstr "Srerviço:"
msgid "Share"
msgstr "Acçao"
-#: templates/web/bromley/report/display.html:205
-#: templates/web/bromley/report/new/fill_in_details_form.html:129
-#: templates/web/bromley/report/new/fill_in_details_form.html:175
#: templates/web/default/report/new/fill_in_details_form.html:210
#: templates/web/default/report/update-form.html:157
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:129
@@ -3222,11 +3036,7 @@ msgstr "Mostrar pins"
#: templates/web/fixmystreet/auth/general.html:3
#: templates/web/fixmystreet/auth/general.html:42
#: templates/web/fixmystreet/auth/general.html:62
-#: templates/web/fixmystreet/header.html:54
-#: templates/web/oxfordshire/header.html:115
-#: templates/web/seesomething/auth/general.html:3
-#: templates/web/seesomething/auth/general.html:39
-#: templates/web/stevenage/header.html:101
+#: templates/web/fixmystreet/header.html:57
#: templates/web/zurich/auth/general.html:18
#: templates/web/zurich/auth/general.html:35
msgid "Sign in"
@@ -3238,20 +3048,15 @@ msgstr "Entrar por email"
#: templates/web/default/auth/general.html:1
#: templates/web/fixmystreet/auth/general.html:1
-#: templates/web/seesomething/auth/general.html:1
#: templates/web/zurich/auth/general.html:1
msgid "Sign in or create an account"
msgstr "Entar e crear uma conta"
-#: templates/web/bromley/auth/sign_out.html:1
#: templates/web/default/auth/sign_out.html:1
#: templates/web/default/header.html:30
#: templates/web/emptyhomes/header.html:46
#: templates/web/fiksgatami/header.html:22
#: templates/web/fiksgatami/nn/header.html:22
-#: templates/web/lichfielddc/header.html:177
-#: templates/web/reading/header.html:33
-#: templates/web/seesomething/auth/sign_out.html:1
#: templates/web/zurich/auth/sign_out.html:1
msgid "Sign out"
msgstr "Sair "
@@ -3260,14 +3065,12 @@ msgstr "Sair "
#: templates/web/emptyhomes/header.html:45
#: templates/web/fiksgatami/header.html:21
#: templates/web/fiksgatami/nn/header.html:21
-#: templates/web/lichfielddc/header.html:177
-#: templates/web/reading/header.html:32
msgid "Signed in as %s"
msgstr "Entrou como %s"
-#: templates/web/default/report/new/fill_in_details_text.html:1
-#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:1
-#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1
+#: templates/web/default/report/new/fill_in_details_text.html:2
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:2
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:2
msgid "Some categories may require additional information."
msgstr "Algumas categorias podem solicitar informações adicionais."
@@ -3298,6 +3101,8 @@ msgstr "Desculpe, houve um erro ao confirmar o seu problema."
#: perllib/FixMyStreet/App/Controller/Report/New.pm:215
#: perllib/FixMyStreet/Geocode.pm:28 perllib/FixMyStreet/Geocode/Bing.pm:58
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:75
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:95
#: perllib/FixMyStreet/Geocode/Google.pm:74
#: perllib/FixMyStreet/Geocode/OSM.pm:66
msgid "Sorry, we could not find that location."
@@ -3305,7 +3110,7 @@ msgstr "Desculpe, não conseguimos encontrar esse local."
#: perllib/FixMyStreet/Geocode/Bing.pm:53
#: perllib/FixMyStreet/Geocode/Google.pm:69
-#: perllib/FixMyStreet/Geocode/Zurich.pm:87
+#: perllib/FixMyStreet/Geocode/Zurich.pm:88
msgid "Sorry, we could not parse that location. Please try again."
msgstr "Desculpe, mas não foi possível analisar esse local. Por favor, tente novamente."
@@ -3315,11 +3120,9 @@ msgid "Source code"
msgstr "O código-fonte"
#: templates/web/default/admin/stats.html:64
-#, fuzzy
msgid "Start Date:"
-msgstr "Dia:"
+msgstr ""
-#: templates/web/bromley/report/display.html:78
#: templates/web/default/admin/flagged.html:18
#: templates/web/default/admin/list_updates.html:11
#: templates/web/default/admin/reports.html:15
@@ -3336,8 +3139,8 @@ msgstr "Estado"
msgid "State:"
msgstr "Estado"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1182
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:257
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1191
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:305
#: templates/web/default/admin/stats.html:1
#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72
msgid "Stats"
@@ -3353,7 +3156,7 @@ msgstr "Status"
msgid "Still open, via questionnaire, %s"
msgstr "Ainda em aberto, via questionário, %s"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:370
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378
msgid "Subcategory: %s"
msgstr "Subcategoria: %s"
@@ -3361,8 +3164,7 @@ msgstr "Subcategoria: %s"
msgid "Subdivision/Body"
msgstr "Zona / Bairro"
-#: templates/web/bromley/report/new/fill_in_details_form.html:48
-#: templates/web/fixmystreet/contact/index.html:91
+#: templates/web/fixmystreet/contact/index.html:95
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:60
msgid "Subject"
msgstr "Assunto:"
@@ -3375,9 +3177,6 @@ msgstr "Assunto:"
msgid "Subject:"
msgstr "Assunto:"
-#: templates/web/bromley/report/new/fill_in_details_form.html:140
-#: templates/web/bromley/report/new/fill_in_details_form.html:190
-#: templates/web/bromley/report/new/fill_in_details_form.html:204
#: templates/web/default/questionnaire/creator_fixed.html:19
#: templates/web/default/report/new/fill_in_details_form.html:114
#: templates/web/default/report/new/fill_in_details_form.html:154
@@ -3386,13 +3185,12 @@ msgstr "Assunto:"
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:142
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:167
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:212
-#: templates/web/seesomething/report/new/fill_in_details_form.html:93
#: templates/web/zurich/report/new/fill_in_details_form.html:114
msgid "Submit"
msgstr "Submeter"
-#: templates/web/default/admin/report_edit.html:92
-#: templates/web/default/admin/update_edit.html:60
+#: templates/web/default/admin/report_edit.html:97
+#: templates/web/default/admin/update_edit.html:65
#: templates/web/default/admin/user-form.html:55
#: templates/web/zurich/admin/report_edit-sdm.html:67
#: templates/web/zurich/admin/report_edit.html:224
@@ -3405,8 +3203,8 @@ msgstr "Submeter alteraçoes"
msgid "Submit questionnaire"
msgstr "Submeter questionario"
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:111
-#: templates/web/zurich/admin/header.html:1
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:133
+#: templates/web/zurich/admin/header.html:2
#: templates/web/zurich/admin/header.html:6
#: templates/web/zurich/admin/index-dm.html:23
#: templates/web/zurich/admin/index-dm.html:6
@@ -3418,7 +3216,6 @@ msgstr "Submeter questionario"
msgid "Submitted"
msgstr "Submitido"
-#: templates/web/bromley/report/display.html:44
#: templates/web/default/alert/updates.html:17
#: templates/web/default/report/display.html:42
#: templates/web/fixmystreet/alert/updates.html:23
@@ -3436,8 +3233,8 @@ msgstr "Subcrever um alerta de e-mail"
msgid "Subscribe to an alert based upon what baranagay you&rsquo;re in:"
msgstr "Subcrever um alerta baseado no que baranagay você está em:"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1175
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:241
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1184
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:289
#: templates/web/default/admin/index.html:1
#: templates/web/zurich/admin/index-dm.html:1
#: templates/web/zurich/admin/index-sdm.html:1
@@ -3456,7 +3253,7 @@ msgstr "Resumo"
msgid "Summary reports"
msgstr "Resumo reports"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1179
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1188
msgid "Survey"
msgstr "Teste"
@@ -3479,17 +3276,15 @@ msgstr "Somente versao texto"
msgid "Text:"
msgstr "Texto:"
-#: templates/web/default/tokens/confirm_update.html:7
#: templates/web/default/tokens/confirm_update.html:8
msgid "Thank you &mdash; you can <a href=\"%s\">view your updated problem</a> on the site."
msgstr "Obrigado - você pode <a href=\"%s\"> ver o seu problema atualizados </a> no site."
-#: templates/web/emptyhomes/tokens/confirm_problem.html:6
+#: templates/web/emptyhomes/tokens/confirm_problem.html:7
#: templates/web/emptyhomes/tokens/confirm_problem.html:8
msgid "Thank you for reporting an empty property on ReportEmptyHomes.com. We have emailed the lead officer for empty homes in the council responsible with details, and asked them to do whatever they can to get the empty property back into use as soon as possible."
msgstr "Obrigado por relatar um imóvel vazio em ReportEmptyHomes.com. Temos enviado o oficial de ligação para as casas vazias no conselho responsável, com detalhes, e pediu-lhes para fazer o que puder para obter a propriedade vazia novamente em uso o mais rápido possível."
-#: templates/web/emptyhomes/tokens/confirm_problem.html:30
#: templates/web/emptyhomes/tokens/confirm_problem.html:31
msgid ""
"Thank you for reporting this empty property on ReportEmptyHomes.com.\n"
@@ -3506,7 +3301,7 @@ msgstr ""
msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it."
msgstr "Obrigado por tentar confirmar a sua atualização ou problema. Parece que temos um erro a nós mesmos, porém, assim <a href=\"%s\"> por favor deixe-nos saber o que aconteceu </a> e vamos olhar para ele."
-#: templates/web/emptyhomes/tokens/confirm_problem.html:24
+#: templates/web/emptyhomes/tokens/confirm_problem.html:25
#: templates/web/emptyhomes/tokens/confirm_problem.html:26
msgid "Thank you for using ReportEmptyHomes.com. Your action is already helping to resolve the UK&rsquo;s empty homes crisis."
msgstr "Obrigado por usar ReportEmptyHomes.com. Sua ação já está ajudando a resolver vazio crise casas em Mindelo."
@@ -3527,15 +3322,16 @@ msgstr "Obrigado, gratos em ouvir que o problema foi corrigido! Podemos apenas p
msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
msgstr "Essa imagem não parece ter sido carregada corretamente (%s), por favor, tente novamente."
-#: perllib/FixMyStreet/App/Controller/Council.pm:90
+#: perllib/FixMyStreet/App/Controller/Council.pm:100
msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
msgstr "Esse local não parece ser coberto por um conselho, talvez seja no mar ou fora do país. Por favor, tente novamente."
-#: perllib/FixMyStreet/App/Controller/Location.pm:123
+#: perllib/FixMyStreet/App/Controller/Location.pm:124
msgid "That location does not appear to be in the UK; please try again."
msgstr "Esse local não parece estar em Mindelo, por favor tente novamente."
#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:63
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:79
#: perllib/FixMyStreet/Cobrand/UK.pm:86
msgid "That postcode was not recognised, sorry."
msgstr "Esse código postal não foi reconhecido, me desculpe.Tente novamente."
@@ -3595,7 +3391,7 @@ msgstr ""
msgid "The confirmation email <strong>may</strong> take a few minutes to arrive &mdash; <em>please</em> be patient."
msgstr "O e-mail de confirmação <strong> Maio </strong> levar alguns minutos para chegar - <em> por favor </em>, seja paciente."
-#: templates/web/fixmystreet/report/new/fill_in_details_text.html:1
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:2
#: templates/web/fixmystreet/report/new/fill_in_details_text.html:3
msgid "The council won&rsquo;t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc."
msgstr "O conselho não vai ser capaz de ajudar a menos que você deixe o máximo de detalhes possível. Por favor, descreva a localização exata do problema (por exemplo, em uma parede, passeio, pavimento, iluminaçao), o que é, quanto tempo ele tem estado lá, uma descrição (e uma foto do problema se você tiver um), e outras informaçoes uteis."
@@ -3622,6 +3418,7 @@ msgstr "O erro foi: %s"
msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
msgstr "Os seguintes atributos Open311 v2 são devolvidos para cada solicitação: service_request_id, descrição, lat, long, MEDIA_URL, status, requested_datetime, updated_datetime, service_code e service_name."
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:187
#: perllib/FixMyStreet/Geocode/OSM.pm:165
msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
msgstr "As seguintes informações sobre a estrada mais próxima pode ser imprecisas ou irrelevantes, se o problema está perto de várias estradas ou perto de uma estrada sem nome registrado no OpenStreetMap."
@@ -3680,7 +3477,7 @@ msgstr ""
msgid "The passwords do not match"
msgstr "As senhas não são iguais"
-#: templates/web/default/errors/page_error_404_not_found.html:10
+#: templates/web/default/errors/page_error_404_not_found.html:11
#: templates/web/default/errors/page_error_404_not_found.html:12
msgid "The requested URL '%s' was not found on this server"
msgstr " A URL solicitada '%s' não foi encontrada neste servidor"
@@ -3690,16 +3487,14 @@ msgstr " A URL solicitada '%s' não foi encontrada neste servidor"
msgid "The simplest alert is our geographic one:"
msgstr "O alerta mais simples é o nosso único ponto localizaçao geográfica:"
-#: templates/web/barnet/report/new/councils_text_all.html:3
#: templates/web/default/report/new/councils_extra_text.html:1
-#: templates/web/default/report/new/councils_text_some.html:10
#: templates/web/default/report/new/councils_text_some.html:11
#: templates/web/default/report/new/fill_in_details_form.html:17
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12
msgid "The subject and details of the problem will be public, plus your name if you give us permission."
msgstr "O tema e os detalhes do problema serão públicos, além de seu nome se você nos der permissão."
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:291
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:296
msgid "The user could not locate the problem on a map, but to see the area around the location they entered"
msgstr "O usuário não conseguiu localizar o problema em um mapa, localizar a area mais proxima do local"
@@ -3714,16 +3509,15 @@ msgstr ""
msgid "There was a problem showing the All Reports page. Please try again later."
msgstr "Houve um problema ao mostrar a página de todos os relatórios. Por favor, tente novamente mais tarde."
-#: perllib/FixMyStreet/App/Controller/Contact.pm:116
+#: perllib/FixMyStreet/App/Controller/Contact.pm:121
#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59
msgid "There was a problem showing this page. Please try again later."
msgstr "Houve um problema mostrada nesta página. Por favor, tente novamente mais tarde."
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:747
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:755
#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134
#: templates/web/default/auth/general.html:23
#: templates/web/fixmystreet/auth/general.html:24
-#: templates/web/seesomething/auth/general.html:24
#: templates/web/zurich/auth/general.html:28
msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the &lsquo;sign in by email&rsquo; section of the form."
msgstr "Houve um problema com o email / combinação de senha. Se você não lembra da sua senha, ou não tiver um, por favor preencha o \"sinal de colocar e-mail 'seção do formulário."
@@ -3736,7 +3530,7 @@ msgstr "Houve um problema com o email / combinação de senha. Por favor, tente
msgid "There was a problem with your update. Please try again."
msgstr "Houve um problema com a sua atualização. Por favor, tente novamente."
-#: perllib/FixMyStreet/App/Controller/Contact.pm:120
+#: perllib/FixMyStreet/App/Controller/Contact.pm:125
msgid "There were problems with your report. Please see below."
msgstr "Houve problemas com o seu relatório. Por favor, veja abaixo."
@@ -3776,16 +3570,16 @@ msgid ""
" A body will not receive any reports unless it covers at least one area."
msgstr ""
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:375
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:385
msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system."
msgstr "Este e-mail foi enviado para ambos os conselhos que cobrem o local do problema, como o usuário não categorizá-lo, por favor, ignorar se você não é o conselho correto para lidar com o problema, ou deixe-nos saber que categoria de problema é para que possamos adicioná-lo ao nosso sistema."
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:388
msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue."
msgstr "Este e-mail foi enviado para vários conselhos que cobrem o local do problema, como a categoria selecionada é fornecida para todos eles, por favor, ignorar se você não é o conselho correto para lidar com o problema."
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:894
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:964
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:898
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:968
#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:131
#: perllib/FixMyStreet/Cobrand/UK.pm:58
msgid "This information is required"
@@ -3817,7 +3611,6 @@ msgstr "Isso pode ser porque o link é velho demais ou já foi utilizado, ou o e
msgid "This problem has been closed"
msgstr "Este problema esta solucionado."
-#: templates/web/bromley/report/display.html:98
#: templates/web/default/report/banner.html:12
#: templates/web/default/report/update-form.html:48
#: templates/web/emptyhomes/report/banner.html:3
@@ -3825,7 +3618,6 @@ msgstr "Este problema esta solucionado."
msgid "This problem has been fixed"
msgstr "Este problema foi resolvido"
-#: templates/web/bromley/report/display.html:92
#: templates/web/default/report/update-form.html:43
#: templates/web/fixmystreet/report/update-form.html:40
msgid "This problem has not been fixed"
@@ -3839,33 +3631,33 @@ msgstr "Este problema está em progresso"
msgid "This problem is old and of unknown status."
msgstr "Este problema é antigo e de status desconhecido."
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:108
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:109
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:130
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:131
#: templates/web/zurich/report/_main.html:14
msgid "This report is awaiting moderation."
msgstr "Este relatório está aguardando moderação."
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88
msgid "This report is currently marked as closed."
msgstr "Este relatório está marcado como fechado."
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:84
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86
msgid "This report is currently marked as fixed."
msgstr "Este relatório está marcado como fixo."
-#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:90
msgid "This report is currently marked as open."
msgstr "Este relatório está marcado como aberto."
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:315
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:320
msgid "This report was submitted anonymously"
msgstr "Este relatório foi enviado anonimamente"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:284
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:289
msgid "This web page also contains a photo of the problem, provided by the user."
msgstr "Esta página também contém uma foto do problema, fornecido pelo usuário."
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1178
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1187
#: templates/web/default/admin/timeline.html:1
msgid "Timeline"
msgstr "Timeline"
@@ -3883,7 +3675,7 @@ msgstr "Para <strong> relatar um problema </strong>, clique no mapa no local cor
msgid "To find out what local alerts we have for you, please enter your postcode or street name and area"
msgstr "Para descobrir quais os alertas locais que temos para si, deve inserir o seu código postal ou nome de rua e área ou zona"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:290
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:295
msgid "To view a map of the precise location of this issue"
msgstr "Para ver no mapa a localização exata desse problema"
@@ -3895,17 +3687,10 @@ msgstr "Para ver no mapa a localização exata desse problema"
msgid "Total"
msgstr "Total"
-#: templates/web/seesomething/report/new/fill_in_details_form.html:24
-msgid "Transport Category"
-msgstr "Categoria Transporte"
-
#: templates/web/default/js/translation_strings.html:29
-#: templates/web/oxfordshire/js/translation_strings.html:23
msgid "Try again"
msgstr "Tente novamente"
-#: templates/web/bromley/report/display.html:80
-#: templates/web/bromley/report/display.html:83
#: templates/web/default/admin/report_edit.html:35
#: templates/web/default/admin/report_edit.html:46
#: templates/web/default/report/update-form.html:30
@@ -3933,7 +3718,6 @@ msgid "Unknown alert type"
msgstr "Tipo de alerta desconhecido"
#: templates/web/default/js/translation_strings.html:39
-#: templates/web/oxfordshire/js/translation_strings.html:33
msgid "Unknown error"
msgstr "Erro desconhecido"
@@ -3941,7 +3725,6 @@ msgstr "Erro desconhecido"
msgid "Unknown problem ID"
msgstr "Desconhecido problema com ID"
-#: templates/web/bromley/report/display.html:66
#: templates/web/fixmystreet/report/update-form.html:19
msgid "Update"
msgstr "Actualizar"
@@ -3951,12 +3734,12 @@ msgid "Update %s created for problem %d; by %s"
msgstr "Atualize %s criado para o problema de %d; por %s"
#: templates/web/default/contact/index.html:21
-#: templates/web/fixmystreet/contact/index.html:34
+#: templates/web/fixmystreet/contact/index.html:38
msgid "Update below added anonymously at %s"
msgstr "Atualize abaixo colocado de forma anónima em %s"
#: templates/web/default/contact/index.html:23
-#: templates/web/fixmystreet/contact/index.html:36
+#: templates/web/fixmystreet/contact/index.html:40
msgid "Update below added by %s at %s"
msgstr "Actualizar abaixo adicionado por %s em %s"
@@ -4000,12 +3783,12 @@ msgstr "Actualizar:"
msgid "Updated"
msgstr "Atualizado"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1042
-#: perllib/FixMyStreet/App/Controller/Admin.pm:796
-#: perllib/FixMyStreet/App/Controller/Admin.pm:940
-#: perllib/FixMyStreet/App/Controller/Admin.pm:998
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:487
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:556
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1007
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1051
+#: perllib/FixMyStreet/App/Controller/Admin.pm:801
+#: perllib/FixMyStreet/App/Controller/Admin.pm:949
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:550
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:619
msgid "Updated!"
msgstr "Actualizado!"
@@ -4017,16 +3800,15 @@ msgstr "Actualizado!"
msgid "Updates"
msgstr "Actualizaçoes"
-#: perllib/FixMyStreet/DB/Result/Comment.pm:131
-msgid "Updates are limited to 2000 characters in length. Please shorten your update"
+#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+#, fuzzy
+msgid "Updates are limited to %s characters in length. Please shorten your update"
msgstr "As atualizações são limitadas a 2000 caracteres. Por favor, encurtar a sua atualização"
#: db/alert_types.pl:5 db/alert_types.pl:6
msgid "Updates on {{title}}"
msgstr "Atualizações sobre {{título}}"
-#: templates/web/bromley/report/display.html:0
-#: templates/web/bromley/report/display.html:8
#: templates/web/default/report/display.html:0
#: templates/web/default/report/display.html:5
#: templates/web/fixmystreet/report/display.html:0
@@ -4040,15 +3822,14 @@ msgstr ""
#: templates/web/zurich/admin/list_updates.html:30
#: templates/web/zurich/admin/list_updates.html:9
-#, fuzzy
msgid "User"
-msgstr "Usuários"
+msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1342
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1351
msgid "User flag removed"
msgstr "Bandeira usuário removida"
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1314
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1323
msgid "User flagged"
msgstr "Usuário sinalizado"
@@ -4056,8 +3837,8 @@ msgstr "Usuário sinalizado"
msgid "User search finds matches in users' names and email addresses."
msgstr ""
-#: perllib/FixMyStreet/App/Controller/Admin.pm:1180
-#: perllib/FixMyStreet/Cobrand/Zurich.pm:256
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1189
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:304
#: templates/web/default/admin/flagged.html:29
#: templates/web/zurich/header.html:69
msgid "Users"
@@ -4086,12 +3867,9 @@ msgstr "Ver o seu relatório"
#: templates/web/default/around/display_location.html:0
#: templates/web/default/around/display_location.html:34
-#: templates/web/seesomething/around/display_location.html:0
-#: templates/web/seesomething/around/display_location.html:16
msgid "Viewing a location"
msgstr "Visualizando um local"
-#: templates/web/bromley/report/display.html:0
#: templates/web/default/report/display.html:0
#: templates/web/fixmystreet/report/display.html:0
msgid "Viewing a problem"
@@ -4104,7 +3882,6 @@ msgstr "Wards deste conselho"
#: templates/web/default/alert/choose.html:6
#: templates/web/default/around/around_index.html:13
#: templates/web/fixmystreet/around/around_index.html:16
-#: templates/web/seesomething/around/around_index.html:13
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 "Encontramos mais de uma correspondência para essa localização. Mostramos até dez partidas, por favor tente uma pesquisa diferente se não estiver aqui."
@@ -4116,25 +3893,22 @@ msgstr "Nós não temos sido capazes de confirmar a sua conta - desculpe."
msgid "We have sent you an email containing a link to confirm your account."
msgstr "Nós enviamos um e-mail contendo um link para confirmar sua conta."
-#: templates/web/emptyhomes/tokens/confirm_problem.html:18
+#: templates/web/emptyhomes/tokens/confirm_problem.html:19
#: templates/web/emptyhomes/tokens/confirm_problem.html:20
msgid "We may contact you periodically to ask if anything has changed with the property you reported."
msgstr "Podemos contactá-lo periodicamente para perguntar se alguma coisa mudou com a propriedade que você relatou."
-#: templates/web/bromley/report/display.html:143
#: templates/web/fixmystreet/report/update-form.html:115
msgid "We never show your email"
msgstr "Nós nunca divulgaremos o seu e-mail"
-#: templates/web/bromley/report/new/fill_in_details_form.html:133
-#: templates/web/bromley/report/new/fill_in_details_form.html:179
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:134
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:201
#: templates/web/zurich/report/new/fill_in_details_form.html:96
msgid "We never show your email address or phone number."
msgstr "Nós nunca divulgaremos o seu endereço de e-mail ou número de telefone."
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:384
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:394
msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch."
msgstr "Percebemos este problema pode ser da responsabilidade do %s, no entanto, nós não possuímos nenhuma informação de contato deles. Se você souber de um endereço de contato apropriado, favor fornecer esse contacto. Obrigado."
@@ -4142,14 +3916,12 @@ msgstr "Percebemos este problema pode ser da responsabilidade do %s, no entanto,
msgid "We send it to the council on your behalf"
msgstr "Nós enviá-lo para o conselho em seu nome"
-#: templates/web/bromley/report/new/fill_in_details_form.html:217
#: templates/web/default/report/new/notes.html:5
#: templates/web/fixmybarangay/report/new/notes.html:5
msgid "We will only use your personal information in accordance with our <a href=\"/faq#privacy\">privacy policy.</a>"
msgstr "Nós só usamos as suas informações pessoais de acordo com a nossa <a href=\"/faq#privacy\">política de privacidade.</a>"
#: templates/web/fixmystreet/report/new/notes.html:4
-#: templates/web/oxfordshire/report/new/notes.html:4
msgid "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>"
msgstr "Nós só usamos as suas informações pessoais de acordo com a nossa <a href=\"/privacy\"> política de privacidade.</a>"
@@ -4179,13 +3951,11 @@ msgstr "Bloco inteiro de apartamentos vazios"
msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>."
msgstr "Com o pedido de pesquisa, também é possível pesquisar agency_responsavel para limitar as solicitações às enviados para uma única administração. O termo de pesquisa é a identificação de administração fornecidos pela <a href=\"%s\"> MapIt </a>."
-#: templates/web/fixmystreet/footer.html:21
-#: templates/web/stevenage/footer.html:22
+#: templates/web/fixmystreet/footer.html:24
msgid "Would you like better integration with FixMyStreet? <a href=\"http://www.mysociety.org/for-councils/fixmystreet/\">Find out about FixMyStreet for councils</a>."
msgstr "Gostaria de uma melhor integração com FixMyStreet <a href=\"http://www.mysociety.org/for-councils/fixmystreet/\"> Descobre FixMyStreet para os conselhos </a>."
-#: templates/web/fixmystreet/footer.html:17
-#: templates/web/stevenage/footer.html:18
+#: templates/web/fixmystreet/footer.html:20
msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>."
msgstr "Gostaria de contribuir para FixMyStreet Nosso código é open source e <a href=\"http://github.com/mysociety/fixmystreet\"> disponível no GitHub </a>."
@@ -4197,7 +3967,6 @@ msgstr "Gostaria de receber um questionário em 4 semanas, lembrando que você v
#: templates/web/default/report/new/notes.html:8
#: templates/web/fixmybarangay/report/new/notes.html:8
#: templates/web/fixmystreet/report/new/notes.html:8
-#: templates/web/oxfordshire/report/new/notes.html:7
msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
msgstr "Escrever a mensagem inteiramente em letras maiúsculas torna difícil de ler, assim como a falta de pontuação."
@@ -4227,26 +3996,24 @@ msgstr "Ano"
msgid "Yes"
msgstr "Sim"
-#: templates/web/bromley/report/display.html:157
-#: templates/web/bromley/report/new/fill_in_details_form.html:198
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:161
#: templates/web/fixmystreet/report/update-form.html:89
msgid "Yes I have a password"
msgstr "Sim, tenho uma password"
#: templates/web/default/contact/index.html:37
-#: templates/web/fixmystreet/contact/index.html:50
+#: templates/web/fixmystreet/contact/index.html:54
msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:"
msgstr "Você está reportando o seguinte relatório de problema por ser abusiva, contendo informações pessoais, ou similar:"
#: templates/web/default/contact/index.html:15
-#: templates/web/fixmystreet/contact/index.html:28
+#: templates/web/fixmystreet/contact/index.html:32
msgid "You are reporting the following update for being abusive, containing personal information, or similar:"
msgstr "Você está reportando a seguinte atualização por ser abusiva, contendo informações pessoais, ou similar:"
-#: templates/web/default/tokens/confirm_problem.html:19
+#: templates/web/default/tokens/confirm_problem.html:20
#: templates/web/default/tokens/confirm_problem.html:21
-#: templates/web/zurich/tokens/confirm_problem.html:5
+#: templates/web/zurich/tokens/confirm_problem.html:6
#: templates/web/zurich/tokens/confirm_problem.html:8
msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
msgstr "Você pode <a href=\"%s%s\"> ver o problema neste site </a>."
@@ -4255,6 +4022,10 @@ msgstr "Você pode <a href=\"%s%s\"> ver o problema neste site </a>."
msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
msgstr ""
+#: templates/web/fixmystreet/contact/index.html:118
+msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
+msgstr ""
+
#: templates/web/default/admin/flagged.html:5
msgid ""
"You can flag any report or user by editing them, and they will be listed on this page.\n"
@@ -4262,9 +4033,9 @@ msgid ""
" reports in the past."
msgstr ""
-#: templates/web/default/report/new/councils_text_none.html:11
-#: templates/web/default/report/new/councils_text_none.html:13
-#: templates/web/default/report/new/councils_text_some.html:20
+#: templates/web/default/report/new/councils_text_none.html:19
+#: templates/web/default/report/new/councils_text_none.html:20
+#: templates/web/default/report/new/councils_text_some.html:21
#: templates/web/default/report/new/councils_text_some.html:22
msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>."
msgstr "Você pode nos ajudar a encontrar um endereço de e-mail de contato para os problemas locais para %s e e-mail para nós em <a href='mailto:%s'>%s</a>."
@@ -4274,7 +4045,6 @@ msgid "You can mark a body as deleted if you do not want it to be active on the
msgstr ""
#: templates/web/default/js/translation_strings.html:36
-#: templates/web/oxfordshire/js/translation_strings.html:30
msgid "You declined; please fill in the box above"
msgstr "Você recusou, por favor preencha o quadro de cima"
@@ -4282,30 +4052,25 @@ msgstr "Você recusou, por favor preencha o quadro de cima"
msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
msgstr "Você já respondeu a este questionário. Se você tem uma pergunta, por favor <a href='%s'> entrar em contato </a>, ou <a href='%s'> ver o seu problema </a>. \n"
-#: templates/web/bromley/report/new/fill_in_details_form.html:97
#: templates/web/default/questionnaire/index.html:96
#: templates/web/default/report/new/fill_in_details_form.html:93
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:90
#: templates/web/fixmystreet/questionnaire/index.html:87
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:99
-#: templates/web/seesomething/report/new/fill_in_details_form.html:59
#: templates/web/zurich/report/new/fill_in_details_form.html:75
msgid "You have already attached a photo to this report, attaching another one will replace it."
msgstr "Você já anexou uma foto com este relatório, anexando outro irá substituí-lo."
-#: templates/web/bromley/report/display.html:108
#: templates/web/default/report/update-form.html:59
#: templates/web/fixmystreet/report/update-form.html:56
msgid "You have already attached a photo to this update, attaching another one will replace it."
msgstr "Você já anexou uma foto a esta atualização, anexando outra irá substituí-la."
#: templates/web/default/auth/sign_out.html:3
-#: templates/web/seesomething/auth/sign_out.html:3
#: templates/web/zurich/auth/sign_out.html:3
msgid "You have been signed out"
msgstr "Voce foi logado fora"
-#: templates/web/bromley/report/new/fill_in_details_form.html:25
#: templates/web/default/report/new/fill_in_details_form.html:7
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:7
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:28
@@ -4317,17 +4082,14 @@ msgstr "Você localizou o problema no ponto marcado com um pino verde no mapa. S
msgid "You have successfully confirmed your alert."
msgstr "Você confirmou com sucesso o seu alerta."
-#: templates/web/zurich/tokens/confirm_problem.html:5
#: templates/web/zurich/tokens/confirm_problem.html:6
msgid "You have successfully confirmed your email address."
msgstr "Você confirmou com sucesso o seu endereço de e-mail."
-#: templates/web/default/tokens/confirm_problem.html:14
#: templates/web/default/tokens/confirm_problem.html:15
msgid "You have successfully confirmed your problem"
msgstr "Você confirmou com sucesso o seu problema"
-#: templates/web/default/tokens/confirm_update.html:11
#: templates/web/default/tokens/confirm_update.html:12
msgid "You have successfully confirmed your update and you can now <a href=\"%s\">view it on the site</a>."
msgstr "Você confirmou com êxito a sua atualização e agora você pode <a href=\"%s\"> vê-lo no site </a>."
@@ -4340,11 +4102,15 @@ msgstr "Você criou com sucesso o seu alerta."
msgid "You have successfully deleted your alert."
msgstr "Você removeu com sucesso o seu alerta."
-#: perllib/FixMyStreet/App/Controller/Report/New.pm:754
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:762
#: perllib/FixMyStreet/App/Controller/Report/Update.pm:140
msgid "You have successfully signed in; please check and confirm your details are accurate:"
msgstr "Você se inscreveu com sucesso nos, por favor, verificar e confirmar os seus dados estão correctos:"
+#: templates/web/default/my/my.html:17 templates/web/fixmystreet/my/my.html:17
+msgid "You haven&rsquo;t created any reports yet. <a href=\"%s\">Report a problem now.</a>"
+msgstr ""
+
#: templates/web/default/email_sent.html:13
msgid "You must now click the link in the email we've just sent you."
msgstr "Agora você deve clicar no link do e-mail que acabamos de lhe enviar."
@@ -4371,13 +4137,10 @@ msgstr "Você realmente deseja reenviar o email?"
msgid "Your Reports"
msgstr "Seus relatorios"
-#: templates/web/bromley/report/display.html:41
-#: templates/web/bromley/report/display.html:43
-#: templates/web/bromley/report/new/fill_in_details_form.html:145
#: templates/web/fixmystreet/alert/_list.html:89
#: templates/web/fixmystreet/alert/updates.html:19
#: templates/web/fixmystreet/alert/updates.html:22
-#: templates/web/fixmystreet/contact/index.html:84
+#: templates/web/fixmystreet/contact/index.html:88
#: templates/web/fixmystreet/report/display.html:65
#: templates/web/fixmystreet/report/display.html:67
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:115
@@ -4386,14 +4149,8 @@ msgstr "Seus relatorios"
msgid "Your email"
msgstr "Seu e-mail"
-#: templates/web/seesomething/report/new/fill_in_details_form.html:81
-msgid "Your email (optional)"
-msgstr "Seu e-mail (opcional)"
-
-#: templates/web/bromley/report/display.html:132
#: templates/web/fixmystreet/auth/general.html:26
#: templates/web/fixmystreet/report/update-form.html:80
-#: templates/web/seesomething/auth/general.html:26
#: templates/web/zurich/auth/general.html:30
#: templates/web/zurich/auth/general.html:58
msgid "Your email address"
@@ -4411,28 +4168,15 @@ msgstr "O seu endereço de email:"
msgid "Your email:"
msgstr "Seu e-mail:"
-#: templates/web/bromley/report/display.html:195
-#: templates/web/bromley/report/new/fill_in_details_form.html:117
-#: templates/web/bromley/report/new/fill_in_details_form.html:164
-msgid "Your first name"
-msgstr "Nome"
-
-#: templates/web/fixmystreet/report/updates-sidebar-notes.html:5
+#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7
msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>"
msgstr "Suas informações só serão utilizadas de acordo com nossa <a href=\"/privacy\"> política de privacidade </a>"
-#: templates/web/bromley/report/display.html:201
-#: templates/web/bromley/report/new/fill_in_details_form.html:123
-#: templates/web/bromley/report/new/fill_in_details_form.html:170
-msgid "Your last name"
-msgstr "Apelido"
-
#: templates/web/fixmystreet/auth/general.html:57
-#: templates/web/fixmystreet/contact/index.html:77
+#: templates/web/fixmystreet/contact/index.html:81
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:124
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:192
#: templates/web/fixmystreet/report/update-form.html:140
-#: templates/web/seesomething/report/new/fill_in_details_form.html:79
#: templates/web/zurich/auth/general.html:61
#: templates/web/zurich/report/new/fill_in_details_form.html:104
msgid "Your name"
@@ -4446,12 +4190,9 @@ msgstr "Nome"
msgid "Your name:"
msgstr "Nome"
-#: templates/web/bromley/report/display.html:162
-#: templates/web/bromley/report/new/fill_in_details_form.html:203
#: templates/web/fixmystreet/auth/general.html:41
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:166
#: templates/web/fixmystreet/report/update-form.html:94
-#: templates/web/seesomething/auth/general.html:30
#: templates/web/zurich/auth/general.html:34
msgid "Your password"
msgstr "Password"
@@ -4460,11 +4201,8 @@ msgstr "Password"
msgid "Your password has been changed"
msgstr "Sua password foi alterada"
-#: templates/web/bromley/report/new/fill_in_details_form.html:137
-#: templates/web/bromley/report/new/fill_in_details_form.html:184
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:139
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:206
-#: templates/web/seesomething/report/new/fill_in_details_form.html:90
#: templates/web/zurich/report/new/fill_in_details_form.html:110
msgid "Your phone number"
msgstr "Telefone "
@@ -4477,19 +4215,13 @@ msgstr "Seu relatório"
msgid "Your report has been created and will shortly be sent."
msgstr "Seu relatório foi criado e será enviado em breve."
-#: templates/web/barnet/footer.html:18 templates/web/bromley/footer.html:19
-#: templates/web/bromley/header.html:75 templates/web/default/footer.html:9
-#: templates/web/fiksgatami/footer.html:6
+#: templates/web/default/footer.html:9 templates/web/fiksgatami/footer.html:6
#: templates/web/fiksgatami/nn/footer.html:6
-#: templates/web/fixmindelo/footer.html:39
-#: templates/web/fixmystreet/footer.html:46
-#: templates/web/oxfordshire/footer.html:21
-#: templates/web/oxfordshire/header.html:63
-#: templates/web/reading/footer.html:7 templates/web/stevenage/footer.html:41
+#: templates/web/fixmystreet/footer.html:49
msgid "Your reports"
msgstr "Seus relatórios"
-#: templates/web/default/my/my.html:45 templates/web/fixmystreet/my/my.html:49
+#: templates/web/default/my/my.html:50 templates/web/fixmystreet/my/my.html:56
msgid "Your updates"
msgstr "Suas atualizações"
@@ -4506,7 +4238,7 @@ msgstr "por %s"
msgid "council"
msgstr "conselho"
-#: perllib/FixMyStreet/DB/Result/Problem.pm:649
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
msgid "council ref:&nbsp;%s"
msgstr "conselho ref:%s"
@@ -4518,27 +4250,24 @@ msgstr "não usar o mapa"
#: templates/web/default/alert/index.html:33
#: templates/web/fixmystreet/around/postcode_form.html:20
-#: templates/web/seesomething/around/postcode_form.html:9
msgid "e.g. ‘%s’ or ‘%s’"
msgstr "por exemplo '%s' ou '%s'"
#: templates/web/default/admin/flagged.html:51
-#, fuzzy
msgid "edit user"
-msgstr "Adicionar user"
+msgstr ""
#: templates/web/default/admin/index.html:23
#: templates/web/zurich/admin/index.html:5
msgid "from %d different users"
msgstr "e %d usuários diferentes"
-#: templates/web/bromley/report/_item.html:12
-#: templates/web/fixmystreet/report/_item.html:12
+#: templates/web/fixmystreet/report/_item.html:17
#: templates/web/zurich/report/_item.html:16
msgid "last updated %s"
msgstr "Última atualizada %s"
-#: perllib/Utils.pm:263
+#: perllib/Utils.pm:265
msgid "less than a minute"
msgstr "menos de um minuto"
@@ -4596,21 +4325,20 @@ msgid "or"
msgstr "ou"
#: templates/web/default/js/translation_strings.html:27
-#: templates/web/oxfordshire/js/translation_strings.html:21
msgid "or locate me automatically"
msgstr "ou localizár-me automaticamente"
-#: templates/web/default/admin/report_edit.html:24
+#: templates/web/default/admin/report_edit.html:25
#: templates/web/default/admin/report_edit.html:26
-#: templates/web/zurich/admin/report_edit-sdm.html:30
+#: templates/web/zurich/admin/report_edit-sdm.html:31
#: templates/web/zurich/admin/report_edit-sdm.html:32
-#: templates/web/zurich/admin/report_edit-sdm.html:39
+#: templates/web/zurich/admin/report_edit-sdm.html:40
#: templates/web/zurich/admin/report_edit-sdm.html:41
-#: templates/web/zurich/admin/report_edit.html:30
+#: templates/web/zurich/admin/report_edit.html:31
#: templates/web/zurich/admin/report_edit.html:32
-#: templates/web/zurich/admin/report_edit.html:41
+#: templates/web/zurich/admin/report_edit.html:42
#: templates/web/zurich/admin/report_edit.html:43
-#: templates/web/zurich/admin/report_edit.html:53
+#: templates/web/zurich/admin/report_edit.html:54
#: templates/web/zurich/admin/report_edit.html:55
msgid "originally entered: &ldquo;%s&rdquo;"
msgstr "originalmente introduzido: \"%s\""
@@ -4624,23 +4352,17 @@ msgstr "outras áreas:"
msgid "reopened"
msgstr "reaberto"
-#: templates/web/barnet/header.html:71 templates/web/bromley/header.html:100
-#: templates/web/bromley/header.html:65
#: templates/web/fixmybarangay/header.html:67
-#: templates/web/fixmystreet/header.html:51
-#: templates/web/oxfordshire/header.html:112
-#: templates/web/oxfordshire/header.html:48
-#: templates/web/stevenage/header.html:98 templates/web/zurich/footer.html:12
+#: templates/web/fixmystreet/header.html:54
+#: templates/web/zurich/footer.html:12
msgid "sign out"
msgstr "sair"
-#: templates/web/bromley/report/new/fill_in_details_form.html:4
-#: templates/web/bromley/report/new/fill_in_details_form.html:7
-#: templates/web/default/report/new/fill_in_details_form.html:11
+#: templates/web/default/report/new/fill_in_details_form.html:12
#: templates/web/default/report/new/fill_in_details_form.html:14
-#: templates/web/emptyhomes/report/new/fill_in_details_form.html:11
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:12
#: templates/web/emptyhomes/report/new/fill_in_details_form.html:14
-#: templates/web/fixmystreet/report/new/fill_in_details_form.html:6
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:7
#: templates/web/fixmystreet/report/new/fill_in_details_form.html:9
msgid "the local council"
msgstr "o conselho local"
@@ -4650,11 +4372,11 @@ msgstr "o conselho local"
msgid "there is no pin shown as the user did not use the map"
msgstr "não há nenhum fix pin para o usuario usar no mapa"
-#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:362
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:370
msgid "this type of local problem"
msgstr "este tipo de problema local"
-#: perllib/Utils.pm:235
+#: perllib/Utils.pm:237
msgid "today"
msgstr "hoje"
@@ -4684,7 +4406,7 @@ msgid_plural "<big>%s</big> reports recently"
msgstr[0] "<big>%s</big> Relatorio recentemente"
msgstr[1] "<big>%s</big> Relatorios recentemente"
-#: perllib/Utils.pm:282
+#: perllib/Utils.pm:284
#, perl-format
msgid "%d hour"
msgid_plural "%d hours"
@@ -4698,7 +4420,7 @@ msgid_plural "%d supporters"
msgstr[0] "%d suppoter"
msgstr[1] "%d supporters"
-#: perllib/Utils.pm:284
+#: perllib/Utils.pm:286
#, perl-format
msgid "%d minute"
msgid_plural "%d minutes"
@@ -4719,7 +4441,7 @@ msgid_plural "We do not yet have details for the councils that cover this locati
msgstr[0] "Nós ainda não temos detalhes para o conselho, que abrange este local."
msgstr[1] "Nós ainda não temos detalhes para o conselho, que abrange este local."
-#: perllib/Utils.pm:278
+#: perllib/Utils.pm:280
#, perl-format
msgid "%d week"
msgid_plural "%d weeks"
@@ -4740,6 +4462,13 @@ msgid_plural "<big>%s</big> fixed in past month"
msgstr[0] "<big>%s</big> fixado no mês passado"
msgstr[1] "<big>%s</big> fixado no mês passado"
+#: perllib/Utils.pm:282
+#, perl-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d dia"
+msgstr[1] "%d dias"
+
#: templates/web/default/report/new/councils_text_some.html:14
#, perl-format
msgid "We do <strong>not</strong> yet have details for the other council that covers this location."
@@ -4747,25 +4476,41 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils
msgstr[0] "Fazemos <strong> não </strong> ainda tem detalhes para os outros conselhos que cobrem este local."
msgstr[1] "Fazemos <strong> não </strong> ainda tem detalhes para os outros conselhos que cobrem este local."
-#: perllib/Utils.pm:280
-#, perl-format
-msgid "%d day"
-msgid_plural "%d days"
-msgstr[0] "%d dia"
-msgstr[1] "%d dias"
+#~ msgid "First Name"
+#~ msgstr "Primeiro Nome"
-#, fuzzy
-#~ msgid "The email field is required"
-#~ msgstr "Esta informação é necessária"
+#~ msgid "Incident Category"
+#~ msgstr "Categoria incidente"
+
+#~ msgid "Last Name"
+#~ msgstr "Ultimo Nome"
+
+#~ msgid "Name (optional)"
+#~ msgstr "Nome (opcional)"
+
+#~ msgid "Please choose a transport category"
+#~ msgstr "Por favor escolha uma categoria de transporte"
+
+#~ msgid "Please choose an incident category"
+#~ msgstr "Por favor escolha uma categoria incidente"
+
+#~ msgid "Please describe the exact location of the report. Example: “2 dumped mattresses outside Number 19 Stockwell Close”"
+#~ msgstr "Por favor, descreva a localização exata do relatório. Exemplo: \"2 postes iluminaçao partidos na rua lisboa\""
+
+#~ msgid "Please note that updates are not sent to the relevant department. 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 "Por favor, note que as atualizações não são enviadas para o departamento competente. Se você deixar seu nome será público. Suas informações só serão utilizadas de acordo com nossa <a href=\"/faq#privacy\"> política de privacidade </a>"
+
+#~ msgid "Providing a password is optional, but doing so will allow you to more easily report future problems, leave updates and manage your reports."
+#~ msgstr "Fornecer uma senha é opcional, mas isso vai permitir que você mais facilmente relatar problemas futuros, deixe as atualizações e gerenciar seus relatórios."
-#~ msgid "End Year:"
-#~ msgstr "Fim do ano:"
+#~ msgid "Transport Category"
+#~ msgstr "Categoria Transporte"
-#~ msgid "End month:"
-#~ msgstr "Fim do mês:"
+#~ msgid "Your email (optional)"
+#~ msgstr "Seu e-mail (opcional)"
-#~ msgid "Start Year:"
-#~ msgstr "Ano:"
+#~ msgid "Your first name"
+#~ msgstr "Nome"
-#~ msgid "Start month:"
-#~ msgstr "Mes:"
+#~ msgid "Your last name"
+#~ msgstr "Apelido"
diff --git a/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po
new file mode 100644
index 000000000..d06e1839e
--- /dev/null
+++ b/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po
@@ -0,0 +1,4392 @@
+# FixMyStreet original .po file, autogenerated by gettext-extract.
+# Copyright (C) 2011 UK Citizens Online Democracy
+# This file is distributed under the same license as the main FixMyStreet code.
+# Matthew Somerville <matthew@mysociety.org>, 2011-06-03.
+#
+# Translators:
+# fldrog <florin.botis@gmail.com>, 2014
+# rbilei <radu.bilei@gmail.com>, 2014
+# nistorbog <nistorbog@gmail.com>, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: fixmystreet\n"
+"Report-Msgid-Bugs-To: matthew@mysociety.org\n"
+"POT-Creation-Date: 2014-05-16 17:30+0100\n"
+"PO-Revision-Date: 2014-03-22 11:47+0000\n"
+"Last-Translator: rbilei <radu.bilei@gmail.com>\n"
+"Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/fixmystreet/language/ro_RO/)\n"
+"Language: ro_RO\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:604
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383
+msgid " and "
+msgstr "și"
+
+#: templates/web/default/tokens/confirm_problem.html:15
+#: templates/web/default/tokens/confirm_problem.html:17
+msgid " and <strong>we will now send it to the council</strong>"
+msgstr "și <strong> îl vom trimite către instituția abilitată"
+
+#: templates/web/default/report/new/councils_text_all.html:12
+#: templates/web/default/report/new/councils_text_all.html:19
+#: templates/web/default/report/new/councils_text_all.html:5
+#: templates/web/default/report/new/councils_text_none.html:19
+#: templates/web/default/report/new/councils_text_none.html:21
+#: templates/web/default/report/new/councils_text_some.html:21
+#: templates/web/default/report/new/councils_text_some.html:23
+#: templates/web/default/report/new/councils_text_some.html:5
+#: templates/web/emptyhomes/report/new/councils_text_all.html:3
+msgid " or "
+msgstr "sau"
+
+#: templates/web/default/admin/bodies.html:46
+msgid "%d addresses"
+msgstr "%d adrese"
+
+#: templates/web/default/admin/index.html:25
+msgid "%d confirmed alerts, %d unconfirmed"
+msgstr "%d alerte confirmate, %d neconfirmate"
+
+#: templates/web/default/admin/index.html:27
+#: templates/web/zurich/admin/index.html:6
+msgid "%d council contacts &ndash; %d confirmed, %d unconfirmed"
+msgstr "%d contacte &ndash; %d confirmate, %d neconfirmate"
+
+#: templates/web/default/admin/edit-league.html:12
+msgid "%d edits by %s"
+msgstr "%d modificări de %s"
+
+#: templates/web/default/admin/index.html:24
+msgid "%d live updates"
+msgstr "%d actualizări"
+
+#: templates/web/default/admin/index.html:26
+msgid "%d questionnaires sent &ndash; %d answered (%s%%)"
+msgstr ""
+
+#: templates/web/default/pagination.html:10
+msgid "%d to %d of %d"
+msgstr "%d - %d din %d"
+
+#: templates/web/default/reports/body.html:0
+#: templates/web/default/reports/body.html:22
+msgid "%s - Summary reports"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:653
+msgid "%s ref:&nbsp;%s"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:270 perllib/FixMyStreet/Cobrand/UK.pm:282
+msgid "%s ward, %s"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:540
+msgid "%s, reported at %s"
+msgstr "%s, raportat la %s"
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:297 perllib/FixMyStreet/Cobrand/UK.pm:309
+msgid "%s, within %s ward"
+msgstr ""
+
+#: templates/web/default/email_sent.html:29
+msgid "(Don't worry &mdash; we'll hang on to your alert while you're checking your email.)"
+msgstr "(Nu-ți fă griji &mdash; îți vom păstra alerta până îți verifici email-ul.)"
+
+#: templates/web/default/email_sent.html:25
+msgid "(Don't worry &mdash; we'll hang on to your problem report while you're checking your email.)"
+msgstr "(Nu-ți fă griji &mdash; îți vom păstra raportarea până îți verifici email-ul.)"
+
+#: templates/web/default/email_sent.html:27
+msgid "(Don't worry &mdash; we'll hang on to your update while you're checking your email.)"
+msgstr "(Nu-ți fă griji &mdash; îți vom păstra actualizarea până îți verifici email-ul.)"
+
+#: templates/web/default/admin/report_blocks.html:11
+#: templates/web/default/admin/users.html:29
+msgid "(Email in abuse table)"
+msgstr ""
+
+#: templates/web/default/alert/_list.html:20
+#: templates/web/fixmystreet/alert/_list.html:24
+msgid "(a default distance which covers roughly 200,000 people)"
+msgstr "(o distanță implicită ce acoperă în jur de 200 000 de locuitori)"
+
+#: templates/web/default/alert/_list.html:25
+#: templates/web/fixmystreet/alert/_list.html:28
+msgid "(alternatively the RSS feed can be customised, within"
+msgstr ""
+
+#: templates/web/default/around/around_map_list_items.html:12
+#: templates/web/default/around/on_map_list_items.html:9
+#: templates/web/fixmystreet/report/_item.html:27
+#: templates/web/zurich/report/_item.html:21
+msgid "(closed)"
+msgstr "(închis)"
+
+#: templates/web/default/around/around_map_list_items.html:10
+#: templates/web/default/around/on_map_list_items.html:7
+#: templates/web/fixmystreet/report/_item.html:25
+#: templates/web/zurich/report/_item.html:19
+msgid "(fixed)"
+msgstr "(rezolvat)"
+
+#: templates/web/default/index.html:12 templates/web/default/index.html:9
+#: templates/web/fixmystreet/around/intro.html:2
+msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)"
+msgstr ""
+
+#: templates/web/default/reports/_list-entry.html:4
+#: templates/web/fixmystreet/report/_item.html:21
+msgid "(not sent to council)"
+msgstr "(netrimis)"
+
+#: templates/web/default/report/new/fill_in_details_form.html:217
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:140
+#: templates/web/zurich/report/new/fill_in_details_form.html:100
+msgid "(optional)"
+msgstr "(opțional)"
+
+#: templates/web/default/reports/_list-entry.html:2
+#: templates/web/fixmystreet/report/_item.html:20
+msgid "(sent to both)"
+msgstr ""
+
+#: templates/web/default/report/new/fill_in_details_form.html:211
+msgid "(we never show your email address or phone number)"
+msgstr "(nu afișăm niciodată adresa ta de email sau numărul de telefon)"
+
+#: templates/web/default/report/update-form.html:158
+msgid "(we never show your email)"
+msgstr "(nu afișăm niciodată adresa ta de email)"
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:635
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:662
+#: perllib/FixMyStreet/DB/Result/Problem.pm:379
+msgid "-- Pick a category --"
+msgstr "-- Alege o categorie --"
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:618
+#: perllib/FixMyStreet/DB/Result/Problem.pm:385
+msgid "-- Pick a property type --"
+msgstr "-- Alege un tip de proprietate --"
+
+#: templates/web/emptyhomes/front/stats.html:5
+msgid "<big>%s</big> reports"
+msgstr "<big>%s</big> raportări"
+
+#: templates/web/default/admin/body-form.html:42
+#: templates/web/default/admin/body-form.html:43
+msgid ""
+"<code>MAPIT_URL</code> is set (<code>%s</code>) but no <code>MAPIT_TYPES</code>.<br>\n"
+" This is probably why \"area covered\" is empty (below).<br>\n"
+" Maybe add some <code>MAPIT_TYPES</code> to your config file?"
+msgstr ""
+
+#: templates/web/default/questionnaire/completed.html:20
+msgid "<p style=\"font-size:150%\">Thank you very much for filling in our questionnaire; glad to hear it&rsquo;s been fixed.</p>"
+msgstr ""
+
+#: templates/web/fiksgatami/questionnaire/completed-open.html:1
+msgid ""
+"<p style=\"font-size:150%\">We&rsquo;re sorry to hear that. We have two\n"
+"suggestions: why not try <a href=\"http://www.norge.no/styresmakter/\">writing\n"
+"direct to your councillor(s)</a> or, if it&rsquo;s a problem that could be\n"
+"fixed by local people working together, why not\n"
+"<a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n"
+"</p>"
+msgstr ""
+
+#: templates/web/fixmystreet/questionnaire/completed-open.html:25
+msgid ""
+"<p style=\"font-size:150%\">We&rsquo;re sorry to hear that. We have two\n"
+"suggestions: why not try <a href=\"http://www.writetothem.com/\">writing direct\n"
+"to your councillor(s)</a> or, if it&rsquo;s a problem that could be fixed by\n"
+"local people working together, why not\n"
+"<a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n"
+"</p>"
+msgstr ""
+
+#: templates/web/default/questionnaire/completed-open.html:6
+msgid ""
+"<p style=\"font-size:150%\">We&rsquo;re sorry to hear that. We have two\n"
+"suggestions: why not try writing to your local representative or, if it&rsquo;s\n"
+"a problem that could be fixed by local people working together, why not\n"
+"<a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n"
+"</p>"
+msgstr ""
+
+#: templates/web/default/questionnaire/index.html:35
+msgid ""
+"<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"
+"time to say so. We think it&rsquo;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 ""
+
+#: templates/web/default/questionnaire/index.html:26
+msgid ""
+"<p>Getting empty homes back into use can be difficult. You shouldn&rsquo;t expect\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"
+"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"
+msgstr ""
+
+#: templates/web/default/questionnaire/completed.html:9
+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"
+"site and leave an update.</p>"
+msgstr ""
+
+#: templates/web/default/around/_report_banner.html:4
+#: templates/web/default/around/_report_banner.html:5
+msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>"
+msgstr ""
+
+#: templates/web/default/admin/index.html:22
+#: templates/web/zurich/admin/index.html:4
+msgid "<strong>%d</strong> live problems"
+msgstr ""
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:183
+msgid "<strong>No</strong> Let me confirm my report by email"
+msgstr ""
+
+#: templates/web/fixmystreet/report/update-form.html:110
+msgid "<strong>No</strong> Let me confirm my update by email"
+msgstr ""
+
+#: templates/web/fixmystreet/auth/general.html:50
+#: templates/web/zurich/auth/general.html:51
+msgid "<strong>No</strong> let me sign in by email"
+msgstr ""
+
+#: templates/web/default/auth/general.html:55
+msgid "<strong>No</strong>, I do not, let me sign in by email:"
+msgstr ""
+
+#: templates/web/default/report/new/fill_in_details_form.html:162
+msgid "<strong>No</strong>, let me confirm my report by email:"
+msgstr ""
+
+#: templates/web/default/report/update-form.html:117
+msgid "<strong>No</strong>, let me confirm my update by email:"
+msgstr ""
+
+#: templates/web/default/auth/general.html:37
+#: templates/web/default/report/new/fill_in_details_form.html:140
+#: templates/web/default/report/update-form.html:95
+#: templates/web/fixmystreet/auth/general.html:36
+#: templates/web/fixmystreet/auth/general.html:38
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:159
+#: templates/web/fixmystreet/report/update-form.html:87
+msgid "<strong>Yes</strong> I have a password"
+msgstr ""
+
+#: templates/web/default/static/about-en-gb.html:1
+#: templates/web/default/static/about-en-gb.html:3
+#: templates/web/emptyhomes/header.html:34
+#: templates/web/emptyhomes/static/about-cy.html:1
+#: templates/web/emptyhomes/static/about-cy.html:3
+#: templates/web/emptyhomes/static/about-en-gb.html:1
+#: templates/web/emptyhomes/static/about-en-gb.html:3
+msgid "About us"
+msgstr "Despre noi"
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:39
+#: templates/web/default/report/update-form.html:30
+#: templates/web/default/report/update-form.html:31
+#: templates/web/fixmystreet/report/update-form.html:28
+#: templates/web/fixmystreet/report/update-form.html:29
+msgid "Action Scheduled"
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:3
+#: templates/web/default/admin/body-form.html:4
+msgid ""
+"Add a <strong>body</strong> for each administrative body, such as a council or department\n"
+" to which problem reports can be sent. You can add one or more contacts (for different\n"
+" categories of problem) to each body."
+msgstr ""
+
+#: templates/web/default/admin/body.html:45
+msgid "Add a contact using the form below."
+msgstr ""
+
+#: templates/web/default/admin/bodies.html:65
+#: templates/web/default/admin/bodies.html:70
+#: templates/web/default/admin/body-form.html:233
+#: templates/web/zurich/admin/body-form.html:51
+msgid "Add body"
+msgstr ""
+
+#: templates/web/default/admin/body.html:88
+#: templates/web/zurich/admin/body.html:30
+msgid "Add new category"
+msgstr "Adaugă o categorie nouă"
+
+#: templates/web/default/admin/users.html:45
+msgid "Add user"
+msgstr "Adaugă utilizator"
+
+#: templates/web/default/my/my.html:61 templates/web/fixmystreet/my/my.html:67
+msgid "Added %s"
+msgstr ""
+
+#: templates/web/default/auth/change_password.html:29
+msgid "Again:"
+msgstr ""
+
+#: templates/web/default/admin/timeline.html:35
+msgid "Alert %d created for %s, type %s, parameters %s / %s"
+msgstr ""
+
+#: templates/web/default/admin/timeline.html:37
+msgid "Alert %d disabled (created %s)"
+msgstr ""
+
+#: templates/web/default/report/update-form.html:163
+#: templates/web/fixmystreet/report/update-form.html:148
+msgid "Alert me to future updates"
+msgstr ""
+
+#: templates/web/default/reports/index.html:3
+#: templates/web/fixmybarangay/reports/index.html:3
+#: templates/web/zurich/admin/stats.html:5
+#: templates/web/zurich/reports/index.html:15
+msgid "All Reports"
+msgstr ""
+
+#: templates/web/default/footer.html:11
+#: templates/web/emptyhomes/header.html:32
+#: templates/web/fiksgatami/footer.html:7
+#: templates/web/fiksgatami/nn/footer.html:7
+#: templates/web/fixmybarangay/footer.html:20
+#: templates/web/fixmystreet/footer.html:51
+#: templates/web/zurich/admin/index-dm.html:12
+#: templates/web/zurich/admin/stats.html:13
+#: templates/web/zurich/footer.html:19
+#: templates/web/zurich/nav_over_content.html:6
+msgid "All reports"
+msgstr ""
+
+#: templates/web/default/admin/stats.html:5
+#: templates/web/zurich/admin/stats.html:8
+msgid "All reports between %s and %s"
+msgstr ""
+
+#: templates/web/default/report/new/councils_text_some.html:2
+msgid "All the information you provide here will be sent to"
+msgstr ""
+
+#: templates/web/default/report/new/councils_text_all.html:12
+#: templates/web/default/report/new/councils_text_all.html:13
+msgid "All the information you provide here will be sent to <strong>%s</strong> or <strong>Roads Service</strong>."
+msgstr ""
+
+#: templates/web/default/report/new/councils_text_all.html:5
+#: templates/web/default/report/new/councils_text_all.html:6
+msgid "All the information you provide here will be sent to <strong>%s</strong> or a relevant local body such as <strong>TfL</strong>, via the London Report-It system."
+msgstr ""
+
+#: templates/web/default/report/new/councils_text_all.html:19
+#: templates/web/default/report/new/councils_text_all.html:20
+#: templates/web/default/report/new/fill_in_details_form.html:12
+#: templates/web/default/report/new/fill_in_details_form.html:13
+#: templates/web/emptyhomes/report/new/councils_text_all.html:3
+#: templates/web/emptyhomes/report/new/councils_text_all.html:4
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:12
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:13
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:7
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:8
+msgid "All the information you provide here will be sent to <strong>%s</strong>."
+msgstr ""
+
+#: templates/web/default/questionnaire/index.html:60
+#: templates/web/fixmystreet/questionnaire/index.html:54
+msgid "An update marked this problem as fixed."
+msgstr ""
+
+#: templates/web/default/admin/list_updates.html:32
+#: templates/web/default/admin/problem_row.html:20
+msgid "Anonymous"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:62
+#: templates/web/default/admin/update_edit.html:23
+msgid "Anonymous:"
+msgstr ""
+
+#: templates/web/default/footer.html:26
+msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?"
+msgstr ""
+
+#: templates/web/fixmystreet/footer.html:19
+msgid "Are you a developer?"
+msgstr ""
+
+#: templates/web/fixmystreet/footer.html:23
+msgid "Are you from a council?"
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:69
+#: templates/web/zurich/admin/body-form.html:24
+msgid "Area covered"
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit.html:144
+#: templates/web/zurich/admin/stats.html:36
+msgid "Assign to different category:"
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit.html:153
+msgid "Assign to external body:"
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit.html:133
+#: templates/web/zurich/admin/report_edit.html:190
+msgid "Assign to subdivision:"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:163
+#: templates/web/zurich/report/updates.html:11
+msgid "Assigned to %s"
+msgstr ""
+
+#: templates/web/default/open311/index.html:86
+msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date."
+msgstr ""
+
+#: templates/web/default/open311/index.html:78
+msgid "At the moment only searching for and looking at reports work."
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:334
+#: templates/web/zurich/report/_item.html:11
+msgid "Awaiting moderation"
+msgstr ""
+
+#: templates/web/default/js/translation_strings.html:32
+msgid "Back"
+msgstr ""
+
+#: templates/web/default/admin/report_blocks.html:11
+msgid "Ban email address"
+msgstr ""
+
+#: templates/web/fixmybarangay/report/new/notes.html:7
+msgid "Be sure to choose the right category, because we use that to determine to whom the report is sent."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1185
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:297
+#: templates/web/default/admin/bodies.html:1
+#: templates/web/zurich/header.html:64
+msgid "Bodies"
+msgstr ""
+
+#: templates/web/default/admin/flagged.html:17
+#: templates/web/default/admin/reports.html:14
+#: templates/web/default/admin/users.html:17
+msgid "Body"
+msgstr ""
+
+#: templates/web/default/admin/user-form.html:32
+msgid "Body:"
+msgstr ""
+
+#: templates/web/fiksgatami/footer.html:16
+#: templates/web/fiksgatami/nn/footer.html:16
+msgid "Built by <a href=\"http://www.mysociety.org/\">mySociety</a> and maintained by <a href=\"http://www.nuug.no/\">NUUG</a>"
+msgstr ""
+
+#: templates/web/default/admin/stats.html:80
+msgid "By Date"
+msgstr ""
+
+#: templates/web/fixmystreet/around/_report_banner.html:10
+#: templates/web/fixmystreet/around/_report_banner.html:9
+msgid "Can't see the map? <a href='%s' rel='nofollow'>Skip this step</a>"
+msgstr ""
+
+#: templates/web/default/admin/bodies.html:20
+#: templates/web/default/admin/body.html:53
+#: templates/web/default/admin/index.html:44
+#: templates/web/default/report/new/category.html:10
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:74
+#: templates/web/zurich/admin/body.html:13
+#: templates/web/zurich/admin/index-dm.html:23
+#: templates/web/zurich/admin/index-sdm.html:21
+#: templates/web/zurich/admin/reports.html:13
+#: templates/web/zurich/admin/stats.html:50
+#: templates/web/zurich/report/new/fill_in_details_form.html:50
+msgid "Category"
+msgstr ""
+
+#: templates/web/default/admin/index.html:42
+msgid "Category fix rate for problems > 4 weeks old"
+msgstr ""
+
+#: templates/web/default/admin/body.html:109
+#: templates/web/default/admin/body_edit.html:23
+#: templates/web/default/admin/report_edit.html:61
+#: templates/web/default/report/new/fill_in_details_form.html:67
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:50
+#: templates/web/zurich/admin/body.html:36
+#: templates/web/zurich/admin/report_edit-sdm.html:45
+#: templates/web/zurich/admin/report_edit.html:143
+msgid "Category:"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:374
+msgid "Category: %s"
+msgstr ""
+
+#: templates/web/default/auth/change_password.html:1
+#: templates/web/default/auth/change_password.html:3
+#: templates/web/default/auth/change_password.html:33
+msgid "Change Password"
+msgstr ""
+
+#: templates/web/default/admin/body.html:131
+msgid ""
+"Check <strong>confirmed</strong> to indicate that this contact has been confirmed as correct.\n"
+" If you are not sure of the origin or validity of the contact, leave this unchecked."
+msgstr ""
+
+#: templates/web/default/admin/body.html:142
+msgid ""
+"Check <strong>deleted</strong> to remove the category from use. \n"
+" It will not appear as an available category in the drop-down menu on the report-a-problem page."
+msgstr ""
+
+#: templates/web/default/admin/body.html:162
+msgid ""
+"Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n"
+" <br>\n"
+" Normally, categories are not private.\n"
+" <br>\n"
+" This is suitable for issues that you want to allow users to report to the body, but for which there is no public\n"
+" interest in displaying the report. In the UK, we've used this for services like requesting an extra rubbish bin\n"
+" at a specific address."
+msgstr ""
+
+#: templates/web/default/admin/body.html:101
+msgid ""
+"Choose a <strong>category</strong> name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n"
+" to the body too. These will appear in the drop-down menu on the report-a-problem page."
+msgstr ""
+
+#: templates/web/default/admin/stats.html:65
+#: templates/web/default/admin/stats.html:71
+msgid "Click here or enter as dd/mm/yyyy"
+msgstr ""
+
+#: templates/web/default/js/translation_strings.html:47
+#: templates/web/fixmystreet/around/_report_banner.html:2
+msgid "Click map to report a problem"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:140
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:45
+#: templates/web/default/admin/report_edit.html:47
+#: templates/web/default/dashboard/index.html:142
+#: templates/web/default/dashboard/index.html:144
+#: templates/web/fixmystreet/report/banner.html:15
+#: templates/web/zurich/admin/header.html:10
+#: templates/web/zurich/admin/header.html:12
+#: templates/web/zurich/admin/header.html:2
+#: templates/web/zurich/admin/report_edit.html:100
+#: templates/web/zurich/admin/report_edit.html:98
+#: templates/web/zurich/admin/stats.html:31
+#: templates/web/zurich/report/banner.html:13
+msgid "Closed"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:748
+msgid "Closed by council"
+msgstr ""
+
+#: templates/web/default/my/my.html:37 templates/web/fixmystreet/my/my.html:43
+msgid "Closed reports"
+msgstr ""
+
+#: templates/web/default/admin/problem_row.html:38
+msgid "Closed:"
+msgstr ""
+
+#: templates/web/default/around/tabbed_lists.html:11
+#: templates/web/default/around/tabbed_lists.html:12
+msgid "Closest nearby problems <small>(within&nbsp;%skm)</small>"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:23
+#: templates/web/zurich/admin/report_edit-sdm.html:36
+#: templates/web/zurich/admin/report_edit.html:49
+msgid "Co-ordinates:"
+msgstr ""
+
+#: templates/web/default/admin/list_updates.html:10
+msgid "Cobrand"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:75
+#: templates/web/default/admin/update_edit.html:50
+msgid "Cobrand data:"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:74
+#: templates/web/default/admin/update_edit.html:49
+msgid "Cobrand:"
+msgstr ""
+
+#: templates/web/default/admin/config_page.html:1
+msgid "Configuration"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:421
+msgid "Configuration updated - contacts will be generated automatically later"
+msgstr ""
+
+#: templates/web/default/admin/body_edit.html:47
+msgid "Configure Endpoint"
+msgstr ""
+
+#: templates/web/default/admin/body.html:62
+msgid "Confirm"
+msgstr ""
+
+#: templates/web/default/auth/token.html:1
+msgid "Confirm account"
+msgstr ""
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:177
+#: templates/web/fixmystreet/report/update-form.html:105
+msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated."
+msgstr ""
+
+#: templates/web/default/questionnaire/creator_fixed.html:1
+#: templates/web/default/tokens/confirm_problem.html:1
+#: templates/web/default/tokens/confirm_problem.html:3
+#: templates/web/default/tokens/confirm_update.html:1
+#: templates/web/default/tokens/confirm_update.html:3
+#: templates/web/emptyhomes/tokens/confirm_problem.html:1
+#: templates/web/emptyhomes/tokens/confirm_problem.html:3
+#: templates/web/zurich/tokens/confirm_problem.html:1
+#: templates/web/zurich/tokens/confirm_problem.html:3
+msgid "Confirmation"
+msgstr ""
+
+#: templates/web/default/admin/body.html:137
+#: templates/web/default/admin/body.html:55
+#: templates/web/default/admin/body_edit.html:32
+#: templates/web/default/admin/body_edit.html:84
+#: templates/web/zurich/admin/stats.html:40
+msgid "Confirmed"
+msgstr ""
+
+#: templates/web/default/admin/stats.html:5
+msgid "Confirmed reports between %s and %s"
+msgstr ""
+
+#: templates/web/default/admin/list_updates.html:39
+#: templates/web/default/admin/problem_row.html:36
+#: templates/web/default/admin/report_edit.html:70
+msgid "Confirmed:"
+msgstr ""
+
+#: templates/web/fiksgatami/footer.html:10
+#: templates/web/fiksgatami/nn/footer.html:10
+msgid "Contact"
+msgstr ""
+
+#: templates/web/default/footer.html:24
+msgid "Contact FixMyStreet"
+msgstr ""
+
+#: templates/web/default/contact/index.html:1
+#: templates/web/default/contact/index.html:2
+#: templates/web/default/contact/submit.html:1
+#: templates/web/fixmystreet/contact/index.html:1
+#: templates/web/fixmystreet/contact/index.html:2
+msgid "Contact Us"
+msgstr ""
+
+#: templates/web/default/contact/index.html:6
+#: templates/web/default/contact/submit.html:3
+#: templates/web/fixmystreet/contact/index.html:22
+msgid "Contact the team"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1319
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1347
+msgid "Could not find user"
+msgstr ""
+
+#: templates/web/default/js/translation_strings.html:37
+msgid "Could not look up location"
+msgstr ""
+
+#: templates/web/default/admin/list_updates.html:9
+msgid "Council"
+msgstr ""
+
+#: templates/web/default/admin/body.html:1
+#: templates/web/default/admin/body_edit.html:1
+#: templates/web/zurich/admin/body.html:1
+msgid "Council contacts for %s"
+msgstr ""
+
+#: templates/web/default/admin/stats.html:84
+msgid "Council:"
+msgstr ""
+
+#: templates/web/default/admin/stats.html:12
+#: templates/web/default/admin/stats.html:32
+#: templates/web/zurich/admin/stats.html:45
+#: templates/web/zurich/admin/stats.html:50
+msgid "Count"
+msgstr ""
+
+#: templates/web/default/email_sent.html:1
+msgid "Create a report"
+msgstr ""
+
+#: templates/web/default/admin/body.html:179
+#: templates/web/zurich/admin/body.html:53
+msgid "Create category"
+msgstr ""
+
+#: templates/web/default/admin/problem_row.html:34
+#: templates/web/zurich/admin/list_updates.html:29
+#: templates/web/zurich/admin/list_updates.html:8
+msgid "Created"
+msgstr ""
+
+#: templates/web/default/admin/list_updates.html:38
+#: templates/web/default/admin/report_edit.html:69
+#: templates/web/default/admin/update_edit.html:51
+#: templates/web/zurich/admin/report_edit-sdm.html:50
+#: templates/web/zurich/admin/report_edit.html:64
+#: templates/web/zurich/admin/update_edit.html:29
+msgid "Created:"
+msgstr ""
+
+#: templates/web/default/admin/stats.html:31
+msgid "Current state"
+msgstr ""
+
+#: templates/web/default/admin/bodies.html:7
+#: templates/web/default/admin/index.html:5
+msgid "Currently no bodies have been created."
+msgstr ""
+
+#: templates/web/default/dashboard/index.html:6
+#: templates/web/default/dashboard/index.html:7
+msgid "Dashboard"
+msgstr ""
+
+#: templates/web/zurich/admin/stats.html:35
+msgid "Dealt with by subdivision within 5 working days"
+msgstr ""
+
+#: templates/web/default/admin/bodies.html:22
+#: templates/web/default/admin/body.html:148
+#: templates/web/default/admin/body.html:56
+#: templates/web/default/admin/body_edit.html:37
+#: templates/web/default/admin/body_edit.html:85
+msgid "Deleted"
+msgstr ""
+
+#: templates/web/zurich/admin/index-dm.html:22
+#: templates/web/zurich/admin/index-sdm.html:20
+#: templates/web/zurich/admin/reports.html:12
+msgid "Description"
+msgstr ""
+
+#: templates/web/default/js/translation_strings.html:34
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66
+#: templates/web/zurich/report/new/fill_in_details_form.html:42
+msgid "Details"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:20
+#: templates/web/default/report/new/fill_in_details_form.html:61
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:79
+#: templates/web/zurich/admin/report_edit-sdm.html:28
+#: templates/web/zurich/admin/report_edit.html:28
+#: templates/web/zurich/admin/report_edit.html:38
+msgid "Details:"
+msgstr ""
+
+#: templates/web/default/admin/body.html:57
+msgid "Devolved"
+msgstr ""
+
+#: templates/web/default/admin/edit-league.html:8
+msgid "Diligency prize league table"
+msgstr ""
+
+#: templates/web/fixmystreet/auth/general.html:30
+msgid "Do you have a FixMyBarangay password?"
+msgstr ""
+
+#: templates/web/default/auth/general.html:32
+#: templates/web/fixmystreet/auth/general.html:32
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:155
+#: templates/web/fixmystreet/report/update-form.html:84
+msgid "Do you have a FixMyStreet password?"
+msgstr ""
+
+#: templates/web/default/questionnaire/index.html:70
+#: templates/web/fixmystreet/questionnaire/index.html:64
+msgid "Don&rsquo;t know"
+msgstr ""
+
+#: templates/web/fixmystreet/contact/index.html:115
+msgid "Don't like forms?"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:47
+#: templates/web/default/report/update-form.html:30
+#: templates/web/default/report/update-form.html:32
+#: templates/web/fixmystreet/report/update-form.html:28
+#: templates/web/fixmystreet/report/update-form.html:30
+msgid "Duplicate"
+msgstr ""
+
+#: templates/web/default/admin/body.html:90
+msgid ""
+"Each contact for the body has a category, which is displayed to the public. \n"
+" Different categories <strong>can have the same contact</strong> (email address).\n"
+" This means you can add many categories even if you only have one contact for the body.\n"
+" "
+msgstr ""
+
+#: templates/web/default/admin/list_updates.html:42
+#: templates/web/default/admin/problem_row.html:41
+#: templates/web/default/admin/users.html:31
+#: templates/web/zurich/admin/problem_row.html:42
+msgid "Edit"
+msgstr ""
+
+#: templates/web/default/admin/body.html:189
+#: templates/web/zurich/admin/body.html:64
+msgid "Edit body details"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:1
+#: templates/web/zurich/admin/report_edit-sdm.html:2
+#: templates/web/zurich/admin/report_edit-sdm.html:4
+#: templates/web/zurich/admin/report_edit.html:2
+#: templates/web/zurich/admin/report_edit.html:5
+msgid "Editing problem %d"
+msgstr ""
+
+#: templates/web/default/admin/update_edit.html:1
+#: templates/web/zurich/admin/update_edit.html:1
+msgid "Editing update %d"
+msgstr ""
+
+#: templates/web/default/admin/user_edit.html:1
+msgid "Editing user %d"
+msgstr ""
+
+#: templates/web/default/admin/body_edit.html:86
+msgid "Editor"
+msgstr ""
+
+#: templates/web/default/admin/bodies.html:18
+#: templates/web/default/admin/body.html:54
+#: templates/web/default/admin/body_edit.html:83
+#: templates/web/default/admin/flagged.html:38
+#: templates/web/default/admin/users.html:16
+#: templates/web/fixmystreet/auth/general.html:20
+#: templates/web/fixmystreet/report/update-form.html:76
+#: templates/web/zurich/admin/body-form.html:9
+#: templates/web/zurich/admin/body.html:14
+#: templates/web/zurich/auth/general.html:24
+#: templates/web/zurich/auth/general.html:54
+msgid "Email"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1295
+msgid "Email added to abuse list"
+msgstr ""
+
+#: templates/web/default/admin/body.html:126
+msgid "Email address:"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1292
+msgid "Email already in abuse list"
+msgstr ""
+
+#: templates/web/default/around/_updates.html:5
+msgid "Email me new local problems"
+msgstr ""
+
+#: templates/web/default/report/display.html:34
+msgid "Email me updates"
+msgstr ""
+
+#: templates/web/default/admin/body_edit.html:26
+#: templates/web/default/admin/report_edit.html:67
+#: templates/web/default/admin/update_edit.html:33
+#: templates/web/default/admin/user-form.html:20
+#: templates/web/default/alert/updates.html:13
+#: templates/web/default/report/display.html:38
+#: templates/web/zurich/admin/body.html:41
+#: templates/web/zurich/admin/report_edit-sdm.html:47
+#: templates/web/zurich/admin/report_edit.html:60
+msgid "Email:"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:323
+msgid "Email: %s"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:620
+msgid "Empty flat or maisonette"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:619
+msgid "Empty house or bungalow"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:622
+msgid "Empty office or other commercial"
+msgstr ""
+
+#: templates/web/emptyhomes/report/new/form_heading.html:1
+msgid "Empty property details form"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:623
+msgid "Empty pub or bar"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:624
+msgid "Empty public building - school, hospital, etc."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:158
+#: templates/web/default/admin/body-form.html:159
+msgid ""
+"Enable <strong>Open311 update-sending</strong> if the endpoint will send and receive\n"
+" updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n"
+" For more information, see \n"
+" <a href='http://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:215
+#: templates/web/default/admin/body-form.html:216
+msgid ""
+"Enable this <strong>can be devolved</strong> setting if one or more contacts have a \n"
+" different endpoint (and send method) from the body's. For example, if reports for some categories of\n"
+" problem must be emailed, while others can be sent over Open311."
+msgstr ""
+
+#: templates/web/default/admin/stats.html:70
+msgid "End Date:"
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:126
+msgid "Endpoint"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:72
+msgid "Enter a Z&uuml;rich street name"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:18
+msgid "Enter a nearby UK postcode, or street name and area"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:25
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:37
+msgid "Enter a nearby postcode, or street name and area"
+msgstr ""
+
+#: templates/web/default/around/postcode_form.html:2
+#: templates/web/fixmystreet/around/postcode_form.html:11
+msgid "Enter a nearby street name and area"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:9
+msgid "Enter a nearby street name and area, postal code or district in Delhi"
+msgstr ""
+
+#: templates/web/default/auth/general.html:64
+#: templates/web/default/report/new/fill_in_details_form.html:169
+#: templates/web/default/report/update-form.html:124
+msgid "Enter a new password:"
+msgstr ""
+
+#: templates/web/fixmystreet/auth/general.html:61
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:211
+#: templates/web/fixmystreet/report/update-form.html:122
+#: templates/web/zurich/auth/general.html:65
+msgid "Enter a password"
+msgstr ""
+
+#: templates/web/default/index-steps.html:26
+msgid "Enter details of the problem"
+msgstr ""
+
+#: templates/web/default/auth/token.html:5
+#: templates/web/default/errors/generic.html:1
+#: templates/web/default/errors/generic.html:3
+#: templates/web/default/tokens/abuse.html:1
+#: templates/web/default/tokens/abuse.html:3
+#: templates/web/default/tokens/error.html:1
+#: templates/web/default/tokens/error.html:3
+msgid "Error"
+msgstr ""
+
+#: templates/web/default/admin/body.html:11
+#: templates/web/default/admin/body_edit.html:18
+msgid "Example postcode %s"
+msgstr ""
+
+#: templates/web/default/open311/index.html:96
+msgid "Examples:"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:76
+msgid "Extra data:"
+msgstr ""
+
+#: templates/web/default/contact/submit.html:15
+msgid "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>."
+msgstr ""
+
+#: templates/web/zurich/admin/index-dm.html:33
+#: templates/web/zurich/admin/index-sdm.html:30
+msgid "Filter report list"
+msgstr ""
+
+#: templates/web/emptyhomes/front/stats.html:6
+msgid "Find latest local and national news"
+msgstr ""
+
+#: templates/web/default/questionnaire/index.html:79
+#: templates/web/fixmystreet/questionnaire/index.html:73
+msgid "First time"
+msgstr ""
+
+#: templates/web/default/admin/body.html:37
+msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below."
+msgstr ""
+
+#: templates/web/fiksgatami/header.html:16
+#: templates/web/fiksgatami/nn/header.html:16
+msgid "Fix<span id=\"my\">My</span>Street"
+msgstr ""
+
+#: templates/web/default/header.html:24
+msgid "FixMyStreet"
+msgstr ""
+
+#: templates/web/default/admin/header.html:10
+msgid "FixMyStreet admin:"
+msgstr ""
+
+#: templates/web/default/alert/index.html:11
+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"
+"within a certain distance of a particular location."
+msgstr ""
+
+#: templates/web/default/alert/_list.html:71
+#: templates/web/fixmystreet/alert/_list.html:73
+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"
+"for the county council."
+msgstr ""
+
+#: templates/web/default/admin/index.html:44
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:41
+#: templates/web/default/admin/report_edit.html:42
+#: templates/web/default/dashboard/index.html:142
+#: templates/web/default/dashboard/index.html:144
+#: templates/web/default/report/update-form.html:30
+#: templates/web/default/report/update-form.html:34
+#: templates/web/fixmystreet/report/banner.html:12
+#: templates/web/fixmystreet/report/update-form.html:28
+#: templates/web/fixmystreet/report/update-form.html:32
+msgid "Fixed"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:43
+msgid "Fixed - Council"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:42
+msgid "Fixed - User"
+msgstr ""
+
+#: templates/web/default/my/my.html:32 templates/web/fixmystreet/my/my.html:38
+msgid "Fixed reports"
+msgstr ""
+
+#: templates/web/default/admin/problem_row.html:37
+msgid "Fixed:"
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:84
+#: templates/web/zurich/admin/body-form.html:36
+msgid "Flag as deleted"
+msgstr ""
+
+#: templates/web/default/admin/report_blocks.html:16
+msgid "Flag user"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1190
+#: templates/web/default/admin/users.html:19
+msgid "Flagged"
+msgstr ""
+
+#: templates/web/default/admin/flagged.html:1
+msgid "Flagged reports and users"
+msgstr ""
+
+#: templates/web/default/admin/user-form.html:45
+msgid "Flagged users are listed on the <a href='%s'>flagged</a> page."
+msgstr ""
+
+#: templates/web/default/admin/flagged.html:31
+msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention."
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:78
+#: templates/web/default/admin/user-form.html:51
+msgid "Flagged:"
+msgstr ""
+
+#: templates/web/default/reports/_ward-list.html:3
+#: templates/web/fixmystreet/reports/_ward-list.html:4
+msgid "Follow a ward link to view only reports within that ward."
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:30
+msgid "For council(s):"
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:65
+msgid "For more information, see <a href='http://code.fixmystreet.com/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>."
+msgstr ""
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:176
+#: templates/web/fixmystreet/report/update-form.html:104
+msgid "Forgotten your password?"
+msgstr ""
+
+#: templates/web/default/faq/faq-en-gb.html:1
+#: templates/web/emptyhomes/faq/faq-cy.html:1
+#: templates/web/emptyhomes/faq/faq-en-gb.html:1
+#: templates/web/fiksgatami/faq/faq-nb.html:1
+#: templates/web/fiksgatami/nn/faq/faq-nn.html:1
+#: templates/web/fixmybarangay/faq/faq-en-gb.html:1
+#: templates/web/fixmystreet/faq/faq-en-gb.html:1
+#: templates/web/fixmystreet/static/privacy.html:1
+msgid "Frequently Asked Questions"
+msgstr ""
+
+#: templates/web/default/open311/index.html:138
+msgid "GeoRSS on Google Maps"
+msgstr ""
+
+#: templates/web/fixmystreet/around/_updates.html:3
+#: templates/web/fixmystreet/report/display.html:38
+msgid "Get updates"
+msgstr ""
+
+#: templates/web/fixmystreet/reports/_rss.html:4
+#: templates/web/fixmystreet/reports/_rss.html:9
+msgid "Get updates of %s problems"
+msgstr ""
+
+#: templates/web/fixmystreet/reports/_rss.html:11
+#: templates/web/fixmystreet/reports/_rss.html:4
+msgid "Get updates of problems in this %s"
+msgstr ""
+
+#: templates/web/default/alert/_list.html:83
+#: templates/web/fixmybarangay/alert/_list.html:28
+#: templates/web/fixmystreet/alert/_list.html:82
+msgid "Give me an RSS feed"
+msgstr ""
+
+#: templates/web/default/alert/index.html:34
+#: templates/web/default/around/postcode_form.html:8
+#: templates/web/fixmystreet/around/postcode_form.html:21
+#: templates/web/zurich/admin/stats.html:26
+msgid "Go"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:77
+msgid "Going to send questionnaire?"
+msgstr ""
+
+#: templates/web/default/admin/index.html:32
+msgid "Graph of problem creation by status over time"
+msgstr ""
+
+#: templates/web/default/reports/index.html:8
+msgid "Greyed-out lines are councils that no longer exist."
+msgstr ""
+
+#: templates/web/default/questionnaire/index.html:61
+#: templates/web/fixmystreet/questionnaire/index.html:55
+msgid "Has this problem been fixed?"
+msgstr ""
+
+#: templates/web/default/questionnaire/index.html:74
+#: templates/web/fixmystreet/questionnaire/index.html:68
+msgid "Have you ever reported a problem to a council before, or is this your first time?"
+msgstr ""
+
+#: templates/web/default/footer.html:15
+#: templates/web/emptyhomes/header.html:33
+#: templates/web/fiksgatami/footer.html:9
+#: templates/web/fiksgatami/nn/footer.html:9
+#: templates/web/fixmybarangay/footer.html:24
+#: templates/web/fixmystreet/footer.html:55
+#: templates/web/zurich/faq/faq-de-ch.html:1
+#: templates/web/zurich/footer.html:21
+#: templates/web/zurich/nav_over_content.html:8
+msgid "Help"
+msgstr ""
+
+#: templates/web/default/alert/_list.html:6
+#: templates/web/fixmystreet/alert/_list.html:8
+msgid "Here are the types of local problem alerts for &lsquo;%s&rsquo;."
+msgstr ""
+
+#: templates/web/fixmybarangay/header.html:66
+#: templates/web/fixmystreet/header.html:53
+#: templates/web/zurich/footer.html:11
+msgid "Hi %s"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:50
+#: templates/web/default/admin/report_edit.html:51
+#: templates/web/default/admin/update_edit.html:28
+#: templates/web/zurich/admin/header.html:11
+#: templates/web/zurich/admin/header.html:2
+#: templates/web/zurich/admin/report_edit.html:89
+#: templates/web/zurich/admin/report_edit.html:93
+#: templates/web/zurich/admin/stats.html:32
+#: templates/web/zurich/admin/update_edit.html:18
+msgid "Hidden"
+msgstr ""
+
+#: templates/web/default/around/display_location.html:67
+msgid "Hide old"
+msgstr ""
+
+#: templates/web/default/around/display_location.html:62
+msgid "Hide pins"
+msgstr ""
+
+#: templates/web/default/admin/body_edit.html:79
+msgid "History"
+msgstr ""
+
+#: templates/web/default/js/translation_strings.html:31
+msgid "Home"
+msgstr ""
+
+#: templates/web/default/index-steps.html:1
+msgid "How to report a problem"
+msgstr ""
+
+#: templates/web/default/js/translation_strings.html:33
+msgid "How to send successful reports"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:733
+msgid "I am afraid you cannot confirm unconfirmed reports."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:89
+msgid "I'm afraid we couldn't locate your problem in the database.\n"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Tokens.pm:44
+msgid "I'm afraid we couldn't validate that token, as the report was made too long ago."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Tokens.pm:260
+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 ""
+
+#: templates/web/default/admin/flagged.html:14
+#: templates/web/default/admin/list_updates.html:6
+#: templates/web/default/admin/reports.html:11
+#: templates/web/zurich/admin/index-dm.html:21
+#: templates/web/zurich/admin/index-sdm.html:19
+#: templates/web/zurich/admin/list_updates.html:28
+#: templates/web/zurich/admin/list_updates.html:7
+#: templates/web/zurich/admin/reports.html:11
+msgid "ID"
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:24
+#: templates/web/default/admin/body-form.html:25
+msgid ""
+"Identify a <strong>parent</strong> if this body is itself part of another body.\n"
+" For basic installations, you don't need to join bodies in this way."
+msgstr ""
+
+#: templates/web/default/admin/body.html:104
+msgid ""
+"If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n"
+" the menu. Make sure you use the same category name in the bodies if you want this to happen."
+msgstr ""
+
+#: templates/web/default/email_sent.html:19
+msgid "If you do not, your alert will not be activated."
+msgstr ""
+
+#: templates/web/default/email_sent.html:15
+msgid "If you do not, your problem will not be posted."
+msgstr ""
+
+#: templates/web/default/email_sent.html:17
+msgid "If you do not, your update will not be posted."
+msgstr ""
+
+#: templates/web/default/report/new/councils_text_none.html:9
+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 ""
+
+#: templates/web/emptyhomes/report/new/councils_text_none.html:9
+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 ""
+
+#: templates/web/default/auth/token.html:22
+#: templates/web/default/email_sent.html:9
+msgid "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."
+msgstr ""
+
+#: templates/web/default/questionnaire/index.html:86
+#: templates/web/fixmystreet/questionnaire/index.html:77
+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 ""
+
+#: templates/web/default/admin/body.html:120
+msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:200
+#: templates/web/default/admin/body-form.html:201
+msgid ""
+"If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n"
+" its updates. Enable <strong>extended Open311 stauses</strong> if you want to allow extra states to be passed.\n"
+" Check that your cobrand supports this feature before switching it on."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:187
+#: templates/web/default/admin/body-form.html:188
+msgid ""
+"If you've enabled Open311 update-sending above, enable <strong>suppression of alerts</strong> \n"
+" if you do <strong>not</strong> want that user to be notified whenever these updates are created."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:173
+#: templates/web/default/admin/body-form.html:174
+msgid ""
+"If you've enabled Open311 update-sending above, you must identify which \n"
+" FixMyStreet <strong>user</strong> will be attributed as the creator of those updates\n"
+" when they are shown on the site. Enter the ID (number) of that user."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Contact.pm:116
+msgid "Illegal ID"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Alert.pm:100
+msgid "Illegal feed selection"
+msgstr ""
+
+#: templates/web/default/dashboard/index.html:142
+#: templates/web/default/dashboard/index.html:144
+#: templates/web/default/report/update-form.html:30
+#: templates/web/default/report/update-form.html:32
+#: templates/web/fixmystreet/report/update-form.html:28
+#: templates/web/fixmystreet/report/update-form.html:30
+msgid "In Progress"
+msgstr ""
+
+#: templates/web/default/admin/flagged.html:39
+msgid "In abuse table?"
+msgstr ""
+
+#: templates/web/default/open311/index.html:90
+msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)."
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:143
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:38
+#: templates/web/fixmystreet/report/banner.html:19
+#: templates/web/zurich/admin/header.html:2
+#: templates/web/zurich/admin/header.html:8
+#: templates/web/zurich/admin/report_edit.html:102
+#: templates/web/zurich/report/banner.html:15
+msgid "In progress"
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit.html:163
+msgid "Include reporter personal details"
+msgstr ""
+
+#: templates/web/default/admin/stats.html:76
+msgid "Include unconfirmed reports"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:354
+msgid "Incorrect has_photo value \"%s\""
+msgstr ""
+
+#: templates/web/zurich/admin/list_updates.html:3
+msgid "Internal notes"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:48
+msgid "Internal referral"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:339
+msgid "Invalid agency_responsible value %s"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1105
+msgid "Invalid end date"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:432
+msgid "Invalid format %s specified."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1101
+msgid "Invalid start date"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:37
+#: templates/web/default/dashboard/index.html:142
+#: templates/web/default/dashboard/index.html:143
+#: templates/web/default/report/update-form.html:30
+#: templates/web/default/report/update-form.html:31
+#: templates/web/fixmystreet/report/update-form.html:28
+#: templates/web/fixmystreet/report/update-form.html:29
+msgid "Investigating"
+msgstr ""
+
+#: templates/web/emptyhomes/tokens/confirm_problem.html:13
+#: templates/web/emptyhomes/tokens/confirm_problem.html:14
+msgid "It is worth noting however that the process can sometimes be slow, especially if the property is in very poor repair or the owner is unwilling to act. In most cases it can take six months or more before you can expect to see anything change and sometimes there may be considerable barries to a property being brought back into use. This doesn&rsquo;t mean the council isn&rsquo;t doing anything. We encourage councils to update the website so you can see what is happening. It may be a long process, but you reporting your concerns about this property to the council is a valuable first step."
+msgstr ""
+
+#: templates/web/fixmystreet/contact/blurb.html:8
+msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there."
+msgstr ""
+
+#: templates/web/default/auth/general.html:44
+#: templates/web/default/report/new/fill_in_details_form.html:149
+#: templates/web/default/report/update-form.html:104
+#: templates/web/fixmystreet/auth/general.html:46
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:172
+#: templates/web/fixmystreet/report/update-form.html:100
+#: templates/web/zurich/auth/general.html:40
+msgid "Keep me signed in on this computer"
+msgstr ""
+
+#: templates/web/default/admin/body.html:58
+#: templates/web/zurich/admin/body.html:15
+msgid "Last editor"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:72
+msgid "Last update:"
+msgstr ""
+
+#: templates/web/default/admin/problem_row.html:39
+msgid "Last&nbsp;update:"
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:222
+msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")."
+msgstr ""
+
+#: templates/web/default/admin/body.html:14
+#: templates/web/default/admin/body.html:16
+msgid "List all reported problems"
+msgstr ""
+
+#: templates/web/default/report/new/fill_in_details_form.html:68
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:51
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:75
+#: templates/web/zurich/report/new/fill_in_details_form.html:51
+msgid "Loading..."
+msgstr ""
+
+#: templates/web/default/alert/choose.html:1
+#: templates/web/default/alert/choose.html:3
+#: templates/web/default/alert/index.html:1
+#: templates/web/default/alert/index.html:3
+#: templates/web/default/alert/list.html:2
+#: templates/web/default/alert/list.html:5
+#: templates/web/default/alert/updates.html:1
+#: templates/web/default/tokens/confirm_alert.html:1
+#: templates/web/default/tokens/confirm_alert.html:3
+#: templates/web/emptyhomes/alert/index.html:1
+#: templates/web/emptyhomes/alert/index.html:3
+#: templates/web/fixmybarangay/alert/index.html:1
+#: templates/web/fixmybarangay/alert/index.html:3
+#: templates/web/fixmystreet/alert/updates.html:1
+msgid "Local RSS feeds and email alerts"
+msgstr ""
+
+#: templates/web/default/alert/list.html:13
+#: templates/web/default/alert/list.html:14
+#: templates/web/default/alert/list.html:2
+#: templates/web/default/alert/list.html:3
+msgid "Local RSS feeds and email alerts for ‘%s’"
+msgstr ""
+
+#: templates/web/default/footer.html:13 templates/web/fiksgatami/footer.html:8
+#: templates/web/fiksgatami/nn/footer.html:8
+#: templates/web/fixmybarangay/footer.html:22
+#: templates/web/fixmystreet/footer.html:53
+msgid "Local alerts"
+msgstr ""
+
+#: templates/web/default/index-steps.html:25
+msgid "Locate the problem on a map of the area"
+msgstr ""
+
+#: templates/web/default/js/translation_strings.html:43
+msgid "MAP"
+msgstr ""
+
+#: perllib/FixMyStreet/Map/OSM.pm:44
+msgid "Map &copy; <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> and contributors, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA</a>"
+msgstr ""
+
+#: templates/web/default/admin/user-form.html:43
+msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>."
+msgstr ""
+
+#: templates/web/fixmystreet/contact/index.html:103
+msgid "Message"
+msgstr ""
+
+#: templates/web/default/contact/index.html:92
+msgid "Message:"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Open311.pm:440
+msgid "Missing jurisdiction_id"
+msgstr ""
+
+#: templates/web/zurich/admin/stats.html:34
+msgid "Moderated by division within one working day"
+msgstr ""
+
+#: templates/web/default/admin/stats.html:11
+msgid "Month"
+msgstr ""
+
+#: templates/web/default/report/display.html:30
+msgid "More problems nearby"
+msgstr ""
+
+#: templates/web/default/admin/bodies.html:16
+#: templates/web/default/admin/body-form.html:18
+#: templates/web/default/admin/flagged.html:16
+#: templates/web/default/admin/flagged.html:37
+#: templates/web/default/admin/list_updates.html:7
+#: templates/web/default/admin/reports.html:13
+#: templates/web/default/admin/users.html:15
+#: templates/web/default/reports/index.html:15
+#: templates/web/emptyhomes/reports/index.html:9
+#: templates/web/fiksgatami/nn/reports/index.html:9
+#: templates/web/fiksgatami/reports/index.html:9
+#: templates/web/fixmybarangay/reports/index.html:15
+#: templates/web/fixmystreet/auth/general.html:56
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:120
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:187
+#: templates/web/fixmystreet/report/update-form.html:136
+#: templates/web/zurich/admin/body-form.html:4
+#: templates/web/zurich/auth/general.html:60
+#: templates/web/zurich/report/new/fill_in_details_form.html:100
+msgid "Name"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:66
+#: templates/web/default/admin/update_edit.html:32
+#: templates/web/default/admin/user-form.html:18
+#: templates/web/zurich/admin/report_edit-sdm.html:46
+#: templates/web/zurich/admin/report_edit.html:59
+#: templates/web/zurich/admin/stats.html:41
+msgid "Name:"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:322
+msgid "Name: %s"
+msgstr ""
+
+#: templates/web/fiksgatami/footer.html:3
+#: templates/web/fiksgatami/nn/footer.html:3
+msgid "Navigation"
+msgstr ""
+
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:188
+#: perllib/FixMyStreet/Geocode/OSM.pm:166
+msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:142
+msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:421
+#: perllib/FixMyStreet/Cobrand/Default.pm:461
+msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:297
+msgid ""
+"Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n"
+"\n"
+msgstr ""
+
+#: templates/web/default/email_sent.html:3
+msgid "Nearly Done! Now check your email..."
+msgstr ""
+
+#: templates/web/default/reports/index.html:16
+#: templates/web/fixmybarangay/reports/index.html:16
+msgid "New <br>problems"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:264
+msgid "New body added"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:376
+msgid "New category contact added"
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:58
+#: templates/web/zurich/admin/report_edit.html:84
+msgid "New internal note:"
+msgstr ""
+
+#: db/alert_types.pl:18 db/alert_types.pl:22
+msgid "New local problems on FixMyStreet"
+msgstr ""
+
+#: db/alert_types_eha.pl:12
+msgid "New local reports on reportemptyhomes.com"
+msgstr ""
+
+#: templates/web/emptyhomes/reports/index.html:10
+#: templates/web/fiksgatami/nn/reports/index.html:10
+#: templates/web/fiksgatami/reports/index.html:10
+msgid "New problems"
+msgstr ""
+
+#: db/alert_types.pl:38
+msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet"
+msgstr ""
+
+#: db/alert_types.pl:26 db/alert_types.pl:30
+msgid "New problems near {{POSTCODE}} on FixMyStreet"
+msgstr ""
+
+#: db/alert_types.pl:10
+msgid "New problems on FixMyStreet"
+msgstr ""
+
+#: db/alert_types.pl:34
+msgid "New problems to {{COUNCIL}} on FixMyStreet"
+msgstr ""
+
+#: db/alert_types.pl:42
+msgid "New problems within {{NAME}}'s boundary on FixMyStreet"
+msgstr ""
+
+#: templates/web/zurich/admin/index-sdm.html:4
+msgid "New reports"
+msgstr ""
+
+#: db/alert_types_eha.pl:23
+msgid "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com"
+msgstr ""
+
+#: db/alert_types_eha.pl:5
+msgid "New reports on reportemptyhomes.com"
+msgstr ""
+
+#: db/alert_types_eha.pl:16
+msgid "New reports on reportemptyhomes.com near {{POSTCODE}}"
+msgstr ""
+
+#: db/alert_types_eha.pl:19
+msgid "New reports to {{COUNCIL}} on reportemptyhomes.com"
+msgstr ""
+
+#: db/alert_types_eha.pl:27
+msgid "New reports within {{NAME}}'s boundary on reportemptyhomes.com"
+msgstr ""
+
+#: templates/web/default/admin/questionnaire.html:24
+msgid "New state"
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:61
+msgid "New update:"
+msgstr ""
+
+#: templates/web/fiksgatami/front/news.html:9
+#: templates/web/fiksgatami/nn/front/news.html:9
+#: templates/web/fixmystreet/front/news.html:8
+msgid "New!"
+msgstr ""
+
+#: templates/web/default/pagination.html:13
+msgid "Next"
+msgstr ""
+
+#: templates/web/default/admin/body.html:68
+#: templates/web/default/admin/body.html:69
+#: templates/web/default/admin/body.html:70
+#: templates/web/default/admin/body_edit.html:4
+#: templates/web/default/admin/list_updates.html:32
+#: templates/web/default/admin/list_updates.html:34
+#: templates/web/default/admin/list_updates.html:35
+#: templates/web/default/admin/problem_row.html:20
+#: templates/web/default/admin/report_edit.html:64
+#: templates/web/default/admin/report_edit.html:77
+#: templates/web/default/admin/update_edit.html:25
+#: templates/web/default/questionnaire/creator_fixed.html:16
+#: templates/web/default/questionnaire/index.html:111
+#: templates/web/default/questionnaire/index.html:68
+#: templates/web/fixmystreet/questionnaire/index.html:101
+#: templates/web/fixmystreet/questionnaire/index.html:62
+msgid "No"
+msgstr ""
+
+#: templates/web/default/admin/user-form.html:33
+msgid "No body"
+msgstr ""
+
+#: templates/web/default/admin/stats.html:85
+msgid "No council"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:362
+msgid "No council selected"
+msgstr ""
+
+#: templates/web/default/admin/edit-league.html:17
+msgid "No edits have yet been made."
+msgstr ""
+
+#: templates/web/default/admin/flagged.html:25
+msgid "No flagged problems found."
+msgstr ""
+
+#: templates/web/default/admin/flagged.html:58
+msgid "No flagged users found."
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:68
+msgid "No further updates"
+msgstr ""
+
+#: templates/web/default/around/around_map_list_items.html:17
+#: templates/web/fixmystreet/around/around_map_list_items.html:8
+msgid "No problems found."
+msgstr ""
+
+#: templates/web/default/around/on_map_list_items.html:14
+#: templates/web/fixmystreet/around/on_map_list_items.html:6
+msgid "No problems have been reported yet."
+msgstr ""
+
+#: templates/web/default/js/translation_strings.html:38
+msgid "No result returned"
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:60
+#: templates/web/default/admin/body-form.html:61
+msgid ""
+"No specific areas are currently available, because the <code>MAPIT_URL</code> in\n"
+" your config file is not pointing to a live MapIt service."
+msgstr ""
+
+#: templates/web/default/report/_support.html:3
+#: templates/web/default/report/_support.html:4
+msgid "No supporters"
+msgstr ""
+
+#: templates/web/default/admin/body.html:73
+msgid "Non Public"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:30
+#: templates/web/zurich/admin/report_edit-sdm.html:49
+#: templates/web/zurich/admin/report_edit.html:63
+msgid "None"
+msgstr ""
+
+#: templates/web/default/admin/user-form.html:24
+#: templates/web/default/admin/user-form.html:25
+msgid ""
+"Normal (public) users should not be associated with any <strong>body</strong>.<br>\n"
+" Authorised staff users can be associated with the body they represent.<br>\n"
+" Depending on the implementation, staff users may have access to the dashboard (summary of\n"
+" activity across their body), the ability to hide reports or set special report statuses."
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:46
+#: templates/web/default/report/update-form.html:30
+#: templates/web/default/report/update-form.html:33
+#: templates/web/fixmystreet/report/update-form.html:28
+#: templates/web/fixmystreet/report/update-form.html:31
+msgid "Not Responsible"
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit-sdm.html:21
+msgid "Not for my subdivision"
+msgstr ""
+
+#: templates/web/default/admin/questionnaire.html:6
+msgid "Not reported before"
+msgstr ""
+
+#: templates/web/default/report/_main.html:10
+msgid "Not reported to council"
+msgstr ""
+
+#: templates/web/default/admin/body.html:59
+#: templates/web/default/admin/body_edit.html:87
+#: templates/web/zurich/admin/body.html:16
+msgid "Note"
+msgstr ""
+
+#: templates/web/default/admin/stats.html:51
+msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little"
+msgstr ""
+
+#: templates/web/default/admin/body.html:157
+#: templates/web/default/admin/body_edit.html:44
+#: templates/web/zurich/admin/body.html:47
+msgid "Note:"
+msgstr ""
+
+#: templates/web/default/open311/index.html:75
+msgid "Note: <strong>%s</strong>"
+msgstr ""
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:154
+msgid "Now to submit your report&hellip;"
+msgstr ""
+
+#: templates/web/default/report/new/fill_in_details_form.html:131
+msgid "Now to submit your report&hellip; do you have a FixMyStreet password?"
+msgstr ""
+
+#: templates/web/fixmystreet/report/update-form.html:83
+msgid "Now to submit your update&hellip;"
+msgstr ""
+
+#: templates/web/default/report/update-form.html:86
+msgid "Now to submit your update&hellip; do you have a FixMyStreet password?"
+msgstr ""
+
+#: templates/web/default/js/translation_strings.html:42
+msgid "OK"
+msgstr ""
+
+#: templates/web/default/report/display.html:24
+#: templates/web/default/report/update.html:16
+msgid "Offensive? Unsuitable? Tell us"
+msgstr ""
+
+#: templates/web/default/reports/index.html:18
+#: templates/web/fixmybarangay/reports/index.html:18
+msgid "Old / unknown <br>problems"
+msgstr ""
+
+#: templates/web/fiksgatami/nn/reports/index.html:12
+#: templates/web/fiksgatami/reports/index.html:12
+msgid "Old problems,<br>state unknown"
+msgstr ""
+
+#: templates/web/default/admin/questionnaire.html:24
+msgid "Old state"
+msgstr ""
+
+#: templates/web/default/reports/index.html:20
+#: templates/web/fixmybarangay/reports/index.html:20
+msgid "Older <br>fixed"
+msgstr ""
+
+#: templates/web/default/reports/index.html:17
+#: templates/web/fixmybarangay/reports/index.html:17
+msgid "Older <br>problems"
+msgstr ""
+
+#: templates/web/fiksgatami/nn/reports/index.html:14
+#: templates/web/fiksgatami/reports/index.html:14
+msgid "Older fixed"
+msgstr ""
+
+#: templates/web/emptyhomes/reports/index.html:11
+#: templates/web/fiksgatami/nn/reports/index.html:11
+#: templates/web/fiksgatami/reports/index.html:11
+msgid "Older problems"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:137
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:36
+#: templates/web/default/admin/report_edit.html:37
+#: templates/web/default/admin/update_edit.html:28
+#: templates/web/default/dashboard/index.html:142
+#: templates/web/default/report/update-form.html:30
+#: templates/web/fixmystreet/report/update-form.html:28
+#: templates/web/zurich/admin/header.html:2
+#: templates/web/zurich/admin/header.html:7
+#: templates/web/zurich/admin/report_edit.html:89
+#: templates/web/zurich/admin/report_edit.html:91
+#: templates/web/zurich/admin/update_edit.html:18
+#: templates/web/zurich/report/banner.html:11
+msgid "Open"
+msgstr ""
+
+#: templates/web/default/my/my.html:27 templates/web/fixmystreet/my/my.html:33
+msgid "Open reports"
+msgstr ""
+
+#: templates/web/default/open311/index.html:72
+msgid "Open311 API for the mySociety FixMyStreet server"
+msgstr ""
+
+#: templates/web/default/open311/index.html:82
+msgid "Open311 initiative web page"
+msgstr ""
+
+#: templates/web/default/open311/index.html:83
+msgid "Open311 specification"
+msgstr ""
+
+#: templates/web/default/alert/_list.html:58
+#: templates/web/fixmystreet/alert/_list.html:60
+msgid "Or problems reported to:"
+msgstr ""
+
+#: templates/web/default/alert/_list.html:33
+#: templates/web/fixmystreet/alert/_list.html:36
+msgid "Or you can subscribe to an alert based upon what ward or council you&rsquo;re in:"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:1057
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:662
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:663
+#: perllib/FixMyStreet/DB/Result/Problem.pm:546
+#: perllib/FixMyStreet/DB/Result/Problem.pm:556
+#: perllib/FixMyStreet/DB/Result/Problem.pm:566
+#: perllib/FixMyStreet/DB/Result/Problem.pm:578
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:369
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:384
+msgid "Other"
+msgstr ""
+
+#: templates/web/default/footer.html:27
+msgid "Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>."
+msgstr ""
+
+#: templates/web/default/admin/list_updates.html:8
+msgid "Owner"
+msgstr ""
+
+#: templates/web/default/errors/page_error_404_not_found.html:1
+#: templates/web/default/errors/page_error_404_not_found.html:3
+msgid "Page Not Found"
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:31
+#: templates/web/zurich/admin/body-form.html:14
+msgid "Parent"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:51
+msgid "Partial"
+msgstr ""
+
+#: templates/web/fixmystreet/auth/general.html:59
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:208
+#: templates/web/fixmystreet/report/update-form.html:119
+#: templates/web/zurich/auth/general.html:32
+#: templates/web/zurich/auth/general.html:63
+msgid "Password (optional)"
+msgstr ""
+
+#: templates/web/default/auth/change_password.html:25
+msgid "Password:"
+msgstr ""
+
+#: templates/web/default/js/translation_strings.html:45
+msgid "Permalink"
+msgstr ""
+
+#: templates/web/zurich/report/new/fill_in_details_form.html:106
+msgid "Phone number"
+msgstr ""
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:138
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:205
+msgid "Phone number (optional)"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:287
+#: templates/web/default/admin/report_edit.html:68
+#: templates/web/default/report/new/fill_in_details_form.html:215
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:138
+#: templates/web/zurich/admin/report_edit-sdm.html:49
+#: templates/web/zurich/admin/report_edit.html:63
+#: templates/web/zurich/admin/stats.html:39
+msgid "Phone:"
+msgstr ""
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:92
+#: templates/web/fixmystreet/report/update-form.html:59
+#: templates/web/zurich/admin/index-dm.html:29
+#: templates/web/zurich/admin/index-sdm.html:24
+#: templates/web/zurich/admin/reports.html:16
+#: templates/web/zurich/admin/stats.html:37
+#: templates/web/zurich/report/new/fill_in_details_form.html:68
+msgid "Photo"
+msgstr ""
+
+#: templates/web/default/questionnaire/index.html:99
+#: templates/web/default/report/new/fill_in_details_form.html:102
+#: templates/web/default/report/update-form.html:62
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:99
+#: templates/web/fixmystreet/questionnaire/index.html:90
+msgid "Photo:"
+msgstr ""
+
+#: templates/web/default/alert/list.html:26
+msgid "Photos of recent nearby reports"
+msgstr ""
+
+#: templates/web/default/js/translation_strings.html:30
+msgid "Place pin on map"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:38
+#: templates/web/default/dashboard/index.html:142
+#: templates/web/default/dashboard/index.html:143
+#: templates/web/zurich/admin/header.html:2
+#: templates/web/zurich/admin/header.html:9
+#: templates/web/zurich/admin/index-dm.html:9
+#: templates/web/zurich/admin/report_edit.html:89
+#: templates/web/zurich/admin/report_edit.html:92
+msgid "Planned"
+msgstr ""
+
+#: templates/web/fixmystreet/questionnaire/index.html:44
+msgid "Please <a class=\"tab_link\" href=\"#report\">take a look</a> at the updates that have been left."
+msgstr ""
+
+#: templates/web/default/report/new/notes.html:6
+#: templates/web/fixmystreet/report/new/notes.html:6
+msgid "Please be polite, concise and to the point."
+msgstr ""
+
+#: templates/web/default/auth/change_password.html:12
+#: templates/web/default/auth/change_password.html:17
+msgid "Please check the passwords and try again"
+msgstr ""
+
+#: templates/web/default/auth/token.html:14
+msgid "Please check your email"
+msgstr ""
+
+#: templates/web/default/auth/general.html:14
+#: templates/web/default/auth/general.html:8
+#: templates/web/fixmystreet/auth/general.html:15
+#: templates/web/fixmystreet/auth/general.html:9
+#: templates/web/zurich/auth/general.html:3
+#: templates/web/zurich/auth/general.html:9
+msgid "Please check your email address is correct"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:859
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:878
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:921
+#: perllib/FixMyStreet/DB/Result/Problem.pm:381
+#: templates/web/default/js/translation_strings.html:9
+msgid "Please choose a category"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:387
+msgid "Please choose a property type"
+msgstr ""
+
+#: templates/web/default/contact/blurb.html:2
+#: templates/web/fixmystreet/contact/blurb.html:12
+msgid ""
+"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 ""
+
+#: templates/web/default/report/new/notes.html:7
+#: templates/web/fixmystreet/report/new/notes.html:7
+msgid "Please do not be abusive&nbsp;&mdash; abusing your council devalues the service for all users."
+msgstr ""
+
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:46
+msgid "Please do not give address or personal information in this section."
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Comment.pm:126
+#: templates/web/default/js/translation_strings.html:2
+msgid "Please enter a message"
+msgstr ""
+
+#: templates/web/default/auth/change_password.html:12
+#: templates/web/default/auth/change_password.html:15
+#: templates/web/default/js/translation_strings.html:19
+msgid "Please enter a password"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Contact.pm:97
+#: perllib/FixMyStreet/DB/Result/Problem.pm:356
+#: templates/web/default/js/translation_strings.html:3
+msgid "Please enter a subject"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1041
+#: perllib/FixMyStreet/App/Controller/Admin.pm:988
+#: perllib/FixMyStreet/DB/Result/User.pm:115
+#: templates/web/default/js/translation_strings.html:12
+#: templates/web/default/js/translation_strings.html:16
+msgid "Please enter a valid email"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Alert.pm:346
+#: perllib/FixMyStreet/App/Controller/Contact.pm:107
+msgid "Please enter a valid email address"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:359
+#: templates/web/default/js/translation_strings.html:4
+msgid "Please enter some details"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Contact.pm:96
+#: perllib/FixMyStreet/DB/Result/User.pm:112
+#: templates/web/default/auth/general.html:13
+#: templates/web/default/auth/general.html:8
+#: templates/web/default/js/translation_strings.html:11
+#: templates/web/default/js/translation_strings.html:15
+#: templates/web/fixmystreet/auth/general.html:14
+#: templates/web/fixmystreet/auth/general.html:9
+#: templates/web/zurich/auth/general.html:3
+#: templates/web/zurich/auth/general.html:8
+msgid "Please enter your email"
+msgstr ""
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:151
+#: templates/web/zurich/report/new/fill_in_details_form.html:92
+msgid "Please enter your email address"
+msgstr ""
+
+#: templates/web/default/js/translation_strings.html:25
+msgid "Please enter your first name"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:374
+#: templates/web/default/js/translation_strings.html:7
+msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Contact.pm:95
+#: perllib/FixMyStreet/DB/Result/Comment.pm:123
+#: perllib/FixMyStreet/DB/Result/Problem.pm:367
+#: perllib/FixMyStreet/DB/Result/User.pm:108
+#: templates/web/default/js/translation_strings.html:6
+msgid "Please enter your name"
+msgstr ""
+
+#: templates/web/default/js/translation_strings.html:22
+msgid "Please enter your phone number"
+msgstr ""
+
+#: templates/web/default/js/translation_strings.html:26
+msgid "Please enter your second name"
+msgstr ""
+
+#: templates/web/default/js/translation_strings.html:24
+msgid "Please enter your title"
+msgstr ""
+
+#: templates/web/default/auth/sign_out.html:5
+#: templates/web/zurich/auth/sign_out.html:5
+msgid "Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a href=\"/\">front page</a>."
+msgstr ""
+
+#: templates/web/emptyhomes/report/new/fill_in_details_text.html:1
+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"
+"to read, as does a lack of punctuation."
+msgstr ""
+
+#: templates/web/default/report/new/fill_in_details_text.html:11
+#: templates/web/default/report/new/fill_in_details_text.html:2
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:10
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:2
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:2
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:8
+msgid "Please fill in details of the problem below."
+msgstr ""
+
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:2
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:3
+msgid ""
+"Please fill in details of the problem below. Leave as much detail as you can, \n"
+"and if possible describe the exact location of\n"
+"the problem (e.g. if there is a streetlight number or road name)."
+msgstr ""
+
+#: templates/web/default/report/new/fill_in_details_text.html:2
+#: templates/web/default/report/new/fill_in_details_text.html:3
+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 ""
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:70
+#: templates/web/zurich/report/new/fill_in_details_form.html:46
+msgid "Please fill in details of the problem."
+msgstr ""
+
+#: templates/web/default/report/new/fill_in_details_form.html:27
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:26
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:35
+#: templates/web/zurich/report/new/fill_in_details_form.html:20
+msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243
+msgid "Please indicate whether you'd like to receive another questionnaire"
+msgstr ""
+
+#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4
+msgid "Please note that updates are not sent to the council."
+msgstr ""
+
+#: templates/web/default/report/update-form.html:7
+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 ""
+
+#: templates/web/default/report/new/fill_in_details_form.html:5
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:5
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:26
+#: templates/web/zurich/report/new/fill_in_details_form.html:11
+msgid "Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit."
+msgstr ""
+
+#: templates/web/default/report/new/notes.html:1
+#: templates/web/fixmybarangay/report/new/notes.html:1
+#: templates/web/fixmystreet/report/new/notes.html:1
+msgid "Please note:"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:246
+msgid "Please provide some explanation as to why you're reopening this report"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253
+msgid "Please provide some text as well as a photo"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239
+msgid "Please say whether you've ever reported a problem to your council before"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Alert.pm:80
+msgid "Please select the feed you want"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Alert.pm:118
+msgid "Please select the type of alert you want"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235
+msgid "Please state whether or not the problem has been fixed"
+msgstr ""
+
+#: templates/web/default/questionnaire/index.html:50
+msgid "Please take a look at the updates that have been left."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Photo.pm:176
+msgid "Please upload a JPEG image only"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Photo.pm:183
+msgid "Please upload a JPEG image only\n"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Contact.pm:98
+msgid "Please write a message"
+msgstr ""
+
+#: templates/web/fixmystreet/report/update-form.html:23
+msgid "Please write your update here"
+msgstr ""
+
+#: templates/web/default/contact/index.html:95
+#: templates/web/default/report/update-form.html:109
+#: templates/web/default/report/update-form.html:131
+#: templates/web/default/report/update-form.html:72
+#: templates/web/fixmystreet/contact/index.html:110
+#: templates/web/fixmystreet/report/update-form.html:123
+#: templates/web/fixmystreet/report/update-form.html:71
+#: templates/web/fixmystreet/report/update-form.html:95
+msgid "Post"
+msgstr ""
+
+#: templates/web/default/report/updates.html:15
+msgid "Posted anonymously at %s"
+msgstr ""
+
+#: templates/web/default/report/updates.html:22
+msgid "Posted by %s (<strong>%s</strong>) at %s"
+msgstr ""
+
+#: templates/web/default/report/updates.html:24
+msgid "Posted by %s at %s"
+msgstr ""
+
+#: templates/web/default/pagination.html:7
+msgid "Previous"
+msgstr ""
+
+#: templates/web/default/admin/body.html:173
+#: templates/web/default/admin/body_edit.html:40
+#: templates/web/default/admin/report_edit.html:79
+msgid "Private"
+msgstr ""
+
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:108
+msgid "Private information (not shown on site)"
+msgstr ""
+
+#: templates/web/default/maps/openlayers.html:86
+msgid "Problem"
+msgstr ""
+
+#: templates/web/default/admin/timeline.html:22
+msgid "Problem %d created"
+msgstr ""
+
+#: templates/web/default/admin/timeline.html:24
+msgid "Problem %s confirmed"
+msgstr ""
+
+#: templates/web/default/admin/timeline.html:26
+msgid "Problem %s sent to council %s"
+msgstr ""
+
+#: templates/web/default/admin/index.html:36
+#: templates/web/zurich/admin/index.html:9
+msgid "Problem breakdown by state"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:959
+msgid "Problem marked as open."
+msgstr ""
+
+#: templates/web/default/admin/questionnaire.html:21
+msgid "Problem state change based on survey results"
+msgstr ""
+
+#: templates/web/default/admin/flagged.html:10
+msgid "Problems"
+msgstr ""
+
+#: templates/web/default/around/_updates.html:1
+msgid "Problems in this area"
+msgstr ""
+
+#: templates/web/fixmystreet/around/tabbed_lists.html:4
+#: templates/web/fixmystreet/report/display.html:46
+msgid "Problems nearby"
+msgstr ""
+
+#: templates/web/fixmystreet/around/tabbed_lists.html:3
+#: templates/web/fixmystreet/report/display.html:44
+msgid "Problems on the map"
+msgstr ""
+
+#: db/alert_types.pl:14
+msgid "Problems recently reported fixed on FixMyStreet"
+msgstr ""
+
+#: templates/web/default/alert/_list.html:19
+#: templates/web/fixmystreet/alert/_list.html:21
+msgid "Problems within %.1fkm of this location"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:629
+#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:109
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:184
+#: perllib/FixMyStreet/Cobrand/UK.pm:222
+msgid "Problems within %s"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:117
+#: perllib/FixMyStreet/Cobrand/UK.pm:236
+msgid "Problems within %s ward"
+msgstr ""
+
+#: templates/web/default/reports/body.html:0
+#: templates/web/default/reports/body.html:24
+msgid "Problems within %s, FixMyStreet"
+msgstr ""
+
+#: templates/web/default/alert/_list.html:40
+#: templates/web/fixmybarangay/alert/_list.html:13
+#: templates/web/fixmystreet/alert/_list.html:42
+msgid "Problems within the boundary of:"
+msgstr ""
+
+#: db/alert_types_eha.pl:8
+msgid "Properties recently reported as put back to use on reportemptyhomes.com"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:32
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:115
+msgid "Property address:"
+msgstr ""
+
+#: templates/web/default/report/new/category.html:8
+msgid "Property type:"
+msgstr ""
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:64
+msgid "Provide a title"
+msgstr ""
+
+#: templates/web/default/report/update-form.html:3
+#: templates/web/fixmystreet/report/update-form.html:4
+msgid "Provide an update"
+msgstr ""
+
+#: templates/web/fixmystreet/auth/general.html:53
+msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
+msgstr ""
+
+#: templates/web/default/report/new/fill_in_details_form.html:173
+#: templates/web/default/report/update-form.html:128
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:202
+#: templates/web/fixmystreet/report/update-form.html:116
+msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports."
+msgstr ""
+
+#: templates/web/default/admin/body.html:60
+#: templates/web/default/admin/body.html:73
+msgid "Public"
+msgstr ""
+
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:44
+msgid "Public information (shown on site)"
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit.html:198
+#: templates/web/zurich/admin/report_edit.html:214
+msgid "Public response:"
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit.html:80
+#: templates/web/zurich/admin/stats.html:38
+msgid "Publish photo"
+msgstr ""
+
+#: templates/web/zurich/admin/report_edit.html:222
+msgid "Publish the response"
+msgstr ""
+
+#: templates/web/default/questionnaire/completed.html:2
+#: templates/web/default/questionnaire/index.html:0
+#: templates/web/default/questionnaire/index.html:14
+#: templates/web/default/questionnaire/index.html:4
+#: templates/web/fixmystreet/questionnaire/index.html:0
+#: templates/web/fixmystreet/questionnaire/index.html:14
+#: templates/web/fixmystreet/questionnaire/index.html:32
+#: templates/web/fixmystreet/questionnaire/index.html:4
+msgid "Questionnaire"
+msgstr ""
+
+#: templates/web/default/admin/timeline.html:30
+msgid "Questionnaire %d answered for problem %d, %s to %s"
+msgstr ""
+
+#: templates/web/default/admin/timeline.html:28
+msgid "Questionnaire %d sent for problem %d"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192
+msgid "Questionnaire filled in by problem reporter"
+msgstr ""
+
+#: templates/web/default/alert/_list.html:21
+#: templates/web/default/around/display_location.html:3
+#: templates/web/default/report/display.html:46
+#: templates/web/default/reports/_rss.html:1
+#: templates/web/fixmystreet/alert/_list.html:22
+#: templates/web/fixmystreet/alert/updates.html:9
+#: templates/web/fixmystreet/report/display.html:61
+msgid "RSS feed"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:265 perllib/FixMyStreet/Cobrand/UK.pm:277
+msgid "RSS feed for %s"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:271 perllib/FixMyStreet/Cobrand/UK.pm:283
+msgid "RSS feed for %s ward, %s"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:171
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:179
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:189
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:197
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:200
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:208
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:218
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:226
+#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303
+msgid "RSS feed of %s"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:296 perllib/FixMyStreet/Cobrand/UK.pm:308
+msgid "RSS feed of %s, within %s ward"
+msgstr ""
+
+#: templates/web/default/alert/_list.html:21
+#: templates/web/fixmystreet/alert/_list.html:22
+msgid "RSS feed of nearby problems"
+msgstr ""
+
+#: templates/web/default/reports/_rss.html:1
+msgid "RSS feed of problems in this %s"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/Default.pm:630
+#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:110
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:154
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:183
+#: perllib/FixMyStreet/Cobrand/UK.pm:229
+msgid "RSS feed of problems within %s"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:116
+#: perllib/FixMyStreet/Cobrand/UK.pm:235
+msgid "RSS feed of problems within %s ward"
+msgstr ""
+
+#: templates/web/default/around/display_location.html:3
+#: templates/web/default/around/display_location.html:4
+msgid "RSS feed of recent local problems"
+msgstr ""
+
+#: templates/web/default/report/display.html:46
+#: templates/web/fixmystreet/alert/updates.html:9
+#: templates/web/fixmystreet/report/display.html:61
+msgid "RSS feed of updates to this problem"
+msgstr ""
+
+#: templates/web/default/alert/updates.html:9
+#: templates/web/default/report/display.html:37
+#: templates/web/fixmystreet/alert/updates.html:14
+#: templates/web/fixmystreet/report/display.html:63
+msgid "Receive email when updates are left on this problem."
+msgstr ""
+
+#: templates/web/default/around/display_location.html:0
+#: templates/web/default/around/display_location.html:32
+msgid "Recent local problems, FixMyStreet"
+msgstr ""
+
+#: templates/web/default/reports/index.html:19
+#: templates/web/fixmybarangay/reports/index.html:19
+msgid "Recently <br>fixed"
+msgstr ""
+
+#: templates/web/fiksgatami/nn/reports/index.html:13
+#: templates/web/fiksgatami/reports/index.html:13
+msgid "Recently fixed"
+msgstr ""
+
+#: templates/web/default/index.html:35 templates/web/emptyhomes/index.html:24
+#: templates/web/fixmystreet/index.html:49
+msgid "Recently reported problems"
+msgstr ""
+
+#: templates/web/default/report/new/notes.html:9
+#: templates/web/fixmystreet/report/new/notes.html:10
+msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website."
+msgstr ""
+
+#: templates/web/fixmybarangay/report/new/notes.html:9
+msgid "Remember that, for the pilot project, FixMyBarangay is only for reporting potholes and streetlights in bgy. Luz or Basak San Nicolas."
+msgstr ""
+
+#: templates/web/default/admin/report_blocks.html:16
+msgid "Remove flag"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:94
+#: templates/web/default/admin/update_edit.html:62
+#: templates/web/zurich/admin/update_edit.html:35
+msgid "Remove photo (can't be undone!)"
+msgstr ""
+
+#: templates/web/emptyhomes/header.html:12
+msgid "Report Empty Homes"
+msgstr ""
+
+#: templates/web/default/footer.html:7 templates/web/emptyhomes/header.html:31
+#: templates/web/fiksgatami/footer.html:5
+#: templates/web/fiksgatami/nn/footer.html:5
+#: templates/web/fixmystreet/footer.html:47
+#: templates/web/zurich/footer.html:17
+#: templates/web/zurich/nav_over_content.html:4
+msgid "Report a problem"
+msgstr ""
+
+#: templates/web/fixmystreet/report/display.html:35
+msgid "Report abuse"
+msgstr ""
+
+#: templates/web/default/report_created.html:1
+#: templates/web/default/report_created.html:3
+msgid "Report created"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Rss.pm:295
+msgid "Report on %s"
+msgstr ""
+
+#: templates/web/default/index.html:14 templates/web/emptyhomes/index.html:5
+#: templates/web/fixmystreet/around/intro.html:1
+#: templates/web/zurich/around/intro.html:1
+msgid "Report, view, or discuss local problems"
+msgstr ""
+
+#: templates/web/default/my/my.html:79
+msgid "Reported %s"
+msgstr ""
+
+#: templates/web/default/my/my.html:77
+msgid "Reported %s, to %s"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:561
+#: templates/web/default/contact/index.html:45
+#: templates/web/fixmystreet/contact/index.html:62
+msgid "Reported anonymously at %s"
+msgstr ""
+
+#: templates/web/default/admin/questionnaire.html:5
+#: templates/web/default/questionnaire/index.html:77
+#: templates/web/fixmystreet/questionnaire/index.html:71
+msgid "Reported before"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:584
+#: templates/web/default/contact/index.html:47
+#: templates/web/fixmystreet/contact/index.html:64
+msgid "Reported by %s at %s"
+msgstr ""
+
+#: templates/web/zurich/report/_main.html:2
+msgid "Reported in the %s category"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:557
+msgid "Reported in the %s category anonymously at %s"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:579
+msgid "Reported in the %s category by %s at %s"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:553
+msgid "Reported via %s anonymously at %s"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:575
+msgid "Reported via %s by %s at %s"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:549
+msgid "Reported via %s in the %s category anonymously at %s"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:569
+msgid "Reported via %s in the %s category by %s at %s"
+msgstr ""
+
+#: templates/web/default/around/around_index.html:1
+#: templates/web/default/js/translation_strings.html:41
+#: templates/web/default/report/new/fill_in_details.html:0
+#: templates/web/default/report/new/fill_in_details.html:3
+#: templates/web/default/report/new/fill_in_details_form.html:1
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:1
+#: templates/web/fixmystreet/around/around_index.html:2
+#: templates/web/fixmystreet/report/new/fill_in_details.html:0
+#: templates/web/fixmystreet/report/new/fill_in_details.html:5
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2
+#: templates/web/zurich/report/new/fill_in_details_form.html:2
+msgid "Reporting a problem"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1186
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:290
+#: templates/web/zurich/header.html:60
+msgid "Reports"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:395
+#: perllib/FixMyStreet/DB/Result/Problem.pm:399
+msgid "Reports are limited to %s characters in length. Please shorten your report"
+msgstr ""
+
+#: templates/web/zurich/admin/index-sdm.html:7
+msgid "Reports awaiting approval"
+msgstr ""
+
+#: templates/web/default/around/tabbed_lists.html:3
+msgid "Reports on and around the map"
+msgstr ""
+
+#: templates/web/zurich/admin/index-sdm.html:10
+msgid "Reports published"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:71
+msgid "Resend report"
+msgstr ""
+
+#: templates/web/default/js/translation_strings.html:28
+msgid "Right place?"
+msgstr ""
+
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:195
+#: perllib/FixMyStreet/Geocode/OSM.pm:173
+msgid "Road operator for this named road (derived from road reference number and type): %s"
+msgstr ""
+
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:192
+#: perllib/FixMyStreet/Geocode/OSM.pm:170
+msgid "Road operator for this named road (from OpenStreetMap): %s"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1386
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1397
+#: templates/web/default/admin/report_edit.html:90
+#: templates/web/zurich/admin/report_edit.html:76
+msgid "Rotate Left"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1386
+#: templates/web/default/admin/report_edit.html:91
+#: templates/web/zurich/admin/report_edit.html:77
+msgid "Rotate Right"
+msgstr ""
+
+#: templates/web/default/admin/body_edit.html:76
+msgid "Save changes"
+msgstr ""
+
+#: templates/web/default/admin/reports.html:1
+#: templates/web/zurich/admin/reports.html:1
+msgid "Search Reports"
+msgstr ""
+
+#: templates/web/default/admin/users.html:1
+msgid "Search Users"
+msgstr ""
+
+#: templates/web/zurich/header.html:77
+msgid "Search reports"
+msgstr ""
+
+#: templates/web/default/admin/reports.html:5
+#: templates/web/default/admin/users.html:8
+#: templates/web/zurich/admin/reports.html:5
+msgid "Search:"
+msgstr ""
+
+#: templates/web/default/admin/reports.html:26
+msgid "Searching found no reports."
+msgstr ""
+
+#: templates/web/default/admin/users.html:39
+msgid "Searching found no users."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:33
+#: templates/web/zurich/admin/body-form.html:16
+msgid "Select a body"
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:71
+#: templates/web/zurich/admin/body-form.html:26
+msgid "Select an area"
+msgstr ""
+
+#: templates/web/default/alert/_list.html:8
+#: templates/web/fixmystreet/alert/_list.html:10
+msgid "Select which type of alert you'd like and click the button for an RSS feed, or enter your email address to subscribe to an email alert."
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:666
+msgid "Sent to %s %s later"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:71
+msgid "Sent:"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:73
+#: templates/web/zurich/admin/stats.html:45
+msgid "Service:"
+msgstr ""
+
+#: templates/web/fixmystreet/report/display.html:41
+msgid "Share"
+msgstr ""
+
+#: templates/web/default/report/new/fill_in_details_form.html:210
+#: templates/web/default/report/update-form.html:157
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:129
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:197
+#: templates/web/fixmystreet/report/update-form.html:144
+msgid "Show my name publicly"
+msgstr ""
+
+#: templates/web/default/around/display_location.html:69
+msgid "Show old"
+msgstr ""
+
+#: templates/web/default/around/display_location.html:60
+msgid "Show pins"
+msgstr ""
+
+#: templates/web/default/auth/general.html:3
+#: templates/web/default/auth/general.html:49
+#: templates/web/fixmybarangay/header.html:70
+#: templates/web/fixmystreet/auth/general.html:3
+#: templates/web/fixmystreet/auth/general.html:42
+#: templates/web/fixmystreet/auth/general.html:62
+#: templates/web/fixmystreet/header.html:57
+#: templates/web/zurich/auth/general.html:18
+#: templates/web/zurich/auth/general.html:35
+msgid "Sign in"
+msgstr ""
+
+#: templates/web/default/auth/general.html:74
+msgid "Sign in by email"
+msgstr ""
+
+#: templates/web/default/auth/general.html:1
+#: templates/web/fixmystreet/auth/general.html:1
+#: templates/web/zurich/auth/general.html:1
+msgid "Sign in or create an account"
+msgstr ""
+
+#: templates/web/default/auth/sign_out.html:1
+#: templates/web/default/header.html:30
+#: templates/web/emptyhomes/header.html:46
+#: templates/web/fiksgatami/header.html:22
+#: templates/web/fiksgatami/nn/header.html:22
+#: templates/web/zurich/auth/sign_out.html:1
+msgid "Sign out"
+msgstr ""
+
+#: templates/web/default/header.html:29
+#: templates/web/emptyhomes/header.html:45
+#: templates/web/fiksgatami/header.html:21
+#: templates/web/fiksgatami/nn/header.html:21
+msgid "Signed in as %s"
+msgstr ""
+
+#: templates/web/default/report/new/fill_in_details_text.html:2
+#: templates/web/fixmybarangay/report/new/fill_in_details_text.html:2
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:2
+msgid "Some categories may require additional information."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:145
+#: templates/web/default/admin/body-form.html:146
+msgid ""
+"Some endpoints require an <strong>API key</strong> to indicate that the reports are being\n"
+" sent from your FixMyStreet installation."
+msgstr ""
+
+#: templates/web/default/alert/index.html:42
+#: templates/web/fixmybarangay/alert/index.html:32
+msgid "Some photos of recent reports"
+msgstr ""
+
+#: perllib/FixMyStreet/App/View/Email.pm:32
+#: perllib/FixMyStreet/App/View/Web.pm:44
+msgid "Some text to localize"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/UK.pm:93
+msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover."
+msgstr ""
+
+#: templates/web/default/tokens/abuse.html:5
+msgid "Sorry, there has been an error confirming your problem."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:215
+#: perllib/FixMyStreet/Geocode.pm:28 perllib/FixMyStreet/Geocode/Bing.pm:58
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:75
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:95
+#: perllib/FixMyStreet/Geocode/Google.pm:74
+#: perllib/FixMyStreet/Geocode/OSM.pm:66
+msgid "Sorry, we could not find that location."
+msgstr ""
+
+#: perllib/FixMyStreet/Geocode/Bing.pm:53
+#: perllib/FixMyStreet/Geocode/Google.pm:69
+#: perllib/FixMyStreet/Geocode/Zurich.pm:88
+msgid "Sorry, we could not parse that location. Please try again."
+msgstr ""
+
+#: templates/web/fiksgatami/footer.html:16
+#: templates/web/fiksgatami/nn/footer.html:16
+msgid "Source code"
+msgstr ""
+
+#: templates/web/default/admin/stats.html:64
+msgid "Start Date:"
+msgstr ""
+
+#: templates/web/default/admin/flagged.html:18
+#: templates/web/default/admin/list_updates.html:11
+#: templates/web/default/admin/reports.html:15
+#: templates/web/fixmystreet/report/update-form.html:26
+msgid "State"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:34
+#: templates/web/default/admin/update_edit.html:27
+#: templates/web/default/report/update-form.html:28
+#: templates/web/zurich/admin/report_edit-sdm.html:56
+#: templates/web/zurich/admin/report_edit.html:87
+#: templates/web/zurich/admin/update_edit.html:17
+msgid "State:"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1191
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:305
+#: templates/web/default/admin/stats.html:1
+#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72
+msgid "Stats"
+msgstr ""
+
+#: templates/web/zurich/admin/index-dm.html:23
+#: templates/web/zurich/admin/index-sdm.html:21
+#: templates/web/zurich/admin/reports.html:13
+msgid "Status"
+msgstr ""
+
+#: templates/web/default/report/updates.html:10
+msgid "Still open, via questionnaire, %s"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378
+msgid "Subcategory: %s"
+msgstr ""
+
+#: templates/web/zurich/admin/index-dm.html:27
+msgid "Subdivision/Body"
+msgstr ""
+
+#: templates/web/fixmystreet/contact/index.html:95
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:60
+msgid "Subject"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:19
+#: templates/web/default/contact/index.html:83
+#: templates/web/default/report/new/fill_in_details_form.html:52
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:70
+#: templates/web/zurich/admin/report_edit.html:37
+msgid "Subject:"
+msgstr ""
+
+#: templates/web/default/questionnaire/creator_fixed.html:19
+#: templates/web/default/report/new/fill_in_details_form.html:114
+#: templates/web/default/report/new/fill_in_details_form.html:154
+#: templates/web/default/report/new/fill_in_details_form.html:176
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:144
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:142
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:167
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:212
+#: templates/web/zurich/report/new/fill_in_details_form.html:114
+msgid "Submit"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:97
+#: templates/web/default/admin/update_edit.html:65
+#: templates/web/default/admin/user-form.html:55
+#: templates/web/zurich/admin/report_edit-sdm.html:67
+#: templates/web/zurich/admin/report_edit.html:224
+#: templates/web/zurich/admin/update_edit.html:38
+msgid "Submit changes"
+msgstr ""
+
+#: templates/web/default/questionnaire/index.html:116
+#: templates/web/fixmystreet/questionnaire/index.html:105
+msgid "Submit questionnaire"
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:133
+#: templates/web/zurich/admin/header.html:2
+#: templates/web/zurich/admin/header.html:6
+#: templates/web/zurich/admin/index-dm.html:23
+#: templates/web/zurich/admin/index-dm.html:6
+#: templates/web/zurich/admin/index-sdm.html:21
+#: templates/web/zurich/admin/report_edit.html:89
+#: templates/web/zurich/admin/report_edit.html:90
+#: templates/web/zurich/admin/reports.html:13
+#: templates/web/zurich/report/banner.html:9
+msgid "Submitted"
+msgstr ""
+
+#: templates/web/default/alert/updates.html:17
+#: templates/web/default/report/display.html:42
+#: templates/web/fixmystreet/alert/updates.html:23
+#: templates/web/fixmystreet/report/display.html:68
+msgid "Subscribe"
+msgstr ""
+
+#: templates/web/default/alert/_list.html:97
+#: templates/web/fixmybarangay/alert/_list.html:42
+#: templates/web/fixmystreet/alert/_list.html:92
+msgid "Subscribe me to an email alert"
+msgstr ""
+
+#: templates/web/fixmybarangay/alert/_list.html:6
+msgid "Subscribe to an alert based upon what baranagay you&rsquo;re in:"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1184
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:289
+#: templates/web/default/admin/index.html:1
+#: templates/web/zurich/admin/index-dm.html:1
+#: templates/web/zurich/admin/index-sdm.html:1
+#: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12
+#: templates/web/zurich/header.html:57
+msgid "Summary"
+msgstr ""
+
+#: templates/web/default/reports/index.html:1
+#: templates/web/emptyhomes/reports/index.html:1
+#: templates/web/fiksgatami/nn/reports/index.html:1
+#: templates/web/fiksgatami/reports/index.html:1
+#: templates/web/fixmybarangay/reports/index.html:1
+#: templates/web/zurich/reports/index.html:0
+#: templates/web/zurich/reports/index.html:4
+msgid "Summary reports"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1188
+msgid "Survey"
+msgstr ""
+
+#: templates/web/default/admin/questionnaire.html:1
+msgid "Survey Results"
+msgstr ""
+
+#: templates/web/default/admin/list_updates.html:12
+#: templates/web/zurich/admin/list_updates.html:10
+#: templates/web/zurich/admin/list_updates.html:31
+msgid "Text"
+msgstr ""
+
+#: templates/web/default/admin/body.html:18
+msgid "Text only version"
+msgstr ""
+
+#: templates/web/default/admin/update_edit.html:20
+#: templates/web/zurich/admin/update_edit.html:12
+msgid "Text:"
+msgstr ""
+
+#: templates/web/default/tokens/confirm_update.html:8
+msgid "Thank you &mdash; you can <a href=\"%s\">view your updated problem</a> on the site."
+msgstr ""
+
+#: templates/web/emptyhomes/tokens/confirm_problem.html:7
+#: templates/web/emptyhomes/tokens/confirm_problem.html:8
+msgid "Thank you for reporting an empty property on ReportEmptyHomes.com. We have emailed the lead officer for empty homes in the council responsible with details, and asked them to do whatever they can to get the empty property back into use as soon as possible."
+msgstr ""
+
+#: templates/web/emptyhomes/tokens/confirm_problem.html:31
+msgid ""
+"Thank you for reporting this empty property on ReportEmptyHomes.com.\n"
+"At present the report cannot be sent through to the council for this area. We\n"
+"are working with councils to link them into the system so that as many areas\n"
+"as possible will be covered."
+msgstr ""
+
+#: templates/web/default/tokens/error.html:7
+msgid "Thank you for trying to confirm your update or problem. We seem to have an error ourselves though, so <a href=\"%s\">please let us know what went on</a> and we'll look into it."
+msgstr ""
+
+#: templates/web/emptyhomes/tokens/confirm_problem.html:25
+#: templates/web/emptyhomes/tokens/confirm_problem.html:26
+msgid "Thank you for using ReportEmptyHomes.com. Your action is already helping to resolve the UK&rsquo;s empty homes crisis."
+msgstr ""
+
+#: templates/web/fixmystreet/around/around_index.html:27
+msgid "Thanks for uploading your photo. We now need to locate your problem, so please enter a nearby street name or postcode in the box above&nbsp;:"
+msgstr ""
+
+#: templates/web/default/contact/submit.html:8
+msgid "Thanks for your feedback. We'll get back to you as soon as we can!"
+msgstr ""
+
+#: templates/web/default/questionnaire/creator_fixed.html:9
+msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Photo.pm:190
+msgid "That image doesn't appear to have uploaded correctly (%s), please try again."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Council.pm:100
+msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Location.pm:124
+msgid "That location does not appear to be in the UK; please try again."
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:63
+#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:79
+#: perllib/FixMyStreet/Cobrand/UK.pm:86
+msgid "That postcode was not recognised, sorry."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:704
+msgid "That problem will now be resent."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:117
+msgid "That report cannot be viewed on %s."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:111
+msgid "That report has been removed from FixMyStreet."
+msgstr ""
+
+#: templates/web/default/admin/body.html:115
+msgid ""
+"The <strong>email address</strong> is the destination to which reports about this category will be sent. \n"
+" Other categories for this body may have the same email address."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:119
+#: templates/web/default/admin/body-form.html:120
+msgid ""
+"The <strong>endpoint</strong> is the URL of the service that FixMyStreet will connect to \n"
+" when sending reports to this body."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:132
+#: templates/web/default/admin/body-form.html:133
+msgid ""
+"The <strong>jurisdiction</strong> is only needed if the endpoint is serving more\n"
+" than one. If the body is running its own endpoint, you can usually leave this blank."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:90
+#: templates/web/default/admin/body-form.html:91
+msgid ""
+"The <strong>send method</strong> determines how problem reports will be sent to the body.\n"
+" If you leave this blank, <strong>send method defaults to email</strong>."
+msgstr ""
+
+#: templates/web/default/open311/index.html:92
+msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:11
+#: templates/web/default/admin/body-form.html:12
+msgid ""
+"The body's <strong>name</strong> identifies the body (for example, <em>Borsetshire District Council</em>)\n"
+" and may be displayed publically."
+msgstr ""
+
+#: templates/web/default/auth/token.html:19
+#: templates/web/default/email_sent.html:6
+msgid "The confirmation email <strong>may</strong> take a few minutes to arrive &mdash; <em>please</em> be patient."
+msgstr ""
+
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:2
+#: templates/web/fixmystreet/report/new/fill_in_details_text.html:3
+msgid "The council won&rsquo;t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc."
+msgstr ""
+
+#: templates/web/fixmystreet/questionnaire/index.html:43
+msgid "The details of your problem are available from the other tab above."
+msgstr ""
+
+#: templates/web/default/questionnaire/index.html:49
+msgid "The details of your problem are available on the right hand side of this page."
+msgstr ""
+
+#: templates/web/default/admin/edit-league.html:3
+#: templates/web/default/admin/edit-league.html:4
+msgid "The diligency prize league table shows editors' activity (who's been editing the most records)."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60
+#: perllib/FixMyStreet/App/Controller/Reports.pm:72
+msgid "The error was: %s"
+msgstr ""
+
+#: templates/web/default/open311/index.html:88
+msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name."
+msgstr ""
+
+#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:187
+#: perllib/FixMyStreet/Geocode/OSM.pm:165
+msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap."
+msgstr ""
+
+#: db/alert_types.pl:19 db/alert_types.pl:23 db/alert_types.pl:27
+#: db/alert_types.pl:31
+msgid "The latest local problems reported by users"
+msgstr ""
+
+#: db/alert_types_eha.pl:13
+msgid "The latest local reports reported by users"
+msgstr ""
+
+#: db/alert_types.pl:35
+msgid "The latest problems for {{COUNCIL}} reported by users"
+msgstr ""
+
+#: db/alert_types.pl:39
+msgid "The latest problems for {{COUNCIL}} within {{WARD}} ward reported by users"
+msgstr ""
+
+#: db/alert_types.pl:11
+msgid "The latest problems reported by users"
+msgstr ""
+
+#: db/alert_types.pl:15
+msgid "The latest problems reported fixed by users"
+msgstr ""
+
+#: db/alert_types.pl:43
+msgid "The latest problems within {{NAME}}'s boundary reported by users"
+msgstr ""
+
+#: db/alert_types_eha.pl:9
+msgid "The latest properties reported back to use by users"
+msgstr ""
+
+#: db/alert_types_eha.pl:20
+msgid "The latest reports for {{COUNCIL}} reported by users"
+msgstr ""
+
+#: db/alert_types_eha.pl:24
+msgid "The latest reports for {{COUNCIL}} within {{WARD}} ward reported by users"
+msgstr ""
+
+#: db/alert_types_eha.pl:28
+msgid "The latest reports within {{NAME}}'s boundary reported by users"
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:58
+msgid "The list of available areas is being provided by the MapIt service at %s."
+msgstr ""
+
+#: templates/web/default/auth/change_password.html:12
+#: templates/web/default/auth/change_password.html:16
+msgid "The passwords do not match"
+msgstr ""
+
+#: templates/web/default/errors/page_error_404_not_found.html:11
+#: templates/web/default/errors/page_error_404_not_found.html:12
+msgid "The requested URL '%s' was not found on this server"
+msgstr ""
+
+#: templates/web/default/alert/_list.html:14
+#: templates/web/fixmystreet/alert/_list.html:16
+msgid "The simplest alert is our geographic one:"
+msgstr ""
+
+#: templates/web/default/report/new/councils_extra_text.html:1
+#: templates/web/default/report/new/councils_text_some.html:11
+#: templates/web/default/report/new/fill_in_details_form.html:17
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12
+msgid "The subject and details of the problem will be public, plus your name if you give us permission."
+msgstr ""
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:296
+msgid "The user could not locate the problem on a map, but to see the area around the location they entered"
+msgstr ""
+
+#: templates/web/default/admin/user-form.html:12
+#: templates/web/default/admin/user-form.html:13
+msgid ""
+"The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n"
+" Names are not necessarily unique."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Reports.pm:69
+msgid "There was a problem showing the All Reports page. Please try again later."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Contact.pm:121
+#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59
+msgid "There was a problem showing this page. Please try again later."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:755
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134
+#: templates/web/default/auth/general.html:23
+#: templates/web/fixmystreet/auth/general.html:24
+#: templates/web/zurich/auth/general.html:28
+msgid "There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the &lsquo;sign in by email&rsquo; section of the form."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Alert.pm:355
+msgid "There was a problem with your email/password combination. Please try again."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:272
+msgid "There was a problem with your update. Please try again."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Contact.pm:125
+msgid "There were problems with your report. Please see below."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:299
+msgid "There were problems with your update. Please see below."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:108
+#: templates/web/default/admin/body-form.html:109
+msgid ""
+"These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.<br>\n"
+" <strong>You don't need to set them if the Send Method is email.</strong>.\n"
+" For more information on Open311, see \n"
+" <a href='http://www.mysociety.org/2013/01/17/open311-explained/' class='admin-offsite-link'>this article</a>.\n"
+" "
+msgstr ""
+
+#: templates/web/default/open311/index.html:79
+msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future."
+msgstr ""
+
+#: templates/web/default/admin/body.html:33
+msgid ""
+"This body covers no area. This means that it has no jurisdiction over problems reported <em>at any location</em>.\n"
+" Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n"
+" Currently, users <strong>cannot report problems to this body</strong>."
+msgstr ""
+
+#: templates/web/default/admin/body.html:43
+msgid "This body has no contacts. This means that currently problems reported to this body <strong>will not be sent</strong>."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:52
+#: templates/web/default/admin/body-form.html:53
+msgid ""
+"This body will only be sent reports for problems that are located in the <strong>area covered</strong>.\n"
+" A body will not receive any reports unless it covers at least one area."
+msgstr ""
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:385
+msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system."
+msgstr ""
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:388
+msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:898
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:968
+#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:131
+#: perllib/FixMyStreet/Cobrand/UK.pm:58
+msgid "This information is required"
+msgstr ""
+
+#: templates/web/default/debug_header.html:3
+msgid "This is a developer site; things might break at any time, and the database will be periodically deleted."
+msgstr ""
+
+#: templates/web/fixmybarangay/reports/index.html:7
+msgid "This is a summary of all reports on this site; select a particular barangay to see the reports sent there."
+msgstr ""
+
+#: templates/web/emptyhomes/reports/index.html:4
+msgid "This is a summary of all reports on this site; select a particular council to see the empty homes news for that area."
+msgstr ""
+
+#: templates/web/default/reports/index.html:7
+#: templates/web/fiksgatami/nn/reports/index.html:4
+#: templates/web/fiksgatami/reports/index.html:4
+msgid "This is a summary of all reports on this site; select a particular council to see the reports sent there."
+msgstr ""
+
+#: templates/web/default/auth/token.html:9
+msgid "This may be because the link is too old or already used, or the address was not copied correctly."
+msgstr ""
+
+#: templates/web/default/report/banner.html:15
+msgid "This problem has been closed"
+msgstr ""
+
+#: templates/web/default/report/banner.html:12
+#: templates/web/default/report/update-form.html:48
+#: templates/web/emptyhomes/report/banner.html:3
+#: templates/web/fixmystreet/report/update-form.html:46
+msgid "This problem has been fixed"
+msgstr ""
+
+#: templates/web/default/report/update-form.html:43
+#: templates/web/fixmystreet/report/update-form.html:40
+msgid "This problem has not been fixed"
+msgstr ""
+
+#: templates/web/default/report/banner.html:19
+msgid "This problem is in progress"
+msgstr ""
+
+#: templates/web/default/report/banner.html:9
+msgid "This problem is old and of unknown status."
+msgstr ""
+
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:130
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:131
+#: templates/web/zurich/report/_main.html:14
+msgid "This report is awaiting moderation."
+msgstr ""
+
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:88
+msgid "This report is currently marked as closed."
+msgstr ""
+
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:86
+msgid "This report is currently marked as fixed."
+msgstr ""
+
+#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:90
+msgid "This report is currently marked as open."
+msgstr ""
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:320
+msgid "This report was submitted anonymously"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:289
+msgid "This web page also contains a photo of the problem, provided by the user."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1187
+#: templates/web/default/admin/timeline.html:1
+msgid "Timeline"
+msgstr ""
+
+#: templates/web/default/admin/flagged.html:15
+#: templates/web/default/admin/reports.html:12
+msgid "Title"
+msgstr ""
+
+#: templates/web/default/around/_report_banner.html:2
+msgid "To <strong>report a problem</strong>, click on the map at the correct location."
+msgstr ""
+
+#: templates/web/default/alert/index.html:27
+msgid "To find out what local alerts we have for you, please enter your postcode or street name and area"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:295
+msgid "To view a map of the precise location of this issue"
+msgstr ""
+
+#: templates/web/default/admin/index.html:44
+#: templates/web/default/admin/questionnaire.html:24
+#: templates/web/default/admin/stats.html:24
+#: templates/web/default/admin/stats.html:43
+#: templates/web/zurich/admin/stats.html:30
+msgid "Total"
+msgstr ""
+
+#: templates/web/default/js/translation_strings.html:29
+msgid "Try again"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:46
+#: templates/web/default/report/update-form.html:30
+#: templates/web/default/report/update-form.html:33
+#: templates/web/fixmystreet/report/update-form.html:28
+#: templates/web/fixmystreet/report/update-form.html:31
+msgid "Unable to fix"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:35
+#: templates/web/default/admin/report_edit.html:51
+#: templates/web/default/admin/update_edit.html:28
+#: templates/web/zurich/admin/report_edit-sdm.html:48
+#: templates/web/zurich/admin/report_edit.html:61
+#: templates/web/zurich/admin/update_edit.html:18
+msgid "Unconfirmed"
+msgstr ""
+
+#: templates/web/fixmystreet/report/banner.html:9
+msgid "Unknown"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Rss.pm:173
+msgid "Unknown alert type"
+msgstr ""
+
+#: templates/web/default/js/translation_strings.html:39
+msgid "Unknown error"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report.pm:106
+msgid "Unknown problem ID"
+msgstr ""
+
+#: templates/web/fixmystreet/report/update-form.html:19
+msgid "Update"
+msgstr ""
+
+#: templates/web/default/admin/timeline.html:33
+msgid "Update %s created for problem %d; by %s"
+msgstr ""
+
+#: templates/web/default/contact/index.html:21
+#: templates/web/fixmystreet/contact/index.html:38
+msgid "Update below added anonymously at %s"
+msgstr ""
+
+#: templates/web/default/contact/index.html:23
+#: templates/web/fixmystreet/contact/index.html:40
+msgid "Update below added by %s at %s"
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:233
+#: templates/web/zurich/admin/body-form.html:51
+msgid "Update body"
+msgstr ""
+
+#: templates/web/default/admin/index.html:38
+msgid "Update breakdown by state"
+msgstr ""
+
+#: db/alert_types.pl:7
+msgid "Update by {{name}}"
+msgstr ""
+
+#: templates/web/default/admin/update_edit.html:42
+#: templates/web/zurich/admin/update_edit.html:25
+msgid "Update changed problem state to %s"
+msgstr ""
+
+#: templates/web/default/admin/update_edit.html:44
+msgid "Update marked problem as fixed"
+msgstr ""
+
+#: templates/web/default/admin/update_edit.html:46
+msgid "Update reopened problem"
+msgstr ""
+
+#: templates/web/default/admin/body.html:83
+msgid "Update statuses"
+msgstr ""
+
+#: templates/web/default/report/update-form.html:22
+msgid "Update:"
+msgstr ""
+
+#: templates/web/zurich/admin/index-dm.html:23
+#: templates/web/zurich/admin/index-sdm.html:21
+#: templates/web/zurich/admin/reports.html:13
+msgid "Updated"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1007
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1051
+#: perllib/FixMyStreet/App/Controller/Admin.pm:801
+#: perllib/FixMyStreet/App/Controller/Admin.pm:949
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:550
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:619
+msgid "Updated!"
+msgstr ""
+
+#: templates/web/default/admin/list_updates.html:2
+#: templates/web/default/report/update.html:3
+#: templates/web/fixmystreet/report/update.html:3
+#: templates/web/zurich/admin/list_updates.html:24
+#: templates/web/zurich/report/updates.html:2
+msgid "Updates"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Comment.pm:132
+msgid "Updates are limited to %s characters in length. Please shorten your update"
+msgstr ""
+
+#: db/alert_types.pl:5 db/alert_types.pl:6
+msgid "Updates on {{title}}"
+msgstr ""
+
+#: templates/web/default/report/display.html:0
+#: templates/web/default/report/display.html:5
+#: templates/web/fixmystreet/report/display.html:0
+#: templates/web/fixmystreet/report/display.html:8
+msgid "Updates to this problem, FixMyStreet"
+msgstr ""
+
+#: templates/web/default/admin/body.html:153
+msgid "Use the <strong>note</strong> to record details that are only displayed in the admin. Notes are not shown publicly, and are not sent to the body."
+msgstr ""
+
+#: templates/web/zurich/admin/list_updates.html:30
+#: templates/web/zurich/admin/list_updates.html:9
+msgid "User"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1351
+msgid "User flag removed"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1323
+msgid "User flagged"
+msgstr ""
+
+#: templates/web/default/admin/users.html:5
+msgid "User search finds matches in users' names and email addresses."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:1189
+#: perllib/FixMyStreet/Cobrand/Zurich.pm:304
+#: templates/web/default/admin/flagged.html:29
+#: templates/web/zurich/header.html:69
+msgid "Users"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:371
+#: perllib/FixMyStreet/App/Controller/Admin.pm:401
+msgid "Values updated"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:18
+#: templates/web/default/admin/update_edit.html:18
+#: templates/web/zurich/admin/report_edit-sdm.html:24
+#: templates/web/zurich/admin/report_edit.html:23
+#: templates/web/zurich/admin/update_edit.html:10
+msgid "View report on site"
+msgstr ""
+
+#: templates/web/default/reports/body.html:14
+msgid "View reports by ward"
+msgstr ""
+
+#: templates/web/emptyhomes/tokens/confirm_problem.html:39
+msgid "View your report"
+msgstr ""
+
+#: templates/web/default/around/display_location.html:0
+#: templates/web/default/around/display_location.html:34
+msgid "Viewing a location"
+msgstr ""
+
+#: templates/web/default/report/display.html:0
+#: templates/web/fixmystreet/report/display.html:0
+msgid "Viewing a problem"
+msgstr ""
+
+#: templates/web/default/reports/body.html:16
+msgid "Wards of this council"
+msgstr ""
+
+#: templates/web/default/alert/choose.html:6
+#: templates/web/default/around/around_index.html:13
+#: templates/web/fixmystreet/around/around_index.html:16
+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 ""
+
+#: templates/web/default/auth/token.html:8
+msgid "We have not been able to confirm your account - sorry."
+msgstr ""
+
+#: templates/web/default/auth/token.html:16
+msgid "We have sent you an email containing a link to confirm your account."
+msgstr ""
+
+#: templates/web/emptyhomes/tokens/confirm_problem.html:19
+#: templates/web/emptyhomes/tokens/confirm_problem.html:20
+msgid "We may contact you periodically to ask if anything has changed with the property you reported."
+msgstr ""
+
+#: templates/web/fixmystreet/report/update-form.html:115
+msgid "We never show your email"
+msgstr ""
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:134
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:201
+#: templates/web/zurich/report/new/fill_in_details_form.html:96
+msgid "We never show your email address or phone number."
+msgstr ""
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:394
+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 ""
+
+#: templates/web/default/index-steps.html:31
+msgid "We send it to the council on your behalf"
+msgstr ""
+
+#: templates/web/default/report/new/notes.html:5
+#: templates/web/fixmybarangay/report/new/notes.html:5
+msgid "We will only use your personal information in accordance with our <a href=\"/faq#privacy\">privacy policy.</a>"
+msgstr ""
+
+#: templates/web/fixmystreet/report/new/notes.html:4
+msgid "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>"
+msgstr ""
+
+#: templates/web/emptyhomes/contact/blurb.html:2
+msgid "We&rsquo;d love to hear what you think about this website. Just fill in the form. Please don&rsquo;t contact us about individual empty homes; use the box accessed from <a href=\"/\">the front page</a>."
+msgstr ""
+
+#: templates/web/default/contact/blurb.html:8
+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 ""
+
+#: templates/web/default/admin/body.html:61
+#: templates/web/default/admin/body_edit.html:82
+#: templates/web/zurich/admin/body.html:17
+msgid "When edited"
+msgstr ""
+
+#: templates/web/default/admin/problem_row.html:35
+msgid "When sent"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:621
+msgid "Whole block of empty flats"
+msgstr ""
+
+#: templates/web/default/open311/index.html:94
+msgid "With request searches, it is also possible to search for agency_responsible to limit the requests to those sent to a single administration. The search term is the administration ID provided by <a href=\"%s\">MaPit</a>."
+msgstr ""
+
+#: templates/web/fixmystreet/footer.html:24
+msgid "Would you like better integration with FixMyStreet? <a href=\"http://www.mysociety.org/for-councils/fixmystreet/\">Find out about FixMyStreet for councils</a>."
+msgstr ""
+
+#: templates/web/fixmystreet/footer.html:20
+msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>."
+msgstr ""
+
+#: templates/web/default/questionnaire/index.html:106
+#: templates/web/fixmystreet/questionnaire/index.html:96
+msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?"
+msgstr ""
+
+#: templates/web/default/report/new/notes.html:8
+#: templates/web/fixmybarangay/report/new/notes.html:8
+#: templates/web/fixmystreet/report/new/notes.html:8
+msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation."
+msgstr ""
+
+#: templates/web/default/admin/stats.html:10
+msgid "Year"
+msgstr ""
+
+#: templates/web/default/admin/bodies.html:57
+#: templates/web/default/admin/body.html:68
+#: templates/web/default/admin/body.html:69
+#: templates/web/default/admin/body.html:70
+#: templates/web/default/admin/body_edit.html:5
+#: templates/web/default/admin/flagged.html:47
+#: templates/web/default/admin/list_updates.html:32
+#: templates/web/default/admin/list_updates.html:34
+#: templates/web/default/admin/list_updates.html:35
+#: templates/web/default/admin/problem_row.html:20
+#: templates/web/default/admin/report_edit.html:63
+#: templates/web/default/admin/report_edit.html:77
+#: templates/web/default/admin/update_edit.html:24
+#: templates/web/default/admin/users.html:29
+#: templates/web/default/questionnaire/creator_fixed.html:14
+#: templates/web/default/questionnaire/index.html:109
+#: templates/web/default/questionnaire/index.html:66
+#: templates/web/fixmystreet/questionnaire/index.html:60
+#: templates/web/fixmystreet/questionnaire/index.html:99
+msgid "Yes"
+msgstr ""
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:161
+#: templates/web/fixmystreet/report/update-form.html:89
+msgid "Yes I have a password"
+msgstr ""
+
+#: templates/web/default/contact/index.html:37
+#: templates/web/fixmystreet/contact/index.html:54
+msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:"
+msgstr ""
+
+#: templates/web/default/contact/index.html:15
+#: templates/web/fixmystreet/contact/index.html:32
+msgid "You are reporting the following update for being abusive, containing personal information, or similar:"
+msgstr ""
+
+#: templates/web/default/tokens/confirm_problem.html:20
+#: templates/web/default/tokens/confirm_problem.html:21
+#: templates/web/zurich/tokens/confirm_problem.html:6
+#: templates/web/zurich/tokens/confirm_problem.html:8
+msgid "You can <a href=\"%s%s\">view the problem on this site</a>."
+msgstr ""
+
+#: templates/web/default/admin/user-form.html:47
+msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create."
+msgstr ""
+
+#: templates/web/fixmystreet/contact/index.html:118
+msgid "You can contact technical support on <a href='mailto:%s'>%s</a>"
+msgstr ""
+
+#: templates/web/default/admin/flagged.html:5
+msgid ""
+"You can flag any report or user by editing them, and they will be listed on this page.\n"
+" For example, this can useful if you want to keep an eye on a user who has posted inappropriate\n"
+" reports in the past."
+msgstr ""
+
+#: templates/web/default/report/new/councils_text_none.html:19
+#: templates/web/default/report/new/councils_text_none.html:20
+#: templates/web/default/report/new/councils_text_some.html:21
+#: templates/web/default/report/new/councils_text_some.html:22
+msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>."
+msgstr ""
+
+#: templates/web/default/admin/body-form.html:81
+msgid "You can mark a body as deleted if you do not want it to be active on the site."
+msgstr ""
+
+#: templates/web/default/js/translation_strings.html:36
+msgid "You declined; please fill in the box above"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38
+msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n"
+msgstr ""
+
+#: templates/web/default/questionnaire/index.html:96
+#: templates/web/default/report/new/fill_in_details_form.html:93
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:90
+#: templates/web/fixmystreet/questionnaire/index.html:87
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:99
+#: templates/web/zurich/report/new/fill_in_details_form.html:75
+msgid "You have already attached a photo to this report, attaching another one will replace it."
+msgstr ""
+
+#: templates/web/default/report/update-form.html:59
+#: templates/web/fixmystreet/report/update-form.html:56
+msgid "You have already attached a photo to this update, attaching another one will replace it."
+msgstr ""
+
+#: templates/web/default/auth/sign_out.html:3
+#: templates/web/zurich/auth/sign_out.html:3
+msgid "You have been signed out"
+msgstr ""
+
+#: templates/web/default/report/new/fill_in_details_form.html:7
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:7
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:28
+#: templates/web/zurich/report/new/fill_in_details_form.html:13
+msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. "
+msgstr ""
+
+#: templates/web/default/tokens/confirm_alert.html:7
+msgid "You have successfully confirmed your alert."
+msgstr ""
+
+#: templates/web/zurich/tokens/confirm_problem.html:6
+msgid "You have successfully confirmed your email address."
+msgstr ""
+
+#: templates/web/default/tokens/confirm_problem.html:15
+msgid "You have successfully confirmed your problem"
+msgstr ""
+
+#: templates/web/default/tokens/confirm_update.html:12
+msgid "You have successfully confirmed your update and you can now <a href=\"%s\">view it on the site</a>."
+msgstr ""
+
+#: templates/web/default/tokens/confirm_alert.html:11
+msgid "You have successfully created your alert."
+msgstr ""
+
+#: templates/web/default/tokens/confirm_alert.html:9
+msgid "You have successfully deleted your alert."
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Report/New.pm:762
+#: perllib/FixMyStreet/App/Controller/Report/Update.pm:140
+msgid "You have successfully signed in; please check and confirm your details are accurate:"
+msgstr ""
+
+#: templates/web/default/my/my.html:17 templates/web/fixmystreet/my/my.html:17
+msgid "You haven&rsquo;t created any reports yet. <a href=\"%s\">Report a problem now.</a>"
+msgstr ""
+
+#: templates/web/default/email_sent.html:13
+msgid "You must now click the link in the email we've just sent you."
+msgstr ""
+
+#: templates/web/default/admin/index.html:7
+msgid "You need to <a href=\"%s\">add some bodies</a> (such as councils or departments) before any reports can be sent."
+msgstr ""
+
+#: templates/web/default/admin/bodies.html:9
+msgid ""
+"You need to add bodies (such as councils or departments) so that you can then add\n"
+" the categories of problems they can handle (such as potholes or streetlights) and the\n"
+" contacts (such as an email address) to which reports are sent."
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:71
+msgid "You really want to resend?"
+msgstr ""
+
+#: templates/web/default/my/my.html:0 templates/web/default/my/my.html:14
+#: templates/web/default/my/my.html:3 templates/web/fixmystreet/my/my.html:0
+#: templates/web/fixmystreet/my/my.html:14
+#: templates/web/fixmystreet/my/my.html:3
+msgid "Your Reports"
+msgstr ""
+
+#: templates/web/fixmystreet/alert/_list.html:89
+#: templates/web/fixmystreet/alert/updates.html:19
+#: templates/web/fixmystreet/alert/updates.html:22
+#: templates/web/fixmystreet/contact/index.html:88
+#: templates/web/fixmystreet/report/display.html:65
+#: templates/web/fixmystreet/report/display.html:67
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:115
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:147
+#: templates/web/zurich/report/new/fill_in_details_form.html:88
+msgid "Your email"
+msgstr ""
+
+#: templates/web/fixmystreet/auth/general.html:26
+#: templates/web/fixmystreet/report/update-form.html:80
+#: templates/web/zurich/auth/general.html:30
+#: templates/web/zurich/auth/general.html:58
+msgid "Your email address"
+msgstr ""
+
+#: templates/web/default/auth/general.html:27
+msgid "Your email address:"
+msgstr ""
+
+#: templates/web/default/alert/_list.html:92
+#: templates/web/default/report/new/fill_in_details_form.html:124
+#: templates/web/default/report/update-form.html:81
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:133
+#: templates/web/fixmybarangay/alert/_list.html:37
+msgid "Your email:"
+msgstr ""
+
+#: templates/web/fixmystreet/report/updates-sidebar-notes.html:7
+msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>"
+msgstr ""
+
+#: templates/web/fixmystreet/auth/general.html:57
+#: templates/web/fixmystreet/contact/index.html:81
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:124
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:192
+#: templates/web/fixmystreet/report/update-form.html:140
+#: templates/web/zurich/auth/general.html:61
+#: templates/web/zurich/report/new/fill_in_details_form.html:104
+msgid "Your name"
+msgstr ""
+
+#: templates/web/default/auth/general.html:59
+#: templates/web/default/contact/index.html:68
+#: templates/web/default/report/new/fill_in_details_form.html:203
+#: templates/web/default/report/update-form.html:151
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:124
+msgid "Your name:"
+msgstr ""
+
+#: templates/web/fixmystreet/auth/general.html:41
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:166
+#: templates/web/fixmystreet/report/update-form.html:94
+#: templates/web/zurich/auth/general.html:34
+msgid "Your password"
+msgstr ""
+
+#: templates/web/default/auth/change_password.html:6
+msgid "Your password has been changed"
+msgstr ""
+
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:139
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:206
+#: templates/web/zurich/report/new/fill_in_details_form.html:110
+msgid "Your phone number"
+msgstr ""
+
+#: templates/web/fixmystreet/questionnaire/index.html:15
+msgid "Your report"
+msgstr ""
+
+#: templates/web/default/report_created.html:6
+msgid "Your report has been created and will shortly be sent."
+msgstr ""
+
+#: templates/web/default/footer.html:9 templates/web/fiksgatami/footer.html:6
+#: templates/web/fiksgatami/nn/footer.html:6
+#: templates/web/fixmystreet/footer.html:49
+msgid "Your reports"
+msgstr ""
+
+#: templates/web/default/my/my.html:50 templates/web/fixmystreet/my/my.html:56
+msgid "Your updates"
+msgstr ""
+
+#: templates/web/default/contact/index.html:76
+msgid "Your&nbsp;email:"
+msgstr ""
+
+#: templates/web/default/admin/timeline.html:4
+msgid "by %s"
+msgstr ""
+
+#: templates/web/default/reports/body.html:6
+#: templates/web/default/reports/body.html:7
+msgid "council"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/Result/Problem.pm:651
+msgid "council ref:&nbsp;%s"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:28
+#: templates/web/zurich/admin/report_edit-sdm.html:43
+#: templates/web/zurich/admin/report_edit.html:57
+msgid "didn't use map"
+msgstr ""
+
+#: templates/web/default/alert/index.html:33
+#: templates/web/fixmystreet/around/postcode_form.html:20
+msgid "e.g. ‘%s’ or ‘%s’"
+msgstr ""
+
+#: templates/web/default/admin/flagged.html:51
+msgid "edit user"
+msgstr ""
+
+#: templates/web/default/admin/index.html:23
+#: templates/web/zurich/admin/index.html:5
+msgid "from %d different users"
+msgstr ""
+
+#: templates/web/fixmystreet/report/_item.html:17
+#: templates/web/zurich/report/_item.html:16
+msgid "last updated %s"
+msgstr ""
+
+#: perllib/Utils.pm:265
+msgid "less than a minute"
+msgstr ""
+
+#: templates/web/default/report/updates.html:57
+msgid "marked as a duplicate report"
+msgstr ""
+
+#: templates/web/default/report/updates.html:47
+msgid "marked as action scheduled"
+msgstr ""
+
+#: templates/web/default/report/updates.html:59
+msgid "marked as an internal referral"
+msgstr ""
+
+#: templates/web/default/report/updates.html:49
+msgid "marked as closed"
+msgstr ""
+
+#: templates/web/default/report/updates.html:28
+#: templates/web/default/report/updates.html:51
+msgid "marked as fixed"
+msgstr ""
+
+#: templates/web/default/report/updates.html:45
+msgid "marked as in progress"
+msgstr ""
+
+#: templates/web/default/report/updates.html:41
+msgid "marked as investigating"
+msgstr ""
+
+#: templates/web/default/report/updates.html:55
+msgid "marked as not the council's responsibility"
+msgstr ""
+
+#: templates/web/default/report/updates.html:43
+msgid "marked as planned"
+msgstr ""
+
+#: templates/web/default/report/updates.html:53
+msgid "marked as unable to fix"
+msgstr ""
+
+#: perllib/FixMyStreet/App/Controller/Admin.pm:130
+#: templates/web/default/admin/questionnaire.html:15
+#: templates/web/default/admin/questionnaire.html:16
+msgid "n/a"
+msgstr ""
+
+#: templates/web/default/alert/_list.html:87
+#: templates/web/fixmybarangay/alert/_list.html:32
+#: templates/web/fixmystreet/alert/_list.html:85
+msgid "or"
+msgstr ""
+
+#: templates/web/default/js/translation_strings.html:27
+msgid "or locate me automatically"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:25
+#: templates/web/default/admin/report_edit.html:26
+#: templates/web/zurich/admin/report_edit-sdm.html:31
+#: templates/web/zurich/admin/report_edit-sdm.html:32
+#: templates/web/zurich/admin/report_edit-sdm.html:40
+#: templates/web/zurich/admin/report_edit-sdm.html:41
+#: templates/web/zurich/admin/report_edit.html:31
+#: templates/web/zurich/admin/report_edit.html:32
+#: templates/web/zurich/admin/report_edit.html:42
+#: templates/web/zurich/admin/report_edit.html:43
+#: templates/web/zurich/admin/report_edit.html:54
+#: templates/web/zurich/admin/report_edit.html:55
+msgid "originally entered: &ldquo;%s&rdquo;"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:30
+msgid "other areas:"
+msgstr ""
+
+#: templates/web/default/report/updates.html:29
+#: templates/web/default/report/updates.html:39
+msgid "reopened"
+msgstr ""
+
+#: templates/web/fixmybarangay/header.html:67
+#: templates/web/fixmystreet/header.html:54
+#: templates/web/zurich/footer.html:12
+msgid "sign out"
+msgstr ""
+
+#: templates/web/default/report/new/fill_in_details_form.html:12
+#: templates/web/default/report/new/fill_in_details_form.html:14
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:12
+#: templates/web/emptyhomes/report/new/fill_in_details_form.html:14
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:7
+#: templates/web/fixmystreet/report/new/fill_in_details_form.html:9
+msgid "the local council"
+msgstr ""
+
+#: templates/web/default/report/_main.html:6
+#: templates/web/zurich/report/_main.html:5
+msgid "there is no pin shown as the user did not use the map"
+msgstr ""
+
+#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:370
+msgid "this type of local problem"
+msgstr ""
+
+#: perllib/Utils.pm:237
+msgid "today"
+msgstr ""
+
+#: templates/web/default/admin/report_edit.html:28
+#: templates/web/zurich/admin/report_edit-sdm.html:43
+#: templates/web/zurich/admin/report_edit.html:57
+msgid "used map"
+msgstr ""
+
+#: templates/web/default/admin/update_edit.html:35
+msgid "user is from same council as problem - %d"
+msgstr ""
+
+#: templates/web/default/admin/update_edit.html:38
+msgid "user is problem owner"
+msgstr ""
+
+#: templates/web/default/reports/body.html:0
+#: templates/web/default/reports/body.html:3
+msgid "ward"
+msgstr ""
+
+#: templates/web/default/front/stats.html:17
+#, perl-format
+msgid "<big>%s</big> report recently"
+msgid_plural "<big>%s</big> reports recently"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: perllib/Utils.pm:284
+#, perl-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templates/web/default/report/_support.html:6
+#, perl-format
+msgid "%d supporter"
+msgid_plural "%d supporters"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: perllib/Utils.pm:286
+#, perl-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templates/web/default/front/stats.html:29
+#, perl-format
+msgid "<big>%s</big> update on reports"
+msgid_plural "<big>%s</big> updates on reports"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templates/web/emptyhomes/report/new/councils_text_none.html:3
+#, perl-format
+msgid "We do not yet have details for the council that covers this location."
+msgid_plural "We do not yet have details for the councils that cover this location."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: perllib/Utils.pm:280
+#, perl-format
+msgid "%d week"
+msgid_plural "%d weeks"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templates/web/default/front/stats.html:12
+#, perl-format
+msgid "<big>%s</big> report in past week"
+msgid_plural "<big>%s</big> reports in past week"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templates/web/default/front/stats.html:23
+#, perl-format
+msgid "<big>%s</big> fixed in past month"
+msgid_plural "<big>%s</big> fixed in past month"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: perllib/Utils.pm:282
+#, perl-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+
+#: templates/web/default/report/new/councils_text_some.html:14
+#, perl-format
+msgid "We do <strong>not</strong> yet have details for the other council that covers this location."
+msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
diff --git a/perllib/FixMyStreet.pm b/perllib/FixMyStreet.pm
index de55e0070..34c7bfe21 100644
--- a/perllib/FixMyStreet.pm
+++ b/perllib/FixMyStreet.pm
@@ -96,6 +96,12 @@ sub override_config($&) {
# For historical reasons, we have two ways of asking for config variables.
# Override them both, I'm sure we'll find time to get rid of one eventually.
+ #
+ # NB: though we have these two functions, templates tend to use [% c.config %]
+ # This overriding happens after $c->config is set, so note that
+ # FixMyStreet::App->setup_request rewrites $c->config if we are in
+ # test_mode, so tests should Just Work there too.
+
my $override_guard1 = Sub::Override->new(
"FixMyStreet::config",
sub {
diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm
index 13617a3c0..0d3b024a8 100644
--- a/perllib/FixMyStreet/App.pm
+++ b/perllib/FixMyStreet/App.pm
@@ -349,7 +349,7 @@ sub send_email {
}
sub send_email_cron {
- my ( $c, $params, $env_from, $env_to, $nomail ) = @_;
+ my ( $c, $params, $env_from, $env_to, $nomail, $cobrand, $lang_code ) = @_;
return 1 if $c->is_abuser( $env_to );
@@ -357,15 +357,31 @@ sub send_email_cron {
unpack('h*', random_bytes(5, 1)), FixMyStreet->config('EMAIL_DOMAIN')
);
- $params->{_parameters_}->{signature} = '';
- #$params->{_parameters_}->{signature} = $c->view('Email')->render(
- # $c, 'signature.txt', {
- # additional_template_paths => [
- # FixMyStreet->path_to( 'templates', 'email', $c->cobrand->moniker, $c->stash->{lang_code} )->stringify,
- # FixMyStreet->path_to( 'templates', 'email', $c->cobrand->moniker )->stringify,
- # ]
- # }
- #);
+ # This is all to set the path for the templates processor so we can override
+ # signature and site names in emails using templates in the old style emails.
+ # It's a bit involved as not everywhere we use it knows about the cobrand so
+ # we can't assume there will be one.
+ my $include_path = FixMyStreet->path_to( 'templates', 'email', 'default' )->stringify;
+ if ( $cobrand ) {
+ $include_path =
+ FixMyStreet->path_to( 'templates', 'email', $cobrand->moniker )->stringify . ':'
+ . $include_path;
+ if ( $lang_code ) {
+ $include_path =
+ FixMyStreet->path_to( 'templates', 'email', $cobrand->moniker, $lang_code )->stringify . ':'
+ . $include_path;
+ }
+ }
+ my $tt = Template->new({
+ INCLUDE_PATH => $include_path
+ });
+ my ($sig, $site_name);
+ $tt->process( 'signature.txt', $params, \$sig );
+ $params->{_parameters_}->{signature} = $sig;
+
+ $tt->process( 'site_name.txt', $params, \$site_name );
+ my $site_title = $cobrand ? $cobrand->site_title : '';
+ $params->{_parameters_}->{site_name} = $site_name || $site_title;
$params->{_line_indent} = '';
my $email = mySociety::Locale::in_gb_locale { mySociety::Email::construct_email($params) };
diff --git a/perllib/FixMyStreet/App/Controller/Council.pm b/perllib/FixMyStreet/App/Controller/Council.pm
index ceec04027..8a174c254 100644
--- a/perllib/FixMyStreet/App/Controller/Council.pm
+++ b/perllib/FixMyStreet/App/Controller/Council.pm
@@ -53,10 +53,16 @@ sub load_and_check_areas : Private {
my $short_longitude = Utils::truncate_coordinate($longitude);
my $all_areas;
+
+ my %params;
+ $params{generation} = $c->config->{MAPIT_GENERATION}
+ if $c->config->{MAPIT_GENERATION};
+
if ( $c->stash->{fetch_all_areas} ) {
my %area_types = map { $_ => 1 } @$area_types;
$all_areas =
- mySociety::MaPit::call( 'point', "4326/$short_longitude,$short_latitude" );
+ mySociety::MaPit::call( 'point',
+ "4326/$short_longitude,$short_latitude", %params );
$c->stash->{all_areas_mapit} = $all_areas;
$all_areas = {
map { $_ => $all_areas->{$_} }
@@ -65,7 +71,8 @@ sub load_and_check_areas : Private {
};
} else {
$all_areas =
- mySociety::MaPit::call( 'point', "4326/$short_longitude,$short_latitude",
+ mySociety::MaPit::call( 'point',
+ "4326/$short_longitude,$short_latitude", %params,
type => $area_types );
}
if ($all_areas->{error}) {
diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm
index 3463ebab6..56a915c89 100644
--- a/perllib/FixMyStreet/DB/Result/Problem.pm
+++ b/perllib/FixMyStreet/DB/Result/Problem.pm
@@ -604,7 +604,7 @@ sub body {
$body = join( _(' and '),
map {
my $name = $_->name;
- if (mySociety::Config::get('AREA_LINKS_FROM_PROBLEMS')) {
+ if ($c and mySociety::Config::get('AREA_LINKS_FROM_PROBLEMS')) {
'<a href="' . $_->url($c) . '">' . $name . '</a>';
} else {
$name;
@@ -623,10 +623,11 @@ sub body {
# Note: this only makes sense when called on a problem that has been sent!
sub can_display_external_id {
my $self = shift;
- if ($self->external_id && $self->bodies_str =~ /2237/) {
+ if ($self->external_id && $self->send_method_used &&
+ ($self->send_method_used eq 'barnet' || $self->bodies_str =~ /2237/)) {
return 1;
}
- return 0;
+ return 0;
}
# TODO Some/much of this could be moved to the template
diff --git a/perllib/FixMyStreet/DB/ResultSet/AlertType.pm b/perllib/FixMyStreet/DB/ResultSet/AlertType.pm
index 545b54c60..984e698e0 100644
--- a/perllib/FixMyStreet/DB/ResultSet/AlertType.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/AlertType.pm
@@ -271,6 +271,8 @@ sub _send_aggregated_alert_email(%) {
$sender,
[ $data{alert_email} ],
0,
+ $cobrand,
+ $data{lang}
);
if ($result == mySociety::EmailUtil::EMAIL_SUCCESS) {
diff --git a/perllib/FixMyStreet/DB/ResultSet/Problem.pm b/perllib/FixMyStreet/DB/ResultSet/Problem.pm
index c108f7e29..2f4bc6363 100644
--- a/perllib/FixMyStreet/DB/ResultSet/Problem.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/Problem.pm
@@ -440,7 +440,7 @@ sub send_reports {
lastupdate => \'ms_current_timestamp()',
} );
if ( $cobrand->report_sent_confirmation_email && !$h{anonymous_report}) {
- _send_report_sent_email( $row, \%h, $nomail );
+ _send_report_sent_email( $row, \%h, $nomail, $cobrand );
}
debug_print("send successful: OK", $row->id) if $debug_mode;
} else {
@@ -493,6 +493,7 @@ sub _send_report_sent_email {
my $row = shift;
my $h = shift;
my $nomail = shift;
+ my $cobrand = shift;
my $template = 'confirm_report_sent.txt';
my $template_path = FixMyStreet->path_to( "templates", "email", $row->cobrand, $row->lang, $template )->stringify;
@@ -511,7 +512,8 @@ sub _send_report_sent_email {
},
mySociety::Config::get('CONTACT_EMAIL'),
[ $row->user->email ],
- $nomail
+ $nomail,
+ $cobrand
);
}
diff --git a/perllib/FixMyStreet/DB/ResultSet/Questionnaire.pm b/perllib/FixMyStreet/DB/ResultSet/Questionnaire.pm
index 6f2c19b5e..64ba8ec6a 100644
--- a/perllib/FixMyStreet/DB/ResultSet/Questionnaire.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/Questionnaire.pm
@@ -98,6 +98,8 @@ sub send_questionnaires_period {
. $row->user->email . "\n"
if $params->{verbose};
+ $h{site_name} = $cobrand->site_title();
+
my $result = FixMyStreet::App->send_email_cron(
{
_template_ => $template,
@@ -107,7 +109,8 @@ sub send_questionnaires_period {
},
$sender,
[ $row->user->email ],
- $params->{nomail}
+ $params->{nomail},
+ $cobrand
);
if ($result == mySociety::EmailUtil::EMAIL_SUCCESS) {
print " ...success\n" if $params->{verbose};
diff --git a/perllib/FixMyStreet/Map/FMS.pm b/perllib/FixMyStreet/Map/FMS.pm
index e7aa46784..62849a157 100644
--- a/perllib/FixMyStreet/Map/FMS.pm
+++ b/perllib/FixMyStreet/Map/FMS.pm
@@ -38,7 +38,7 @@ sub get_quadkey {
}
sub map_tile_base {
- '.', "http://%stilma.mysociety.org/sv/%d/%d/%d.png";
+ '-', "//%stilma.mysociety.org/sv/%d/%d/%d.png";
}
sub map_tiles {
diff --git a/t/app/controller/alert_new.t b/t/app/controller/alert_new.t
index 594d4c7a6..14cf32d7c 100644
--- a/t/app/controller/alert_new.t
+++ b/t/app/controller/alert_new.t
@@ -12,7 +12,7 @@ foreach my $test (
email => 'test@example.com',
type => 'area_problems',
content => 'your alert will not be activated',
- email_text => 'confirm the alert',
+ email_text => "confirms that you'd like to receive an email",
uri =>
'/alert/subscribe?type=local&rznvy=test@example.com&feed=area:1000:A_Location',
param1 => 1000
@@ -21,7 +21,7 @@ foreach my $test (
email => 'test@example.com',
type => 'council_problems',
content => 'your alert will not be activated',
- email_text => 'confirm the alert',
+ email_text => "confirms that you'd like to receive an email",
uri =>
'/alert/subscribe?type=local&rznvy=test@example.com&feed=council:1000:A_Location',
param1 => 1000,
@@ -31,7 +31,7 @@ foreach my $test (
email => 'test@example.com',
type => 'ward_problems',
content => 'your alert will not be activated',
- email_text => 'confirm the alert',
+ email_text => "confirms that you'd like to receive an email",
uri =>
'/alert/subscribe?type=local&rznvy=test@example.com&feed=ward:1000:1001:A_Location:Diff_Location',
param1 => 1000,
@@ -41,7 +41,7 @@ foreach my $test (
email => 'test@example.com',
type => 'local_problems',
content => 'your alert will not be activated',
- email_text => 'confirm the alert',
+ email_text => "confirms that you'd like to receive an email",
uri =>
'/alert/subscribe?type=local&rznvy=test@example.com&feed=local:10.2:20.1',
param1 => 20.1,
@@ -51,7 +51,7 @@ foreach my $test (
email => 'test@example.com',
type => 'new_updates',
content => 'your alert will not be activated',
- email_text => 'confirm the alert',
+ email_text => "confirms that you'd like to receive an email",
uri => '/alert/subscribe?type=updates&rznvy=test@example.com&id=1',
param1 => 1,
}
@@ -450,9 +450,9 @@ subtest "Test normal alert signups and that alerts are sent" => sub {
my @emails = $mech->get_email;
my $count;
for (@emails) {
- $count++ if $_->body =~ /The following updates have been left on this problem:/;
- $count++ if $_->body =~ /The following new problems have been reported to City of\s+Edinburgh\s+Council:/;
- $count++ if $_->body =~ /The following nearby problems have been added:/;
+ $count++ if $_->body =~ /The following updates have been left on this report:/;
+ $count++ if $_->body =~ /The following new FixMyStreet reports have been sent to City of\s+Edinburgh\s+Council:/;
+ $count++ if $_->body =~ /The following FixMyStreet reports have been made within the area you\s+specified:/;
$count++ if $_->body =~ /\s+-\s+Testing/;
}
is $count, 5, 'Three emails, with five matching lines in them';
@@ -479,6 +479,121 @@ subtest "Test normal alert signups and that alerts are sent" => sub {
$mech->delete_user($user2);
};
+subtest "Test signature template is used from cobrand" => sub {
+ $mech->delete_user( 'reporter@example.com' );
+ $mech->delete_user( 'alerts@example.com' );
+
+ my $user1 = FixMyStreet::App->model('DB::User')
+ ->find_or_create( { email => 'reporter@example.com', name => 'Reporter User' } );
+ ok $user1, "created test user";
+
+ my $user2 = FixMyStreet::App->model('DB::User')
+ ->find_or_create( { email => 'alerts@example.com', name => 'Alert User' } );
+ ok $user2, "created test user";
+
+ my $dt = DateTime->now()->add( days => 2);
+
+ my $dt_parser = FixMyStreet::App->model('DB')->schema->storage->datetime_parser;
+
+ my $report_time = '2011-03-01 12:00:00';
+ my $report = FixMyStreet::App->model('DB::Problem')->find_or_create( {
+ postcode => 'EH1 1BB',
+ bodies_str => '2651',
+ areas => ',11808,135007,14419,134935,2651,20728,',
+ category => 'Street lighting',
+ title => 'Testing',
+ detail => 'Testing Detail',
+ used_map => 1,
+ name => $user1->name,
+ anonymous => 0,
+ state => 'fixed - user',
+ confirmed => $dt_parser->format_datetime($dt),
+ lastupdate => $dt_parser->format_datetime($dt),
+ whensent => $dt_parser->format_datetime($dt->clone->add( minutes => 5 )),
+ lang => 'en-gb',
+ service => '',
+ cobrand => 'default',
+ cobrand_data => '',
+ send_questionnaire => 1,
+ latitude => '55.951963',
+ longitude => '-3.189944',
+ user_id => $user1->id,
+ } );
+ my $report_id = $report->id;
+ ok $report, "created test report - $report_id";
+
+ my $alert = FixMyStreet::App->model('DB::Alert')->create( {
+ parameter => $report_id,
+ alert_type => 'new_updates',
+ user => $user1,
+ cobrand => 'default',
+ } );
+ my $ret = $alert->confirm;
+ ok $ret, 'created alert for reporter';
+
+ my $update = FixMyStreet::App->model('DB::Comment')->create( {
+ problem_id => $report_id,
+ user_id => $user2->id,
+ name => 'Other User',
+ mark_fixed => 'false',
+ text => 'This is some update text',
+ state => 'confirmed',
+ confirmed => $dt->clone->add( hours => 7 ),
+ anonymous => 'f',
+ } );
+ my $update_id = $update->id;
+ ok $update, "created test update - $update_id";
+
+
+ $mech->clear_emails_ok;
+ FixMyStreet::override_config {
+ MAPIT_URL => 'http://mapit.mysociety.org/',
+ ALLOWED_COBRANDS => [ { 'fixmystreet' => '.' } ],
+ }, sub {
+ FixMyStreet::App->model('DB::AlertType')->email_alerts();
+ };
+ # TODO Note the below will fail if the db has an existing alert that matches
+ $mech->email_count_is(1);
+
+ my @emails = $mech->get_email;
+ my $email = $emails[0];
+ like $email->body, qr/All the best/, 'default signature used';
+ unlike $email->body, qr/twitter.com/, 'nothing from fixmystreet signature';
+
+ $update = FixMyStreet::App->model('DB::Comment')->create( {
+ problem_id => $report_id,
+ user_id => $user2->id,
+ name => 'Anonymous User',
+ mark_fixed => 'true',
+ text => 'This is some more update text',
+ state => 'confirmed',
+ confirmed => $dt->clone->add( hours => 8 ),
+ anonymous => 't',
+ } );
+ $update_id = $update->id;
+ ok $update, "created test update - $update_id";
+
+ $alert->cobrand('fixmystreet');
+ $alert->update;
+
+ $mech->clear_emails_ok;
+ FixMyStreet::override_config {
+ MAPIT_URL => 'http://mapit.mysociety.org/',
+ ALLOWED_COBRANDS => [ { 'fixmystreet' => '.' } ],
+ }, sub {
+ FixMyStreet::App->model('DB::AlertType')->email_alerts();
+ };
+ # TODO Note the below will fail if the db has an existing alert that matches
+ $mech->email_count_is(1);
+
+ @emails = $mech->get_email;
+ $email = $emails[0];
+ like $email->body, qr/twitter.com/, 'fixmystreet signature used';
+
+ $mech->delete_user($user1);
+ $mech->delete_user($user2);
+};
+
for my $test (
{
desc => 'check non public reports are not included in council problems alerts',
diff --git a/t/app/controller/around.t b/t/app/controller/around.t
index cbb110a1a..892231ef1 100644
--- a/t/app/controller/around.t
+++ b/t/app/controller/around.t
@@ -67,8 +67,8 @@ foreach my $test (
foreach my $test (
{
pc => 'SW1A 1AA',
- latitude => '51.50101',
- longitude => '-0.141587',
+ latitude => '51.501009',
+ longitude => '-0.141588',
},
{
pc => 'TQ 388 773',
diff --git a/t/app/controller/auth.t b/t/app/controller/auth.t
index 3d52c0925..17ba0d1a0 100644
--- a/t/app/controller/auth.t
+++ b/t/app/controller/auth.t
@@ -66,7 +66,7 @@ $mech->not_logged_in_ok;
$mech->email_count_is(1);
my $email = $mech->get_email;
$mech->clear_emails_ok;
- is $email->header('Subject'), "Your FixMyStreet.com account details",
+ is $email->header('Subject'), "Your FixMyStreet account details",
"subject is correct";
is $email->header('To'), $test_email, "to is correct";
diff --git a/t/app/controller/report_import.t b/t/app/controller/report_import.t
index a6ccc9604..226efdd84 100644
--- a/t/app/controller/report_import.t
+++ b/t/app/controller/report_import.t
@@ -147,8 +147,8 @@ subtest "Submit a correct entry" => sub {
# Check photo present, and still there after map submission (testing bug #18)
$mech->content_contains( '<img align="right" src="/photo/' );
- $mech->content_contains('latitude" value="51.50101"', 'Check latitude');
- $mech->content_contains('longitude" value="-0.141587"', 'Check longitude');
+ $mech->content_contains('latitude" value="51.501009"', 'Check latitude');
+ $mech->content_contains('longitude" value="-0.141588"', 'Check longitude');
FixMyStreet::override_config {
ALLOWED_COBRANDS => [ { 'fixmystreet' => '.' } ],
MAPIT_URL => 'http://mapit.mysociety.org/',
diff --git a/t/app/controller/report_new.t b/t/app/controller/report_new.t
index 98b0175f8..157d63d01 100644
--- a/t/app/controller/report_new.t
+++ b/t/app/controller/report_new.t
@@ -587,7 +587,7 @@ foreach my $test (
# receive token
my $email = $mech->get_email;
ok $email, "got an email";
- like $email->body, qr/confirm the problem/i, "confirm the problem";
+ like $email->body, qr/confirm that you want to send your\s+report/i, "confirm the problem";
my ($url) = $email->body =~ m{(http://\S+)};
ok $url, "extracted confirm url '$url'";
@@ -932,7 +932,7 @@ subtest "test report creation for a category that is non public" => sub {
my $email = $mech->get_email;
ok $email, "got an email";
- like $email->body, qr/confirm the problem/i, "confirm the problem";
+ like $email->body, qr/confirm that you want to send your\s+report/i, "confirm the problem";
my ($url) = $email->body =~ m{(http://\S+)};
ok $url, "extracted confirm url '$url'";
@@ -1128,7 +1128,7 @@ for my $test (
my $email = $mech->get_email;
ok $email, "got an email";
- like $email->body, qr/confirm the problem/i, "confirm the problem";
+ like $email->body, qr/confirm that you want to send your\s+report/i, "confirm the problem";
my ($url) = $email->body =~ m{(https?://\S+)};
ok $url, "extracted confirm url '$url'";
@@ -1298,7 +1298,7 @@ subtest "test Lichfield" => sub {
# receive token
my $email = $mech->get_email;
ok $email, "got an email";
- like $email->body, qr/confirm the problem/i, "confirm the problem";
+ like $email->body, qr/to confirm that you want to send your/i, "confirm the problem";
my ($url) = $email->body =~ m{(http://\S+)};
ok $url, "extracted confirm url '$url'";
@@ -1576,7 +1576,7 @@ subtest "extra google analytics code displayed on email confirmation problem cre
my $email = $mech->get_email;
ok $email, "got an email";
- like $email->body, qr/confirm the problem/i, "confirm the problem";
+ like $email->body, qr/confirm that you want to/i, "confirm the problem";
my ($url) = $email->body =~ m{(https?://\S+)};
ok $url, "extracted confirm url '$url'";
diff --git a/t/app/controller/report_updates.t b/t/app/controller/report_updates.t
index e84755650..17947a212 100644
--- a/t/app/controller/report_updates.t
+++ b/t/app/controller/report_updates.t
@@ -355,7 +355,7 @@ for my $test (
my $email = $mech->get_email;
ok $email, "got an email";
- like $email->body, qr/confirm the update you/i, "Correct email text";
+ like $email->body, qr/confirm your update on/i, "Correct email text";
my ( $url, $url_token ) = $email->body =~ m{(http://\S+/C/)(\S+)};
ok $url, "extracted confirm url '$url'";
@@ -1010,7 +1010,7 @@ subtest 'submit an update for a registered user, creating update by email' => su
my $email = $mech->get_email;
ok $email, "got an email";
- like $email->body, qr/confirm the update you/i, "Correct email text";
+ like $email->body, qr/confirm your update on/i, "Correct email text";
my ( $url, $url_token ) = $email->body =~ m{(http://\S+/C/)(\S+)};
ok $url, "extracted confirm url '$url'";
@@ -1513,7 +1513,7 @@ for my $test (
my $email = $mech->get_email;
ok $email, "got an email";
- like $email->body, qr/confirm the update you/i, "Correct email text";
+ like $email->body, qr/confirm your update on/i, "Correct email text";
my ( $url, $url_token ) = $email->body =~ m{(http://\S+/C/)(\S+)};
ok $url, "extracted confirm url '$url'";
diff --git a/t/app/model/problem.t b/t/app/model/problem.t
index 24ed959af..f15d56bfe 100644
--- a/t/app/model/problem.t
+++ b/t/app/model/problem.t
@@ -666,8 +666,8 @@ subtest 'check can turn on report sent email alerts' => sub {
ok defined( $problem->whensent ), 'whensent set';
$email = $emails[1];
- like $email->header('Subject'), qr/Problem Report Sent/, 'report sent email title correct';
- like $email->body, qr/Your report about/, 'report sent body correct';
+ like $email->header('Subject'), qr/FixMyStreet Report Sent/, 'report sent email title correct';
+ like $email->body, qr/to submit your report/, 'report sent body correct';
$send_confirmation_mail_override->restore();
};
diff --git a/t/cobrand/zurich.t b/t/cobrand/zurich.t
index e97891b91..e8cf3bee3 100644
--- a/t/cobrand/zurich.t
+++ b/t/cobrand/zurich.t
@@ -565,7 +565,8 @@ subtest "phone number is mandatory" => sub {
MAPIT_TYPES => [ 'O08' ],
MAPIT_URL => 'http://global.mapit.mysociety.org/',
ALLOWED_COBRANDS => [ 'zurich' ],
- MAPIT_ID_WHITELIST => [ 423017 ],
+ MAPIT_ID_WHITELIST => [ 274456 ],
+ MAPIT_GENERATION => 2,
}, sub {
$user = $mech->log_in_ok( 'dm1@example.org' );
$mech->get_ok( '/report/new?lat=47.381817&lon=8.529156' );
@@ -581,6 +582,7 @@ subtest "phone number is not mandatory for reports from mobile apps" => sub {
MAPIT_URL => 'http://global.mapit.mysociety.org/',
ALLOWED_COBRANDS => [ 'zurich' ],
MAPIT_ID_WHITELIST => [ 423017 ],
+ MAPIT_GENERATION => 4,
}, sub {
$mech->post_ok( '/report/new/mobile?lat=47.381817&lon=8.529156' , {
service => 'iPhone',
@@ -678,8 +680,8 @@ subtest "test admin_log" => sub {
is $entries[-1]->action, 'state change to hidden', 'State change logged as expected';
};
-cleanup();
-
-ok $mech->host("www.fixmystreet.com"), "change host back";
-
-done_testing();
+END {
+ cleanup();
+ ok $mech->host("www.fixmystreet.com"), "change host back";
+ done_testing();
+}
diff --git a/templates/email/default/alert-confirm.txt b/templates/email/default/alert-confirm.txt
index 0d23d7733..886b04b00 100644
--- a/templates/email/default/alert-confirm.txt
+++ b/templates/email/default/alert-confirm.txt
@@ -1,13 +1,18 @@
-Subject: Confirm your alert on [% INCLUDE 'site-name.txt' | trim %]
+Subject: Confirm your [% INCLUDE 'site-name.txt' | trim %] alert
-Hi,
+Please click on the link below to confirm your [% INCLUDE 'site-name.txt' | trim %] alert.
-Please click on the link below to confirm the alert you just
-asked to subscribe to on [% INCLUDE 'site-name.txt' | trim %]:
+ [% token_url %]
- [% token_url %]
+If you can't click the link, copy and paste it to the address bar of your web
+browser.
-If you can't click the link, please copy and paste it to the
-address bar of your web browser.
+This confirms that you'd like to receive an email when someone makes a
+[% INCLUDE 'site-name.txt' | trim %] report within your chosen area.
+
+Email alerts are a free service from [% INCLUDE 'site-name.txt' | trim %].
[% INCLUDE 'signature.txt' %]
+
+This email was sent automatically, from an unmonitored email account - so
+please do not reply to it.
diff --git a/templates/email/default/alert-problem-area.txt b/templates/email/default/alert-problem-area.txt
index 3696c87d4..2bcf3fbfc 100644
--- a/templates/email/default/alert-problem-area.txt
+++ b/templates/email/default/alert-problem-area.txt
@@ -1,12 +1,22 @@
-Subject: New problems in <?=$values['area_name']?> on FixMyStreet
+Subject: New <?=$values['site_name']?> reports in <?=$values['area_name']?>
-The following new problems have been added within
+The following new <?=$values['site_name']?> reports have been added in
<?=$values['area_name']?>:
<?=$values['data']?>
<?=$values['signature']?>
-To stop receiving emails when there are new problems in
-<?=$values['area_name']?>, please follow this link:
+
+Unsubscribe?
+
+You asked us to send you an email when someone makes a new <?=$values['site_name']?>
+report in <?=$values['area_name']?>. This is a free service from <?=$values['site_name']?>.
+
+If you no longer wish to receive an email whenever there are new reports in
+<?=$values['area_name']?>, please follow this link:
+
<?=$values['unsubscribe_url']?>
+
+This email was sent automatically, from an unmonitored email account - so please
+do not reply to it.
diff --git a/templates/email/default/alert-problem-council.txt b/templates/email/default/alert-problem-council.txt
index 5544a2043..8bc9d6d20 100644
--- a/templates/email/default/alert-problem-council.txt
+++ b/templates/email/default/alert-problem-council.txt
@@ -1,11 +1,22 @@
-Subject: New problems reported to <?=$values['area_name']?> on FixMyStreet
+Subject: New <?=$values['site_name']?> reports to <?=$values['area_name']?>
-The following new problems have been reported to <?=$values['area_name']?>:
+The following new <?=$values['site_name']?> reports have been sent to
+<?=$values['area_name']?>:
<?=$values['data']?>
<?=$values['signature']?>
-To stop receiving emails when there are new problems reported to
-<?=$values['area_name']?>, please follow this link:
+
+Unsubscribe?
+
+You asked us to send you an email when someone makes a new <?=$values['site_name']?>
+report to <?=$values['area_name']?>. This is a free service from <?=$values['site_name']?>.
+
+If you no longer wish to receive an email whenever there are new reports made to
+<?=$values['area_name']?>, please follow this link:
+
<?=$values['unsubscribe_url']?>
+
+This email was sent automatically, from an unmonitored email account - so please
+do not reply to it.
diff --git a/templates/email/default/alert-problem-nearby.txt b/templates/email/default/alert-problem-nearby.txt
index 0c88dab5a..3dc562840 100644
--- a/templates/email/default/alert-problem-nearby.txt
+++ b/templates/email/default/alert-problem-nearby.txt
@@ -1,10 +1,22 @@
-Subject: New nearby problems on FixMyStreet
+Subject: New reports on <?=$values['site_name']?>
-The following nearby problems have been added:
+The following <?=$values['site_name']?> reports have been made within the area
+you specified:
<?=$values['data']?>
<?=$values['signature']?>
-To stop receiving emails when there are nearby problems,
-please follow this link: <?=$values['unsubscribe_url']?>
+
+Unsubscribe?
+
+You asked us to send you an email when someone makes a new <?=$values['site_name']?>
+report within your chosen area. This is a free service from <?=$values['site_name']?>.
+
+If you no longer wish to receive an email whenever there are new reports within
+this area, please follow this link:
+
+<?=$values['unsubscribe_url']?>
+
+This email was sent automatically, from an unmonitored email account - so please
+do not reply to it.
diff --git a/templates/email/default/alert-problem-ward.txt b/templates/email/default/alert-problem-ward.txt
index 9793bcdac..9bcc770b1 100644
--- a/templates/email/default/alert-problem-ward.txt
+++ b/templates/email/default/alert-problem-ward.txt
@@ -1,12 +1,24 @@
-Subject: New problems reported to <?=$values['area_name']?> within <?=$values['ward_name']?> on FixMyStreet
+Subject: New <?=$values['site_name']?> reports to <?=$values['area_name']?> within <?=$values['ward_name']?>
-The following new problems have been reported to <?=$values['area_name']?>
+The following new <?=$values['site_name']?> reports have been sent to <?=$values['area_name']?>
within <?=$values['ward_name']?>:
<?=$values['data']?>
<?=$values['signature']?>
-To stop receiving emails when there are new problems reported to
-<?=$values['area_name']?> within <?=$values['ward_name']?>,
-please follow this link: <?=$values['unsubscribe_url']?>
+
+Unsubscribe?
+
+You subscribed to receive an email every time someone makes a new <?=$values['site_name']?>
+report to <?=$values['area_name']?> within <?=$values['ward_name']?>.This is a
+free service from <?=$values['site_name']?>.
+
+If you no longer wish to receive an email whenever there are new reports to
+<?=$values['area_name']?> within <?=$values['ward_name']?>, please follow
+this link:
+
+<?=$values['unsubscribe_url']?>
+
+This email was sent automatically, from an unmonitored email account - so please
+do not reply to it.
diff --git a/templates/email/default/alert-problem.txt b/templates/email/default/alert-problem.txt
index 01e184e0a..edce34931 100644
--- a/templates/email/default/alert-problem.txt
+++ b/templates/email/default/alert-problem.txt
@@ -1,10 +1,21 @@
-Subject: New problems on FixMyStreet
+Subject: New reports on <?=$values['site_name']?>
-The following new problems have been added:
+The following new reports have been added to <?=$values['site_name']?>:
<?=$values['data']?>
<?=$values['signature']?>
-To stop receiving emails when there are new problems,
-please follow this link: <?=$values['unsubscribe_url']?>
+
+Unsubscribe?
+
+You subscribed to receive an email when someone makes a new <?=$values['site_name']?>
+report. This is a free service from <?=$values['site_name']?>.
+
+If you no longer wish to receive an email whenever there are new <?=$values['site_name']?>
+reports please follow this link:
+
+<?=$values['unsubscribe_url']?>
+
+This email was sent automatically, from an unmonitored email account - so please
+do not reply to it.
diff --git a/templates/email/default/alert-update.txt b/templates/email/default/alert-update.txt
index 1140de1fa..93ba11e01 100644
--- a/templates/email/default/alert-update.txt
+++ b/templates/email/default/alert-update.txt
@@ -1,17 +1,27 @@
-Subject: New updates on problem - '<?=$values['title']?>'
+Subject: New <?=$values['site_name']?> updates on report: '<?=$values['title']?>'
-The following updates have been left on this problem:
+You asked us to send you an email every time an update was made to the
+<?=$values['site_name']?> report: <?=$values['title']?>.
+
+The following updates have been left on this report:
<?=$values['data']?>
<?=$values['state_message']?>
-To view or reply to these updates, please visit the following URL:
+If you would like to view or reply to these updates, please visit the following URL:
<?=$values['problem_url']?>
-You cannot contact anyone by replying to this email.
+This email was sent automatically, from an unmonitored email account - so
+please do not reply to it.
<?=$values['signature']?>
-To stop receiving emails when there are new updates on this problem,
+
+Unsubscribe?
+
+We currently email you whenever someone leaves an update on the
+<?=$values['site_name']?> report: <?=$values['title']?>.
+
+If you no longer wish to receive an email whenever this report is updated,
please follow this link: <?=$values['unsubscribe_url']?>
diff --git a/templates/email/default/confirm_report_sent.txt b/templates/email/default/confirm_report_sent.txt
index 201888270..735d52027 100644
--- a/templates/email/default/confirm_report_sent.txt
+++ b/templates/email/default/confirm_report_sent.txt
@@ -1,9 +1,25 @@
-Subject: Problem Report Sent: <?=$values['title']?>
+Subject: <?=$values['site_name']?> Report Sent: <?=$values['title']?>
-Hi,
+Hello,
-Your report about "<?=$values['title']?>" has been sent to <?=$values['bodies_name']?>.
+Thank you for using <?=$values['site_name']?> to submit your report
+"<?=$values['title']?>".
-Thanks
+This is to confirm that it has now been sent to <?=$values['bodies_name']?>,
+who should respond to you directly.
+
+Your report is also on <?=$values['url']?>, where others may read, comment or
+offer advice.
+
+You should also feel free to add updates to that page, although note that they
+will not be sent to your council.
+
+If you'd like to update your council, please wait for their reply so that you
+can respond to them directly.
+
+Good luck in getting your problem fixed.
<?=$values['signature']?>
+
+This email was sent automatically, from an unmonitored email account - so
+please do not reply to it.
diff --git a/templates/email/default/login.txt b/templates/email/default/login.txt
index 762407b01..360eb8512 100644
--- a/templates/email/default/login.txt
+++ b/templates/email/default/login.txt
@@ -1,9 +1,13 @@
-Subject: Your FixMyStreet.com account details
+Subject: Your [% INCLUDE 'site-name.txt' | trim %] account details
-Please click on the link below to confirm your email address. Then you will be
-able to view your problem reports and manage them more easily.
+Please click on the link below to confirm your email address.
[% c.uri_for_action( 'auth/token', token ) %]
+Once you've done this, you'll be able to view and manage all reports and
+updates you've made on [% INCLUDE 'site-name.txt' | trim %].
+
[% INCLUDE 'signature.txt' %]
+This email was sent automatically, from an unmonitored email account - so
+please do not reply to it.
diff --git a/templates/email/default/partial.txt b/templates/email/default/partial.txt
index 82bc0cf0e..fb5e17c10 100644
--- a/templates/email/default/partial.txt
+++ b/templates/email/default/partial.txt
@@ -1,13 +1,16 @@
-Subject: Confirm your report on FixMyStreet
+Subject: Confirm your report on [% INCLUDE 'site-name.txt' | trim %]
-Hi [% report.name || report.email %],
+Hello [% report.name || report.email %],
-To confirm the report you have uploaded to FixMyStreet via
-[% report.service %], and to check or add any details,
-please visit the following URL:
+To confirm the report you have uploaded to [% INCLUDE 'site-name.txt' | trim %]
+via [% report.service %], and to check or add any details, please visit the
+following URL:
[% token_url %]
Thanks!
[% INCLUDE 'signature.txt' %]
+
+This email was sent automatically, from an unmonitored email account - so
+please do not reply to it.
diff --git a/templates/email/default/problem-confirm.txt b/templates/email/default/problem-confirm.txt
index 3a6bbe03a..ab4870bb1 100644
--- a/templates/email/default/problem-confirm.txt
+++ b/templates/email/default/problem-confirm.txt
@@ -1,19 +1,31 @@
-Subject: Confirm your problem on [% INCLUDE 'site-name.txt' | trim %]
+Subject: Confirm your report on [% INCLUDE 'site-name.txt' | trim %]
-Hi [% report.name %],
+Hello [% report.name %],
-Please click on the link below to confirm the problem you just
-added to [% INCLUDE 'site-name.txt' | trim %]:
+Please click on the link below to confirm that you want to send your report to
+[% report.body %]. Note that your report will also appear on the [% INCLUDE 'site-name.txt' | trim %]
+website:
[% token_url %]
-If your email program does not let you click on this link,
-copy and paste it into your web browser and press return.
+If your email program does not let you click on this link, copy and paste it
+into your web browser and press return.
Your problem had the title:
+
[% report.title %]
And details:
+
[% report.detail %]
+If you no longer wish to send this report, please take no further action.
+
+Thank you for submitting a report through [% INCLUDE 'site-name.txt' | trim %].
+
+
+
[% INCLUDE 'signature.txt' %]
+
+This email was sent automatically, from an unmonitored email account - so
+please do not reply to it.
diff --git a/templates/email/default/questionnaire.txt b/templates/email/default/questionnaire.txt
index 88d4cc1b5..4257792da 100644
--- a/templates/email/default/questionnaire.txt
+++ b/templates/email/default/questionnaire.txt
@@ -1,23 +1,24 @@
-Subject: FixMyStreet questionnaire about '<?=$values['title']?>'
+Subject: Questionnaire about your <?=$values['site_name']?> report: '<?=$values['title']?>'
-Hi <?=$values['name']?>,
+Hello <?=$values['name']?>,
-<?=$values['created']?> ago, you left a problem on FixMyStreet
-with the details provided at the end of this email. To keep our
-site up to date and relevant, we'd appreciate it if you could
-follow the link below and fill in our short questionnaire
+<?=$values['created']?> ago, you reported a problem using <?=$values['site_name']?>.
+
+The details of that report are at the end of this email.
+
+To keep <?=$values['site_name']?> up to date and relevant, we'd appreciate it
+if you could follow the link below and fill in our short questionnaire
updating the status of your problem:
<?=$values['url']?>
-Please do not reply to this email; there is a public comment
-box on the questionnaire.
-
<?=$values['signature']?>
-Your problem was as follows:
+Your report was as follows:
<?=$values['title']?>
<?=$values['detail']?>
+This email was sent automatically, from an unmonitored email account - so
+please do not reply to it.
diff --git a/templates/email/default/reply-autoresponse b/templates/email/default/reply-autoresponse
index f984c66b0..5751dc524 100644
--- a/templates/email/default/reply-autoresponse
+++ b/templates/email/default/reply-autoresponse
@@ -1,23 +1,39 @@
Subject: Automatic reply to your message to FixMyStreet
-Hi,
+Hello,
-This is an automatic response to your email; your email has not been delivered.
+You are receiving this message because you have tried to reply to an automated
+email from FixMyStreet.
-If you're replying to an email about a report update, please visit
-the URL given in the email in order to leave a reply. You cannot
-reply to an update via email.
+This is an automatic response to your email.
-If you are trying to confirm something, such as a report or an email
-alert, please click the link in the email that we sent you, or, if
-you cannot click the link, copy and paste it into the address bar of
-your web browser.
+If you are trying to contact your council about a report you have made, please
+search your email for their latest communication (or auto-reply), and respond
+to that.
-If you're trying to unsubscribe from an email alert, there is an
-unsubscribe link at the bottom of the email.
+Alternatively, if you would like your comment to be published on our website,
+you can post it as an update to the original report. Note, however, that updates
+are not sent to the council - they are a way for residents to discuss local
+problems and offer advice or support. With this in mind, you may wish to both
+update your original report, and chase your council via email.
-If you have a question or comment about the site, please send your
-email to team@fixmystreet.com
+If you would like to respond to our question about whether your problem has
+been fixed, please follow the link in the email we sent you.
+
+If you are trying to reply to an update someone has left on your report, please
+visit your report page on FixMyStreet and enter your response in the 'update'
+box.
+
+If you are trying to confirm a report or an email alert, please click the link
+in the email that we sent you, or, if you cannot click the link, copy and paste
+it into the address bar of your web browser.
+
+If you're trying to unsubscribe from an email alert, there is an unsubscribe
+link at the bottom of the email.
+
+All the best,
-Yours,
The FixMyStreet team
+
+This email was sent automatically, from an unmonitored email account - so
+please do not reply to it.
diff --git a/templates/email/default/signature.txt b/templates/email/default/signature.txt
index 69ee38767..f94250564 100644
--- a/templates/email/default/signature.txt
+++ b/templates/email/default/signature.txt
@@ -1,2 +1,3 @@
-Yours,
+All the best,
+
The FixMyStreet team
diff --git a/templates/email/default/submit-brent.txt b/templates/email/default/submit-brent.txt
index 75a954765..44c9ad744 100644
--- a/templates/email/default/submit-brent.txt
+++ b/templates/email/default/submit-brent.txt
@@ -39,5 +39,5 @@ also welcome any other feedback you may have.
FixMyStreet is now available for full integration into council
websites, making life easier for both you and your residents.
-Read more here: http://www.mysociety.org/for-councils/fixmystreet/
+Read more here: http://www.mysociety.org/services/fixmystreet-for-councils/
diff --git a/templates/email/default/submit-example.txt b/templates/email/default/submit-example.txt
index 4956a7a93..117584467 100644
--- a/templates/email/default/submit-example.txt
+++ b/templates/email/default/submit-example.txt
@@ -57,5 +57,5 @@ feedback you may have.
FixMyStreet is now available for full integration into council
websites, making life easier for both you and your residents.
-Read more here: http://www.mysociety.org/for-councils/fixmystreet/
+Read more here: http://www.mysociety.org/services/fixmystreet-for-councils/
diff --git a/templates/email/default/submit.txt b/templates/email/default/submit.txt
index 6066a7b68..2a2eae3e6 100644
--- a/templates/email/default/submit.txt
+++ b/templates/email/default/submit.txt
@@ -39,5 +39,5 @@ also welcome any other feedback you may have.
FixMyStreet is now available for full integration into council
websites, making life easier for both you and your residents.
-Read more here: http://www.mysociety.org/for-councils/fixmystreet/
+Read more here: http://www.mysociety.org/services/fixmystreet-for-councils/
diff --git a/templates/email/default/update-confirm-donotsend.txt b/templates/email/default/update-confirm-donotsend.txt
new file mode 100644
index 000000000..bbeffef6e
--- /dev/null
+++ b/templates/email/default/update-confirm-donotsend.txt
@@ -0,0 +1,3 @@
+Note that we do not send updates to [% update.problem.body %] - they are
+intended as a place for [% INCLUDE 'site-name.txt' | trim %] users to
+discuss, support, and offer advice.
diff --git a/templates/email/default/update-confirm.txt b/templates/email/default/update-confirm.txt
index beefac9c1..039a3bb39 100644
--- a/templates/email/default/update-confirm.txt
+++ b/templates/email/default/update-confirm.txt
@@ -1,17 +1,21 @@
Subject: Confirm your update on [% INCLUDE 'site-name.txt' | trim %]
-Hi [% update.name %],
+Hello [% update.name %],
-Please click on the link below to confirm the update you just
-wrote:
+Please click on the link below to confirm your update on [% INCLUDE 'site-name.txt' | trim %]:
[% token_url %]
-If your email program does not let you click on this link,
-copy and paste it into your web browser and press return.
+If your email program does not let you click on this link, copy and paste it
+into your web browser and press return.
Your update reads:
[% update.text %]
+[% INCLUDE 'update-confirm-donotsend.txt' %]
+
[% INCLUDE 'signature.txt' %]
+
+This email was sent automatically, from an unmonitored email account - so
+please do not reply to it.
diff --git a/templates/email/fixmystreet/alert-problem-area.txt b/templates/email/fixmystreet/alert-problem-area.txt
deleted file mode 100644
index 736e45143..000000000
--- a/templates/email/fixmystreet/alert-problem-area.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Subject: New problems in <?=$values['area_name']?> on FixMyStreet
-
-The following new problems have been added within
-<?=$values['area_name']?>:
-
-<?=$values['data']?>
-
--------
-
-<?=$values['signature']?>
-
-To stop receiving emails when there are new problems in
-<?=$values['area_name']?>, please follow this link:
-<?=$values['unsubscribe_url']?>
diff --git a/templates/email/fixmystreet/alert-problem-council.txt b/templates/email/fixmystreet/alert-problem-council.txt
deleted file mode 100644
index 65b11aceb..000000000
--- a/templates/email/fixmystreet/alert-problem-council.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Subject: New problems reported to <?=$values['area_name']?> on FixMyStreet
-
-The following new problems have been reported to <?=$values['area_name']?>:
-
-<?=$values['data']?>
-
--------
-
-<?=$values['signature']?>
-
-To stop receiving emails when there are new problems reported to
-<?=$values['area_name']?>, please follow this link:
-<?=$values['unsubscribe_url']?>
diff --git a/templates/email/fixmystreet/alert-problem-nearby.txt b/templates/email/fixmystreet/alert-problem-nearby.txt
deleted file mode 100644
index 17d792a12..000000000
--- a/templates/email/fixmystreet/alert-problem-nearby.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Subject: New nearby problems on FixMyStreet
-
-The following nearby problems have been added:
-
-<?=$values['data']?>
-
--------
-
-<?=$values['signature']?>
-
-To stop receiving emails when there are nearby problems,
-please follow this link: <?=$values['unsubscribe_url']?>
diff --git a/templates/email/fixmystreet/alert-problem-ward.txt b/templates/email/fixmystreet/alert-problem-ward.txt
deleted file mode 100644
index dc7a02b9b..000000000
--- a/templates/email/fixmystreet/alert-problem-ward.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-Subject: New problems reported to <?=$values['area_name']?> within <?=$values['ward_name']?> on FixMyStreet
-
-The following new problems have been reported to <?=$values['area_name']?>
-within <?=$values['ward_name']?>:
-
-<?=$values['data']?>
-
--------
-
-<?=$values['signature']?>
-
-To stop receiving emails when there are new problems reported to
-<?=$values['area_name']?> within <?=$values['ward_name']?>,
-please follow this link: <?=$values['unsubscribe_url']?>
diff --git a/templates/email/fixmystreet/alert-problem.txt b/templates/email/fixmystreet/alert-problem.txt
deleted file mode 100644
index 12af205f1..000000000
--- a/templates/email/fixmystreet/alert-problem.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Subject: New problems on FixMyStreet
-
-The following new problems have been added:
-
-<?=$values['data']?>
-
--------
-
-<?=$values['signature']?>
-
-To stop receiving emails when there are new problems,
-please follow this link: <?=$values['unsubscribe_url']?>
diff --git a/templates/email/fixmystreet/alert-update.txt b/templates/email/fixmystreet/alert-update.txt
deleted file mode 100644
index 7cbf26c44..000000000
--- a/templates/email/fixmystreet/alert-update.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Subject: New updates on problem - '<?=$values['title']?>'
-
-The following updates have been left on this problem:
-
-<?=$values['data']?>
-
-<?=$values['state_message']?>
-
-To view or reply to these updates, please visit the following URL:
- <?=$values['problem_url']?>
-
-You cannot contact anyone by replying to this email.
-
--------
-
-<?=$values['signature']?>
-
-To stop receiving emails when there are new updates on this problem,
-please follow this link: <?=$values['unsubscribe_url']?>
diff --git a/templates/email/fixmystreet/signature.txt b/templates/email/fixmystreet/signature.txt
new file mode 100644
index 000000000..67906ac2f
--- /dev/null
+++ b/templates/email/fixmystreet/signature.txt
@@ -0,0 +1,11 @@
+All the best,
+
+The FixMyStreet team
+
+http://www.FixMyStreet.com
+Twitter: https://twitter.com/FixMyStreet
+Facebook: http://www.facebook.com/fixmystreet
+
+Problems? questions?
+
+Visit http://www.fixmystreet.com/faq
diff --git a/templates/email/fixmystreet/update-confirm-donotsend.txt b/templates/email/fixmystreet/update-confirm-donotsend.txt
new file mode 100644
index 000000000..2e04dc0bf
--- /dev/null
+++ b/templates/email/fixmystreet/update-confirm-donotsend.txt
@@ -0,0 +1,8 @@
+[% IF update.problem.bodies_str != 2482 AND update.problem.bodies_str != 2347 %]
+Note that we do not send updates to [% update.problem.body %] - they are
+intended as a place for [% INCLUDE 'site-name.txt' | trim %] users to
+discuss, support, and offer advice.
+[% ELSE %]
+This update will be sent to [% update.problem.body %] and will
+also be displayed on the [% INCLUDE 'site-name.txt' | trim %] website.
+[% END %]
diff --git a/templates/web/default/admin/config_page.html b/templates/web/default/admin/config_page.html
index f198de2af..83300e4db 100644
--- a/templates/web/default/admin/config_page.html
+++ b/templates/web/default/admin/config_page.html
@@ -84,6 +84,7 @@ running version <strong>[% git_version || 'unknown' %]</strong>.
[% INCLUDE with_cobrand value="MAPIT_TYPES"
cob = c.cobrand.area_types %]
[% INCLUDE just_value value="MAPIT_ID_WHITELIST" %]
+[% INCLUDE just_value value="MAPIT_GENERATION" %]
[% INCLUDE with_cobrand value="MAPIT_TYPES_CHILDREN"
cob = c.cobrand.area_types_children %]
diff --git a/templates/web/default/my/my.html b/templates/web/default/my/my.html
index 48a33a1d2..33b2cc6a4 100644
--- a/templates/web/default/my/my.html
+++ b/templates/web/default/my/my.html
@@ -13,6 +13,8 @@
<h1>[% loc('Your Reports') %]</h1>
+<p><a href="/auth/change_password">[% loc('Change password') %]</a></p>
+
[% IF ! has_content %]
[% tprintf( loc('You haven&rsquo;t created any reports yet. <a href="%s">Report a problem now.</a>'),
c.uri_for('/') ) %]
diff --git a/templates/web/fixamingata/front/recent.html b/templates/web/fixamingata/front/recent.html
new file mode 100644
index 000000000..04873f144
--- /dev/null
+++ b/templates/web/fixamingata/front/recent.html
@@ -0,0 +1,30 @@
+ [%
+ recent_photos = c.cobrand.recent_photos('front', 5);
+ %]
+
+ <div id="front-recently">
+ <div id="fb-root"></div>
+ <script>(function(d, s, id) {
+ var js, fjs = d.getElementsByTagName(s)[0];
+ if (d.getElementById(id)) return;
+ js = d.createElement(s); js.id = id;
+ js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.0";
+ fjs.parentNode.insertBefore(js, fjs);
+ }(document, 'script', 'facebook-jssdk'));</script>
+ <link rel="canonical" href="https://plus.google.com/105025269316032228481" />
+ <div style="height: 50px; position: relative;"><div class="fb-like" data-href="https://www.facebook.com/fixamingata" data-layout="button_count" data-action="like" data-show-faces="true" data-share="true" style="float: left;"></div>&nbsp;&nbsp;&nbsp;<script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script><div style="float: left; padding-left: 20px; padding-top: 2px;"><g:plusone></g:plusone></div></div>
+ [% IF recent_photos.size %]
+ <h2>
+ [% loc('Recently reported problems') %]
+ </h2>
+
+ <section class="full-width">
+ <ul class="issue-list-a">
+ [% FOREACH problem IN recent_photos %]
+ [% INCLUDE 'report/_item.html', no_fixed = 1 %]
+ [% END %]
+ </ul>
+ </section>
+
+ [% END %]
+ </div>
diff --git a/templates/web/fixamingata/index.html b/templates/web/fixamingata/index.html
deleted file mode 100644
index aa81378c6..000000000
--- a/templates/web/fixamingata/index.html
+++ /dev/null
@@ -1,84 +0,0 @@
-[%# Assumes fixmystreet cobrand is using FMS map template - for bonus points preload all the right map elements. %]
-[% map_js = BLOCK %]
-<script>
-yepnope.addPrefix( 'preload', function ( resource ) {
- resource.noexec = true;
- return resource;
-});
-Modernizr.load({
- load: [
- "preload![% version('/js/OpenLayers.fixmystreet.js') %]",
- "preload![% version('/js/map-OpenLayers.js') %]",
- "preload![% version('/js/map-bing-ol.js') %]",
- "preload![% version('/js/jquery.ba-hashchange.min.js') %]"
- ]
-});
-</script>
-[% END %]
-
-[% pre_container_extra = PROCESS 'around/postcode_form.html' %]
-[% INCLUDE 'header.html', title = '', bodyclass = 'frontpage fullwidthpage' %]
-
-[% IF error %]
- <p class="form-error">[% error %]</p>
-[% END %]
-
-[% IF c.cobrand.moniker == 'bromley' %]
-<p>This is primarily for reporting physical problems that can be fixed
-like graffiti, cleansing issues or road defects. To report other
-kinds of problems like missed bins use our
-<a href="http://www.bromley.gov.uk/report">online report it forms</a>.
-</p>
-[% END %]
-
-<div class="tablewrapper">
- <div id="front-howto">
- [% INCLUDE 'index-steps.html' %]
- </div>
-
- [%
- recent_photos = c.cobrand.recent_photos('front', 5);
- %]
-
- <div id="front-recently">
- <div id="fb-root"></div>
- <script>(function(d, s, id) {
- var js, fjs = d.getElementsByTagName(s)[0];
- if (d.getElementById(id)) return;
- js = d.createElement(s); js.id = id;
- js.src = "//connect.facebook.net/en_US/sdk.js#xfbml=1&version=v2.0";
- fjs.parentNode.insertBefore(js, fjs);
- }(document, 'script', 'facebook-jssdk'));</script>
- <link rel="canonical" href="https://plus.google.com/105025269316032228481" />
- <div style="height: 50px; position: relative;"><div class="fb-like" data-href="https://www.facebook.com/fixamingata" data-layout="button_count" data-action="like" data-show-faces="true" data-share="true" style="float: left;"></div>&nbsp;&nbsp;&nbsp;<script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script><div style="float: left; padding-left: 20px; padding-top: 2px;"><g:plusone></g:plusone></div></div>
- [% IF recent_photos.size %]
- <h2>
- [% IF c.cobrand.moniker == 'hart' %]
- Recently reported
- [% ELSE %]
- [% loc('Recently reported problems') %]
- [% END %]
- </h2>
-
- <section class="full-width">
- <ul class="issue-list-a">
- [% FOREACH problem IN recent_photos %]
- [% INCLUDE 'report/_item.html', no_fixed = 1 %]
- [% END %]
- </ul>
- </section>
-
- <!-- [% IF c.cobrand.moniker != 'emptyhomes' %] -->
- <!-- <section class="full-width"> -->
- <!-- [% INCLUDE "front/stats.html" %] -->
- <!-- [% TRY %][% INCLUDE "front/tips.html" %][% CATCH file %][% END %] -->
- <!-- </section> -->
- <!-- [% END %] -->
-
- [% END %]
- </div>
-</div>
-
-<!-- [% TRY %][% INCLUDE 'front/news.html' %][% CATCH file %][% END %] -->
-
-[% INCLUDE 'footer.html' pagefooter = 'yes' %]
diff --git a/templates/web/fixmystreet/front/recent.html b/templates/web/fixmystreet/front/recent.html
new file mode 100644
index 000000000..4cb575489
--- /dev/null
+++ b/templates/web/fixmystreet/front/recent.html
@@ -0,0 +1,24 @@
+ [%
+ recent_photos = c.cobrand.recent_photos('front', 5);
+ %]
+
+ [% IF recent_photos.size %]
+ <div id="front-recently">
+ <h2>
+ [% IF c.cobrand.moniker == 'hart' %]
+ Recently reported
+ [% ELSE %]
+ [% loc('Recently reported problems') %]
+ [% END %]
+ </h2>
+
+ <section class="full-width">
+ <ul class="issue-list-a">
+ [% FOREACH problem IN recent_photos %]
+ [% INCLUDE 'report/_item.html', no_fixed = 1 %]
+ [% END %]
+ </ul>
+ </section>
+
+ </div>
+ [% END %]
diff --git a/templates/web/fixmystreet/index.html b/templates/web/fixmystreet/index.html
index 4d674a17e..a20c35e51 100644
--- a/templates/web/fixmystreet/index.html
+++ b/templates/web/fixmystreet/index.html
@@ -36,30 +36,7 @@ kinds of problems like missed bins use our
[% INCLUDE 'index-steps.html' %]
</div>
- [%
- recent_photos = c.cobrand.recent_photos('front', 5);
- %]
-
- [% IF recent_photos.size %]
- <div id="front-recently">
- <h2>
- [% IF c.cobrand.moniker == 'hart' %]
- Recently reported
- [% ELSE %]
- [% loc('Recently reported problems') %]
- [% END %]
- </h2>
-
- <section class="full-width">
- <ul class="issue-list-a">
- [% FOREACH problem IN recent_photos %]
- [% INCLUDE 'report/_item.html', no_fixed = 1 %]
- [% END %]
- </ul>
- </section>
-
- </div>
- [% END %]
+ [% INCLUDE 'front/recent.html' %]
</div>
diff --git a/templates/web/fixmystreet/my/my.html b/templates/web/fixmystreet/my/my.html
index 5c4ccf2af..db162a7ba 100644
--- a/templates/web/fixmystreet/my/my.html
+++ b/templates/web/fixmystreet/my/my.html
@@ -13,6 +13,8 @@
<h1>[% loc('Your Reports') %]</h1>
+<p><a href="/auth/change_password">[% loc('Change password') %]</a></p>
+
[% IF ! has_content %]
[% tprintf( loc('You haven&rsquo;t created any reports yet. <a href="%s">Report a problem now.</a>'),
c.uri_for('/') ) %]
diff --git a/templates/web/fixmystreet/questionnaire/completed-open.html b/templates/web/fixmystreet/questionnaire/completed-open.html
index f39083cce..ff19134be 100644
--- a/templates/web/fixmystreet/questionnaire/completed-open.html
+++ b/templates/web/fixmystreet/questionnaire/completed-open.html
@@ -3,10 +3,30 @@
Thank you very much for filling in our questionnaire.
</p>
[% ELSE %]
+ [% IF c.cobrand.moniker == 'fixmystreet' %]
+ <p style="font-size:150%">We&rsquo;re sorry to hear that your problem hasn't been fixed.</p>
+
+ <p>
+ FixMyStreet helps you send a report to your council, but we're not responsible for fixing things.
+ If you'd like to chase your issue, please search your inbox for the latest reply, or auto-reply
+ from your council, and respond to that.
+ </p>
+
+ <p>
+ Meanwhile, if you're getting nowhere, you might consider writing to your local councillor or other
+ representative to see if they can help.
+ </p>
+
+ <p>
+ You can do this on <a href="https://www.writetothem.com/">https://www.writetothem.com/</a>, another
+ useful mySociety website.
+ </p>
+ [% ELSE %]
[% loc('<p style="font-size:150%">We&rsquo;re sorry to hear that. We have two
suggestions: why not try <a href="http://www.writetothem.com/">writing direct
to your councillor(s)</a> or, if it&rsquo;s a problem that could be fixed by
local people working together, why not
<a href="http://www.pledgebank.com/new">make and publicise a pledge</a>?
</p>' ) %]
+ [% END %]
[% END %]
diff --git a/web/js/map-bing-ol.js b/web/js/map-bing-ol.js
index 846133cd5..535edac21 100644
--- a/web/js/map-bing-ol.js
+++ b/web/js/map-bing-ol.js
@@ -1,4 +1,4 @@
-var tile_base = [ [ '', 'a.', 'b.', 'c.' ], 'http://{S}tilma.mysociety.org/sv' ];
+var tile_base = [ [ '', 'a-', 'b-', 'c-' ], '//{S}tilma.mysociety.org/sv' ];
function set_map_config(perm) {
var permalink_id;