diff options
465 files changed, 37656 insertions, 17283 deletions
diff --git a/.gitignore b/.gitignore index 777f3bafd..3241af718 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,6 @@ phonegap/www/js/config.js phonegap/Android/bin/ phonegap/iPhone/FixMyStreet.xcodeproj/project.xcworkspace/xcuserdata phonegap/Android/gen/ + +/fixmystreet-international +*[Mm]ake[Mm]y[Ii]sland* diff --git a/.travis.yml b/.travis.yml index 2c80b3534..1f8e95d58 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,6 +5,9 @@ notifications: - "irc.mysociety.org#fixmystreet" use_notice: true skip_join: true + webhooks: + urls: + - https://webhooks.gitter.im/e/863c1892a6a51e5a3b3c language: perl perl: @@ -17,10 +20,6 @@ env: - secure: "qW+WCgAF68itADxcbcq+nCnKx3vf3GX73HMfjfbkFFUsYmIR+ZaJ9yQMnGJwxIpCHTWLAeqyx4KO8N8T3GmNdKYzIMZemOzp4ED29YC31QOQeq1CwNp2hD5sq/o47d2BzXWwMYNvNXfxz1K6r2c6EMPUtu8X3B8ExZq1RzSFdXs=" before_install: - - sudo apt-get update -qq - - sudo apt-get install -qq jhead libgmp-dev python-boto -# A couple of other modules that normally come from packages, but no system stuff here - - cpanm -q Locale::gettext Math::BigInt::GMP - sudo locale-gen cy_GB.UTF-8 en_GB.UTF-8 nb_NO.UTF-8 de_CH.UTF-8 sv_SE.UTF-8 install: - .travis/install diff --git a/.travis/after_script b/.travis/after_script index 37fd37eb8..006ff7849 100755 --- a/.travis/after_script +++ b/.travis/after_script @@ -2,13 +2,11 @@ import hashlib import os +import site import subprocess import sys import tarfile -import boto -from boto.s3.key import Key - root = os.path.join(os.path.dirname(__file__), '..') with open(os.path.join(root, 'cpanfile.snapshot')) as cpanfile: hash = hashlib.md5(cpanfile.read()).hexdigest() @@ -18,6 +16,12 @@ if os.path.exists(wanted_filename) and os.path.getsize(wanted_filename): print "File was downloaded, no need to upload" sys.exit() +site.addsitedir(site.getusersitepackages()) +os.system('pip install --user boto') + +import boto +from boto.s3.key import Key + print "Creating archive..." tfile = tarfile.open(wanted_filename, 'w:gz') tfile.add('local') diff --git a/.travis/install b/.travis/install index c766d3598..b73eef330 100755 --- a/.travis/install +++ b/.travis/install @@ -19,6 +19,8 @@ try: tfile.extractall() print "Cached copy found and extracted" sys.exit(0) + else: + os.remove(wanted_filename) except IOError: os.remove(wanted_filename) diff --git a/.tx/config b/.tx/config index 45f921856..f23aac597 100644 --- a/.tx/config +++ b/.tx/config @@ -2,7 +2,7 @@ host = https://www.transifex.com type = PO -[fixmystreet.v1-5] +[fixmystreet.v1-5-4] file_filter = locale/<lang>.UTF-8/LC_MESSAGES/FixMyStreet.po source_file = locale/FixMyStreet.po source_lang = en_GB @@ -14,7 +14,7 @@ RSS alerts of problems in their area. It was created in 2007 by [mySociety](https://www.mysociety.org/) for reporting problems to UK councils and has been copied around the world. The FixMyStreet -Platform is now at version 1.5.2. +Platform is now at version 1.6.1. ## Installation @@ -38,6 +38,79 @@ We've extracted all of the mobile apps from this repository into the ## Releases +* v1.6.1 (31st July 2015) + - Bugfixes: + - Fix bug introduced in last release when setting multiple areas + for a body in the admin. #1158 + - New features: + - Danish translation. + - Front end improvements: + - Fix “All Reports” table headers on scroll. #50 + - Add time tooltips to All Reports table headings. #983 + - Fix sidebar running over the footer on alerts page. #1168 + - Admin improvements: + - Add mark as sent button. #601 + - Add link to comment user ID from body form if present. #580 + - Add MapIt links from body page/ report co-ordinates. #638 + - Show any category extra data. #517 #920 + - Mark users who have moderate permission. #990 + - Allow editing of body external URL. + - List a report’s bodies more nicely. + - UK specific improvements: + - Explain gone Northern Ireland councils. #1151 + - Better messaging for councils refusing messages. #968 + +* v1.5.5 / v1.6 (10th July 2015) + - Security: + - Fix vulnerability in login email sending that could allow an account + to be hijacked by a third party. + - Time out email authentication tokens. + - Update dependency to fix issue with Unicode characters in passwords. + - New features: + - Chinese translation. + - Front end improvements: + - Add “Report” button in default mobile header. #931 + - Use ‘hamburger’ menu icon in mobile header. #931 + - Resize map pins based on zoom level. #1041 + - Improve report meta information display. #1080 + - Display message on body page when reports list is empty. + - Bugfixes: + - Fix issue with shrunken update photos. #424 + - Fix typo in footer role="contentinfo". + - Default Google maps to satellite view. #1133 + - Update Bing Maps parameter ID. + - Development improvements: + - Add ability for map pages to filter by category/state. #1134 + (this is currently on a couple of cobrands, to add to base soon) + - Allow cobrands to specify ordering on all reports page. + - Use mocked Nominatim in tests to cope with bad connections. + - Add Extra role to ease use of the {extra} database field. #1018 + - UK specific improvements: + - Add dog poop poster. #1028 + +* v1.5.4 (25th February 2015) + - New features: + - Stamen toner-lite and Bing Maps tiles. + - Czech and part-done Lithuanian translations. + - Front end improvements: + - Nicer confirmation pages, with next steps template example. #972 + - Always show report/update confirmation page, even if logged in. #1003 + - Expire cached geolocations after a week. #684 + - Bugfixes: + - Make sure all co-ordinates are stringified/truncated. #1009 + - Correct "Open Street Map" to "OpenStreetMap". #1021 + - Only create timezone objects once, at startup. + - Development improvements: + - Remove need to specify en-gb in LANGUAGES. #1015 + - Mac installation improvements. #1014 + - Make use of jhead and Math::BigInt::GMP optional. #1016 + - Link from admin config page to MapIt. #1022 + - Test URLs for confirmation pages. + - New configuration variable for setting up behind a secure proxy. + - UK specific improvements: + - Output easting/northing on one line. #997 + - Output Irish easting/northing in Northern Ireland. #822 + * v1.5.3 (21st January 2015) - New features: - Satellite map toggle option on Google Maps view. #1002 diff --git a/bin/gettext-extract b/bin/gettext-extract index b645f57dc..c1f3d384e 100755 --- a/bin/gettext-extract +++ b/bin/gettext-extract @@ -15,7 +15,7 @@ rm -f $PO # we don't want to extract strings from all the cobrand templates so list # the ones we care about -find templates/web/base templates/web/fixmystreet templates/web/zurich templates/web/fiksgatami -name '*.html' > template_list +find templates/web/base templates/web/fixmystreet templates/web/zurich -name '*.html' > template_list # Extract from Perl xgettext.pl --gnu-gettext --verbose --output $PO --plugin perl=* --plugin tt2 --directory perllib -f template_list --directory db --directory bin diff --git a/bin/send-comments b/bin/send-comments index 2d6b525b5..fabf2b633 100755 --- a/bin/send-comments +++ b/bin/send-comments @@ -145,7 +145,7 @@ while ( my $body = $bodies->next ) { sub bromley_retry_timeout { my $row = shift; - my $tz = DateTime::TimeZone->new( name => 'local' ); + my $tz = FixMyStreet->local_time_zone; my $now = DateTime->now( time_zone => $tz ); my $diff = $now - $row->send_fail_timestamp; if ( $diff->in_units( 'minutes' ) < 30 ) { diff --git a/bin/site-specific-install.sh b/bin/site-specific-install.sh index c57678b7b..75b016bb5 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.5.3} +VERSION=${VERSION_OVERRIDE:-v1.6.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 4a8fea830..700a642f4 100755 --- a/bin/zurich/overdue-alert +++ b/bin/zurich/overdue-alert @@ -14,7 +14,7 @@ BEGIN { use File::Basename qw(dirname); use File::Spec; my $d = dirname(File::Spec->rel2abs($0)); - require "$d/../setenv.pl"; + require "$d/../../setenv.pl"; } use DateTime; diff --git a/commonlib b/commonlib -Subproject 4e67698fa8d8b25b71b1baaf1a1856dcd566e5a +Subproject f87aecb7510fb6e43156328277ba4aa4b9e17d7 diff --git a/conf/general.yml-example b/conf/general.yml-example index 9770ade86..ee68b5cd6 100644 --- a/conf/general.yml-example +++ b/conf/general.yml-example @@ -24,6 +24,10 @@ FMS_DB_PASS: '' BASE_URL: 'http://www.example.org' # Use the below if you're using the Catalyst development server # BASE_URL: 'http://localhost:3000' +SECURE_PROXY_SSL_HEADER: '' +# If you're behind a proxy, set this to a two-element list containing the +# trusted HTTP header and the required value. For example: +# SECURE_PROXY_SSL_HEADER: [ 'X-Forwarded-Proto', 'https' ] # Email domain used for emails, and contact name/email for admin use. EMAIL_DOMAIN: 'example.org' @@ -49,7 +53,6 @@ EXAMPLE_PLACES: [ 'High Street', 'Main Street' ] # An array of languages for the site, in the following format: # <language code>,<pretty name>,<locale> -# Do not remove the en-gb line as it is needed for correct operation. LANGUAGES: - 'en-gb,English,en_GB' @@ -183,14 +186,3 @@ TESTING_COUNCILS: '' # if you're using Message Manager, include the URL here (see https://github.com/mysociety/message-manager/) MESSAGE_MANAGER_URL: '' - -# ----------------------------------------------------------------------- - -# fixmystreet.com specific config variables. You won't need any of these. -KASABI_API_KEY: '' -LONDON_REPORTIT_URL: '' -LONDON_REPORTIT_KEY: '' -LONDON_REPORTIT_SECRET: '' -AUTH_SHARED_SECRET: '' -HEARFROMYOURMP_BASE_URL: '' - @@ -3,6 +3,10 @@ requires 'List::MoreUtils'; requires 'local::lib'; requires 'Class::Unload'; +# Interesting installation issues, see end of this file +requires 'ExtUtils::MakeMaker', '6.72'; # [1] +# requires 'MooseX::NonMoose'; # [2] + # Catalyst itself, and modules/plugins used requires 'Catalyst', '5.80031'; requires 'Catalyst::Action::RenderView'; @@ -31,6 +35,7 @@ requires 'DateTime::Format::W3CDTF'; requires 'DateTime::TimeZone'; requires 'DBD::Pg', '2.9.2'; requires 'DBI'; +requires 'DBIx::Class::EncodedColumn', '0.00013'; requires 'DBIx::Class::EncodedColumn::Crypt::Eksblowfish::Bcrypt'; requires 'DBIx::Class::FilterColumn'; requires 'DBIx::Class::InflateColumn::DateTime'; @@ -55,6 +60,7 @@ requires 'Image::Size'; requires 'IO::String'; requires 'JSON'; requires 'JSON::XS'; +requires 'Locale::gettext'; requires 'LWP::Simple'; requires 'LWP::UserAgent'; requires 'Math::Trig'; @@ -128,3 +134,52 @@ requires 'Test::Warn'; requires 'Test::WWW::Mechanize::Catalyst'; requires 'Web::Scraper'; +################################################################# +# +# [1] Many things in cpanfile.snapshot require ExtUtils::MakeMaker 6.59, and +# one thing (DBIx::Class::IntrospectableM2M) requires 6.72, and so the snapshot +# contains the details for ExtUtils::MakeMaker 6.72. carton itself requires +# ExtUtils::MakeMaker 6.64. +# +# I don't understand the intracacies of carton/cpanm, but from the +# build.logs, I ascertain that DBIx::Class::Schema::Loader requires +# DBIx::Class::IntrospectableM2M and somehow in the process sets it up so that +# DBIx::Class::IntrospectableM2M tries to install the version of +# ExtUtils::MakeMaker used during the DBIx::Class::Schema::Loader installation. +# +# It seems as if the version of ExtUtils::MakeMaker used at any point is the +# one in local if present, then the one in local-carton if present, then the +# system one. Let's look at a few different installation platforms: +# +# On Debian wheezy, ExtUtils::MakeMaker is version 6.57. The installation of +# carton installs ExtUtils::MakeMaker 7.04 in local-carton. Running carton +# install installs ExtUtils::MakeMaker 6.72 in local at some point before +# DBIx::Class::Schema::Loader (due to one of the 6.59 requirements), and so +# DBIx::Class::IntrospectableM2M uses and tries to install 6.72, which is fine. +# +# On Ubuntu trusty, ExtUtils::MakeMaker is version 6.66. The installation of +# carton is satisfied already. Running carton install, nothing else upgrades +# ExtUtils::MakeMaker (as 6.66 > 6.59), and so when we get to +# DBIx::Class::IntrospectableM2M it uses the system 6.66 and upgrades to 6.72, +# which is again fine. +# +# On Mac OS X 10.9.5, ExtUtils::MakeMaker is version 6.63. The installation of +# carton installs ExtUtils::MakeMaker 7.04 in local-carton. Running carton +# install, nothing else upgrades ExtUtils::MakeMaker (as 6.63 > 6.59), and when +# we get to DBIx::Class::IntrospectableM2M it therefore uses 7.04 and can't +# install it (as the snapshot only contains 6.72) and fails. +# +# Therefore, if we make sure the ExtUtils::MakeMaker from the snapshot is +# installed early in the process, it will be available when we get to +# DBIx::Class::IntrospectableM2M, be used and match its own condition. +# I'm sure this isn't the correct solution, but it is a working one. +# +# +# [2] The installation of Catalyst::Model::DBIC::Schema tries to install any +# module that it finds already present in an optional section. On a Mac, the +# system has MooseX::NonMoose version 0.22, which is an optional component for +# Catalyst::Helper support, and it finds that but then thinks it is not +# installed, tries to install it but doesn't find it in the snapshot, and +# fails. The easiest solution here is to include MooseX::NonMoose in +# cpanfile.snapshot so it can be found, though I guess it shouldn't be trying +# to install it if it's already thought that 0.22 was installed... diff --git a/cpanfile.snapshot b/cpanfile.snapshot index e5d8b9afc..add5bc404 100644 --- a/cpanfile.snapshot +++ b/cpanfile.snapshot @@ -1165,10 +1165,10 @@ DISTRIBUTIONS Try::Tiny 0.07 namespace::clean 0.24 perl 5.008001 - DBIx-Class-EncodedColumn-0.00011 - pathname: W/WR/WREIS/DBIx-Class-EncodedColumn-0.00011.tar.gz + DBIx-Class-EncodedColumn-0.00013 + pathname: W/WR/WREIS/DBIx-Class-EncodedColumn-0.00013.tar.gz provides: - DBIx::Class::EncodedColumn 0.00011 + DBIx::Class::EncodedColumn 0.00013 DBIx::Class::EncodedColumn::Crypt 0.01 DBIx::Class::EncodedColumn::Crypt::Eksblowfish::Bcrypt 0.00001 DBIx::Class::EncodedColumn::Crypt::OpenPGP 0.01 @@ -1177,7 +1177,8 @@ DISTRIBUTIONS DBD::SQLite 0 DBIx::Class 0.06002 Dir::Self 0 - ExtUtils::MakeMaker 6.42 + Encode 0 + ExtUtils::MakeMaker 6.36 File::Spec 0 File::Temp 0 Sub::Name 0.04 @@ -4176,6 +4177,22 @@ DISTRIBUTIONS Test::More 0.88 namespace::autoclean 0 namespace::clean 0.10 + MooseX-NonMoose-0.26 + pathname: D/DO/DOY/MooseX-NonMoose-0.26.tar.gz + provides: + MooseX::NonMoose 0.26 + MooseX::NonMoose::InsideOut 0.26 + MooseX::NonMoose::Meta::Role::Class 0.26 + MooseX::NonMoose::Meta::Role::Constructor 0.26 + requirements: + ExtUtils::MakeMaker 6.30 + List::MoreUtils 0 + Module::Runtime 0 + Moose::Exporter 0 + Moose::Role 2.0000 + Moose::Util 0 + Try::Tiny 0 + warnings 0 MooseX-Params-Validate-0.18 pathname: D/DR/DROLSKY/MooseX-Params-Validate-0.18.tar.gz provides: @@ -6599,6 +6616,12 @@ DISTRIBUTIONS common::sense 3.6 requirements: ExtUtils::MakeMaker 0 + gettext-1.05 + pathname: P/PV/PVANDRY/gettext-1.05.tar.gz + provides: + Locale::gettext 1.05 + requirements: + ExtUtils::MakeMaker 0 libwww-perl-6.05 pathname: G/GA/GAAS/libwww-perl-6.05.tar.gz provides: diff --git a/data/dft.csv b/data/dft.csv deleted file mode 100644 index 0bf1a94d1..000000000 --- a/data/dft.csv +++ /dev/null @@ -1,534 +0,0 @@ -Id,Organisation -7249,186k Limited -7246,360 Networks(UK)Ltd -7263,51º Limited -6905,Aberconwy And Colwyn -7235,Abovenet Communications UK Ltd -7082,Affiniti -7297,Airwave Solutions Limited -7302,Aligned Assets Limited -905,Allerdale Borough Council -6983,Amey Highways South East Unit -6982,Amey Highways South West Unit -7025,Andover Cable Services -6805,Anglesey -7026,Anglia Cable -9100,Anglian Water -7303,Ask Controls Ltd -7300,Autodesk Ltd -17,Baa -5060,Barking And Dagenham -5090,Barnet -4405,Barnsley -114,Bath And North East Somerset -7045,Bcm North And East -7043,Bcm South -6980,Bear Scotland Ltd North East Unit -6981,Bear Scotland Ltd North West Unit -235,Bedford UA -225,Bedfordshire -7095,Bell Cablemedia (Wearside) -7096,Bell Cablemedia (Worcester) -5120,Bexley -4605,Birmingham -7028,Birmingham Cable -7198,Birmingham Cable (Wythall) -2372,Blackburn -2373,Blackpool -6910,Blaenau Gwent -4205,Bolton -1250,Bournemouth -9110,Bournemouth And West Hampshire Water -335,Bracknell Forest -4705,Bradford -5150,Brent -6915,Bridgend -1445,Brighton And Hove -116,Bristol -9111,Bristol Waterworks Company -7242,British Gas Connections Ltd -7186,British Oxygen -7089,British Pipeline Agency (Bpa) -7094,British Rail Telecomms -7187,British Waterways Board -7208,Broadband Ventures -7172,Broadcast Satellite Television -7029,Broadland Cablevision -5180,Bromley -7225,Bskyb Telecommunications Services Ltd -30,BT -7171,BT New Towns System -430,Buckinghamshire -7192,Burton-Upon-Trent Cable Comms -4210,Bury -7298,By Design -7319,C2c Services Ltd -70,Cable & Wireless UK -7097,Cable Commmunications Fylde & Wyre -7030,Cable London Plc (Camden) -7099,Cable London Plc (Enfield) -7100,Cable London Plc (Hackney) -7101,Cable London Plc (Haringey) -7103,Cable North West (Central Lancashire) -7052,Cable North West (Merseyside) -7102,Cable North West (North Liverpool) -7104,Cable North West (St Helens) -7105,Cable North West (Wigan) -7173,Cablecom Investments -7032,Cabletel Bedfordshire -7106,Cabletel Central Hertfordshire -7107,Cabletel Hertfordshire -7047,Cabletel Kirklees -7108,Cabletel North Bedfordshire -7109,Cabletel South Wales (Cardiff) -7050,Cabletel South Wales (Newport) -7110,Cabletel South Wales (West Glamorgan) -7111,Cabletel Surrey -7033,Cablevision Wellingborough -7296,Cadcorp -6810,Caernarfonshire And Merionethshire -6920,Caerphilly -4710,Calderdale -7034,Cambridge Cable -9113,Cambridge Water Company -535,Cambridgeshire -5210,Camden -6815,Cardiff -6820,Cardiganshire -6825,Carmarthenshire -7253,Carrier 1 UK Ltd -240,Central Bedfordshire UA -7007,Central Networks -7011,Central Networks -9234,Centro -645,Cheshire -660,Cheshire East UA -665,Cheshire West And Chester UA -9114,Chester Waterworks -9115,Cholderton And District Water -1055,City Of Derby -2465,City Of Leicester -5030,City Of London -7075,City Of London Telecomms -3060,City Of Nottingham -540,City Of Peterborough -1160,City Of Plymouth -1775,City Of Portsmouth -1780,City Of Southampton -3455,City Of Stoke-On-Trent -5990,City Of Westminster -7261,Citylink Telecommunications Ltd -7279,Cityspace Ltd -7112,Comcast Teesside (Darlington) -7113,Comcast Teesside (Teesside) -7035,Comment Cablevision -7058,Comtel (Stafford Comms ) -800,Cornwall -840,Cornwall UA -7036,County Cable Comms -1850,County Of Herefordshire -4610,Coventry -7037,Coventry Cable -7318,Crossrail Ltd -5240,Croydon -900,Cumbria -1350,Darlington -7290,Dclg Firecontrol Project -9138,Dee Valley Water Plc -4900,Defence Estates -6830,Denbighshire -7188,Department For Transport Stats Roads -1050,Derbyshire -1155,Devon -7189,Diamond Cable (Bassetlaw And Ravenshead -7040,Diamond Cable (Grantham) -7114,Diamond Cable (Grimsby) -7115,Diamond Cable (Lincoln) -7203,Diamond Cable (Lincolnshire) -7116,Diamond Cable (Mansfield) -7117,Diamond Cable (Melton Mowbray) -7118,Diamond Cable (Newark) -7119,Diamond Cable (Nottingham) -4410,Doncaster -1245,Dorset -4615,Dudley -1345,Durham -1355,Durham UA -7260,E S Pipelines Ltd -5270,Ealing -7042,East Coast Cable -2001,East Riding Of Yorkshire -1440,East Sussex -7219,Eastern Group Telecoms -7259,Eigernet Ltd -7243,Eircom (UK) Ltd -7325,Eirgrid Plc -7005,Electricity North West Limited -7120,Encom Cable TV & Comms (Dartford) -7121,Encom Cable TV & Comms (Epping Forest) -7122,Encom Cable TV & Comms (Greater London) -7123,Encom Cable TV & Comms (Havering) -7124,Encom Cable TV & Comms (Newham) -7125,Encom Cable TV & Comms (Waltham Forest) -7269,Energetics Electricity Limited -7311,Energetics Gas Limited -7080,Energis Comms -5300,Enfield -7220,Environment Agency -7309,Esp Electricity Limited -1585,Essex -9120,Essex And Suffolk Water -7091,Esso Petroleum Co -7307,Eunetworks Fiber UK Limited -7039,Eurobell (South West) -7044,Eurobell (Sussex) -7126,Eurobell (West Kent) -7282,Exor Corporation Ltd -7127,Fenland Cablevision -7223,Fibernet Ltd -7266,Fibrespan Limited -7305,Fibrespeed Ltd -7206,Fina Pipelines -6835,Flintshire -7234,Flute Ltd -7294,Fulcrum Pipelines Limited -7241,Gamma Telecom Ltd -7231,Gas Transportation Co Ltd -4505,Gateshead -7229,GC Pan European Crossing UK Ltd -7315,Gene Sys Telecommunications Ltd -7237,General Telecommunications Ltd -7304,Geo -7317,Ggp Systems Ltd -7084,Global Communications Holding Ltd -7183,Global Crossing (UK) Telecommunications -1600,Gloucestershire -7207,Government Office (London) -7215,Greater Manchester PTE -3061,Greater Nottingham Light Rapid Transit -5330,Greenwich -7228,GT UK Ltd -7312,H2O Networks -5360,Hackney -7262,Halcrow Group -650,Halton -5390,Hammersmith And Fulham -1770,Hampshire -5420,Haringey -5450,Harrow -724,Hartlepool -9122,Hartlepool Water -5480,Havering -1900,Hertfordshire -7323,Highway Management Scotland Ltd -11,Highways Agency -5510,Hillingdon -7193,Hincley Cable Comms -7285,Historic Scotland -9997,Holeworld Ltd -5540,Hounslow -7077,Hutchinson Microtel -7264,Hutchison 3g Ltd -7245,I-21 Holdings Ltd -7185,ICI Pipelines -7306,Idox Software Ltd -7218,Independent Pipelines Ltd -7281,Independent Power Networks Ltd -7326,Independent Water Networks Ltd -60,Infocus Public Networks Ltd -7291,Innogistic Software Plc -7324,Internal Communication Systems Ltd -7074,Ionica L3 -2114,Isle Of Wight -7251,Isle Of Wight Cable And Telephone Co Ltd -835,Isles Of Scilly -5570,Islington -7289,Jacobs UK Ltd -7174,John Jones -7175,John Sulwyn Evans -7128,Jones Cable Group (Harrogate) -7067,Jones Cable Group (York) -7129,Jones Cable Group Of Leeds -7130,Jones Cable Group South Hertfordshire -5600,Kensington And Chelsea -2275,Kent -9924,Kent Fire And Rescue Service -7308,Key Traffic Systems Ltd -7073,Kingston Comms (Hull) -5630,Kingston Upon Thames -2004,Kingston-Upon-Hull -4715,Kirklees -4305,Knowsley -7267,Kpn Eurorings Bv -7227,Kpn Telecom UK Ltd -7268,Laing Energy Ltd -5660,Lambeth -2371,Lancashire -7277,Lancaster University Network Services -7048,Lcl Cable Comms -4720,Leeds -2460,Leicestershire -7232,Level 3 Communications Ltd -5690,Lewisham -7191,Lichfield Cable Comms -2500,Lincolnshire -4310,Liverpool -7216,London Dockland Development Corp -7009,London Electricity -7210,London Transport -7072,London Underground -7320,Luns Ltd -230,Luton -7283,M6 Concessionaire -18,M6 Toll Motorway (Mel) -7284,M77 Concessionaire -7090,Mainline Pipelines -4215,Manchester -7008,Manweb -7295,Mapinfo Ltd -7288,Mayrise Limited -2280,Medway Towns -50,Mercury -7078,Mercury Pcn -9212,Merseyside Fire Service -6925,Merthyr Tydfil -5720,Merton -7176,Metro Cable TV -9123,Mid Kent Water -9124,Mid Southern Water -13,Mid Wales Trunk Road Agency -734,Middlesborough -7049,Middlesex Cable Comms -7238,Middlesex Cable Ltd -7031,Midland Cable Comms -435,Milton Keynes -7278,Mll Telecom Limited -6840,Monmouthshire -7257,Mowlem Energy Limited -7177,Multichannel Television -7015,National Grid Electricity Transmission -10,National Grid Gas Plc -7217,National Transcommunications Ltd -6930,Neath And Port Talbot -7244,Neoscorp Ltd -7093,Network Rail Infrastructure Ltd -7226,New World Payphones Ltd -4510,Newcastle Upon Tyne -5750,Newham -7275,Newnet Plc -6935,Newport -2600,Norfolk -7293,Norfolk Fire And Rescue Service -7051,North Downs Cable -2002,North East Lincolnshire -9126,North East Water -2003,North Lincolnshire -9127,North Surrey Water -4515,North Tyneside -14,North Wales Trunk Road Agency -121,North West Somerset -9102,North West Water -2745,North Yorkshire -2800,Northamptonshire -7006,Northern Electric -7271,Northern Gas Networks -2900,Northumberland -2935,Northumberland UA -9101,Northumbrian Water -7053,Norwich Cablevision -7222,Nottingham City Heating -3055,Nottinghamshire -7274,Ntl National Networks Ltd -7142,Nynex Cablecomms -7182,O2 (UK) Limited -7092,Oil And Pipeline Agency (Gpss) -4220,Oldham -7321,Olympic Delivery Authority -7258,Omne Telecommunications Ltd -7252,Oncue Telecommunications Ltd -7299,Opal Telecom -7233,Orange Pcs Ltd -7055,Oxford Cable -3100,Oxfordshire -6845,Pembrokeshire -7056,Peterborough Cablevision -7301,Plantech Limited -1255,Poole -7213,Port Of London Authority -9128,Portsmouth Waterworks Company -7316,Powersystems UK Ltd -6850,Powys -345,Reading -5780,Redbridge -728,Redcar And Cleveland -7247,Redstone Network Services Ltd -6940,Rhondda Cynon Taff -5810,Richmond Upon Thames -4225,Rochdale -7322,Rolta UK Limited -7221,Romec Ltd -4415,Rotherham -7214,Royal Parks -7184,Rugby Cement -2470,Rutland -4230,Salford -7179,Salford Cable Television -4620,Sandwell -7180,Sapphire -7273,Scotland Gas Networks Plc -7079,Scottish Hydro-Electric (Comms) -7286,Scottish Natural Heritage -7019,Scottish Power -7287,Scottish Wildlife Trust -4320,Sefton -9103,Severn Trent Water -4420,Sheffield -7209,Sheffield Heat And Power -7070,Shell / BP Pipelines -3235,Shropshire -9922,Shropshire Fire And Rescue Service -3245,Shropshire UA -350,Slough -7211,Slough Heat And Power -4625,Solihull -3300,Somerset -9117,South East Water -119,South Gloucestershire -9129,South Staffordshire Water -4520,South Tyneside -7012,South Wales Electricity -7292,South Wales Fire And Rescue Service -12,South Wales Trunk Road Agency -9105,South West Water -7003,South Western Electricity -9923,South Yorkshire Fire And Rescue Service -9236,South Yorkshire PTE -1590,Southend-On-Sea -7194,Southern East Anglia Cable -7002,Southern Electric -7270,Southern Gas Networks Plc -9104,Southern Water -5840,Southwark -7313,Sse Pipelines Ltd -4315,St Helens -3450,Staffordshire -7059,Starvision Network -4235,Stockport -738,Stockton-On-Tees -9998,Street Managers Without A Specific Code -9999,Street Work Licences -3500,Suffolk -4525,Sunderland -3600,Surrey -5870,Sutton -9118,Sutton And East Surrey Water Plc -9131,Sutton District Water No Longer Operates -6855,Swansea -7145,Sweb Telecoms -3935,Swindon -7060,Swindon Cable -7280,Symology -4240,Tameside -7190,Tamworth Cable Comms -7181,Tawd Valley Cable -7016,Teeside Power -7147,Telecential Comms (Northampton) -7150,Telecential Comms (Rugby) -7151,Telecential Comms (Stratford) -7146,Telecential Comms Northants -7148,Telecential Comms Thames Valley -7149,Telecential Comms Warwickshire -7152,Telecential Comms West Hertfordshire -7240,Telewest Communications Group -3240,Telford And Wrekin -7153,Telford Telecomms -7230,Telia UK Ltd -7085,Telstra European Holdings -9106,Thames Water -7098,The Cable Corporation (Hillingdon) -7066,The Cable Corporation (Windsor) -1595,Thurrock -7224,Thus -7250,T-Mobile (UK)Limited -1165,Torbay -6945,Torfaen -5900,Tower Hamlets -7212,Traffic Director For London -4245,Trafford -20,Transport For London -7087,Transport For London Street Management -7010,UK Power Networks Eastern & London -7004,UK Power Networks South Eastern -7061,United Artists Comms (Avon) -7154,United Artists Comms (Cotswolds) -7156,United Artists Comms (Kingston) -7155,United Artists Comms (London South) -7157,United Artists Comms (Merton) -7158,United Artists Comms (North East) -7159,United Artists Comms (South East) -7255,United Utilities Gas Networks Ltd -7256,United Utilities Gas Pipelines Ltd -7265,Utility Grid Installations Ltd -6950,Vale Of Glamorgan -9133,Veolia Water Central Ltd -9132,Veolia Water East Ltd -7314,Veolia Water Outsoursing Limited -9121,Veolia Water Southeast -7086,Verizon Business -7236,Viatel UK Ltd -7062,Videotron Corporation (Ealing) -7161,Videotron Corporation (Greenwich) -7162,Videotron Corporation (Hammersmith) -7163,Videotron Corporation (Harrow) -7164,Videotron Corporation (Kensington) -7165,Videotron Corporation (Lamberth) -7166,Videotron Corporation (Southampton) -7167,Videotron Corporation (Thamesmead) -7168,Videotron Corporation (Wandsworth) -7169,Videotron Corporation (Winchester) -7205,Videotron Southampton (Totton And Hythe) -7160,Virgin Media -7076,Vodafone Group -7248,Vsnl Telecommunications (UK) Ltd -7254,Vtesse Networks -7276,Vtl (UK) Ltd -4725,Wakefield -7272,Wales & West Utilities Ltd -4630,Walsall -5930,Waltham Forest -5960,Wandsworth -655,Warrington -3700,Warwickshire -16,Welsh Assembly Government -7310,Welsh Highland Railway Construction Ltd -9107,Welsh Water -7064,Wessex Cable -9108,Wessex Water -340,West Berkshire -9137,West Of Scotland Water -3800,West Sussex -9235,West Yorkshire PTE -7065,Westminster Cable Company -4250,Wigan -3930,Wiltshire -3940,Wiltshire UA -355,Windsor And Maidenhead -7239,Windsor Television Ltd -4325,Wirral -360,Wokingham -4635,Wolverhampton -1855,Worcestershire -7081,Worldcom International Ltd -6955,Wrexham -9135,Wrexham Water -2741,York -9136,York Waterworks -7027,Yorkshire Cable Comms -7068,Yorkshire Cable Comms (Bradford) -7041,Yorkshire Cable Comms (Doncaster) -7170,Yorkshire Cable Comms (Halifax) -7057,Yorkshire Cable Comms (Sheffield) -7063,Yorkshire Cable Comms (Wakefield) -7001,Yorkshire Electricity Distribution Ltd -9109,Yorkshire Water -7083,Your Communications Limited diff --git a/locale/FixMyStreet.po b/locale/FixMyStreet.po index 3a16698e3..afd40ef34 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: 2015-01-20 16:59+0000\n" +"POT-Creation-Date: 2015-07-31 14:28+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,11 +17,11 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:618 perllib/FixMyStreet/DB/ResultSet/Problem.pm:386 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 perllib/FixMyStreet/DB/ResultSet/Problem.pm:392 msgid " and " msgstr "" -#: templates/web/base/report/new/councils_text_all.html:12 templates/web/base/report/new/councils_text_all.html:19 templates/web/base/report/new/councils_text_all.html:5 templates/web/base/report/new/councils_text_none.html:19 templates/web/base/report/new/councils_text_none.html:21 templates/web/base/report/new/councils_text_some.html:20 templates/web/base/report/new/councils_text_some.html:22 templates/web/base/report/new/councils_text_some.html:5 +#: templates/web/base/report/new/councils_text_all.html:2 templates/web/base/report/new/councils_text_none.html:11 templates/web/base/report/new/councils_text_none.html:2 templates/web/base/report/new/councils_text_some.html:19 templates/web/base/report/new/councils_text_some.html:22 templates/web/base/report/new/councils_text_some.html:5 msgid " or " msgstr "" @@ -53,22 +53,26 @@ msgstr "" msgid "%s - Summary reports" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:672 msgid "%s ref: %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:265 perllib/FixMyStreet/Cobrand/UK.pm:277 +#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:554 +#: perllib/FixMyStreet/DB/Result/Problem.pm:559 msgid "%s, reported at %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:304 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "%s, within %s ward" msgstr "" +#: perllib/FixMyStreet/Map/OSM.pm:42 +msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" +msgstr "" + #: templates/web/base/email_sent.html:29 msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" msgstr "" @@ -81,7 +85,7 @@ msgstr "" msgid "(Don't worry — we'll hang on to your update while you're checking your email.)" msgstr "" -#: templates/web/base/admin/report_blocks.html:11 templates/web/base/admin/users.html:29 +#: templates/web/base/admin/report_blocks.html:11 templates/web/base/admin/users.html:31 msgid "(Email in abuse table)" msgstr "" @@ -101,7 +105,7 @@ msgstr "" msgid "(fixed)" msgstr "" -#: templates/web/base/index.html:9 templates/web/fixmystreet/around/intro.html:2 +#: templates/web/base/index.html:8 templates/web/base/index.html:9 templates/web/fixmystreet/around/intro.html:2 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "" @@ -109,7 +113,7 @@ msgstr "" msgid "(not sent to council)" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:218 templates/web/zurich/report/new/fill_in_details_form.html:94 +#: templates/web/base/report/new/fill_in_details_form.html:199 templates/web/zurich/report/new/fill_in_details_form.html:77 msgid "(optional)" msgstr "" @@ -121,7 +125,7 @@ msgstr "" msgid "(sent to both)" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:212 +#: templates/web/base/report/new/fill_in_details_form.html:193 msgid "(we never show your email address or phone number)" msgstr "" @@ -129,11 +133,11 @@ msgstr "" 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:393 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 perllib/FixMyStreet/DB/Result/Problem.pm:399 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:630 perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "" @@ -144,37 +148,7 @@ msgid "" " Maybe add some <code>MAPIT_TYPES</code> to your config file?" msgstr "" -#: templates/web/base/questionnaire/completed.html:20 -msgid "<p style=\"font-size:150%\">Thank you very much for filling in our questionnaire; glad to hear it’s been fixed.</p>" -msgstr "" - -#: templates/web/fiksgatami/questionnaire/completed-open.html:1 -msgid "" -"<p style=\"font-size:150%\">We’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’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/base/questionnaire/completed-open.html:6 -msgid "" -"<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" -"suggestions: why not try writing to your local representatives or, if\n" -"it’s a problem that could be fixed by local people working together, why\n" -"not <a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n" -"</p>" -msgstr "" - -#: templates/web/base/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/base/around/_report_banner.html:4 templates/web/base/around/_report_banner.html:5 +#: templates/web/base/around/_report_banner.html:3 templates/web/base/around/_report_banner.html:5 msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>" msgstr "" @@ -198,7 +172,7 @@ msgstr "" msgid "<strong>No</strong>, I do not, let me sign in by email:" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:163 +#: templates/web/base/report/new/fill_in_details_form.html:144 msgid "<strong>No</strong>, let me confirm my report by email:" msgstr "" @@ -206,11 +180,7 @@ msgstr "" msgid "<strong>No</strong>, let me confirm my update by email:" msgstr "" -#: templates/web/base/tokens/confirm_problem.html:19 templates/web/base/tokens/confirm_problem.html:20 -msgid "<strong>We will now send it to the council</strong>." -msgstr "" - -#: templates/web/base/auth/general.html:37 templates/web/base/report/new/fill_in_details_form.html:141 templates/web/base/report/update-form.html:95 templates/web/fixmystreet/auth/general.html:37 templates/web/fixmystreet/auth/general.html:39 templates/web/fixmystreet/report/new/form_user_loggedout.html:15 templates/web/fixmystreet/report/update-form.html:89 +#: templates/web/base/auth/general.html:37 templates/web/base/report/new/fill_in_details_form.html:122 templates/web/base/report/update-form.html:95 templates/web/fixmystreet/auth/general.html:37 templates/web/fixmystreet/auth/general.html:39 templates/web/fixmystreet/report/new/form_user_loggedout.html:15 templates/web/fixmystreet/report/update-form.html:89 msgid "<strong>Yes</strong> I have a password" msgstr "" @@ -218,7 +188,7 @@ msgstr "" msgid "About us" msgstr "" -#: templates/web/base/admin/report_edit.html:35 templates/web/base/admin/report_edit.html:39 templates/web/base/report/update-form.html:30 templates/web/base/report/update-form.html:31 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/admin/report_edit.html:48 templates/web/base/admin/report_edit.html:52 templates/web/base/report/update-form.html:30 templates/web/base/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 "" @@ -229,23 +199,23 @@ msgid "" " categories of problem) to each body." msgstr "" -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/body.html:56 msgid "Add a contact using the form below." msgstr "" -#: templates/web/base/admin/bodies.html:74 templates/web/base/admin/body-form.html:233 templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/bodies.html:74 templates/web/base/admin/body-form.html:240 templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "" -#: templates/web/base/admin/body.html:108 templates/web/zurich/admin/body.html:31 +#: templates/web/base/admin/body.html:116 templates/web/zurich/admin/body.html:31 msgid "Add new category" msgstr "" -#: templates/web/base/admin/users.html:45 +#: templates/web/base/admin/users.html:47 msgid "Add user" msgstr "" -#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:70 +#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:52 msgid "Added %s" msgstr "" @@ -269,7 +239,7 @@ msgstr "" msgid "All Reports" msgstr "" -#: templates/web/base/footer.html:11 templates/web/fiksgatami/footer.html:23 templates/web/fiksgatami/nn/footer.html:23 templates/web/fixmystreet/footer.html:26 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/base/footer.html:11 templates/web/fixmystreet/footer.html:26 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 "" @@ -281,15 +251,7 @@ msgstr "" msgid "All the information you provide here will be sent to" msgstr "" -#: templates/web/base/report/new/councils_text_all.html:12 templates/web/base/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/base/report/new/councils_text_all.html:5 templates/web/base/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/base/report/new/councils_text_all.html:19 templates/web/base/report/new/councils_text_all.html:20 templates/web/base/report/new/fill_in_details_form.html:13 templates/web/base/report/new/fill_in_details_form.html:14 templates/web/fixmystreet/report/new/fill_in_details_form.html:10 templates/web/fixmystreet/report/new/fill_in_details_form.html:11 +#: templates/web/base/report/new/councils_text_all.html:2 templates/web/base/report/new/councils_text_all.html:4 templates/web/base/report/new/fill_in_details_form.html:12 templates/web/base/report/new/fill_in_details_form.html:14 templates/web/fixmystreet/report/new/fill_in_details_form.html:10 templates/web/fixmystreet/report/new/fill_in_details_form.html:11 msgid "All the information you provide here will be sent to <strong>%s</strong>." msgstr "" @@ -301,7 +263,7 @@ msgstr "" msgid "Anonymous" msgstr "" -#: templates/web/base/admin/report_edit.html:62 templates/web/base/admin/update_edit.html:23 +#: templates/web/base/admin/report_edit.html:75 templates/web/base/admin/update_edit.html:23 msgid "Anonymous:" msgstr "" @@ -309,15 +271,15 @@ msgstr "" msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?" msgstr "" -#: templates/web/fiksgatami/front/footer-marketing.html:14 templates/web/fixmystreet/front/footer-marketing.html:16 +#: templates/web/fixmystreet/front/footer-marketing.html:16 msgid "Are you a developer?" msgstr "" -#: templates/web/base/admin/body-form.html:69 templates/web/zurich/admin/body-form.html:24 +#: templates/web/base/admin/body-form.html:69 templates/web/base/admin/body.html:16 templates/web/zurich/admin/body-form.html:24 msgid "Area covered" msgstr "" -#: templates/web/base/admin/bodies.html:15 templates/web/base/admin/body.html:52 +#: templates/web/base/admin/bodies.html:15 templates/web/base/admin/body.html:60 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "" @@ -333,7 +295,7 @@ msgstr "" msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:163 templates/web/zurich/report/updates.html:11 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:165 templates/web/zurich/report/updates.html:11 msgid "Assigned to %s" msgstr "" @@ -345,7 +307,7 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:348 templates/web/zurich/report/_item.html:11 +#: perllib/FixMyStreet/DB/Result/Problem.pm:373 templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "" @@ -357,7 +319,7 @@ msgstr "" msgid "Ban email address" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 perllib/FixMyStreet/Cobrand/Zurich.pm:297 templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 perllib/FixMyStreet/Cobrand/Zurich.pm:301 templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" msgstr "" @@ -365,7 +327,7 @@ msgstr "" msgid "Body" msgstr "" -#: templates/web/base/admin/user-form.html:32 +#: templates/web/base/admin/report_edit.html:34 templates/web/base/admin/user-form.html:32 msgid "Body:" msgstr "" @@ -377,7 +339,7 @@ msgstr "" msgid "Can't see the map? <em>Skip this step</em>" msgstr "" -#: templates/web/base/admin/body.html:60 templates/web/base/admin/index.html:55 templates/web/base/report/new/category.html:10 templates/web/fixmystreet/report/new/fill_in_details_form.html:53 templates/web/zurich/admin/body.html:14 templates/web/zurich/admin/index-dm.html:23 templates/web/zurich/admin/index-sdm.html:21 templates/web/zurich/admin/reports.html:13 templates/web/zurich/admin/stats.html:50 templates/web/zurich/report/new/fill_in_details_form.html:50 +#: templates/web/base/admin/body.html:68 templates/web/base/admin/index.html:55 templates/web/base/report/new/category.html:10 templates/web/base/report/new/category_wrapper.html:3 templates/web/zurich/admin/body.html:14 templates/web/zurich/admin/index-dm.html:23 templates/web/zurich/admin/index-sdm.html:21 templates/web/zurich/admin/reports.html:13 templates/web/zurich/admin/stats.html:50 msgid "Category" msgstr "" @@ -385,11 +347,11 @@ msgstr "" msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: templates/web/base/admin/body.html:130 templates/web/base/admin/category_edit.html:23 templates/web/base/admin/report_edit.html:61 templates/web/base/report/new/fill_in_details_form.html:68 templates/web/zurich/admin/body.html:43 templates/web/zurich/admin/report_edit-sdm.html:42 templates/web/zurich/admin/report_edit.html:140 +#: templates/web/base/admin/body.html:138 templates/web/base/admin/category_edit.html:23 templates/web/base/admin/report_edit.html:74 templates/web/zurich/admin/body.html:43 templates/web/zurich/admin/report_edit-sdm.html:42 templates/web/zurich/admin/report_edit.html:140 msgid "Category:" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:377 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383 msgid "Category: %s" msgstr "" @@ -397,19 +359,19 @@ msgstr "" msgid "Change password" msgstr "" -#: templates/web/base/admin/body.html:152 +#: templates/web/base/admin/body.html:160 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/base/admin/body.html:163 +#: templates/web/base/admin/body.html:171 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/base/admin/body.html:183 +#: templates/web/base/admin/body.html:191 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -420,7 +382,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:122 +#: templates/web/base/admin/body.html:130 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." @@ -434,15 +396,15 @@ msgstr "" msgid "Click map to report a problem" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 templates/web/base/admin/report_edit.html:35 templates/web/base/admin/report_edit.html:45 templates/web/base/admin/report_edit.html:47 templates/web/base/dashboard/index.html:142 templates/web/base/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:95 templates/web/zurich/admin/report_edit.html:97 templates/web/zurich/admin/stats.html:31 templates/web/zurich/report/banner.html:13 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 templates/web/base/admin/report_edit.html:48 templates/web/base/admin/report_edit.html:58 templates/web/base/admin/report_edit.html:60 templates/web/base/dashboard/index.html:142 templates/web/base/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:95 templates/web/zurich/admin/report_edit.html:97 templates/web/zurich/admin/stats.html:31 templates/web/zurich/report/banner.html:13 msgid "Closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:762 +#: perllib/FixMyStreet/DB/Result/Problem.pm:771 msgid "Closed by council" msgstr "" -#: templates/web/base/my/my.html:40 templates/web/fixmystreet/my/my.html:46 +#: templates/web/base/my/my.html:40 templates/web/fixmystreet/my/_problem-list.html:12 msgid "Closed reports" msgstr "" @@ -450,7 +412,7 @@ msgstr "" msgid "Closed:" msgstr "" -#: templates/web/base/around/tabbed_lists.html:11 templates/web/base/around/tabbed_lists.html:12 +#: templates/web/base/around/tabbed_lists.html:10 templates/web/base/around/tabbed_lists.html:12 msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "" @@ -462,23 +424,23 @@ msgstr "" msgid "Cobrand" msgstr "" -#: templates/web/base/admin/report_edit.html:75 templates/web/base/admin/update_edit.html:50 +#: templates/web/base/admin/report_edit.html:91 templates/web/base/admin/update_edit.html:50 msgid "Cobrand data:" msgstr "" -#: templates/web/base/admin/report_edit.html:74 templates/web/base/admin/update_edit.html:49 +#: templates/web/base/admin/report_edit.html:90 templates/web/base/admin/update_edit.html:49 msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 templates/web/base/admin/config_page.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" -#: templates/web/base/admin/category_edit.html:47 +#: templates/web/base/admin/category_edit.html:52 msgid "Configure Endpoint" msgstr "" -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/body.html:72 msgid "Confirm" msgstr "" @@ -494,7 +456,7 @@ msgstr "" msgid "Confirmation" msgstr "" -#: templates/web/base/admin/body.html:158 templates/web/base/admin/body.html:71 templates/web/base/admin/category_edit.html:32 templates/web/base/admin/category_edit.html:84 templates/web/zurich/admin/stats.html:40 +#: templates/web/base/admin/body.html:166 templates/web/base/admin/body.html:79 templates/web/base/admin/category_edit.html:37 templates/web/base/admin/category_edit.html:89 templates/web/zurich/admin/stats.html:40 msgid "Confirmed" msgstr "" @@ -502,7 +464,7 @@ msgstr "" msgid "Confirmed reports between %s and %s" msgstr "" -#: templates/web/base/admin/list_updates.html:39 templates/web/base/admin/problem_row.html:36 templates/web/base/admin/report_edit.html:70 +#: templates/web/base/admin/list_updates.html:39 templates/web/base/admin/problem_row.html:36 templates/web/base/admin/report_edit.html:83 msgid "Confirmed:" msgstr "" @@ -514,11 +476,11 @@ msgstr "" msgid "Contact Us" msgstr "" -#: templates/web/base/contact/index.html:6 templates/web/base/contact/submit.html:3 templates/web/fixmystreet/contact/index.html:20 +#: templates/web/base/contact/index.html:6 templates/web/fixmystreet/contact/index.html:20 msgid "Contact the team" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1327 perllib/FixMyStreet/App/Controller/Admin.pm:1355 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1325 perllib/FixMyStreet/App/Controller/Admin.pm:1353 msgid "Could not find user" msgstr "" @@ -534,6 +496,10 @@ msgstr "" msgid "Council contacts for %s" msgstr "" +#: perllib/FixMyStreet/DB/Result/Problem.pm:670 +msgid "Council ref: %s" +msgstr "" + #: templates/web/base/admin/stats.html:84 msgid "Council:" msgstr "" @@ -546,7 +512,7 @@ msgstr "" msgid "Create a report" msgstr "" -#: templates/web/base/admin/body.html:200 templates/web/zurich/admin/body.html:59 +#: templates/web/base/admin/body.html:208 templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "" @@ -554,7 +520,7 @@ msgstr "" msgid "Created" msgstr "" -#: templates/web/base/admin/list_updates.html:38 templates/web/base/admin/report_edit.html:69 templates/web/base/admin/update_edit.html:51 templates/web/zurich/admin/report_edit-sdm.html:47 templates/web/zurich/admin/report_edit.html:61 templates/web/zurich/admin/update_edit.html:29 +#: templates/web/base/admin/list_updates.html:38 templates/web/base/admin/report_edit.html:82 templates/web/base/admin/update_edit.html:51 templates/web/zurich/admin/report_edit-sdm.html:47 templates/web/zurich/admin/report_edit.html:61 templates/web/zurich/admin/update_edit.html:29 msgid "Created:" msgstr "" @@ -566,7 +532,7 @@ msgstr "" msgid "Currently no bodies have been created." msgstr "" -#: templates/web/base/dashboard/index.html:6 templates/web/base/dashboard/index.html:7 +#: templates/web/base/dashboard/index.html:5 templates/web/base/dashboard/index.html:7 msgid "Dashboard" msgstr "" @@ -574,11 +540,11 @@ msgstr "" msgid "Dealt with by subdivision within 5 working days" msgstr "" -#: templates/web/base/admin/bodies.html:27 templates/web/base/admin/body.html:169 templates/web/base/admin/body.html:73 templates/web/base/admin/category_edit.html:37 templates/web/base/admin/category_edit.html:85 +#: templates/web/base/admin/bodies.html:27 templates/web/base/admin/body.html:177 templates/web/base/admin/body.html:81 templates/web/base/admin/category_edit.html:42 templates/web/base/admin/category_edit.html:90 msgid "Deleted" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:43 templates/web/zurich/admin/index-dm.html:22 templates/web/zurich/admin/index-sdm.html:20 templates/web/zurich/admin/reports.html:12 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 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 "" @@ -590,7 +556,7 @@ msgstr "" msgid "Details:" msgstr "" -#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/body.html:87 msgid "Devolved" msgstr "" @@ -614,11 +580,11 @@ msgstr "" msgid "Don't like forms?" msgstr "" -#: templates/web/base/admin/report_edit.html:35 templates/web/base/admin/report_edit.html:47 templates/web/base/report/update-form.html:30 templates/web/base/report/update-form.html:32 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:30 +#: templates/web/base/admin/report_edit.html:48 templates/web/base/admin/report_edit.html:60 templates/web/base/report/update-form.html:30 templates/web/base/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/base/admin/body.html:98 +#: templates/web/base/admin/body.html:106 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" @@ -626,15 +592,15 @@ msgid "" " " msgstr "" -#: templates/web/base/admin/list_updates.html:42 templates/web/base/admin/problem_row.html:41 templates/web/base/admin/users.html:31 templates/web/zurich/admin/problem_row.html:42 +#: templates/web/base/admin/list_updates.html:42 templates/web/base/admin/problem_row.html:41 templates/web/base/admin/users.html:33 templates/web/zurich/admin/problem_row.html:42 msgid "Edit" msgstr "" -#: templates/web/base/admin/body.html:212 templates/web/zurich/admin/body.html:71 +#: templates/web/base/admin/body.html:220 templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "" -#: templates/web/base/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 +#: templates/web/base/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 msgid "Editing problem %d" msgstr "" @@ -646,23 +612,31 @@ msgstr "" msgid "Editing user %d" msgstr "" -#: templates/web/base/admin/category_edit.html:86 +#: templates/web/base/admin/category_edit.html:91 msgid "Editor" msgstr "" -#: templates/web/base/admin/bodies.html:23 templates/web/base/admin/category_edit.html:83 templates/web/base/admin/flagged.html:38 templates/web/base/admin/users.html:16 templates/web/fixmystreet/auth/general.html:21 templates/web/zurich/admin/body-form.html:9 templates/web/zurich/admin/body.html:15 templates/web/zurich/auth/general.html:24 templates/web/zurich/auth/general.html:54 +#: templates/web/base/admin/bodies.html:23 templates/web/base/admin/category_edit.html:88 templates/web/base/admin/flagged.html:38 templates/web/base/admin/users.html:16 templates/web/fixmystreet/auth/general.html:21 templates/web/zurich/admin/body-form.html:9 templates/web/zurich/admin/body.html:15 templates/web/zurich/auth/general.html:24 templates/web/zurich/auth/general.html:54 msgid "Email" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1303 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1301 msgid "Email added to abuse list" msgstr "" -#: templates/web/base/admin/body.html:147 +#: templates/web/base/admin/body.html:155 msgid "Email address:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1300 +#: templates/web/base/tokens/confirm_alert.html:6 +msgid "Email alert created" +msgstr "" + +#: templates/web/base/tokens/confirm_alert.html:10 +msgid "Email alert deleted" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1298 msgid "Email already in abuse list" msgstr "" @@ -674,35 +648,35 @@ msgstr "" msgid "Email me updates" msgstr "" -#: templates/web/base/admin/category_edit.html:26 templates/web/base/admin/report_edit.html:67 templates/web/base/admin/update_edit.html:33 templates/web/base/admin/user-form.html:20 templates/web/base/alert/updates.html:13 templates/web/base/report/display.html:42 templates/web/zurich/admin/body.html:47 templates/web/zurich/admin/report_edit-sdm.html:44 templates/web/zurich/admin/report_edit.html:57 +#: templates/web/base/admin/category_edit.html:31 templates/web/base/admin/report_edit.html:80 templates/web/base/admin/update_edit.html:33 templates/web/base/admin/user-form.html:20 templates/web/base/alert/updates.html:13 templates/web/base/report/display.html:42 templates/web/zurich/admin/body.html:47 templates/web/zurich/admin/report_edit-sdm.html:44 templates/web/zurich/admin/report_edit.html:57 msgid "Email:" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:322 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 msgid "Email: %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 msgid "Empty flat or maisonette" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:631 msgid "Empty house or bungalow" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:622 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty office or other commercial" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:623 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Empty pub or bar" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:624 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty public building - school, hospital, etc." msgstr "" -#: templates/web/base/admin/body-form.html:158 templates/web/base/admin/body-form.html:159 +#: templates/web/base/admin/body-form.html:162 templates/web/base/admin/body-form.html:163 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" @@ -710,7 +684,7 @@ msgid "" " <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>." msgstr "" -#: templates/web/base/admin/body-form.html:215 templates/web/base/admin/body-form.html:216 +#: templates/web/base/admin/body-form.html:222 templates/web/base/admin/body-form.html:223 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" @@ -721,11 +695,11 @@ msgstr "" msgid "End Date:" msgstr "" -#: templates/web/base/admin/body-form.html:126 +#: templates/web/base/admin/body-form.html:130 msgid "Endpoint" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:72 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:73 msgid "Enter a Zürich street name" msgstr "" @@ -737,7 +711,7 @@ msgstr "" msgid "Enter a nearby postcode, or street name and area" msgstr "" -#: templates/web/base/around/postcode_form.html:2 templates/web/fixmystreet/around/postcode_form.html:11 +#: templates/web/base/around/postcode_form.html:1 templates/web/base/around/postcode_form.html:2 templates/web/fixmystreet/around/postcode_form.html:10 templates/web/fixmystreet/around/postcode_form.html:11 msgid "Enter a nearby street name and area" msgstr "" @@ -745,7 +719,7 @@ msgstr "" msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "" -#: templates/web/base/auth/general.html:64 templates/web/base/report/new/fill_in_details_form.html:170 templates/web/base/report/update-form.html:124 +#: templates/web/base/auth/general.html:64 templates/web/base/report/new/fill_in_details_form.html:151 templates/web/base/report/update-form.html:124 msgid "Enter a new password:" msgstr "" @@ -753,7 +727,7 @@ msgstr "" msgid "Enter a password" msgstr "" -#: templates/web/base/index-steps.html:33 +#: templates/web/base/index-steps.html:26 msgid "Enter details of the problem" msgstr "" @@ -769,16 +743,20 @@ msgstr "" msgid "Examples:" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:47 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" -#: templates/web/base/admin/report_edit.html:76 +#: templates/web/base/admin/body-form.html:81 +msgid "External URL" +msgstr "" + +#: templates/web/base/admin/category_edit.html:27 templates/web/base/admin/report_edit.html:92 msgid "Extra data:" msgstr "" -#: templates/web/base/contact/submit.html:15 -msgid "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>." +#: templates/web/base/contact/submit.html:13 +msgid "Failed to send message" msgstr "" #: templates/web/zurich/admin/index-dm.html:33 templates/web/zurich/admin/index-sdm.html:30 @@ -789,7 +767,7 @@ msgstr "" msgid "First time" msgstr "" -#: templates/web/base/admin/body.html:40 +#: templates/web/base/admin/body.html:48 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" @@ -818,19 +796,19 @@ msgid "" "for the county council." msgstr "" -#: templates/web/base/admin/index.html:55 templates/web/base/admin/report_edit.html:35 templates/web/base/admin/report_edit.html:41 templates/web/base/admin/report_edit.html:42 templates/web/base/dashboard/index.html:142 templates/web/base/dashboard/index.html:144 templates/web/base/report/update-form.html:30 templates/web/base/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/base/admin/index.html:55 templates/web/base/admin/report_edit.html:48 templates/web/base/admin/report_edit.html:54 templates/web/base/admin/report_edit.html:55 templates/web/base/dashboard/index.html:142 templates/web/base/dashboard/index.html:144 templates/web/base/report/update-form.html:30 templates/web/base/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/base/admin/report_edit.html:35 templates/web/base/admin/report_edit.html:43 +#: templates/web/base/admin/report_edit.html:48 templates/web/base/admin/report_edit.html:56 msgid "Fixed - Council" msgstr "" -#: templates/web/base/admin/report_edit.html:35 templates/web/base/admin/report_edit.html:42 +#: templates/web/base/admin/report_edit.html:48 templates/web/base/admin/report_edit.html:55 msgid "Fixed - User" msgstr "" -#: templates/web/base/my/my.html:35 templates/web/fixmystreet/my/my.html:41 +#: templates/web/base/my/my.html:35 templates/web/fixmystreet/my/_problem-list.html:7 msgid "Fixed reports" msgstr "" @@ -838,7 +816,7 @@ msgstr "" msgid "Fixed:" msgstr "" -#: templates/web/base/admin/body-form.html:84 templates/web/zurich/admin/body-form.html:36 +#: templates/web/base/admin/body-form.html:89 templates/web/zurich/admin/body-form.html:36 msgid "Flag as deleted" msgstr "" @@ -846,7 +824,7 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 templates/web/base/admin/users.html:19 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "" @@ -854,7 +832,7 @@ msgstr "" msgid "Flagged reports and users" msgstr "" -#: templates/web/base/admin/user-form.html:45 +#: templates/web/base/admin/user-form.html:46 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page." msgstr "" @@ -862,7 +840,7 @@ msgstr "" msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." msgstr "" -#: templates/web/base/admin/report_edit.html:78 templates/web/base/admin/user-form.html:51 +#: templates/web/base/admin/report_edit.html:94 templates/web/base/admin/user-form.html:52 msgid "Flagged:" msgstr "" @@ -870,10 +848,6 @@ msgstr "" msgid "Follow a ward link to view only reports within that ward." msgstr "" -#: templates/web/base/admin/report_edit.html:30 -msgid "For council(s):" -msgstr "" - #: templates/web/base/admin/body-form.html:65 msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "" @@ -882,7 +856,7 @@ msgstr "" msgid "Forgotten your password?" msgstr "" -#: templates/web/base/faq/faq-en-gb.html:1 templates/web/base/static/privacy.html:1 templates/web/base/static/privacy.html:2 templates/web/fiksgatami/faq/faq-nb.html:1 templates/web/fiksgatami/nn/faq/faq-nn.html:1 +#: templates/web/base/faq/faq-en-gb.html:1 templates/web/base/static/privacy.html:1 templates/web/base/static/privacy.html:2 msgid "Frequently Asked Questions" msgstr "" @@ -894,11 +868,11 @@ msgstr "" msgid "Get updates" msgstr "" -#: templates/web/fixmystreet/reports/_rss.html:4 templates/web/fixmystreet/reports/_rss.html:9 +#: templates/web/fixmystreet/reports/_rss.html:3 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 +#: templates/web/fixmystreet/reports/_rss.html:11 templates/web/fixmystreet/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "" @@ -906,11 +880,15 @@ msgstr "" msgid "Give me an RSS feed" msgstr "" +#: templates/web/base/questionnaire/completed.html:14 +msgid "Glad to hear it’s been fixed!" +msgstr "" + #: templates/web/base/alert/index.html:34 templates/web/base/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/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:93 msgid "Going to send questionnaire?" msgstr "" @@ -930,7 +908,7 @@ msgstr "" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "" -#: templates/web/base/footer.html:15 templates/web/fiksgatami/footer.html:27 templates/web/fiksgatami/nn/footer.html:27 templates/web/fixmystreet/footer.html:30 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/base/footer.html:15 templates/web/fixmystreet/footer.html:30 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 "" @@ -938,11 +916,11 @@ msgstr "" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "" -#: templates/web/fiksgatami/header.html:48 templates/web/fixmystreet/header.html:52 templates/web/zurich/footer.html:11 +#: templates/web/fixmystreet/header.html:58 templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "" -#: templates/web/base/admin/report_edit.html:35 templates/web/base/admin/report_edit.html:50 templates/web/base/admin/report_edit.html:51 templates/web/base/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:86 templates/web/zurich/admin/report_edit.html:90 templates/web/zurich/admin/stats.html:32 templates/web/zurich/admin/update_edit.html:18 +#: templates/web/base/admin/report_edit.html:48 templates/web/base/admin/report_edit.html:63 templates/web/base/admin/report_edit.html:64 templates/web/base/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:86 templates/web/zurich/admin/report_edit.html:90 templates/web/zurich/admin/stats.html:32 templates/web/zurich/admin/update_edit.html:18 msgid "Hidden" msgstr "" @@ -954,7 +932,7 @@ msgstr "" msgid "Hide pins" msgstr "" -#: templates/web/base/admin/category_edit.html:79 +#: templates/web/base/admin/category_edit.html:84 msgid "History" msgstr "" @@ -970,19 +948,23 @@ msgstr "" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:740 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" +#: templates/web/base/tokens/confirm_problem.html:23 templates/web/base/tokens/confirm_problem.html:27 +msgid "I just reported a problem on @fixmystreet" 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." +#: templates/web/base/tokens/confirm_update.html:19 templates/web/base/tokens/confirm_update.html:23 +msgid "I just updated a problem on @fixmystreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:260 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +msgid "I'm afraid we couldn't locate your problem in the database.\n" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 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 "" @@ -996,7 +978,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:125 +#: templates/web/base/admin/body.html:133 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." @@ -1014,7 +996,11 @@ msgstr "" msgid "If you do not, your update will not be posted." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:9 +#: templates/web/base/questionnaire/completed.html:8 +msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." +msgstr "" + +#: templates/web/base/report/new/councils_text_none.html:2 templates/web/base/report/new/councils_text_none.html:8 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 "" @@ -1029,31 +1015,31 @@ msgid "" "your experience of getting the problem fixed?" msgstr "" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/body.html:149 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/base/admin/body-form.html:200 templates/web/base/admin/body-form.html:201 +#: templates/web/base/admin/body-form.html:207 templates/web/base/admin/body-form.html:208 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable <strong>extended Open311 stauses</strong> if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/body-form.html:187 templates/web/base/admin/body-form.html:188 +#: templates/web/base/admin/body-form.html:194 templates/web/base/admin/body-form.html:195 msgid "" "If you've enabled Open311 update-sending above, enable <strong>suppression of alerts</strong> \n" " if you do <strong>not</strong> want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/body-form.html:173 templates/web/base/admin/body-form.html:174 +#: templates/web/base/admin/body-form.html:177 templates/web/base/admin/body-form.html:178 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:127 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 msgid "Illegal ID" msgstr "" @@ -1073,10 +1059,14 @@ 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:143 templates/web/base/admin/report_edit.html:35 templates/web/base/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:99 templates/web/zurich/report/banner.html:15 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:144 templates/web/base/admin/report_edit.html:48 templates/web/base/admin/report_edit.html:51 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:99 templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "" +#: templates/web/base/tokens/confirm_alert.html:11 +msgid "Inbox zero, here we come!" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:160 msgid "Include reporter personal details" msgstr "" @@ -1085,7 +1075,7 @@ msgstr "" msgid "Include unconfirmed reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:354 +#: perllib/FixMyStreet/App/Controller/Open311.pm:359 msgid "Incorrect has_photo value \"%s\"" msgstr "" @@ -1093,27 +1083,27 @@ msgstr "" msgid "Internal notes" msgstr "" -#: templates/web/base/admin/report_edit.html:35 templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:48 templates/web/base/admin/report_edit.html:61 msgid "Internal referral" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:339 +#: perllib/FixMyStreet/App/Controller/Open311.pm:344 msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1114 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1112 msgid "Invalid end date" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:432 +#: perllib/FixMyStreet/App/Controller/Open311.pm:437 msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1110 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 msgid "Invalid start date" msgstr "" -#: templates/web/base/admin/report_edit.html:35 templates/web/base/admin/report_edit.html:37 templates/web/base/dashboard/index.html:142 templates/web/base/dashboard/index.html:143 templates/web/base/report/update-form.html:30 templates/web/base/report/update-form.html:31 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:29 +#: templates/web/base/admin/report_edit.html:48 templates/web/base/admin/report_edit.html:50 templates/web/base/dashboard/index.html:142 templates/web/base/dashboard/index.html:143 templates/web/base/report/update-form.html:30 templates/web/base/report/update-form.html:31 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:29 msgid "Investigating" msgstr "" @@ -1121,15 +1111,19 @@ msgstr "" msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "" -#: templates/web/base/auth/general.html:44 templates/web/base/report/new/fill_in_details_form.html:150 templates/web/base/report/update-form.html:104 templates/web/fixmystreet/auth/general.html:47 templates/web/fixmystreet/report/new/form_user_loggedout.html:28 templates/web/fixmystreet/report/update-form.html:102 templates/web/zurich/auth/general.html:40 +#: templates/web/base/tokens/confirm_problem.html:14 +msgid "It’s on its way to the council right now." +msgstr "" + +#: templates/web/base/auth/general.html:44 templates/web/base/report/new/fill_in_details_form.html:131 templates/web/base/report/update-form.html:104 templates/web/fixmystreet/auth/general.html:47 templates/web/fixmystreet/report/new/form_user_loggedout.html:28 templates/web/fixmystreet/report/update-form.html:102 templates/web/zurich/auth/general.html:40 msgid "Keep me signed in on this computer" msgstr "" -#: templates/web/base/admin/body.html:62 templates/web/zurich/admin/body.html:16 +#: templates/web/base/admin/body.html:70 templates/web/zurich/admin/body.html:16 msgid "Last editor" msgstr "" -#: templates/web/base/admin/report_edit.html:72 +#: templates/web/base/admin/report_edit.html:88 msgid "Last update:" msgstr "" @@ -1137,31 +1131,31 @@ msgstr "" msgid "Last update:" msgstr "" -#: templates/web/base/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:229 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "" -#: templates/web/base/admin/body.html:17 templates/web/base/admin/body.html:19 +#: templates/web/base/admin/body.html:27 msgid "List all reported problems" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:69 templates/web/fixmystreet/report/new/fill_in_details_form.html:54 templates/web/zurich/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/category_wrapper.html:4 msgid "Loading..." msgstr "" -#: templates/web/base/alert/choose.html:1 templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1 templates/web/base/tokens/confirm_alert.html:1 templates/web/base/tokens/confirm_alert.html:4 templates/web/fixmystreet/alert/updates.html:1 +#: templates/web/base/alert/choose.html:1 templates/web/base/alert/choose.html:3 templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3 templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5 templates/web/base/alert/updates.html:1 templates/web/base/tokens/confirm_alert.html:1 templates/web/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "" -#: templates/web/base/alert/list.html:13 templates/web/base/alert/list.html:14 templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:3 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:12 templates/web/base/alert/list.html:14 templates/web/base/alert/list.html:3 msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "" -#: templates/web/base/footer.html:13 templates/web/fiksgatami/footer.html:25 templates/web/fiksgatami/nn/footer.html:25 templates/web/fixmystreet/footer.html:28 +#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:28 msgid "Local alerts" msgstr "" -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:25 msgid "Locate the problem on a map of the area" msgstr "" @@ -1169,18 +1163,26 @@ msgstr "" msgid "MAP" msgstr "" -#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/js/translation_strings.html:45 templates/web/base/maps/google-ol.html:13 msgid "Map" msgstr "" -#: perllib/FixMyStreet/Map/OSM.pm:42 -msgid "Map © <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>" +#: templates/web/base/admin/report_edit.html:86 +msgid "Mark as sent" msgstr "" -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/user-form.html:44 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." msgstr "" +#: templates/web/base/reports/index.html:24 +msgid "Marked fixed/closed in the past eight weeks" +msgstr "" + +#: templates/web/base/reports/index.html:25 +msgid "Marked fixed/closed more than eight weeks ago" +msgstr "" + #: templates/web/fixmystreet/contact/index.html:106 msgid "Message" msgstr "" @@ -1189,7 +1191,7 @@ msgstr "" msgid "Message:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:440 +#: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" msgstr "" @@ -1205,31 +1207,31 @@ msgstr "" msgid "More problems nearby" msgstr "" -#: templates/web/base/admin/bodies.html:21 templates/web/base/admin/body-form.html:18 templates/web/base/admin/flagged.html:16 templates/web/base/admin/flagged.html:37 templates/web/base/admin/list_updates.html:7 templates/web/base/admin/reports.html:13 templates/web/base/admin/users.html:15 templates/web/base/reports/index.html:20 templates/web/fixmystreet/auth/general.html:53 templates/web/fixmystreet/report/new/form_user_loggedin.html:9 templates/web/fixmystreet/report/new/form_user_loggedout.html:44 templates/web/fixmystreet/report/update-form.html:138 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:94 +#: templates/web/base/admin/bodies.html:21 templates/web/base/admin/body-form.html:18 templates/web/base/admin/flagged.html:16 templates/web/base/admin/flagged.html:37 templates/web/base/admin/list_updates.html:7 templates/web/base/admin/reports.html:13 templates/web/base/admin/users.html:15 templates/web/base/reports/index.html:20 templates/web/fixmystreet/auth/general.html:53 templates/web/fixmystreet/report/new/form_user_loggedin.html:9 templates/web/fixmystreet/report/new/form_user_loggedout.html:44 templates/web/fixmystreet/report/update-form.html:138 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:77 msgid "Name" msgstr "" -#: templates/web/base/admin/report_edit.html:66 templates/web/base/admin/update_edit.html:32 templates/web/base/admin/user-form.html:18 templates/web/zurich/admin/report_edit-sdm.html:43 templates/web/zurich/admin/report_edit.html:56 templates/web/zurich/admin/stats.html:41 +#: templates/web/base/admin/report_edit.html:79 templates/web/base/admin/update_edit.html:32 templates/web/base/admin/user-form.html:18 templates/web/zurich/admin/report_edit-sdm.html:43 templates/web/zurich/admin/report_edit.html:56 templates/web/zurich/admin/stats.html:41 msgid "Name:" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:321 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:313 msgid "Name: %s" msgstr "" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:186 perllib/FixMyStreet/Geocode/OSM.pm:164 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:137 +#: perllib/FixMyStreet/Cobrand/UK.pm:127 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 +#: perllib/FixMyStreet/Cobrand/Default.pm:442 perllib/FixMyStreet/Cobrand/Default.pm:482 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:277 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1243,11 +1245,11 @@ msgstr "" msgid "New <br>problems" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:264 +#: perllib/FixMyStreet/App/Controller/Admin.pm:261 msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:379 msgid "New category contact added" msgstr "" @@ -1319,7 +1321,7 @@ msgstr "" msgid "Next" msgstr "" -#: templates/web/base/admin/body.html:72 templates/web/base/admin/body.html:74 templates/web/base/admin/body.html:78 templates/web/base/admin/body.html:80 templates/web/base/admin/category_edit.html:4 templates/web/base/admin/list_updates.html:32 templates/web/base/admin/list_updates.html:34 templates/web/base/admin/list_updates.html:35 templates/web/base/admin/problem_row.html:20 templates/web/base/admin/report_edit.html:64 templates/web/base/admin/report_edit.html:77 templates/web/base/admin/update_edit.html:25 templates/web/base/questionnaire/creator_fixed.html:16 templates/web/base/questionnaire/index.html:44 templates/web/base/questionnaire/index.html:83 templates/web/fixmystreet/questionnaire/index.html:102 templates/web/fixmystreet/questionnaire/index.html:63 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 templates/web/base/admin/category_edit.html:4 templates/web/base/admin/list_updates.html:32 templates/web/base/admin/list_updates.html:34 templates/web/base/admin/list_updates.html:35 templates/web/base/admin/problem_row.html:20 templates/web/base/admin/report_edit.html:77 templates/web/base/admin/report_edit.html:93 templates/web/base/admin/update_edit.html:25 templates/web/base/questionnaire/creator_fixed.html:16 templates/web/base/questionnaire/index.html:44 templates/web/base/questionnaire/index.html:83 templates/web/fixmystreet/questionnaire/index.html:102 templates/web/fixmystreet/questionnaire/index.html:63 msgid "No" msgstr "" @@ -1331,7 +1333,7 @@ msgstr "" msgid "No council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:376 +#: perllib/FixMyStreet/DB/Result/Problem.pm:401 msgid "No council selected" msgstr "" @@ -1369,11 +1371,11 @@ msgid "" " your config file is not pointing to a live MapIt service." msgstr "" -#: templates/web/base/report/_support.html:3 templates/web/base/report/_support.html:4 +#: templates/web/base/report/_support.html:2 templates/web/base/report/_support.html:4 msgid "No supporters" msgstr "" -#: templates/web/base/admin/report_edit.html:30 templates/web/zurich/admin/report_edit-sdm.html:46 templates/web/zurich/admin/report_edit.html:60 +#: templates/web/base/admin/report_edit.html:41 templates/web/zurich/admin/report_edit-sdm.html:46 templates/web/zurich/admin/report_edit.html:60 msgid "None" msgstr "" @@ -1385,7 +1387,7 @@ msgid "" " activity across their body), the ability to hide reports or set special report statuses." msgstr "" -#: templates/web/base/admin/report_edit.html:35 templates/web/base/admin/report_edit.html:46 templates/web/base/report/update-form.html:30 templates/web/base/report/update-form.html:33 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/admin/report_edit.html:48 templates/web/base/admin/report_edit.html:59 templates/web/base/report/update-form.html:30 templates/web/base/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 "" @@ -1397,11 +1399,11 @@ msgstr "" msgid "Not reported before" msgstr "" -#: templates/web/base/report/_main.html:61 +#: templates/web/base/report/_main.html:62 msgid "Not reported to council" msgstr "" -#: templates/web/base/admin/body.html:63 templates/web/base/admin/category_edit.html:87 templates/web/zurich/admin/body.html:17 +#: templates/web/base/admin/body.html:71 templates/web/base/admin/category_edit.html:92 templates/web/zurich/admin/body.html:17 msgid "Note" msgstr "" @@ -1409,7 +1411,7 @@ msgstr "" 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/base/admin/body.html:178 templates/web/base/admin/category_edit.html:44 templates/web/zurich/admin/body.html:53 +#: templates/web/base/admin/body.html:186 templates/web/base/admin/category_edit.html:49 templates/web/zurich/admin/body.html:53 msgid "Note:" msgstr "" @@ -1421,7 +1423,7 @@ msgstr "" msgid "Now to submit your report…" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:132 +#: templates/web/base/report/new/fill_in_details_form.html:113 msgid "Now to submit your report… do you have a FixMyStreet password?" msgstr "" @@ -1437,7 +1439,7 @@ msgstr "" msgid "OK" msgstr "" -#: templates/web/base/report/display.html:28 templates/web/base/report/update.html:16 +#: templates/web/base/report/display.html:28 templates/web/base/report/update.html:17 msgid "Offensive? Unsuitable? Tell us" msgstr "" @@ -1457,18 +1459,26 @@ msgstr "" msgid "Older <br>problems" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:37 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 msgid "One-line summary" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:137 templates/web/base/admin/report_edit.html:35 templates/web/base/admin/report_edit.html:36 templates/web/base/admin/report_edit.html:37 templates/web/base/admin/update_edit.html:28 templates/web/base/dashboard/index.html:142 templates/web/base/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:86 templates/web/zurich/admin/report_edit.html:88 templates/web/zurich/admin/update_edit.html:18 templates/web/zurich/report/banner.html:11 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:138 templates/web/base/admin/report_edit.html:48 templates/web/base/admin/report_edit.html:49 templates/web/base/admin/report_edit.html:50 templates/web/base/admin/update_edit.html:28 templates/web/base/dashboard/index.html:142 templates/web/base/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:86 templates/web/zurich/admin/report_edit.html:88 templates/web/zurich/admin/update_edit.html:18 templates/web/zurich/report/banner.html:11 msgid "Open" msgstr "" -#: templates/web/base/my/my.html:30 templates/web/fixmystreet/my/my.html:36 +#: templates/web/base/reports/index.html:22 +msgid "Open for more than four weeks, with an update within the past eight weeks" +msgstr "" + +#: templates/web/base/my/my.html:30 templates/web/fixmystreet/my/_problem-list.html:2 msgid "Open reports" msgstr "" +#: templates/web/base/reports/index.html:23 +msgid "Open, but not had any update in eight weeks" +msgstr "" + #: templates/web/base/open311/index.html:70 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "" @@ -1489,7 +1499,7 @@ msgstr "" msgid "Or you can subscribe to an alert based upon what ward or council you’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:560 perllib/FixMyStreet/DB/Result/Problem.pm:570 perllib/FixMyStreet/DB/Result/Problem.pm:580 perllib/FixMyStreet/DB/Result/Problem.pm:592 perllib/FixMyStreet/DB/ResultSet/Problem.pm:372 perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061 perllib/FixMyStreet/App/Controller/Report/New.pm:666 perllib/FixMyStreet/App/Controller/Report/New.pm:667 perllib/FixMyStreet/DB/Result/Problem.pm:565 perllib/FixMyStreet/DB/Result/Problem.pm:575 perllib/FixMyStreet/DB/Result/Problem.pm:585 perllib/FixMyStreet/DB/Result/Problem.pm:597 perllib/FixMyStreet/DB/ResultSet/Problem.pm:378 perllib/FixMyStreet/DB/ResultSet/Problem.pm:393 msgid "Other" msgstr "" @@ -1509,7 +1519,7 @@ msgstr "" msgid "Parent" msgstr "" -#: templates/web/base/admin/report_edit.html:35 templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 templates/web/base/admin/report_edit.html:64 msgid "Partial" msgstr "" @@ -1525,7 +1535,7 @@ msgstr "" msgid "Permalink" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:100 +#: templates/web/zurich/report/new/fill_in_details_form.html:83 msgid "Phone number" msgstr "" @@ -1533,15 +1543,15 @@ msgstr "" msgid "Phone number (optional)" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:286 templates/web/base/admin/report_edit.html:68 templates/web/base/report/new/fill_in_details_form.html:216 templates/web/zurich/admin/report_edit-sdm.html:46 templates/web/zurich/admin/report_edit.html:60 templates/web/zurich/admin/stats.html:39 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:291 templates/web/base/admin/report_edit.html:81 templates/web/base/report/new/fill_in_details_form.html:197 templates/web/zurich/admin/report_edit-sdm.html:46 templates/web/zurich/admin/report_edit.html:60 templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:72 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 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 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:51 msgid "Photo" msgstr "" -#: templates/web/base/questionnaire/index.html:71 templates/web/base/report/new/fill_in_details_form.html:103 templates/web/base/report/update-form.html:62 templates/web/fixmystreet/questionnaire/index.html:91 +#: templates/web/base/questionnaire/index.html:71 templates/web/base/report/new/fill_in_details_form.html:84 templates/web/base/report/update-form.html:62 templates/web/fixmystreet/questionnaire/index.html:91 msgid "Photo:" msgstr "" @@ -1553,7 +1563,7 @@ msgstr "" msgid "Place pin on map" msgstr "" -#: templates/web/base/admin/report_edit.html:35 templates/web/base/admin/report_edit.html:38 templates/web/base/dashboard/index.html:142 templates/web/base/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:86 templates/web/zurich/admin/report_edit.html:89 +#: templates/web/base/admin/report_edit.html:48 templates/web/base/admin/report_edit.html:51 templates/web/base/dashboard/index.html:142 templates/web/base/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:86 templates/web/zurich/admin/report_edit.html:89 msgid "Planned" msgstr "" @@ -1577,15 +1587,15 @@ msgstr "" msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:349 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:395 templates/web/base/js/translation_strings.html:9 +#: perllib/FixMyStreet/App/Controller/Admin.pm:343 perllib/FixMyStreet/App/Controller/Report/New.pm:876 perllib/FixMyStreet/App/Controller/Report/New.pm:925 perllib/FixMyStreet/DB/Result/Problem.pm:412 templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:401 +#: perllib/FixMyStreet/DB/Result/Problem.pm:418 msgid "Please choose a property type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:370 msgid "Please correct the errors below" msgstr "" @@ -1600,7 +1610,7 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:352 perllib/FixMyStreet/DB/Result/Comment.pm:133 templates/web/base/js/translation_strings.html:2 +#: perllib/FixMyStreet/App/Controller/Admin.pm:346 perllib/FixMyStreet/DB/Result/Comment.pm:125 templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "" @@ -1608,27 +1618,27 @@ msgstr "" msgid "Please enter a password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:108 perllib/FixMyStreet/DB/Result/Problem.pm:370 templates/web/base/js/translation_strings.html:3 +#: perllib/FixMyStreet/App/Controller/Contact.pm:113 perllib/FixMyStreet/DB/Result/Problem.pm:395 templates/web/base/js/translation_strings.html:3 msgid "Please enter a subject" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1050 perllib/FixMyStreet/App/Controller/Admin.pm:351 perllib/FixMyStreet/App/Controller/Admin.pm:997 perllib/FixMyStreet/DB/Result/User.pm:127 templates/web/base/js/translation_strings.html:12 templates/web/base/js/translation_strings.html:16 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 perllib/FixMyStreet/App/Controller/Admin.pm:345 perllib/FixMyStreet/App/Controller/Admin.pm:995 perllib/FixMyStreet/DB/Result/User.pm:127 templates/web/base/js/translation_strings.html:12 templates/web/base/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:118 +#: perllib/FixMyStreet/App/Controller/Alert.pm:346 perllib/FixMyStreet/App/Controller/Contact.pm:123 msgid "Please enter a valid email address" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:373 templates/web/base/js/translation_strings.html:4 +#: perllib/FixMyStreet/DB/Result/Problem.pm:398 templates/web/base/js/translation_strings.html:4 msgid "Please enter some details" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:107 perllib/FixMyStreet/DB/Result/User.pm:124 templates/web/base/auth/general.html:13 templates/web/base/auth/general.html:8 templates/web/base/js/translation_strings.html:11 templates/web/base/js/translation_strings.html:15 templates/web/fixmystreet/auth/general.html:10 templates/web/fixmystreet/auth/general.html:15 templates/web/zurich/auth/general.html:3 templates/web/zurich/auth/general.html:8 +#: perllib/FixMyStreet/App/Controller/Contact.pm:112 perllib/FixMyStreet/DB/Result/User.pm:124 templates/web/base/auth/general.html:13 templates/web/base/auth/general.html:8 templates/web/base/js/translation_strings.html:11 templates/web/base/js/translation_strings.html:15 templates/web/fixmystreet/auth/general.html:10 templates/web/fixmystreet/auth/general.html:15 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/form_user_loggedout.html:7 templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 templates/web/zurich/report/new/fill_in_details_form.html:75 msgid "Please enter your email address" msgstr "" @@ -1636,11 +1646,11 @@ msgstr "" msgid "Please enter your first name" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:388 templates/web/base/js/translation_strings.html:7 +#: perllib/FixMyStreet/Cobrand/UK.pm:318 templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:106 perllib/FixMyStreet/DB/Result/Comment.pm:130 perllib/FixMyStreet/DB/Result/Problem.pm:381 perllib/FixMyStreet/DB/Result/User.pm:120 templates/web/base/js/translation_strings.html:6 +#: perllib/FixMyStreet/App/Controller/Contact.pm:111 perllib/FixMyStreet/DB/Result/Comment.pm:122 perllib/FixMyStreet/DB/Result/Problem.pm:406 perllib/FixMyStreet/DB/Result/User.pm:120 templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" msgstr "" @@ -1660,7 +1670,7 @@ msgstr "" msgid "Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a href=\"/\">front page</a>." msgstr "" -#: templates/web/base/report/new/fill_in_details_text.html:2 templates/web/base/report/new/fill_in_details_text.html:8 +#: templates/web/base/report/new/fill_in_details_text.html:1 templates/web/base/report/new/fill_in_details_text.html:8 msgid "Please fill in details of the problem below." msgstr "" @@ -1672,7 +1682,7 @@ msgstr "" msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:251 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" @@ -1692,15 +1702,15 @@ msgstr "" msgid "Please note:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:246 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:254 msgid "Please provide some explanation as to why you're reopening this report" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:261 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 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 perllib/FixMyStreet/App/Controller/Questionnaire.pm:247 msgid "Please say whether you've ever reported a problem to your council before" msgstr "" @@ -1712,7 +1722,7 @@ msgstr "" msgid "Please select the type of alert you want" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please state whether or not the problem has been fixed" msgstr "" @@ -1720,15 +1730,11 @@ msgstr "" msgid "Please take a look at the updates that have been left." msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:176 +#: perllib/FixMyStreet/App/Controller/Photo.pm:177 perllib/FixMyStreet/App/Controller/Photo.pm:187 perllib/FixMyStreet/App/Controller/Photo.pm:189 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:109 +#: perllib/FixMyStreet/App/Controller/Contact.pm:114 msgid "Please write a message" msgstr "" @@ -1760,11 +1766,11 @@ msgstr "" msgid "Privacy" msgstr "" -#: templates/web/base/admin/body.html:194 templates/web/base/admin/body.html:77 templates/web/base/admin/category_edit.html:40 templates/web/base/admin/report_edit.html:79 +#: templates/web/base/admin/body.html:202 templates/web/base/admin/body.html:85 templates/web/base/admin/category_edit.html:45 templates/web/base/admin/report_edit.html:95 msgid "Private" msgstr "" -#: templates/web/base/maps/openlayers.html:86 +#: templates/web/base/maps/openlayers.html:89 msgid "Problem" msgstr "" @@ -1784,7 +1790,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:966 msgid "Problem marked as open." msgstr "" @@ -1816,11 +1822,11 @@ msgstr "" msgid "Problems within %.1fkm of this location" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:629 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:114 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 perllib/FixMyStreet/Cobrand/FixaMinGata.pm:151 perllib/FixMyStreet/Cobrand/UK.pm:217 +#: perllib/FixMyStreet/Cobrand/Default.pm:650 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 perllib/FixMyStreet/Cobrand/UK.pm:207 msgid "Problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:122 perllib/FixMyStreet/Cobrand/UK.pm:231 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "Problems within %s ward" msgstr "" @@ -1836,7 +1842,7 @@ msgstr "" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "" -#: templates/web/base/admin/report_edit.html:32 +#: templates/web/base/admin/report_edit.html:45 msgid "Property address:" msgstr "" @@ -1852,7 +1858,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/base/report/new/fill_in_details_form.html:174 templates/web/base/report/update-form.html:128 templates/web/fixmystreet/report/new/form_user_loggedout.html:71 templates/web/fixmystreet/report/update-form.html:119 +#: templates/web/base/report/new/fill_in_details_form.html:155 templates/web/base/report/update-form.html:128 templates/web/fixmystreet/report/new/form_user_loggedout.html:71 templates/web/fixmystreet/report/update-form.html:119 msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." msgstr "" @@ -1868,7 +1874,7 @@ msgstr "" msgid "Publish the response" msgstr "" -#: templates/web/base/questionnaire/completed.html:2 templates/web/base/questionnaire/index.html:0 templates/web/base/questionnaire/index.html:14 templates/web/base/questionnaire/index.html:4 templates/web/fixmystreet/questionnaire/index.html:0 templates/web/fixmystreet/questionnaire/index.html:15 templates/web/fixmystreet/questionnaire/index.html:33 templates/web/fixmystreet/questionnaire/index.html:5 +#: templates/web/base/questionnaire/completed.html:1 templates/web/base/questionnaire/index.html:0 templates/web/base/questionnaire/index.html:14 templates/web/base/questionnaire/index.html:4 templates/web/fixmystreet/questionnaire/index.html:0 templates/web/fixmystreet/questionnaire/index.html:15 templates/web/fixmystreet/questionnaire/index.html:33 templates/web/fixmystreet/questionnaire/index.html:5 msgid "Questionnaire" msgstr "" @@ -1880,27 +1886,27 @@ msgstr "" msgid "Questionnaire %d sent for problem %d" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 msgid "Questionnaire filled in by problem reporter" msgstr "" -#: templates/web/base/alert/_list.html:21 templates/web/base/around/display_location.html:3 templates/web/base/report/display.html:50 templates/web/base/reports/_rss.html:1 templates/web/fixmystreet/alert/_list.html:22 templates/web/fixmystreet/alert/updates.html:9 templates/web/fixmystreet/report/display.html:58 +#: templates/web/base/alert/_list.html:21 templates/web/base/around/display_location.html:1 templates/web/base/around/display_location.html:3 templates/web/base/report/display.html:50 templates/web/base/reports/_rss.html:1 templates/web/fixmystreet/alert/_list.html:22 templates/web/fixmystreet/alert/updates.html:9 templates/web/fixmystreet/report/display.html:58 msgid "RSS feed" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:260 perllib/FixMyStreet/Cobrand/UK.pm:272 +#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 msgid "RSS feed for %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "RSS feed for %s ward, %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 perllib/FixMyStreet/Cobrand/FixaMinGata.pm:167 perllib/FixMyStreet/Cobrand/FixaMinGata.pm:175 perllib/FixMyStreet/Cobrand/FixaMinGata.pm:185 perllib/FixMyStreet/Cobrand/FixaMinGata.pm:193 perllib/FixMyStreet/Cobrand/UK.pm:286 perllib/FixMyStreet/Cobrand/UK.pm:298 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 msgid "RSS feed of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 msgid "RSS feed of %s, within %s ward" msgstr "" @@ -1912,15 +1918,15 @@ msgstr "" msgid "RSS feed of problems in this %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:630 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:115 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 perllib/FixMyStreet/Cobrand/FixaMinGata.pm:150 perllib/FixMyStreet/Cobrand/UK.pm:224 +#: perllib/FixMyStreet/Cobrand/Default.pm:651 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 perllib/FixMyStreet/Cobrand/UK.pm:214 msgid "RSS feed of problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 perllib/FixMyStreet/Cobrand/UK.pm:230 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s ward" msgstr "" -#: templates/web/base/around/display_location.html:3 templates/web/base/around/display_location.html:4 +#: templates/web/base/around/display_location.html:1 templates/web/base/around/display_location.html:4 msgid "RSS feed of recent local problems" msgstr "" @@ -1952,11 +1958,15 @@ msgstr "" msgid "Remove flag" msgstr "" -#: templates/web/base/admin/report_edit.html:94 templates/web/base/admin/update_edit.html:62 templates/web/zurich/admin/update_edit.html:35 +#: templates/web/base/admin/report_edit.html:110 templates/web/base/admin/update_edit.html:62 templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "" -#: templates/web/base/footer.html:7 templates/web/fiksgatami/footer.html:19 templates/web/fiksgatami/nn/footer.html:19 templates/web/fixmystreet/footer.html:22 templates/web/zurich/footer.html:17 templates/web/zurich/nav_over_content.html:4 +#: templates/web/fixmystreet/header_logo.html:2 +msgid "Report" +msgstr "" + +#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:22 templates/web/fixmystreet/header_logo.html:2 templates/web/zurich/footer.html:17 templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" msgstr "" @@ -1964,10 +1974,6 @@ msgstr "" msgid "Report abuse" msgstr "" -#: templates/web/base/report_created.html:1 templates/web/base/report_created.html:3 -msgid "Report created" -msgstr "" - #: perllib/FixMyStreet/App/Controller/Rss.pm:295 msgid "Report on %s" msgstr "" @@ -1988,7 +1994,7 @@ msgstr "" msgid "Reported %s, to %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:575 templates/web/base/contact/index.html:50 templates/web/fixmystreet/contact/index.html:65 +#: perllib/FixMyStreet/DB/Result/Problem.pm:580 templates/web/base/contact/index.html:50 templates/web/fixmystreet/contact/index.html:65 msgid "Reported anonymously at %s" msgstr "" @@ -1996,7 +2002,7 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:598 templates/web/base/contact/index.html:52 templates/web/fixmystreet/contact/index.html:67 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 templates/web/base/contact/index.html:52 templates/web/fixmystreet/contact/index.html:67 msgid "Reported by %s at %s" msgstr "" @@ -2004,39 +2010,43 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:571 +#: perllib/FixMyStreet/DB/Result/Problem.pm:576 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:598 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:567 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:589 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:563 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:583 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 msgid "Reported via %s in the %s category by %s at %s" msgstr "" -#: templates/web/base/around/around_index.html:2 templates/web/base/around/around_index.html:3 templates/web/base/js/translation_strings.html:41 templates/web/base/report/new/fill_in_details.html:0 templates/web/base/report/new/fill_in_details.html:5 templates/web/fixmystreet/around/around_index.html:2 templates/web/zurich/report/new/fill_in_details_form.html:2 +#: templates/web/base/reports/index.html:21 +msgid "Reported within the last four weeks" +msgstr "" + +#: templates/web/base/around/around_index.html:1 templates/web/base/around/around_index.html:3 templates/web/base/js/translation_strings.html:41 templates/web/base/report/new/fill_in_details.html:0 templates/web/base/report/new/fill_in_details.html:5 templates/web/fixmystreet/around/around_index.html:2 templates/web/zurich/report/new/fill_in_details_form.html:2 msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 perllib/FixMyStreet/Cobrand/Zurich.pm:290 templates/web/zurich/header.html:60 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 perllib/FixMyStreet/Cobrand/Zurich.pm:294 templates/web/zurich/header.html:60 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:409 perllib/FixMyStreet/DB/Result/Problem.pm:413 +#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" @@ -2052,7 +2062,7 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:85 msgid "Resend report" msgstr "" @@ -2060,27 +2070,27 @@ msgstr "" msgid "Right place?" msgstr "" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:193 perllib/FixMyStreet/Geocode/OSM.pm:171 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:167 perllib/FixMyStreet/Geocode/OSM.pm:152 msgid "Road operator for this named road (derived from road reference number and type): %s" msgstr "" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:190 perllib/FixMyStreet/Geocode/OSM.pm:168 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:164 perllib/FixMyStreet/Geocode/OSM.pm:149 msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1394 perllib/FixMyStreet/App/Controller/Admin.pm:1405 templates/web/base/admin/report_edit.html:90 templates/web/zurich/admin/report_edit.html:73 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 perllib/FixMyStreet/App/Controller/Admin.pm:1403 templates/web/base/admin/report_edit.html:106 templates/web/zurich/admin/report_edit.html:73 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1394 templates/web/base/admin/report_edit.html:91 templates/web/zurich/admin/report_edit.html:74 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 templates/web/base/admin/report_edit.html:107 templates/web/zurich/admin/report_edit.html:74 msgid "Rotate Right" msgstr "" -#: templates/web/base/js/translation_strings.html:46 templates/web/base/maps/google-ol.html:13 +#: templates/web/base/js/translation_strings.html:46 msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:200 templates/web/base/admin/category_edit.html:76 templates/web/zurich/admin/body.html:59 +#: templates/web/base/admin/body.html:208 templates/web/base/admin/category_edit.html:81 templates/web/zurich/admin/body.html:59 msgid "Save changes" msgstr "" @@ -2104,7 +2114,7 @@ msgstr "" msgid "Searching found no reports." msgstr "" -#: templates/web/base/admin/users.html:39 +#: templates/web/base/admin/users.html:41 msgid "Searching found no users." msgstr "" @@ -2124,15 +2134,15 @@ 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:680 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "Sent to %s %s later" msgstr "" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:84 msgid "Sent:" msgstr "" -#: templates/web/base/admin/report_edit.html:73 templates/web/zurich/admin/stats.html:45 +#: templates/web/base/admin/report_edit.html:89 templates/web/zurich/admin/stats.html:45 msgid "Service:" msgstr "" @@ -2140,7 +2150,7 @@ msgstr "" msgid "Share" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:211 templates/web/base/report/update-form.html:157 templates/web/fixmystreet/report/new/form_user_loggedin.html:23 templates/web/fixmystreet/report/new/form_user_loggedout.html:59 templates/web/fixmystreet/report/update-form.html:146 +#: templates/web/base/report/new/fill_in_details_form.html:192 templates/web/base/report/update-form.html:157 templates/web/fixmystreet/report/new/form_user_loggedin.html:23 templates/web/fixmystreet/report/new/form_user_loggedout.html:59 templates/web/fixmystreet/report/update-form.html:146 msgid "Show my name publicly" msgstr "" @@ -2172,11 +2182,11 @@ msgstr "" msgid "Signed in as %s" msgstr "" -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 msgid "Some categories may require additional information." msgstr "" -#: templates/web/base/admin/body-form.html:145 templates/web/base/admin/body-form.html:146 +#: templates/web/base/admin/body-form.html:149 templates/web/base/admin/body-form.html:150 msgid "" "Some endpoints require an <strong>API key</strong> to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -2186,11 +2196,11 @@ msgstr "" msgid "Some photos of recent reports" msgstr "" -#: perllib/FixMyStreet/App/View/Email.pm:32 perllib/FixMyStreet/App/View/Web.pm:44 +#: perllib/FixMyStreet/App/View/Email.pm:32 perllib/FixMyStreet/App/View/Web.pm:43 msgid "Some text to localize" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:88 +#: perllib/FixMyStreet/Cobrand/UK.pm:78 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -2198,11 +2208,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:26 perllib/FixMyStreet/Geocode/Bing.pm:56 perllib/FixMyStreet/Geocode/FixaMinGata.pm:73 perllib/FixMyStreet/Geocode/FixaMinGata.pm:93 perllib/FixMyStreet/Geocode/Google.pm:72 perllib/FixMyStreet/Geocode/OSM.pm:64 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:214 perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 perllib/FixMyStreet/Geocode/Google.pm:47 perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "" -#: perllib/FixMyStreet/Geocode/Bing.pm:51 perllib/FixMyStreet/Geocode/Google.pm:67 perllib/FixMyStreet/Geocode/Zurich.pm:87 +#: perllib/FixMyStreet/Geocode/Bing.pm:34 perllib/FixMyStreet/Geocode/Google.pm:44 perllib/FixMyStreet/Geocode/Zurich.pm:87 msgid "Sorry, we could not parse that location. Please try again." msgstr "" @@ -2210,15 +2220,15 @@ msgstr "" msgid "Start Date:" msgstr "" -#: templates/web/base/admin/body.html:61 templates/web/base/admin/flagged.html:18 templates/web/base/admin/list_updates.html:11 templates/web/base/admin/reports.html:15 templates/web/fixmystreet/report/update-form.html:26 +#: templates/web/base/admin/body.html:69 templates/web/base/admin/flagged.html:18 templates/web/base/admin/list_updates.html:11 templates/web/base/admin/reports.html:15 templates/web/fixmystreet/report/update-form.html:26 msgid "State" msgstr "" -#: templates/web/base/admin/report_edit.html:34 templates/web/base/admin/update_edit.html:27 templates/web/base/report/update-form.html:28 templates/web/zurich/admin/report_edit-sdm.html:53 templates/web/zurich/admin/report_edit.html:84 templates/web/zurich/admin/update_edit.html:17 +#: templates/web/base/admin/report_edit.html:47 templates/web/base/admin/update_edit.html:27 templates/web/base/report/update-form.html:28 templates/web/zurich/admin/report_edit-sdm.html:53 templates/web/zurich/admin/report_edit.html:84 templates/web/zurich/admin/update_edit.html:17 msgid "State:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1200 perllib/FixMyStreet/Cobrand/Zurich.pm:304 templates/web/base/admin/stats.html:1 templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 perllib/FixMyStreet/Cobrand/Zurich.pm:308 templates/web/base/admin/stats.html:1 templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" msgstr "" @@ -2230,7 +2240,7 @@ msgstr "" msgid "Still open, via questionnaire, %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:381 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 msgid "Subcategory: %s" msgstr "" @@ -2246,11 +2256,11 @@ msgstr "" msgid "Subject:" msgstr "" -#: templates/web/base/questionnaire/creator_fixed.html:19 templates/web/base/report/new/fill_in_details_form.html:115 templates/web/base/report/new/fill_in_details_form.html:155 templates/web/base/report/new/fill_in_details_form.html:177 templates/web/fixmystreet/report/new/form_user_loggedin.html:36 templates/web/fixmystreet/report/new/form_user_loggedout.html:23 templates/web/fixmystreet/report/new/form_user_loggedout.html:76 templates/web/zurich/report/new/fill_in_details_form.html:108 +#: templates/web/base/questionnaire/creator_fixed.html:19 templates/web/base/report/new/fill_in_details_form.html:136 templates/web/base/report/new/fill_in_details_form.html:158 templates/web/base/report/new/fill_in_details_form.html:96 templates/web/fixmystreet/report/new/form_user_loggedin.html:36 templates/web/fixmystreet/report/new/form_user_loggedout.html:23 templates/web/fixmystreet/report/new/form_user_loggedout.html:76 templates/web/zurich/report/new/fill_in_details_form.html:91 msgid "Submit" msgstr "" -#: templates/web/base/admin/report_edit.html:97 templates/web/base/admin/update_edit.html:65 templates/web/base/admin/user-form.html:55 templates/web/zurich/admin/report_edit-sdm.html:64 templates/web/zurich/admin/report_edit.html:221 templates/web/zurich/admin/update_edit.html:38 +#: templates/web/base/admin/report_edit.html:113 templates/web/base/admin/update_edit.html:65 templates/web/base/admin/user-form.html:56 templates/web/zurich/admin/report_edit-sdm.html:64 templates/web/zurich/admin/report_edit.html:221 templates/web/zurich/admin/update_edit.html:38 msgid "Submit changes" msgstr "" @@ -2258,7 +2268,7 @@ msgstr "" 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:86 templates/web/zurich/admin/report_edit.html:87 templates/web/zurich/admin/reports.html:13 templates/web/zurich/report/banner.html:9 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:134 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:86 templates/web/zurich/admin/report_edit.html:87 templates/web/zurich/admin/reports.html:13 templates/web/zurich/report/banner.html:9 msgid "Submitted" msgstr "" @@ -2270,7 +2280,7 @@ msgstr "" msgid "Subscribe me to an email alert" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 perllib/FixMyStreet/Cobrand/Zurich.pm:289 templates/web/base/admin/bodies.html:25 templates/web/base/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:1191 perllib/FixMyStreet/Cobrand/Zurich.pm:293 templates/web/base/admin/bodies.html:25 templates/web/base/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 "" @@ -2278,7 +2288,7 @@ msgstr "" msgid "Summary reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 msgid "Survey" msgstr "" @@ -2290,7 +2300,7 @@ msgstr "" msgid "Text" msgstr "" -#: templates/web/base/admin/body.html:21 +#: templates/web/base/admin/body.html:28 msgid "Text only version" msgstr "" @@ -2298,47 +2308,51 @@ msgstr "" msgid "Text:" msgstr "" -#: templates/web/base/tokens/confirm_update.html:9 -msgid "Thank you — you can <a href=\"%s\">view your updated problem</a> on the site." -msgstr "" - -#: templates/web/base/tokens/confirm_problem.html:18 -msgid "Thank you for reporting this issue" +#: templates/web/base/tokens/confirm_problem.html:12 +msgid "Thank you for reporting this issue!" msgstr "" #: templates/web/base/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/fixmystreet/around/around_index.html:28 -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 :" +#: templates/web/base/tokens/confirm_update.html:15 +msgid "Thank you for updating this issue!" msgstr "" -#: templates/web/base/contact/submit.html:8 -msgid "Thanks for your feedback. We'll get back to you as soon as we can!" +#: templates/web/base/contact/submit.html:6 templates/web/base/questionnaire/completed.html:5 +msgid "Thank you for your feedback" +msgstr "" + +#: templates/web/fixmystreet/around/around_index.html:28 +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 :" msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:9 msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:190 +#: perllib/FixMyStreet/App/Controller/Photo.pm:195 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Council.pm:100 +#: perllib/FixMyStreet/App/Controller/Council.pm:97 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 +#: perllib/FixMyStreet/App/Controller/Location.pm:126 msgid "That location does not appear to be in the UK; please try again." msgstr "" -#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 perllib/FixMyStreet/Cobrand/UK.pm:81 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 perllib/FixMyStreet/Cobrand/UK.pm:71 msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:713 +#: perllib/FixMyStreet/App/Controller/Admin.pm:712 +msgid "That problem has been marked as sent." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:704 msgid "That problem will now be resent." msgstr "" @@ -2350,25 +2364,25 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "" -#: templates/web/base/admin/body.html:136 +#: templates/web/base/admin/body.html:144 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/base/admin/body-form.html:119 templates/web/base/admin/body-form.html:120 +#: templates/web/base/admin/body-form.html:123 templates/web/base/admin/body-form.html:124 msgid "" "The <strong>endpoint</strong> is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." msgstr "" -#: templates/web/base/admin/body-form.html:132 templates/web/base/admin/body-form.html:133 +#: templates/web/base/admin/body-form.html:136 templates/web/base/admin/body-form.html:137 msgid "" "The <strong>jurisdiction</strong> is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" -#: templates/web/base/admin/body-form.html:90 templates/web/base/admin/body-form.html:91 +#: templates/web/base/admin/body-form.html:94 templates/web/base/admin/body-form.html:95 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>." @@ -2388,7 +2402,7 @@ msgstr "" msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." msgstr "" -#: templates/web/base/report/new/fill_in_details_text.html:2 templates/web/base/report/new/fill_in_details_text.html:3 +#: templates/web/base/report/new/fill_in_details_text.html:1 templates/web/base/report/new/fill_in_details_text.html:3 msgid "The council won’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 "" @@ -2412,7 +2426,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:185 perllib/FixMyStreet/Geocode/OSM.pm:163 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:159 perllib/FixMyStreet/Geocode/OSM.pm:144 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap." msgstr "" @@ -2468,7 +2482,7 @@ msgstr "" msgid "The passwords do not match" msgstr "" -#: templates/web/base/errors/page_error_404_not_found.html:11 templates/web/base/errors/page_error_404_not_found.html:12 +#: templates/web/base/errors/page_error_404_not_found.html:10 templates/web/base/errors/page_error_404_not_found.html:12 msgid "The requested URL '%s' was not found on this server" msgstr "" @@ -2480,7 +2494,7 @@ msgstr "" msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:295 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:300 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" @@ -2490,15 +2504,19 @@ msgid "" " Names are not necessarily unique." msgstr "" +#: templates/web/base/reports/_problem-list.html:15 +msgid "There are no reports to show." +msgstr "" + #: perllib/FixMyStreet/App/Controller/Reports.pm:75 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:131 perllib/FixMyStreet/App/Controller/Dashboard.pm:59 +#: perllib/FixMyStreet/App/Controller/Contact.pm:136 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/base/auth/general.html:23 templates/web/fixmystreet/auth/general.html:25 templates/web/zurich/auth/general.html:28 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:762 perllib/FixMyStreet/App/Controller/Report/Update.pm:134 templates/web/base/auth/general.html:23 templates/web/fixmystreet/auth/general.html:25 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 ‘sign in by email’ section of the form." msgstr "" @@ -2510,7 +2528,7 @@ msgstr "" msgid "There was a problem with your update. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:135 +#: perllib/FixMyStreet/App/Controller/Contact.pm:140 msgid "There were problems with your report. Please see below." msgstr "" @@ -2518,7 +2536,7 @@ msgstr "" msgid "There were problems with your update. Please see below." msgstr "" -#: templates/web/base/admin/body-form.html:108 templates/web/base/admin/body-form.html:109 +#: templates/web/base/admin/body-form.html:112 templates/web/base/admin/body-form.html:113 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" @@ -2531,14 +2549,14 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" -#: templates/web/base/admin/body.html:36 +#: templates/web/base/admin/body.html:44 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported <em>at any location</em>.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" " Currently, users <strong>cannot report problems to this body</strong>." msgstr "" -#: templates/web/base/admin/body.html:46 +#: templates/web/base/admin/body.html:54 msgid "This body has no contacts. This means that currently problems reported to this body <strong>will not be sent</strong>." msgstr "" @@ -2548,15 +2566,15 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:388 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:394 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:391 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 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:136 perllib/FixMyStreet/Cobrand/UK.pm:53 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:902 perllib/FixMyStreet/App/Controller/Report/New.pm:972 perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 perllib/FixMyStreet/Cobrand/UK.pm:43 msgid "This information is required" msgstr "" @@ -2592,7 +2610,7 @@ msgstr "" 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 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:131 perllib/FixMyStreet/Cobrand/Zurich.pm:132 templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -2608,15 +2626,15 @@ msgstr "" msgid "This report is currently marked as open." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:319 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:311 msgid "This report was submitted anonymously" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:293 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 templates/web/base/admin/timeline.html:1 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -2632,7 +2650,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:294 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:299 msgid "To view a map of the precise location of this issue" msgstr "" @@ -2644,11 +2662,15 @@ msgstr "" msgid "Try again" msgstr "" -#: templates/web/base/admin/report_edit.html:35 templates/web/base/admin/report_edit.html:46 templates/web/base/report/update-form.html:30 templates/web/base/report/update-form.html:33 templates/web/fixmystreet/report/update-form.html:28 templates/web/fixmystreet/report/update-form.html:31 +#: templates/web/base/contact/submit.html:14 +msgid "Try emailing us directly:" +msgstr "" + +#: templates/web/base/admin/report_edit.html:48 templates/web/base/admin/report_edit.html:59 templates/web/base/report/update-form.html:30 templates/web/base/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/base/admin/report_edit.html:35 templates/web/base/admin/report_edit.html:51 templates/web/base/admin/update_edit.html:28 templates/web/zurich/admin/report_edit-sdm.html:45 templates/web/zurich/admin/report_edit.html:58 templates/web/zurich/admin/update_edit.html:18 +#: templates/web/base/admin/report_edit.html:48 templates/web/base/admin/report_edit.html:64 templates/web/base/admin/update_edit.html:28 templates/web/zurich/admin/report_edit-sdm.html:45 templates/web/zurich/admin/report_edit.html:58 templates/web/zurich/admin/update_edit.html:18 msgid "Unconfirmed" msgstr "" @@ -2684,7 +2706,7 @@ msgstr "" msgid "Update below added by %s at %s" msgstr "" -#: templates/web/base/admin/body-form.html:233 templates/web/zurich/admin/body-form.html:51 +#: templates/web/base/admin/body-form.html:240 templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "" @@ -2708,7 +2730,7 @@ msgstr "" msgid "Update reopened problem" msgstr "" -#: templates/web/base/admin/body.html:93 +#: templates/web/base/admin/body.html:101 msgid "Update statuses" msgstr "" @@ -2720,7 +2742,7 @@ msgstr "" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1016 perllib/FixMyStreet/App/Controller/Admin.pm:1060 perllib/FixMyStreet/App/Controller/Admin.pm:810 perllib/FixMyStreet/App/Controller/Admin.pm:958 perllib/FixMyStreet/Cobrand/Zurich.pm:549 perllib/FixMyStreet/Cobrand/Zurich.pm:618 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1014 perllib/FixMyStreet/App/Controller/Admin.pm:1058 perllib/FixMyStreet/App/Controller/Admin.pm:808 perllib/FixMyStreet/App/Controller/Admin.pm:956 perllib/FixMyStreet/Cobrand/Zurich.pm:556 perllib/FixMyStreet/Cobrand/Zurich.pm:625 msgid "Updated!" msgstr "" @@ -2728,7 +2750,7 @@ msgstr "" msgid "Updates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:139 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -2740,7 +2762,7 @@ msgstr "" msgid "Updates to this problem, FixMyStreet" msgstr "" -#: templates/web/base/admin/body.html:174 +#: templates/web/base/admin/body.html:182 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 "" @@ -2748,11 +2770,11 @@ msgstr "" msgid "User" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1357 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1331 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1329 msgid "User flagged" msgstr "" @@ -2760,11 +2782,11 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 perllib/FixMyStreet/Cobrand/Zurich.pm:303 templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:69 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 perllib/FixMyStreet/Cobrand/Zurich.pm:307 templates/web/base/admin/flagged.html:29 templates/web/zurich/header.html:69 msgid "Users" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:380 perllib/FixMyStreet/App/Controller/Admin.pm:410 perllib/FixMyStreet/App/Controller/Admin.pm:430 +#: perllib/FixMyStreet/App/Controller/Admin.pm:374 perllib/FixMyStreet/App/Controller/Admin.pm:404 perllib/FixMyStreet/App/Controller/Admin.pm:421 msgid "Values updated" msgstr "" @@ -2808,11 +2830,11 @@ msgstr "" msgid "We never show your email address or phone number." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:403 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/base/index-steps.html:38 +#: templates/web/base/index-steps.html:31 msgid "We send it to the council on your behalf" msgstr "" @@ -2820,15 +2842,23 @@ msgstr "" msgid "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>" msgstr "" +#: templates/web/base/questionnaire/completed-open.html:2 +msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" +msgstr "" + #: templates/web/base/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/fixmystreet/report/new/fill_in_details_form.html:41 +#: templates/web/base/contact/submit.html:7 +msgid "We’ll get back to you as soon as we can." +msgstr "" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 msgid "What’s the issue, and where is it?" msgstr "" -#: templates/web/base/admin/category_edit.html:82 templates/web/zurich/admin/body.html:18 +#: templates/web/base/admin/category_edit.html:87 templates/web/zurich/admin/body.html:18 msgid "When edited" msgstr "" @@ -2836,15 +2866,19 @@ msgstr "" msgid "When sent" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Whole block of empty flats" msgstr "" +#: templates/web/base/tokens/confirm_alert.html:7 +msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." +msgstr "" + #: templates/web/base/open311/index.html:92 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/fiksgatami/front/footer-marketing.html:15 templates/web/fixmystreet/front/footer-marketing.html:17 +#: templates/web/fixmystreet/front/footer-marketing.html:17 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" @@ -2864,7 +2898,7 @@ msgstr "" msgid "Year" msgstr "" -#: templates/web/base/admin/bodies.html:66 templates/web/base/admin/body.html:72 templates/web/base/admin/body.html:74 templates/web/base/admin/body.html:78 templates/web/base/admin/body.html:80 templates/web/base/admin/category_edit.html:5 templates/web/base/admin/flagged.html:47 templates/web/base/admin/list_updates.html:32 templates/web/base/admin/list_updates.html:34 templates/web/base/admin/list_updates.html:35 templates/web/base/admin/problem_row.html:20 templates/web/base/admin/report_edit.html:63 templates/web/base/admin/report_edit.html:77 templates/web/base/admin/update_edit.html:24 templates/web/base/admin/users.html:29 templates/web/base/questionnaire/creator_fixed.html:14 templates/web/base/questionnaire/index.html:42 templates/web/base/questionnaire/index.html:81 templates/web/fixmystreet/questionnaire/index.html:100 templates/web/fixmystreet/questionnaire/index.html:61 +#: templates/web/base/admin/bodies.html:66 templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 templates/web/base/admin/category_edit.html:5 templates/web/base/admin/flagged.html:47 templates/web/base/admin/list_updates.html:32 templates/web/base/admin/list_updates.html:34 templates/web/base/admin/list_updates.html:35 templates/web/base/admin/problem_row.html:20 templates/web/base/admin/report_edit.html:76 templates/web/base/admin/report_edit.html:93 templates/web/base/admin/update_edit.html:24 templates/web/base/admin/users.html:31 templates/web/base/questionnaire/creator_fixed.html:14 templates/web/base/questionnaire/index.html:42 templates/web/base/questionnaire/index.html:81 templates/web/fixmystreet/questionnaire/index.html:100 templates/web/fixmystreet/questionnaire/index.html:61 msgid "Yes" msgstr "" @@ -2884,11 +2918,11 @@ msgstr "" msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/tokens/confirm_problem.html:25 templates/web/base/tokens/confirm_problem.html:26 templates/web/zurich/tokens/confirm_problem.html:6 templates/web/zurich/tokens/confirm_problem.html:8 +#: templates/web/zurich/tokens/confirm_problem.html:5 templates/web/zurich/tokens/confirm_problem.html:8 msgid "You can <a href=\"%s%s\">view the problem on this site</a>." msgstr "" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:48 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -2903,11 +2937,11 @@ msgid "" " reports in the past." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:19 templates/web/base/report/new/councils_text_none.html:20 templates/web/base/report/new/councils_text_some.html:20 templates/web/base/report/new/councils_text_some.html:21 +#: templates/web/base/report/new/councils_text_none.html:10 templates/web/base/report/new/councils_text_none.html:2 templates/web/base/report/new/councils_text_some.html:19 templates/web/base/report/new/councils_text_some.html:21 msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." msgstr "" -#: templates/web/base/admin/body-form.html:81 +#: templates/web/base/admin/body-form.html:85 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" @@ -2919,7 +2953,7 @@ msgstr "" msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" msgstr "" -#: templates/web/base/questionnaire/index.html:68 templates/web/base/report/new/fill_in_details_form.html:94 templates/web/fixmystreet/questionnaire/index.html:88 templates/web/fixmystreet/report/new/fill_in_details_form.html:79 templates/web/zurich/report/new/fill_in_details_form.html:75 +#: templates/web/base/questionnaire/index.html:68 templates/web/base/report/new/fill_in_details_form.html:75 templates/web/fixmystreet/questionnaire/index.html:88 templates/web/fixmystreet/report/new/fill_in_details_form.html:73 templates/web/zurich/report/new/fill_in_details_form.html:58 msgid "You have already attached a photo to this report, attaching another one will replace it." msgstr "" @@ -2927,7 +2961,7 @@ msgstr "" msgid "You have already attached a photo to this update, attaching another one will replace it." msgstr "" -#: templates/web/base/auth/sign_out.html:3 templates/web/zurich/auth/sign_out.html:3 +#: templates/web/base/auth/sign_out.html:4 templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" msgstr "" @@ -2935,26 +2969,10 @@ msgstr "" 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/base/tokens/confirm_alert.html:8 -msgid "You have successfully confirmed your alert." -msgstr "" - -#: templates/web/zurich/tokens/confirm_problem.html:6 +#: templates/web/zurich/tokens/confirm_problem.html:5 templates/web/zurich/tokens/confirm_problem.html:6 msgid "You have successfully confirmed your email address." msgstr "" -#: templates/web/base/tokens/confirm_update.html:14 -msgid "You have successfully confirmed your update and you can now <a href=\"%s\">view it on the site</a>." -msgstr "" - -#: templates/web/base/tokens/confirm_alert.html:12 -msgid "You have successfully created your alert." -msgstr "" - -#: templates/web/base/tokens/confirm_alert.html:10 -msgid "You have successfully deleted your alert." -msgstr "" - #: templates/web/base/report/display.html:20 templates/web/base/report/new/fill_in_details.html:37 templates/web/fixmystreet/report/display.html:17 msgid "You have successfully signed in; please check and confirm your details are accurate:" msgstr "" @@ -2978,7 +2996,7 @@ msgid "" " contacts (such as an email address) to which reports are sent." msgstr "" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:85 msgid "You really want to resend?" msgstr "" @@ -2986,7 +3004,7 @@ msgstr "" 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:91 templates/web/fixmystreet/report/display.html:62 templates/web/fixmystreet/report/display.html:64 templates/web/fixmystreet/report/new/form_user_loggedin.html:3 templates/web/fixmystreet/report/new/form_user_loggedout.html:1 templates/web/fixmystreet/report/update-form.html:76 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:91 templates/web/fixmystreet/report/display.html:62 templates/web/fixmystreet/report/display.html:64 templates/web/fixmystreet/report/new/form_user_loggedin.html:3 templates/web/fixmystreet/report/new/form_user_loggedout.html:1 templates/web/fixmystreet/report/update-form.html:76 templates/web/zurich/report/new/fill_in_details_form.html:71 msgid "Your email" msgstr "" @@ -2998,7 +3016,7 @@ msgstr "" msgid "Your email address:" msgstr "" -#: templates/web/base/alert/_list.html:92 templates/web/base/report/new/fill_in_details_form.html:125 templates/web/base/report/update-form.html:81 +#: templates/web/base/alert/_list.html:92 templates/web/base/report/new/fill_in_details_form.html:106 templates/web/base/report/update-form.html:81 msgid "Your email:" msgstr "" @@ -3006,11 +3024,11 @@ msgstr "" msgid "Your information will only be used in accordance with our <a href=\"/privacy\">privacy policy</a>" msgstr "" -#: templates/web/fixmystreet/auth/general.html:54 templates/web/fixmystreet/contact/index.html:84 templates/web/fixmystreet/report/new/form_user_loggedin.html:18 templates/web/fixmystreet/report/new/form_user_loggedout.html:54 templates/web/fixmystreet/report/update-form.html:142 templates/web/zurich/auth/general.html:61 templates/web/zurich/report/new/fill_in_details_form.html:98 +#: templates/web/fixmystreet/auth/general.html:54 templates/web/fixmystreet/contact/index.html:84 templates/web/fixmystreet/report/new/form_user_loggedin.html:18 templates/web/fixmystreet/report/new/form_user_loggedout.html:54 templates/web/fixmystreet/report/update-form.html:142 templates/web/zurich/auth/general.html:61 templates/web/zurich/report/new/fill_in_details_form.html:81 msgid "Your name" msgstr "" -#: templates/web/base/auth/general.html:59 templates/web/base/contact/index.html:73 templates/web/base/report/new/fill_in_details_form.html:204 templates/web/base/report/update-form.html:151 +#: templates/web/base/auth/general.html:59 templates/web/base/contact/index.html:73 templates/web/base/report/new/fill_in_details_form.html:185 templates/web/base/report/update-form.html:151 msgid "Your name:" msgstr "" @@ -3022,31 +3040,19 @@ msgstr "" msgid "Your password has been changed" msgstr "" -#: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 templates/web/fixmystreet/report/new/form_user_loggedout.html:63 templates/web/zurich/report/new/fill_in_details_form.html:104 +#: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 templates/web/fixmystreet/report/new/form_user_loggedout.html:63 templates/web/zurich/report/new/fill_in_details_form.html:87 msgid "Your phone number" msgstr "" -#: templates/web/base/tokens/confirm_problem.html:4 -msgid "Your problem has been confirmed!" -msgstr "" - #: templates/web/fixmystreet/questionnaire/index.html:16 msgid "Your report" msgstr "" -#: templates/web/base/report_created.html:6 -msgid "Your report has been created and will shortly be sent." -msgstr "" - -#: templates/web/base/footer.html:9 templates/web/fiksgatami/footer.html:21 templates/web/fiksgatami/nn/footer.html:21 templates/web/fixmystreet/footer.html:24 +#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:24 msgid "Your reports" msgstr "" -#: templates/web/base/tokens/confirm_update.html:4 -msgid "Your update has been confirmed!" -msgstr "" - -#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:59 +#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:41 msgid "Your updates" msgstr "" @@ -3062,11 +3068,7 @@ msgstr "" msgid "council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:665 -msgid "council ref: %s" -msgstr "" - -#: templates/web/base/admin/report_edit.html:28 templates/web/zurich/admin/report_edit-sdm.html:40 templates/web/zurich/admin/report_edit.html:54 +#: templates/web/base/admin/report_edit.html:32 templates/web/zurich/admin/report_edit-sdm.html:40 templates/web/zurich/admin/report_edit.html:54 msgid "didn't use map" msgstr "" @@ -3074,7 +3076,7 @@ msgstr "" msgid "e.g. ‘%s’ or ‘%s’" msgstr "" -#: templates/web/base/admin/flagged.html:51 +#: templates/web/base/admin/body-form.html:188 templates/web/base/admin/flagged.html:51 msgid "edit user" msgstr "" @@ -3086,7 +3088,7 @@ msgstr "" msgid "last updated %s" msgstr "" -#: perllib/Utils.pm:263 +#: perllib/Utils.pm:235 msgid "less than a minute" msgstr "" @@ -3142,11 +3144,11 @@ msgstr "" msgid "or locate me automatically" msgstr "" -#: templates/web/base/admin/report_edit.html:25 templates/web/base/admin/report_edit.html:26 templates/web/zurich/admin/report_edit-sdm.html:28 templates/web/zurich/admin/report_edit-sdm.html:29 templates/web/zurich/admin/report_edit-sdm.html:37 templates/web/zurich/admin/report_edit-sdm.html:38 templates/web/zurich/admin/report_edit.html:28 templates/web/zurich/admin/report_edit.html:29 templates/web/zurich/admin/report_edit.html:39 templates/web/zurich/admin/report_edit.html:40 templates/web/zurich/admin/report_edit.html:51 templates/web/zurich/admin/report_edit.html:52 +#: templates/web/base/admin/report_edit.html:28 templates/web/base/admin/report_edit.html:30 templates/web/zurich/admin/report_edit-sdm.html:27 templates/web/zurich/admin/report_edit-sdm.html:29 templates/web/zurich/admin/report_edit-sdm.html:36 templates/web/zurich/admin/report_edit-sdm.html:38 templates/web/zurich/admin/report_edit.html:27 templates/web/zurich/admin/report_edit.html:29 templates/web/zurich/admin/report_edit.html:38 templates/web/zurich/admin/report_edit.html:40 templates/web/zurich/admin/report_edit.html:50 templates/web/zurich/admin/report_edit.html:52 msgid "originally entered: “%s”" msgstr "" -#: templates/web/base/admin/report_edit.html:30 +#: templates/web/base/admin/report_edit.html:43 msgid "other areas:" msgstr "" @@ -3154,11 +3156,11 @@ msgstr "" msgid "reopened" msgstr "" -#: templates/web/fiksgatami/header.html:49 templates/web/fixmystreet/header.html:53 templates/web/zurich/footer.html:12 +#: templates/web/fixmystreet/header.html:59 templates/web/zurich/footer.html:12 msgid "sign out" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:13 templates/web/base/report/new/fill_in_details_form.html:15 templates/web/fixmystreet/report/new/fill_in_details_form.html:10 templates/web/fixmystreet/report/new/fill_in_details_form.html:12 +#: templates/web/base/report/new/fill_in_details_form.html:12 templates/web/base/report/new/fill_in_details_form.html:15 templates/web/fixmystreet/report/new/fill_in_details_form.html:10 templates/web/fixmystreet/report/new/fill_in_details_form.html:12 msgid "the local council" msgstr "" @@ -3166,15 +3168,15 @@ msgstr "" msgid "there is no pin shown as the user did not use the map" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:373 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:379 msgid "this type of local problem" msgstr "" -#: perllib/Utils.pm:235 +#: perllib/Utils.pm:207 msgid "today" msgstr "" -#: templates/web/base/admin/report_edit.html:28 templates/web/zurich/admin/report_edit-sdm.html:40 templates/web/zurich/admin/report_edit.html:54 +#: templates/web/base/admin/report_edit.html:32 templates/web/zurich/admin/report_edit-sdm.html:40 templates/web/zurich/admin/report_edit.html:54 msgid "used map" msgstr "" @@ -3197,7 +3199,7 @@ msgid_plural "<big>%s</big> reports recently" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:282 +#: perllib/Utils.pm:254 #, perl-format msgid "%d hour" msgid_plural "%d hours" @@ -3211,7 +3213,7 @@ msgid_plural "%d supporters" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:284 +#: perllib/Utils.pm:256 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -3232,7 +3234,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:250 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -3253,7 +3255,7 @@ msgid_plural "<big>%s</big> fixed in past month" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:280 +#: perllib/Utils.pm:252 #, perl-format msgid "%d day" msgid_plural "%d days" diff --git a/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po index 4a5c9287d..639319418 100644 --- a/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/ar.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -5,14 +5,15 @@ # # Translators: # Abdullah Aldebas <demo@adebas.net>, 2015 +# Omar Duhaiby <3omarz@gmail.com>, 2015 # Turki Alhajjaji <thugrh@gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2015-01-20 16:59+0000\n" -"PO-Revision-Date: 2015-01-13 19:39+0000\n" -"Last-Translator: Abdullah Aldebas <demo@adebas.net>\n" +"POT-Creation-Date: 2015-07-31 14:28+0100\n" +"PO-Revision-Date: 2015-07-10 13:29+0000\n" +"Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Arabic (http://www.transifex.com/projects/p/fixmystreet/language/ar/)\n" "Language: ar\n" "MIME-Version: 1.0\n" @@ -20,17 +21,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:618 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:386 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:392 msgid " and " msgstr "و" -#: templates/web/base/report/new/councils_text_all.html:12 -#: templates/web/base/report/new/councils_text_all.html:19 -#: templates/web/base/report/new/councils_text_all.html:5 -#: templates/web/base/report/new/councils_text_none.html:19 -#: templates/web/base/report/new/councils_text_none.html:21 -#: templates/web/base/report/new/councils_text_some.html:20 +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_none.html:11 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " @@ -43,7 +42,7 @@ msgstr "%d تنبيهات مؤكدة ، %d غير مؤكدة" #: templates/web/base/admin/index.html:38 #: templates/web/zurich/admin/index.html:6 msgid "%d council contacts – %d confirmed, %d unconfirmed" -msgstr "%d معلومات الإتصال – %d تم التأكيد, %d لم يتم التأكيد" +msgstr "%d معلومات الاتصال – %d مؤكدة, %d غير مؤكدة" #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" @@ -66,22 +65,26 @@ msgstr "" msgid "%s - Summary reports" msgstr "%s - التقرير المختصر" -#: perllib/FixMyStreet/DB/Result/Problem.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:672 msgid "%s ref: %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:265 perllib/FixMyStreet/Cobrand/UK.pm:277 +#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:554 +#: perllib/FixMyStreet/DB/Result/Problem.pm:559 msgid "%s, reported at %s" msgstr "%s, تم التقرير إلى %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:304 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "%s, within %s ward" msgstr "" +#: perllib/FixMyStreet/Map/OSM.pm:42 +msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" +msgstr "" + #: templates/web/base/email_sent.html:29 msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" msgstr "" @@ -95,7 +98,7 @@ msgid "(Don't worry — we'll hang on to your update while you're checking y msgstr "" #: templates/web/base/admin/report_blocks.html:11 -#: templates/web/base/admin/users.html:29 +#: templates/web/base/admin/users.html:31 msgid "(Email in abuse table)" msgstr "" @@ -123,7 +126,7 @@ msgstr "(مغلق)" msgid "(fixed)" msgstr "(تم إصلاحها)" -#: templates/web/base/index.html:9 +#: templates/web/base/index.html:8 templates/web/base/index.html:9 #: templates/web/fixmystreet/around/intro.html:2 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "( مثل الكتابة على الجدران ، رمي النفايات في الاماكن الغير مخصصة ، بلاطات ارصفة مكسورة او انارة الشوارع)" @@ -133,8 +136,8 @@ msgstr "( مثل الكتابة على الجدران ، رمي النفايات msgid "(not sent to council)" msgstr "(لم ترسل الى الجهة)" -#: templates/web/base/report/new/fill_in_details_form.html:218 -#: templates/web/zurich/report/new/fill_in_details_form.html:94 +#: templates/web/base/report/new/fill_in_details_form.html:199 +#: templates/web/zurich/report/new/fill_in_details_form.html:77 msgid "(optional)" msgstr "(إختياري)" @@ -147,7 +150,7 @@ msgstr "(عام)" msgid "(sent to both)" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:212 +#: templates/web/base/report/new/fill_in_details_form.html:193 msgid "(we never show your email address or phone number)" msgstr "(لن نقوم بعرض بريدك الإلكتروني او رقم هاتفك المحمول)" @@ -155,14 +158,13 @@ msgstr "(لن نقوم بعرض بريدك الإلكتروني او رقم ها 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:393 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "--قم بإختيار تصنيف--" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 -#: perllib/FixMyStreet/DB/Result/Problem.pm:399 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:630 +#: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- إختر نوع العقار--" @@ -174,37 +176,7 @@ msgid "" " Maybe add some <code>MAPIT_TYPES</code> to your config file?" msgstr "" -#: templates/web/base/questionnaire/completed.html:20 -msgid "<p style=\"font-size:150%\">Thank you very much for filling in our questionnaire; glad to hear it’s been fixed.</p>" -msgstr "" - -#: templates/web/fiksgatami/questionnaire/completed-open.html:1 -msgid "" -"<p style=\"font-size:150%\">We’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’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/base/questionnaire/completed-open.html:6 -msgid "" -"<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" -"suggestions: why not try writing to your local representatives or, if\n" -"it’s a problem that could be fixed by local people working together, why\n" -"not <a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n" -"</p>" -msgstr "" - -#: templates/web/base/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/base/around/_report_banner.html:4 +#: templates/web/base/around/_report_banner.html:3 #: templates/web/base/around/_report_banner.html:5 msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>" msgstr "" @@ -231,7 +203,7 @@ msgstr "" msgid "<strong>No</strong>, I do not, let me sign in by email:" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:163 +#: templates/web/base/report/new/fill_in_details_form.html:144 msgid "<strong>No</strong>, let me confirm my report by email:" msgstr "" @@ -239,13 +211,8 @@ msgstr "" msgid "<strong>No</strong>, let me confirm my update by email:" msgstr "" -#: templates/web/base/tokens/confirm_problem.html:19 -#: templates/web/base/tokens/confirm_problem.html:20 -msgid "<strong>We will now send it to the council</strong>." -msgstr "" - #: templates/web/base/auth/general.html:37 -#: templates/web/base/report/new/fill_in_details_form.html:141 +#: templates/web/base/report/new/fill_in_details_form.html:122 #: templates/web/base/report/update-form.html:95 #: templates/web/fixmystreet/auth/general.html:37 #: templates/web/fixmystreet/auth/general.html:39 @@ -259,8 +226,8 @@ msgstr "" msgid "About us" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:39 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:52 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:31 #: templates/web/fixmystreet/report/update-form.html:28 @@ -276,26 +243,26 @@ msgid "" " categories of problem) to each body." msgstr "" -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/body.html:56 msgid "Add a contact using the form below." msgstr "" #: templates/web/base/admin/bodies.html:74 -#: templates/web/base/admin/body-form.html:233 +#: templates/web/base/admin/body-form.html:240 #: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "" -#: templates/web/base/admin/body.html:108 +#: templates/web/base/admin/body.html:116 #: templates/web/zurich/admin/body.html:31 msgid "Add new category" msgstr "" -#: templates/web/base/admin/users.html:45 +#: templates/web/base/admin/users.html:47 msgid "Add user" msgstr "إضافة مستخدم" -#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:70 +#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:52 msgid "Added %s" msgstr "" @@ -322,9 +289,7 @@ msgstr "" msgid "All Reports" msgstr "كل التقرير" -#: templates/web/base/footer.html:11 templates/web/fiksgatami/footer.html:23 -#: templates/web/fiksgatami/nn/footer.html:23 -#: templates/web/fixmystreet/footer.html:26 +#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:26 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:19 @@ -341,19 +306,9 @@ msgstr "" msgid "All the information you provide here will be sent to" msgstr "" -#: templates/web/base/report/new/councils_text_all.html:12 -#: templates/web/base/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/base/report/new/councils_text_all.html:5 -#: templates/web/base/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/base/report/new/councils_text_all.html:19 -#: templates/web/base/report/new/councils_text_all.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:13 +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_all.html:4 +#: templates/web/base/report/new/fill_in_details_form.html:12 #: templates/web/base/report/new/fill_in_details_form.html:14 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 @@ -370,7 +325,7 @@ msgstr "" msgid "Anonymous" msgstr "مجهول" -#: templates/web/base/admin/report_edit.html:62 +#: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:23 msgid "Anonymous:" msgstr "مجهول:" @@ -379,18 +334,18 @@ msgstr "مجهول:" msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?" msgstr "" -#: templates/web/fiksgatami/front/footer-marketing.html:14 #: templates/web/fixmystreet/front/footer-marketing.html:16 msgid "Are you a developer?" msgstr "هل انت مطور ؟" #: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 msgid "Area covered" msgstr "المنطقة مغطاة" #: templates/web/base/admin/bodies.html:15 -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/body.html:60 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "" @@ -408,7 +363,7 @@ msgstr "" msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:163 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:165 #: templates/web/zurich/report/updates.html:11 msgid "Assigned to %s" msgstr "" @@ -421,7 +376,7 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:348 +#: perllib/FixMyStreet/DB/Result/Problem.pm:373 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "في إنتظار المشرفين" @@ -434,8 +389,8 @@ msgstr "الخلف" msgid "Ban email address" msgstr "حظر البريد الإلكتروني" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:297 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:301 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" msgstr "" @@ -446,6 +401,7 @@ msgstr "" msgid "Body" msgstr "" +#: templates/web/base/admin/report_edit.html:34 #: templates/web/base/admin/user-form.html:32 msgid "Body:" msgstr "" @@ -458,16 +414,15 @@ msgstr "بالتاريخ" msgid "Can't see the map? <em>Skip this step</em>" msgstr "" -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:55 #: templates/web/base/report/new/category.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:53 +#: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 #: templates/web/zurich/admin/stats.html:50 -#: templates/web/zurich/report/new/fill_in_details_form.html:50 msgid "Category" msgstr "" @@ -475,17 +430,16 @@ msgstr "" msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:138 #: templates/web/base/admin/category_edit.html:23 -#: templates/web/base/admin/report_edit.html:61 -#: templates/web/base/report/new/fill_in_details_form.html:68 +#: templates/web/base/admin/report_edit.html:74 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/report_edit-sdm.html:42 #: templates/web/zurich/admin/report_edit.html:140 msgid "Category:" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:377 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383 msgid "Category: %s" msgstr "" @@ -496,19 +450,19 @@ msgstr "" msgid "Change password" msgstr "تغيير كلمة المرور" -#: templates/web/base/admin/body.html:152 +#: templates/web/base/admin/body.html:160 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/base/admin/body.html:163 +#: templates/web/base/admin/body.html:171 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/base/admin/body.html:183 +#: templates/web/base/admin/body.html:191 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -519,7 +473,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:122 +#: templates/web/base/admin/body.html:130 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." @@ -535,16 +489,16 @@ msgstr "" msgid "Click map to report a problem" msgstr "اضغط على الخريطة للإبلاغ عن مشكلة" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:45 -#: templates/web/base/admin/report_edit.html:47 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:58 +#: templates/web/base/admin/report_edit.html:60 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/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:95 #: templates/web/zurich/admin/report_edit.html:97 #: templates/web/zurich/admin/stats.html:31 @@ -552,11 +506,12 @@ msgstr "اضغط على الخريطة للإبلاغ عن مشكلة" msgid "Closed" msgstr "مغلق" -#: perllib/FixMyStreet/DB/Result/Problem.pm:762 +#: perllib/FixMyStreet/DB/Result/Problem.pm:771 msgid "Closed by council" msgstr "مغلق من الجهة" -#: templates/web/base/my/my.html:40 templates/web/fixmystreet/my/my.html:46 +#: templates/web/base/my/my.html:40 +#: templates/web/fixmystreet/my/_problem-list.html:12 msgid "Closed reports" msgstr "تقارير مغلقة" @@ -564,7 +519,7 @@ msgstr "تقارير مغلقة" msgid "Closed:" msgstr "مغلق:" -#: templates/web/base/around/tabbed_lists.html:11 +#: templates/web/base/around/tabbed_lists.html:10 #: templates/web/base/around/tabbed_lists.html:12 msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "" @@ -579,26 +534,26 @@ msgstr "إحداثيات" msgid "Cobrand" msgstr "" -#: templates/web/base/admin/report_edit.html:75 +#: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:50 msgid "Cobrand data:" msgstr "" -#: templates/web/base/admin/report_edit.html:74 +#: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:49 msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "إعدادت" -#: templates/web/base/admin/category_edit.html:47 +#: templates/web/base/admin/category_edit.html:52 msgid "Configure Endpoint" msgstr "" -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/body.html:72 msgid "Confirm" msgstr "تأكيد" @@ -619,10 +574,10 @@ msgstr "" msgid "Confirmation" msgstr "تأكيد" -#: templates/web/base/admin/body.html:158 -#: templates/web/base/admin/body.html:71 -#: templates/web/base/admin/category_edit.html:32 -#: templates/web/base/admin/category_edit.html:84 +#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/category_edit.html:37 +#: templates/web/base/admin/category_edit.html:89 #: templates/web/zurich/admin/stats.html:40 msgid "Confirmed" msgstr "مؤكد" @@ -633,7 +588,7 @@ msgstr "" #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 -#: templates/web/base/admin/report_edit.html:70 +#: templates/web/base/admin/report_edit.html:83 msgid "Confirmed:" msgstr "مؤكد:" @@ -650,13 +605,12 @@ msgid "Contact Us" msgstr "إتصل بنا" #: templates/web/base/contact/index.html:6 -#: templates/web/base/contact/submit.html:3 #: templates/web/fixmystreet/contact/index.html:20 msgid "Contact the team" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1327 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1355 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1325 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1353 msgid "Could not find user" msgstr "" @@ -674,6 +628,10 @@ msgstr "" msgid "Council contacts for %s" msgstr "" +#: perllib/FixMyStreet/DB/Result/Problem.pm:670 +msgid "Council ref: %s" +msgstr "" + #: templates/web/base/admin/stats.html:84 msgid "Council:" msgstr "" @@ -689,7 +647,7 @@ msgstr "" msgid "Create a report" msgstr "" -#: templates/web/base/admin/body.html:200 +#: templates/web/base/admin/body.html:208 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "" @@ -701,7 +659,7 @@ msgid "Created" msgstr "" #: templates/web/base/admin/list_updates.html:38 -#: templates/web/base/admin/report_edit.html:69 +#: templates/web/base/admin/report_edit.html:82 #: templates/web/base/admin/update_edit.html:51 #: templates/web/zurich/admin/report_edit-sdm.html:47 #: templates/web/zurich/admin/report_edit.html:61 @@ -718,7 +676,7 @@ msgstr "" msgid "Currently no bodies have been created." msgstr "" -#: templates/web/base/dashboard/index.html:6 +#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 msgid "Dashboard" msgstr "" @@ -728,14 +686,14 @@ msgid "Dealt with by subdivision within 5 working days" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:169 -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:37 -#: templates/web/base/admin/category_edit.html:85 +#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:81 +#: templates/web/base/admin/category_edit.html:42 +#: templates/web/base/admin/category_edit.html:90 msgid "Deleted" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:43 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -755,7 +713,7 @@ msgstr "" msgid "Details:" msgstr "" -#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/body.html:87 msgid "Devolved" msgstr "" @@ -783,8 +741,8 @@ msgstr "" msgid "Don't like forms?" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:47 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:60 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:32 #: templates/web/fixmystreet/report/update-form.html:28 @@ -792,7 +750,7 @@ msgstr "" msgid "Duplicate" msgstr "" -#: templates/web/base/admin/body.html:98 +#: templates/web/base/admin/body.html:106 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" @@ -802,20 +760,20 @@ msgstr "" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 -#: templates/web/base/admin/users.html:31 +#: templates/web/base/admin/users.html:33 #: templates/web/zurich/admin/problem_row.html:42 msgid "Edit" msgstr "" -#: templates/web/base/admin/body.html:212 +#: templates/web/base/admin/body.html:220 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "" #: templates/web/base/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:2 +#: 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:2 +#: templates/web/zurich/admin/report_edit.html:1 #: templates/web/zurich/admin/report_edit.html:5 msgid "Editing problem %d" msgstr "" @@ -829,12 +787,12 @@ msgstr "" msgid "Editing user %d" msgstr "" -#: templates/web/base/admin/category_edit.html:86 +#: templates/web/base/admin/category_edit.html:91 msgid "Editor" msgstr "" #: templates/web/base/admin/bodies.html:23 -#: templates/web/base/admin/category_edit.html:83 +#: templates/web/base/admin/category_edit.html:88 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 #: templates/web/fixmystreet/auth/general.html:21 @@ -845,15 +803,23 @@ msgstr "" msgid "Email" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1303 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1301 msgid "Email added to abuse list" msgstr "" -#: templates/web/base/admin/body.html:147 +#: templates/web/base/admin/body.html:155 msgid "Email address:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1300 +#: templates/web/base/tokens/confirm_alert.html:6 +msgid "Email alert created" +msgstr "" + +#: templates/web/base/tokens/confirm_alert.html:10 +msgid "Email alert deleted" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1298 msgid "Email already in abuse list" msgstr "" @@ -865,8 +831,8 @@ msgstr "" msgid "Email me updates" msgstr "" -#: templates/web/base/admin/category_edit.html:26 -#: templates/web/base/admin/report_edit.html:67 +#: templates/web/base/admin/category_edit.html:31 +#: templates/web/base/admin/report_edit.html:80 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 @@ -877,32 +843,32 @@ msgstr "" msgid "Email:" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:322 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 msgid "Email: %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 msgid "Empty flat or maisonette" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:631 msgid "Empty house or bungalow" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:622 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty office or other commercial" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:623 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Empty pub or bar" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:624 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty public building - school, hospital, etc." msgstr "" -#: templates/web/base/admin/body-form.html:158 -#: templates/web/base/admin/body-form.html:159 +#: templates/web/base/admin/body-form.html:162 +#: templates/web/base/admin/body-form.html:163 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" @@ -910,8 +876,8 @@ msgid "" " <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>." msgstr "" -#: templates/web/base/admin/body-form.html:215 -#: templates/web/base/admin/body-form.html:216 +#: templates/web/base/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:223 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" @@ -922,11 +888,11 @@ msgstr "" msgid "End Date:" msgstr "" -#: templates/web/base/admin/body-form.html:126 +#: templates/web/base/admin/body-form.html:130 msgid "Endpoint" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:72 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:73 msgid "Enter a Zürich street name" msgstr "" @@ -939,7 +905,9 @@ msgstr "" msgid "Enter a nearby postcode, or street name and area" msgstr "" +#: templates/web/base/around/postcode_form.html:1 #: templates/web/base/around/postcode_form.html:2 +#: templates/web/fixmystreet/around/postcode_form.html:10 #: templates/web/fixmystreet/around/postcode_form.html:11 msgid "Enter a nearby street name and area" msgstr "" @@ -949,7 +917,7 @@ msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "" #: templates/web/base/auth/general.html:64 -#: templates/web/base/report/new/fill_in_details_form.html:170 +#: templates/web/base/report/new/fill_in_details_form.html:151 #: templates/web/base/report/update-form.html:124 msgid "Enter a new password:" msgstr "" @@ -961,7 +929,7 @@ msgstr "" msgid "Enter a password" msgstr "" -#: templates/web/base/index-steps.html:33 +#: templates/web/base/index-steps.html:26 msgid "Enter details of the problem" msgstr "" @@ -984,16 +952,21 @@ msgstr "" msgid "Examples:" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:47 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" -#: templates/web/base/admin/report_edit.html:76 +#: templates/web/base/admin/body-form.html:81 +msgid "External URL" +msgstr "" + +#: templates/web/base/admin/category_edit.html:27 +#: templates/web/base/admin/report_edit.html:92 msgid "Extra data:" msgstr "" -#: templates/web/base/contact/submit.html:15 -msgid "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>." +#: templates/web/base/contact/submit.html:13 +msgid "Failed to send message" msgstr "" #: templates/web/zurich/admin/index-dm.html:33 @@ -1006,7 +979,7 @@ msgstr "" msgid "First time" msgstr "" -#: templates/web/base/admin/body.html:40 +#: templates/web/base/admin/body.html:48 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" @@ -1037,9 +1010,9 @@ msgid "" msgstr "" #: templates/web/base/admin/index.html:55 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:41 -#: templates/web/base/admin/report_edit.html:42 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:54 +#: templates/web/base/admin/report_edit.html:55 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/update-form.html:30 @@ -1050,17 +1023,18 @@ msgstr "" msgid "Fixed" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:43 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:56 msgid "Fixed - Council" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:42 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:55 msgid "Fixed - User" msgstr "" -#: templates/web/base/my/my.html:35 templates/web/fixmystreet/my/my.html:41 +#: templates/web/base/my/my.html:35 +#: templates/web/fixmystreet/my/_problem-list.html:7 msgid "Fixed reports" msgstr "" @@ -1068,7 +1042,7 @@ msgstr "" msgid "Fixed:" msgstr "" -#: templates/web/base/admin/body-form.html:84 +#: templates/web/base/admin/body-form.html:89 #: templates/web/zurich/admin/body-form.html:36 msgid "Flag as deleted" msgstr "" @@ -1077,7 +1051,7 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "" @@ -1086,7 +1060,7 @@ msgstr "" msgid "Flagged reports and users" msgstr "" -#: templates/web/base/admin/user-form.html:45 +#: templates/web/base/admin/user-form.html:46 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page." msgstr "" @@ -1094,8 +1068,8 @@ msgstr "" msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." msgstr "" -#: templates/web/base/admin/report_edit.html:78 -#: templates/web/base/admin/user-form.html:51 +#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/user-form.html:52 msgid "Flagged:" msgstr "" @@ -1104,10 +1078,6 @@ msgstr "" msgid "Follow a ward link to view only reports within that ward." msgstr "" -#: templates/web/base/admin/report_edit.html:30 -msgid "For council(s):" -msgstr "" - #: templates/web/base/admin/body-form.html:65 msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "" @@ -1120,8 +1090,6 @@ msgstr "" #: templates/web/base/faq/faq-en-gb.html:1 #: templates/web/base/static/privacy.html:1 #: templates/web/base/static/privacy.html:2 -#: templates/web/fiksgatami/faq/faq-nb.html:1 -#: templates/web/fiksgatami/nn/faq/faq-nn.html:1 msgid "Frequently Asked Questions" msgstr "" @@ -1134,13 +1102,13 @@ msgstr "" msgid "Get updates" msgstr "" -#: templates/web/fixmystreet/reports/_rss.html:4 +#: templates/web/fixmystreet/reports/_rss.html:3 #: 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 +#: templates/web/fixmystreet/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "" @@ -1149,6 +1117,10 @@ msgstr "" msgid "Give me an RSS feed" msgstr "" +#: templates/web/base/questionnaire/completed.html:14 +msgid "Glad to hear it’s been fixed!" +msgstr "" + #: templates/web/base/alert/index.html:34 #: templates/web/base/around/postcode_form.html:8 #: templates/web/fixmystreet/around/postcode_form.html:21 @@ -1156,7 +1128,7 @@ msgstr "" msgid "Go" msgstr "" -#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:93 msgid "Going to send questionnaire?" msgstr "" @@ -1178,9 +1150,7 @@ msgstr "" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "" -#: templates/web/base/footer.html:15 templates/web/fiksgatami/footer.html:27 -#: templates/web/fiksgatami/nn/footer.html:27 -#: templates/web/fixmystreet/footer.html:30 +#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:30 #: templates/web/zurich/faq/faq-de-ch.html:1 #: templates/web/zurich/footer.html:21 #: templates/web/zurich/nav_over_content.html:8 @@ -1192,18 +1162,17 @@ msgstr "" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "" -#: templates/web/fiksgatami/header.html:48 -#: templates/web/fixmystreet/header.html:52 +#: templates/web/fixmystreet/header.html:58 #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:50 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:63 +#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/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:86 #: templates/web/zurich/admin/report_edit.html:90 #: templates/web/zurich/admin/stats.html:32 @@ -1219,7 +1188,7 @@ msgstr "" msgid "Hide pins" msgstr "" -#: templates/web/base/admin/category_edit.html:79 +#: templates/web/base/admin/category_edit.html:84 msgid "History" msgstr "" @@ -1235,19 +1204,25 @@ msgstr "" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:740 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" +#: templates/web/base/tokens/confirm_problem.html:23 +#: templates/web/base/tokens/confirm_problem.html:27 +msgid "I just reported a problem on @fixmystreet" 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." +#: templates/web/base/tokens/confirm_update.html:19 +#: templates/web/base/tokens/confirm_update.html:23 +msgid "I just updated a problem on @fixmystreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:260 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +msgid "I'm afraid we couldn't locate your problem in the database.\n" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 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 "" @@ -1269,7 +1244,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:125 +#: templates/web/base/admin/body.html:133 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." @@ -1287,7 +1262,12 @@ msgstr "" msgid "If you do not, your update will not be posted." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:9 +#: templates/web/base/questionnaire/completed.html:8 +msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." +msgstr "" + +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:8 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 "" @@ -1303,34 +1283,34 @@ msgid "" "your experience of getting the problem fixed?" msgstr "" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/body.html:149 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/base/admin/body-form.html:200 -#: templates/web/base/admin/body-form.html:201 +#: templates/web/base/admin/body-form.html:207 +#: templates/web/base/admin/body-form.html:208 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable <strong>extended Open311 stauses</strong> if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/body-form.html:187 -#: templates/web/base/admin/body-form.html:188 +#: templates/web/base/admin/body-form.html:194 +#: templates/web/base/admin/body-form.html:195 msgid "" "If you've enabled Open311 update-sending above, enable <strong>suppression of alerts</strong> \n" " if you do <strong>not</strong> want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/body-form.html:173 -#: templates/web/base/admin/body-form.html:174 +#: templates/web/base/admin/body-form.html:177 +#: templates/web/base/admin/body-form.html:178 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:127 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 msgid "Illegal ID" msgstr "" @@ -1355,17 +1335,21 @@ 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:143 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:38 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:144 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 #: templates/web/fixmystreet/report/banner.html:19 -#: templates/web/zurich/admin/header.html:2 +#: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 #: templates/web/zurich/admin/report_edit.html:99 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "" +#: templates/web/base/tokens/confirm_alert.html:11 +msgid "Inbox zero, here we come!" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:160 msgid "Include reporter personal details" msgstr "" @@ -1374,7 +1358,7 @@ msgstr "" msgid "Include unconfirmed reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:354 +#: perllib/FixMyStreet/App/Controller/Open311.pm:359 msgid "Incorrect has_photo value \"%s\"" msgstr "" @@ -1382,29 +1366,29 @@ msgstr "" msgid "Internal notes" msgstr "" -#: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:61 msgid "Internal referral" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:339 +#: perllib/FixMyStreet/App/Controller/Open311.pm:344 msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1114 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1112 msgid "Invalid end date" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:432 +#: perllib/FixMyStreet/App/Controller/Open311.pm:437 msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1110 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 msgid "Invalid start date" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:37 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:50 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 #: templates/web/base/report/update-form.html:30 @@ -1418,8 +1402,12 @@ msgstr "" msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "" +#: templates/web/base/tokens/confirm_problem.html:14 +msgid "It’s on its way to the council right now." +msgstr "" + #: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:150 +#: templates/web/base/report/new/fill_in_details_form.html:131 #: templates/web/base/report/update-form.html:104 #: templates/web/fixmystreet/auth/general.html:47 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 @@ -1428,12 +1416,12 @@ msgstr "" msgid "Keep me signed in on this computer" msgstr "" -#: templates/web/base/admin/body.html:62 +#: templates/web/base/admin/body.html:70 #: templates/web/zurich/admin/body.html:16 msgid "Last editor" msgstr "" -#: templates/web/base/admin/report_edit.html:72 +#: templates/web/base/admin/report_edit.html:88 msgid "Last update:" msgstr "" @@ -1441,43 +1429,38 @@ msgstr "" msgid "Last update:" msgstr "" -#: templates/web/base/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:229 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "" -#: templates/web/base/admin/body.html:17 templates/web/base/admin/body.html:19 +#: templates/web/base/admin/body.html:27 msgid "List all reported problems" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:69 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:54 -#: templates/web/zurich/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/category_wrapper.html:4 msgid "Loading..." msgstr "" #: templates/web/base/alert/choose.html:1 #: templates/web/base/alert/choose.html:3 #: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3 -#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:5 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5 #: templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 -#: templates/web/base/tokens/confirm_alert.html:4 #: templates/web/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "" -#: templates/web/base/alert/list.html:13 templates/web/base/alert/list.html:14 -#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:3 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:12 +#: templates/web/base/alert/list.html:14 templates/web/base/alert/list.html:3 msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "" -#: templates/web/base/footer.html:13 templates/web/fiksgatami/footer.html:25 -#: templates/web/fiksgatami/nn/footer.html:25 -#: templates/web/fixmystreet/footer.html:28 +#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:28 msgid "Local alerts" msgstr "" -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:25 msgid "Locate the problem on a map of the area" msgstr "" @@ -1486,17 +1469,26 @@ msgid "MAP" msgstr "" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" msgstr "" -#: perllib/FixMyStreet/Map/OSM.pm:42 -msgid "Map © <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>" +#: templates/web/base/admin/report_edit.html:86 +msgid "Mark as sent" msgstr "" -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/user-form.html:44 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." msgstr "" +#: templates/web/base/reports/index.html:24 +msgid "Marked fixed/closed in the past eight weeks" +msgstr "" + +#: templates/web/base/reports/index.html:25 +msgid "Marked fixed/closed more than eight weeks ago" +msgstr "" + #: templates/web/fixmystreet/contact/index.html:106 msgid "Message" msgstr "" @@ -1505,7 +1497,7 @@ msgstr "" msgid "Message:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:440 +#: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" msgstr "" @@ -1535,11 +1527,11 @@ msgstr "" #: templates/web/fixmystreet/report/update-form.html:138 #: 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:94 +#: templates/web/zurich/report/new/fill_in_details_form.html:77 msgid "Name" msgstr "" -#: templates/web/base/admin/report_edit.html:66 +#: templates/web/base/admin/report_edit.html:79 #: templates/web/base/admin/update_edit.html:32 #: templates/web/base/admin/user-form.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:43 @@ -1548,25 +1540,25 @@ msgstr "" msgid "Name:" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:321 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:313 msgid "Name: %s" msgstr "" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:186 -#: perllib/FixMyStreet/Geocode/OSM.pm:164 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 +#: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:137 +#: perllib/FixMyStreet/Cobrand/UK.pm:127 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 +#: perllib/FixMyStreet/Cobrand/Default.pm:442 +#: perllib/FixMyStreet/Cobrand/Default.pm:482 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:277 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1580,11 +1572,11 @@ msgstr "" msgid "New <br>problems" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:264 +#: perllib/FixMyStreet/App/Controller/Admin.pm:261 msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:379 msgid "New category contact added" msgstr "" @@ -1657,15 +1649,15 @@ msgstr "" msgid "Next" msgstr "" -#: templates/web/base/admin/body.html:72 templates/web/base/admin/body.html:74 -#: templates/web/base/admin/body.html:78 templates/web/base/admin/body.html:80 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:93 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:44 @@ -1683,7 +1675,7 @@ msgstr "" msgid "No council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:376 +#: perllib/FixMyStreet/DB/Result/Problem.pm:401 msgid "No council selected" msgstr "" @@ -1724,12 +1716,12 @@ msgid "" " your config file is not pointing to a live MapIt service." msgstr "" -#: templates/web/base/report/_support.html:3 +#: templates/web/base/report/_support.html:2 #: templates/web/base/report/_support.html:4 msgid "No supporters" msgstr "" -#: templates/web/base/admin/report_edit.html:30 +#: templates/web/base/admin/report_edit.html:41 #: templates/web/zurich/admin/report_edit-sdm.html:46 #: templates/web/zurich/admin/report_edit.html:60 msgid "None" @@ -1744,8 +1736,8 @@ msgid "" " activity across their body), the ability to hide reports or set special report statuses." msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:46 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -1761,12 +1753,12 @@ msgstr "" msgid "Not reported before" msgstr "" -#: templates/web/base/report/_main.html:61 +#: templates/web/base/report/_main.html:62 msgid "Not reported to council" msgstr "" -#: templates/web/base/admin/body.html:63 -#: templates/web/base/admin/category_edit.html:87 +#: templates/web/base/admin/body.html:71 +#: templates/web/base/admin/category_edit.html:92 #: templates/web/zurich/admin/body.html:17 msgid "Note" msgstr "" @@ -1775,8 +1767,8 @@ msgstr "" 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/base/admin/body.html:178 -#: templates/web/base/admin/category_edit.html:44 +#: templates/web/base/admin/body.html:186 +#: templates/web/base/admin/category_edit.html:49 #: templates/web/zurich/admin/body.html:53 msgid "Note:" msgstr "" @@ -1789,7 +1781,7 @@ msgstr "" msgid "Now to submit your report…" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:132 +#: templates/web/base/report/new/fill_in_details_form.html:113 msgid "Now to submit your report… do you have a FixMyStreet password?" msgstr "" @@ -1806,7 +1798,7 @@ msgid "OK" msgstr "" #: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:16 +#: templates/web/base/report/update.html:17 msgid "Offensive? Unsuitable? Tell us" msgstr "" @@ -1826,19 +1818,19 @@ msgstr "" msgid "Older <br>problems" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:37 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 msgid "One-line summary" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:137 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:36 -#: templates/web/base/admin/report_edit.html:37 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:138 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:49 +#: templates/web/base/admin/report_edit.html:50 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/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:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/report_edit.html:86 #: templates/web/zurich/admin/report_edit.html:88 @@ -1847,10 +1839,19 @@ msgstr "" msgid "Open" msgstr "" -#: templates/web/base/my/my.html:30 templates/web/fixmystreet/my/my.html:36 +#: templates/web/base/reports/index.html:22 +msgid "Open for more than four weeks, with an update within the past eight weeks" +msgstr "" + +#: templates/web/base/my/my.html:30 +#: templates/web/fixmystreet/my/_problem-list.html:2 msgid "Open reports" msgstr "" +#: templates/web/base/reports/index.html:23 +msgid "Open, but not had any update in eight weeks" +msgstr "" + #: templates/web/base/open311/index.html:70 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "" @@ -1873,15 +1874,15 @@ msgstr "" msgid "Or you can subscribe to an alert based upon what ward or council you’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:560 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 -#: perllib/FixMyStreet/DB/Result/Problem.pm:592 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:372 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 +#: perllib/FixMyStreet/DB/Result/Problem.pm:597 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:393 msgid "Other" msgstr "" @@ -1903,8 +1904,8 @@ msgstr "" msgid "Parent" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 msgid "Partial" msgstr "" @@ -1924,7 +1925,7 @@ msgstr "" msgid "Permalink" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:100 +#: templates/web/zurich/report/new/fill_in_details_form.html:83 msgid "Phone number" msgstr "" @@ -1933,27 +1934,27 @@ msgstr "" msgid "Phone number (optional)" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:286 -#: templates/web/base/admin/report_edit.html:68 -#: templates/web/base/report/new/fill_in_details_form.html:216 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:291 +#: templates/web/base/admin/report_edit.html:81 +#: templates/web/base/report/new/fill_in_details_form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:46 #: templates/web/zurich/admin/report_edit.html:60 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:72 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 #: 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 +#: templates/web/zurich/report/new/fill_in_details_form.html:51 msgid "Photo" msgstr "" #: templates/web/base/questionnaire/index.html:71 -#: templates/web/base/report/new/fill_in_details_form.html:103 +#: templates/web/base/report/new/fill_in_details_form.html:84 #: templates/web/base/report/update-form.html:62 #: templates/web/fixmystreet/questionnaire/index.html:91 msgid "Photo:" @@ -1967,11 +1968,11 @@ msgstr "" msgid "Place pin on map" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:38 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/zurich/admin/header.html:2 +#: 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:86 @@ -2005,20 +2006,19 @@ msgstr "" msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:349 -#: 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:395 +#: perllib/FixMyStreet/App/Controller/Admin.pm:343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:876 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 +#: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:401 +#: perllib/FixMyStreet/DB/Result/Problem.pm:418 msgid "Please choose a property type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:370 msgid "Please correct the errors below" msgstr "" @@ -2034,8 +2034,8 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:352 -#: perllib/FixMyStreet/DB/Result/Comment.pm:133 +#: perllib/FixMyStreet/App/Controller/Admin.pm:346 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "" @@ -2046,15 +2046,15 @@ msgstr "" msgid "Please enter a password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:108 -#: perllib/FixMyStreet/DB/Result/Problem.pm:370 +#: perllib/FixMyStreet/App/Controller/Contact.pm:113 +#: perllib/FixMyStreet/DB/Result/Problem.pm:395 #: templates/web/base/js/translation_strings.html:3 msgid "Please enter a subject" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1050 -#: perllib/FixMyStreet/App/Controller/Admin.pm:351 -#: perllib/FixMyStreet/App/Controller/Admin.pm:997 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin.pm:995 #: perllib/FixMyStreet/DB/Result/User.pm:127 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 @@ -2062,16 +2062,16 @@ msgid "Please enter a valid email" msgstr "" #: perllib/FixMyStreet/App/Controller/Alert.pm:346 -#: perllib/FixMyStreet/App/Controller/Contact.pm:118 +#: perllib/FixMyStreet/App/Controller/Contact.pm:123 msgid "Please enter a valid email address" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:373 +#: perllib/FixMyStreet/DB/Result/Problem.pm:398 #: templates/web/base/js/translation_strings.html:4 msgid "Please enter some details" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:107 +#: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/User.pm:124 #: templates/web/base/auth/general.html:13 #: templates/web/base/auth/general.html:8 @@ -2085,7 +2085,7 @@ msgid "Please enter your email" msgstr "" #: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:75 msgid "Please enter your email address" msgstr "" @@ -2093,14 +2093,14 @@ msgstr "" msgid "Please enter your first name" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: perllib/FixMyStreet/Cobrand/UK.pm:318 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:106 -#: perllib/FixMyStreet/DB/Result/Comment.pm:130 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Contact.pm:111 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 +#: perllib/FixMyStreet/DB/Result/Problem.pm:406 #: perllib/FixMyStreet/DB/Result/User.pm:120 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" @@ -2123,7 +2123,7 @@ msgstr "" msgid "Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a href=\"/\">front page</a>." msgstr "" -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:8 msgid "Please fill in details of the problem below." msgstr "" @@ -2138,7 +2138,7 @@ msgstr "" msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:251 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" @@ -2161,16 +2161,16 @@ msgstr "" msgid "Please note:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:246 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:254 msgid "Please provide some explanation as to why you're reopening this report" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:261 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 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:247 msgid "Please say whether you've ever reported a problem to your council before" msgstr "" @@ -2182,7 +2182,7 @@ msgstr "" msgid "Please select the type of alert you want" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please state whether or not the problem has been fixed" msgstr "" @@ -2190,15 +2190,13 @@ msgstr "" msgid "Please take a look at the updates that have been left." msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:176 +#: perllib/FixMyStreet/App/Controller/Photo.pm:177 +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 +#: perllib/FixMyStreet/App/Controller/Photo.pm:189 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:109 +#: perllib/FixMyStreet/App/Controller/Contact.pm:114 msgid "Please write a message" msgstr "" @@ -2237,14 +2235,14 @@ msgstr "" msgid "Privacy" msgstr "" -#: templates/web/base/admin/body.html:194 -#: templates/web/base/admin/body.html:77 -#: templates/web/base/admin/category_edit.html:40 -#: templates/web/base/admin/report_edit.html:79 +#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:85 +#: templates/web/base/admin/category_edit.html:45 +#: templates/web/base/admin/report_edit.html:95 msgid "Private" msgstr "" -#: templates/web/base/maps/openlayers.html:86 +#: templates/web/base/maps/openlayers.html:89 msgid "Problem" msgstr "" @@ -2265,7 +2263,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:966 msgid "Problem marked as open." msgstr "" @@ -2300,16 +2298,15 @@ msgstr "" msgid "Problems within %.1fkm of this location" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:629 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:114 +#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:151 -#: perllib/FixMyStreet/Cobrand/UK.pm:217 +#: perllib/FixMyStreet/Cobrand/UK.pm:207 msgid "Problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:122 -#: perllib/FixMyStreet/Cobrand/UK.pm:231 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "Problems within %s ward" msgstr "" @@ -2327,7 +2324,7 @@ msgstr "" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "" -#: templates/web/base/admin/report_edit.html:32 +#: templates/web/base/admin/report_edit.html:45 msgid "Property address:" msgstr "" @@ -2344,7 +2341,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/base/report/new/fill_in_details_form.html:174 +#: templates/web/base/report/new/fill_in_details_form.html:155 #: templates/web/base/report/update-form.html:128 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 #: templates/web/fixmystreet/report/update-form.html:119 @@ -2365,7 +2362,7 @@ msgstr "" msgid "Publish the response" msgstr "" -#: templates/web/base/questionnaire/completed.html:2 +#: templates/web/base/questionnaire/completed.html:1 #: templates/web/base/questionnaire/index.html:0 #: templates/web/base/questionnaire/index.html:14 #: templates/web/base/questionnaire/index.html:4 @@ -2384,11 +2381,12 @@ msgstr "" msgid "Questionnaire %d sent for problem %d" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 msgid "Questionnaire filled in by problem reporter" msgstr "" #: templates/web/base/alert/_list.html:21 +#: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display.html:50 #: templates/web/base/reports/_rss.html:1 @@ -2398,11 +2396,11 @@ msgstr "" msgid "RSS feed" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:260 perllib/FixMyStreet/Cobrand/UK.pm:272 +#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 msgid "RSS feed for %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "RSS feed for %s ward, %s" msgstr "" @@ -2410,15 +2408,11 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:167 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:175 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:185 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:193 -#: perllib/FixMyStreet/Cobrand/UK.pm:286 perllib/FixMyStreet/Cobrand/UK.pm:298 +#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 msgid "RSS feed of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 msgid "RSS feed of %s, within %s ward" msgstr "" @@ -2431,20 +2425,19 @@ msgstr "" msgid "RSS feed of problems in this %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:630 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:115 +#: perllib/FixMyStreet/Cobrand/Default.pm:651 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:150 -#: perllib/FixMyStreet/Cobrand/UK.pm:224 +#: perllib/FixMyStreet/Cobrand/UK.pm:214 msgid "RSS feed of problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 -#: perllib/FixMyStreet/Cobrand/UK.pm:230 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s ward" msgstr "" -#: templates/web/base/around/display_location.html:3 +#: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:4 msgid "RSS feed of recent local problems" msgstr "" @@ -2484,15 +2477,18 @@ msgstr "" msgid "Remove flag" msgstr "" -#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/report_edit.html:110 #: templates/web/base/admin/update_edit.html:62 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "" -#: templates/web/base/footer.html:7 templates/web/fiksgatami/footer.html:19 -#: templates/web/fiksgatami/nn/footer.html:19 -#: templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 +msgid "Report" +msgstr "" + +#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 #: templates/web/zurich/footer.html:17 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2502,11 +2498,6 @@ msgstr "" msgid "Report abuse" msgstr "" -#: templates/web/base/report_created.html:1 -#: templates/web/base/report_created.html:3 -msgid "Report created" -msgstr "" - #: perllib/FixMyStreet/App/Controller/Rss.pm:295 msgid "Report on %s" msgstr "" @@ -2530,7 +2521,7 @@ msgstr "" msgid "Reported %s, to %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:580 #: templates/web/base/contact/index.html:50 #: templates/web/fixmystreet/contact/index.html:65 msgid "Reported anonymously at %s" @@ -2542,7 +2533,7 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:598 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 #: templates/web/base/contact/index.html:52 #: templates/web/fixmystreet/contact/index.html:67 msgid "Reported by %s at %s" @@ -2552,31 +2543,35 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:571 +#: perllib/FixMyStreet/DB/Result/Problem.pm:576 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:598 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:567 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:589 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:563 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:583 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 msgid "Reported via %s in the %s category by %s at %s" msgstr "" -#: templates/web/base/around/around_index.html:2 +#: templates/web/base/reports/index.html:21 +msgid "Reported within the last four weeks" +msgstr "" + +#: templates/web/base/around/around_index.html:1 #: templates/web/base/around/around_index.html:3 #: templates/web/base/js/translation_strings.html:41 #: templates/web/base/report/new/fill_in_details.html:0 @@ -2586,14 +2581,13 @@ msgstr "" msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:294 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:409 -#: perllib/FixMyStreet/DB/Result/Problem.pm:413 +#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" @@ -2609,7 +2603,7 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:85 msgid "Resend report" msgstr "" @@ -2617,36 +2611,35 @@ msgstr "" msgid "Right place?" msgstr "" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:193 -#: perllib/FixMyStreet/Geocode/OSM.pm:171 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:167 +#: perllib/FixMyStreet/Geocode/OSM.pm:152 msgid "Road operator for this named road (derived from road reference number and type): %s" msgstr "" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:190 -#: perllib/FixMyStreet/Geocode/OSM.pm:168 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:164 +#: perllib/FixMyStreet/Geocode/OSM.pm:149 msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1394 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 -#: templates/web/base/admin/report_edit.html:90 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1403 +#: templates/web/base/admin/report_edit.html:106 #: templates/web/zurich/admin/report_edit.html:73 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1394 -#: templates/web/base/admin/report_edit.html:91 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: templates/web/base/admin/report_edit.html:107 #: templates/web/zurich/admin/report_edit.html:74 msgid "Rotate Right" msgstr "" #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:200 -#: templates/web/base/admin/category_edit.html:76 +#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/category_edit.html:81 #: templates/web/zurich/admin/body.html:59 msgid "Save changes" msgstr "" @@ -2674,7 +2667,7 @@ msgstr "" msgid "Searching found no reports." msgstr "" -#: templates/web/base/admin/users.html:39 +#: templates/web/base/admin/users.html:41 msgid "Searching found no users." msgstr "" @@ -2697,15 +2690,15 @@ 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:680 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "Sent to %s %s later" msgstr "" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:84 msgid "Sent:" msgstr "" -#: templates/web/base/admin/report_edit.html:73 +#: templates/web/base/admin/report_edit.html:89 #: templates/web/zurich/admin/stats.html:45 msgid "Service:" msgstr "" @@ -2714,7 +2707,7 @@ msgstr "" msgid "Share" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:211 +#: templates/web/base/report/new/fill_in_details_form.html:192 #: templates/web/base/report/update-form.html:157 #: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 @@ -2759,12 +2752,12 @@ msgstr "" msgid "Signed in as %s" msgstr "" -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 msgid "Some categories may require additional information." msgstr "" -#: templates/web/base/admin/body-form.html:145 -#: templates/web/base/admin/body-form.html:146 +#: templates/web/base/admin/body-form.html:149 +#: templates/web/base/admin/body-form.html:150 msgid "" "Some endpoints require an <strong>API key</strong> to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -2775,11 +2768,11 @@ msgid "Some photos of recent reports" msgstr "" #: perllib/FixMyStreet/App/View/Email.pm:32 -#: perllib/FixMyStreet/App/View/Web.pm:44 +#: perllib/FixMyStreet/App/View/Web.pm:43 msgid "Some text to localize" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:88 +#: perllib/FixMyStreet/Cobrand/UK.pm:78 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -2787,17 +2780,16 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:215 -#: perllib/FixMyStreet/Geocode.pm:26 perllib/FixMyStreet/Geocode/Bing.pm:56 -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:73 -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:93 -#: perllib/FixMyStreet/Geocode/Google.pm:72 -#: perllib/FixMyStreet/Geocode/OSM.pm:64 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:214 +#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 +#: perllib/FixMyStreet/Geocode/Google.pm:47 +#: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "" -#: perllib/FixMyStreet/Geocode/Bing.pm:51 -#: perllib/FixMyStreet/Geocode/Google.pm:67 +#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: perllib/FixMyStreet/Geocode/Google.pm:44 #: perllib/FixMyStreet/Geocode/Zurich.pm:87 msgid "Sorry, we could not parse that location. Please try again." msgstr "" @@ -2806,7 +2798,7 @@ msgstr "" msgid "Start Date:" msgstr "" -#: templates/web/base/admin/body.html:61 +#: templates/web/base/admin/body.html:69 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 @@ -2814,7 +2806,7 @@ msgstr "" msgid "State" msgstr "" -#: templates/web/base/admin/report_edit.html:34 +#: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 #: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:53 @@ -2823,8 +2815,8 @@ msgstr "" msgid "State:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1200 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:304 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:308 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" @@ -2840,7 +2832,7 @@ msgstr "" msgid "Still open, via questionnaire, %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:381 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 msgid "Subcategory: %s" msgstr "" @@ -2860,19 +2852,19 @@ msgid "Subject:" msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:115 -#: templates/web/base/report/new/fill_in_details_form.html:155 -#: templates/web/base/report/new/fill_in_details_form.html:177 +#: templates/web/base/report/new/fill_in_details_form.html:136 +#: templates/web/base/report/new/fill_in_details_form.html:158 +#: templates/web/base/report/new/fill_in_details_form.html:96 #: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 -#: templates/web/zurich/report/new/fill_in_details_form.html:108 +#: templates/web/zurich/report/new/fill_in_details_form.html:91 msgid "Submit" msgstr "" -#: templates/web/base/admin/report_edit.html:97 +#: templates/web/base/admin/report_edit.html:113 #: templates/web/base/admin/update_edit.html:65 -#: templates/web/base/admin/user-form.html:55 +#: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:64 #: templates/web/zurich/admin/report_edit.html:221 #: templates/web/zurich/admin/update_edit.html:38 @@ -2884,8 +2876,8 @@ msgstr "" msgid "Submit questionnaire" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:133 -#: templates/web/zurich/admin/header.html:2 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:134 +#: 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 @@ -2909,8 +2901,8 @@ msgstr "" msgid "Subscribe me to an email alert" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1191 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:293 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 #: templates/web/zurich/admin/index-dm.html:1 @@ -2926,7 +2918,7 @@ msgstr "" msgid "Summary reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 msgid "Survey" msgstr "" @@ -2940,7 +2932,7 @@ msgstr "" msgid "Text" msgstr "" -#: templates/web/base/admin/body.html:21 +#: templates/web/base/admin/body.html:28 msgid "Text only version" msgstr "" @@ -2949,49 +2941,54 @@ msgstr "" msgid "Text:" msgstr "" -#: templates/web/base/tokens/confirm_update.html:9 -msgid "Thank you — you can <a href=\"%s\">view your updated problem</a> on the site." -msgstr "" - -#: templates/web/base/tokens/confirm_problem.html:18 -msgid "Thank you for reporting this issue" +#: templates/web/base/tokens/confirm_problem.html:12 +msgid "Thank you for reporting this issue!" msgstr "" #: templates/web/base/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/fixmystreet/around/around_index.html:28 -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 :" +#: templates/web/base/tokens/confirm_update.html:15 +msgid "Thank you for updating this issue!" +msgstr "" + +#: templates/web/base/contact/submit.html:6 +#: templates/web/base/questionnaire/completed.html:5 +msgid "Thank you for your feedback" msgstr "" -#: templates/web/base/contact/submit.html:8 -msgid "Thanks for your feedback. We'll get back to you as soon as we can!" +#: templates/web/fixmystreet/around/around_index.html:28 +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 :" msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:9 msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:190 +#: perllib/FixMyStreet/App/Controller/Photo.pm:195 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Council.pm:100 +#: perllib/FixMyStreet/App/Controller/Council.pm:97 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 +#: perllib/FixMyStreet/App/Controller/Location.pm:126 msgid "That location does not appear to be in the UK; please try again." msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:81 +#: perllib/FixMyStreet/Cobrand/UK.pm:71 msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:713 +#: perllib/FixMyStreet/App/Controller/Admin.pm:712 +msgid "That problem has been marked as sent." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:704 msgid "That problem will now be resent." msgstr "" @@ -3003,28 +3000,28 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "" -#: templates/web/base/admin/body.html:136 +#: templates/web/base/admin/body.html:144 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/base/admin/body-form.html:119 -#: templates/web/base/admin/body-form.html:120 +#: templates/web/base/admin/body-form.html:123 +#: templates/web/base/admin/body-form.html:124 msgid "" "The <strong>endpoint</strong> is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." msgstr "" -#: templates/web/base/admin/body-form.html:132 -#: templates/web/base/admin/body-form.html:133 +#: templates/web/base/admin/body-form.html:136 +#: templates/web/base/admin/body-form.html:137 msgid "" "The <strong>jurisdiction</strong> is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" -#: templates/web/base/admin/body-form.html:90 -#: templates/web/base/admin/body-form.html:91 +#: templates/web/base/admin/body-form.html:94 +#: templates/web/base/admin/body-form.html:95 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>." @@ -3045,7 +3042,7 @@ msgstr "" msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." msgstr "" -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:3 msgid "The council won’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 "" @@ -3072,8 +3069,8 @@ 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:185 -#: perllib/FixMyStreet/Geocode/OSM.pm:163 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:159 +#: perllib/FixMyStreet/Geocode/OSM.pm:144 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap." msgstr "" @@ -3131,7 +3128,7 @@ msgstr "" msgid "The passwords do not match" msgstr "" -#: templates/web/base/errors/page_error_404_not_found.html:11 +#: templates/web/base/errors/page_error_404_not_found.html:10 #: templates/web/base/errors/page_error_404_not_found.html:12 msgid "The requested URL '%s' was not found on this server" msgstr "" @@ -3148,7 +3145,7 @@ msgstr "" msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:295 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:300 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" @@ -3159,16 +3156,20 @@ msgid "" " Names are not necessarily unique." msgstr "" +#: templates/web/base/reports/_problem-list.html:15 +msgid "There are no reports to show." +msgstr "" + #: perllib/FixMyStreet/App/Controller/Reports.pm:75 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:131 +#: perllib/FixMyStreet/App/Controller/Contact.pm:136 #: 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/New.pm:762 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 #: templates/web/base/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:25 @@ -3184,7 +3185,7 @@ msgstr "" msgid "There was a problem with your update. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:135 +#: perllib/FixMyStreet/App/Controller/Contact.pm:140 msgid "There were problems with your report. Please see below." msgstr "" @@ -3192,8 +3193,8 @@ msgstr "" msgid "There were problems with your update. Please see below." msgstr "" -#: templates/web/base/admin/body-form.html:108 -#: templates/web/base/admin/body-form.html:109 +#: templates/web/base/admin/body-form.html:112 +#: templates/web/base/admin/body-form.html:113 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" @@ -3206,14 +3207,14 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" -#: templates/web/base/admin/body.html:36 +#: templates/web/base/admin/body.html:44 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported <em>at any location</em>.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" " Currently, users <strong>cannot report problems to this body</strong>." msgstr "" -#: templates/web/base/admin/body.html:46 +#: templates/web/base/admin/body.html:54 msgid "This body has no contacts. This means that currently problems reported to this body <strong>will not be sent</strong>." msgstr "" @@ -3224,18 +3225,18 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:388 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:394 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:391 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 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:136 -#: perllib/FixMyStreet/Cobrand/UK.pm:53 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:902 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:972 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/Cobrand/UK.pm:43 msgid "This information is required" msgstr "" @@ -3274,8 +3275,8 @@ msgstr "" msgid "This problem is old and of unknown status." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:130 #: perllib/FixMyStreet/Cobrand/Zurich.pm:131 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:132 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -3292,15 +3293,15 @@ msgstr "" msgid "This report is currently marked as open." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:319 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:311 msgid "This report was submitted anonymously" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:293 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -3318,7 +3319,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:294 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:299 msgid "To view a map of the precise location of this issue" msgstr "" @@ -3334,8 +3335,12 @@ msgstr "" msgid "Try again" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:46 +#: templates/web/base/contact/submit.html:14 +msgid "Try emailing us directly:" +msgstr "" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -3343,8 +3348,8 @@ msgstr "" msgid "Unable to fix" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/admin/update_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:45 #: templates/web/zurich/admin/report_edit.html:58 @@ -3386,7 +3391,7 @@ msgstr "" msgid "Update below added by %s at %s" msgstr "" -#: templates/web/base/admin/body-form.html:233 +#: templates/web/base/admin/body-form.html:240 #: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "" @@ -3412,7 +3417,7 @@ msgstr "" msgid "Update reopened problem" msgstr "" -#: templates/web/base/admin/body.html:93 +#: templates/web/base/admin/body.html:101 msgid "Update statuses" msgstr "" @@ -3426,12 +3431,12 @@ msgstr "" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1016 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1060 -#: perllib/FixMyStreet/App/Controller/Admin.pm:810 -#: perllib/FixMyStreet/App/Controller/Admin.pm:958 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:549 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:618 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1014 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:808 +#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:556 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:625 msgid "Updated!" msgstr "" @@ -3443,7 +3448,7 @@ msgstr "" msgid "Updates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:139 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -3458,7 +3463,7 @@ msgstr "" msgid "Updates to this problem, FixMyStreet" msgstr "" -#: templates/web/base/admin/body.html:174 +#: templates/web/base/admin/body.html:182 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 "" @@ -3467,11 +3472,11 @@ msgstr "" msgid "User" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1357 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1331 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1329 msgid "User flagged" msgstr "" @@ -3479,16 +3484,16 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:303 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:307 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:380 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:430 +#: perllib/FixMyStreet/App/Controller/Admin.pm:374 +#: perllib/FixMyStreet/App/Controller/Admin.pm:404 +#: perllib/FixMyStreet/App/Controller/Admin.pm:421 msgid "Values updated" msgstr "" @@ -3542,11 +3547,11 @@ msgstr "" msgid "We never show your email address or phone number." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:403 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/base/index-steps.html:38 +#: templates/web/base/index-steps.html:31 msgid "We send it to the council on your behalf" msgstr "" @@ -3555,15 +3560,23 @@ msgstr "" msgid "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>" msgstr "" +#: templates/web/base/questionnaire/completed-open.html:2 +msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" +msgstr "" + #: templates/web/base/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/fixmystreet/report/new/fill_in_details_form.html:41 +#: templates/web/base/contact/submit.html:7 +msgid "We’ll get back to you as soon as we can." +msgstr "" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 msgid "What’s the issue, and where is it?" msgstr "" -#: templates/web/base/admin/category_edit.html:82 +#: templates/web/base/admin/category_edit.html:87 #: templates/web/zurich/admin/body.html:18 msgid "When edited" msgstr "" @@ -3572,15 +3585,18 @@ msgstr "" msgid "When sent" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Whole block of empty flats" msgstr "" +#: templates/web/base/tokens/confirm_alert.html:7 +msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." +msgstr "" + #: templates/web/base/open311/index.html:92 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/fiksgatami/front/footer-marketing.html:15 #: templates/web/fixmystreet/front/footer-marketing.html:17 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" @@ -3604,18 +3620,18 @@ msgid "Year" msgstr "" #: templates/web/base/admin/bodies.html:66 -#: templates/web/base/admin/body.html:72 templates/web/base/admin/body.html:74 -#: templates/web/base/admin/body.html:78 templates/web/base/admin/body.html:80 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:76 +#: templates/web/base/admin/report_edit.html:93 #: templates/web/base/admin/update_edit.html:24 -#: templates/web/base/admin/users.html:29 +#: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:42 #: templates/web/base/questionnaire/index.html:81 @@ -3644,14 +3660,12 @@ msgstr "" msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/tokens/confirm_problem.html:25 -#: templates/web/base/tokens/confirm_problem.html:26 -#: templates/web/zurich/tokens/confirm_problem.html:6 +#: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:8 msgid "You can <a href=\"%s%s\">view the problem on this site</a>." msgstr "" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:48 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -3666,14 +3680,14 @@ msgid "" " reports in the past." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:19 -#: templates/web/base/report/new/councils_text_none.html:20 -#: templates/web/base/report/new/councils_text_some.html:20 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." msgstr "" -#: templates/web/base/admin/body-form.html:81 +#: templates/web/base/admin/body-form.html:85 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" @@ -3686,10 +3700,10 @@ msgid "You have already answered this questionnaire. If you have a question, ple msgstr "" #: templates/web/base/questionnaire/index.html:68 -#: templates/web/base/report/new/fill_in_details_form.html:94 +#: templates/web/base/report/new/fill_in_details_form.html:75 #: templates/web/fixmystreet/questionnaire/index.html:88 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:79 -#: templates/web/zurich/report/new/fill_in_details_form.html:75 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 +#: templates/web/zurich/report/new/fill_in_details_form.html:58 msgid "You have already attached a photo to this report, attaching another one will replace it." msgstr "" @@ -3698,7 +3712,7 @@ msgstr "" msgid "You have already attached a photo to this update, attaching another one will replace it." msgstr "" -#: templates/web/base/auth/sign_out.html:3 +#: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" msgstr "" @@ -3707,26 +3721,11 @@ msgstr "" 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/base/tokens/confirm_alert.html:8 -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/base/tokens/confirm_update.html:14 -msgid "You have successfully confirmed your update and you can now <a href=\"%s\">view it on the site</a>." -msgstr "" - -#: templates/web/base/tokens/confirm_alert.html:12 -msgid "You have successfully created your alert." -msgstr "" - -#: templates/web/base/tokens/confirm_alert.html:10 -msgid "You have successfully deleted your alert." -msgstr "" - #: templates/web/base/report/display.html:20 #: templates/web/base/report/new/fill_in_details.html:37 #: templates/web/fixmystreet/report/display.html:17 @@ -3752,7 +3751,7 @@ msgid "" " contacts (such as an email address) to which reports are sent." msgstr "" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:85 msgid "You really want to resend?" msgstr "" @@ -3772,7 +3771,7 @@ msgstr "" #: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 #: templates/web/fixmystreet/report/update-form.html:76 -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:71 msgid "Your email" msgstr "" @@ -3788,7 +3787,7 @@ msgid "Your email address:" msgstr "" #: templates/web/base/alert/_list.html:92 -#: templates/web/base/report/new/fill_in_details_form.html:125 +#: templates/web/base/report/new/fill_in_details_form.html:106 #: templates/web/base/report/update-form.html:81 msgid "Your email:" msgstr "" @@ -3803,13 +3802,13 @@ msgstr "" #: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 #: templates/web/fixmystreet/report/update-form.html:142 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:98 +#: templates/web/zurich/report/new/fill_in_details_form.html:81 msgid "Your name" msgstr "" #: templates/web/base/auth/general.html:59 #: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:204 +#: templates/web/base/report/new/fill_in_details_form.html:185 #: templates/web/base/report/update-form.html:151 msgid "Your name:" msgstr "" @@ -3827,33 +3826,19 @@ msgstr "" #: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 -#: templates/web/zurich/report/new/fill_in_details_form.html:104 +#: templates/web/zurich/report/new/fill_in_details_form.html:87 msgid "Your phone number" msgstr "" -#: templates/web/base/tokens/confirm_problem.html:4 -msgid "Your problem has been confirmed!" -msgstr "" - #: templates/web/fixmystreet/questionnaire/index.html:16 msgid "Your report" msgstr "" -#: templates/web/base/report_created.html:6 -msgid "Your report has been created and will shortly be sent." -msgstr "" - -#: templates/web/base/footer.html:9 templates/web/fiksgatami/footer.html:21 -#: templates/web/fiksgatami/nn/footer.html:21 -#: templates/web/fixmystreet/footer.html:24 +#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:24 msgid "Your reports" msgstr "" -#: templates/web/base/tokens/confirm_update.html:4 -msgid "Your update has been confirmed!" -msgstr "" - -#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:59 +#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:41 msgid "Your updates" msgstr "" @@ -3870,11 +3855,7 @@ msgstr "" msgid "council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:665 -msgid "council ref: %s" -msgstr "" - -#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:32 #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:54 msgid "didn't use map" @@ -3885,6 +3866,7 @@ msgstr "" msgid "e.g. ‘%s’ or ‘%s’" msgstr "" +#: templates/web/base/admin/body-form.html:188 #: templates/web/base/admin/flagged.html:51 msgid "edit user" msgstr "" @@ -3899,7 +3881,7 @@ msgstr "" msgid "last updated %s" msgstr "" -#: perllib/Utils.pm:263 +#: perllib/Utils.pm:235 msgid "less than a minute" msgstr "" @@ -3959,22 +3941,22 @@ msgstr "" msgid "or locate me automatically" msgstr "" -#: templates/web/base/admin/report_edit.html:25 -#: templates/web/base/admin/report_edit.html:26 -#: templates/web/zurich/admin/report_edit-sdm.html:28 +#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:30 +#: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit-sdm.html:29 -#: templates/web/zurich/admin/report_edit-sdm.html:37 +#: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:38 -#: templates/web/zurich/admin/report_edit.html:28 +#: templates/web/zurich/admin/report_edit.html:27 #: templates/web/zurich/admin/report_edit.html:29 -#: templates/web/zurich/admin/report_edit.html:39 +#: templates/web/zurich/admin/report_edit.html:38 #: templates/web/zurich/admin/report_edit.html:40 -#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit.html:50 #: templates/web/zurich/admin/report_edit.html:52 msgid "originally entered: “%s”" msgstr "" -#: templates/web/base/admin/report_edit.html:30 +#: templates/web/base/admin/report_edit.html:43 msgid "other areas:" msgstr "" @@ -3983,13 +3965,12 @@ msgstr "" msgid "reopened" msgstr "" -#: templates/web/fiksgatami/header.html:49 -#: templates/web/fixmystreet/header.html:53 +#: templates/web/fixmystreet/header.html:59 #: templates/web/zurich/footer.html:12 msgid "sign out" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:13 +#: templates/web/base/report/new/fill_in_details_form.html:12 #: templates/web/base/report/new/fill_in_details_form.html:15 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 @@ -4001,15 +3982,15 @@ msgstr "" msgid "there is no pin shown as the user did not use the map" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:373 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:379 msgid "this type of local problem" msgstr "" -#: perllib/Utils.pm:235 +#: perllib/Utils.pm:207 msgid "today" msgstr "" -#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:32 #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:54 msgid "used map" @@ -4039,7 +4020,7 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: perllib/Utils.pm:282 +#: perllib/Utils.pm:254 #, perl-format msgid "%d hour" msgid_plural "%d hours" @@ -4061,7 +4042,7 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: perllib/Utils.pm:284 +#: perllib/Utils.pm:256 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -4094,7 +4075,7 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: perllib/Utils.pm:278 +#: perllib/Utils.pm:250 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -4127,7 +4108,7 @@ msgstr[3] "" msgstr[4] "" msgstr[5] "" -#: perllib/Utils.pm:280 +#: perllib/Utils.pm:252 #, perl-format msgid "%d day" msgid_plural "%d days" diff --git a/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po index 98165f44b..bfab19002 100644 --- a/locale/bg_BG.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/bg_BG.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: 2015-01-20 16:59+0000\n" -"PO-Revision-Date: 2014-11-19 18:30+0000\n" +"POT-Creation-Date: 2015-07-31 14:28+0100\n" +"PO-Revision-Date: 2015-07-10 13:31+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/fixmystreet/language/bg_BG/)\n" "Language: bg_BG\n" @@ -20,17 +20,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:618 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:386 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:392 msgid " and " msgstr "и" -#: templates/web/base/report/new/councils_text_all.html:12 -#: templates/web/base/report/new/councils_text_all.html:19 -#: templates/web/base/report/new/councils_text_all.html:5 -#: templates/web/base/report/new/councils_text_none.html:19 -#: templates/web/base/report/new/councils_text_none.html:21 -#: templates/web/base/report/new/councils_text_some.html:20 +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_none.html:11 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " @@ -66,22 +64,26 @@ msgstr "%d до %d от %d" msgid "%s - Summary reports" msgstr "%s - Обобщена справка" -#: perllib/FixMyStreet/DB/Result/Problem.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:672 msgid "%s ref: %s" msgstr "%s номер: %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:265 perllib/FixMyStreet/Cobrand/UK.pm:277 +#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 msgid "%s ward, %s" msgstr "%s квартал, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:554 +#: perllib/FixMyStreet/DB/Result/Problem.pm:559 msgid "%s, reported at %s" msgstr "%s, съобщено на %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:304 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "%s, within %s ward" msgstr "%s, в %s квартал" +#: perllib/FixMyStreet/Map/OSM.pm:42 +msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" +msgstr "" + #: templates/web/base/email_sent.html:29 msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" msgstr "(Не се притеснявайте — задържаме известието докато проверявате имейла си.)" @@ -95,7 +97,7 @@ msgid "(Don't worry — we'll hang on to your update while you're checking y msgstr "(Не се притеснявайте — задържаме актуализацията докато проверявате имейла си.)" #: templates/web/base/admin/report_blocks.html:11 -#: templates/web/base/admin/users.html:29 +#: templates/web/base/admin/users.html:31 msgid "(Email in abuse table)" msgstr "(Имейлът е маркиран като подаващ обидни сигнали)" @@ -123,7 +125,7 @@ msgstr "(затворен)" msgid "(fixed)" msgstr "(поправен)" -#: templates/web/base/index.html:9 +#: templates/web/base/index.html:8 templates/web/base/index.html:9 #: templates/web/fixmystreet/around/intro.html:2 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(като графити, дупки по улицата, счупено улично осветление)" @@ -133,8 +135,8 @@ msgstr "(като графити, дупки по улицата, счупено msgid "(not sent to council)" msgstr "(не е изпратен към общината)" -#: templates/web/base/report/new/fill_in_details_form.html:218 -#: templates/web/zurich/report/new/fill_in_details_form.html:94 +#: templates/web/base/report/new/fill_in_details_form.html:199 +#: templates/web/zurich/report/new/fill_in_details_form.html:77 msgid "(optional)" msgstr "(незадължително)" @@ -147,7 +149,7 @@ msgstr "" msgid "(sent to both)" msgstr "(изпратен към двата района)" -#: templates/web/base/report/new/fill_in_details_form.html:212 +#: templates/web/base/report/new/fill_in_details_form.html:193 msgid "(we never show your email address or phone number)" msgstr "(ние никога не показваме вашия имейл или телефонен номер)" @@ -155,14 +157,13 @@ msgstr "(ние никога не показваме вашия имейл ил 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:393 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Изберете категория --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 -#: perllib/FixMyStreet/DB/Result/Problem.pm:399 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:630 +#: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Изберете подходящ тип --" @@ -174,50 +175,7 @@ msgid "" " Maybe add some <code>MAPIT_TYPES</code> to your config file?" msgstr "" -#: templates/web/base/questionnaire/completed.html:20 -msgid "<p style=\"font-size:150%\">Thank you very much for filling in our questionnaire; glad to hear it’s been fixed.</p>" -msgstr "" -"<p style=\"font-size:150%\">Благодарим Ви за отделеното време. Радваме се, че \n" -"проблемът е бил отстранен.</p>" - -#: templates/web/fiksgatami/questionnaire/completed-open.html:1 -msgid "" -"<p style=\"font-size:150%\">We’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’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%\">Съжаляваме да чуем това. Имаме две предложения:\n" -"защо не пишете директно на общината или, ако това е проблем, \n" -"който можете да бъде отстранен с общи усилия от гражданите, защо не \n" -"направите предложение за отстраняването му?</p>" - -#: templates/web/base/questionnaire/completed-open.html:6 -msgid "" -"<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" -"suggestions: why not try writing to your local representatives or, if\n" -"it’s a problem that could be fixed by local people working together, why\n" -"not <a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n" -"</p>" -msgstr "" -"<p style=\"font-size:150%\">Съжаляваме да чуем това. Имаме две предложения:\n" -"защо не пишете директно на общината или, ако това е проблем, \n" -"който можете да бъде отстранен с общи усилия от гражданите, защо не \n" -"направите предложение за отстраняването му?</p>" - -#: templates/web/base/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>Благодарим Ви,че попълнихте нашия въпросник; ако\n" -"получите повече информация относно статуса на вашия проблем, моля върнете се на\n" -"сайта и актуализирайте сигнала.</p>" - -#: templates/web/base/around/_report_banner.html:4 +#: templates/web/base/around/_report_banner.html:3 #: templates/web/base/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>" @@ -244,7 +202,7 @@ msgstr "<strong>Не</strong> Нека да вляза в системата ч msgid "<strong>No</strong>, I do not, let me sign in by email:" msgstr "<strong>Не</strong> Нека да вляза в системата чрез имейл" -#: templates/web/base/report/new/fill_in_details_form.html:163 +#: templates/web/base/report/new/fill_in_details_form.html:144 msgid "<strong>No</strong>, let me confirm my report by email:" msgstr "<strong>Не</strong> Нека да потвърдя сигнала чрез имейл" @@ -252,13 +210,8 @@ msgstr "<strong>Не</strong> Нека да потвърдя сигнала чр msgid "<strong>No</strong>, let me confirm my update by email:" msgstr "<strong>Не</strong> Нека потвърдя промяната чрез имейл:" -#: templates/web/base/tokens/confirm_problem.html:19 -#: templates/web/base/tokens/confirm_problem.html:20 -msgid "<strong>We will now send it to the council</strong>." -msgstr "" - #: templates/web/base/auth/general.html:37 -#: templates/web/base/report/new/fill_in_details_form.html:141 +#: templates/web/base/report/new/fill_in_details_form.html:122 #: templates/web/base/report/update-form.html:95 #: templates/web/fixmystreet/auth/general.html:37 #: templates/web/fixmystreet/auth/general.html:39 @@ -272,8 +225,8 @@ msgstr "<strong>Да</strong> Имам парола" msgid "About us" msgstr "За нас" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:39 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:52 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:31 #: templates/web/fixmystreet/report/update-form.html:28 @@ -292,26 +245,26 @@ msgstr "" "район или дружество, към което могат да се изпращат проблеми. Можете да добавяте \n" "повече от един контакт (в зависимост от категорията на проблема) за всяка служба." -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/body.html:56 msgid "Add a contact using the form below." msgstr "Добавете контакт като използвате формата по-долу." #: templates/web/base/admin/bodies.html:74 -#: templates/web/base/admin/body-form.html:233 +#: templates/web/base/admin/body-form.html:240 #: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "Добавете район" -#: templates/web/base/admin/body.html:108 +#: templates/web/base/admin/body.html:116 #: templates/web/zurich/admin/body.html:31 msgid "Add new category" msgstr "Добавяне на нова категория" -#: templates/web/base/admin/users.html:45 +#: templates/web/base/admin/users.html:47 msgid "Add user" msgstr "Добавете потребител" -#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:70 +#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:52 msgid "Added %s" msgstr "Добавено %s" @@ -338,9 +291,7 @@ msgstr "Известявай ме за бъдещи актуализиации" msgid "All Reports" msgstr "Вички сигнали" -#: templates/web/base/footer.html:11 templates/web/fiksgatami/footer.html:23 -#: templates/web/fiksgatami/nn/footer.html:23 -#: templates/web/fixmystreet/footer.html:26 +#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:26 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:19 @@ -357,19 +308,9 @@ msgstr "Всички сигнали между%s и %s " msgid "All the information you provide here will be sent to" msgstr "Цялата информация, която предоставите тук, ще бъде изпратена на " -#: templates/web/base/report/new/councils_text_all.html:12 -#: templates/web/base/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/base/report/new/councils_text_all.html:5 -#: templates/web/base/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/base/report/new/councils_text_all.html:19 -#: templates/web/base/report/new/councils_text_all.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:13 +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_all.html:4 +#: templates/web/base/report/new/fill_in_details_form.html:12 #: templates/web/base/report/new/fill_in_details_form.html:14 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 @@ -386,7 +327,7 @@ msgstr "Този сигнал е маркиран като поправен." msgid "Anonymous" msgstr "Анонимен" -#: templates/web/base/admin/report_edit.html:62 +#: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:23 msgid "Anonymous:" msgstr "Анонимен:" @@ -395,18 +336,18 @@ msgstr "Анонимен:" msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?" msgstr "" -#: templates/web/fiksgatami/front/footer-marketing.html:14 #: templates/web/fixmystreet/front/footer-marketing.html:16 msgid "Are you a developer?" msgstr "Ако сте програмист?" #: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 msgid "Area covered" msgstr "Територията е обхваната" #: templates/web/base/admin/bodies.html:15 -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/body.html:60 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "" @@ -424,7 +365,7 @@ msgstr "Прехвърляне към външна община:" msgid "Assign to subdivision:" msgstr "Прехвърляне към подразделение:" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:163 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:165 #: templates/web/zurich/report/updates.html:11 msgid "Assigned to %s" msgstr "Прехвърлен на %s" @@ -437,7 +378,7 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "За момета можете само да търсите и преглеждате сигнали" -#: perllib/FixMyStreet/DB/Result/Problem.pm:348 +#: perllib/FixMyStreet/DB/Result/Problem.pm:373 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "Очакващ преглед" @@ -450,8 +391,8 @@ msgstr "Назад" msgid "Ban email address" msgstr "Забрана на имейл адреса" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:297 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:301 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" msgstr "Райони" @@ -462,6 +403,7 @@ msgstr "Райони" msgid "Body" msgstr "Район" +#: templates/web/base/admin/report_edit.html:34 #: templates/web/base/admin/user-form.html:32 msgid "Body:" msgstr "Район:" @@ -474,16 +416,15 @@ msgstr "По дата" msgid "Can't see the map? <em>Skip this step</em>" msgstr "Не виждате картата? <em>Пропуснете тази стъпка</em>" -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:55 #: templates/web/base/report/new/category.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:53 +#: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 #: templates/web/zurich/admin/stats.html:50 -#: templates/web/zurich/report/new/fill_in_details_form.html:50 msgid "Category" msgstr "Категория" @@ -491,17 +432,16 @@ msgstr "Категория" msgid "Category fix rate for problems > 4 weeks old" msgstr "Сигнали подадени преди повече от 4 седмици" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:138 #: templates/web/base/admin/category_edit.html:23 -#: templates/web/base/admin/report_edit.html:61 -#: templates/web/base/report/new/fill_in_details_form.html:68 +#: templates/web/base/admin/report_edit.html:74 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/report_edit-sdm.html:42 #: templates/web/zurich/admin/report_edit.html:140 msgid "Category:" msgstr "Категория:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:377 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383 msgid "Category: %s" msgstr "Категория: %s" @@ -512,7 +452,7 @@ msgstr "Категория: %s" msgid "Change password" msgstr "Промяна на парола" -#: templates/web/base/admin/body.html:152 +#: templates/web/base/admin/body.html:160 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." @@ -520,7 +460,7 @@ msgstr "" "Изберете <strong>потвърден</strong> за да отбележите, че този контакт е бил потвърден и коректен. \n" "Ако не сте сигурни за първоизточника или валидността на контакта, оставете полето немаркирано." -#: templates/web/base/admin/body.html:163 +#: templates/web/base/admin/body.html:171 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." @@ -528,7 +468,7 @@ msgstr "" "Маркирайте <strong>изтриване</strong>, за да премахнете категорията.\n" "В този случай тя няма да бъде достъпна в списъка с категории на страницата за подаване на нов сигнал." -#: templates/web/base/admin/body.html:183 +#: templates/web/base/admin/body.html:191 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -544,7 +484,7 @@ msgstr "" "<br>\n" "Тази опция е подходяща за сигнали, които всички биха могли да подават, но които не представляват интерес за останалите. Например да си изиска допълнителен контейнер за боклук за даден адрес." -#: templates/web/base/admin/body.html:122 +#: templates/web/base/admin/body.html:130 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." @@ -560,16 +500,16 @@ msgstr "Изберете дата или я въведете - dd/mm/yyyy" msgid "Click map to report a problem" msgstr "Щракнете върху картата, за да съобщите за проблем" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:45 -#: templates/web/base/admin/report_edit.html:47 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:58 +#: templates/web/base/admin/report_edit.html:60 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/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:95 #: templates/web/zurich/admin/report_edit.html:97 #: templates/web/zurich/admin/stats.html:31 @@ -577,11 +517,12 @@ msgstr "Щракнете върху картата, за да съобщите msgid "Closed" msgstr "Затворен" -#: perllib/FixMyStreet/DB/Result/Problem.pm:762 +#: perllib/FixMyStreet/DB/Result/Problem.pm:771 msgid "Closed by council" msgstr "Затворен от общината" -#: templates/web/base/my/my.html:40 templates/web/fixmystreet/my/my.html:46 +#: templates/web/base/my/my.html:40 +#: templates/web/fixmystreet/my/_problem-list.html:12 msgid "Closed reports" msgstr "Затворени сигнали" @@ -589,7 +530,7 @@ msgstr "Затворени сигнали" msgid "Closed:" msgstr "Затворени:" -#: templates/web/base/around/tabbed_lists.html:11 +#: templates/web/base/around/tabbed_lists.html:10 #: templates/web/base/around/tabbed_lists.html:12 msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "Други сигнали в близост <small>(within %skm)</small>" @@ -604,26 +545,26 @@ msgstr "Координати:" msgid "Cobrand" msgstr "Местна имплементция" -#: templates/web/base/admin/report_edit.html:75 +#: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:50 msgid "Cobrand data:" msgstr "Информация за местната имплементция:" -#: templates/web/base/admin/report_edit.html:74 +#: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:49 msgid "Cobrand:" msgstr "Местна имплементция" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Конфигурация" -#: templates/web/base/admin/category_edit.html:47 +#: templates/web/base/admin/category_edit.html:52 msgid "Configure Endpoint" msgstr "Задайте крайна точка" -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/body.html:72 msgid "Confirm" msgstr "Потвърждаване" @@ -644,10 +585,10 @@ msgstr "Потвърдете сигнала, въвеждайки имейла msgid "Confirmation" msgstr "Потвърждение" -#: templates/web/base/admin/body.html:158 -#: templates/web/base/admin/body.html:71 -#: templates/web/base/admin/category_edit.html:32 -#: templates/web/base/admin/category_edit.html:84 +#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/category_edit.html:37 +#: templates/web/base/admin/category_edit.html:89 #: templates/web/zurich/admin/stats.html:40 msgid "Confirmed" msgstr "Потвърдено" @@ -658,7 +599,7 @@ msgstr "Потвърдени сигнали между %s и %s" #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 -#: templates/web/base/admin/report_edit.html:70 +#: templates/web/base/admin/report_edit.html:83 msgid "Confirmed:" msgstr "Потвърдени:" @@ -675,13 +616,12 @@ msgid "Contact Us" msgstr "Връзка с нас" #: templates/web/base/contact/index.html:6 -#: templates/web/base/contact/submit.html:3 #: templates/web/fixmystreet/contact/index.html:20 msgid "Contact the team" msgstr "Връзка с тима" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1327 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1355 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1325 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1353 msgid "Could not find user" msgstr "Потребителят не е намерен" @@ -699,6 +639,10 @@ msgstr "Община" msgid "Council contacts for %s" msgstr "Контакти на общината за %s " +#: perllib/FixMyStreet/DB/Result/Problem.pm:670 +msgid "Council ref: %s" +msgstr "входящ номер в общината: %s" + #: templates/web/base/admin/stats.html:84 msgid "Council:" msgstr "Община:" @@ -714,7 +658,7 @@ msgstr "Брой" msgid "Create a report" msgstr "Подай сигнал" -#: templates/web/base/admin/body.html:200 +#: templates/web/base/admin/body.html:208 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Създай категория" @@ -726,7 +670,7 @@ msgid "Created" msgstr "Създаден" #: templates/web/base/admin/list_updates.html:38 -#: templates/web/base/admin/report_edit.html:69 +#: templates/web/base/admin/report_edit.html:82 #: templates/web/base/admin/update_edit.html:51 #: templates/web/zurich/admin/report_edit-sdm.html:47 #: templates/web/zurich/admin/report_edit.html:61 @@ -743,7 +687,7 @@ msgstr "Текущо състояние" msgid "Currently no bodies have been created." msgstr "В момента няма създадени Райони." -#: templates/web/base/dashboard/index.html:6 +#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 msgid "Dashboard" msgstr "Табло" @@ -753,14 +697,14 @@ msgid "Dealt with by subdivision within 5 working days" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:169 -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:37 -#: templates/web/base/admin/category_edit.html:85 +#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:81 +#: templates/web/base/admin/category_edit.html:42 +#: templates/web/base/admin/category_edit.html:90 msgid "Deleted" msgstr "Изтрит" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:43 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -780,7 +724,7 @@ msgstr "Информация" msgid "Details:" msgstr "Информация:" -#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/body.html:87 msgid "Devolved" msgstr "Прехвърлен" @@ -808,8 +752,8 @@ msgstr "Не знам" msgid "Don't like forms?" msgstr "Не обичате форми?" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:47 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:60 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:32 #: templates/web/fixmystreet/report/update-form.html:28 @@ -817,7 +761,7 @@ msgstr "Не обичате форми?" msgid "Duplicate" msgstr "Вече съществува" -#: templates/web/base/admin/body.html:98 +#: templates/web/base/admin/body.html:106 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" @@ -831,20 +775,20 @@ msgstr "" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 -#: templates/web/base/admin/users.html:31 +#: templates/web/base/admin/users.html:33 #: templates/web/zurich/admin/problem_row.html:42 msgid "Edit" msgstr "Редактиране" -#: templates/web/base/admin/body.html:212 +#: templates/web/base/admin/body.html:220 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "Редактиране на информацията за района" #: templates/web/base/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:2 +#: 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:2 +#: templates/web/zurich/admin/report_edit.html:1 #: templates/web/zurich/admin/report_edit.html:5 msgid "Editing problem %d" msgstr "Редактиране на сигнала %d " @@ -858,12 +802,12 @@ msgstr "Редактиране на актуализацията %d" msgid "Editing user %d" msgstr "Редактиране на потребителя %d" -#: templates/web/base/admin/category_edit.html:86 +#: templates/web/base/admin/category_edit.html:91 msgid "Editor" msgstr "Редактирано от" #: templates/web/base/admin/bodies.html:23 -#: templates/web/base/admin/category_edit.html:83 +#: templates/web/base/admin/category_edit.html:88 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 #: templates/web/fixmystreet/auth/general.html:21 @@ -874,15 +818,23 @@ msgstr "Редактирано от" msgid "Email" msgstr "Имейл" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1303 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1301 msgid "Email added to abuse list" msgstr "Имейлът е добавен в списъка със злоупотреби" -#: templates/web/base/admin/body.html:147 +#: templates/web/base/admin/body.html:155 msgid "Email address:" msgstr "Имейл адрес:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1300 +#: templates/web/base/tokens/confirm_alert.html:6 +msgid "Email alert created" +msgstr "" + +#: templates/web/base/tokens/confirm_alert.html:10 +msgid "Email alert deleted" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1298 msgid "Email already in abuse list" msgstr "Имейлът е в списъка със злоупотреби" @@ -894,8 +846,8 @@ msgstr "Съобщавай ми новите сигнали" msgid "Email me updates" msgstr "Съобщавай ми за промени" -#: templates/web/base/admin/category_edit.html:26 -#: templates/web/base/admin/report_edit.html:67 +#: templates/web/base/admin/category_edit.html:31 +#: templates/web/base/admin/report_edit.html:80 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 @@ -906,32 +858,32 @@ msgstr "Съобщавай ми за промени" msgid "Email:" msgstr "Имейл:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:322 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 msgid "Email: %s" msgstr "Имейл: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 msgid "Empty flat or maisonette" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:631 msgid "Empty house or bungalow" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:622 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty office or other commercial" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:623 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Empty pub or bar" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:624 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty public building - school, hospital, etc." msgstr "" -#: templates/web/base/admin/body-form.html:158 -#: templates/web/base/admin/body-form.html:159 +#: templates/web/base/admin/body-form.html:162 +#: templates/web/base/admin/body-form.html:163 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" @@ -939,8 +891,8 @@ msgid "" " <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>." msgstr "" -#: templates/web/base/admin/body-form.html:215 -#: templates/web/base/admin/body-form.html:216 +#: templates/web/base/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:223 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" @@ -951,11 +903,11 @@ msgstr "" msgid "End Date:" msgstr "Крайна дата:" -#: templates/web/base/admin/body-form.html:126 +#: templates/web/base/admin/body-form.html:130 msgid "Endpoint" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:72 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:73 msgid "Enter a Zürich street name" msgstr "" @@ -968,7 +920,9 @@ msgstr "" msgid "Enter a nearby postcode, or street name and area" msgstr "Въведете пощенски код или име на улица в близост до вас" +#: templates/web/base/around/postcode_form.html:1 #: templates/web/base/around/postcode_form.html:2 +#: templates/web/fixmystreet/around/postcode_form.html:10 #: templates/web/fixmystreet/around/postcode_form.html:11 msgid "Enter a nearby street name and area" msgstr "Въведете име на улица в близост до вас" @@ -978,7 +932,7 @@ msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "" #: templates/web/base/auth/general.html:64 -#: templates/web/base/report/new/fill_in_details_form.html:170 +#: templates/web/base/report/new/fill_in_details_form.html:151 #: templates/web/base/report/update-form.html:124 msgid "Enter a new password:" msgstr "Въведете нова парола:" @@ -990,7 +944,7 @@ msgstr "Въведете нова парола:" msgid "Enter a password" msgstr "Въведете парола" -#: templates/web/base/index-steps.html:33 +#: templates/web/base/index-steps.html:26 msgid "Enter details of the problem" msgstr "Въведете информация за проблема" @@ -1013,17 +967,22 @@ msgstr "Примерен пощенски адрес %s" msgid "Examples:" msgstr "Примери:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:47 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" -#: templates/web/base/admin/report_edit.html:76 +#: templates/web/base/admin/body-form.html:81 +msgid "External URL" +msgstr "" + +#: templates/web/base/admin/category_edit.html:27 +#: templates/web/base/admin/report_edit.html:92 msgid "Extra data:" msgstr "Допълнителни данни:" -#: templates/web/base/contact/submit.html:15 -msgid "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>." -msgstr "Неуспешно изпращане на съобщение. Моля опитайте по-късно или <a href=\"mailto:%s\">ни пишете</a>." +#: templates/web/base/contact/submit.html:13 +msgid "Failed to send message" +msgstr "" #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 @@ -1035,7 +994,7 @@ msgstr "Филтриране на списъка със сигнали" msgid "First time" msgstr "За първи път" -#: templates/web/base/admin/body.html:40 +#: templates/web/base/admin/body.html:48 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" @@ -1066,9 +1025,9 @@ msgid "" msgstr "" #: templates/web/base/admin/index.html:55 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:41 -#: templates/web/base/admin/report_edit.html:42 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:54 +#: templates/web/base/admin/report_edit.html:55 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/update-form.html:30 @@ -1079,17 +1038,18 @@ msgstr "" msgid "Fixed" msgstr "Поправено" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:43 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:56 msgid "Fixed - Council" msgstr "Поправени - община" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:42 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:55 msgid "Fixed - User" msgstr "Поправени - потребител" -#: templates/web/base/my/my.html:35 templates/web/fixmystreet/my/my.html:41 +#: templates/web/base/my/my.html:35 +#: templates/web/fixmystreet/my/_problem-list.html:7 msgid "Fixed reports" msgstr "Поправени сигнали" @@ -1097,7 +1057,7 @@ msgstr "Поправени сигнали" msgid "Fixed:" msgstr "Поправени:" -#: templates/web/base/admin/body-form.html:84 +#: templates/web/base/admin/body-form.html:89 #: templates/web/zurich/admin/body-form.html:36 msgid "Flag as deleted" msgstr "Означен като \"изтрит\"" @@ -1106,7 +1066,7 @@ msgstr "Означен като \"изтрит\"" msgid "Flag user" msgstr "Означаване на потребител" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Означен" @@ -1115,7 +1075,7 @@ msgstr "Означен" msgid "Flagged reports and users" msgstr "Означени сигнали и потребители" -#: templates/web/base/admin/user-form.html:45 +#: templates/web/base/admin/user-form.html:46 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page." msgstr "Означените потребители са изброени на страницата с <a href='%s'>означените</a>." @@ -1123,8 +1083,8 @@ msgstr "Означените потребители са изброени на msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." msgstr "Означените потребители нямат рестрикции. Това е списък с потребители, които са поставени под наблюдение." -#: templates/web/base/admin/report_edit.html:78 -#: templates/web/base/admin/user-form.html:51 +#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/user-form.html:52 msgid "Flagged:" msgstr "Означен:" @@ -1133,10 +1093,6 @@ msgstr "Означен:" msgid "Follow a ward link to view only reports within that ward." msgstr "Последвайте линка за района, за да видите сигнали само за този район." -#: templates/web/base/admin/report_edit.html:30 -msgid "For council(s):" -msgstr "За общината/ите:" - #: templates/web/base/admin/body-form.html:65 msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "За повече информацич вижте <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Как ПоправиСофия използва MapIt</a>." @@ -1149,8 +1105,6 @@ msgstr "Забравена парола?" #: templates/web/base/faq/faq-en-gb.html:1 #: templates/web/base/static/privacy.html:1 #: templates/web/base/static/privacy.html:2 -#: templates/web/fiksgatami/faq/faq-nb.html:1 -#: templates/web/fiksgatami/nn/faq/faq-nn.html:1 msgid "Frequently Asked Questions" msgstr "Често задавани въпроси" @@ -1163,13 +1117,13 @@ msgstr "" msgid "Get updates" msgstr "Изтегляне на актуализациите" -#: templates/web/fixmystreet/reports/_rss.html:4 +#: templates/web/fixmystreet/reports/_rss.html:3 #: templates/web/fixmystreet/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "Изтегляне на актуализациите на %s сигналите " #: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:4 +#: templates/web/fixmystreet/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "Изтегляне на актуализациите за сигналите в %s" @@ -1178,6 +1132,10 @@ msgstr "Изтегляне на актуализациите за сигнали msgid "Give me an RSS feed" msgstr "Изтегляне на RSS емисии" +#: templates/web/base/questionnaire/completed.html:14 +msgid "Glad to hear it’s been fixed!" +msgstr "" + #: templates/web/base/alert/index.html:34 #: templates/web/base/around/postcode_form.html:8 #: templates/web/fixmystreet/around/postcode_form.html:21 @@ -1185,7 +1143,7 @@ msgstr "Изтегляне на RSS емисии" msgid "Go" msgstr "Търси" -#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:93 msgid "Going to send questionnaire?" msgstr "Ще изпратите ли анкетата?" @@ -1209,9 +1167,7 @@ msgstr "" "Подавали ли сте сигнал за нередност към общината преди или сега \n" "подавате за първи път?" -#: templates/web/base/footer.html:15 templates/web/fiksgatami/footer.html:27 -#: templates/web/fiksgatami/nn/footer.html:27 -#: templates/web/fixmystreet/footer.html:30 +#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:30 #: templates/web/zurich/faq/faq-de-ch.html:1 #: templates/web/zurich/footer.html:21 #: templates/web/zurich/nav_over_content.html:8 @@ -1223,18 +1179,17 @@ msgstr "Помощ" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "Това са типовете известия за нови сигнали за ‘%s’." -#: templates/web/fiksgatami/header.html:48 -#: templates/web/fixmystreet/header.html:52 +#: templates/web/fixmystreet/header.html:58 #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "Здравей %s" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:50 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:63 +#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/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:86 #: templates/web/zurich/admin/report_edit.html:90 #: templates/web/zurich/admin/stats.html:32 @@ -1250,7 +1205,7 @@ msgstr "Скрий старите" msgid "Hide pins" msgstr "Скрий кабърчетата" -#: templates/web/base/admin/category_edit.html:79 +#: templates/web/base/admin/category_edit.html:84 msgid "History" msgstr "История" @@ -1266,19 +1221,25 @@ msgstr "Как да сигнализирате за проблем" msgid "How to send successful reports" msgstr "Как да подавате сигнали успешно" -#: perllib/FixMyStreet/App/Controller/Admin.pm:742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:740 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 "Вашият сигнал не беше намерен.\n" +#: templates/web/base/tokens/confirm_problem.html:23 +#: templates/web/base/tokens/confirm_problem.html:27 +msgid "I just reported a problem on @fixmystreet" +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." +#: templates/web/base/tokens/confirm_update.html:19 +#: templates/web/base/tokens/confirm_update.html:23 +msgid "I just updated a problem on @fixmystreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:260 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +msgid "I'm afraid we couldn't locate your problem in the database.\n" +msgstr "Вашият сигнал не беше намерен.\n" + +#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 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 "" @@ -1300,7 +1261,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:125 +#: templates/web/base/admin/body.html:133 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." @@ -1318,7 +1279,12 @@ msgstr "В противен случай, вашият проблем няма msgid "If you do not, your update will not be posted." msgstr "В противен случай, вашата актуализация няма да бъде публикувана." -#: templates/web/base/report/new/councils_text_none.html:9 +#: templates/web/base/questionnaire/completed.html:8 +msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." +msgstr "" + +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:8 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 "Ако сигнализирате за проблем тук, той ще бъде достъпен публично, но сигналът <strong>няма</strong> да бъде изпратен към общината." @@ -1336,34 +1302,34 @@ msgstr "" "Ако желаете да коментирате публично проблема, моля направете го тук \n" "(моля имайте предвид, че тази информация няма да бъде изпратена на общината)." -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/body.html:149 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/base/admin/body-form.html:200 -#: templates/web/base/admin/body-form.html:201 +#: templates/web/base/admin/body-form.html:207 +#: templates/web/base/admin/body-form.html:208 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable <strong>extended Open311 stauses</strong> if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/body-form.html:187 -#: templates/web/base/admin/body-form.html:188 +#: templates/web/base/admin/body-form.html:194 +#: templates/web/base/admin/body-form.html:195 msgid "" "If you've enabled Open311 update-sending above, enable <strong>suppression of alerts</strong> \n" " if you do <strong>not</strong> want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/body-form.html:173 -#: templates/web/base/admin/body-form.html:174 +#: templates/web/base/admin/body-form.html:177 +#: templates/web/base/admin/body-form.html:178 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:127 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 msgid "Illegal ID" msgstr "Несъществуващ номер" @@ -1388,17 +1354,21 @@ 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:143 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:38 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:144 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 #: templates/web/fixmystreet/report/banner.html:19 -#: templates/web/zurich/admin/header.html:2 +#: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 #: templates/web/zurich/admin/report_edit.html:99 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "В процес на обработка" +#: templates/web/base/tokens/confirm_alert.html:11 +msgid "Inbox zero, here we come!" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:160 msgid "Include reporter personal details" msgstr "" @@ -1407,7 +1377,7 @@ msgstr "" msgid "Include unconfirmed reports" msgstr "Включи непотвърдените сигнали" -#: perllib/FixMyStreet/App/Controller/Open311.pm:354 +#: perllib/FixMyStreet/App/Controller/Open311.pm:359 msgid "Incorrect has_photo value \"%s\"" msgstr "" @@ -1415,29 +1385,29 @@ msgstr "" msgid "Internal notes" msgstr "Вътрешни бележки" -#: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:61 msgid "Internal referral" msgstr "Вътрешен номер" -#: perllib/FixMyStreet/App/Controller/Open311.pm:339 +#: perllib/FixMyStreet/App/Controller/Open311.pm:344 msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1114 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1112 msgid "Invalid end date" msgstr "Невярна дата" -#: perllib/FixMyStreet/App/Controller/Open311.pm:432 +#: perllib/FixMyStreet/App/Controller/Open311.pm:437 msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1110 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 msgid "Invalid start date" msgstr "Невярна дата" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:37 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:50 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 #: templates/web/base/report/update-form.html:30 @@ -1451,8 +1421,12 @@ msgstr "Сигналът се разглежда" msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "Моля проверете <a href=\"%s\">страницата с често задавани въпроси</a> и вижте дали няма да намерите отговор там." +#: templates/web/base/tokens/confirm_problem.html:14 +msgid "It’s on its way to the council right now." +msgstr "" + #: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:150 +#: templates/web/base/report/new/fill_in_details_form.html:131 #: templates/web/base/report/update-form.html:104 #: templates/web/fixmystreet/auth/general.html:47 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 @@ -1461,12 +1435,12 @@ msgstr "Моля проверете <a href=\"%s\">страницата с че msgid "Keep me signed in on this computer" msgstr "Запомни ме" -#: templates/web/base/admin/body.html:62 +#: templates/web/base/admin/body.html:70 #: templates/web/zurich/admin/body.html:16 msgid "Last editor" msgstr "Последно редактирано от" -#: templates/web/base/admin/report_edit.html:72 +#: templates/web/base/admin/report_edit.html:88 msgid "Last update:" msgstr "Последно обновено:" @@ -1474,43 +1448,38 @@ msgstr "Последно обновено:" msgid "Last update:" msgstr "Последно обновено:" -#: templates/web/base/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:229 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "" -#: templates/web/base/admin/body.html:17 templates/web/base/admin/body.html:19 +#: templates/web/base/admin/body.html:27 msgid "List all reported problems" msgstr "Показване на всички сигнали" -#: templates/web/base/report/new/fill_in_details_form.html:69 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:54 -#: templates/web/zurich/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/category_wrapper.html:4 msgid "Loading..." msgstr "Зареждане..." #: templates/web/base/alert/choose.html:1 #: templates/web/base/alert/choose.html:3 #: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3 -#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:5 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5 #: templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 -#: templates/web/base/tokens/confirm_alert.html:4 #: templates/web/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "RSS и имейл известия за сигнали" -#: templates/web/base/alert/list.html:13 templates/web/base/alert/list.html:14 -#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:3 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:12 +#: templates/web/base/alert/list.html:14 templates/web/base/alert/list.html:3 msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "RSS и имейл известия за сигнали за ‘%s’" -#: templates/web/base/footer.html:13 templates/web/fiksgatami/footer.html:25 -#: templates/web/fiksgatami/nn/footer.html:25 -#: templates/web/fixmystreet/footer.html:28 +#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:28 msgid "Local alerts" msgstr "Известия" -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:25 msgid "Locate the problem on a map of the area" msgstr "Локализирайте проблема на картата" @@ -1519,17 +1488,27 @@ msgid "MAP" msgstr "Карта" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" msgstr "" -#: perllib/FixMyStreet/Map/OSM.pm:42 -msgid "Map © <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/base/admin/report_edit.html:86 +#, fuzzy +msgid "Mark as sent" +msgstr "маркиран като \"затворен\"" -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/user-form.html:44 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." msgstr "Маркирайте потребители, които бихте искали да държите под око." +#: templates/web/base/reports/index.html:24 +msgid "Marked fixed/closed in the past eight weeks" +msgstr "" + +#: templates/web/base/reports/index.html:25 +msgid "Marked fixed/closed more than eight weeks ago" +msgstr "" + #: templates/web/fixmystreet/contact/index.html:106 msgid "Message" msgstr "Съобщение" @@ -1538,7 +1517,7 @@ msgstr "Съобщение" msgid "Message:" msgstr "Съобщение:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:440 +#: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" msgstr "Липсващо jurisdiction_id" @@ -1568,11 +1547,11 @@ msgstr "Още сигнали наоколо" #: templates/web/fixmystreet/report/update-form.html:138 #: 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:94 +#: templates/web/zurich/report/new/fill_in_details_form.html:77 msgid "Name" msgstr "Име" -#: templates/web/base/admin/report_edit.html:66 +#: templates/web/base/admin/report_edit.html:79 #: templates/web/base/admin/update_edit.html:32 #: templates/web/base/admin/user-form.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:43 @@ -1581,25 +1560,25 @@ msgstr "Име" msgid "Name:" msgstr "Име:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:321 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:313 msgid "Name: %s" msgstr "Име: %s" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:186 -#: perllib/FixMyStreet/Geocode/OSM.pm:164 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 +#: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:137 +#: perllib/FixMyStreet/Cobrand/UK.pm:127 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 +#: perllib/FixMyStreet/Cobrand/Default.pm:442 +#: perllib/FixMyStreet/Cobrand/Default.pm:482 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:277 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1613,11 +1592,11 @@ msgstr "Моля проверете имейл адреса" msgid "New <br>problems" msgstr "Нови <br>сигнали" -#: perllib/FixMyStreet/App/Controller/Admin.pm:264 +#: perllib/FixMyStreet/App/Controller/Admin.pm:261 msgid "New body added" msgstr "Районът е добавен" -#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:379 msgid "New category contact added" msgstr "Категорията е добавена" @@ -1690,15 +1669,15 @@ msgstr "Нова актуализация" msgid "Next" msgstr "Слеващ" -#: templates/web/base/admin/body.html:72 templates/web/base/admin/body.html:74 -#: templates/web/base/admin/body.html:78 templates/web/base/admin/body.html:80 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:93 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:44 @@ -1716,7 +1695,7 @@ msgstr "Несъществуващ район" msgid "No council" msgstr "Несъществуваща община" -#: perllib/FixMyStreet/DB/Result/Problem.pm:376 +#: perllib/FixMyStreet/DB/Result/Problem.pm:401 msgid "No council selected" msgstr "Не е избрана община" @@ -1757,12 +1736,12 @@ msgid "" " your config file is not pointing to a live MapIt service." msgstr "" -#: templates/web/base/report/_support.html:3 +#: templates/web/base/report/_support.html:2 #: templates/web/base/report/_support.html:4 msgid "No supporters" msgstr "" -#: templates/web/base/admin/report_edit.html:30 +#: templates/web/base/admin/report_edit.html:41 #: templates/web/zurich/admin/report_edit-sdm.html:46 #: templates/web/zurich/admin/report_edit.html:60 msgid "None" @@ -1777,8 +1756,8 @@ msgid "" " activity across their body), the ability to hide reports or set special report statuses." msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:46 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -1794,12 +1773,12 @@ msgstr "" msgid "Not reported before" msgstr "Не съм подавал преди" -#: templates/web/base/report/_main.html:61 +#: templates/web/base/report/_main.html:62 msgid "Not reported to council" msgstr "Съгналът не е подаден към общината" -#: templates/web/base/admin/body.html:63 -#: templates/web/base/admin/category_edit.html:87 +#: templates/web/base/admin/body.html:71 +#: templates/web/base/admin/category_edit.html:92 #: templates/web/zurich/admin/body.html:17 msgid "Note" msgstr "Бележка" @@ -1808,8 +1787,8 @@ msgstr "Бележка" 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/base/admin/body.html:178 -#: templates/web/base/admin/category_edit.html:44 +#: templates/web/base/admin/body.html:186 +#: templates/web/base/admin/category_edit.html:49 #: templates/web/zurich/admin/body.html:53 msgid "Note:" msgstr "Бележка:" @@ -1822,7 +1801,7 @@ msgstr "Бележка: <strong>%s</strong>" msgid "Now to submit your report…" msgstr "Сега да изпратим Вашия сигнал…" -#: templates/web/base/report/new/fill_in_details_form.html:132 +#: templates/web/base/report/new/fill_in_details_form.html:113 msgid "Now to submit your report… do you have a FixMyStreet password?" msgstr "Сега да изпратим Вашия сигнал… имате ли парола за ПоправиСофия?" @@ -1839,7 +1818,7 @@ msgid "OK" msgstr "ОК" #: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:16 +#: templates/web/base/report/update.html:17 msgid "Offensive? Unsuitable? Tell us" msgstr "Обиден? Неподходящ? Кажете ни" @@ -1859,19 +1838,19 @@ msgstr "Поправени преди<br>известно време" msgid "Older <br>problems" msgstr "Стари <br>сигнали" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:37 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 msgid "One-line summary" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:137 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:36 -#: templates/web/base/admin/report_edit.html:37 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:138 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:49 +#: templates/web/base/admin/report_edit.html:50 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/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:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/report_edit.html:86 #: templates/web/zurich/admin/report_edit.html:88 @@ -1880,10 +1859,19 @@ msgstr "" msgid "Open" msgstr "Отворен" -#: templates/web/base/my/my.html:30 templates/web/fixmystreet/my/my.html:36 +#: templates/web/base/reports/index.html:22 +msgid "Open for more than four weeks, with an update within the past eight weeks" +msgstr "" + +#: templates/web/base/my/my.html:30 +#: templates/web/fixmystreet/my/_problem-list.html:2 msgid "Open reports" msgstr "Отворени сигнали" +#: templates/web/base/reports/index.html:23 +msgid "Open, but not had any update in eight weeks" +msgstr "" + #: templates/web/base/open311/index.html:70 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "" @@ -1906,15 +1894,15 @@ msgstr "" msgid "Or you can subscribe to an alert based upon what ward or council you’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:560 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 -#: perllib/FixMyStreet/DB/Result/Problem.pm:592 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:372 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 +#: perllib/FixMyStreet/DB/Result/Problem.pm:597 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:393 msgid "Other" msgstr "Други" @@ -1936,8 +1924,8 @@ msgstr "Страницата не е намерена" msgid "Parent" msgstr "Община" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 msgid "Partial" msgstr "Частичен" @@ -1957,7 +1945,7 @@ msgstr "Парола:" msgid "Permalink" msgstr "Връзка" -#: templates/web/zurich/report/new/fill_in_details_form.html:100 +#: templates/web/zurich/report/new/fill_in_details_form.html:83 msgid "Phone number" msgstr "Телефонен номер" @@ -1966,27 +1954,27 @@ msgstr "Телефонен номер" msgid "Phone number (optional)" msgstr "Телефонен номер (незадължително)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:286 -#: templates/web/base/admin/report_edit.html:68 -#: templates/web/base/report/new/fill_in_details_form.html:216 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:291 +#: templates/web/base/admin/report_edit.html:81 +#: templates/web/base/report/new/fill_in_details_form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:46 #: templates/web/zurich/admin/report_edit.html:60 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Телефон:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:72 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 #: 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 +#: templates/web/zurich/report/new/fill_in_details_form.html:51 msgid "Photo" msgstr "Снимка" #: templates/web/base/questionnaire/index.html:71 -#: templates/web/base/report/new/fill_in_details_form.html:103 +#: templates/web/base/report/new/fill_in_details_form.html:84 #: templates/web/base/report/update-form.html:62 #: templates/web/fixmystreet/questionnaire/index.html:91 msgid "Photo:" @@ -2000,11 +1988,11 @@ msgstr "Снимки на скоро подадени сигнали" msgid "Place pin on map" msgstr "Поставете кабърче върху картата" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:38 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/zurich/admin/header.html:2 +#: 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:86 @@ -2038,20 +2026,19 @@ msgstr "Моля проверете имейл адреса" msgid "Please check your email address is correct" msgstr "Моля проверете дали сте въвели коректен имейл адрес" -#: perllib/FixMyStreet/App/Controller/Admin.pm:349 -#: 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:395 +#: perllib/FixMyStreet/App/Controller/Admin.pm:343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:876 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 +#: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" msgstr "Моля изберете категория" -#: perllib/FixMyStreet/DB/Result/Problem.pm:401 +#: perllib/FixMyStreet/DB/Result/Problem.pm:418 msgid "Please choose a property type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:370 msgid "Please correct the errors below" msgstr "" @@ -2071,8 +2058,8 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "Моля не обиждайте никого - обиждайки Общината, Вие обезценявате услугата за всички потребители." -#: perllib/FixMyStreet/App/Controller/Admin.pm:352 -#: perllib/FixMyStreet/DB/Result/Comment.pm:133 +#: perllib/FixMyStreet/App/Controller/Admin.pm:346 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "Моля въведете съобщение" @@ -2083,15 +2070,15 @@ msgstr "Моля въведете съобщение" msgid "Please enter a password" msgstr "Моля въведете парола" -#: perllib/FixMyStreet/App/Controller/Contact.pm:108 -#: perllib/FixMyStreet/DB/Result/Problem.pm:370 +#: perllib/FixMyStreet/App/Controller/Contact.pm:113 +#: perllib/FixMyStreet/DB/Result/Problem.pm:395 #: templates/web/base/js/translation_strings.html:3 msgid "Please enter a subject" msgstr "Моля въведете тема" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1050 -#: perllib/FixMyStreet/App/Controller/Admin.pm:351 -#: perllib/FixMyStreet/App/Controller/Admin.pm:997 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin.pm:995 #: perllib/FixMyStreet/DB/Result/User.pm:127 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 @@ -2099,16 +2086,16 @@ msgid "Please enter a valid email" msgstr "Моля въведете валиден имейл" #: perllib/FixMyStreet/App/Controller/Alert.pm:346 -#: perllib/FixMyStreet/App/Controller/Contact.pm:118 +#: perllib/FixMyStreet/App/Controller/Contact.pm:123 msgid "Please enter a valid email address" msgstr "Моля въведете валиден имейл адрес" -#: perllib/FixMyStreet/DB/Result/Problem.pm:373 +#: perllib/FixMyStreet/DB/Result/Problem.pm:398 #: templates/web/base/js/translation_strings.html:4 msgid "Please enter some details" msgstr "Моля въведете информация" -#: perllib/FixMyStreet/App/Controller/Contact.pm:107 +#: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/User.pm:124 #: templates/web/base/auth/general.html:13 #: templates/web/base/auth/general.html:8 @@ -2122,7 +2109,7 @@ msgid "Please enter your email" msgstr "Моля въведете имейл" #: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:75 msgid "Please enter your email address" msgstr "Моля въведете имейл адрес" @@ -2130,14 +2117,14 @@ msgstr "Моля въведете имейл адрес" msgid "Please enter your first name" msgstr "Моля въведете име" -#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: perllib/FixMyStreet/Cobrand/UK.pm:318 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Моля въведете цялото си име, общината се нуждае от тази информация - ако не желаете името Ви да се появява на сайта, моля махнете отметката по-долу" -#: perllib/FixMyStreet/App/Controller/Contact.pm:106 -#: perllib/FixMyStreet/DB/Result/Comment.pm:130 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Contact.pm:111 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 +#: perllib/FixMyStreet/DB/Result/Problem.pm:406 #: perllib/FixMyStreet/DB/Result/User.pm:120 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" @@ -2160,7 +2147,7 @@ msgstr "Моля въведете обръщение" msgid "Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a href=\"/\">front page</a>." msgstr "Можете да <a href=\"%s\">влезете отново</a> или да се върнете <a href=\"/\">в началото</a>." -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:8 msgid "Please fill in details of the problem below." msgstr "Моля попълнете информация за проблема." @@ -2175,7 +2162,7 @@ msgstr "Моля попълнете информация за проблема." msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "Моля попълнете формата с информация за проблема и опишете местоположението възможно най-точно." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:251 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Моля отбележете дали бихте искали да участвате в друга анкета" @@ -2198,16 +2185,16 @@ msgstr "" msgid "Please note:" msgstr "Забележка:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:246 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:254 msgid "Please provide some explanation as to why you're reopening this report" msgstr "Моля въведете информация защо отваряте сигнала отново." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:261 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 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:247 msgid "Please say whether you've ever reported a problem to your council before" msgstr "Моля отговорете дали някога сте подавали сигнал към общината преди." @@ -2219,7 +2206,7 @@ msgstr "Моля изберете начин на известяване" msgid "Please select the type of alert you want" msgstr "Моля изберете тип известия, които бихте искали да получаваме" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please state whether or not the problem has been fixed" msgstr "Моля посочете дали проблемът е бил разрешен или не" @@ -2227,15 +2214,13 @@ msgstr "Моля посочете дали проблемът е бил разр msgid "Please take a look at the updates that have been left." msgstr "Моля погледнете актуализациите." -#: perllib/FixMyStreet/App/Controller/Photo.pm:176 +#: perllib/FixMyStreet/App/Controller/Photo.pm:177 +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 +#: perllib/FixMyStreet/App/Controller/Photo.pm:189 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 "Моля качвайте само JPEG изображения\n" - -#: perllib/FixMyStreet/App/Controller/Contact.pm:109 +#: perllib/FixMyStreet/App/Controller/Contact.pm:114 msgid "Please write a message" msgstr "Моля въведете съобщение" @@ -2274,14 +2259,14 @@ msgstr "Предишно" msgid "Privacy" msgstr "" -#: templates/web/base/admin/body.html:194 -#: templates/web/base/admin/body.html:77 -#: templates/web/base/admin/category_edit.html:40 -#: templates/web/base/admin/report_edit.html:79 +#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:85 +#: templates/web/base/admin/category_edit.html:45 +#: templates/web/base/admin/report_edit.html:95 msgid "Private" msgstr "Лично" -#: templates/web/base/maps/openlayers.html:86 +#: templates/web/base/maps/openlayers.html:89 msgid "Problem" msgstr "Сигнал" @@ -2302,7 +2287,7 @@ msgstr "Сигналът %s е подаден към общината %s " msgid "Problem breakdown by state" msgstr "Разделяне на сигналите по статуси" -#: perllib/FixMyStreet/App/Controller/Admin.pm:968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:966 msgid "Problem marked as open." msgstr "Сигналът е маркиран като отворен." @@ -2337,16 +2322,15 @@ msgstr "Проблеми сигнализирани скоро в сайта" msgid "Problems within %.1fkm of this location" msgstr "Сигнали в радиус от %.1fкм от това местоположение" -#: perllib/FixMyStreet/Cobrand/Default.pm:629 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:114 +#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:151 -#: perllib/FixMyStreet/Cobrand/UK.pm:217 +#: perllib/FixMyStreet/Cobrand/UK.pm:207 msgid "Problems within %s" msgstr "Сигнали в %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:122 -#: perllib/FixMyStreet/Cobrand/UK.pm:231 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "Problems within %s ward" msgstr "Сигнали в квартал %s" @@ -2364,7 +2348,7 @@ msgstr "Сигнали в границите на:" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "" -#: templates/web/base/admin/report_edit.html:32 +#: templates/web/base/admin/report_edit.html:45 msgid "Property address:" msgstr "Адрес на имота:" @@ -2381,7 +2365,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/base/report/new/fill_in_details_form.html:174 +#: templates/web/base/report/new/fill_in_details_form.html:155 #: templates/web/base/report/update-form.html:128 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 #: templates/web/fixmystreet/report/update-form.html:119 @@ -2402,7 +2386,7 @@ msgstr "Публикувай снимка" msgid "Publish the response" msgstr "Публикувай отговора" -#: templates/web/base/questionnaire/completed.html:2 +#: templates/web/base/questionnaire/completed.html:1 #: templates/web/base/questionnaire/index.html:0 #: templates/web/base/questionnaire/index.html:14 #: templates/web/base/questionnaire/index.html:4 @@ -2421,11 +2405,12 @@ msgstr "Анкетата %d е попълнена за проблем %d, %s д msgid "Questionnaire %d sent for problem %d" msgstr "Анкетата %d за проблем %d е изпратена" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 msgid "Questionnaire filled in by problem reporter" msgstr "Анкетата е попълнена от потребителя, подал сигнала" #: templates/web/base/alert/_list.html:21 +#: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display.html:50 #: templates/web/base/reports/_rss.html:1 @@ -2435,11 +2420,11 @@ msgstr "Анкетата е попълнена от потребителя, по msgid "RSS feed" msgstr "RSS абонамент" -#: perllib/FixMyStreet/Cobrand/UK.pm:260 perllib/FixMyStreet/Cobrand/UK.pm:272 +#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 msgid "RSS feed for %s" msgstr "RSS абонамент за %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "RSS feed for %s ward, %s" msgstr "RSS абонамент за квартал %s, %s" @@ -2447,15 +2432,11 @@ msgstr "RSS абонамент за квартал %s, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:167 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:175 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:185 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:193 -#: perllib/FixMyStreet/Cobrand/UK.pm:286 perllib/FixMyStreet/Cobrand/UK.pm:298 +#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 msgid "RSS feed of %s" msgstr "RSS абонамент за %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 msgid "RSS feed of %s, within %s ward" msgstr "RSS абонамент за %s, в квартал %s" @@ -2468,20 +2449,19 @@ msgstr "RSS абонамент за последни проблеми наоко msgid "RSS feed of problems in this %s" msgstr "RSS абонамент за проблеми в този %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:630 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:115 +#: perllib/FixMyStreet/Cobrand/Default.pm:651 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:150 -#: perllib/FixMyStreet/Cobrand/UK.pm:224 +#: perllib/FixMyStreet/Cobrand/UK.pm:214 msgid "RSS feed of problems within %s" msgstr "RSS абонамент за проблеми в %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 -#: perllib/FixMyStreet/Cobrand/UK.pm:230 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s ward" msgstr "RSS абонамент за проблеми в квартал %s" -#: templates/web/base/around/display_location.html:3 +#: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:4 msgid "RSS feed of recent local problems" msgstr "RSS абонамент за последни проблеми наоколо" @@ -2521,15 +2501,18 @@ msgstr "Помнете, че \"ПоправиСофия\" служи за под msgid "Remove flag" msgstr "Премахване на означението" -#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/report_edit.html:110 #: templates/web/base/admin/update_edit.html:62 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Премахване на снимката (необратимо действие)" -#: templates/web/base/footer.html:7 templates/web/fiksgatami/footer.html:19 -#: templates/web/fiksgatami/nn/footer.html:19 -#: templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 +msgid "Report" +msgstr "" + +#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 #: templates/web/zurich/footer.html:17 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2539,11 +2522,6 @@ msgstr "Подайте сигнал" msgid "Report abuse" msgstr "Сигнализирай за неподходящо съдържание" -#: templates/web/base/report_created.html:1 -#: templates/web/base/report_created.html:3 -msgid "Report created" -msgstr "Сигналът е подаден" - #: perllib/FixMyStreet/App/Controller/Rss.pm:295 msgid "Report on %s" msgstr "Сигнал за %s " @@ -2567,7 +2545,7 @@ msgstr "" msgid "Reported %s, to %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:580 #: templates/web/base/contact/index.html:50 #: templates/web/fixmystreet/contact/index.html:65 msgid "Reported anonymously at %s" @@ -2579,7 +2557,7 @@ msgstr "" msgid "Reported before" msgstr "Подавал съм и преди" -#: perllib/FixMyStreet/DB/Result/Problem.pm:598 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 #: templates/web/base/contact/index.html:52 #: templates/web/fixmystreet/contact/index.html:67 msgid "Reported by %s at %s" @@ -2589,31 +2567,36 @@ msgstr "" msgid "Reported in the %s category" msgstr "Сигналът е подаден в категория %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:571 +#: perllib/FixMyStreet/DB/Result/Problem.pm:576 msgid "Reported in the %s category anonymously at %s" msgstr "Сигналът е подаден анонимно в категория %s в %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:598 msgid "Reported in the %s category by %s at %s" msgstr "Сигналът е подаден в категория %s от %s в %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:567 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:589 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:563 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Сигналът е подаден анонимно чрез %s в категория %s в %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:583 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 msgid "Reported via %s in the %s category by %s at %s" msgstr "Сигналът е подаден чрез %s в категория %s от %s в %s" -#: templates/web/base/around/around_index.html:2 +#: templates/web/base/reports/index.html:21 +#, fuzzy +msgid "Reported within the last four weeks" +msgstr "Сигналът е подаден в категория %s " + +#: templates/web/base/around/around_index.html:1 #: templates/web/base/around/around_index.html:3 #: templates/web/base/js/translation_strings.html:41 #: templates/web/base/report/new/fill_in_details.html:0 @@ -2623,14 +2606,13 @@ msgstr "Сигналът е подаден чрез %s в категория %s msgid "Reporting a problem" msgstr "Сигнализиране за проблем" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:294 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "Сигнали" -#: perllib/FixMyStreet/DB/Result/Problem.pm:409 -#: perllib/FixMyStreet/DB/Result/Problem.pm:413 +#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" @@ -2646,7 +2628,7 @@ msgstr "Сигнали означени върху картата" msgid "Reports published" msgstr "Публикувани сигнали" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:85 msgid "Resend report" msgstr "Препращане на сигнал" @@ -2654,36 +2636,35 @@ msgstr "Препращане на сигнал" msgid "Right place?" msgstr "Правилното място ли е това?" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:193 -#: perllib/FixMyStreet/Geocode/OSM.pm:171 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:167 +#: perllib/FixMyStreet/Geocode/OSM.pm:152 msgid "Road operator for this named road (derived from road reference number and type): %s" msgstr "" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:190 -#: perllib/FixMyStreet/Geocode/OSM.pm:168 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:164 +#: perllib/FixMyStreet/Geocode/OSM.pm:149 msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1394 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 -#: templates/web/base/admin/report_edit.html:90 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1403 +#: templates/web/base/admin/report_edit.html:106 #: templates/web/zurich/admin/report_edit.html:73 msgid "Rotate Left" msgstr "Завъртане наляво" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1394 -#: templates/web/base/admin/report_edit.html:91 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: templates/web/base/admin/report_edit.html:107 #: templates/web/zurich/admin/report_edit.html:74 msgid "Rotate Right" msgstr "Завъртане надясно" #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:200 -#: templates/web/base/admin/category_edit.html:76 +#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/category_edit.html:81 #: templates/web/zurich/admin/body.html:59 msgid "Save changes" msgstr "Запази промените" @@ -2711,7 +2692,7 @@ msgstr "Търсене:" msgid "Searching found no reports." msgstr "Не са намерени сигнали." -#: templates/web/base/admin/users.html:39 +#: templates/web/base/admin/users.html:41 msgid "Searching found no users." msgstr "Не са намерени потребители." @@ -2734,15 +2715,15 @@ 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 "Изберете кой тип известия бихте искали да получавате и щракнете бутона за RSS емисии или въведете имейл адрес, за да се абонирате за имейл известия." -#: perllib/FixMyStreet/DB/Result/Problem.pm:680 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "Sent to %s %s later" msgstr "Сигналът е подаден към %s преди %s" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:84 msgid "Sent:" msgstr "Изпратени:" -#: templates/web/base/admin/report_edit.html:73 +#: templates/web/base/admin/report_edit.html:89 #: templates/web/zurich/admin/stats.html:45 msgid "Service:" msgstr "Услуга:" @@ -2751,7 +2732,7 @@ msgstr "Услуга:" msgid "Share" msgstr "Сподели" -#: templates/web/base/report/new/fill_in_details_form.html:211 +#: templates/web/base/report/new/fill_in_details_form.html:192 #: templates/web/base/report/update-form.html:157 #: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 @@ -2796,12 +2777,12 @@ msgstr "Изход" msgid "Signed in as %s" msgstr "Вход като %s" -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 msgid "Some categories may require additional information." msgstr "Някои категории може да се нуждаят от допълнителна информация." -#: templates/web/base/admin/body-form.html:145 -#: templates/web/base/admin/body-form.html:146 +#: templates/web/base/admin/body-form.html:149 +#: templates/web/base/admin/body-form.html:150 msgid "" "Some endpoints require an <strong>API key</strong> to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -2812,11 +2793,11 @@ msgid "Some photos of recent reports" msgstr "Някои снимки от сигнали подадени наскоро" #: perllib/FixMyStreet/App/View/Email.pm:32 -#: perllib/FixMyStreet/App/View/Web.pm:44 +#: perllib/FixMyStreet/App/View/Web.pm:43 msgid "Some text to localize" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:88 +#: perllib/FixMyStreet/Cobrand/UK.pm:78 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -2824,17 +2805,16 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:215 -#: perllib/FixMyStreet/Geocode.pm:26 perllib/FixMyStreet/Geocode/Bing.pm:56 -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:73 -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:93 -#: perllib/FixMyStreet/Geocode/Google.pm:72 -#: perllib/FixMyStreet/Geocode/OSM.pm:64 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:214 +#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 +#: perllib/FixMyStreet/Geocode/Google.pm:47 +#: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "" -#: perllib/FixMyStreet/Geocode/Bing.pm:51 -#: perllib/FixMyStreet/Geocode/Google.pm:67 +#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: perllib/FixMyStreet/Geocode/Google.pm:44 #: perllib/FixMyStreet/Geocode/Zurich.pm:87 msgid "Sorry, we could not parse that location. Please try again." msgstr "" @@ -2843,7 +2823,7 @@ msgstr "" msgid "Start Date:" msgstr "Начална дата:" -#: templates/web/base/admin/body.html:61 +#: templates/web/base/admin/body.html:69 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 @@ -2851,7 +2831,7 @@ msgstr "Начална дата:" msgid "State" msgstr "" -#: templates/web/base/admin/report_edit.html:34 +#: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 #: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:53 @@ -2860,8 +2840,8 @@ msgstr "" msgid "State:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1200 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:304 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:308 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" @@ -2877,7 +2857,7 @@ msgstr "Статус" msgid "Still open, via questionnaire, %s" msgstr "Все още отворен, от анкета, %s " -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:381 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 msgid "Subcategory: %s" msgstr "" @@ -2897,19 +2877,19 @@ msgid "Subject:" msgstr "Тема:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:115 -#: templates/web/base/report/new/fill_in_details_form.html:155 -#: templates/web/base/report/new/fill_in_details_form.html:177 +#: templates/web/base/report/new/fill_in_details_form.html:136 +#: templates/web/base/report/new/fill_in_details_form.html:158 +#: templates/web/base/report/new/fill_in_details_form.html:96 #: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 -#: templates/web/zurich/report/new/fill_in_details_form.html:108 +#: templates/web/zurich/report/new/fill_in_details_form.html:91 msgid "Submit" msgstr "Изпращане" -#: templates/web/base/admin/report_edit.html:97 +#: templates/web/base/admin/report_edit.html:113 #: templates/web/base/admin/update_edit.html:65 -#: templates/web/base/admin/user-form.html:55 +#: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:64 #: templates/web/zurich/admin/report_edit.html:221 #: templates/web/zurich/admin/update_edit.html:38 @@ -2921,8 +2901,8 @@ msgstr "Изпращане на промените" msgid "Submit questionnaire" msgstr "Изпращане на анкетата" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:133 -#: templates/web/zurich/admin/header.html:2 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:134 +#: 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 @@ -2946,8 +2926,8 @@ msgstr "Абониране" msgid "Subscribe me to an email alert" msgstr "Абониране за известяване по имейл" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1191 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:293 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 #: templates/web/zurich/admin/index-dm.html:1 @@ -2963,7 +2943,7 @@ msgstr "Обобщение" msgid "Summary reports" msgstr "Обобщена справка" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 msgid "Survey" msgstr "Проучване" @@ -2977,7 +2957,7 @@ msgstr "Резултати от проучване" msgid "Text" msgstr "Текст" -#: templates/web/base/admin/body.html:21 +#: templates/web/base/admin/body.html:28 msgid "Text only version" msgstr "Версия само с текст" @@ -2986,49 +2966,55 @@ msgstr "Версия само с текст" msgid "Text:" msgstr "Текст:" -#: templates/web/base/tokens/confirm_update.html:9 -msgid "Thank you — you can <a href=\"%s\">view your updated problem</a> on the site." -msgstr "Благодарим Ви — можете да <a href=\"%s\">видите актуализирания сигнал</a> на сайта." - -#: templates/web/base/tokens/confirm_problem.html:18 -msgid "Thank you for reporting this issue" +#: templates/web/base/tokens/confirm_problem.html:12 +msgid "Thank you for reporting this issue!" msgstr "" #: templates/web/base/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/base/tokens/confirm_update.html:15 +msgid "Thank you for updating this issue!" +msgstr "" + +#: templates/web/base/contact/submit.html:6 +#: templates/web/base/questionnaire/completed.html:5 +msgid "Thank you for your feedback" +msgstr "" + #: templates/web/fixmystreet/around/around_index.html:28 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 :" msgstr "Благодаря за предоставената снимка. Тъй като се нуждаем от местоложението на вашия проблем, моля въведете адрес наблизо в полето по-горе :" -#: templates/web/base/contact/submit.html:8 -msgid "Thanks for your feedback. We'll get back to you as soon as we can!" -msgstr "Благодарим ви за обратната връзка. Ще се свържем с вас при първа възможност!" - #: templates/web/base/questionnaire/creator_fixed.html:9 msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "Благодаря! Радваме се, че този проблем е бил разрешен! Бихме искли да Ви питаме подавали ли сте сигнали към общината и преди?" -#: perllib/FixMyStreet/App/Controller/Photo.pm:190 +#: perllib/FixMyStreet/App/Controller/Photo.pm:195 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Прикачването на изображение е неуспешно (%s). Моля опитайте отново." -#: perllib/FixMyStreet/App/Controller/Council.pm:100 +#: perllib/FixMyStreet/App/Controller/Council.pm:97 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 +#: perllib/FixMyStreet/App/Controller/Location.pm:126 msgid "That location does not appear to be in the UK; please try again." msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:81 +#: perllib/FixMyStreet/Cobrand/UK.pm:71 msgid "That postcode was not recognised, sorry." msgstr "Моля да ни извините, този пощенски код не беше разпознат." -#: perllib/FixMyStreet/App/Controller/Admin.pm:713 +#: perllib/FixMyStreet/App/Controller/Admin.pm:712 +#, fuzzy +msgid "That problem has been marked as sent." +msgstr "Сигналът ще бъде препратен." + +#: perllib/FixMyStreet/App/Controller/Admin.pm:704 msgid "That problem will now be resent." msgstr "Сигналът ще бъде препратен." @@ -3040,28 +3026,28 @@ msgstr "Сигналът не може да бъде разгледан %s." msgid "That report has been removed from FixMyStreet." msgstr "Този сигнал е бил изтрит от ПоправиСофия." -#: templates/web/base/admin/body.html:136 +#: templates/web/base/admin/body.html:144 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/base/admin/body-form.html:119 -#: templates/web/base/admin/body-form.html:120 +#: templates/web/base/admin/body-form.html:123 +#: templates/web/base/admin/body-form.html:124 msgid "" "The <strong>endpoint</strong> is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." msgstr "" -#: templates/web/base/admin/body-form.html:132 -#: templates/web/base/admin/body-form.html:133 +#: templates/web/base/admin/body-form.html:136 +#: templates/web/base/admin/body-form.html:137 msgid "" "The <strong>jurisdiction</strong> is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" -#: templates/web/base/admin/body-form.html:90 -#: templates/web/base/admin/body-form.html:91 +#: templates/web/base/admin/body-form.html:94 +#: templates/web/base/admin/body-form.html:95 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>." @@ -3082,7 +3068,7 @@ msgstr "" msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." msgstr "Това <strong>може</strong> да отнеме няколко минути — <em>моля</em> бъдете търпеливи." -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:3 msgid "The council won’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 "Бихте могли да помогнете на Общината давайки възможно най-пълната информация, с която разполагате. Моля опишете точното местонахождение на проблема, от какво естество е, от колко време съществува, кратко описание. По възможност прикачете и снимка на проблема, ако разполагате с такава." @@ -3109,8 +3095,8 @@ msgstr "Грешката беше: %s" msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:185 -#: perllib/FixMyStreet/Geocode/OSM.pm:163 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:159 +#: perllib/FixMyStreet/Geocode/OSM.pm:144 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap." msgstr "" @@ -3168,7 +3154,7 @@ msgstr "" msgid "The passwords do not match" msgstr "Паролите не съвпадат" -#: templates/web/base/errors/page_error_404_not_found.html:11 +#: templates/web/base/errors/page_error_404_not_found.html:10 #: templates/web/base/errors/page_error_404_not_found.html:12 msgid "The requested URL '%s' was not found on this server" msgstr "Търсеният адрес '%s' не беше намерен на този сървър" @@ -3185,7 +3171,7 @@ msgstr "Можете да получавате известия на базат msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:295 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:300 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" @@ -3198,16 +3184,20 @@ msgstr "" "Потребителското <strong>име</strong> е видимо публично в сигналите, които не са маркирани като <em>анонимни</em>.\n" "Имената не са уникални." +#: templates/web/base/reports/_problem-list.html:15 +msgid "There are no reports to show." +msgstr "" + #: perllib/FixMyStreet/App/Controller/Reports.pm:75 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "Възникна проблем при визуализирането на страницата с всички сигнали. Моля опитайте по-късно." -#: perllib/FixMyStreet/App/Controller/Contact.pm:131 +#: perllib/FixMyStreet/App/Controller/Contact.pm:136 #: 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/New.pm:762 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 #: templates/web/base/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:25 @@ -3223,7 +3213,7 @@ msgstr "Възникна проблем с комбинацията имейл/ msgid "There was a problem with your update. Please try again." msgstr "Възникна проблем с вашата актуализация. Моля опитайте отново." -#: perllib/FixMyStreet/App/Controller/Contact.pm:135 +#: perllib/FixMyStreet/App/Controller/Contact.pm:140 msgid "There were problems with your report. Please see below." msgstr "Възникна проблем с вашая сигнал. Моля опитайте отново." @@ -3231,8 +3221,8 @@ msgstr "Възникна проблем с вашая сигнал. Моля о msgid "There were problems with your update. Please see below." msgstr "Възникнаха проблеми с вашата актуализация. Моля вижте по-долу." -#: templates/web/base/admin/body-form.html:108 -#: templates/web/base/admin/body-form.html:109 +#: templates/web/base/admin/body-form.html:112 +#: templates/web/base/admin/body-form.html:113 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" @@ -3245,14 +3235,14 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" -#: templates/web/base/admin/body.html:36 +#: templates/web/base/admin/body.html:44 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported <em>at any location</em>.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" " Currently, users <strong>cannot report problems to this body</strong>." msgstr "" -#: templates/web/base/admin/body.html:46 +#: templates/web/base/admin/body.html:54 msgid "This body has no contacts. This means that currently problems reported to this body <strong>will not be sent</strong>." msgstr "" @@ -3263,18 +3253,18 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:388 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:394 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:391 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 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:136 -#: perllib/FixMyStreet/Cobrand/UK.pm:53 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:902 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:972 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/Cobrand/UK.pm:43 msgid "This information is required" msgstr "Тази информация е необходима" @@ -3313,8 +3303,8 @@ msgstr "Този проблем е в процес на обработка." msgid "This problem is old and of unknown status." msgstr "Този сигнал е с неизвестен статус." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:130 #: perllib/FixMyStreet/Cobrand/Zurich.pm:131 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:132 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -3331,15 +3321,15 @@ msgstr "Този сигнал е означен със статус поправ msgid "This report is currently marked as open." msgstr "Този сигнал е означен със статус отворен." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:319 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:311 msgid "This report was submitted anonymously" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:293 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Тази страница съдържа и снимка, изпратена от нашия потребител." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Времева линия" @@ -3357,7 +3347,7 @@ msgstr "За да <strong> подадете сигнал</strong>, щракне 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:294 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:299 msgid "To view a map of the precise location of this issue" msgstr "За да видите точното местоположение на проблема върху картата" @@ -3373,8 +3363,12 @@ msgstr "Общо" msgid "Try again" msgstr "Опитайте отново" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:46 +#: templates/web/base/contact/submit.html:14 +msgid "Try emailing us directly:" +msgstr "" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -3382,8 +3376,8 @@ msgstr "Опитайте отново" msgid "Unable to fix" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/admin/update_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:45 #: templates/web/zurich/admin/report_edit.html:58 @@ -3425,7 +3419,7 @@ msgstr "Актуализирано анонимно на %s" msgid "Update below added by %s at %s" msgstr "Актуализирано от %s на %s" -#: templates/web/base/admin/body-form.html:233 +#: templates/web/base/admin/body-form.html:240 #: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "" @@ -3451,7 +3445,7 @@ msgstr "" msgid "Update reopened problem" msgstr "Актуализация на възобновен сигнал" -#: templates/web/base/admin/body.html:93 +#: templates/web/base/admin/body.html:101 msgid "Update statuses" msgstr "Актуализация на статусите" @@ -3465,12 +3459,12 @@ msgstr "Актуализация:" msgid "Updated" msgstr "Актуализирано!" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1016 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1060 -#: perllib/FixMyStreet/App/Controller/Admin.pm:810 -#: perllib/FixMyStreet/App/Controller/Admin.pm:958 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:549 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:618 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1014 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:808 +#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:556 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:625 msgid "Updated!" msgstr "Актуализирано!" @@ -3482,7 +3476,7 @@ msgstr "Актуализирано!" msgid "Updates" msgstr "Актуализации" -#: perllib/FixMyStreet/DB/Result/Comment.pm:139 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -3497,7 +3491,7 @@ msgstr "Актуализиране на {{title}}" msgid "Updates to this problem, FixMyStreet" msgstr "" -#: templates/web/base/admin/body.html:174 +#: templates/web/base/admin/body.html:182 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 "" @@ -3506,11 +3500,11 @@ msgstr "" msgid "User" msgstr "Потребител" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1357 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1331 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1329 msgid "User flagged" msgstr "" @@ -3518,16 +3512,16 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:303 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:307 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Потребители" -#: perllib/FixMyStreet/App/Controller/Admin.pm:380 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:430 +#: perllib/FixMyStreet/App/Controller/Admin.pm:374 +#: perllib/FixMyStreet/App/Controller/Admin.pm:404 +#: perllib/FixMyStreet/App/Controller/Admin.pm:421 msgid "Values updated" msgstr "Актуализиране на стойностите" @@ -3581,11 +3575,11 @@ msgstr "Ние никога не показваме вашия имейл" msgid "We never show your email address or phone number." msgstr "Ние никога не показваме вашия имейл или телефонен номер." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:403 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/base/index-steps.html:38 +#: templates/web/base/index-steps.html:31 msgid "We send it to the council on your behalf" msgstr "Ние ще го изпратим на общината вместо Вас" @@ -3594,17 +3588,25 @@ msgstr "Ние ще го изпратим на общината вместо В msgid "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>" msgstr "Личните Ви данни ще бъдат използвани единствено и само в съответствие с нашата <a href=\"/privacy\">Политика за поверителност.</a>" +#: templates/web/base/questionnaire/completed-open.html:2 +msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" +msgstr "" + #: templates/web/base/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 "" "Ще се раздваме да разберем какво мислите за сайта. Моля попълнете формата \n" "или ни изпратете майл на <a href='mailto:%s'>%s</a>:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:41 +#: templates/web/base/contact/submit.html:7 +msgid "We’ll get back to you as soon as we can." +msgstr "" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 msgid "What’s the issue, and where is it?" msgstr "" -#: templates/web/base/admin/category_edit.html:82 +#: templates/web/base/admin/category_edit.html:87 #: templates/web/zurich/admin/body.html:18 msgid "When edited" msgstr "Редактирано на:" @@ -3613,15 +3615,18 @@ msgstr "Редактирано на:" msgid "When sent" msgstr "Изпратен" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Whole block of empty flats" msgstr "" +#: templates/web/base/tokens/confirm_alert.html:7 +msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." +msgstr "" + #: templates/web/base/open311/index.html:92 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/fiksgatami/front/footer-marketing.html:15 #: templates/web/fixmystreet/front/footer-marketing.html:17 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" @@ -3645,18 +3650,18 @@ msgid "Year" msgstr "Година" #: templates/web/base/admin/bodies.html:66 -#: templates/web/base/admin/body.html:72 templates/web/base/admin/body.html:74 -#: templates/web/base/admin/body.html:78 templates/web/base/admin/body.html:80 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:76 +#: templates/web/base/admin/report_edit.html:93 #: templates/web/base/admin/update_edit.html:24 -#: templates/web/base/admin/users.html:29 +#: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:42 #: templates/web/base/questionnaire/index.html:81 @@ -3685,14 +3690,12 @@ msgstr "" msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/tokens/confirm_problem.html:25 -#: templates/web/base/tokens/confirm_problem.html:26 -#: templates/web/zurich/tokens/confirm_problem.html:6 +#: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:8 msgid "You can <a href=\"%s%s\">view the problem on this site</a>." msgstr "Можете да <a href=\"%s%s\">разгледате сигнала на този сайт</a>." -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:48 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -3707,14 +3710,14 @@ msgid "" " reports in the past." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:19 -#: templates/web/base/report/new/councils_text_none.html:20 -#: templates/web/base/report/new/councils_text_some.html:20 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 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/base/admin/body-form.html:81 +#: templates/web/base/admin/body-form.html:85 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "Можете да маркирате района или общината за изтриване, ако не желаете да бъде активна за този сайт." @@ -3727,10 +3730,10 @@ msgid "You have already answered this questionnaire. If you have a question, ple msgstr "Вече сте попълнили тази анкета. Ако имате въпрос, моля <a href='%s'>свържете се с нас</a>, или <a href='%s'>прегледайте сигнала</a>.\n" #: templates/web/base/questionnaire/index.html:68 -#: templates/web/base/report/new/fill_in_details_form.html:94 +#: templates/web/base/report/new/fill_in_details_form.html:75 #: templates/web/fixmystreet/questionnaire/index.html:88 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:79 -#: templates/web/zurich/report/new/fill_in_details_form.html:75 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 +#: templates/web/zurich/report/new/fill_in_details_form.html:58 msgid "You have already attached a photo to this report, attaching another one will replace it." msgstr "Вече сте прикачили снимка към този сигнал. Ако прикачите нова, то тя ще замени съществуващата." @@ -3739,7 +3742,7 @@ msgstr "Вече сте прикачили снимка към този сигн msgid "You have already attached a photo to this update, attaching another one will replace it." msgstr "Вече сте прикачили снимка към актуализацията, прикачайки нова ще замените предходната." -#: templates/web/base/auth/sign_out.html:3 +#: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" msgstr "Вие излязохте успешно" @@ -3748,26 +3751,11 @@ msgstr "Вие излязохте успешно" 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/base/tokens/confirm_alert.html:8 -msgid "You have successfully confirmed your alert." -msgstr "Успешно пoтвърдихте Вашето известие." - +#: 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 "Успешно пoтвърдихте Вашият имейл адрес." -#: templates/web/base/tokens/confirm_update.html:14 -msgid "You have successfully confirmed your update and you can now <a href=\"%s\">view it on the site</a>." -msgstr "Вие успешно потвърдихте вашата промяна и сега можете да я <a href=\"%s\">видите на сайта</a>." - -#: templates/web/base/tokens/confirm_alert.html:12 -msgid "You have successfully created your alert." -msgstr "Успешно създадохте известие." - -#: templates/web/base/tokens/confirm_alert.html:10 -msgid "You have successfully deleted your alert." -msgstr "Успешно изтрихте известието си." - #: templates/web/base/report/display.html:20 #: templates/web/base/report/new/fill_in_details.html:37 #: templates/web/fixmystreet/report/display.html:17 @@ -3796,7 +3784,7 @@ msgstr "" "категории проблеми, които те обслужват (като повреда на пътя или наработещо \n" "улично осветление), както и контакти (като имейл адрес), на който сигналите се изпращат." -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:85 msgid "You really want to resend?" msgstr "Наистина ли искате да го изпратите отново?" @@ -3816,7 +3804,7 @@ msgstr "Вашите Сигнали" #: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 #: templates/web/fixmystreet/report/update-form.html:76 -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:71 msgid "Your email" msgstr "Имейл" @@ -3832,7 +3820,7 @@ msgid "Your email address:" msgstr "Имейл адрес:" #: templates/web/base/alert/_list.html:92 -#: templates/web/base/report/new/fill_in_details_form.html:125 +#: templates/web/base/report/new/fill_in_details_form.html:106 #: templates/web/base/report/update-form.html:81 msgid "Your email:" msgstr "Имейл:" @@ -3847,13 +3835,13 @@ msgstr "Вашата информация ще бъде използва сам #: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 #: templates/web/fixmystreet/report/update-form.html:142 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:98 +#: templates/web/zurich/report/new/fill_in_details_form.html:81 msgid "Your name" msgstr "Име" #: templates/web/base/auth/general.html:59 #: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:204 +#: templates/web/base/report/new/fill_in_details_form.html:185 #: templates/web/base/report/update-form.html:151 msgid "Your name:" msgstr "Име:" @@ -3871,33 +3859,19 @@ msgstr "Паролата Ви беше променена успешно" #: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 -#: templates/web/zurich/report/new/fill_in_details_form.html:104 +#: templates/web/zurich/report/new/fill_in_details_form.html:87 msgid "Your phone number" msgstr "Телефонен номер" -#: templates/web/base/tokens/confirm_problem.html:4 -msgid "Your problem has been confirmed!" -msgstr "" - #: templates/web/fixmystreet/questionnaire/index.html:16 msgid "Your report" msgstr "Вашият сигнал" -#: templates/web/base/report_created.html:6 -msgid "Your report has been created and will shortly be sent." -msgstr "Вашият сигнал беше създаден и скоро ще бъде изпратен." - -#: templates/web/base/footer.html:9 templates/web/fiksgatami/footer.html:21 -#: templates/web/fiksgatami/nn/footer.html:21 -#: templates/web/fixmystreet/footer.html:24 +#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:24 msgid "Your reports" msgstr "Вашите сигнали" -#: templates/web/base/tokens/confirm_update.html:4 -msgid "Your update has been confirmed!" -msgstr "" - -#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:59 +#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:41 msgid "Your updates" msgstr "Актуализации" @@ -3914,11 +3888,7 @@ msgstr "от %s" msgid "council" msgstr "община" -#: perllib/FixMyStreet/DB/Result/Problem.pm:665 -msgid "council ref: %s" -msgstr "входящ номер в общината: %s" - -#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:32 #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:54 msgid "didn't use map" @@ -3929,6 +3899,7 @@ msgstr "картата не е била използвана" msgid "e.g. ‘%s’ or ‘%s’" msgstr "напр. ‘%s’ или ‘%s’" +#: templates/web/base/admin/body-form.html:188 #: templates/web/base/admin/flagged.html:51 msgid "edit user" msgstr "редакция на потребителя" @@ -3943,7 +3914,7 @@ msgstr "от %d различни потребители" msgid "last updated %s" msgstr "Последно обновено %s" -#: perllib/Utils.pm:263 +#: perllib/Utils.pm:235 msgid "less than a minute" msgstr "преди по-малко от минута" @@ -4003,22 +3974,22 @@ msgstr "или" msgid "or locate me automatically" msgstr "или ме намери автоматично" -#: templates/web/base/admin/report_edit.html:25 -#: templates/web/base/admin/report_edit.html:26 -#: templates/web/zurich/admin/report_edit-sdm.html:28 +#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:30 +#: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit-sdm.html:29 -#: templates/web/zurich/admin/report_edit-sdm.html:37 +#: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:38 -#: templates/web/zurich/admin/report_edit.html:28 +#: templates/web/zurich/admin/report_edit.html:27 #: templates/web/zurich/admin/report_edit.html:29 -#: templates/web/zurich/admin/report_edit.html:39 +#: templates/web/zurich/admin/report_edit.html:38 #: templates/web/zurich/admin/report_edit.html:40 -#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit.html:50 #: templates/web/zurich/admin/report_edit.html:52 msgid "originally entered: “%s”" msgstr "първоначално въведен: “%s”" -#: templates/web/base/admin/report_edit.html:30 +#: templates/web/base/admin/report_edit.html:43 msgid "other areas:" msgstr "други територии:" @@ -4027,13 +3998,12 @@ msgstr "други територии:" msgid "reopened" msgstr "отново отворен" -#: templates/web/fiksgatami/header.html:49 -#: templates/web/fixmystreet/header.html:53 +#: templates/web/fixmystreet/header.html:59 #: templates/web/zurich/footer.html:12 msgid "sign out" msgstr "излизане" -#: templates/web/base/report/new/fill_in_details_form.html:13 +#: templates/web/base/report/new/fill_in_details_form.html:12 #: templates/web/base/report/new/fill_in_details_form.html:15 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 @@ -4045,15 +4015,15 @@ msgstr "местната община" msgid "there is no pin shown as the user did not use the map" msgstr "мястото не е било отбелязано на картата от потребителя" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:373 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:379 msgid "this type of local problem" msgstr "този тип сигнали" -#: perllib/Utils.pm:235 +#: perllib/Utils.pm:207 msgid "today" msgstr "днес" -#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:32 #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:54 msgid "used map" @@ -4079,7 +4049,7 @@ msgid_plural "<big>%s</big> reports recently" msgstr[0] "<big>%s</big> подаден наскоро" msgstr[1] "<big>%s</big> подадени наскоро" -#: perllib/Utils.pm:282 +#: perllib/Utils.pm:254 #, perl-format msgid "%d hour" msgid_plural "%d hours" @@ -4093,7 +4063,7 @@ msgid_plural "%d supporters" msgstr[0] "%d поддръжник" msgstr[1] "%d поддръжници" -#: perllib/Utils.pm:284 +#: perllib/Utils.pm:256 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -4114,7 +4084,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:250 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -4135,7 +4105,7 @@ msgid_plural "<big>%s</big> fixed in past month" msgstr[0] "<big>%s</big>поправени през изминалия месец" msgstr[1] "<big>%s</big>поправени през изминалия месец" -#: perllib/Utils.pm:280 +#: perllib/Utils.pm:252 #, perl-format msgid "%d day" msgid_plural "%d days" @@ -4149,8 +4119,5 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "Все още <strong>нямаме</strong> информация за общината, която стопанисва тази територия." msgstr[1] "Все още <strong>нямаме</strong> информация за общините, които стопанисват тази територия." -#~ msgid "Configuration updated - contacts will be generated automatically later" -#~ msgstr "Конфигурацията е обновена - контактите ще бъдат генерирани автоматично по-късно" - -#~ msgid "The subject and details of the problem will be public, plus your name if you give us permission." -#~ msgstr "Заглавието и описанието на сигнала ще станат публични, включително и вашето име, ако позволите това." +#~ msgid "For council(s):" +#~ msgstr "За общината/ите:" diff --git a/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po new file mode 100644 index 000000000..eb1b863c3 --- /dev/null +++ b/locale/cs_CZ.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -0,0 +1,4172 @@ +# 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: +msgid "" +msgstr "" +"Project-Id-Version: fixmystreet\n" +"Report-Msgid-Bugs-To: matthew@mysociety.org\n" +"POT-Creation-Date: 2015-07-31 14:28+0100\n" +"PO-Revision-Date: 2015-07-10 13:32+0000\n" +"Last-Translator: mySociety <transifex@mysociety.org>\n" +"Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/fixmystreet/language/cs_CZ/)\n" +"Language: cs_CZ\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>=2 && n<=4) ? 1 : 2;\n" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:392 +msgid " and " +msgstr " a " + +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_none.html:11 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 +#: templates/web/base/report/new/councils_text_some.html:22 +#: templates/web/base/report/new/councils_text_some.html:5 +msgid " or " +msgstr " nebo " + +#: templates/web/base/admin/index.html:36 +msgid "%d confirmed alerts, %d unconfirmed" +msgstr "%d potvrzených upozornění, %d nepotvrzených" + +#: templates/web/base/admin/index.html:38 +#: templates/web/zurich/admin/index.html:6 +msgid "%d council contacts – %d confirmed, %d unconfirmed" +msgstr "%d úředních kontaktů -%d potvrzených, %d nepotvrzených" + +#: templates/web/base/admin/edit-league.html:12 +msgid "%d edits by %s" +msgstr "%d úprav od %s" + +#: templates/web/base/admin/index.html:35 +msgid "%d live updates" +msgstr "%d online aktualizace" + +#: templates/web/base/admin/index.html:37 +msgid "%d questionnaires sent – %d answered (%s%%)" +msgstr "%d dotazníky zaslány -%d odpovědělo (%s %%)" + +#: templates/web/base/pagination.html:10 +msgid "%d to %d of %d" +msgstr "%d až %d z %d" + +#: templates/web/base/reports/body.html:0 +#: templates/web/base/reports/body.html:23 +msgid "%s - Summary reports" +msgstr "%s -Souhrnné reporty" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:672 +msgid "%s ref: %s" +msgstr "%s ref: %s" + +#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 +msgid "%s ward, %s" +msgstr "%s, oddělení, %" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:559 +msgid "%s, reported at %s" +msgstr "%s, nahlášeno %s" + +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 +msgid "%s, within %s ward" +msgstr "% S, v% s oddělení" + +#: perllib/FixMyStreet/Map/OSM.pm:42 +msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" +msgstr "" + +#: templates/web/base/email_sent.html:29 +msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" +msgstr "(Nemějte obavy - upozornění bude uchováno do doby potvrzení e-mailem.)" + +#: templates/web/base/email_sent.html:25 +msgid "(Don't worry — we'll hang on to your problem report while you're checking your email.)" +msgstr "(Nemějte obavy - hlášení bude uchováno do doby potvrzení e-mailem.)" + +#: templates/web/base/email_sent.html:27 +msgid "(Don't worry — we'll hang on to your update while you're checking your email.)" +msgstr "(Nemějte obavy - hlášení bude uchováno do doby potvrzení e-mailem.)" + +#: templates/web/base/admin/report_blocks.html:11 +#: templates/web/base/admin/users.html:31 +msgid "(Email in abuse table)" +msgstr "(E-mailů v tabulce zneužívání)" + +#: templates/web/base/alert/_list.html:20 +#: templates/web/fixmystreet/alert/_list.html:24 +msgid "(a default distance which covers roughly 200,000 people)" +msgstr "(Standardní vzdálenost, která pokrývá zhruba 10.000 lidí)" + +#: templates/web/base/alert/_list.html:25 +#: templates/web/fixmystreet/alert/_list.html:28 +msgid "(alternatively the RSS feed can be customised, within" +msgstr "(Alternativně RSS zdroj lze přizpůsobit, v rámci" + +#: templates/web/base/around/around_map_list_items.html:12 +#: templates/web/base/around/on_map_list_items.html:9 +#: templates/web/fixmystreet/report/_item.html:27 +#: templates/web/zurich/report/_item.html:21 +msgid "(closed)" +msgstr "(uzavřené)" + +#: templates/web/base/around/around_map_list_items.html:10 +#: templates/web/base/around/on_map_list_items.html:7 +#: templates/web/fixmystreet/report/_item.html:25 +#: templates/web/zurich/report/_item.html:19 +msgid "(fixed)" +msgstr "(vyřešeno)" + +#: templates/web/base/index.html:8 templates/web/base/index.html:9 +#: templates/web/fixmystreet/around/intro.html:2 +msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" +msgstr "(např. graffiti, rozbité pouliční osvětlení, díry v komunikacích a pod. )" + +#: templates/web/base/reports/_list-entry.html:4 +#: templates/web/fixmystreet/report/_item.html:21 +msgid "(not sent to council)" +msgstr "(není odesláno na úřad)" + +#: templates/web/base/report/new/fill_in_details_form.html:199 +#: templates/web/zurich/report/new/fill_in_details_form.html:77 +msgid "(optional)" +msgstr "(volitelně)" + +#: templates/web/fixmystreet/report/public_label.html:1 +msgid "(public)" +msgstr "(veřejné)" + +#: templates/web/base/reports/_list-entry.html:2 +#: templates/web/fixmystreet/report/_item.html:20 +msgid "(sent to both)" +msgstr "(odesláno dvoum??)" + +#: templates/web/base/report/new/fill_in_details_form.html:193 +msgid "(we never show your email address or phone number)" +msgstr "(váš email a telefonní číslo nebudou nikde zveřejněny)" + +#: templates/web/base/report/update-form.html:158 +msgid "(we never show your email)" +msgstr "(váš email nebude nezveřejněn)" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/DB/Result/Problem.pm:410 +msgid "-- Pick a category --" +msgstr "-- Vyberte kategorii --" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:630 +#: perllib/FixMyStreet/DB/Result/Problem.pm:416 +msgid "-- Pick a property type --" +msgstr "-- Vyberte typ nemovitosti --" + +#: templates/web/base/admin/body-form.html:42 +#: templates/web/base/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> je nastavena na (<code>%s</code>), ale ne na <code>MAPIT_TYPES</code>.<br>\n" +" To je pravděpodobně proč je \"area covered\" prázdná (níže).<br>\n" +" Asi upravte <code>MAPIT_TYPES</code> ve vašem konfiguračním souboru." + +#: templates/web/base/around/_report_banner.html:3 +#: templates/web/base/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>Pokud nevidíte mapu, <a href='%s' rel='nofollow'>vynechte tento krok</a>.</small>" + +#: templates/web/base/admin/index.html:33 +#: templates/web/zurich/admin/index.html:4 +msgid "<strong>%d</strong> live problems" +msgstr "<strong>%d</strong>Nevyřešená hlášení" + +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:39 +msgid "<strong>No</strong> Let me confirm my report by email" +msgstr "<strong>Ne</strong> Potvrdím hlášení e-mailem" + +#: templates/web/fixmystreet/report/update-form.html:112 +msgid "<strong>No</strong> Let me confirm my update by email" +msgstr "<strong>Ne</strong> Potvrdím aktualizaci e-mailem" + +#: templates/web/fixmystreet/auth/general.html:51 +#: templates/web/zurich/auth/general.html:51 +msgid "<strong>No</strong> let me sign in by email" +msgstr "<strong>Ne</strong> přihlásím se pomocí e-mailu" + +#: templates/web/base/auth/general.html:55 +msgid "<strong>No</strong>, I do not, let me sign in by email:" +msgstr "<strong>Ne</strong>, přihlásím se pomocí e-mailu:" + +#: templates/web/base/report/new/fill_in_details_form.html:144 +msgid "<strong>No</strong>, let me confirm my report by email:" +msgstr "<strong>Ne</strong>, Potvrdím hlášení prostřednictvím emailu:" + +#: templates/web/base/report/update-form.html:117 +msgid "<strong>No</strong>, let me confirm my update by email:" +msgstr "<strong>Ne</strong>, potvrdím aktualizaci pomocí e-mailu:" + +#: templates/web/base/auth/general.html:37 +#: templates/web/base/report/new/fill_in_details_form.html:122 +#: templates/web/base/report/update-form.html:95 +#: templates/web/fixmystreet/auth/general.html:37 +#: templates/web/fixmystreet/auth/general.html:39 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:15 +#: templates/web/fixmystreet/report/update-form.html:89 +msgid "<strong>Yes</strong> I have a password" +msgstr "<strong>Ano</strong> Mám heslo" + +#: templates/web/base/static/about-en-gb.html:1 +#: templates/web/base/static/about-en-gb.html:3 +msgid "About us" +msgstr "O nás" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:52 +#: templates/web/base/report/update-form.html:30 +#: templates/web/base/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 "Akce naplánována" + +#: templates/web/base/admin/body-form.html:3 +#: templates/web/base/admin/body-form.html:4 +msgid "" +"Add a <strong>body</strong> for each administrative body, such as a council or department\n" +" to which problem reports can be sent. You can add one or more contacts (for different\n" +" categories of problem) to each body." +msgstr "" +"Zadejte <strong>instituci</strong> pro každou administrativní oblast, jako např. obecní úřad či oddělení\n" +" kterému bude hlášení zasláno. Každé instituci můžete zadat jeden nebo více kontaktů (pro různé\n" +" kategorie hlášení)." + +#: templates/web/base/admin/body.html:56 +msgid "Add a contact using the form below." +msgstr "Přidejte kontakt pomocí formuláře níže." + +#: templates/web/base/admin/bodies.html:74 +#: templates/web/base/admin/body-form.html:240 +#: templates/web/zurich/admin/body-form.html:51 +msgid "Add body" +msgstr "Zadejte instituci" + +#: templates/web/base/admin/body.html:116 +#: templates/web/zurich/admin/body.html:31 +msgid "Add new category" +msgstr "Přidat novou kategorii" + +#: templates/web/base/admin/users.html:47 +msgid "Add user" +msgstr "Přidat Uživatele" + +#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:52 +msgid "Added %s" +msgstr "Přidáno %s" + +#: templates/web/base/auth/change_password.html:29 +msgid "Again:" +msgstr "Opětovně:" + +#: templates/web/base/admin/timeline.html:35 +msgid "Alert %d created for %s, type %s, parameters %s / %s" +msgstr "Upozornění %d vytvořené pro %s, typu %s, parametry %s / %s" + +#: templates/web/base/admin/timeline.html:37 +msgid "Alert %d disabled (created %s)" +msgstr "Upozornění %d zrušeno (vytvořeno %s)" + +#: templates/web/base/report/update-form.html:163 +#: templates/web/fixmystreet/report/update-form.html:150 +msgid "Alert me to future updates" +msgstr "Upozorněte mě na budoucí aktualizace" + +#: templates/web/base/reports/index.html:3 +#: templates/web/zurich/admin/stats.html:5 +#: templates/web/zurich/reports/index.html:12 +msgid "All Reports" +msgstr "Všechna hlášení" + +#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:26 +#: 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 "Všechna hlášení" + +#: templates/web/base/admin/stats.html:5 +#: templates/web/zurich/admin/stats.html:8 +msgid "All reports between %s and %s" +msgstr "Všechna hlášení od %s do %s" + +#: templates/web/base/report/new/councils_text_some.html:2 +msgid "All the information you provide here will be sent to" +msgstr "Veškeré vámi poskytnuté informace budou zaslány " + +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_all.html:4 +#: templates/web/base/report/new/fill_in_details_form.html:12 +#: templates/web/base/report/new/fill_in_details_form.html:14 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 +msgid "All the information you provide here will be sent to <strong>%s</strong>." +msgstr "Veškeré vámi poskytnuté informace budou zaslány <strong>%s</strong>." + +#: templates/web/base/questionnaire/index.html:36 +#: templates/web/fixmystreet/questionnaire/index.html:55 +msgid "An update marked this problem as fixed." +msgstr "Hlášení bylo označeno za vyřešené." + +#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/problem_row.html:20 +msgid "Anonymous" +msgstr "Anonimní" + +#: templates/web/base/admin/report_edit.html:75 +#: templates/web/base/admin/update_edit.html:23 +msgid "Anonymous:" +msgstr "Anonymní:" + +#: templates/web/base/footer.html:26 +msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?" +msgstr "Jste <strong>vývojář</strong>? Nechcete se přidat a podpořit FixMyStreet?" + +#: templates/web/fixmystreet/front/footer-marketing.html:16 +msgid "Are you a developer?" +msgstr "Jste vývojář?" + +#: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/body.html:16 +#: templates/web/zurich/admin/body-form.html:24 +msgid "Area covered" +msgstr "Oblast pokrytí" + +#: templates/web/base/admin/bodies.html:15 +#: templates/web/base/admin/body.html:60 +msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." +msgstr "Vzhledem k tomu, že je ve stavu 'staging site' a %s je 'nepravda', budou reporty vypracované na těchto stránkách zaslány uživateli, který nahlásil problém a ne kontaktu uvedenému v nastavení dané oblasti a kategorie." + +#: templates/web/zurich/admin/report_edit.html:141 +#: templates/web/zurich/admin/stats.html:36 +msgid "Assign to different category:" +msgstr "Přiřaďte jinou kategorii:" + +#: templates/web/zurich/admin/report_edit.html:150 +msgid "Assign to external body:" +msgstr "Přiřaďte externí instituci:" + +#: templates/web/zurich/admin/report_edit.html:130 +#: templates/web/zurich/admin/report_edit.html:187 +msgid "Assign to subdivision:" +msgstr "Přiřaďte oddělení:" + +#: perllib/FixMyStreet/Cobrand/Zurich.pm:165 +#: templates/web/zurich/report/updates.html:11 +msgid "Assigned to %s" +msgstr "Přířazeno: %s" + +#: templates/web/base/open311/index.html:84 +msgid "At most %d requests are returned in each query. The returned requests are ordered by requested_datetime, so to get all requests, do several searches with rolling start_date and end_date." +msgstr "" + +#: templates/web/base/open311/index.html:76 +msgid "At the moment only searching for and looking at reports work." +msgstr "V současné době funguje pouze vyhledávání a prohlížení nahlášených problémů." + +#: perllib/FixMyStreet/DB/Result/Problem.pm:373 +#: templates/web/zurich/report/_item.html:11 +msgid "Awaiting moderation" +msgstr "Čeká se na moderování" + +#: templates/web/base/js/translation_strings.html:32 +msgid "Back" +msgstr "Zpět" + +#: templates/web/base/admin/report_blocks.html:11 +msgid "Ban email address" +msgstr "Zakázat emailovou adresu" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:301 +#: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 +msgid "Bodies" +msgstr "Subjekty" + +#: templates/web/base/admin/flagged.html:17 +#: templates/web/base/admin/reports.html:14 +#: templates/web/base/admin/users.html:17 +msgid "Body" +msgstr "Subjekt" + +#: templates/web/base/admin/report_edit.html:34 +#: templates/web/base/admin/user-form.html:32 +msgid "Body:" +msgstr "Subjekt:" + +#: templates/web/base/admin/stats.html:80 +msgid "By Date" +msgstr "Podle datumu" + +#: templates/web/fixmystreet/around/_report_banner.html:8 +msgid "Can't see the map? <em>Skip this step</em>" +msgstr "Nevidíte mapu? <em>vynechte tento krok</em>" + +#: templates/web/base/admin/body.html:68 +#: templates/web/base/admin/index.html:55 +#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category_wrapper.html:3 +#: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/admin/index-dm.html:23 +#: templates/web/zurich/admin/index-sdm.html:21 +#: templates/web/zurich/admin/reports.html:13 +#: templates/web/zurich/admin/stats.html:50 +msgid "Category" +msgstr "Katetorie" + +#: templates/web/base/admin/index.html:53 +msgid "Category fix rate for problems > 4 weeks old" +msgstr "Category fix rate for problems > 4 týdny staré" + +#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/category_edit.html:23 +#: templates/web/base/admin/report_edit.html:74 +#: templates/web/zurich/admin/body.html:43 +#: templates/web/zurich/admin/report_edit-sdm.html:42 +#: templates/web/zurich/admin/report_edit.html:140 +msgid "Category:" +msgstr "Kategorie:" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383 +msgid "Category: %s" +msgstr "Kategorie: %s" + +#: templates/web/base/auth/change_password.html:1 +#: templates/web/base/auth/change_password.html:3 +#: templates/web/base/auth/change_password.html:33 +#: templates/web/base/my/my.html:17 templates/web/fixmystreet/my/my.html:17 +msgid "Change password" +msgstr "Změnit heslo" + +#: templates/web/base/admin/body.html:160 +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 "" +"Kontrola <strong>potvrzení</strong> že je tento kontakt byl potvrzen a že je správný.\n" +" Pokud si nejste jisti správností, ponechte nezaškrtnuté." + +#: templates/web/base/admin/body.html:171 +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 "" +"Zaškrtněte <strong>smazáno</strong> , kategorie nebude nadále používána. \n" +" Nebude se nadále zobrazovat v rozbalovacím menu při zadání hlášení." + +#: templates/web/base/admin/body.html:191 +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 "" +"Zaškrtněte <strong> soukromá kategorie </strong>, aby se <strong>hlášení v této kategorii nikdy nezveřejnili na webových stránkách </ strong>. \n" +" <br> \n" +" Za normálních okolností, kategorie nejsou soukromé. \n" +" <br> \n" +" Toto nastavení je vhodné pro hlášení , která chcete umožnit uživatelům úřadům nahlásit, ale pro které neexistuje žádný veřejný \n" +" zájem na veřejné zobrazení zpráv. Může to být například interní žádost o umístění nových odpadkových košů na specifickou adresu a pod." + +#: templates/web/base/admin/body.html:130 +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 "" +"Jméno <strong> kategorie </strong> zvolte tak, aby dávalo smysl pro veřejnost (např, \"Díra v silnici \", \"Pouliční osvětlení \"), ale je užitečné \n" +" i pro daný úřad. Názvy kategorií se objeví v rozbalovací nabídce na stránce Nahlásit problém." + +#: templates/web/base/admin/stats.html:65 +#: templates/web/base/admin/stats.html:71 +msgid "Click here or enter as dd/mm/yyyy" +msgstr "Klikněte sem nebo vložte dd/mm/rrrr" + +#: templates/web/base/js/translation_strings.html:50 +#: templates/web/fixmystreet/around/_report_banner.html:2 +msgid "Click map to report a problem" +msgstr "Klikněte na mapu a nahlaste problém" + +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:58 +#: templates/web/base/admin/report_edit.html:60 +#: templates/web/base/dashboard/index.html:142 +#: templates/web/base/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:95 +#: templates/web/zurich/admin/report_edit.html:97 +#: templates/web/zurich/admin/stats.html:31 +#: templates/web/zurich/report/banner.html:13 +msgid "Closed" +msgstr "Uzavřena" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:771 +msgid "Closed by council" +msgstr "Uzavřena úřadem" + +#: templates/web/base/my/my.html:40 +#: templates/web/fixmystreet/my/_problem-list.html:12 +msgid "Closed reports" +msgstr "Uzavřená hlášení" + +#: templates/web/base/admin/problem_row.html:38 +msgid "Closed:" +msgstr "Uzavřena:" + +#: templates/web/base/around/tabbed_lists.html:10 +#: templates/web/base/around/tabbed_lists.html:12 +msgid "Closest nearby problems <small>(within %skm)</small>" +msgstr "Nejbližší hlášení <small>( v okolí %s km)</small>" + +#: templates/web/base/admin/report_edit.html:23 +#: templates/web/zurich/admin/report_edit-sdm.html:33 +#: templates/web/zurich/admin/report_edit.html:46 +msgid "Co-ordinates:" +msgstr "Souřadnice:" + +#: templates/web/base/admin/list_updates.html:10 +msgid "Cobrand" +msgstr "Motiv" + +#: templates/web/base/admin/report_edit.html:91 +#: templates/web/base/admin/update_edit.html:50 +msgid "Cobrand data:" +msgstr "Data motivu:" + +#: templates/web/base/admin/report_edit.html:90 +#: templates/web/base/admin/update_edit.html:49 +msgid "Cobrand:" +msgstr "Motiv:" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 +#: templates/web/base/admin/config_page.html:1 +msgid "Configuration" +msgstr "Nastavení" + +#: templates/web/base/admin/category_edit.html:52 +msgid "Configure Endpoint" +msgstr "Nastavení Endpointu" + +#: templates/web/base/admin/body.html:72 +msgid "Confirm" +msgstr "Potvrdit" + +#: templates/web/base/auth/token.html:1 +msgid "Confirm account" +msgstr "Potvrdit účet" + +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:33 +#: templates/web/fixmystreet/report/update-form.html:107 +msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated." +msgstr "Potvrďte hlášení níže a zadejte si nové heslo. Jakmile potvrdíte ověřovací mail, heslo bude aktualizováno a budete přihlášeni do systému." + +#: templates/web/base/questionnaire/creator_fixed.html:1 +#: templates/web/base/tokens/confirm_problem.html:1 +#: templates/web/base/tokens/confirm_update.html:1 +#: templates/web/zurich/tokens/confirm_problem.html:1 +#: templates/web/zurich/tokens/confirm_problem.html:3 +msgid "Confirmation" +msgstr "Potvrzení" + +#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/category_edit.html:37 +#: templates/web/base/admin/category_edit.html:89 +#: templates/web/zurich/admin/stats.html:40 +msgid "Confirmed" +msgstr "Potvrzeno" + +#: templates/web/base/admin/stats.html:5 +msgid "Confirmed reports between %s and %s" +msgstr "Potvrzená hlášení od %s do %s" + +#: templates/web/base/admin/list_updates.html:39 +#: templates/web/base/admin/problem_row.html:36 +#: templates/web/base/admin/report_edit.html:83 +msgid "Confirmed:" +msgstr "Potvrzeno:" + +#: templates/web/base/footer.html:24 +msgid "Contact FixMyStreet" +msgstr "Kontaktujte FixMyStreet" + +#: templates/web/base/contact/index.html:1 +#: templates/web/base/contact/index.html:2 +#: templates/web/base/contact/submit.html:1 +#: templates/web/fixmystreet/contact/index.html:1 +#: templates/web/fixmystreet/contact/index.html:2 +msgid "Contact Us" +msgstr "Kontaktujte nás" + +#: templates/web/base/contact/index.html:6 +#: templates/web/fixmystreet/contact/index.html:20 +msgid "Contact the team" +msgstr "Kontaktujte nás!" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1325 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1353 +msgid "Could not find user" +msgstr "Uživatele nelze najít" + +#: templates/web/base/js/translation_strings.html:37 +msgid "Could not look up location" +msgstr "Lokalitu nelze vyhledat" + +#: templates/web/base/admin/list_updates.html:9 +msgid "Council" +msgstr "Úřad" + +#: templates/web/base/admin/body.html:1 +#: templates/web/base/admin/category_edit.html:1 +#: templates/web/zurich/admin/body.html:1 +msgid "Council contacts for %s" +msgstr "Kontakty na úřad %s" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:670 +msgid "Council ref: %s" +msgstr "číslo jednací: %s" + +#: templates/web/base/admin/stats.html:84 +msgid "Council:" +msgstr "Úřad:" + +#: templates/web/base/admin/stats.html:12 +#: templates/web/base/admin/stats.html:32 +#: templates/web/zurich/admin/stats.html:45 +#: templates/web/zurich/admin/stats.html:50 +msgid "Count" +msgstr "Počet" + +#: templates/web/base/email_sent.html:1 +msgid "Create a report" +msgstr "Vytvořit report" + +#: templates/web/base/admin/body.html:208 +#: templates/web/zurich/admin/body.html:59 +msgid "Create category" +msgstr "Vytvořit kategorii" + +#: templates/web/base/admin/problem_row.html:34 +#: templates/web/zurich/admin/list_updates.html:29 +#: templates/web/zurich/admin/list_updates.html:8 +msgid "Created" +msgstr "Vytvořeno" + +#: templates/web/base/admin/list_updates.html:38 +#: templates/web/base/admin/report_edit.html:82 +#: templates/web/base/admin/update_edit.html:51 +#: templates/web/zurich/admin/report_edit-sdm.html:47 +#: templates/web/zurich/admin/report_edit.html:61 +#: templates/web/zurich/admin/update_edit.html:29 +msgid "Created:" +msgstr "Vytvořeno:" + +#: templates/web/base/admin/stats.html:31 +msgid "Current state" +msgstr "Aktuální stav" + +#: templates/web/base/admin/bodies.html:5 +#: templates/web/base/admin/index.html:16 +msgid "Currently no bodies have been created." +msgstr "Doposud nebyl vytvořen žádný subjekt." + +#: templates/web/base/dashboard/index.html:5 +#: templates/web/base/dashboard/index.html:7 +msgid "Dashboard" +msgstr "Přehledy" + +#: templates/web/zurich/admin/stats.html:35 +msgid "Dealt with by subdivision within 5 working days" +msgstr "Odbavované úřadem do 5 pracovních dnů" + +#: templates/web/base/admin/bodies.html:27 +#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:81 +#: templates/web/base/admin/category_edit.html:42 +#: templates/web/base/admin/category_edit.html:90 +msgid "Deleted" +msgstr "Smazána" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 +#: 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 "Popis" + +#: templates/web/base/js/translation_strings.html:34 +#: templates/web/zurich/report/new/fill_in_details_form.html:42 +msgid "Details" +msgstr "Podrobnosti" + +#: templates/web/base/admin/report_edit.html:20 +#: templates/web/base/report/new/fill_in_details_form.html:62 +#: templates/web/zurich/admin/report_edit-sdm.html:25 +#: templates/web/zurich/admin/report_edit.html:25 +#: templates/web/zurich/admin/report_edit.html:35 +msgid "Details:" +msgstr "Podrobnosti:" + +#: templates/web/base/admin/body.html:87 +msgid "Devolved" +msgstr "Předáno" + +#: templates/web/base/admin/edit-league.html:8 +msgid "Diligency prize league table" +msgstr "Tabulka Vížěhů" + +#: templates/web/fixmystreet/auth/general.html:31 +msgid "Do you have a FixMyBarangay password?" +msgstr "Máte FixMyBarangay heslo?" + +#: templates/web/base/auth/general.html:32 +#: templates/web/fixmystreet/auth/general.html:33 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:11 +#: templates/web/fixmystreet/report/update-form.html:86 +msgid "Do you have a FixMyStreet password?" +msgstr "Máte FixMyStreet heslo?" + +#: templates/web/base/questionnaire/index.html:46 +#: templates/web/fixmystreet/questionnaire/index.html:65 +msgid "Don’t know" +msgstr "Není známo" + +#: templates/web/fixmystreet/contact/index.html:118 +msgid "Don't like forms?" +msgstr "Nechcete řešit formulářem?" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:60 +#: templates/web/base/report/update-form.html:30 +#: templates/web/base/report/update-form.html:32 +#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/fixmystreet/report/update-form.html:30 +msgid "Duplicate" +msgstr "Duplicitní" + +#: templates/web/base/admin/body.html:106 +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 "Každému kontaktu daného subjektu můžeme přidělit kategorii, která je zobrazena veřejně. Různé kategorie mohou mít společný kontakt (e-mail). To znamená, že můžete přidat mnoho kategorií, i když máte jen jednu kontaktní osobu pro daný subjekt." + +#: templates/web/base/admin/list_updates.html:42 +#: templates/web/base/admin/problem_row.html:41 +#: templates/web/base/admin/users.html:33 +#: templates/web/zurich/admin/problem_row.html:42 +msgid "Edit" +msgstr "Upravit" + +#: templates/web/base/admin/body.html:220 +#: templates/web/zurich/admin/body.html:71 +msgid "Edit body details" +msgstr "Editace podrobností subjektu" + +#: templates/web/base/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 +msgid "Editing problem %d" +msgstr "Úpravy hlášení %d" + +#: templates/web/base/admin/update_edit.html:1 +#: templates/web/zurich/admin/update_edit.html:1 +msgid "Editing update %d" +msgstr "Úpravy aktualizace %d" + +#: templates/web/base/admin/user_edit.html:1 +msgid "Editing user %d" +msgstr "Aktualizace uživatele %d" + +#: templates/web/base/admin/category_edit.html:91 +msgid "Editor" +msgstr "Úprava" + +#: templates/web/base/admin/bodies.html:23 +#: templates/web/base/admin/category_edit.html:88 +#: templates/web/base/admin/flagged.html:38 +#: templates/web/base/admin/users.html:16 +#: templates/web/fixmystreet/auth/general.html:21 +#: templates/web/zurich/admin/body-form.html:9 +#: templates/web/zurich/admin/body.html:15 +#: templates/web/zurich/auth/general.html:24 +#: templates/web/zurich/auth/general.html:54 +msgid "Email" +msgstr "E-Mail" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1301 +msgid "Email added to abuse list" +msgstr "E-mail přidán do seznamu zneužívání" + +#: templates/web/base/admin/body.html:155 +msgid "Email address:" +msgstr "E-mailová adresa:" + +#: templates/web/base/tokens/confirm_alert.html:6 +msgid "Email alert created" +msgstr "" + +#: templates/web/base/tokens/confirm_alert.html:10 +msgid "Email alert deleted" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1298 +msgid "Email already in abuse list" +msgstr "E-mail je již v seznamu zneužívání" + +#: templates/web/base/around/_updates.html:5 +msgid "Email me new local problems" +msgstr "Nová lokální hlášení mi pošlete mailem" + +#: templates/web/base/report/display.html:38 +msgid "Email me updates" +msgstr "Zašlete aktualizace mailem" + +#: templates/web/base/admin/category_edit.html:31 +#: templates/web/base/admin/report_edit.html:80 +#: templates/web/base/admin/update_edit.html:33 +#: templates/web/base/admin/user-form.html:20 +#: templates/web/base/alert/updates.html:13 +#: templates/web/base/report/display.html:42 +#: templates/web/zurich/admin/body.html:47 +#: templates/web/zurich/admin/report_edit-sdm.html:44 +#: templates/web/zurich/admin/report_edit.html:57 +msgid "Email:" +msgstr "E-mail:" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 +msgid "Email: %s" +msgstr "E-mail: %s" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 +msgid "Empty flat or maisonette" +msgstr "Prázdný byt nebo mesonet" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:631 +msgid "Empty house or bungalow" +msgstr "Prázdný dům nebo bungalow" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 +msgid "Empty office or other commercial" +msgstr "Zavřená kancelář nebo komerční prostory" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 +msgid "Empty pub or bar" +msgstr "Zavřená hospoda nebo bar" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 +msgid "Empty public building - school, hospital, etc." +msgstr "Prázdná veřejná budova - škola, nemocnice a tp." + +#: templates/web/base/admin/body-form.html:162 +#: templates/web/base/admin/body-form.html:163 +msgid "" +"Enable <strong>Open311 update-sending</strong> if the endpoint will send and receive\n" +" updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" +" For more information, see \n" +" <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>." +msgstr "" + +#: templates/web/base/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:223 +msgid "" +"Enable this <strong>can be devolved</strong> setting if one or more contacts have a \n" +" different endpoint (and send method) from the body's. For example, if reports for some categories of\n" +" problem must be emailed, while others can be sent over Open311." +msgstr "" + +#: templates/web/base/admin/stats.html:70 +msgid "End Date:" +msgstr "Konečné datum:" + +#: templates/web/base/admin/body-form.html:130 +msgid "Endpoint" +msgstr "Endpoint" + +#: perllib/FixMyStreet/Cobrand/Zurich.pm:73 +msgid "Enter a Zürich street name" +msgstr "Zadejte název ulice" + +#: perllib/FixMyStreet/Cobrand/UK.pm:13 +msgid "Enter a nearby UK postcode, or street name and area" +msgstr "Zadejte nejbližší PSČ, název ulice nebo oblasti" + +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 +#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 +msgid "Enter a nearby postcode, or street name and area" +msgstr "Zadejte blízké poštovní směrovací číslo nebo název ulice či oblasti" + +#: templates/web/base/around/postcode_form.html:1 +#: templates/web/base/around/postcode_form.html:2 +#: templates/web/fixmystreet/around/postcode_form.html:10 +#: templates/web/fixmystreet/around/postcode_form.html:11 +msgid "Enter a nearby street name and area" +msgstr "Zadejte PSČ, název ulice nebo název oblasti" + +#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:7 +msgid "Enter a nearby street name and area, postal code or district in Delhi" +msgstr "Zadejte nejbližší název ulice, oblasti, PSČ nebo katastrální části" + +#: templates/web/base/auth/general.html:64 +#: templates/web/base/report/new/fill_in_details_form.html:151 +#: templates/web/base/report/update-form.html:124 +msgid "Enter a new password:" +msgstr "Zadejte nové heslo:" + +#: templates/web/fixmystreet/auth/general.html:63 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:75 +#: templates/web/fixmystreet/report/update-form.html:123 +#: templates/web/zurich/auth/general.html:65 +msgid "Enter a password" +msgstr "Zadejte heslo" + +#: templates/web/base/index-steps.html:26 +msgid "Enter details of the problem" +msgstr "Uveďte podrobnosti daného problému" + +#: templates/web/base/auth/token.html:5 +#: templates/web/base/errors/generic.html:1 +#: templates/web/base/errors/generic.html:3 +#: templates/web/base/tokens/abuse.html:1 +#: templates/web/base/tokens/abuse.html:3 +#: templates/web/base/tokens/error.html:1 +#: templates/web/base/tokens/error.html:3 +msgid "Error" +msgstr "Chyba" + +#: templates/web/base/admin/body.html:14 +#: templates/web/base/admin/category_edit.html:18 +msgid "Example postcode %s" +msgstr "Příklad PSČ %s" + +#: templates/web/base/open311/index.html:94 +msgid "Examples:" +msgstr "Příklady:" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 +msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" +msgstr "Vysvětlete, co je špatně a kde, případně jak dlouho to již trvá a tp. ..." + +#: templates/web/base/admin/body-form.html:81 +msgid "External URL" +msgstr "" + +#: templates/web/base/admin/category_edit.html:27 +#: templates/web/base/admin/report_edit.html:92 +msgid "Extra data:" +msgstr "Doplňující data:" + +#: templates/web/base/contact/submit.html:13 +msgid "Failed to send message" +msgstr "" + +#: templates/web/zurich/admin/index-dm.html:33 +#: templates/web/zurich/admin/index-sdm.html:30 +msgid "Filter report list" +msgstr "Filtrovat seznam hlášení" + +#: templates/web/base/questionnaire/index.html:55 +#: templates/web/fixmystreet/questionnaire/index.html:74 +msgid "First time" +msgstr "Poprvé" + +#: templates/web/base/admin/body.html:48 +msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." +msgstr "Pro opravu vyberte <strong>oblast pokrytí</strong> v části <em>Editace podrobností subjektu</em> ve formuláři níže." + +#: templates/web/base/header.html:24 +msgid "FixMyStreet" +msgstr "FixMyStreet" + +#: templates/web/base/admin/header.html:10 +msgid "FixMyStreet admin:" +msgstr "FixMyStreet administrace:" + +#: templates/web/base/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 má řadu RSS kanálů a e-mailových upozornění na místních problémy, včetně \n" +" upozornění pro všechny problémy v rámci určitého oddělení nebo úřadu, nebo se všemi problémy \n" +" v určité vzdálenosti k dané lokalitě." + +#: templates/web/base/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’s alerts, but will only appear in the \"Within the boundary\" alert\n" +"for the county council." +msgstr "" +"FixMyStreet posílá hlášení různých kategorií problémů\n" +"příslušným úřadům, takže problémy uvnitř hranic určitého okrsku \n" +"se nemusí shodovat s problémy zaslanými tomuto úřadu. Například, graffiti hlášení \n" +"bude zasláno do okresního zastupitelstva, takže se objeví v obou okresního \n" +"Rady & rsquo; s upozornění, ale objeví se pouze v \"v rámci hranice \" alert \n" +"na krajský úřad." + +#: templates/web/base/admin/index.html:55 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:54 +#: templates/web/base/admin/report_edit.html:55 +#: templates/web/base/dashboard/index.html:142 +#: templates/web/base/dashboard/index.html:144 +#: templates/web/base/report/update-form.html:30 +#: templates/web/base/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 "Vyřešené" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:56 +msgid "Fixed - Council" +msgstr "vyřešené - Úřad" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:55 +msgid "Fixed - User" +msgstr "Vyřešené - Uživatel" + +#: templates/web/base/my/my.html:35 +#: templates/web/fixmystreet/my/_problem-list.html:7 +msgid "Fixed reports" +msgstr "Hlášení - Vyřešené" + +#: templates/web/base/admin/problem_row.html:37 +msgid "Fixed:" +msgstr "Vyřešené:" + +#: templates/web/base/admin/body-form.html:89 +#: templates/web/zurich/admin/body-form.html:36 +msgid "Flag as deleted" +msgstr "Označené za smazané" + +#: templates/web/base/admin/report_blocks.html:16 +msgid "Flag user" +msgstr "Sledovat uživatele" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: templates/web/base/admin/users.html:19 +msgid "Flagged" +msgstr "Určeno ke sledování" + +#: templates/web/base/admin/flagged.html:1 +msgid "Flagged reports and users" +msgstr "Sledovaná hlášení a sledovaní uživatelé" + +#: templates/web/base/admin/user-form.html:46 +msgid "Flagged users are listed on the <a href='%s'>flagged</a> page." +msgstr "Takto označení uživatelé jsou v seznamu na této <a href='%s'>stránce</a>." + +#: templates/web/base/admin/flagged.html:31 +msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." +msgstr "Označení uživatelé nejsou žádným způsobem omezováni. Je to jen seznam uživatelů, kteří byli označeni k Vaší pozornosti." + +#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/user-form.html:52 +msgid "Flagged:" +msgstr "Sledováno:" + +#: templates/web/base/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 "Klikněte na odkaz pro danou oblast, zobrazí se hlášení pouze z této oblasti." + +#: templates/web/base/admin/body-form.html:65 +msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." +msgstr "Více informací naleznete v článku <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Jak FixMyStreet používá Mapit</a>." + +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:32 +#: templates/web/fixmystreet/report/update-form.html:106 +msgid "Forgotten your password?" +msgstr "Zapomněli jste své heslo?" + +#: templates/web/base/faq/faq-en-gb.html:1 +#: templates/web/base/static/privacy.html:1 +#: templates/web/base/static/privacy.html:2 +msgid "Frequently Asked Questions" +msgstr "Často kladené dotazy" + +#: templates/web/base/open311/index.html:136 +msgid "GeoRSS on Google Maps" +msgstr "GeoRSS na Google Mapách" + +#: templates/web/fixmystreet/around/_updates.html:3 +#: templates/web/fixmystreet/report/display.html:35 +msgid "Get updates" +msgstr "Zasílání aktualizací" + +#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/fixmystreet/reports/_rss.html:9 +msgid "Get updates of %s problems" +msgstr "Získat aktualizace hlášení %s " + +#: templates/web/fixmystreet/reports/_rss.html:11 +#: templates/web/fixmystreet/reports/_rss.html:3 +msgid "Get updates of problems in this %s" +msgstr "Získat aktualizace hlášení %s " + +#: templates/web/base/alert/_list.html:83 +#: templates/web/fixmystreet/alert/_list.html:82 +msgid "Give me an RSS feed" +msgstr "Přihlásit se k odběru RSS kanálu" + +#: templates/web/base/questionnaire/completed.html:14 +msgid "Glad to hear it’s been fixed!" +msgstr "" + +#: templates/web/base/alert/index.html:34 +#: templates/web/base/around/postcode_form.html:8 +#: templates/web/fixmystreet/around/postcode_form.html:21 +#: templates/web/zurich/admin/stats.html:26 +msgid "Go" +msgstr "OK" + +#: templates/web/base/admin/report_edit.html:93 +msgid "Going to send questionnaire?" +msgstr "Odeslat dotazník?" + +#: templates/web/base/admin/index.html:43 +msgid "Graph of problem creation by status over time" +msgstr "Graf hlášení v čase a jejich stavů" + +#: templates/web/base/reports/index.html:12 +msgid "Greyed-out lines are councils that no longer exist." +msgstr "Šedě označené řádky jsou úřady, které již existují." + +#: templates/web/base/questionnaire/index.html:37 +#: templates/web/fixmystreet/questionnaire/index.html:56 +msgid "Has this problem been fixed?" +msgstr "Byl tento problém vyřešen?" + +#: templates/web/base/questionnaire/index.html:50 +#: templates/web/fixmystreet/questionnaire/index.html:69 +msgid "Have you ever reported a problem to a council before, or is this your first time?" +msgstr "Už jste někdy před tím hlásili problém úřadu a nebo je toto Vaše hlášení poprvé?" + +#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:30 +#: 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 "Nápověda" + +#: templates/web/base/alert/_list.html:6 +#: templates/web/fixmystreet/alert/_list.html:8 +msgid "Here are the types of local problem alerts for ‘%s’." +msgstr "Možnosti pro upozornění na lokální problém pro oblast ‘%s’." + +#: templates/web/fixmystreet/header.html:58 +#: templates/web/zurich/footer.html:11 +msgid "Hi %s" +msgstr "Přihlášená osoba: %s" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:63 +#: templates/web/base/admin/report_edit.html:64 +#: templates/web/base/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:86 +#: templates/web/zurich/admin/report_edit.html:90 +#: templates/web/zurich/admin/stats.html:32 +#: templates/web/zurich/admin/update_edit.html:18 +msgid "Hidden" +msgstr "Skrytý" + +#: templates/web/base/around/display_location.html:65 +msgid "Hide old" +msgstr "Skrýt staré" + +#: templates/web/base/around/display_location.html:60 +msgid "Hide pins" +msgstr "Schovat značky" + +#: templates/web/base/admin/category_edit.html:84 +msgid "History" +msgstr "Historie" + +#: templates/web/base/js/translation_strings.html:31 +msgid "Home" +msgstr "Úvodní stránka" + +#: templates/web/base/index-steps.html:1 +msgid "How to report a problem" +msgstr "Jak nahlásit problém" + +#: templates/web/base/js/translation_strings.html:33 +msgid "How to send successful reports" +msgstr "Anleitung" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:740 +msgid "I am afraid you cannot confirm unconfirmed reports." +msgstr "Bohužel nemůžete potvrdit nepotvrzená hlášení." + +#: templates/web/base/tokens/confirm_problem.html:23 +#: templates/web/base/tokens/confirm_problem.html:27 +msgid "I just reported a problem on @fixmystreet" +msgstr "" + +#: templates/web/base/tokens/confirm_update.html:19 +#: templates/web/base/tokens/confirm_update.html:23 +msgid "I just updated a problem on @fixmystreet" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +msgid "I'm afraid we couldn't locate your problem in the database.\n" +msgstr "Bohužel, nelze lokalizovat Vaše hlášení v databázi.\n" + +#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 +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 "Bohužel nelze ověřit platnost. Pokud jste kopírovali URL adresu z e-mailové zprávy, prosím zkontrolujte její správnost.\n" + +#: templates/web/base/admin/flagged.html:14 +#: templates/web/base/admin/list_updates.html:6 +#: templates/web/base/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/base/admin/body-form.html:24 +#: templates/web/base/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 "" +"Vyberte <strong>nadřízený subjekt</strong> pokud je subjekt součástí jiného subjektu.\n" +" Pro základní nastavení instalace nevyžaduje propojování subjektů tímto způsobem." + +#: templates/web/base/admin/body.html:133 +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 "" +"Pokud dva nebo více subjektů působí ve stejné lokalitě, FixMyStreet spojuje identické kategorie do jedné\n" +" položky menu. Pokud to tak chcete, ujistěte se, že jména kategorie v těchto subjektech jsou totožná." + +#: templates/web/base/email_sent.html:19 +msgid "If you do not, your alert will not be activated." +msgstr "Pokud to neuděláte, vaše upozornění nebude aktivováno." + +#: templates/web/base/email_sent.html:15 +msgid "If you do not, your problem will not be posted." +msgstr "Pokud to neuděláte, Vaše hlášení nebude odesláno." + +#: templates/web/base/email_sent.html:17 +msgid "If you do not, your update will not be posted." +msgstr "Pokud to neuděláte, Vaše aktualizace nebude odeslána." + +#: templates/web/base/questionnaire/completed.html:8 +msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." +msgstr "" + +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:8 +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 "Pokud zde zadáte své hlášení, nadpis a podrobnosti hlášení budou veřejné, ale hlášení <strong>nebude</strong> doručeno na úřad." + +#: templates/web/base/auth/token.html:22 templates/web/base/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 "Pokud používáte webový e-mail, nebo máte zapnutý filtr <em>nevyžádané pošty</em>, zkontrolujte si <em>hromadnou</em> a <em>spam</em> složky. Občas jsou naše zprávy jsou tímto způsobem označovány." + +#: templates/web/base/questionnaire/index.html:59 +#: templates/web/fixmystreet/questionnaire/index.html:78 +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 "" +"Pokud chcete zanechat veřejnou aktualizaci tohoto hlášení, zadejte ji prosím zde\n" +"(Takovéto aktualizace nebudou zaslány na úřad). Například, jakou máte\n" +"osobní zkušenost z řešení tohoto problému?" + +#: templates/web/base/admin/body.html:149 +msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." +msgstr "Pokud používáte <strong>metodu zasílání mimo zaslání emailu</strong>, zadejte zde ID služby (Open311) nebo její ekvivalent." + +#: templates/web/base/admin/body-form.html:207 +#: templates/web/base/admin/body-form.html:208 +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 "" +"Pokud jste povolili Open311 výše uvedenou aktualizaci, systém Open311 při aktualizaci obvykle přijímá pouze status OTEVŘENO nebo UZAVŘENO. \n" +" Povolte <strong> rozšířené stavy systému Open311 </strong>, pokud chcete, aby mohly být předány ostatní stavy. \n" +" Před jeho povolením zkontrolujte, zda stránky vašeho motivu tuto funkci podporují." + +#: templates/web/base/admin/body-form.html:194 +#: templates/web/base/admin/body-form.html:195 +msgid "" +"If you've enabled Open311 update-sending above, enable <strong>suppression of alerts</strong> \n" +" if you do <strong>not</strong> want that user to be notified whenever these updates are created." +msgstr "" + +#: templates/web/base/admin/body-form.html:177 +#: templates/web/base/admin/body-form.html:178 +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:132 +msgid "Illegal ID" +msgstr "Neplatné ID" + +#: perllib/FixMyStreet/App/Controller/Alert.pm:100 +msgid "Illegal feed selection" +msgstr "Neplatný výběr zdoje" + +#: templates/web/base/dashboard/index.html:142 +#: templates/web/base/dashboard/index.html:144 +#: templates/web/base/report/update-form.html:30 +#: templates/web/base/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 "v řešení" + +#: templates/web/base/admin/flagged.html:39 +msgid "In abuse table?" +msgstr "V tabulce zneužívání?" + +#: templates/web/base/open311/index.html:88 +msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." +msgstr "Kromě toho, tyto atributy, které nejsou součástí specifikace Open311 v2 jsou vráceny: agency_sent_datetime název (také vrácený jako součást popisu), interface_used, comment_count, requestor_name (přítomný pouze tehdy, pokud žadatel povolen název, který bude zobrazen na této stránce) ," + +#: perllib/FixMyStreet/Cobrand/Zurich.pm:144 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 +#: 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:99 +#: templates/web/zurich/report/banner.html:15 +msgid "In progress" +msgstr "v řešení" + +#: templates/web/base/tokens/confirm_alert.html:11 +msgid "Inbox zero, here we come!" +msgstr "" + +#: templates/web/zurich/admin/report_edit.html:160 +msgid "Include reporter personal details" +msgstr "Zahrnuty osobní údaje hlasatele problému" + +#: templates/web/base/admin/stats.html:76 +msgid "Include unconfirmed reports" +msgstr "Včetně nepotvrzených hlášení" + +#: perllib/FixMyStreet/App/Controller/Open311.pm:359 +msgid "Incorrect has_photo value \"%s\"" +msgstr "Chybná has_photo hodnota \"%s\"" + +#: templates/web/zurich/admin/list_updates.html:3 +msgid "Internal notes" +msgstr "Interní poznámky" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:61 +msgid "Internal referral" +msgstr "Interní postoupení" + +#: perllib/FixMyStreet/App/Controller/Open311.pm:344 +msgid "Invalid agency_responsible value %s" +msgstr "Chybná agency_responsible hodnota %s" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1112 +msgid "Invalid end date" +msgstr "Chybný konečný datum" + +#: perllib/FixMyStreet/App/Controller/Open311.pm:437 +msgid "Invalid format %s specified." +msgstr "Chybný formát %s specified." + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 +msgid "Invalid start date" +msgstr "Chybné počáteční datum" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:50 +#: templates/web/base/dashboard/index.html:142 +#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/report/update-form.html:30 +#: templates/web/base/report/update-form.html:31 +#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/fixmystreet/report/update-form.html:29 +msgid "Investigating" +msgstr "Šetření" + +#: 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 "Často bývá nejrychlejší <a href=\"%s\">zkontrolovat naše Otázky a odpovědi</a> a podívat se, zda odpověď nenaleznete zde." + +#: templates/web/base/tokens/confirm_problem.html:14 +msgid "It’s on its way to the council right now." +msgstr "" + +#: templates/web/base/auth/general.html:44 +#: templates/web/base/report/new/fill_in_details_form.html:131 +#: templates/web/base/report/update-form.html:104 +#: templates/web/fixmystreet/auth/general.html:47 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 +#: templates/web/fixmystreet/report/update-form.html:102 +#: templates/web/zurich/auth/general.html:40 +msgid "Keep me signed in on this computer" +msgstr "Ponechte mě přihlášeného na tomto počítači" + +#: templates/web/base/admin/body.html:70 +#: templates/web/zurich/admin/body.html:16 +msgid "Last editor" +msgstr "Poslední úpravy" + +#: templates/web/base/admin/report_edit.html:88 +msgid "Last update:" +msgstr "Poslední úpravy:" + +#: templates/web/base/admin/problem_row.html:39 +msgid "Last update:" +msgstr "Poslední úpravy:" + +#: templates/web/base/admin/body-form.html:229 +msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." +msgstr "Ponechte prázdné, pokud pro tento subjekt bude vždy použitá stejná metoda zasílání (např. \"%s\")." + +#: templates/web/base/admin/body.html:27 +msgid "List all reported problems" +msgstr "Seznam všech hlášení" + +#: templates/web/base/report/new/category_wrapper.html:4 +msgid "Loading..." +msgstr "Nahrávání..." + +#: templates/web/base/alert/choose.html:1 +#: templates/web/base/alert/choose.html:3 +#: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5 +#: templates/web/base/alert/updates.html:1 +#: templates/web/base/tokens/confirm_alert.html:1 +#: templates/web/fixmystreet/alert/updates.html:1 +msgid "Local RSS feeds and email alerts" +msgstr "Lokální RSS kanály a mailové upozornění" + +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:12 +#: templates/web/base/alert/list.html:14 templates/web/base/alert/list.html:3 +msgid "Local RSS feeds and email alerts for ‘%s’" +msgstr "Lokální RSS kanály a mailové upozornění pro ‘%s’" + +#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:28 +msgid "Local alerts" +msgstr "Místní upozornění" + +#: templates/web/base/index-steps.html:25 +msgid "Locate the problem on a map of the area" +msgstr "Lokalizujte vaše hlášení v mapě" + +#: templates/web/base/js/translation_strings.html:43 +msgid "MAP" +msgstr "MAPA" + +#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 +msgid "Map" +msgstr "Mapa" + +#: templates/web/base/admin/report_edit.html:86 +#, fuzzy +msgid "Mark as sent" +msgstr "označeno za uzavřené" + +#: templates/web/base/admin/user-form.html:44 +msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." +msgstr "Označte uživatele, jejichž chování chcete sledovat a označte je <strong>příznakem</strong>." + +#: templates/web/base/reports/index.html:24 +msgid "Marked fixed/closed in the past eight weeks" +msgstr "" + +#: templates/web/base/reports/index.html:25 +msgid "Marked fixed/closed more than eight weeks ago" +msgstr "" + +#: templates/web/fixmystreet/contact/index.html:106 +msgid "Message" +msgstr "Zpráva" + +#: templates/web/base/contact/index.html:97 +msgid "Message:" +msgstr "Zpráva:" + +#: perllib/FixMyStreet/App/Controller/Open311.pm:445 +msgid "Missing jurisdiction_id" +msgstr "Chybějící jurisdiction_id" + +#: templates/web/zurich/admin/stats.html:34 +msgid "Moderated by division within one working day" +msgstr "Moderováno oddělením během jednoho pracovního dne" + +#: templates/web/base/admin/stats.html:11 +msgid "Month" +msgstr "Měsíc" + +#: templates/web/base/report/display.html:34 +msgid "More problems nearby" +msgstr "Další hlášení z okolí" + +#: templates/web/base/admin/bodies.html:21 +#: templates/web/base/admin/body-form.html:18 +#: templates/web/base/admin/flagged.html:16 +#: templates/web/base/admin/flagged.html:37 +#: templates/web/base/admin/list_updates.html:7 +#: templates/web/base/admin/reports.html:13 +#: templates/web/base/admin/users.html:15 +#: templates/web/base/reports/index.html:20 +#: templates/web/fixmystreet/auth/general.html:53 +#: templates/web/fixmystreet/report/new/form_user_loggedin.html:9 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:44 +#: templates/web/fixmystreet/report/update-form.html:138 +#: 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:77 +msgid "Name" +msgstr "Jméno" + +#: templates/web/base/admin/report_edit.html:79 +#: templates/web/base/admin/update_edit.html:32 +#: templates/web/base/admin/user-form.html:18 +#: templates/web/zurich/admin/report_edit-sdm.html:43 +#: templates/web/zurich/admin/report_edit.html:56 +#: templates/web/zurich/admin/stats.html:41 +msgid "Name:" +msgstr "Jméno:" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:313 +msgid "Name: %s" +msgstr "Jméno: %s" + +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 +#: perllib/FixMyStreet/Geocode/OSM.pm:145 +msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" +msgstr "Nejbližší pojmenovaná ulice k umístěné značce na mapě (automaticky generováno pomocí OpenStreetMap): %s%s" + +#: perllib/FixMyStreet/Cobrand/UK.pm:127 +msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" +msgstr "Nejbližší PSČ k umístěné značce na mapě (automaticky generováno) %s (%sm away)" + +#: perllib/FixMyStreet/Cobrand/Default.pm:442 +#: perllib/FixMyStreet/Cobrand/Default.pm:482 +msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" +msgstr "Nejbližší cesta k umístěné značce na mapě (automaticky generováno pomocí Bing Mapy): %s" + +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:277 +msgid "" +"Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" +"\n" +msgstr "" +"Nejbližší cesta k umístěné značce na mapě (automaticky generováno pomocí Bing Mapy): %s\n" +"\n" + +#: templates/web/base/email_sent.html:3 +msgid "Nearly Done! Now check your email..." +msgstr "Téměř hotovo! Nyní zkontrolujte svůj e-mail ..." + +#: templates/web/base/reports/index.html:21 +msgid "New <br>problems" +msgstr "Nová <br>hlášení" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:261 +msgid "New body added" +msgstr "Přidán nový subjekt" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:379 +msgid "New category contact added" +msgstr "Do kategorie byl přidán nový kontakt" + +#: templates/web/zurich/admin/report_edit-sdm.html:55 +#: templates/web/zurich/admin/report_edit.html:81 +msgid "New internal note:" +msgstr "Nová interní poznámka:" + +#: db/alert_types.pl:18 db/alert_types.pl:22 +msgid "New local problems on FixMyStreet" +msgstr "Nové lokální hlášení na FixMyStreet" + +#: db/alert_types_eha.pl:12 +msgid "New local reports on reportemptyhomes.com" +msgstr "Nová lokální hlášení na reportemptyhomes.com" + +#: db/alert_types.pl:38 +msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" +msgstr "Nová hlášení pro {{COUNCIL}} , oblast {{WARD}} na FixMyStreet" + +#: db/alert_types.pl:26 db/alert_types.pl:30 +msgid "New problems near {{POSTCODE}} on FixMyStreet" +msgstr "Nová hlášení pro PSČ {{POSTCODE}} na serveru FixMyStreet" + +#: db/alert_types.pl:10 +msgid "New problems on FixMyStreet" +msgstr "Nová hlášení na serveru FixMyStreet" + +#: db/alert_types.pl:34 +msgid "New problems to {{COUNCIL}} on FixMyStreet" +msgstr "Nová hlášení pro {{COUNCIL}} na FixMyStreet" + +#: db/alert_types.pl:42 +msgid "New problems within {{NAME}}'s boundary on FixMyStreet" +msgstr "Nová hlášení v oblasti {{NAME}} na FixMyStreet" + +#: templates/web/zurich/admin/index-sdm.html:4 +msgid "New reports" +msgstr "Nová hlášení" + +#: db/alert_types_eha.pl:23 +msgid "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com" +msgstr "Nová hlášení pro {{COUNCIL}} , oblast {{WARD}} na reportemptyhomes.com" + +#: db/alert_types_eha.pl:5 +msgid "New reports on reportemptyhomes.com" +msgstr "Nová hlášení na reportemptyhomes.com" + +#: db/alert_types_eha.pl:16 +msgid "New reports on reportemptyhomes.com near {{POSTCODE}}" +msgstr "Nová hlášení na reportemptyhomes.com v oblasti PSČ {{POSTCODE}}" + +#: db/alert_types_eha.pl:19 +msgid "New reports to {{COUNCIL}} on reportemptyhomes.com" +msgstr "Nová hlášení pro {{COUNCIL}} na reportemptyhomes.com" + +#: db/alert_types_eha.pl:27 +msgid "New reports within {{NAME}}'s boundary on reportemptyhomes.com" +msgstr "Nová hlášení pro oblast {{NAME}} na reportemptyhomes.com" + +#: templates/web/base/admin/questionnaire.html:24 +msgid "New state" +msgstr "Nový stav" + +#: templates/web/zurich/admin/report_edit-sdm.html:58 +msgid "New update:" +msgstr "Nové aktualizace:" + +#: templates/web/base/pagination.html:13 +msgid "Next" +msgstr "Další" + +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 +#: templates/web/base/admin/category_edit.html:4 +#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:34 +#: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/problem_row.html:20 +#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:93 +#: templates/web/base/admin/update_edit.html:25 +#: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/questionnaire/index.html:44 +#: templates/web/base/questionnaire/index.html:83 +#: templates/web/fixmystreet/questionnaire/index.html:102 +#: templates/web/fixmystreet/questionnaire/index.html:63 +msgid "No" +msgstr "Ne" + +#: templates/web/base/admin/user-form.html:33 +msgid "No body" +msgstr "Žádný subjekt" + +#: templates/web/base/admin/stats.html:85 +msgid "No council" +msgstr "Žádný Úřad" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:401 +msgid "No council selected" +msgstr "Není vybrán žádný úřad" + +#: templates/web/base/admin/edit-league.html:17 +msgid "No edits have yet been made." +msgstr "Nebyly provedeny žádné úpravy." + +#: templates/web/base/admin/flagged.html:25 +msgid "No flagged problems found." +msgstr "Nebyla nalazena žádná sledovaná hlášení." + +#: templates/web/base/admin/flagged.html:58 +msgid "No flagged users found." +msgstr "Nebyli nalezeni žádní sledovaní uživatelé." + +#: templates/web/zurich/admin/report_edit-sdm.html:65 +msgid "No further updates" +msgstr "Žádné další aktualizace" + +#: templates/web/base/around/around_map_list_items.html:17 +#: templates/web/fixmystreet/around/around_map_list_items.html:8 +msgid "No problems found." +msgstr "Nenalezena žádná hlášení." + +#: templates/web/base/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 "Doposud nebylo nic nahlášeno." + +#: templates/web/base/js/translation_strings.html:38 +msgid "No result returned" +msgstr "Vráceno bez výsledku." + +#: templates/web/base/admin/body-form.html:60 +#: templates/web/base/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 "" +"Aktuálně není dostupná žádná oblast, protože <code>MAPIT_URL</code>\n" +"v konfiguračním souboru není nastaven na fungující MapIt službu." + +#: templates/web/base/report/_support.html:2 +#: templates/web/base/report/_support.html:4 +msgid "No supporters" +msgstr "Žádný podporovatel." + +#: templates/web/base/admin/report_edit.html:41 +#: templates/web/zurich/admin/report_edit-sdm.html:46 +#: templates/web/zurich/admin/report_edit.html:60 +msgid "None" +msgstr "Žádné" + +#: templates/web/base/admin/user-form.html:24 +#: templates/web/base/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 "" +"Normální uživatelé (veřejnost) by neměli být přiřazeni k žádnému <strong>subjektu</strong>.<br>\n" +" Autorizovaní zaměstnanci mohou být registrováni jejich úřady, které zastupují.<br>\n" +" V závislosti na implementaci, zaměstnanci institucí mohou mít přístup k přehledům (souhrny \n" +" aktivit jejich institucí), možnost smazat hlášení nebo nastavovat speciální stavy hlášení." + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 +#: templates/web/base/report/update-form.html:30 +#: templates/web/base/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 "Nezodpovídá" + +#: templates/web/zurich/admin/report_edit-sdm.html:18 +msgid "Not for my subdivision" +msgstr "Není určeno pro naší oddělení" + +#: templates/web/base/admin/questionnaire.html:6 +msgid "Not reported before" +msgstr "Hlásil(a) jsem poprvé" + +#: templates/web/base/report/_main.html:62 +msgid "Not reported to council" +msgstr "Na úřad nebylo hlášeno" + +#: templates/web/base/admin/body.html:71 +#: templates/web/base/admin/category_edit.html:92 +#: templates/web/zurich/admin/body.html:17 +msgid "Note" +msgstr "Poznámka" + +#: templates/web/base/admin/stats.html:51 +msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" +msgstr "Upozorňujeme, že když zahrnujeme nepotvrzená hlášení, používáme datum hlášení, kdy bylo vytvořeno. To však nemusí být ve stejném měsíci, kdy bylo potvrzeno a proto se počty mohou trochu lišit" + +#: templates/web/base/admin/body.html:186 +#: templates/web/base/admin/category_edit.html:49 +#: templates/web/zurich/admin/body.html:53 +msgid "Note:" +msgstr "Poznámka:" + +#: templates/web/base/open311/index.html:73 +msgid "Note: <strong>%s</strong>" +msgstr "Poznámka: <strong>%s</strong>" + +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:10 +msgid "Now to submit your report…" +msgstr "A teď stačí hlášení odeslat" + +#: templates/web/base/report/new/fill_in_details_form.html:113 +msgid "Now to submit your report… do you have a FixMyStreet password?" +msgstr "A nyní odešlete hlášení t… máte FixMyStreet heslo?" + +#: templates/web/fixmystreet/report/update-form.html:85 +msgid "Now to submit your update…" +msgstr "A nyní pro odeslání aktualizace…" + +#: templates/web/base/report/update-form.html:86 +msgid "Now to submit your update… do you have a FixMyStreet password?" +msgstr "A nyní pro odeslání aktualizace t… máte FixMyStreet heslo?" + +#: templates/web/base/js/translation_strings.html:42 +msgid "OK" +msgstr "OK" + +#: templates/web/base/report/display.html:28 +#: templates/web/base/report/update.html:17 +msgid "Offensive? Unsuitable? Tell us" +msgstr "Urážlivé? Nevhodné? Řekněte nám" + +#: templates/web/base/reports/index.html:23 +msgid "Old / unknown <br>problems" +msgstr "Staré / neznámé <br>hlášení" + +#: templates/web/base/admin/questionnaire.html:24 +msgid "Old state" +msgstr "Starý stav" + +#: templates/web/base/reports/index.html:25 +msgid "Older <br>fixed" +msgstr "Starší <br>vyřešené" + +#: templates/web/base/reports/index.html:22 +msgid "Older <br>problems" +msgstr "Starší <br>hlášení" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 +msgid "One-line summary" +msgstr "jednořádkový nadpis" + +#: perllib/FixMyStreet/Cobrand/Zurich.pm:138 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:49 +#: templates/web/base/admin/report_edit.html:50 +#: templates/web/base/admin/update_edit.html:28 +#: templates/web/base/dashboard/index.html:142 +#: templates/web/base/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:86 +#: templates/web/zurich/admin/report_edit.html:88 +#: templates/web/zurich/admin/update_edit.html:18 +#: templates/web/zurich/report/banner.html:11 +msgid "Open" +msgstr "Otevřený" + +#: templates/web/base/reports/index.html:22 +msgid "Open for more than four weeks, with an update within the past eight weeks" +msgstr "" + +#: templates/web/base/my/my.html:30 +#: templates/web/fixmystreet/my/_problem-list.html:2 +msgid "Open reports" +msgstr "Otevřená hlášení" + +#: templates/web/base/reports/index.html:23 +msgid "Open, but not had any update in eight weeks" +msgstr "" + +#: templates/web/base/open311/index.html:70 +msgid "Open311 API for the mySociety FixMyStreet server" +msgstr "Open311 API pro server mySociety FixMyStreet" + +#: templates/web/base/open311/index.html:80 +msgid "Open311 initiative web page" +msgstr "Úvodní webová stránka systému Open311" + +#: templates/web/base/open311/index.html:81 +msgid "Open311 specification" +msgstr "Specifikace systému Open311" + +#: templates/web/base/alert/_list.html:58 +#: templates/web/fixmystreet/alert/_list.html:60 +msgid "Or problems reported to:" +msgstr "Nebo problémy hlášené subjektu:" + +#: templates/web/base/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’re in:" +msgstr "Nebo se můžete přihlásit k odběru všech upozornění na hlášení, které jsou v následujících oblastech úřadu či částí:" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 +#: perllib/FixMyStreet/DB/Result/Problem.pm:597 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:393 +msgid "Other" +msgstr "Ostatní" + +#: templates/web/base/footer.html:27 +msgid "Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>." +msgstr "Náš zdrojový kód je open source a <a href=\"http://github.com/mysociety/fixmystreet\">je dostupný na GitHub</a>." + +#: templates/web/base/admin/list_updates.html:8 +msgid "Owner" +msgstr "Vlastník" + +#: templates/web/base/errors/page_error_404_not_found.html:1 +#: templates/web/base/errors/page_error_404_not_found.html:3 +msgid "Page Not Found" +msgstr "Stránka nenalezena" + +#: templates/web/base/admin/body-form.html:31 +#: templates/web/zurich/admin/body-form.html:14 +msgid "Parent" +msgstr "Nadřazený subjekt" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 +msgid "Partial" +msgstr "Částečně" + +#: templates/web/fixmystreet/auth/general.html:56 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:68 +#: templates/web/fixmystreet/report/update-form.html:116 +#: templates/web/zurich/auth/general.html:32 +#: templates/web/zurich/auth/general.html:63 +msgid "Password (optional)" +msgstr "Heslo (volitelně)" + +#: templates/web/base/auth/change_password.html:25 +msgid "Password:" +msgstr "Heslo:" + +#: templates/web/base/js/translation_strings.html:48 +msgid "Permalink" +msgstr "Trvalý odkaz" + +#: templates/web/zurich/report/new/fill_in_details_form.html:83 +msgid "Phone number" +msgstr "Telefonní číslo" + +#: templates/web/fixmystreet/report/new/form_user_loggedin.html:26 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:62 +msgid "Phone number (optional)" +msgstr "Telefonní číslo (volitelně)" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:291 +#: templates/web/base/admin/report_edit.html:81 +#: templates/web/base/report/new/fill_in_details_form.html:197 +#: templates/web/zurich/admin/report_edit-sdm.html:46 +#: templates/web/zurich/admin/report_edit.html:60 +#: templates/web/zurich/admin/stats.html:39 +msgid "Phone:" +msgstr "Telefon:" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 +#: 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:51 +msgid "Photo" +msgstr "Fotografie" + +#: templates/web/base/questionnaire/index.html:71 +#: templates/web/base/report/new/fill_in_details_form.html:84 +#: templates/web/base/report/update-form.html:62 +#: templates/web/fixmystreet/questionnaire/index.html:91 +msgid "Photo:" +msgstr "Fotografie:" + +#: templates/web/base/alert/list.html:26 +msgid "Photos of recent nearby reports" +msgstr "Fotografie nedávných okolních hlášení" + +#: templates/web/base/js/translation_strings.html:30 +msgid "Place pin on map" +msgstr "Umísti špendlík na mapu" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/dashboard/index.html:142 +#: templates/web/base/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:86 +#: templates/web/zurich/admin/report_edit.html:89 +msgid "Planned" +msgstr "Plánováno" + +#: templates/web/fixmystreet/questionnaire/index.html:45 +msgid "Please <a class=\"tab_link\" href=\"#report\">take a look</a> at the updates that have been left." +msgstr "" + +#: templates/web/base/report/new/notes.html:5 +msgid "Please be polite, concise and to the point." +msgstr "Buďte prosím zdvořilí, struční a vyjadřujte se k věci." + +#: templates/web/base/auth/change_password.html:12 +#: templates/web/base/auth/change_password.html:17 +msgid "Please check the passwords and try again" +msgstr "Zkontrolujte prosím hesla a zkuste znovu" + +#: templates/web/base/auth/token.html:14 +msgid "Please check your email" +msgstr "Zkontrolujte svůj mail" + +#: templates/web/base/auth/general.html:14 +#: templates/web/base/auth/general.html:8 +#: templates/web/fixmystreet/auth/general.html:10 +#: templates/web/fixmystreet/auth/general.html:16 +#: templates/web/zurich/auth/general.html:3 +#: templates/web/zurich/auth/general.html:9 +msgid "Please check your email address is correct" +msgstr "Zkontrolujte, zda je vaše emailová adresa správná" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:876 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 +#: perllib/FixMyStreet/DB/Result/Problem.pm:412 +#: templates/web/base/js/translation_strings.html:9 +msgid "Please choose a category" +msgstr "Vyberte kategorii" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:418 +msgid "Please choose a property type" +msgstr "Zvolte typ nemovitosti" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:370 +msgid "Please correct the errors below" +msgstr "Opravte prosím chyby uvedené níže" + +#: templates/web/base/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 "" +"<strong>Neposílejte</strong> hlášení problémů prostřednictvím tohoto formuláře: zprávy jsou zasílány\n" +"pouze týmuFixMyStreet, ale ne kompetentním úřadům. Pro nahlášení problémů\n" +"prosím <a href=\"/\">přejděte na titulní stranu</a> a řiďte se instrukcemi." + +#: templates/web/base/report/new/notes.html:6 +msgid "Please do not be abusive — abusing your council devalues the service for all users." +msgstr "Nezneužívejte tento nástroj - zneužívání vašeho úřadu znehodnocuje službu pro všechny uživatele." + +#: perllib/FixMyStreet/App/Controller/Admin.pm:346 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 +#: templates/web/base/js/translation_strings.html:2 +msgid "Please enter a message" +msgstr "prosím zadejte zprávu" + +#: templates/web/base/auth/change_password.html:12 +#: templates/web/base/auth/change_password.html:15 +#: templates/web/base/js/translation_strings.html:19 +msgid "Please enter a password" +msgstr "Prosím zadejte heslo" + +#: perllib/FixMyStreet/App/Controller/Contact.pm:113 +#: perllib/FixMyStreet/DB/Result/Problem.pm:395 +#: templates/web/base/js/translation_strings.html:3 +msgid "Please enter a subject" +msgstr "Prosím zadejte název" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin.pm:995 +#: perllib/FixMyStreet/DB/Result/User.pm:127 +#: templates/web/base/js/translation_strings.html:12 +#: templates/web/base/js/translation_strings.html:16 +msgid "Please enter a valid email" +msgstr "Prosím zadejte platný e-mail" + +#: perllib/FixMyStreet/App/Controller/Alert.pm:346 +#: perllib/FixMyStreet/App/Controller/Contact.pm:123 +msgid "Please enter a valid email address" +msgstr "Prosím zadejte platnou emailovou adresu" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:398 +#: templates/web/base/js/translation_strings.html:4 +msgid "Please enter some details" +msgstr "Prosím zadejte podrobnosti" + +#: perllib/FixMyStreet/App/Controller/Contact.pm:112 +#: perllib/FixMyStreet/DB/Result/User.pm:124 +#: templates/web/base/auth/general.html:13 +#: templates/web/base/auth/general.html:8 +#: templates/web/base/js/translation_strings.html:11 +#: templates/web/base/js/translation_strings.html:15 +#: templates/web/fixmystreet/auth/general.html:10 +#: templates/web/fixmystreet/auth/general.html:15 +#: templates/web/zurich/auth/general.html:3 +#: templates/web/zurich/auth/general.html:8 +msgid "Please enter your email" +msgstr "Prosím zadejte váš e-mail" + +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 +#: templates/web/zurich/report/new/fill_in_details_form.html:75 +msgid "Please enter your email address" +msgstr "Prosím zadejte vaši emailovou adresu" + +#: templates/web/base/js/translation_strings.html:25 +msgid "Please enter your first name" +msgstr "Zadejte vaše jméno" + +#: perllib/FixMyStreet/Cobrand/UK.pm:318 +#: templates/web/base/js/translation_strings.html:7 +msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" +msgstr "Zadejte své celé jméno, úřad potřebuje tyto informace - jestliže si přejete, aby Vaše jméno nebylo na webu zobrazeno, odškrtněnte čvereček níže" + +#: perllib/FixMyStreet/App/Controller/Contact.pm:111 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 +#: perllib/FixMyStreet/DB/Result/Problem.pm:406 +#: perllib/FixMyStreet/DB/Result/User.pm:120 +#: templates/web/base/js/translation_strings.html:6 +msgid "Please enter your name" +msgstr "Zadejte vaše jméno" + +#: templates/web/base/js/translation_strings.html:22 +msgid "Please enter your phone number" +msgstr "Prosím zadejte vaše telefonní číslo" + +#: templates/web/base/js/translation_strings.html:26 +msgid "Please enter your second name" +msgstr "Prosím zadejte vaše příjmení" + +#: templates/web/base/js/translation_strings.html:24 +msgid "Please enter your title" +msgstr "Zadejte nadpis" + +#: templates/web/base/auth/sign_out.html:5 +#: templates/web/zurich/auth/sign_out.html:5 +msgid "Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a href=\"/\">front page</a>." +msgstr "Můžete se kdykoliv znovu <a href=\"%s\">připojit</a>, nebo přejít na <a href=\"/\">úvodní stránku</a>." + +#: templates/web/base/report/new/fill_in_details_text.html:1 +#: templates/web/base/report/new/fill_in_details_text.html:8 +msgid "Please fill in details of the problem below." +msgstr "Prosím, níže vyplňte údaje o hlášeném problému." + +#: templates/web/zurich/report/new/fill_in_details_form.html:46 +msgid "Please fill in details of the problem." +msgstr "Prosím, vyplňte údaje o hlášeném problému." + +#: templates/web/base/report/new/fill_in_details_form.html:28 +#: templates/web/fixmystreet/report/new/sidebar.html:7 +#: 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 "Vyplňte prosím níže uvedený formulář s údaji o problému, a popište místo tak přesně, jak je to možné v poli podrobnosti." + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:251 +msgid "Please indicate whether you'd like to receive another questionnaire" +msgstr "Uveďte, zda chcete dostat další dotazník" + +#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4 +msgid "Please note that updates are not sent to the council." +msgstr "Vezměte prosím na vědomí, že aktualizace nejsou odeslány na úřad." + +#: templates/web/base/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 "Vezměte prosím na vědomí, že aktualizace nejsou odeslány na úřad. Uvedete-li zde své jméno, bude veřejně zobrazené. Vaše údaje budou použity pouze v souladu s našimi <a href=\"/faq#privacy\"> zásadami ochrany osobních údajů </a>" + +#: templates/web/base/report/new/fill_in_details_form.html:8 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:21 +#: 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 "Vezměte prosím na vědomí, že vaše zpráva <strong> ještě nebyla zaslána </strong>. Vyberte si kategorii a přidejte další informace níže, a pak odešlete." + +#: templates/web/base/report/new/notes.html:1 +#: templates/web/zurich/report/new/notes.html:1 +msgid "Please note:" +msgstr "Vezměte prosím na vědomí:" + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:254 +msgid "Please provide some explanation as to why you're reopening this report" +msgstr "Uveďte prosím nějaké vysvětlení, proč jste znovu otevřeli toto hlášení" + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:261 +msgid "Please provide some text as well as a photo" +msgstr "Uveďte prosím nějaký text, stejně jako fotografii" + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:247 +msgid "Please say whether you've ever reported a problem to your council before" +msgstr "Prosím, řekněte, jestli jste někdy předtím hlásili problémy na váš úřad" + +#: perllib/FixMyStreet/App/Controller/Alert.pm:80 +msgid "Please select the feed you want" +msgstr "Prosím, vyberte kanál, který chcete" + +#: perllib/FixMyStreet/App/Controller/Alert.pm:118 +msgid "Please select the type of alert you want" +msgstr "Vyberte typ upozornění, které chcete" + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 +msgid "Please state whether or not the problem has been fixed" +msgstr "Uveďte, prosím, zda byl či nebyl problém vyřešen" + +#: templates/web/base/questionnaire/index.html:26 +msgid "Please take a look at the updates that have been left." +msgstr "Věnujte prosím pozornost aktualizacím, které zde byly zanechány." + +#: perllib/FixMyStreet/App/Controller/Photo.pm:177 +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 +#: perllib/FixMyStreet/App/Controller/Photo.pm:189 +msgid "Please upload a JPEG image only" +msgstr "Prosím, nahrávejte pouze obrázky ve formátu JPEG" + +#: perllib/FixMyStreet/App/Controller/Contact.pm:114 +msgid "Please write a message" +msgstr "Napište zprávu" + +#: templates/web/fixmystreet/report/update-form.html:23 +msgid "Please write your update here" +msgstr "Aktuální informace doplňte prosím zde" + +#: templates/web/base/contact/index.html:100 +#: templates/web/base/report/update-form.html:109 +#: templates/web/base/report/update-form.html:131 +#: templates/web/base/report/update-form.html:72 +#: templates/web/fixmystreet/contact/index.html:113 +#: templates/web/fixmystreet/report/update-form.html:124 +#: templates/web/fixmystreet/report/update-form.html:71 +#: templates/web/fixmystreet/report/update-form.html:97 +msgid "Post" +msgstr "Odeslat" + +#: templates/web/base/report/updates.html:15 +msgid "Posted anonymously at %s" +msgstr "Nahlášeno anonymně v %s" + +#: templates/web/base/report/updates.html:22 +msgid "Posted by %s (<strong>%s</strong>) at %s" +msgstr "Odesláno uživatelem %s (<strong>%s</strong>) v %s" + +#: templates/web/base/report/updates.html:24 +msgid "Posted by %s at %s" +msgstr "Odesláno uživatelem %s v %s" + +#: templates/web/base/pagination.html:7 +msgid "Previous" +msgstr "Předcházející" + +#: templates/web/fixmystreet/footer.html:32 +msgid "Privacy" +msgstr "Ochrana osobních údajů" + +#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:85 +#: templates/web/base/admin/category_edit.html:45 +#: templates/web/base/admin/report_edit.html:95 +msgid "Private" +msgstr "Neveřejné" + +#: templates/web/base/maps/openlayers.html:89 +msgid "Problem" +msgstr "Hlášení" + +#: templates/web/base/admin/timeline.html:22 +msgid "Problem %d created" +msgstr "Hlášení %d vytvořeno" + +#: templates/web/base/admin/timeline.html:24 +msgid "Problem %s confirmed" +msgstr "Hlášení %s potvrzeno" + +#: templates/web/base/admin/timeline.html:26 +msgid "Problem %s sent to council %s" +msgstr "Hlášení %s bylo odesláno na úřad %s" + +#: templates/web/base/admin/index.html:47 +#: templates/web/zurich/admin/index.html:9 +msgid "Problem breakdown by state" +msgstr "Členění hlášení podle stavu" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:966 +msgid "Problem marked as open." +msgstr "Hlášení bylo označeno za otevřené." + +#: templates/web/base/admin/questionnaire.html:21 +msgid "Problem state change based on survey results" +msgstr "Stav hlášení byl změněn na základě výsledků šetření" + +#: templates/web/base/admin/flagged.html:10 +msgid "Problems" +msgstr "Hlášení" + +#: templates/web/base/around/_updates.html:1 +msgid "Problems in this area" +msgstr "Hlášení v této oblasti" + +#: templates/web/fixmystreet/around/tabbed_lists.html:4 +#: templates/web/fixmystreet/report/display.html:43 +msgid "Problems nearby" +msgstr "Hlášení v okolí" + +#: templates/web/fixmystreet/around/tabbed_lists.html:3 +#: templates/web/fixmystreet/report/display.html:41 +msgid "Problems on the map" +msgstr "Hlášení na mapě" + +#: db/alert_types.pl:14 +msgid "Problems recently reported fixed on FixMyStreet" +msgstr "Hlášení označená za vyřešená na serveru FixMyStreet" + +#: templates/web/base/alert/_list.html:19 +#: templates/web/fixmystreet/alert/_list.html:21 +msgid "Problems within %.1fkm of this location" +msgstr "Hlášení v okolí %.1fkm od tohoto místa" + +#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 +#: perllib/FixMyStreet/Cobrand/UK.pm:207 +msgid "Problems within %s" +msgstr "Hlášení v oblasti %s" + +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 +msgid "Problems within %s ward" +msgstr "Hlášení v oblasti %s" + +#: templates/web/base/reports/body.html:0 +#: templates/web/base/reports/body.html:24 +msgid "Problems within %s, FixMyStreet" +msgstr "Hlášení v oblasti %s, FixMyStreet" + +#: templates/web/base/alert/_list.html:40 +#: templates/web/fixmystreet/alert/_list.html:42 +msgid "Problems within the boundary of:" +msgstr "Hlášení uvnitř oblasti:" + +#: db/alert_types_eha.pl:8 +msgid "Properties recently reported as put back to use on reportemptyhomes.com" +msgstr "Nemovitosti na reportemptyhomes.com nahlášené k navrácení k opětovnému užívání" + +#: templates/web/base/admin/report_edit.html:45 +msgid "Property address:" +msgstr "Adresa nemovitosti:" + +#: templates/web/base/report/new/category.html:8 +msgid "Property type:" +msgstr "Typ nemovitosti:" + +#: templates/web/base/report/update-form.html:3 +#: templates/web/fixmystreet/report/update-form.html:4 +msgid "Provide an update" +msgstr "Poskytněte aktuální informace" + +#: templates/web/fixmystreet/auth/general.html:59 +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 "Poskytnutí jména a hesla je volitelné, zato vám ale umožní snadněji nahlásit problémy, hlásit aktualizace a spravovat svá hlášení." + +#: templates/web/base/report/new/fill_in_details_form.html:155 +#: templates/web/base/report/update-form.html:128 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 +#: templates/web/fixmystreet/report/update-form.html:119 +msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." +msgstr "Poskytnutí hesla je volitelné, zato vám ale umožní snadněji nahlásit problémy, hlásit aktualizace a spravovat svá hlášení." + +#: templates/web/zurich/admin/report_edit.html:195 +#: templates/web/zurich/admin/report_edit.html:211 +msgid "Public response:" +msgstr "Veřejná reakce:" + +#: templates/web/zurich/admin/report_edit.html:77 +#: templates/web/zurich/admin/stats.html:38 +msgid "Publish photo" +msgstr "Publikovaná fotografie" + +#: templates/web/zurich/admin/report_edit.html:219 +msgid "Publish the response" +msgstr "Publikovat reakci" + +#: templates/web/base/questionnaire/completed.html:1 +#: templates/web/base/questionnaire/index.html:0 +#: templates/web/base/questionnaire/index.html:14 +#: templates/web/base/questionnaire/index.html:4 +#: templates/web/fixmystreet/questionnaire/index.html:0 +#: templates/web/fixmystreet/questionnaire/index.html:15 +#: templates/web/fixmystreet/questionnaire/index.html:33 +#: templates/web/fixmystreet/questionnaire/index.html:5 +msgid "Questionnaire" +msgstr "Dotazník" + +#: templates/web/base/admin/timeline.html:30 +msgid "Questionnaire %d answered for problem %d, %s to %s" +msgstr "Dotazník %d odpověděl na hlášení %d, %s to %s" + +#: templates/web/base/admin/timeline.html:28 +msgid "Questionnaire %d sent for problem %d" +msgstr "Dotazník %d poslal k hlášení %d" + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +msgid "Questionnaire filled in by problem reporter" +msgstr "Dotazník vyplňuje uživatel, který podal hlášení problému" + +#: templates/web/base/alert/_list.html:21 +#: templates/web/base/around/display_location.html:1 +#: templates/web/base/around/display_location.html:3 +#: templates/web/base/report/display.html:50 +#: templates/web/base/reports/_rss.html:1 +#: templates/web/fixmystreet/alert/_list.html:22 +#: templates/web/fixmystreet/alert/updates.html:9 +#: templates/web/fixmystreet/report/display.html:58 +msgid "RSS feed" +msgstr "RSS kanál" + +#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 +msgid "RSS feed for %s" +msgstr "RSS kanál pro %s" + +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 +msgid "RSS feed for %s ward, %s" +msgstr "RSS kanál pro oblast %s, %s" + +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 +#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +msgid "RSS feed of %s" +msgstr "RSS kanál pro %s" + +#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 +msgid "RSS feed of %s, within %s ward" +msgstr "RSS kanál pro %s, v oblasti %s " + +#: templates/web/base/alert/_list.html:21 +#: templates/web/fixmystreet/alert/_list.html:22 +msgid "RSS feed of nearby problems" +msgstr "RSS kanál hlášení v okolí" + +#: templates/web/base/reports/_rss.html:1 +msgid "RSS feed of problems in this %s" +msgstr "RSS kanál hlášení v oblasti %s" + +#: perllib/FixMyStreet/Cobrand/Default.pm:651 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 +#: perllib/FixMyStreet/Cobrand/UK.pm:214 +msgid "RSS feed of problems within %s" +msgstr "RSS kanál hlášení v oblasti %s" + +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:220 +msgid "RSS feed of problems within %s ward" +msgstr "RSS kanál hlášení v oblasti %s " + +#: templates/web/base/around/display_location.html:1 +#: templates/web/base/around/display_location.html:4 +msgid "RSS feed of recent local problems" +msgstr "RSS kanál aktuálních lokálních hlášení" + +#: templates/web/base/report/display.html:50 +#: templates/web/fixmystreet/alert/updates.html:9 +#: templates/web/fixmystreet/report/display.html:58 +msgid "RSS feed of updates to this problem" +msgstr "RSS kanál aktualizací tohoto hlášení" + +#: templates/web/base/alert/updates.html:9 +#: templates/web/base/report/display.html:41 +#: templates/web/fixmystreet/alert/updates.html:14 +#: templates/web/fixmystreet/report/display.html:60 +msgid "Receive email when updates are left on this problem." +msgstr "Dostávat e-mail, když je hlášení aktualizováno." + +#: templates/web/base/around/display_location.html:0 +#: templates/web/base/around/display_location.html:33 +msgid "Recent local problems, FixMyStreet" +msgstr "Aktuální lokální hlášení, FixMyStreet" + +#: templates/web/base/reports/index.html:24 +msgid "Recently <br>fixed" +msgstr "Aktuálně <br>vyřešené" + +#: templates/web/base/index.html:30 +#: templates/web/fixmystreet/front/recent.html:11 +msgid "Recently reported problems" +msgstr "Nedávno nahlášené problémy" + +#: templates/web/zurich/report/new/notes.html:5 +msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website." +msgstr "Uvědomte si, že FixMyStreet je především pro hlášení fyzických problémů, které mohou být opraveny. Pokud váš problém není vhodný pro hlášení prostřednictvím tohoto webu, můžete se obrátit na váš úřad přímo pomocí jejich internetových stránek." + +#: templates/web/base/admin/report_blocks.html:16 +msgid "Remove flag" +msgstr "Odstranit příznak" + +#: templates/web/base/admin/report_edit.html:110 +#: templates/web/base/admin/update_edit.html:62 +#: templates/web/zurich/admin/update_edit.html:35 +msgid "Remove photo (can't be undone!)" +msgstr "Odstranit fotografii (nelze vrátit zpět!)" + +#: templates/web/fixmystreet/header_logo.html:2 +msgid "Report" +msgstr "" + +#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/zurich/footer.html:17 +#: templates/web/zurich/nav_over_content.html:4 +msgid "Report a problem" +msgstr "Nahlásit problém" + +#: templates/web/fixmystreet/report/display.html:32 +msgid "Report abuse" +msgstr "Nevhodný obsah" + +#: perllib/FixMyStreet/App/Controller/Rss.pm:295 +msgid "Report on %s" +msgstr "Hlášení na webu %s" + +#: templates/web/base/report/new/fill_in_details_form.html:1 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 +msgid "Report your problem" +msgstr "Nahlášení problému" + +#: templates/web/base/index.html:11 +#: templates/web/fixmystreet/around/intro.html:1 +#: templates/web/zurich/around/intro.html:1 +msgid "Report, view, or discuss local problems" +msgstr "Hlášení, zobrazení a diskuse nad lokálními problémy" + +#: templates/web/base/my/my.html:82 +msgid "Reported %s" +msgstr "Nahlášeno uživatelem" + +#: templates/web/base/my/my.html:80 +msgid "Reported %s, to %s" +msgstr "Nahlášeno uživatelem %s, určeno pro %s" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:580 +#: templates/web/base/contact/index.html:50 +#: templates/web/fixmystreet/contact/index.html:65 +msgid "Reported anonymously at %s" +msgstr "Nahlášeno anonymně v %s" + +#: templates/web/base/admin/questionnaire.html:5 +#: templates/web/base/questionnaire/index.html:53 +#: templates/web/fixmystreet/questionnaire/index.html:72 +msgid "Reported before" +msgstr "Hlásil(a) jsem již dříve" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: templates/web/base/contact/index.html:52 +#: templates/web/fixmystreet/contact/index.html:67 +msgid "Reported by %s at %s" +msgstr "Nahlášeno uživatelem %s, určeno pro %s" + +#: templates/web/zurich/report/_main.html:2 +msgid "Reported in the %s category" +msgstr "Nahlášeno v kategorii %s" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:576 +msgid "Reported in the %s category anonymously at %s" +msgstr "Nahlášeno anonymně v %s v kategorii %s" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:598 +msgid "Reported in the %s category by %s at %s" +msgstr "Nahlášeno v kategorii %s uživatelem %s v %s" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +msgid "Reported via %s anonymously at %s" +msgstr "Nahlášeno prostřednictvím %s anonymně v %s" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 +msgid "Reported via %s by %s at %s" +msgstr "Nahlášeno prostřednictvím %s uživatelem %s v %s" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 +msgid "Reported via %s in the %s category anonymously at %s" +msgstr "Nahlášeno prostřednictvím %s v kategorii %s anonymně v %s" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 +msgid "Reported via %s in the %s category by %s at %s" +msgstr "Nahlášeno prostřednictvím %s v kategorii %s uživatelem %s v %s" + +#: templates/web/base/reports/index.html:21 +#, fuzzy +msgid "Reported within the last four weeks" +msgstr "Nahlášeno v kategorii %s" + +#: templates/web/base/around/around_index.html:1 +#: templates/web/base/around/around_index.html:3 +#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/report/new/fill_in_details.html:0 +#: templates/web/base/report/new/fill_in_details.html:5 +#: templates/web/fixmystreet/around/around_index.html:2 +#: templates/web/zurich/report/new/fill_in_details_form.html:2 +msgid "Reporting a problem" +msgstr "Hlášení problému" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:294 +#: templates/web/zurich/header.html:60 +msgid "Reports" +msgstr "Hlášení" + +#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 +msgid "Reports are limited to %s characters in length. Please shorten your report" +msgstr "Délka hlášení je omezena na %s znaků. Prosím, zkraťte své hlášení" + +#: templates/web/zurich/admin/index-sdm.html:7 +msgid "Reports awaiting approval" +msgstr "Hlášení čekající na schválení" + +#: templates/web/base/around/tabbed_lists.html:3 +msgid "Reports on and around the map" +msgstr "Hlášení v mapě" + +#: templates/web/zurich/admin/index-sdm.html:10 +msgid "Reports published" +msgstr "Publikovaná hlášení" + +#: templates/web/base/admin/report_edit.html:85 +msgid "Resend report" +msgstr "Znovu odeslané hlášení" + +#: templates/web/base/js/translation_strings.html:28 +msgid "Right place?" +msgstr "Správné místo?" + +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:167 +#: perllib/FixMyStreet/Geocode/OSM.pm:152 +msgid "Road operator for this named road (derived from road reference number and type): %s" +msgstr "" + +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:164 +#: perllib/FixMyStreet/Geocode/OSM.pm:149 +msgid "Road operator for this named road (from OpenStreetMap): %s" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1403 +#: templates/web/base/admin/report_edit.html:106 +#: templates/web/zurich/admin/report_edit.html:73 +msgid "Rotate Left" +msgstr "Otočit doleva" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: templates/web/base/admin/report_edit.html:107 +#: templates/web/zurich/admin/report_edit.html:74 +msgid "Rotate Right" +msgstr "Otočit doprava" + +#: templates/web/base/js/translation_strings.html:46 +msgid "Satellite" +msgstr "Satelitní" + +#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/category_edit.html:81 +#: templates/web/zurich/admin/body.html:59 +msgid "Save changes" +msgstr "Uložit změny" + +#: templates/web/base/admin/reports.html:1 +#: templates/web/zurich/admin/reports.html:1 +msgid "Search Reports" +msgstr "Vyhledat hlášení" + +#: templates/web/base/admin/users.html:1 +msgid "Search Users" +msgstr "Vyhledat uživatele" + +#: templates/web/zurich/header.html:77 +msgid "Search reports" +msgstr "Vyhledat hlášení" + +#: templates/web/base/admin/reports.html:5 +#: templates/web/base/admin/users.html:8 +#: templates/web/zurich/admin/reports.html:5 +msgid "Search:" +msgstr "Vyhledat:" + +#: templates/web/base/admin/reports.html:26 +msgid "Searching found no reports." +msgstr "Nebylo nalezeno žádné hlášení." + +#: templates/web/base/admin/users.html:41 +msgid "Searching found no users." +msgstr "Nebyli nalezeni žádní sledovaní uživatelé." + +#: templates/web/base/admin/body-form.html:33 +#: templates/web/zurich/admin/body-form.html:16 +msgid "Select a body" +msgstr "Zvolte subjekt" + +#: templates/web/base/reports/index.html:9 +msgid "Select a particular council to see the reports sent there." +msgstr "Vyberte konkrétní instituce a" + +#: templates/web/base/admin/body-form.html:71 +#: templates/web/zurich/admin/body-form.html:26 +msgid "Select an area" +msgstr "Zvolte oblast" + +#: templates/web/base/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 "Vyberte, jaký typ upozornění chcete a klikněte na tlačítko pro RSS kanály, nebo zadejte svou e-mailovou adresu k odběru e-mailového upozornění." + +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 +msgid "Sent to %s %s later" +msgstr "odesláno do %s o %s později" + +#: templates/web/base/admin/report_edit.html:84 +msgid "Sent:" +msgstr "Odeslat:" + +#: templates/web/base/admin/report_edit.html:89 +#: templates/web/zurich/admin/stats.html:45 +msgid "Service:" +msgstr "Služba:" + +#: templates/web/fixmystreet/report/display.html:38 +msgid "Share" +msgstr "Sdílet" + +#: templates/web/base/report/new/fill_in_details_form.html:192 +#: templates/web/base/report/update-form.html:157 +#: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 +#: templates/web/fixmystreet/report/update-form.html:146 +msgid "Show my name publicly" +msgstr "Zobrazit moje jméno veřejně" + +#: templates/web/base/around/display_location.html:67 +msgid "Show old" +msgstr "Zobrazit stará" + +#: templates/web/base/around/display_location.html:58 +msgid "Show pins" +msgstr "Zobrazit značky" + +#: templates/web/base/auth/general.html:3 +#: templates/web/base/auth/general.html:49 +#: templates/web/fixmystreet/auth/general.html:4 +#: templates/web/fixmystreet/auth/general.html:43 +#: templates/web/fixmystreet/auth/general.html:64 +#: templates/web/zurich/auth/general.html:18 +#: templates/web/zurich/auth/general.html:35 +msgid "Sign in" +msgstr "Přihlásit se" + +#: templates/web/base/auth/general.html:74 +msgid "Sign in by email" +msgstr "Přihlásit se pomocí e-mailu" + +#: templates/web/base/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 "Přihlaste se nebo si vytvořte účet" + +#: templates/web/base/auth/sign_out.html:1 templates/web/base/header.html:30 +#: templates/web/zurich/auth/sign_out.html:1 +msgid "Sign out" +msgstr "Odhlásit se" + +#: templates/web/base/header.html:29 +msgid "Signed in as %s" +msgstr "Přihlášen as %s" + +#: templates/web/base/report/new/fill_in_details_text.html:1 +msgid "Some categories may require additional information." +msgstr "Nekteré kategorie mohou vyžadovat dodatečné informace." + +#: templates/web/base/admin/body-form.html:149 +#: templates/web/base/admin/body-form.html:150 +msgid "" +"Some endpoints require an <strong>API key</strong> to indicate that the reports are being\n" +" sent from your FixMyStreet installation." +msgstr "" + +#: templates/web/base/alert/index.html:42 +msgid "Some photos of recent reports" +msgstr "Některé fotografie současných hlášení" + +#: perllib/FixMyStreet/App/View/Email.pm:32 +#: perllib/FixMyStreet/App/View/Web.pm:43 +msgid "Some text to localize" +msgstr "Specifický název pro lokalizaci" + +#: perllib/FixMyStreet/Cobrand/UK.pm:78 +msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." +msgstr "Je nám líto, že se zdá, že toto PSČ nepokrýváme." + +#: templates/web/base/tokens/abuse.html:5 +msgid "Sorry, there has been an error confirming your problem." +msgstr "Omlouváme se, došlo k chybě potvrzující váš problém." + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:214 +#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 +#: perllib/FixMyStreet/Geocode/Google.pm:47 +#: perllib/FixMyStreet/Geocode/OSM.pm:48 +msgid "Sorry, we could not find that location." +msgstr "Nemůžeme bohužel nalézt tuto lokalitu." + +#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: perllib/FixMyStreet/Geocode/Google.pm:44 +#: perllib/FixMyStreet/Geocode/Zurich.pm:87 +msgid "Sorry, we could not parse that location. Please try again." +msgstr "Omlouváme se, nelze lokalizovat. Zkuste ještě jednou." + +#: templates/web/base/admin/stats.html:64 +msgid "Start Date:" +msgstr "Počáteční datum:" + +#: templates/web/base/admin/body.html:69 +#: templates/web/base/admin/flagged.html:18 +#: templates/web/base/admin/list_updates.html:11 +#: templates/web/base/admin/reports.html:15 +#: templates/web/fixmystreet/report/update-form.html:26 +msgid "State" +msgstr "Stav" + +#: templates/web/base/admin/report_edit.html:47 +#: templates/web/base/admin/update_edit.html:27 +#: templates/web/base/report/update-form.html:28 +#: templates/web/zurich/admin/report_edit-sdm.html:53 +#: templates/web/zurich/admin/report_edit.html:84 +#: templates/web/zurich/admin/update_edit.html:17 +msgid "State:" +msgstr "Stav:" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:308 +#: templates/web/base/admin/stats.html:1 +#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 +msgid "Stats" +msgstr "Statistiky" + +#: 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 "Stav" + +#: templates/web/base/report/updates.html:10 +msgid "Still open, via questionnaire, %s" +msgstr "Stále otevřeno, prostřednictvím dotazníku, %s" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 +msgid "Subcategory: %s" +msgstr "Podkategorie: %s" + +#: templates/web/zurich/admin/index-dm.html:27 +msgid "Subdivision/Body" +msgstr "Oddělení/Instituce" + +#: templates/web/fixmystreet/contact/index.html:98 +msgid "Subject" +msgstr "Předmět" + +#: templates/web/base/admin/report_edit.html:19 +#: templates/web/base/contact/index.html:88 +#: templates/web/base/report/new/fill_in_details_form.html:53 +#: templates/web/zurich/admin/report_edit.html:34 +msgid "Subject:" +msgstr "Předmět:" + +#: templates/web/base/questionnaire/creator_fixed.html:19 +#: templates/web/base/report/new/fill_in_details_form.html:136 +#: templates/web/base/report/new/fill_in_details_form.html:158 +#: templates/web/base/report/new/fill_in_details_form.html:96 +#: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:91 +msgid "Submit" +msgstr "Odeslat" + +#: templates/web/base/admin/report_edit.html:113 +#: templates/web/base/admin/update_edit.html:65 +#: templates/web/base/admin/user-form.html:56 +#: templates/web/zurich/admin/report_edit-sdm.html:64 +#: templates/web/zurich/admin/report_edit.html:221 +#: templates/web/zurich/admin/update_edit.html:38 +msgid "Submit changes" +msgstr "Odeslat změny" + +#: templates/web/base/questionnaire/index.html:88 +#: templates/web/fixmystreet/questionnaire/index.html:106 +msgid "Submit questionnaire" +msgstr "Odeslat dotazník" + +#: perllib/FixMyStreet/Cobrand/Zurich.pm:134 +#: 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:86 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/reports.html:13 +#: templates/web/zurich/report/banner.html:9 +msgid "Submitted" +msgstr "Odesláno" + +#: templates/web/base/alert/updates.html:17 +#: templates/web/base/report/display.html:46 +#: templates/web/fixmystreet/alert/updates.html:23 +#: templates/web/fixmystreet/report/display.html:65 +msgid "Subscribe" +msgstr "Přihlásit se k odběru" + +#: templates/web/base/alert/_list.html:97 +#: templates/web/fixmystreet/alert/_list.html:92 +msgid "Subscribe me to an email alert" +msgstr "Přihlásit se k odběru emailových upozornění" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1191 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:293 +#: templates/web/base/admin/bodies.html:25 +#: templates/web/base/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 "Přehled" + +#: templates/web/base/reports/index.html:1 +#: templates/web/zurich/reports/index.html:0 +#: templates/web/zurich/reports/index.html:4 +msgid "Summary reports" +msgstr "Souhrnný přehled" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 +msgid "Survey" +msgstr "Průzkum" + +#: templates/web/base/admin/questionnaire.html:1 +msgid "Survey Results" +msgstr "Výsledky průzkumu" + +#: templates/web/base/admin/list_updates.html:12 +#: templates/web/zurich/admin/list_updates.html:10 +#: templates/web/zurich/admin/list_updates.html:31 +msgid "Text" +msgstr "Text" + +#: templates/web/base/admin/body.html:28 +msgid "Text only version" +msgstr "Pouze textová verze" + +#: templates/web/base/admin/update_edit.html:20 +#: templates/web/zurich/admin/update_edit.html:12 +msgid "Text:" +msgstr "Text:" + +#: templates/web/base/tokens/confirm_problem.html:12 +msgid "Thank you for reporting this issue!" +msgstr "" + +#: templates/web/base/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 "Děkujeme, že se snažíte poslat aktualizaci nebo hlášení. Zdá se, že máme sami chybu v systému, tak <a href=\"%s\">, prosím, dejte nám vědět, co se děje </a> a my se na to podíváme." + +#: templates/web/base/tokens/confirm_update.html:15 +msgid "Thank you for updating this issue!" +msgstr "" + +#: templates/web/base/contact/submit.html:6 +#: templates/web/base/questionnaire/completed.html:5 +msgid "Thank you for your feedback" +msgstr "" + +#: templates/web/fixmystreet/around/around_index.html:28 +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 :" +msgstr "Děkujeme za nahrání fotografie. Nyní je třeba lokalizovat Vaše hlášení, proto prosím zadejte název nedaleké ulice nebo poštovní směrovací číslo do pole nad & nbsp;: " + +#: templates/web/base/questionnaire/creator_fixed.html:9 +msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" +msgstr "Díky, rádi slyšíme, že to bylo vyřešeno! Můžeme se ještě zeptat, jestli jste někdy předtím hlásili úřadům problém?" + +#: perllib/FixMyStreet/App/Controller/Photo.pm:195 +msgid "That image doesn't appear to have uploaded correctly (%s), please try again." +msgstr "Zdá se, že se obrázek nenahrál správně (%s), zkuste to prosím znovu." + +#: perllib/FixMyStreet/App/Controller/Council.pm:97 +msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." +msgstr "Zdá se, že tato lokalita nepatří do žádné městské části nebo obecního úřadu na území ČR. Možná se jedná o offshore nebo se nachází v zahraničí. Zkuste to prosím znovu." + +#: perllib/FixMyStreet/App/Controller/Location.pm:126 +msgid "That location does not appear to be in the UK; please try again." +msgstr "To místo se nezdá být v České republice; prosím zkuste to znovu." + +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 +#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 +#: perllib/FixMyStreet/Cobrand/UK.pm:71 +msgid "That postcode was not recognised, sorry." +msgstr "Omlouváme se, ale poštovní směrovací číslo nebylo rozpoznáno." + +#: perllib/FixMyStreet/App/Controller/Admin.pm:712 +#, fuzzy +msgid "That problem has been marked as sent." +msgstr "Hlášení bude nyní opět odesláno." + +#: perllib/FixMyStreet/App/Controller/Admin.pm:704 +msgid "That problem will now be resent." +msgstr "Hlášení bude nyní opět odesláno." + +#: perllib/FixMyStreet/App/Controller/Report.pm:118 +msgid "That report cannot be viewed on %s." +msgstr "Tento report nemůže být zobrazen na %s." + +#: perllib/FixMyStreet/App/Controller/Report.pm:111 +msgid "That report has been removed from FixMyStreet." +msgstr "Toto hlášení bylo vyjmuto z FixMyStreet." + +#: templates/web/base/admin/body.html:144 +msgid "" +"The <strong>email address</strong> is the destination to which reports about this category will be sent. \n" +" Other categories for this body may have the same email address." +msgstr "" +"<Strong>E-mailová adresa </strong> je cíl, kterému zprávy o této kategorii budou odeslány. \n" +" Ostatní kategorie tohoto subjektu mohou mít stejnou e-mailovou adresu." + +#: templates/web/base/admin/body-form.html:123 +#: templates/web/base/admin/body-form.html:124 +msgid "" +"The <strong>endpoint</strong> is the URL of the service that FixMyStreet will connect to \n" +" when sending reports to this body." +msgstr "" +"strong>Endpoint</strong> je adresa URL služby, která FixMyStreet propojí \n" +" s interním systémem daného subjektu." + +#: templates/web/base/admin/body-form.html:136 +#: templates/web/base/admin/body-form.html:137 +msgid "" +"The <strong>jurisdiction</strong> is only needed if the endpoint is serving more\n" +" than one. If the body is running its own endpoint, you can usually leave this blank." +msgstr "" + +#: templates/web/base/admin/body-form.html:94 +#: templates/web/base/admin/body-form.html:95 +msgid "" +"The <strong>send method</strong> determines how problem reports will be sent to the body.\n" +" If you leave this blank, <strong>send method defaults to email</strong>." +msgstr "" + +#: templates/web/base/open311/index.html:90 +msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." +msgstr "" + +#: templates/web/base/admin/body-form.html:11 +#: templates/web/base/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 "" +"<strong>Název</strong> identifikuje subjekt (například, <em>Úřad městské části Praha 21</em>), \n" +" název může být zobrazen veřejně." + +#: templates/web/base/auth/token.html:19 templates/web/base/email_sent.html:6 +msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." +msgstr "Zaslání potvrzovacího e-mailu <strong> může </strong> trvat několik minut, & ndash; <em> prosím </em>, buďte trpěliví." + +#: templates/web/base/report/new/fill_in_details_text.html:1 +#: templates/web/base/report/new/fill_in_details_text.html:3 +msgid "The council won’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 "Úřad nebude moci pomoci, pokud ve svém hlášení nezadáte dostatek podrobností. Popište, prosím, přesné umístění problému (například na zdi), co tam je, jak dlouho to tam bylo a td. Uveďte popis včetně fotografie problému, pokud ji máte." + +#: templates/web/fixmystreet/questionnaire/index.html:44 +msgid "The details of your problem are available from the other tab above." +msgstr "Podrobnosti vašeho hlášení jsou dostupné v záložce nahoře." + +#: templates/web/base/questionnaire/index.html:25 +msgid "The details of your problem are available on the right hand side of this page." +msgstr "Podrobnosti vašeho hlášení jsou dostupné na pravé straně této stránky." + +#: templates/web/base/admin/edit-league.html:3 +#: templates/web/base/admin/edit-league.html:4 +msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." +msgstr "Tabulka Vítězů ukazuje aktivity editorů (kdo editoval nejvíce záznamů)." + +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 +#: perllib/FixMyStreet/App/Controller/Reports.pm:78 +msgid "The error was: %s" +msgstr "Nastala chyba: %s" + +#: templates/web/base/open311/index.html:86 +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:159 +#: perllib/FixMyStreet/Geocode/OSM.pm:144 +msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap." +msgstr "" + +#: 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 "Poslední lokální problémy od uživatelů" + +#: db/alert_types_eha.pl:13 +msgid "The latest local reports reported by users" +msgstr "Poslední lokální hlášení od uživatelů" + +#: db/alert_types.pl:35 +msgid "The latest problems for {{COUNCIL}} reported by users" +msgstr "Poslední hlášení uživatelů pro {{COUNCIL}}" + +#: db/alert_types.pl:39 +msgid "The latest problems for {{COUNCIL}} within {{WARD}} ward reported by users" +msgstr "Poslední hlášení uživatelů pro {{COUNCIL}} v oblasti {{WARD}} " + +#: db/alert_types.pl:11 +msgid "The latest problems reported by users" +msgstr "Poslední hlášení uživatelů" + +#: db/alert_types.pl:15 +msgid "The latest problems reported fixed by users" +msgstr "Poslední hlášení uživateli označená za vyřešená" + +#: db/alert_types.pl:43 +msgid "The latest problems within {{NAME}}'s boundary reported by users" +msgstr "Poslední hlášení uživatelů pro {{NAME}}" + +#: db/alert_types_eha.pl:9 +msgid "The latest properties reported back to use by users" +msgstr "Poslední nemovitosti hlášené uživateli jako zpět předané k užívání" + +#: db/alert_types_eha.pl:20 +msgid "The latest reports for {{COUNCIL}} reported by users" +msgstr "Poslední hlášení uživatelů pro {{COUNCIL}} " + +#: db/alert_types_eha.pl:24 +msgid "The latest reports for {{COUNCIL}} within {{WARD}} ward reported by users" +msgstr "Poslední hlášení uživatelů pro {{COUNCIL}} v oblasti {{WARD}} " + +#: db/alert_types_eha.pl:28 +msgid "The latest reports within {{NAME}}'s boundary reported by users" +msgstr "Poslední hlášení uživatelů pro {{NAME}}" + +#: templates/web/base/admin/body-form.html:58 +msgid "The list of available areas is being provided by the MapIt service at %s." +msgstr "Seznam oblastí byl povolen službou MapIt na adrese %s." + +#: templates/web/base/auth/change_password.html:12 +#: templates/web/base/auth/change_password.html:16 +msgid "The passwords do not match" +msgstr "Heslo se neshoduje" + +#: templates/web/base/errors/page_error_404_not_found.html:10 +#: templates/web/base/errors/page_error_404_not_found.html:12 +msgid "The requested URL '%s' was not found on this server" +msgstr "Požadovaná adresa URL '%s' nebyla na tomto serveru nalezena" + +#: templates/web/base/alert/_list.html:14 +#: templates/web/fixmystreet/alert/_list.html:16 +msgid "The simplest alert is our geographic one:" +msgstr "Nejjednodušší upozornění je jedno z našich geografických:" + +#: templates/web/base/report/new/councils_extra_text.html:1 +#: templates/web/base/report/new/councils_text_some.html:10 +#: templates/web/base/report/new/fill_in_details_form.html:18 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:14 +msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." +msgstr "Souhrn a popisy budou také veřejné (čtěte naše<a href=\"/privacy\">zásady ochrany osobních údajů</a>)" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:300 +msgid "The user could not locate the problem on a map, but to see the area around the location they entered" +msgstr "Uživatel nemohl lokalizovat problém v mapě, ale je zobrazeno okolí lokality při zadání hlášení" + +#: templates/web/base/admin/user-form.html:12 +#: templates/web/base/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 "" +"<strong> Jména </strong> uživatelů se objeví veřejně v hlášeních, která nebyla označena jako <em> anonymní</em>. \n" +" Jména nejsou nutně jedinečná." + +#: templates/web/base/reports/_problem-list.html:15 +msgid "There are no reports to show." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Reports.pm:75 +msgid "There was a problem showing the All Reports page. Please try again later." +msgstr "Nastal problém v zobrazení stránky Všechna hlášení. Prosím, zkuste později." + +#: perllib/FixMyStreet/App/Controller/Contact.pm:136 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59 +msgid "There was a problem showing this page. Please try again later." +msgstr "Nastal problém v zobrazení této stránky. Prosím, zkuste později." + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:762 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 +#: templates/web/base/auth/general.html:23 +#: templates/web/fixmystreet/auth/general.html:25 +#: 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 ‘sign in by email’ section of the form." +msgstr "Byl problém s kombinací e-mailu a hesla. Pokud si nemůžete vzpomenout na své heslo, nebo ho ještě nemáte, zadejte ho v sekci lsquo, přihlášení se prostřednictvím e-mailu & rsquo; tohoto formuláře." + +#: perllib/FixMyStreet/App/Controller/Alert.pm:355 +msgid "There was a problem with your email/password combination. Please try again." +msgstr "Nastal problém s kombinací Vaší e-mailové adresy a hesla. Prosím zkuste znovu." + +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:272 +msgid "There was a problem with your update. Please try again." +msgstr "Nastal problém s vaší aktualizací. Prosím opakujte ještě jednou." + +#: perllib/FixMyStreet/App/Controller/Contact.pm:140 +msgid "There were problems with your report. Please see below." +msgstr "Nastal problém s vaším hlášením. Prosím, přečtěte si informace níže." + +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:300 +msgid "There were problems with your update. Please see below." +msgstr "Nastal problém s Vaší aktualizací. Prosím, přečtěte si informace níže." + +#: templates/web/base/admin/body-form.html:112 +#: templates/web/base/admin/body-form.html:113 +msgid "" +"These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.<br>\n" +" <strong>You don't need to set them if the Send Method is email.</strong>.\n" +" For more information on Open311, see \n" +" <a href='https://www.mysociety.org/2013/01/17/open311-explained/' class='admin-offsite-link'>this article</a>.\n" +" " +msgstr "" +"Tato nastavení jsou určena pro subjekty, které využívají Open311 (nebo jiné back-end integrace) pro příjem hlášení a zpráv o problémech. <br> \n" +" <strong> Není nutné je nastavovat, pokud je zasílání nastaveno e-mailem. </strong>. \n" +" Pro více informací o Open311, viz \n" +" <a href='https://www.mysociety.org/2013/01/17/open311-explained/' class='admin-offsite-link'>tento článek </a>. \n" +" " + +#: templates/web/base/open311/index.html:77 +msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." +msgstr "Na implementaci API se stále pracuje a není dosud stabilní. V budoucnu se může bez upozornění změnit." + +#: templates/web/base/admin/body.html:44 +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 "" +"Tento subjekt nepokrývá žádnou oblast. To znamená, že nemá žádnou pravomoc řešit nahlášené problémy <em> na jakémkoli místě </em>. \n" +" V důsledku toho se žádná z jejích kategorií neobjeví v rozbalovacím menu kategorií, když uživatelé hlásí problémy. \n" +" V současné době <strong> nemohou uživatelé tomuto subjektu reportovat žádné problémy </strong>." + +#: templates/web/base/admin/body.html:54 +msgid "This body has no contacts. This means that currently problems reported to this body <strong>will not be sent</strong>." +msgstr "Úřad nemá nastaven žádný kontakt. To znamená, že nahlášené problémy tomuto úřadu<strong>nebudou zasílány</strong>." + +#: templates/web/base/admin/body-form.html:52 +#: templates/web/base/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 "" +"Tomuto úřadu budou zasálána pouze hlášení o problémech, která jsou umístěna v <strong> oblasti pokrytí</strong>. \n" +" Úřad nebude dostávat žádné zprávy, pokud nepokrývá alespoň jednu vybranou oblast." + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:394 +msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." +msgstr "Tento e-mail byl odeslán na oba úřady působící v dané lokalitě, protože uživatel hlášení nekategorizoval. Prosím ignorujte, pokud nejste oprávněný úřad kompetentní řešit nahlášený problém nebo nám dejte vědět, jaká je to kategorie problémů a kdo jí má na starosti, my jí doplníme do našeho systému." + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 +msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." +msgstr "Tento e-mail byl odeslán na několik úřadů působících v dané lokalitě, protože zvolená kategorie hlášení je uvedena pro všechny z nich. Prosím ignorujte, pokud nejste oprávněný úřad kompetentní řešit nahlášený problém." + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:902 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:972 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/Cobrand/UK.pm:43 +msgid "This information is required" +msgstr "Tato informace je vyžadována" + +#: templates/web/base/debug_header.html:3 +msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." +msgstr "Toto je vývojářský web; věci mohou kdykoli přestat fungovat, databáze bude pravidelně mazána." + +#: templates/web/base/reports/index.html:7 +msgid "This is a summary of all reports on this site." +msgstr "Zde je souhrn všech hlášení na tomto webu." + +#: templates/web/base/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 "To může být proto, že odkaz je příliš starý nebo již použitý, nebo adresa nebyla správně zkopírována." + +#: templates/web/base/report/banner.html:15 +msgid "This problem has been closed" +msgstr "Hlášení bylo uzavřeno" + +#: templates/web/base/report/banner.html:12 +#: templates/web/base/report/update-form.html:48 +#: templates/web/fixmystreet/report/update-form.html:46 +msgid "This problem has been fixed" +msgstr "Hlášení bylo vyřešeno" + +#: templates/web/base/report/update-form.html:43 +#: templates/web/fixmystreet/report/update-form.html:40 +msgid "This problem has not been fixed" +msgstr "Hlášení nemohlo být vyřešeno" + +#: templates/web/base/report/banner.html:19 +msgid "This problem is in progress" +msgstr "Řešení hlášení probíhá" + +#: templates/web/base/report/banner.html:9 +msgid "This problem is old and of unknown status." +msgstr "Hlášení je zastaralé a není znám stav." + +#: perllib/FixMyStreet/Cobrand/Zurich.pm:131 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:132 +#: templates/web/zurich/report/_main.html:14 +msgid "This report is awaiting moderation." +msgstr "Hlášení čeká na moderování operátorem." + +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:87 +msgid "This report is currently marked as closed." +msgstr "Hlášení je aktuálně označené za uzavřené." + +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:85 +msgid "This report is currently marked as fixed." +msgstr "Hlášení je aktuálně označené za vyřešené." + +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:89 +msgid "This report is currently marked as open." +msgstr "Hlášení je aktuálně označené za otevřené." + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:311 +msgid "This report was submitted anonymously" +msgstr "Hlášení bylo zasláno anonymně." + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:293 +msgid "This web page also contains a photo of the problem, provided by the user." +msgstr "Webová stránka také obsahuje fotografii hlášení, poskytnutou uživatelem." + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 +#: templates/web/base/admin/timeline.html:1 +msgid "Timeline" +msgstr "Časová osa" + +#: templates/web/base/admin/flagged.html:15 +#: templates/web/base/admin/reports.html:12 +msgid "Title" +msgstr "Nadpis" + +#: templates/web/base/around/_report_banner.html:2 +msgid "To <strong>report a problem</strong>, click on the map at the correct location." +msgstr "Pro <Strong> nahlášení problému </strong>, klikněte na mapě na správném místě." + +#: templates/web/base/alert/index.html:27 +msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" +msgstr "Pokud chcete zjistit, jaká místní upozornění jsme pro Vás připravili, prosím, zadejte své poštovní směrovací číslo nebo název ulice či oblasti" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:299 +msgid "To view a map of the precise location of this issue" +msgstr "Pro zobrazení mapy přesného umístění tohoto problému" + +#: templates/web/base/admin/index.html:55 +#: templates/web/base/admin/questionnaire.html:24 +#: templates/web/base/admin/stats.html:24 +#: templates/web/base/admin/stats.html:43 +#: templates/web/zurich/admin/stats.html:30 +msgid "Total" +msgstr "Celkem" + +#: templates/web/base/js/translation_strings.html:29 +msgid "Try again" +msgstr "Opakujte znovu" + +#: templates/web/base/contact/submit.html:14 +msgid "Try emailing us directly:" +msgstr "" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 +#: templates/web/base/report/update-form.html:30 +#: templates/web/base/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 "Nelze opravit" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 +#: templates/web/base/admin/update_edit.html:28 +#: templates/web/zurich/admin/report_edit-sdm.html:45 +#: templates/web/zurich/admin/report_edit.html:58 +#: templates/web/zurich/admin/update_edit.html:18 +msgid "Unconfirmed" +msgstr "Nepotvrzeno" + +#: templates/web/fixmystreet/report/banner.html:9 +msgid "Unknown" +msgstr "Neznámé" + +#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +msgid "Unknown alert type" +msgstr "Neznámý typ upozornění" + +#: templates/web/base/js/translation_strings.html:39 +msgid "Unknown error" +msgstr "Neznámá chyba" + +#: perllib/FixMyStreet/App/Controller/Report.pm:106 +msgid "Unknown problem ID" +msgstr "Neznámé ID hlášení" + +#: templates/web/fixmystreet/report/update-form.html:19 +msgid "Update" +msgstr "Aktualizovat" + +#: templates/web/base/admin/timeline.html:33 +msgid "Update %s created for problem %d; by %s" +msgstr "Aktualizujte %s pro hlášení %d; vytvořené uživatelem %s" + +#: templates/web/base/contact/index.html:21 +#: templates/web/fixmystreet/contact/index.html:36 +msgid "Update below added anonymously at %s" +msgstr "Aktualizace níže byly přidána anonymně v %s" + +#: templates/web/base/contact/index.html:23 +#: templates/web/fixmystreet/contact/index.html:38 +msgid "Update below added by %s at %s" +msgstr "Aktualizace níže byly přidána uživatelem %s v %s" + +#: templates/web/base/admin/body-form.html:240 +#: templates/web/zurich/admin/body-form.html:51 +msgid "Update body" +msgstr "Aktualizace subjektu" + +#: templates/web/base/admin/index.html:49 +msgid "Update breakdown by state" +msgstr "Aktualizované členění podle stavu" + +#: db/alert_types.pl:7 +msgid "Update by {{name}}" +msgstr "Aktualizováno uživatelem {{name}}" + +#: templates/web/base/admin/update_edit.html:42 +#: templates/web/zurich/admin/update_edit.html:25 +msgid "Update changed problem state to %s" +msgstr "Aktualizací byl změněn stav hlášení na %s" + +#: templates/web/base/admin/update_edit.html:44 +msgid "Update marked problem as fixed" +msgstr "Nastavte označené hlášení za vyřešené" + +#: templates/web/base/admin/update_edit.html:46 +msgid "Update reopened problem" +msgstr "Aktualizovat znovu otevřené hlášení" + +#: templates/web/base/admin/body.html:101 +msgid "Update statuses" +msgstr "Aktualizovat status" + +#: templates/web/base/report/update-form.html:22 +msgid "Update:" +msgstr "Aktualizace:" + +#: 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 "Aktualizováno" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1014 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:808 +#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:556 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:625 +msgid "Updated!" +msgstr "Aktualizováno!" + +#: templates/web/base/admin/list_updates.html:2 +#: templates/web/base/report/update.html:3 +#: templates/web/fixmystreet/report/update.html:5 +#: templates/web/zurich/admin/list_updates.html:24 +#: templates/web/zurich/report/updates.html:2 +msgid "Updates" +msgstr "Aktualizace" + +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 +msgid "Updates are limited to %s characters in length. Please shorten your update" +msgstr "Aktualizace je omezena na %s znaků její délky. Prosím, zkraťte ji" + +#: db/alert_types.pl:5 db/alert_types.pl:6 +msgid "Updates on {{title}}" +msgstr "Aktualizace hlášení {{title}}" + +#: templates/web/base/report/display.html:0 +#: templates/web/base/report/display.html:5 +#: templates/web/fixmystreet/report/display.html:0 +#: templates/web/fixmystreet/report/display.html:9 +msgid "Updates to this problem, FixMyStreet" +msgstr "Aktualizace tohoto hlášení, FixMyStreet" + +#: templates/web/base/admin/body.html:182 +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 "<strong> Poznámka </strong> slouží pro záznam ifnormací, které jsou zobrazeny pouze v administraci. Poznámky nejsou zobrazeny veřejně a nejsou odeslány subjektům." + +#: templates/web/zurich/admin/list_updates.html:30 +#: templates/web/zurich/admin/list_updates.html:9 +msgid "User" +msgstr "Uživatel" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1357 +msgid "User flag removed" +msgstr "Uživatel vyjmut ze sledování" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1329 +msgid "User flagged" +msgstr "Uživatel sledován" + +#: templates/web/base/admin/users.html:5 +msgid "User search finds matches in users' names and email addresses." +msgstr "Při vyhledávání byly nalezeny shody v uživatelských jménech nebo e-mailových adresách." + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:307 +#: templates/web/base/admin/flagged.html:29 +#: templates/web/zurich/header.html:69 +msgid "Users" +msgstr "Uživatelé" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:374 +#: perllib/FixMyStreet/App/Controller/Admin.pm:404 +#: perllib/FixMyStreet/App/Controller/Admin.pm:421 +msgid "Values updated" +msgstr "Hodnoty aktualizovány" + +#: templates/web/base/admin/report_edit.html:18 +#: templates/web/base/admin/update_edit.html:18 +#: templates/web/zurich/admin/report_edit-sdm.html:21 +#: templates/web/zurich/admin/report_edit.html:20 +#: templates/web/zurich/admin/update_edit.html:10 +msgid "View report on site" +msgstr "Zobrazit hlášení na serveru" + +#: templates/web/base/reports/body.html:14 +msgid "View reports by ward" +msgstr "Zobrazení hlášení podle okrsků" + +#: templates/web/base/around/display_location.html:0 +#: templates/web/base/around/display_location.html:35 +msgid "Viewing a location" +msgstr "Zobrazení oblastí" + +#: templates/web/base/report/display.html:0 +#: templates/web/fixmystreet/report/display.html:0 +msgid "Viewing a problem" +msgstr "Zobrazení hlášení" + +#: templates/web/base/reports/body.html:16 +msgid "Wards of this council" +msgstr "Oddělení tohoto úřadu" + +#: templates/web/base/alert/choose.html:6 +#: templates/web/base/around/around_index.html:16 +#: templates/web/fixmystreet/around/around_index.html:17 +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 "Našli jsme více než jednu shodu pro požadovanou lokalitu. Nabízíme až 10 možných lokalit. Upřesněte prosím vyhledávání, pokud zde požadovanou lokalitu nenaleznete." + +#: templates/web/base/auth/token.html:8 +msgid "We have not been able to confirm your account - sorry." +msgstr "Omlouváme se, nebyli jsme schopni potvrdit Váš účet." + +#: templates/web/base/auth/token.html:16 +msgid "We have sent you an email containing a link to confirm your account." +msgstr "Odeslali jsme Vámi e-mail s odkazem pro potvrzení vašeho účtu." + +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:2 +#: templates/web/fixmystreet/report/update-form.html:77 +msgid "We never show your email" +msgstr "váš email nebude nezveřejněn" + +#: templates/web/fixmystreet/report/new/form_user_loggedin.html:31 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:65 +msgid "We never show your email address or phone number." +msgstr "Váš email a telefonní číslo nebudou nikde zveřejněny." + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:403 +msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." +msgstr "Uvědomujeme si, že za tento problém by mohl být odpovědný % s; Nicméně, nemáme na ně v současné době žádné kontaktní údaje. Pokud příslušné kontakty znáte, sem s nimi. " + +#: templates/web/base/index-steps.html:31 +msgid "We send it to the council on your behalf" +msgstr "Vaše upozornění pošleme kompetentním úřadům v dané lokalitě" + +#: templates/web/base/report/new/notes.html:4 +#: templates/web/zurich/report/new/notes.html:4 +msgid "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>" +msgstr "Osobní údaje budeme používat pouze v souladu s našimi <a href=\"/privacy\"> zásadami ochrany osobních údajů.</a>" + +#: templates/web/base/questionnaire/completed-open.html:2 +msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" +msgstr "" + +#: templates/web/base/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 "Rádi bychom znali Váš názor, co si myslíte o tomto webu. Stačí vyplnit formulář, nebo pošlete e-mail na <a href='mailto:%s'>% s </a>:" + +#: templates/web/base/contact/submit.html:7 +msgid "We’ll get back to you as soon as we can." +msgstr "" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 +msgid "What’s the issue, and where is it?" +msgstr "Co je to za problém, a kde to je?" + +#: templates/web/base/admin/category_edit.html:87 +#: templates/web/zurich/admin/body.html:18 +msgid "When edited" +msgstr "Editováno:" + +#: templates/web/base/admin/problem_row.html:35 +msgid "When sent" +msgstr "Odesláno:" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 +msgid "Whole block of empty flats" +msgstr "Celý blok prázdných bytů" + +#: templates/web/base/tokens/confirm_alert.html:7 +msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." +msgstr "" + +#: templates/web/base/open311/index.html:92 +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 "V požadavku pro vyhledávání je možné hledat s parametrem 'agency_responsible' a omezit požadavky vrácené zpět do administrace. Hledaný výraz je administrativní ID poskytnuté službou<a href=\"%s\"> MaPit </a>." + +#: templates/web/fixmystreet/front/footer-marketing.html:17 +msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." +msgstr "Chcete se podílet na rozvoji projektu FixMyStreet? Náš kód je open source a je k dispozici na <a href=\"http://fixmystreet.org\">fixmystreet.org </a>." + +#: templates/web/base/questionnaire/index.html:78 +#: templates/web/fixmystreet/questionnaire/index.html:97 +msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" +msgstr "Můžeme Vám za měsíc odeslat další dotazník, který Vám připomene zkontrolovat stav Vašeho hlášení?" + +#: templates/web/base/report/new/notes.html:7 +msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." +msgstr "Psaní zprávy pouze hůlkovým písmem je těžké číst, stejně jako chybějící interpunkce." + +#: templates/web/base/report/new/fill_in_details_form.html:4 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:5 +msgid "Wrong location? Just click again on the map." +msgstr "Chybná poloha? Stačí v mapě překliknout na jiné místo." + +#: templates/web/base/admin/stats.html:10 +msgid "Year" +msgstr "Rok" + +#: templates/web/base/admin/bodies.html:66 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 +#: templates/web/base/admin/category_edit.html:5 +#: templates/web/base/admin/flagged.html:47 +#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:34 +#: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/problem_row.html:20 +#: templates/web/base/admin/report_edit.html:76 +#: templates/web/base/admin/report_edit.html:93 +#: templates/web/base/admin/update_edit.html:24 +#: templates/web/base/admin/users.html:31 +#: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/questionnaire/index.html:42 +#: templates/web/base/questionnaire/index.html:81 +#: templates/web/fixmystreet/questionnaire/index.html:100 +#: templates/web/fixmystreet/questionnaire/index.html:61 +msgid "Yes" +msgstr "Ano" + +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:17 +#: templates/web/fixmystreet/report/update-form.html:91 +msgid "Yes I have a password" +msgstr "Ano mám heslo" + +#: templates/web/base/contact/index.html:39 +#: templates/web/fixmystreet/contact/index.html:54 +msgid "You are complaining that this problem report was unnecessarily moderated:" +msgstr "Stěžujete si, že toto hlášení bylo bezdůvodně moderováno:" + +#: templates/web/base/contact/index.html:41 +#: templates/web/fixmystreet/contact/index.html:56 +msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" +msgstr "Upozornění na níže uvedené hlášení, které může být urážlivé, obsahující osobní údaje či jiné nevhodné vyjádření." + +#: templates/web/base/contact/index.html:15 +#: templates/web/fixmystreet/contact/index.html:30 +msgid "You are reporting the following update for being abusive, containing personal information, or similar:" +msgstr "Upozorňuji na níže uvedený záznam, který může obsahovat urážlivé nebo osobní informace, případně jiný problematický text:" + +#: templates/web/zurich/tokens/confirm_problem.html:5 +#: templates/web/zurich/tokens/confirm_problem.html:8 +msgid "You can <a href=\"%s%s\">view the problem on this site</a>." +msgstr "Můžete <a href=\"%s%s\">zobrazit hlášení na tomto webu</a>." + +#: templates/web/base/admin/user-form.html:48 +msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." +msgstr "Můžete přidat e-mail zneužívajícího uživatele do seznamu zneužívání a hlášení těchto uživatelů budou skryty (nikdy nebudou odesílány)." + +#: templates/web/fixmystreet/contact/index.html:121 +msgid "You can contact technical support on <a href='mailto:%s'>%s</a>" +msgstr "Můžete kontaktovat technickou podporu <a href='mailto:%s'>%s</a>" + +#: templates/web/base/admin/flagged.html:5 +msgid "" +"You can flag any report or user by editing them, and they will be listed on this page.\n" +" For example, this can useful if you want to keep an eye on a user who has posted inappropriate\n" +" reports in the past." +msgstr "" +"Můžete při editaci zpráv nebo uživatelů nastavit příznak pro sledování a oni budou uvedeny na této stránce. \n" +" T máže být například užitečné, pokud chcete sledovat uživatele, kteří v minulosti publikovali nevhodný obsah." + +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 +#: templates/web/base/report/new/councils_text_some.html:21 +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 "Pomozte nám najít email na kontaktní osobu pro oblast <strong>%s </strong>a pošlete nám kontakt na adresu <a href='mailto:%s'>%s</a>." + +#: templates/web/base/admin/body-form.html:85 +msgid "You can mark a body as deleted if you do not want it to be active on the site." +msgstr "Pokud nechcete, aby byl subjekt dále na serveru aktivní, můžete ho označit za smazaný." + +#: templates/web/base/js/translation_strings.html:36 +msgid "You declined; please fill in the box above" +msgstr "Odmítnuto; vyplňte rámeček nahoře" + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38 +msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" +msgstr "Na tento dotazník jste již odpověděli. Máte-li dotazy, prosím <a href='%s'>spojte se s námi</a>, nebo si můžete <a href='%s'>zobrazit hlášení</a>.\n" + +#: templates/web/base/questionnaire/index.html:68 +#: templates/web/base/report/new/fill_in_details_form.html:75 +#: templates/web/fixmystreet/questionnaire/index.html:88 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 +#: templates/web/zurich/report/new/fill_in_details_form.html:58 +msgid "You have already attached a photo to this report, attaching another one will replace it." +msgstr "Pro toto hlášení již máte připojenou fotografii, připojením další dojde k jejímu nahrazení." + +#: templates/web/base/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 "Pro tuto aktualizaci již máte připojenou fotografii, připojením další dojde k jejímu nahrazení." + +#: templates/web/base/auth/sign_out.html:4 +#: templates/web/zurich/auth/sign_out.html:3 +msgid "You have been signed out" +msgstr "Byli jste odhlášeni" + +#: 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 "Lokalizovali jste hlášení do místa označeném zelenou značkou v mapě. Pokud to není správné umístění, opakujte a klikněte na správné místo v mapě. " + +#: 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 "Úspěšně jste potvrdili svou e-mailovou adresu." + +#: templates/web/base/report/display.html:20 +#: templates/web/base/report/new/fill_in_details.html:37 +#: templates/web/fixmystreet/report/display.html:17 +msgid "You have successfully signed in; please check and confirm your details are accurate:" +msgstr "Byli jste úspěšně přihlášeni; zkontrolujte a potvrďte zda jsou podrobnosti přesné:" + +#: templates/web/base/my/my.html:20 templates/web/fixmystreet/my/my.html:20 +msgid "You haven’t created any reports yet. <a href=\"%s\">Report a problem now.</a>" +msgstr "Doposud jste nevytvořili žádné hlášení. <a href=\"%s\">Nahlaste problém nyní.</a>" + +#: templates/web/base/email_sent.html:13 +msgid "You must now click the link in the email we've just sent you." +msgstr "Musíte kliknout na link v emailové zprávě, kterou jsme Vám právě poslali." + +#: templates/web/base/admin/index.html:18 +msgid "You need to <a href=\"%s\">add some bodies</a> (such as councils or departments) before any reports can be sent." +msgstr "Musíte <a href=\"%s\"> přidat nějaké subjekty </a> (například úřady či oddělení) kterým pak budou zasílány hlášení." + +#: templates/web/base/admin/bodies.html:7 +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 "" +"Musíte přidat subjekty (například úřady či oddělení), pak můžete přidat \n" +" kategorie problémů, které mají v kompetenci řešit (jako výmoly nebo pouliční osvětlení) \n" +" a kontakty (jako například e-mailovou adresu), na které budou zprávy jsou odesílány." + +#: templates/web/base/admin/report_edit.html:85 +msgid "You really want to resend?" +msgstr "Chcete to skutečně znovu odeslat?" + +#: templates/web/base/my/my.html:0 templates/web/base/my/my.html:15 +#: templates/web/base/my/my.html:4 templates/web/fixmystreet/my/my.html:0 +#: templates/web/fixmystreet/my/my.html:15 +#: templates/web/fixmystreet/my/my.html:4 +msgid "Your Reports" +msgstr "Vaše hlášení" + +#: 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:91 +#: templates/web/fixmystreet/report/display.html:62 +#: templates/web/fixmystreet/report/display.html:64 +#: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 +#: templates/web/fixmystreet/report/update-form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:71 +msgid "Your email" +msgstr "Váš e-mail" + +#: templates/web/fixmystreet/auth/general.html:27 +#: templates/web/fixmystreet/report/update-form.html:82 +#: templates/web/zurich/auth/general.html:30 +#: templates/web/zurich/auth/general.html:58 +msgid "Your email address" +msgstr "Vaše e-mailová adresa" + +#: templates/web/base/auth/general.html:27 +msgid "Your email address:" +msgstr "Vaše e-mailová adresa:" + +#: templates/web/base/alert/_list.html:92 +#: templates/web/base/report/new/fill_in_details_form.html:106 +#: templates/web/base/report/update-form.html:81 +msgid "Your email:" +msgstr "Váš e-mail:" + +#: 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 "Vámi poskytnuté informace budou použity pouze v souladu se <a href=\"/privacy\">zásadami ochrany osobních údajů</a>" + +#: templates/web/fixmystreet/auth/general.html:54 +#: templates/web/fixmystreet/contact/index.html:84 +#: templates/web/fixmystreet/report/new/form_user_loggedin.html:18 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 +#: templates/web/fixmystreet/report/update-form.html:142 +#: templates/web/zurich/auth/general.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:81 +msgid "Your name" +msgstr "Vaše jméno a příjmení" + +#: templates/web/base/auth/general.html:59 +#: templates/web/base/contact/index.html:73 +#: templates/web/base/report/new/fill_in_details_form.html:185 +#: templates/web/base/report/update-form.html:151 +msgid "Your name:" +msgstr "Vaše jméno:" + +#: templates/web/fixmystreet/auth/general.html:42 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:22 +#: templates/web/fixmystreet/report/update-form.html:96 +#: templates/web/zurich/auth/general.html:34 +msgid "Your password" +msgstr "Vaše heslo" + +#: templates/web/base/auth/change_password.html:6 +msgid "Your password has been changed" +msgstr "Vaše heslo bylo změněno" + +#: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 +#: templates/web/zurich/report/new/fill_in_details_form.html:87 +msgid "Your phone number" +msgstr "Vaše telefonní číslo:" + +#: templates/web/fixmystreet/questionnaire/index.html:16 +msgid "Your report" +msgstr "Vaše hlášení" + +#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:24 +msgid "Your reports" +msgstr "Vaše hlášení" + +#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:41 +msgid "Your updates" +msgstr "Vaše aktualizace" + +#: templates/web/base/contact/index.html:81 +msgid "Your email:" +msgstr "Váš e-mail:" + +#: templates/web/base/admin/timeline.html:4 +msgid "by %s" +msgstr "uživatelem %s" + +#: templates/web/base/reports/body.html:6 +#: templates/web/base/reports/body.html:7 +msgid "council" +msgstr "úřad" + +#: templates/web/base/admin/report_edit.html:32 +#: templates/web/zurich/admin/report_edit-sdm.html:40 +#: templates/web/zurich/admin/report_edit.html:54 +msgid "didn't use map" +msgstr "bez mapy" + +#: templates/web/base/alert/index.html:33 +#: templates/web/fixmystreet/around/postcode_form.html:20 +msgid "e.g. ‘%s’ or ‘%s’" +msgstr "např. ‘%s’ nebo ‘%s’" + +#: templates/web/base/admin/body-form.html:188 +#: templates/web/base/admin/flagged.html:51 +msgid "edit user" +msgstr "editace uživatele" + +#: templates/web/base/admin/index.html:34 +#: templates/web/zurich/admin/index.html:5 +msgid "from %d different users" +msgstr "od %d různých uživatelů" + +#: templates/web/fixmystreet/report/_item.html:17 +#: templates/web/zurich/report/_item.html:16 +msgid "last updated %s" +msgstr "naposledy upravené %s" + +#: perllib/Utils.pm:235 +msgid "less than a minute" +msgstr "méně než minutou" + +#: templates/web/base/report/updates.html:57 +msgid "marked as a duplicate report" +msgstr "označené jako duplicitní hlášení" + +#: templates/web/base/report/updates.html:47 +msgid "marked as action scheduled" +msgstr "označené jako plánované" + +#: templates/web/base/report/updates.html:59 +msgid "marked as an internal referral" +msgstr "Označené jako interní postoupení" + +#: templates/web/base/report/updates.html:49 +msgid "marked as closed" +msgstr "označeno za uzavřené" + +#: templates/web/base/report/updates.html:28 +#: templates/web/base/report/updates.html:51 +msgid "marked as fixed" +msgstr "Označené jako vyřešené" + +#: templates/web/base/report/updates.html:45 +msgid "marked as in progress" +msgstr "označené jako probíhající" + +#: templates/web/base/report/updates.html:41 +msgid "marked as investigating" +msgstr "označené jako zkoumání" + +#: templates/web/base/report/updates.html:55 +msgid "marked as not the council's responsibility" +msgstr "označené za nespadající do kompetencí úřadu" + +#: templates/web/base/report/updates.html:43 +msgid "marked as planned" +msgstr "označené za naplánované" + +#: templates/web/base/report/updates.html:53 +msgid "marked as unable to fix" +msgstr "označené za nemožné spravit" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:130 +#: templates/web/base/admin/questionnaire.html:15 +#: templates/web/base/admin/questionnaire.html:16 +msgid "n/a" +msgstr "neuvedeno" + +#: templates/web/base/alert/_list.html:87 +#: templates/web/fixmystreet/alert/_list.html:85 +msgid "or" +msgstr "nebo" + +#: templates/web/base/js/translation_strings.html:27 +msgid "or locate me automatically" +msgstr "nebo mě lokalizujte automaticky" + +#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:30 +#: templates/web/zurich/admin/report_edit-sdm.html:27 +#: templates/web/zurich/admin/report_edit-sdm.html:29 +#: templates/web/zurich/admin/report_edit-sdm.html:36 +#: templates/web/zurich/admin/report_edit-sdm.html:38 +#: templates/web/zurich/admin/report_edit.html:27 +#: templates/web/zurich/admin/report_edit.html:29 +#: templates/web/zurich/admin/report_edit.html:38 +#: templates/web/zurich/admin/report_edit.html:40 +#: templates/web/zurich/admin/report_edit.html:50 +#: templates/web/zurich/admin/report_edit.html:52 +msgid "originally entered: “%s”" +msgstr "původně zadáno: “%s”" + +#: templates/web/base/admin/report_edit.html:43 +msgid "other areas:" +msgstr "ostatní oblasti:" + +#: templates/web/base/report/updates.html:29 +#: templates/web/base/report/updates.html:39 +msgid "reopened" +msgstr "znovu otevřeno" + +#: templates/web/fixmystreet/header.html:59 +#: templates/web/zurich/footer.html:12 +msgid "sign out" +msgstr "odhlásit" + +#: templates/web/base/report/new/fill_in_details_form.html:12 +#: templates/web/base/report/new/fill_in_details_form.html:15 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 +msgid "the local council" +msgstr "místní úřad" + +#: templates/web/base/report/_main.html:57 +#: templates/web/zurich/report/_main.html:5 +msgid "there is no pin shown as the user did not use the map" +msgstr "V mapě se nenalézají žádné značky hlášení od uživatelů" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:379 +msgid "this type of local problem" +msgstr "tento typ lokálního problému" + +#: perllib/Utils.pm:207 +msgid "today" +msgstr "dnes" + +#: templates/web/base/admin/report_edit.html:32 +#: templates/web/zurich/admin/report_edit-sdm.html:40 +#: templates/web/zurich/admin/report_edit.html:54 +msgid "used map" +msgstr "použitá mapa" + +#: templates/web/base/admin/update_edit.html:35 +msgid "user is from same council as problem - %d" +msgstr "uživatel je ze stejného úřadu jako hlášení - %d" + +#: templates/web/base/admin/update_edit.html:38 +msgid "user is problem owner" +msgstr "uživatel je vlastníkem hlášení" + +#: templates/web/base/reports/body.html:0 +#: templates/web/base/reports/body.html:3 +msgid "ward" +msgstr "okrsek" + +#: templates/web/base/front/stats.html:17 +#, perl-format +msgid "<big>%s</big> report recently" +msgid_plural "<big>%s</big> reports recently" +msgstr[0] "<big>%s</big> aktuální hlášení" +msgstr[1] "<big>%s</big> aktuální hlášení" +msgstr[2] "<big>%s</big> aktuální hlášení" + +#: perllib/Utils.pm:254 +#, perl-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d hodina" +msgstr[1] "%d hodiny" +msgstr[2] "%d hodin" + +#: templates/web/base/report/_support.html:6 +#, perl-format +msgid "%d supporter" +msgid_plural "%d supporters" +msgstr[0] "%d podporovatel" +msgstr[1] "%d podporovatelé" +msgstr[2] "%d podporovatelů" + +#: perllib/Utils.pm:256 +#, perl-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d minuta" +msgstr[1] "%d minuty" +msgstr[2] "%d minut" + +#: templates/web/base/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>aktualizované hlášení" +msgstr[1] "<big>%s</big> aktalizovan hlášení" +msgstr[2] "<big>%s</big> aktualizovaných hlášení" + +#: 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] "Doposud nemáme podrobnosti o úřadu pokrývající tuto lokalitu." +msgstr[1] "Doposud nemáme podrobnosti o úřadech pokrývající tuto lokalitu." +msgstr[2] "Doposud nemáme podrobnosti o úřadech pokrývající tuto lokalitu." + +#: perllib/Utils.pm:250 +#, perl-format +msgid "%d week" +msgid_plural "%d weeks" +msgstr[0] "%d týden" +msgstr[1] "%d týdny" +msgstr[2] "%d týdnů" + +#: templates/web/base/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> hlášení minulý týden" +msgstr[1] "<big>%s</big> hlášení minulý týden" +msgstr[2] "<big>%s</big> hlášení minulý týden" + +#: templates/web/base/front/stats.html: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> vyřešeno poslední měsíc" +msgstr[1] "<big>%s</big> vyřešeno poslední měsíc" +msgstr[2] "<big>%s</big> vyřešeno poslední měsíc" + +#: perllib/Utils.pm:252 +#, perl-format +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "%d den" +msgstr[1] "%d dny" +msgstr[2] "%d dní" + +#: templates/web/base/report/new/councils_text_some.html:13 +#, 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] "Doposud <strong>nemáme</strong> podrobnosti o dalším úřadě, který je za tuto oblast zodpovědný." +msgstr[1] "Doposud <strong>nemáme</strong> podrobnosti o dalších úřadech, které jsou za tuto oblast zodpovědné." +msgstr[2] "Doposud <strong>nemáme</strong> podrobnosti o dalších úřadech, které jsou za tuto oblast zodpovědné." + +#~ msgid "For council(s):" +#~ msgstr "Pro úřad(y):" diff --git a/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po new file mode 100644 index 000000000..f2942d715 --- /dev/null +++ b/locale/da_DK.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -0,0 +1,4172 @@ +# 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: +# Guttorm Flatabø <post@guttormflatabo.com>, 2013 +# Keld Simonsen <keld@rap.dk>, 2015 +# oeyrvin <oeyrvin@hagan.no>, 2015 +# Ørjan Vøllestad <orjanv@gmail.com>, 2014 +# pere <pere-transifex@hungry.com>, 2012,2015 +# Petter Reinholdtsen <pere@hungry.com>, 2011 +msgid "" +msgstr "" +"Project-Id-Version: fixmystreet\n" +"Report-Msgid-Bugs-To: matthew@mysociety.org\n" +"POT-Creation-Date: 2015-07-31 14:28+0100\n" +"PO-Revision-Date: 2015-07-25 21:04+0000\n" +"Last-Translator: Keld Simonsen <keld@rap.rap.dk>\n" +"Language-Team: Danish (Denmark) (http://www.transifex.com/projects/p/fixmystreet/language/da_DK/)\n" +"Language: da_DK\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:623 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:392 +msgid " and " +msgstr " og " + +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_none.html:11 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 +#: templates/web/base/report/new/councils_text_some.html:22 +#: templates/web/base/report/new/councils_text_some.html:5 +msgid " or " +msgstr " eller " + +#: templates/web/base/admin/index.html:36 +msgid "%d confirmed alerts, %d unconfirmed" +msgstr "%d bekræftede varsler, %d ubekræftede" + +#: templates/web/base/admin/index.html:38 +#: templates/web/zurich/admin/index.html:6 +msgid "%d council contacts – %d confirmed, %d unconfirmed" +msgstr "%d myndighedskontakter – %d bekræftet, %d ubekræftet" + +#: templates/web/base/admin/edit-league.html:12 +msgid "%d edits by %s" +msgstr "%d redigeringer af %s" + +#: templates/web/base/admin/index.html:35 +msgid "%d live updates" +msgstr "%d aktive opdateringer" + +#: templates/web/base/admin/index.html:37 +msgid "%d questionnaires sent – %d answered (%s%%)" +msgstr "%d spørgeskemaer sendt – %d besvaret (%s%%)" + +#: templates/web/base/pagination.html:10 +msgid "%d to %d of %d" +msgstr "%d til %d af %d" + +#: templates/web/base/reports/body.html:0 +#: templates/web/base/reports/body.html:23 +msgid "%s - Summary reports" +msgstr "%s - opsummeringsrapporter" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:672 +msgid "%s ref: %s" +msgstr "%s ref: %s" + +#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 +msgid "%s ward, %s" +msgstr "%s bydel, %s" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:559 +msgid "%s, reported at %s" +msgstr "%s, rapporteret %s" + +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 +msgid "%s, within %s ward" +msgstr "%s, indefor bydel %s" + +#: perllib/FixMyStreet/Map/OSM.pm:42 +msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" +msgstr "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> -bidragsydere" + +#: templates/web/base/email_sent.html:29 +msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" +msgstr "(Tag det roligt; vi ser på dit varsel mens du tjekker din e-mail.)" + +#: templates/web/base/email_sent.html:25 +msgid "(Don't worry — we'll hang on to your problem report while you're checking your email.)" +msgstr "(Tag det roligt — vi ser på din problemrapport mens du tjekker din email.)" + +#: templates/web/base/email_sent.html:27 +msgid "(Don't worry — we'll hang on to your update while you're checking your email.)" +msgstr "(Tag det roligt — vi ser på din opdatering mens du tjekker din email.)" + +#: templates/web/base/admin/report_blocks.html:11 +#: templates/web/base/admin/users.html:31 +msgid "(Email in abuse table)" +msgstr "(Epost i misbrugstabellen)" + +#: templates/web/base/alert/_list.html:20 +#: templates/web/fixmystreet/alert/_list.html:24 +msgid "(a default distance which covers roughly 200,000 people)" +msgstr "(en standardafstand som dækker en befolkning på omtrent 200.000)" + +#: templates/web/base/alert/_list.html:25 +#: templates/web/fixmystreet/alert/_list.html:28 +msgid "(alternatively the RSS feed can be customised, within" +msgstr "(alternativt kan RSS-strømmen tilpasses, indenfor" + +#: templates/web/base/around/around_map_list_items.html:12 +#: templates/web/base/around/on_map_list_items.html:9 +#: templates/web/fixmystreet/report/_item.html:27 +#: templates/web/zurich/report/_item.html:21 +msgid "(closed)" +msgstr "(lukket)" + +#: templates/web/base/around/around_map_list_items.html:10 +#: templates/web/base/around/on_map_list_items.html:7 +#: templates/web/fixmystreet/report/_item.html:25 +#: templates/web/zurich/report/_item.html:19 +msgid "(fixed)" +msgstr "(løst)" + +#: templates/web/base/index.html:8 templates/web/base/index.html:9 +#: templates/web/fixmystreet/around/intro.html:2 +msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" +msgstr "(som graffite, affald, hul i vejen, eller ødelagt gadelys)" + +#: templates/web/base/reports/_list-entry.html:4 +#: templates/web/fixmystreet/report/_item.html:21 +msgid "(not sent to council)" +msgstr "(ikke rapporteret til myndigheden)" + +#: templates/web/base/report/new/fill_in_details_form.html:199 +#: templates/web/zurich/report/new/fill_in_details_form.html:77 +msgid "(optional)" +msgstr "(valgfrit)" + +#: templates/web/fixmystreet/report/public_label.html:1 +msgid "(public)" +msgstr "(offentlig)" + +#: templates/web/base/reports/_list-entry.html:2 +#: templates/web/fixmystreet/report/_item.html:20 +msgid "(sent to both)" +msgstr "(sendt til begge)" + +#: templates/web/base/report/new/fill_in_details_form.html:193 +msgid "(we never show your email address or phone number)" +msgstr "(vi viser aldrig din e-postadresse eller dit telefonnummer)" + +#: templates/web/base/report/update-form.html:158 +msgid "(we never show your email)" +msgstr "(vi viser aldrig din e-postadresse)" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/DB/Result/Problem.pm:410 +msgid "-- Pick a category --" +msgstr "-- Vælg en kategori --" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:630 +#: perllib/FixMyStreet/DB/Result/Problem.pm:416 +msgid "-- Pick a property type --" +msgstr "-- Vælg en ejendomsstype --" + +#: templates/web/base/admin/body-form.html:42 +#: templates/web/base/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> er sat, (<code>%s</code>) men ingen <code>MAPIT_TYPES</code>.<br>Dette er nok grunden til at \"dækket område\" er tom (nedenfor).<br>Måske skal du tilføje nogen <code>MAPIT_TYPES</code> i konfigurationsfilen?" + +#: templates/web/base/around/_report_banner.html:3 +#: templates/web/base/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 kortet, <a href='%s' rel='nofollow'>så spring dette trin over</a>.</small>" + +#: templates/web/base/admin/index.html:33 +#: templates/web/zurich/admin/index.html:4 +msgid "<strong>%d</strong> live problems" +msgstr "<strong>%d</strong> aktive problemer" + +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:39 +msgid "<strong>No</strong> Let me confirm my report by email" +msgstr "<strong>Nej</strong> Lad mig bekræfte min rapport med e-post" + +#: templates/web/fixmystreet/report/update-form.html:112 +msgid "<strong>No</strong> Let me confirm my update by email" +msgstr "<strong>Nej</strong> Lad mig bekræfte min opdatering med e-post" + +#: templates/web/fixmystreet/auth/general.html:51 +#: templates/web/zurich/auth/general.html:51 +msgid "<strong>No</strong> let me sign in by email" +msgstr "<strong>Nej</strong>, lad mig logge ind med e-post:" + +#: templates/web/base/auth/general.html:55 +msgid "<strong>No</strong>, I do not, let me sign in by email:" +msgstr "<strong>Nej</strong>, det gør jeg ikke. La mig logge ind med e-post:" + +#: templates/web/base/report/new/fill_in_details_form.html:144 +msgid "<strong>No</strong>, let me confirm my report by email:" +msgstr "<strong>Nej</strong>, lad mig bekræfte min rapport med e-post:" + +#: templates/web/base/report/update-form.html:117 +msgid "<strong>No</strong>, let me confirm my update by email:" +msgstr "<strong>Nej</strong>, lad mig bekræfte min opdatering med e-post:" + +#: templates/web/base/auth/general.html:37 +#: templates/web/base/report/new/fill_in_details_form.html:122 +#: templates/web/base/report/update-form.html:95 +#: templates/web/fixmystreet/auth/general.html:37 +#: templates/web/fixmystreet/auth/general.html:39 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:15 +#: templates/web/fixmystreet/report/update-form.html:89 +msgid "<strong>Yes</strong> I have a password" +msgstr "<strong>Ja</strong>, jeg har en adgangskode" + +#: templates/web/base/static/about-en-gb.html:1 +#: templates/web/base/static/about-en-gb.html:3 +msgid "About us" +msgstr "Om os" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:52 +#: templates/web/base/report/update-form.html:30 +#: templates/web/base/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 "Handling planlagt" + +#: templates/web/base/admin/body-form.html:3 +#: templates/web/base/admin/body-form.html:4 +msgid "" +"Add a <strong>body</strong> for each administrative body, such as a council or department\n" +" to which problem reports can be sent. You can add one or more contacts (for different\n" +" categories of problem) to each body." +msgstr "Tilføj en <strong>administration</strong> for hver administrativ instans, for eksempel en kommune eller et departement, hvortil problemrapporter kan sendes. Du kan tilføje en eller flere kontaktpunkter (for forskellige problemkategorier) for hver myndighed." + +#: templates/web/base/admin/body.html:56 +msgid "Add a contact using the form below." +msgstr "Tilføj en kontakt ved at bruge formularen nedenfor." + +#: templates/web/base/admin/bodies.html:74 +#: templates/web/base/admin/body-form.html:240 +#: templates/web/zurich/admin/body-form.html:51 +msgid "Add body" +msgstr "Tilføj myndighed" + +#: templates/web/base/admin/body.html:116 +#: templates/web/zurich/admin/body.html:31 +msgid "Add new category" +msgstr "Tilføj ny kategori" + +#: templates/web/base/admin/users.html:47 +msgid "Add user" +msgstr "Tilføj bruger" + +#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:52 +msgid "Added %s" +msgstr "Tilføjede %s" + +#: templates/web/base/auth/change_password.html:29 +msgid "Again:" +msgstr "Gentag:" + +#: templates/web/base/admin/timeline.html:35 +msgid "Alert %d created for %s, type %s, parameters %s / %s" +msgstr "Varsel %d oprettet for %s, type %s, parameter %s / %s" + +#: templates/web/base/admin/timeline.html:37 +msgid "Alert %d disabled (created %s)" +msgstr "Varsel %d koblet fra (oprettet %s)" + +#: templates/web/base/report/update-form.html:163 +#: templates/web/fixmystreet/report/update-form.html:150 +msgid "Alert me to future updates" +msgstr "Send mig varsel ved fremtidige opdateringer" + +#: templates/web/base/reports/index.html:3 +#: templates/web/zurich/admin/stats.html:5 +#: templates/web/zurich/reports/index.html:12 +msgid "All Reports" +msgstr "Alle rapporter" + +#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:26 +#: 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 "Alle rapporter" + +#: templates/web/base/admin/stats.html:5 +#: templates/web/zurich/admin/stats.html:8 +msgid "All reports between %s and %s" +msgstr "Alle rapporter mellem %s og %s" + +#: templates/web/base/report/new/councils_text_some.html:2 +msgid "All the information you provide here will be sent to" +msgstr "Al informationen du har lagt ind her vil blive sendt til" + +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_all.html:4 +#: templates/web/base/report/new/fill_in_details_form.html:12 +#: templates/web/base/report/new/fill_in_details_form.html:14 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 +msgid "All the information you provide here will be sent to <strong>%s</strong>." +msgstr "All informationen du har lagt ind her vil blive sendt til <strong>%s</strong>." + +#: templates/web/base/questionnaire/index.html:36 +#: templates/web/fixmystreet/questionnaire/index.html:55 +msgid "An update marked this problem as fixed." +msgstr "En opdatering markerede dette problem som ordnet." + +#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/problem_row.html:20 +msgid "Anonymous" +msgstr "Anonym" + +#: templates/web/base/admin/report_edit.html:75 +#: templates/web/base/admin/update_edit.html:23 +msgid "Anonymous:" +msgstr "Anonym:" + +#: templates/web/base/footer.html:26 +msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?" +msgstr "Er du en <strong>udvikler</strong>? Kunne du tænke dig at bidrage til FixMinVej?" + +#: templates/web/fixmystreet/front/footer-marketing.html:16 +msgid "Are you a developer?" +msgstr "Er du en udvikler?" + +#: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/body.html:16 +#: templates/web/zurich/admin/body-form.html:24 +msgid "Area covered" +msgstr "Dækket område" + +#: templates/web/base/admin/bodies.html:15 +#: templates/web/base/admin/body.html:60 +msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." +msgstr "" + +#: templates/web/zurich/admin/report_edit.html:141 +#: templates/web/zurich/admin/stats.html:36 +msgid "Assign to different category:" +msgstr "Flyt til en anden kategori:" + +#: templates/web/zurich/admin/report_edit.html:150 +msgid "Assign to external body:" +msgstr "Tildel til ekstern myndighed:" + +#: templates/web/zurich/admin/report_edit.html:130 +#: templates/web/zurich/admin/report_edit.html:187 +msgid "Assign to subdivision:" +msgstr "Tildelt underafdeling:" + +#: perllib/FixMyStreet/Cobrand/Zurich.pm:165 +#: templates/web/zurich/report/updates.html:11 +msgid "Assigned to %s" +msgstr "Tildelt %s" + +#: templates/web/base/open311/index.html:84 +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 "Højst %d forespørgsler bliver returneret i hver forespørgsel. De returnerede forespørgsler bliver sorteret på requested_datetime, så man må lave flere søgninger med rullende start_date og end_date for at få fat på alle forespørgslerne." + +#: templates/web/base/open311/index.html:76 +msgid "At the moment only searching for and looking at reports work." +msgstr "For øjeblikket er det kun søgning efter og at visning af rapporter som fungerer." + +#: perllib/FixMyStreet/DB/Result/Problem.pm:373 +#: templates/web/zurich/report/_item.html:11 +msgid "Awaiting moderation" +msgstr "Afventer moderation" + +#: templates/web/base/js/translation_strings.html:32 +msgid "Back" +msgstr "Tilbage" + +#: templates/web/base/admin/report_blocks.html:11 +msgid "Ban email address" +msgstr "Bandlys epostadresse" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:301 +#: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 +msgid "Bodies" +msgstr "Administrationer" + +#: templates/web/base/admin/flagged.html:17 +#: templates/web/base/admin/reports.html:14 +#: templates/web/base/admin/users.html:17 +msgid "Body" +msgstr "Administration" + +#: templates/web/base/admin/report_edit.html:34 +#: templates/web/base/admin/user-form.html:32 +msgid "Body:" +msgstr "Administration:" + +#: templates/web/base/admin/stats.html:80 +msgid "By Date" +msgstr "På dato" + +#: templates/web/fixmystreet/around/_report_banner.html:8 +msgid "Can't see the map? <em>Skip this step</em>" +msgstr "Hvis du ikke kan se kortet, <em>så overspring dette trin</em>." + +#: templates/web/base/admin/body.html:68 +#: templates/web/base/admin/index.html:55 +#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category_wrapper.html:3 +#: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/admin/index-dm.html:23 +#: templates/web/zurich/admin/index-sdm.html:21 +#: templates/web/zurich/admin/reports.html:13 +#: templates/web/zurich/admin/stats.html:50 +msgid "Category" +msgstr "Kategori" + +#: templates/web/base/admin/index.html:53 +msgid "Category fix rate for problems > 4 weeks old" +msgstr "Løsningsrate fordelt på kategori for problemer > 4 uger gamle" + +#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/category_edit.html:23 +#: templates/web/base/admin/report_edit.html:74 +#: templates/web/zurich/admin/body.html:43 +#: templates/web/zurich/admin/report_edit-sdm.html:42 +#: templates/web/zurich/admin/report_edit.html:140 +msgid "Category:" +msgstr "Kategori:" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383 +msgid "Category: %s" +msgstr "Kategori: %s" + +#: templates/web/base/auth/change_password.html:1 +#: templates/web/base/auth/change_password.html:3 +#: templates/web/base/auth/change_password.html:33 +#: templates/web/base/my/my.html:17 templates/web/fixmystreet/my/my.html:17 +msgid "Change password" +msgstr "Skift adgangskode" + +#: templates/web/base/admin/body.html:160 +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 "" +"Markér <strong>bekræftet</strong> for at indikere at dette kontaktpunkt er blevet bekræftet som korrekt.\n" +"Hvis du ikke er sikker på oprindelsen eller gyldigheden for kontaktpunktet, så markér ikke feltet." + +#: templates/web/base/admin/body.html:171 +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 "" +"Markér <strong>slettet</strong> for at ikke længere bruge kategorien\n" +"Den vil ikke længere dukke op som en tilgængelig kategori i rullegardinmenuen på rapportér-et-problem-siden." + +#: templates/web/base/admin/body.html:191 +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 "" +"Tjek <strong>private</strong> hvis beskeder i denne gruppe <strong>ikke skal vises på netsiderne</strong>.\n" +" <br> \n" +"Normalt er kategorier ikke interne <br> \n" +"Dette er passerende når du ønsker at tillade brugere at indsende besked til myndigheden, men ikke vil vise\n" +"den udadtil. I England har de brugt dette til opgaver som at bede om en ekstra papirkurv på et bestemt sted." + +#: templates/web/base/admin/body.html:130 +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 "Vælg et <strong>kategorinavn</strong> som giver mening for indbyggerne (f.eks. \"Hul i vejen\", \"Gadebelysning\") men som også er nyttigt for myndigheden. Disse vil dukke op i rullegardinmenuen på rapportér-et-problem-siden." + +#: templates/web/base/admin/stats.html:65 +#: templates/web/base/admin/stats.html:71 +msgid "Click here or enter as dd/mm/yyyy" +msgstr "Klik her eller indtast dato på formatet dd/mm/åååå" + +#: templates/web/base/js/translation_strings.html:50 +#: templates/web/fixmystreet/around/_report_banner.html:2 +msgid "Click map to report a problem" +msgstr "Klik i kortet for at rapportere et problem" + +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:58 +#: templates/web/base/admin/report_edit.html:60 +#: templates/web/base/dashboard/index.html:142 +#: templates/web/base/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:95 +#: templates/web/zurich/admin/report_edit.html:97 +#: templates/web/zurich/admin/stats.html:31 +#: templates/web/zurich/report/banner.html:13 +msgid "Closed" +msgstr "Lukket" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:771 +msgid "Closed by council" +msgstr "(ikke rapporteret til myndigheden)" + +#: templates/web/base/my/my.html:40 +#: templates/web/fixmystreet/my/_problem-list.html:12 +msgid "Closed reports" +msgstr "Fiksede rapporter" + +#: templates/web/base/admin/problem_row.html:38 +msgid "Closed:" +msgstr "Lukket:" + +#: templates/web/base/around/tabbed_lists.html:10 +#: templates/web/base/around/tabbed_lists.html:12 +msgid "Closest nearby problems <small>(within %skm)</small>" +msgstr "De nærmeste problemer <small>(inden for %skm)</small>" + +#: templates/web/base/admin/report_edit.html:23 +#: templates/web/zurich/admin/report_edit-sdm.html:33 +#: templates/web/zurich/admin/report_edit.html:46 +msgid "Co-ordinates:" +msgstr "Koordinater:" + +#: templates/web/base/admin/list_updates.html:10 +msgid "Cobrand" +msgstr "Mærkevaresamarbejde" + +#: templates/web/base/admin/report_edit.html:91 +#: templates/web/base/admin/update_edit.html:50 +msgid "Cobrand data:" +msgstr "Mærkevaresamarbejdsdata:" + +#: templates/web/base/admin/report_edit.html:90 +#: templates/web/base/admin/update_edit.html:49 +msgid "Cobrand:" +msgstr "Mærkevaresamarbejde:" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 +#: templates/web/base/admin/config_page.html:1 +msgid "Configuration" +msgstr "Opsætning" + +#: templates/web/base/admin/category_edit.html:52 +msgid "Configure Endpoint" +msgstr "Opsæt endepunkt" + +#: templates/web/base/admin/body.html:72 +msgid "Confirm" +msgstr "Bekræft" + +#: templates/web/base/auth/token.html:1 +msgid "Confirm account" +msgstr "Bekræft konto" + +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:33 +#: templates/web/fixmystreet/report/update-form.html:107 +msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated." +msgstr "Bekræft via epost nedenfor, og angiv en ny adgangskode der. Når du har bekræftet vil adgangskode dit blive opdatert." + +#: templates/web/base/questionnaire/creator_fixed.html:1 +#: templates/web/base/tokens/confirm_problem.html:1 +#: templates/web/base/tokens/confirm_update.html:1 +#: templates/web/zurich/tokens/confirm_problem.html:1 +#: templates/web/zurich/tokens/confirm_problem.html:3 +msgid "Confirmation" +msgstr "Bekræftelse" + +#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/category_edit.html:37 +#: templates/web/base/admin/category_edit.html:89 +#: templates/web/zurich/admin/stats.html:40 +msgid "Confirmed" +msgstr "Bekræftet" + +#: templates/web/base/admin/stats.html:5 +msgid "Confirmed reports between %s and %s" +msgstr "Bekræftede rapporter mellem %s og %s" + +#: templates/web/base/admin/list_updates.html:39 +#: templates/web/base/admin/problem_row.html:36 +#: templates/web/base/admin/report_edit.html:83 +msgid "Confirmed:" +msgstr "Bekræftet:" + +#: templates/web/base/footer.html:24 +msgid "Contact FixMyStreet" +msgstr "Kontakt FixMinVej" + +#: templates/web/base/contact/index.html:1 +#: templates/web/base/contact/index.html:2 +#: templates/web/base/contact/submit.html:1 +#: templates/web/fixmystreet/contact/index.html:1 +#: templates/web/fixmystreet/contact/index.html:2 +msgid "Contact Us" +msgstr "Kontakt os" + +#: templates/web/base/contact/index.html:6 +#: templates/web/fixmystreet/contact/index.html:20 +msgid "Contact the team" +msgstr "Kontakt projektgruppen" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1325 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1353 +msgid "Could not find user" +msgstr "Kunne ikke finde bruger" + +#: templates/web/base/js/translation_strings.html:37 +msgid "Could not look up location" +msgstr "Kunne ikke finde position" + +#: templates/web/base/admin/list_updates.html:9 +msgid "Council" +msgstr "Administration" + +#: templates/web/base/admin/body.html:1 +#: templates/web/base/admin/category_edit.html:1 +#: templates/web/zurich/admin/body.html:1 +msgid "Council contacts for %s" +msgstr "Administrationskontakter for %s" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:670 +msgid "Council ref: %s" +msgstr "myndighedsreference: %s" + +#: templates/web/base/admin/stats.html:84 +msgid "Council:" +msgstr "Administration:" + +#: templates/web/base/admin/stats.html:12 +#: templates/web/base/admin/stats.html:32 +#: templates/web/zurich/admin/stats.html:45 +#: templates/web/zurich/admin/stats.html:50 +msgid "Count" +msgstr "Antal" + +#: templates/web/base/email_sent.html:1 +msgid "Create a report" +msgstr "Lav en rapport" + +#: templates/web/base/admin/body.html:208 +#: templates/web/zurich/admin/body.html:59 +msgid "Create category" +msgstr "Lav kategori" + +#: templates/web/base/admin/problem_row.html:34 +#: templates/web/zurich/admin/list_updates.html:29 +#: templates/web/zurich/admin/list_updates.html:8 +msgid "Created" +msgstr "Oprettet" + +#: templates/web/base/admin/list_updates.html:38 +#: templates/web/base/admin/report_edit.html:82 +#: templates/web/base/admin/update_edit.html:51 +#: templates/web/zurich/admin/report_edit-sdm.html:47 +#: templates/web/zurich/admin/report_edit.html:61 +#: templates/web/zurich/admin/update_edit.html:29 +msgid "Created:" +msgstr "Oprettet:" + +#: templates/web/base/admin/stats.html:31 +msgid "Current state" +msgstr "Gældende tilstand" + +#: templates/web/base/admin/bodies.html:5 +#: templates/web/base/admin/index.html:16 +msgid "Currently no bodies have been created." +msgstr "I øjeblikket er der ikke lavet nogen instanser." + +#: templates/web/base/dashboard/index.html:5 +#: templates/web/base/dashboard/index.html:7 +msgid "Dashboard" +msgstr "Oversigt" + +#: templates/web/zurich/admin/stats.html:35 +msgid "Dealt with by subdivision within 5 working days" +msgstr "Behandlet af underafdeling inden 5 arbejdsdage" + +#: templates/web/base/admin/bodies.html:27 +#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:81 +#: templates/web/base/admin/category_edit.html:42 +#: templates/web/base/admin/category_edit.html:90 +msgid "Deleted" +msgstr "Slettet" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 +#: 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 "Beskrivelse" + +#: templates/web/base/js/translation_strings.html:34 +#: templates/web/zurich/report/new/fill_in_details_form.html:42 +msgid "Details" +msgstr "Detaljer" + +#: templates/web/base/admin/report_edit.html:20 +#: templates/web/base/report/new/fill_in_details_form.html:62 +#: templates/web/zurich/admin/report_edit-sdm.html:25 +#: templates/web/zurich/admin/report_edit.html:25 +#: templates/web/zurich/admin/report_edit.html:35 +msgid "Details:" +msgstr "Detaljer:" + +#: templates/web/base/admin/body.html:87 +msgid "Devolved" +msgstr "Delegeret" + +#: templates/web/base/admin/edit-league.html:8 +msgid "Diligency prize league table" +msgstr "Arbejdsheste" + +#: templates/web/fixmystreet/auth/general.html:31 +msgid "Do you have a FixMyBarangay password?" +msgstr "Har du en FixMyBarangay-adgangskode?" + +#: templates/web/base/auth/general.html:32 +#: templates/web/fixmystreet/auth/general.html:33 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:11 +#: templates/web/fixmystreet/report/update-form.html:86 +msgid "Do you have a FixMyStreet password?" +msgstr "Har du en FixMinVej-adgangskode?" + +#: templates/web/base/questionnaire/index.html:46 +#: templates/web/fixmystreet/questionnaire/index.html:65 +msgid "Don’t know" +msgstr "Véd ikke" + +#: templates/web/fixmystreet/contact/index.html:118 +msgid "Don't like forms?" +msgstr "Kan du ikke lide skemaer?" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:60 +#: templates/web/base/report/update-form.html:30 +#: templates/web/base/report/update-form.html:32 +#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/fixmystreet/report/update-form.html:30 +msgid "Duplicate" +msgstr "Duplikat" + +#: templates/web/base/admin/body.html:106 +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 "" +"Hver kontakt i myndigheden har en kategori som vises udadtil. \n" +"Forskellige kategorier kan have same kontakt</strong> (e-postadresse).\n" +"Dette betyder at du kan tilføje mange grupper/kategorier selv om du bare har <strong>én<strong> kontakt for myndigheden." + +#: templates/web/base/admin/list_updates.html:42 +#: templates/web/base/admin/problem_row.html:41 +#: templates/web/base/admin/users.html:33 +#: templates/web/zurich/admin/problem_row.html:42 +msgid "Edit" +msgstr "Redigér" + +#: templates/web/base/admin/body.html:220 +#: templates/web/zurich/admin/body.html:71 +msgid "Edit body details" +msgstr "Redigér detaljer for myndighed" + +#: templates/web/base/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 +msgid "Editing problem %d" +msgstr "Redigér problem %d" + +#: templates/web/base/admin/update_edit.html:1 +#: templates/web/zurich/admin/update_edit.html:1 +msgid "Editing update %d" +msgstr "Redigerer opdatering %d" + +#: templates/web/base/admin/user_edit.html:1 +msgid "Editing user %d" +msgstr "Redigerer bruger %d" + +#: templates/web/base/admin/category_edit.html:91 +msgid "Editor" +msgstr "Opdateret af" + +#: templates/web/base/admin/bodies.html:23 +#: templates/web/base/admin/category_edit.html:88 +#: templates/web/base/admin/flagged.html:38 +#: templates/web/base/admin/users.html:16 +#: templates/web/fixmystreet/auth/general.html:21 +#: templates/web/zurich/admin/body-form.html:9 +#: templates/web/zurich/admin/body.html:15 +#: templates/web/zurich/auth/general.html:24 +#: templates/web/zurich/auth/general.html:54 +msgid "Email" +msgstr "E-post" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1301 +msgid "Email added to abuse list" +msgstr "Epost lagt til misbrugsliste" + +#: templates/web/base/admin/body.html:155 +msgid "Email address:" +msgstr "E-postadresse:" + +#: templates/web/base/tokens/confirm_alert.html:6 +msgid "Email alert created" +msgstr "Epostvarsel laget" + +#: templates/web/base/tokens/confirm_alert.html:10 +msgid "Email alert deleted" +msgstr "Epostvarsel slettet" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1298 +msgid "Email already in abuse list" +msgstr "Epost allerede i misbrugslisten" + +#: templates/web/base/around/_updates.html:5 +msgid "Email me new local problems" +msgstr "Send mig e-post om lokale problemer" + +#: templates/web/base/report/display.html:38 +msgid "Email me updates" +msgstr "Send mig opdateringer" + +#: templates/web/base/admin/category_edit.html:31 +#: templates/web/base/admin/report_edit.html:80 +#: templates/web/base/admin/update_edit.html:33 +#: templates/web/base/admin/user-form.html:20 +#: templates/web/base/alert/updates.html:13 +#: templates/web/base/report/display.html:42 +#: templates/web/zurich/admin/body.html:47 +#: templates/web/zurich/admin/report_edit-sdm.html:44 +#: templates/web/zurich/admin/report_edit.html:57 +msgid "Email:" +msgstr "E-post:" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 +msgid "Email: %s" +msgstr "E-post: %s" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 +msgid "Empty flat or maisonette" +msgstr "Tom lejlighed" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:631 +msgid "Empty house or bungalow" +msgstr "Tomt hus eller bungalow" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 +msgid "Empty office or other commercial" +msgstr "Tomt kontor eller forretningsbygning" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 +msgid "Empty pub or bar" +msgstr "Tom pub eller bar" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 +msgid "Empty public building - school, hospital, etc." +msgstr "Tom offentlig bygning - skole, sygehus, etc." + +#: templates/web/base/admin/body-form.html:162 +#: templates/web/base/admin/body-form.html:163 +msgid "" +"Enable <strong>Open311 update-sending</strong> if the endpoint will send and receive\n" +" updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" +" For more information, see \n" +" <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>." +msgstr "" +"Brug <strong>Open311 update-sending</strong> hvis målet er at sende og modtage\n" +"opdateringer til eksidsterende rapporter. Hvis du ikke er sikker, sker det nok ikke, så lad den forblive uafkrydset. For mere information, se\n" +"<a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>denne artikel</a>." + +#: templates/web/base/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:223 +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 "" +"Brug <strong>can be devolved</strong> sætningen hvis en eller flere kontakter har\n" +"et et forskelligt leveringspunkt (og sendemetode) fra myndigheden. For eksempel hvis nogen beskedstyper enten skal \n" +" e-postes, mens andre kan sendes med Open311." + +#: templates/web/base/admin/stats.html:70 +msgid "End Date:" +msgstr "Slut-dato:" + +#: templates/web/base/admin/body-form.html:130 +msgid "Endpoint" +msgstr "Endepunkt" + +#: perllib/FixMyStreet/Cobrand/Zurich.pm:73 +msgid "Enter a Zürich street name" +msgstr "Indtast et vejnavn i Zürich" + +#: perllib/FixMyStreet/Cobrand/UK.pm:13 +msgid "Enter a nearby UK postcode, or street name and area" +msgstr "Indtast et britisk postnummer i nærheden, eller vejnavn og sted" + +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 +#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 +msgid "Enter a nearby postcode, or street name and area" +msgstr "Indtast postnummer i nærheden, eller vejnavn og sted" + +#: templates/web/base/around/postcode_form.html:1 +#: templates/web/base/around/postcode_form.html:2 +#: templates/web/fixmystreet/around/postcode_form.html:10 +#: templates/web/fixmystreet/around/postcode_form.html:11 +msgid "Enter a nearby street name and area" +msgstr "Indtast et vejnavn og sted" + +#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:7 +msgid "Enter a nearby street name and area, postal code or district in Delhi" +msgstr "Vælg et nærliggende gadenavn og område, postnummer eller distrikt i Delhi" + +#: templates/web/base/auth/general.html:64 +#: templates/web/base/report/new/fill_in_details_form.html:151 +#: templates/web/base/report/update-form.html:124 +msgid "Enter a new password:" +msgstr "Indtast en ny adgangskode:" + +#: templates/web/fixmystreet/auth/general.html:63 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:75 +#: templates/web/fixmystreet/report/update-form.html:123 +#: templates/web/zurich/auth/general.html:65 +msgid "Enter a password" +msgstr "Indtast en ny adgangskode" + +#: templates/web/base/index-steps.html:26 +msgid "Enter details of the problem" +msgstr "Indtast detaljer om problemet" + +#: templates/web/base/auth/token.html:5 +#: templates/web/base/errors/generic.html:1 +#: templates/web/base/errors/generic.html:3 +#: templates/web/base/tokens/abuse.html:1 +#: templates/web/base/tokens/abuse.html:3 +#: templates/web/base/tokens/error.html:1 +#: templates/web/base/tokens/error.html:3 +msgid "Error" +msgstr "Fejl" + +#: templates/web/base/admin/body.html:14 +#: templates/web/base/admin/category_edit.html:18 +msgid "Example postcode %s" +msgstr "Eksempel-postnummer %s" + +#: templates/web/base/open311/index.html:94 +msgid "Examples:" +msgstr "Eksempler:" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 +msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" +msgstr "" + +#: templates/web/base/admin/body-form.html:81 +msgid "External URL" +msgstr "" + +#: templates/web/base/admin/category_edit.html:27 +#: templates/web/base/admin/report_edit.html:92 +msgid "Extra data:" +msgstr "Ekstra data:" + +#: templates/web/base/contact/submit.html:13 +msgid "Failed to send message" +msgstr "Kunne ikke sende besked" + +#: templates/web/zurich/admin/index-dm.html:33 +#: templates/web/zurich/admin/index-sdm.html:30 +msgid "Filter report list" +msgstr "Filtrér rapportliste" + +#: templates/web/base/questionnaire/index.html:55 +#: templates/web/fixmystreet/questionnaire/index.html:74 +msgid "First time" +msgstr "Første gang" + +#: templates/web/base/admin/body.html:48 +msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." +msgstr "Fiks dette ved at vælge en <strong>area covered</strong> i <em> Edit body details</em>-skemaet nedenfor." + +#: templates/web/base/header.html:24 +msgid "FixMyStreet" +msgstr "FixMinVej" + +#: templates/web/base/admin/header.html:10 +msgid "FixMyStreet admin:" +msgstr "FixMinVej-administrator:" + +#: templates/web/base/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 "" +"FixMinVej har forskellige RSS-strømme og e-postlister om lokale problemer, dette inkluderer problemer meldt indenfor en bestemt bydel eller myndighed, eller et område med problemer\n" +"indenfor en angivet distance fra en bestemt position." + +#: templates/web/base/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’s alerts, but will only appear in the \"Within the boundary\" alert\n" +"for the county council." +msgstr "FixMinVej sender forskellige kategorier af problemer til forskellige myndigheder, problemer som gælder flere myndigheder bliver sendt til alle dem det angår." + +#: templates/web/base/admin/index.html:55 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:54 +#: templates/web/base/admin/report_edit.html:55 +#: templates/web/base/dashboard/index.html:142 +#: templates/web/base/dashboard/index.html:144 +#: templates/web/base/report/update-form.html:30 +#: templates/web/base/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 "Løst" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:56 +msgid "Fixed - Council" +msgstr "Løst - Administration" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:55 +msgid "Fixed - User" +msgstr "Løst - Bruger" + +#: templates/web/base/my/my.html:35 +#: templates/web/fixmystreet/my/_problem-list.html:7 +msgid "Fixed reports" +msgstr "Fiksede rapporter" + +#: templates/web/base/admin/problem_row.html:37 +msgid "Fixed:" +msgstr "Løst:" + +#: templates/web/base/admin/body-form.html:89 +#: templates/web/zurich/admin/body-form.html:36 +msgid "Flag as deleted" +msgstr "Markér som slettet" + +#: templates/web/base/admin/report_blocks.html:16 +msgid "Flag user" +msgstr "Markér bruger" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: templates/web/base/admin/users.html:19 +msgid "Flagged" +msgstr "Markeret:" + +#: templates/web/base/admin/flagged.html:1 +msgid "Flagged reports and users" +msgstr "Markerede rapporter og brugere" + +#: templates/web/base/admin/user-form.html:46 +msgid "Flagged users are listed on the <a href='%s'>flagged</a> page." +msgstr "Markerede brugere er listet op på <a href='%s'>Markerede</a>-siden." + +#: templates/web/base/admin/flagged.html:31 +msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." +msgstr "Markerede brugere er ikke begrænset på noget måde. Dette er bare en liste med brugere som er blevet markeret for at give dem opmærksomhed." + +#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/user-form.html:52 +msgid "Flagged:" +msgstr "Markeret:" + +#: templates/web/base/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 "Følg en bydelslænke for at kun se rapporter indenfor denne bydel." + +#: templates/web/base/admin/body-form.html:65 +msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." +msgstr "For mere information, se <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Hvordan FixMyStreet bruger Mapit</a>." + +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:32 +#: templates/web/fixmystreet/report/update-form.html:106 +msgid "Forgotten your password?" +msgstr "Glemt din adgangskode?" + +#: templates/web/base/faq/faq-en-gb.html:1 +#: templates/web/base/static/privacy.html:1 +#: templates/web/base/static/privacy.html:2 +msgid "Frequently Asked Questions" +msgstr "Ofte spurgte spørgsmål" + +#: templates/web/base/open311/index.html:136 +msgid "GeoRSS on Google Maps" +msgstr "GeoRSS på Google Maps" + +#: templates/web/fixmystreet/around/_updates.html:3 +#: templates/web/fixmystreet/report/display.html:35 +msgid "Get updates" +msgstr "Få opdateringer" + +#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/fixmystreet/reports/_rss.html:9 +msgid "Get updates of %s problems" +msgstr "Få opdateringer for problemer i denne %s" + +#: templates/web/fixmystreet/reports/_rss.html:11 +#: templates/web/fixmystreet/reports/_rss.html:3 +msgid "Get updates of problems in this %s" +msgstr "Få opdateringer for problemer i denne %s" + +#: templates/web/base/alert/_list.html:83 +#: templates/web/fixmystreet/alert/_list.html:82 +msgid "Give me an RSS feed" +msgstr "Giv mig en RSS-strøm" + +#: templates/web/base/questionnaire/completed.html:14 +msgid "Glad to hear it’s been fixed!" +msgstr "" + +#: templates/web/base/alert/index.html:34 +#: templates/web/base/around/postcode_form.html:8 +#: templates/web/fixmystreet/around/postcode_form.html:21 +#: templates/web/zurich/admin/stats.html:26 +msgid "Go" +msgstr "Søg" + +#: templates/web/base/admin/report_edit.html:93 +msgid "Going to send questionnaire?" +msgstr "Skal der sendes spørgeskema?" + +#: templates/web/base/admin/index.html:43 +msgid "Graph of problem creation by status over time" +msgstr "Graf over problemoprettelse fordelt på status over tid" + +#: templates/web/base/reports/index.html:12 +msgid "Greyed-out lines are councils that no longer exist." +msgstr "Linjer med grå baggrund er myndigheder som ikke længere eksidsterer." + +#: templates/web/base/questionnaire/index.html:37 +#: templates/web/fixmystreet/questionnaire/index.html:56 +msgid "Has this problem been fixed?" +msgstr "Er dette problem blevet løst?" + +#: templates/web/base/questionnaire/index.html:50 +#: templates/web/fixmystreet/questionnaire/index.html:69 +msgid "Have you ever reported a problem to a council before, or is this your first time?" +msgstr "Har du rapporteret et problem til en myndighed før, eller er dette første gang?" + +#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:30 +#: 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 "Hjælp" + +#: templates/web/base/alert/_list.html:6 +#: templates/web/fixmystreet/alert/_list.html:8 +msgid "Here are the types of local problem alerts for ‘%s’." +msgstr "Her er de forskellige typer lokale problemvarsler for ‘%s’." + +#: templates/web/fixmystreet/header.html:58 +#: templates/web/zurich/footer.html:11 +msgid "Hi %s" +msgstr "Hej, %s" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:63 +#: templates/web/base/admin/report_edit.html:64 +#: templates/web/base/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:86 +#: templates/web/zurich/admin/report_edit.html:90 +#: templates/web/zurich/admin/stats.html:32 +#: templates/web/zurich/admin/update_edit.html:18 +msgid "Hidden" +msgstr "Skjul" + +#: templates/web/base/around/display_location.html:65 +msgid "Hide old" +msgstr "Skjul gamle" + +#: templates/web/base/around/display_location.html:60 +msgid "Hide pins" +msgstr "Skjul nåle" + +#: templates/web/base/admin/category_edit.html:84 +msgid "History" +msgstr "Historie" + +#: templates/web/base/js/translation_strings.html:31 +msgid "Home" +msgstr "Hjem" + +#: templates/web/base/index-steps.html:1 +msgid "How to report a problem" +msgstr "Hvordan rapporteres et problem" + +#: templates/web/base/js/translation_strings.html:33 +msgid "How to send successful reports" +msgstr "Hvordan indsendes rapporter som er løst" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:740 +msgid "I am afraid you cannot confirm unconfirmed reports." +msgstr "Jeg er bange for at du ikke kan bekræfte ubekræftede rapporter." + +#: templates/web/base/tokens/confirm_problem.html:23 +#: templates/web/base/tokens/confirm_problem.html:27 +msgid "I just reported a problem on @fixmystreet" +msgstr "Jeg rapporterede netop et problem på @fixminvej" + +#: templates/web/base/tokens/confirm_update.html:19 +#: templates/web/base/tokens/confirm_update.html:23 +msgid "I just updated a problem on @fixmystreet" +msgstr "Jeg opdaterede netop et problem på @fixminvej" + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +msgid "I'm afraid we couldn't locate your problem in the database.\n" +msgstr "Jeg er bange for at vi ikke kunne finde dit problem i databasen.\n" + +#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 +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 bange for at vi ikke kunne verificere denne reference. Hvis du kopierede webadressen fra en e-post, kontrollér at du har kopieret den korrekt.\n" + +#: templates/web/base/admin/flagged.html:14 +#: templates/web/base/admin/list_updates.html:6 +#: templates/web/base/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/base/admin/body-form.html:24 +#: templates/web/base/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 "Identificér en <strong>parent</strong> hvis instansen selv er en del af en anden myndighed." + +#: templates/web/base/admin/body.html:133 +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 "Hvis to eller flere instanser er lokaliseret på samme sted, kombinerer FixMinVej identiske kategorier i en enkelt opføring i menuen. Kontrollér at du bruger samme kategorinavn for instanserne, hvis det er det du ønsker." + +#: templates/web/base/email_sent.html:19 +msgid "If you do not, your alert will not be activated." +msgstr "Hvis du ikke gør dette, vil dit varsel ikke blive aktiveret" + +#: templates/web/base/email_sent.html:15 +msgid "If you do not, your problem will not be posted." +msgstr "Hvis du ikke gør dette, vil din rapport ikke blive publiceret" + +#: templates/web/base/email_sent.html:17 +msgid "If you do not, your update will not be posted." +msgstr "Hvis du ikke gør dette, vil din opdatering ikke blive publiceret" + +#: templates/web/base/questionnaire/completed.html:8 +msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." +msgstr "Hvis du får mere information om status for dit problem, så vær sød at komme tilbage til netstedet og lav en opdatering." + +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:8 +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 indsender et problem her, så vil emne og detaljer for problemet være offentlig, men problemet vil <strong>ikke</strong> blive rapportert til myndigheden." + +#: templates/web/base/auth/token.html:22 templates/web/base/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 "Hvis du bruger web-baseret e-post eller har filtre for affalds-e-post på din e-postkonto, skal du i nogen tilfælde se efter vores beskeder der." + +#: templates/web/base/questionnaire/index.html:59 +#: templates/web/fixmystreet/questionnaire/index.html:78 +msgid "" +"If you wish to leave a public update on the problem, please enter it here\n" +"(please note it will not be sent to the council). For example, what was\n" +"your experience of getting the problem fixed?" +msgstr "" +"Hvis du ønsker at tilføje en offentlig kommentar på problemet, så tilføj den her\n" +"(denne bliver ikke sendt til myndigheden). Du kan for eksempel\n" +"dele din erfaring med hvordan dit problem blev løst." + +#: templates/web/base/admin/body.html:149 +msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." +msgstr "Hvis du bruger <strong>en sendemetode som ikke er e-post</strong>, så indtast tjeneste-ID (Open311) eller tilsvarende identifikator her." + +#: templates/web/base/admin/body-form.html:207 +#: templates/web/base/admin/body-form.html:208 +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 "" +"Hvis du har aktiveret Open311 update-sending ovenfor, vil Open311 normalt kun godtage OPEN eller CLOSED status i\n" +"sine opdateringer. Aktivér <strong>extended Open311 statuses</strong> hvis du vil tillade ekstra tilstande.\n" +"Tjek at cobrand understøtter denne funktion før du slår den til." + +#: templates/web/base/admin/body-form.html:194 +#: templates/web/base/admin/body-form.html:195 +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 "" +"Hvis du har aktiveret Open311 update-sending ovenfor, så aktivér <strong>suppression of alerts</strong>,\n" +"hvis du <strong>ikke</strong> ønsker at varsle denne bruger hver gang disse opdateringer bliver lavet." + +#: templates/web/base/admin/body-form.html:177 +#: templates/web/base/admin/body-form.html:178 +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 "" +"Hvis du har aktiveret Open311 update-sending ovenfor, skal du identificere hvilke FixMinVej <strong>bruger</ strong> som bliver krediteret for opdateringer \n" +"når de bliver vist på netstedet. Vis ID (nummer) for denne bruger." + +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 +msgid "Illegal ID" +msgstr "Ugyldigt ID" + +#: perllib/FixMyStreet/App/Controller/Alert.pm:100 +msgid "Illegal feed selection" +msgstr "Ugyldigt valg af feed" + +#: templates/web/base/dashboard/index.html:142 +#: templates/web/base/dashboard/index.html:144 +#: templates/web/base/report/update-form.html:30 +#: templates/web/base/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 "Under Udførelse" + +#: templates/web/base/admin/flagged.html:39 +msgid "In abuse table?" +msgstr "I misbrugstabel?" + +#: templates/web/base/open311/index.html:88 +msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." +msgstr "Yderligere bliver følgende attributter, som ikke er del af Open311 v2-specifikationen, returneret: agency_sent_datetime, title (også returneret som del af description), interface_used, comment_count, requestor_name (kun tilstede hvis indsender tillod at navnet kunne vises på dette netsted)." + +#: perllib/FixMyStreet/Cobrand/Zurich.pm:144 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 +#: 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:99 +#: templates/web/zurich/report/banner.html:15 +msgid "In progress" +msgstr "Under udførelse" + +#: templates/web/base/tokens/confirm_alert.html:11 +msgid "Inbox zero, here we come!" +msgstr "Tom indboks, her kommer vi!" + +#: templates/web/zurich/admin/report_edit.html:160 +msgid "Include reporter personal details" +msgstr "Inkludér rapportørens personlige detaljer" + +#: templates/web/base/admin/stats.html:76 +msgid "Include unconfirmed reports" +msgstr "Inkludér ubekræftede problemer" + +#: perllib/FixMyStreet/App/Controller/Open311.pm:359 +msgid "Incorrect has_photo value \"%s\"" +msgstr "Forkert has_photo-værdi \"%s\"" + +#: templates/web/zurich/admin/list_updates.html:3 +msgid "Internal notes" +msgstr "Interne notater" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:61 +msgid "Internal referral" +msgstr "Intern reference" + +#: perllib/FixMyStreet/App/Controller/Open311.pm:344 +msgid "Invalid agency_responsible value %s" +msgstr "Ugyldig agency_responsible-værdi %s" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1112 +msgid "Invalid end date" +msgstr "Ugyldig slut-dato" + +#: perllib/FixMyStreet/App/Controller/Open311.pm:437 +msgid "Invalid format %s specified." +msgstr "Ugyldigt format %s angivet." + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 +msgid "Invalid start date" +msgstr "Ugyldig startdato" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:50 +#: templates/web/base/dashboard/index.html:142 +#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/report/update-form.html:30 +#: templates/web/base/report/update-form.html:31 +#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/fixmystreet/report/update-form.html:29 +msgid "Investigating" +msgstr "Undersøges" + +#: 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 "Det er ofte hurtigst at <a href=\"%s\">tjekke vores FAQ</a> og se om svaret er der." + +#: templates/web/base/tokens/confirm_problem.html:14 +msgid "It’s on its way to the council right now." +msgstr "" + +#: templates/web/base/auth/general.html:44 +#: templates/web/base/report/new/fill_in_details_form.html:131 +#: templates/web/base/report/update-form.html:104 +#: templates/web/fixmystreet/auth/general.html:47 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 +#: templates/web/fixmystreet/report/update-form.html:102 +#: templates/web/zurich/auth/general.html:40 +msgid "Keep me signed in on this computer" +msgstr "Husk min indlogning på denne datamaskine" + +#: templates/web/base/admin/body.html:70 +#: templates/web/zurich/admin/body.html:16 +msgid "Last editor" +msgstr "Sidst redigeret af" + +#: templates/web/base/admin/report_edit.html:88 +msgid "Last update:" +msgstr "Sidste opdatering:" + +#: templates/web/base/admin/problem_row.html:39 +msgid "Last update:" +msgstr "Sidste opdatering:" + +#: templates/web/base/admin/body-form.html:229 +msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." +msgstr "Lad denne være blank hvis alle rapporter til denne myndighed skal sendes ved hjælp af samme sende-metode (dvs. \"%s\")." + +#: templates/web/base/admin/body.html:27 +msgid "List all reported problems" +msgstr "List alle rapporterede problemer" + +#: templates/web/base/report/new/category_wrapper.html:4 +msgid "Loading..." +msgstr "Indlæser..." + +#: templates/web/base/alert/choose.html:1 +#: templates/web/base/alert/choose.html:3 +#: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5 +#: templates/web/base/alert/updates.html:1 +#: templates/web/base/tokens/confirm_alert.html:1 +#: templates/web/fixmystreet/alert/updates.html:1 +msgid "Local RSS feeds and email alerts" +msgstr "Lokale RSS-strømme og e-postvarsler" + +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:12 +#: templates/web/base/alert/list.html:14 templates/web/base/alert/list.html:3 +msgid "Local RSS feeds and email alerts for ‘%s’" +msgstr "" + +#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:28 +msgid "Local alerts" +msgstr "Lokale varsler" + +#: templates/web/base/index-steps.html:25 +msgid "Locate the problem on a map of the area" +msgstr "Lokalisér problemet på kortet over området" + +#: templates/web/base/js/translation_strings.html:43 +msgid "MAP" +msgstr "KORT" + +#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 +msgid "Map" +msgstr "Kort" + +#: templates/web/base/admin/report_edit.html:86 +#, fuzzy +msgid "Mark as sent" +msgstr "markeret som lukket" + +#: templates/web/base/admin/user-form.html:44 +msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." +msgstr "Markér brugere hvis adfærd du ønsker at have tjek på som <strong>markeret</strong>." + +#: templates/web/base/reports/index.html:24 +msgid "Marked fixed/closed in the past eight weeks" +msgstr "" + +#: templates/web/base/reports/index.html:25 +msgid "Marked fixed/closed more than eight weeks ago" +msgstr "" + +#: templates/web/fixmystreet/contact/index.html:106 +msgid "Message" +msgstr "Besked" + +#: templates/web/base/contact/index.html:97 +msgid "Message:" +msgstr "Besked:" + +#: perllib/FixMyStreet/App/Controller/Open311.pm:445 +msgid "Missing jurisdiction_id" +msgstr "Mangler jurisdiction_id" + +#: templates/web/zurich/admin/stats.html:34 +msgid "Moderated by division within one working day" +msgstr "Modereret af afdeling inden for en arbejdsdag" + +#: templates/web/base/admin/stats.html:11 +msgid "Month" +msgstr "Måned" + +#: templates/web/base/report/display.html:34 +msgid "More problems nearby" +msgstr "Flere problemer i nærheden" + +#: templates/web/base/admin/bodies.html:21 +#: templates/web/base/admin/body-form.html:18 +#: templates/web/base/admin/flagged.html:16 +#: templates/web/base/admin/flagged.html:37 +#: templates/web/base/admin/list_updates.html:7 +#: templates/web/base/admin/reports.html:13 +#: templates/web/base/admin/users.html:15 +#: templates/web/base/reports/index.html:20 +#: templates/web/fixmystreet/auth/general.html:53 +#: templates/web/fixmystreet/report/new/form_user_loggedin.html:9 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:44 +#: templates/web/fixmystreet/report/update-form.html:138 +#: 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:77 +msgid "Name" +msgstr "Navn" + +#: templates/web/base/admin/report_edit.html:79 +#: templates/web/base/admin/update_edit.html:32 +#: templates/web/base/admin/user-form.html:18 +#: templates/web/zurich/admin/report_edit-sdm.html:43 +#: templates/web/zurich/admin/report_edit.html:56 +#: templates/web/zurich/admin/stats.html:41 +msgid "Name:" +msgstr "Navn:" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:313 +msgid "Name: %s" +msgstr "Navn: %s" + +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 +#: perllib/FixMyStreet/Geocode/OSM.pm:145 +msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" +msgstr "Nærmeste navngivne vej til nålen placeret på kortet (automatisk genereret ved hjælp af OpenStreetMap): %s%s" + +#: perllib/FixMyStreet/Cobrand/UK.pm:127 +msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" +msgstr "Nærmeste postnummer for nålen placeret på kortet (automatisk genereret): %s (%sm væk)" + +#: perllib/FixMyStreet/Cobrand/Default.pm:442 +#: perllib/FixMyStreet/Cobrand/Default.pm:482 +msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" +msgstr "Nærmeste vej for nålen placeret på kortet (automatisk genereret ved hjælp af Bing Maps): %s" + +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:277 +msgid "" +"Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" +"\n" +msgstr "" +"Nærmeste vej for nålen placeret på kortet (automatisk genereret ved hjælp af Bing Maps) er: %s\n" +"\n" + +#: templates/web/base/email_sent.html:3 +msgid "Nearly Done! Now check your email..." +msgstr "Nesten færdig! Nu skal du tjekke din e-post..." + +#: templates/web/base/reports/index.html:21 +msgid "New <br>problems" +msgstr "Nye <br>problemer" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:261 +msgid "New body added" +msgstr "Ny myndighed tilføjet" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:379 +msgid "New category contact added" +msgstr "Ny kategorikontakt tilføjet" + +#: templates/web/zurich/admin/report_edit-sdm.html:55 +#: templates/web/zurich/admin/report_edit.html:81 +msgid "New internal note:" +msgstr "Nyt internt notat:" + +#: db/alert_types.pl:18 db/alert_types.pl:22 +msgid "New local problems on FixMyStreet" +msgstr "Nye lokale problemer på FixMinVej" + +#: db/alert_types_eha.pl:12 +msgid "New local reports on reportemptyhomes.com" +msgstr "Nye lokale rapporter på reportemptyhomes.com" + +#: db/alert_types.pl:38 +msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" +msgstr "Nye problemer for {{COUNCIL}} indenfor {{WARD}} bydel på FixMinVej" + +#: db/alert_types.pl:26 db/alert_types.pl:30 +msgid "New problems near {{POSTCODE}} on FixMyStreet" +msgstr "Nye problemer nær postnummer {{POSTCODE}} på FixMinVej" + +#: db/alert_types.pl:10 +msgid "New problems on FixMyStreet" +msgstr "Nye problemer på FixMinVej" + +#: db/alert_types.pl:34 +msgid "New problems to {{COUNCIL}} on FixMyStreet" +msgstr "Nye problemer i {{COUNCIL}} på FixMinVej" + +#: db/alert_types.pl:42 +msgid "New problems within {{NAME}}'s boundary on FixMyStreet" +msgstr "Nye rapporter indenfor grænsen for {{NAME}} på FixMinVej" + +#: templates/web/zurich/admin/index-sdm.html:4 +msgid "New reports" +msgstr "Nye rapporter" + +#: db/alert_types_eha.pl:23 +msgid "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com" +msgstr "Nye rapporter for {{COUNCIL}} indenfor {{WARD}} bydel på reportemptyhomes.com" + +#: db/alert_types_eha.pl:5 +msgid "New reports on reportemptyhomes.com" +msgstr "Nye rapporter på reportemptyhomes.com" + +#: db/alert_types_eha.pl:16 +msgid "New reports on reportemptyhomes.com near {{POSTCODE}}" +msgstr "Nye rapporter på reportemptyhomes.com nær postnummer {{POSTCODE}}" + +#: db/alert_types_eha.pl:19 +msgid "New reports to {{COUNCIL}} on reportemptyhomes.com" +msgstr "Nye rapporter til {{COUNCIL}} på reportemptyhomes.com" + +#: db/alert_types_eha.pl:27 +msgid "New reports within {{NAME}}'s boundary on reportemptyhomes.com" +msgstr "Nye rapporter indenfor grænsen til {{NAME}} på reportemptyhomes.com" + +#: templates/web/base/admin/questionnaire.html:24 +msgid "New state" +msgstr "Ny tilstand" + +#: templates/web/zurich/admin/report_edit-sdm.html:58 +msgid "New update:" +msgstr "Ny opdatering:" + +#: templates/web/base/pagination.html:13 +msgid "Next" +msgstr "Næste" + +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 +#: templates/web/base/admin/category_edit.html:4 +#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:34 +#: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/problem_row.html:20 +#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:93 +#: templates/web/base/admin/update_edit.html:25 +#: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/questionnaire/index.html:44 +#: templates/web/base/questionnaire/index.html:83 +#: templates/web/fixmystreet/questionnaire/index.html:102 +#: templates/web/fixmystreet/questionnaire/index.html:63 +msgid "No" +msgstr "Nej" + +#: templates/web/base/admin/user-form.html:33 +msgid "No body" +msgstr "Ingen myndighed" + +#: templates/web/base/admin/stats.html:85 +msgid "No council" +msgstr "Ingen myndighed" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:401 +msgid "No council selected" +msgstr "Ingen myndighed er valgt" + +#: templates/web/base/admin/edit-league.html:17 +msgid "No edits have yet been made." +msgstr "Ingen ændringer er blevet gjort." + +#: templates/web/base/admin/flagged.html:25 +msgid "No flagged problems found." +msgstr "Fandt ingen markerede problemer." + +#: templates/web/base/admin/flagged.html:58 +msgid "No flagged users found." +msgstr "Fant ingen markerede brugere." + +#: templates/web/zurich/admin/report_edit-sdm.html:65 +msgid "No further updates" +msgstr "Ikke flere opdateringer" + +#: templates/web/base/around/around_map_list_items.html:17 +#: templates/web/fixmystreet/around/around_map_list_items.html:8 +msgid "No problems found." +msgstr "Ingen problemer blev fundet." + +#: templates/web/base/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 "Ingen problemer er rapporteret" + +#: templates/web/base/js/translation_strings.html:38 +msgid "No result returned" +msgstr "Ingen resultater returneret" + +#: templates/web/base/admin/body-form.html:60 +#: templates/web/base/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 "" +"Ingen specifikke områder er tilgængelig for øjeblikket, fordi \n" +"<code>MAPIT_URL</code> i din \n" +"config-fil ikke peger på en live MapIt-tjeneste." + +#: templates/web/base/report/_support.html:2 +#: templates/web/base/report/_support.html:4 +msgid "No supporters" +msgstr "Ingen supportere" + +#: templates/web/base/admin/report_edit.html:41 +#: templates/web/zurich/admin/report_edit-sdm.html:46 +#: templates/web/zurich/admin/report_edit.html:60 +msgid "None" +msgstr "Ingen" + +#: templates/web/base/admin/user-form.html:24 +#: templates/web/base/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 "" +"Normale (offentlige) brugere bør ikke være forbundet med nogen <strong>instans</ strong>. <br>\n" +"Autoriserede brugere i staben kan være forbundet med den instansen de representerer. <br>\n" +"Afhængig af implementeringen kan ansatte brugere have adgang til dashbordet (sammendrag af \n" +"aktivitet for hele instansen), mulighed at skjule beskeder eller sætte status for specialrapporter." + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 +#: templates/web/base/report/update-form.html:30 +#: templates/web/base/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 "Ikke ansvarlig" + +#: templates/web/zurich/admin/report_edit-sdm.html:18 +msgid "Not for my subdivision" +msgstr "Ikke for min underafdeling" + +#: templates/web/base/admin/questionnaire.html:6 +msgid "Not reported before" +msgstr "Ikke rapporteret tidligere" + +#: templates/web/base/report/_main.html:62 +msgid "Not reported to council" +msgstr "Ikke rapporteret til myndigheden" + +#: templates/web/base/admin/body.html:71 +#: templates/web/base/admin/category_edit.html:92 +#: templates/web/zurich/admin/body.html:17 +msgid "Note" +msgstr "Bemærk" + +#: templates/web/base/admin/stats.html:51 +msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" +msgstr "Bemærk at når vi medtager ubekræftede rapporter så bruges datoen som rapporten var oprettet, hvilket ikke behøver være den samme måned som rapporten blev bekræftet, så tallene kan hoppe lidt op og ned." + +#: templates/web/base/admin/body.html:186 +#: templates/web/base/admin/category_edit.html:49 +#: templates/web/zurich/admin/body.html:53 +msgid "Note:" +msgstr "Bemærk:" + +#: templates/web/base/open311/index.html:73 +msgid "Note: <strong>%s</strong>" +msgstr "Note: <strong>%d</strong>" + +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:10 +msgid "Now to submit your report…" +msgstr "På tide at sende din rapport…" + +#: templates/web/base/report/new/fill_in_details_form.html:113 +msgid "Now to submit your report… do you have a FixMyStreet password?" +msgstr "På tide at sende din rapport… har du en FixMinVej-adgangskode?" + +#: templates/web/fixmystreet/report/update-form.html:85 +msgid "Now to submit your update…" +msgstr "På tide at registrere din opdatering…" + +#: templates/web/base/report/update-form.html:86 +msgid "Now to submit your update… do you have a FixMyStreet password?" +msgstr "På tide at registrere din opdatering… har du en FixMinVej-adgangskode?" + +#: templates/web/base/js/translation_strings.html:42 +msgid "OK" +msgstr "OK" + +#: templates/web/base/report/display.html:28 +#: templates/web/base/report/update.html:17 +msgid "Offensive? Unsuitable? Tell us" +msgstr "Stødende? Upassende? Giv os besked" + +#: templates/web/base/reports/index.html:23 +msgid "Old / unknown <br>problems" +msgstr "Gamle / ukendte <br>problemer" + +#: templates/web/base/admin/questionnaire.html:24 +msgid "Old state" +msgstr "Gammel tilstand" + +#: templates/web/base/reports/index.html:25 +msgid "Older <br>fixed" +msgstr "Ældre <br>løste" + +#: templates/web/base/reports/index.html:22 +msgid "Older <br>problems" +msgstr "Ældre <br>problemer" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 +msgid "One-line summary" +msgstr "Enlinjers opsummering" + +#: perllib/FixMyStreet/Cobrand/Zurich.pm:138 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:49 +#: templates/web/base/admin/report_edit.html:50 +#: templates/web/base/admin/update_edit.html:28 +#: templates/web/base/dashboard/index.html:142 +#: templates/web/base/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:86 +#: templates/web/zurich/admin/report_edit.html:88 +#: templates/web/zurich/admin/update_edit.html:18 +#: templates/web/zurich/report/banner.html:11 +msgid "Open" +msgstr "Åben" + +#: templates/web/base/reports/index.html:22 +msgid "Open for more than four weeks, with an update within the past eight weeks" +msgstr "" + +#: templates/web/base/my/my.html:30 +#: templates/web/fixmystreet/my/_problem-list.html:2 +msgid "Open reports" +msgstr "Åbne rapporter" + +#: templates/web/base/reports/index.html:23 +msgid "Open, but not had any update in eight weeks" +msgstr "" + +#: templates/web/base/open311/index.html:70 +msgid "Open311 API for the mySociety FixMyStreet server" +msgstr "Open311-API for mySocietys FixMinVej-server" + +#: templates/web/base/open311/index.html:80 +msgid "Open311 initiative web page" +msgstr "Open311-initiativets netside" + +#: templates/web/base/open311/index.html:81 +msgid "Open311 specification" +msgstr "Open311-specifikation" + +#: templates/web/base/alert/_list.html:58 +#: templates/web/fixmystreet/alert/_list.html:60 +msgid "Or problems reported to:" +msgstr "Eller problemer meldt til:" + +#: templates/web/base/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’re in:" +msgstr "Eller du kan abonnere på varsel baseret på bydel eller myndighed du hører ind under:" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 +#: perllib/FixMyStreet/DB/Result/Problem.pm:597 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:393 +msgid "Other" +msgstr "Andet" + +#: templates/web/base/footer.html:27 +msgid "Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>." +msgstr "Vores kildekode er frit programmel og <a href=\"http://github.com/mysociety/fixmystreet\">tilgængelig på GitHub</a>." + +#: templates/web/base/admin/list_updates.html:8 +msgid "Owner" +msgstr "Ejer" + +#: templates/web/base/errors/page_error_404_not_found.html:1 +#: templates/web/base/errors/page_error_404_not_found.html:3 +msgid "Page Not Found" +msgstr "Fandt ikke siden" + +#: templates/web/base/admin/body-form.html:31 +#: templates/web/zurich/admin/body-form.html:14 +msgid "Parent" +msgstr "Forælder" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 +msgid "Partial" +msgstr "Delvis" + +#: templates/web/fixmystreet/auth/general.html:56 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:68 +#: templates/web/fixmystreet/report/update-form.html:116 +#: templates/web/zurich/auth/general.html:32 +#: templates/web/zurich/auth/general.html:63 +msgid "Password (optional)" +msgstr "Adgangskode (valgfrit)" + +#: templates/web/base/auth/change_password.html:25 +msgid "Password:" +msgstr "Adgangskode:" + +#: templates/web/base/js/translation_strings.html:48 +msgid "Permalink" +msgstr "Permalink" + +#: templates/web/zurich/report/new/fill_in_details_form.html:83 +msgid "Phone number" +msgstr "Telefonnummer" + +#: templates/web/fixmystreet/report/new/form_user_loggedin.html:26 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:62 +msgid "Phone number (optional)" +msgstr "Telefonnummer (valgfrit)" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:291 +#: templates/web/base/admin/report_edit.html:81 +#: templates/web/base/report/new/fill_in_details_form.html:197 +#: templates/web/zurich/admin/report_edit-sdm.html:46 +#: templates/web/zurich/admin/report_edit.html:60 +#: templates/web/zurich/admin/stats.html:39 +msgid "Phone:" +msgstr "Telefon:" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 +#: 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:51 +msgid "Photo" +msgstr "Billed" + +#: templates/web/base/questionnaire/index.html:71 +#: templates/web/base/report/new/fill_in_details_form.html:84 +#: templates/web/base/report/update-form.html:62 +#: templates/web/fixmystreet/questionnaire/index.html:91 +msgid "Photo:" +msgstr "Billed:" + +#: templates/web/base/alert/list.html:26 +msgid "Photos of recent nearby reports" +msgstr "Billeder af nye problemer i nærheden" + +#: templates/web/base/js/translation_strings.html:30 +msgid "Place pin on map" +msgstr "Placér tegnestiften på kortet" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/dashboard/index.html:142 +#: templates/web/base/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:86 +#: templates/web/zurich/admin/report_edit.html:89 +msgid "Planned" +msgstr "Planlagt" + +#: templates/web/fixmystreet/questionnaire/index.html:45 +msgid "Please <a class=\"tab_link\" href=\"#report\">take a look</a> at the updates that have been left." +msgstr "Venligst <a class=\"tab_link\" href=\"#report\">gennemse</a> opdateringene som er blevet lagt ind." + +#: templates/web/base/report/new/notes.html:5 +msgid "Please be polite, concise and to the point." +msgstr "Vær høflig, præcis og kortfattet." + +#: templates/web/base/auth/change_password.html:12 +#: templates/web/base/auth/change_password.html:17 +msgid "Please check the passwords and try again" +msgstr "Venligst kontrollér adgangskoderne og prøv igen" + +#: templates/web/base/auth/token.html:14 +msgid "Please check your email" +msgstr "Venligst kontrollér e-posten du angav" + +#: templates/web/base/auth/general.html:14 +#: templates/web/base/auth/general.html:8 +#: templates/web/fixmystreet/auth/general.html:10 +#: templates/web/fixmystreet/auth/general.html:16 +#: templates/web/zurich/auth/general.html:3 +#: templates/web/zurich/auth/general.html:9 +msgid "Please check your email address is correct" +msgstr "Venligst kontrollér at du har skrevet en gyldig e-postadresse" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:876 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 +#: perllib/FixMyStreet/DB/Result/Problem.pm:412 +#: templates/web/base/js/translation_strings.html:9 +msgid "Please choose a category" +msgstr "Vælg en kategori" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:418 +msgid "Please choose a property type" +msgstr "Vælg en type egenskab" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:370 +msgid "Please correct the errors below" +msgstr "Husk at rette op på fejlene nedenfor." + +#: templates/web/base/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 "" +"Venligst <strong>ikke</strong> rapportér fejl via denne side; beskederne går til\n" +"gruppen som står bag FixMinVej, og ikke til en myndighed. For at rapportere et problem\n" +"så <a href=\"/\">gå til forsiden</a> og følg instruktionene." + +#: templates/web/base/report/new/notes.html:6 +msgid "Please do not be abusive — abusing your council devalues the service for all users." +msgstr "Vær ikke ufin — at skælde ud på din myndighed skader værdien af tjenesten for alle brugerne." + +#: perllib/FixMyStreet/App/Controller/Admin.pm:346 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 +#: templates/web/base/js/translation_strings.html:2 +msgid "Please enter a message" +msgstr "Venligst indlæg en besked" + +#: templates/web/base/auth/change_password.html:12 +#: templates/web/base/auth/change_password.html:15 +#: templates/web/base/js/translation_strings.html:19 +msgid "Please enter a password" +msgstr "Indtast en adgangskode" + +#: perllib/FixMyStreet/App/Controller/Contact.pm:113 +#: perllib/FixMyStreet/DB/Result/Problem.pm:395 +#: templates/web/base/js/translation_strings.html:3 +msgid "Please enter a subject" +msgstr "Venligst angiv et emne" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin.pm:995 +#: perllib/FixMyStreet/DB/Result/User.pm:127 +#: templates/web/base/js/translation_strings.html:12 +#: templates/web/base/js/translation_strings.html:16 +msgid "Please enter a valid email" +msgstr "Tilføj en gyldig e-post" + +#: perllib/FixMyStreet/App/Controller/Alert.pm:346 +#: perllib/FixMyStreet/App/Controller/Contact.pm:123 +msgid "Please enter a valid email address" +msgstr "Angiv din e-post" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:398 +#: templates/web/base/js/translation_strings.html:4 +msgid "Please enter some details" +msgstr "Angiv oplysninger om problemet" + +#: perllib/FixMyStreet/App/Controller/Contact.pm:112 +#: perllib/FixMyStreet/DB/Result/User.pm:124 +#: templates/web/base/auth/general.html:13 +#: templates/web/base/auth/general.html:8 +#: templates/web/base/js/translation_strings.html:11 +#: templates/web/base/js/translation_strings.html:15 +#: templates/web/fixmystreet/auth/general.html:10 +#: templates/web/fixmystreet/auth/general.html:15 +#: templates/web/zurich/auth/general.html:3 +#: templates/web/zurich/auth/general.html:8 +msgid "Please enter your email" +msgstr "Angiv din e-post" + +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 +#: templates/web/zurich/report/new/fill_in_details_form.html:75 +msgid "Please enter your email address" +msgstr "Venligst angiv din e-postadresse" + +#: templates/web/base/js/translation_strings.html:25 +msgid "Please enter your first name" +msgstr "Venligst angiv dit fornavn" + +#: perllib/FixMyStreet/Cobrand/UK.pm:318 +#: templates/web/base/js/translation_strings.html:7 +msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Contact.pm:111 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 +#: perllib/FixMyStreet/DB/Result/Problem.pm:406 +#: perllib/FixMyStreet/DB/Result/User.pm:120 +#: templates/web/base/js/translation_strings.html:6 +msgid "Please enter your name" +msgstr "Angiv dit navn" + +#: templates/web/base/js/translation_strings.html:22 +msgid "Please enter your phone number" +msgstr "Angiv dit telefonnummer." + +#: templates/web/base/js/translation_strings.html:26 +msgid "Please enter your second name" +msgstr "Venligst angiv dit mellemnavn" + +#: templates/web/base/js/translation_strings.html:24 +msgid "Please enter your title" +msgstr "Venligst angiv din titel" + +#: templates/web/base/auth/sign_out.html:5 +#: templates/web/zurich/auth/sign_out.html:5 +msgid "Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a href=\"/\">front page</a>." +msgstr "Du kan også <a href=\"%s\">logge ind igen</a> eller gå tilbage til <a href=\"/\">forsiden</a>." + +#: templates/web/base/report/new/fill_in_details_text.html:1 +#: templates/web/base/report/new/fill_in_details_text.html:8 +msgid "Please fill in details of the problem below." +msgstr "Venligst udfyld detaljer om problemet nedenfor" + +#: templates/web/zurich/report/new/fill_in_details_form.html:46 +msgid "Please fill in details of the problem." +msgstr "Venligst udfyld detaljer om problemet." + +#: templates/web/base/report/new/fill_in_details_form.html:28 +#: templates/web/fixmystreet/report/new/sidebar.html:7 +#: 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 "" +"Venligst udfyld skemaet nedenfor med detaljerne om problemet,\n" +"og beskriv placeringen så nøjagtigt som muligt i boksen for detaljer." + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:251 +msgid "Please indicate whether you'd like to receive another questionnaire" +msgstr "Venligst indikér om du ønsker at modtage et nyt spørgeskema" + +#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4 +msgid "Please note that updates are not sent to the council." +msgstr "Vær opmærksom på at opdateringer ikke bliver videresendt til myndigheden." + +#: templates/web/base/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 "Venligst bemærk at opdateringer ikke bliver sendt til myndigheden. Hvis du vedlægger dit navnet så vil det være offentlig tilgængeligt. Din information vil kun blive brugt i henhold til vores <a href=\"/faq#privacy\">privatlivspolicy</a>" + +#: templates/web/base/report/new/fill_in_details_form.html:8 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:21 +#: 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 "Bemærk at din rapport <strong>endnu ikke er sendt</strong. Vælg en kategori og tilføj mere information nedenfor før du sender den ind." + +#: templates/web/base/report/new/notes.html:1 +#: templates/web/zurich/report/new/notes.html:1 +msgid "Please note:" +msgstr "Venligst bemærk:" + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:254 +msgid "Please provide some explanation as to why you're reopening this report" +msgstr "Venligst bidrag med en forklaring på hvorfor du genåbner denne problemrapport" + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:261 +msgid "Please provide some text as well as a photo" +msgstr "Venligst bidrag med lidt tekst i tillæg til et billede" + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:247 +msgid "Please say whether you've ever reported a problem to your council before" +msgstr "Venligst oplys om du har rapporteret et problem til din myndighed tidligere" + +#: perllib/FixMyStreet/App/Controller/Alert.pm:80 +msgid "Please select the feed you want" +msgstr "Vælg den kilde du ønsker" + +#: perllib/FixMyStreet/App/Controller/Alert.pm:118 +msgid "Please select the type of alert you want" +msgstr "Venligst vælg hvilken type varsel du ønsker" + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 +msgid "Please state whether or not the problem has been fixed" +msgstr "Venligs angiv om dette problem er blevet fikset eller ikke" + +#: templates/web/base/questionnaire/index.html:26 +msgid "Please take a look at the updates that have been left." +msgstr "Venligst gennemse opdateringerne som er blevet lagt ind." + +#: perllib/FixMyStreet/App/Controller/Photo.pm:177 +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 +#: perllib/FixMyStreet/App/Controller/Photo.pm:189 +msgid "Please upload a JPEG image only" +msgstr "Venligst læg kun JPEG-bilder op" + +#: perllib/FixMyStreet/App/Controller/Contact.pm:114 +msgid "Please write a message" +msgstr "Indtast en besked" + +#: templates/web/fixmystreet/report/update-form.html:23 +msgid "Please write your update here" +msgstr "Indtast venligst din opdatering her" + +#: templates/web/base/contact/index.html:100 +#: templates/web/base/report/update-form.html:109 +#: templates/web/base/report/update-form.html:131 +#: templates/web/base/report/update-form.html:72 +#: templates/web/fixmystreet/contact/index.html:113 +#: templates/web/fixmystreet/report/update-form.html:124 +#: templates/web/fixmystreet/report/update-form.html:71 +#: templates/web/fixmystreet/report/update-form.html:97 +msgid "Post" +msgstr "Indsend" + +#: templates/web/base/report/updates.html:15 +msgid "Posted anonymously at %s" +msgstr "Publiceret anonymt %s" + +#: templates/web/base/report/updates.html:22 +msgid "Posted by %s (<strong>%s</strong>) at %s" +msgstr "Sendt ind af %s (<strong>%s</strong>) %s" + +#: templates/web/base/report/updates.html:24 +msgid "Posted by %s at %s" +msgstr "Sendt ind af %s %s" + +#: templates/web/base/pagination.html:7 +msgid "Previous" +msgstr "Forrige" + +#: templates/web/fixmystreet/footer.html:32 +msgid "Privacy" +msgstr "Personliv" + +#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:85 +#: templates/web/base/admin/category_edit.html:45 +#: templates/web/base/admin/report_edit.html:95 +msgid "Private" +msgstr "Privat" + +#: templates/web/base/maps/openlayers.html:89 +msgid "Problem" +msgstr "Problem" + +#: templates/web/base/admin/timeline.html:22 +msgid "Problem %d created" +msgstr "Problem %d oprettet" + +#: templates/web/base/admin/timeline.html:24 +msgid "Problem %s confirmed" +msgstr "Problem %s bekræftet" + +#: templates/web/base/admin/timeline.html:26 +msgid "Problem %s sent to council %s" +msgstr "Problem %s sendt til myndighed %s" + +#: templates/web/base/admin/index.html:47 +#: templates/web/zurich/admin/index.html:9 +msgid "Problem breakdown by state" +msgstr "Tilstandsfordeling af problemer" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:966 +msgid "Problem marked as open." +msgstr "Problem markeret som åbent." + +#: templates/web/base/admin/questionnaire.html:21 +msgid "Problem state change based on survey results" +msgstr "Problemtilstandsændring baseret på spørgeundersøgelsesresultater" + +#: templates/web/base/admin/flagged.html:10 +msgid "Problems" +msgstr "Problemer" + +#: templates/web/base/around/_updates.html:1 +msgid "Problems in this area" +msgstr "Problemer i dette område" + +#: templates/web/fixmystreet/around/tabbed_lists.html:4 +#: templates/web/fixmystreet/report/display.html:43 +msgid "Problems nearby" +msgstr "Problemer i nærheden" + +#: templates/web/fixmystreet/around/tabbed_lists.html:3 +#: templates/web/fixmystreet/report/display.html:41 +msgid "Problems on the map" +msgstr "Problemer på kortet" + +#: db/alert_types.pl:14 +msgid "Problems recently reported fixed on FixMyStreet" +msgstr "Problemer nyligt rapporteret fikset på FixMinVej" + +#: templates/web/base/alert/_list.html:19 +#: templates/web/fixmystreet/alert/_list.html:21 +msgid "Problems within %.1fkm of this location" +msgstr "Problemer indenfor %.1fkm fra denne positionen" + +#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 +#: perllib/FixMyStreet/Cobrand/UK.pm:207 +msgid "Problems within %s" +msgstr "Problemer indenfor %s" + +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 +msgid "Problems within %s ward" +msgstr "Problemer indenfor %s bydel" + +#: templates/web/base/reports/body.html:0 +#: templates/web/base/reports/body.html:24 +msgid "Problems within %s, FixMyStreet" +msgstr "Problemer indenfor %s, Fiksgatami" + +#: templates/web/base/alert/_list.html:40 +#: templates/web/fixmystreet/alert/_list.html:42 +msgid "Problems within the boundary of:" +msgstr "Problemer indenfor grænserne af:" + +#: db/alert_types_eha.pl:8 +msgid "Properties recently reported as put back to use on reportemptyhomes.com" +msgstr "Ejendomme nyligt rapporteret som gået tilbage i brug på reportemptyhomes.com" + +#: templates/web/base/admin/report_edit.html:45 +msgid "Property address:" +msgstr "Ejendomsadresse:" + +#: templates/web/base/report/new/category.html:8 +msgid "Property type:" +msgstr "Type egenskab:" + +#: templates/web/base/report/update-form.html:3 +#: templates/web/fixmystreet/report/update-form.html:4 +msgid "Provide an update" +msgstr "Bidrag med en opdatering" + +#: templates/web/fixmystreet/auth/general.html:59 +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 "Det er valgfrit at angive navn og adgangskode, men hvis du gør det kan du nemmere rapportere problemer, lave opdateringer og håndtere dine rapporter." + +#: templates/web/base/report/new/fill_in_details_form.html:155 +#: templates/web/base/report/update-form.html:128 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 +#: templates/web/fixmystreet/report/update-form.html:119 +msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." +msgstr "Det er valgfrit at angive en adgangskode, men hvis du gør det vil det blive nemmere for dig at rapportere problemer, lave opdateringer og håndtere dine rapporter" + +#: templates/web/zurich/admin/report_edit.html:195 +#: templates/web/zurich/admin/report_edit.html:211 +msgid "Public response:" +msgstr "Offentlig respons:" + +#: templates/web/zurich/admin/report_edit.html:77 +#: templates/web/zurich/admin/stats.html:38 +msgid "Publish photo" +msgstr "Publicér billede" + +#: templates/web/zurich/admin/report_edit.html:219 +msgid "Publish the response" +msgstr "Publicér svar" + +#: templates/web/base/questionnaire/completed.html:1 +#: templates/web/base/questionnaire/index.html:0 +#: templates/web/base/questionnaire/index.html:14 +#: templates/web/base/questionnaire/index.html:4 +#: templates/web/fixmystreet/questionnaire/index.html:0 +#: templates/web/fixmystreet/questionnaire/index.html:15 +#: templates/web/fixmystreet/questionnaire/index.html:33 +#: templates/web/fixmystreet/questionnaire/index.html:5 +msgid "Questionnaire" +msgstr "Spørgeskema" + +#: templates/web/base/admin/timeline.html:30 +msgid "Questionnaire %d answered for problem %d, %s to %s" +msgstr "Spørgeskema %d udfyldt for problem %d, %s til %s" + +#: templates/web/base/admin/timeline.html:28 +msgid "Questionnaire %d sent for problem %d" +msgstr "Spørgeskema %d sendt for problem %d" + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +msgid "Questionnaire filled in by problem reporter" +msgstr "Spørgeskema udfyldt af fejlrapportøren" + +#: templates/web/base/alert/_list.html:21 +#: templates/web/base/around/display_location.html:1 +#: templates/web/base/around/display_location.html:3 +#: templates/web/base/report/display.html:50 +#: templates/web/base/reports/_rss.html:1 +#: templates/web/fixmystreet/alert/_list.html:22 +#: templates/web/fixmystreet/alert/updates.html:9 +#: templates/web/fixmystreet/report/display.html:58 +msgid "RSS feed" +msgstr "RSS-strøm" + +#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 +msgid "RSS feed for %s" +msgstr "RSS-strøm for %s" + +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 +msgid "RSS feed for %s ward, %s" +msgstr "RSS-strøm for %s bydel, %s" + +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 +#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +msgid "RSS feed of %s" +msgstr "RSS-strøm fra %s" + +#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 +msgid "RSS feed of %s, within %s ward" +msgstr "RSS-strøm af %s, indenfor %s bydel" + +#: templates/web/base/alert/_list.html:21 +#: templates/web/fixmystreet/alert/_list.html:22 +msgid "RSS feed of nearby problems" +msgstr "RSS-strøm med problemer i nærheden" + +#: templates/web/base/reports/_rss.html:1 +msgid "RSS feed of problems in this %s" +msgstr "RSS-strøm for problemer i denne %s" + +#: perllib/FixMyStreet/Cobrand/Default.pm:651 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 +#: perllib/FixMyStreet/Cobrand/UK.pm:214 +msgid "RSS feed of problems within %s" +msgstr "RSS-strøm for problemer indenfor %s" + +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:220 +msgid "RSS feed of problems within %s ward" +msgstr "RSS-strøm for problemer indenfor %s bydel" + +#: templates/web/base/around/display_location.html:1 +#: templates/web/base/around/display_location.html:4 +msgid "RSS feed of recent local problems" +msgstr "RSS-strøm med nylige lokale problemer" + +#: templates/web/base/report/display.html:50 +#: templates/web/fixmystreet/alert/updates.html:9 +#: templates/web/fixmystreet/report/display.html:58 +msgid "RSS feed of updates to this problem" +msgstr "RSS-strøm med opdateringer for dette problem" + +#: templates/web/base/alert/updates.html:9 +#: templates/web/base/report/display.html:41 +#: templates/web/fixmystreet/alert/updates.html:14 +#: templates/web/fixmystreet/report/display.html:60 +msgid "Receive email when updates are left on this problem." +msgstr "Modtag e-post når der er opdateringer på dette problem" + +#: templates/web/base/around/display_location.html:0 +#: templates/web/base/around/display_location.html:33 +msgid "Recent local problems, FixMyStreet" +msgstr "Nylige lokale problemer, FixMinVej." + +#: templates/web/base/reports/index.html:24 +msgid "Recently <br>fixed" +msgstr "Nyligt løste <br>problemer" + +#: templates/web/base/index.html:30 +#: templates/web/fixmystreet/front/recent.html:11 +msgid "Recently reported problems" +msgstr "Nyligt meldte problemer" + +#: templates/web/zurich/report/new/notes.html:5 +msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website." +msgstr "Husk at FixMinVej primært er lavet for at rapportere fysiske problemer som kan blive fikset. Hvis dit problem ikke er egnet til at sende ind via denne tjeneste, så husk at du kan kontakte myndigheden direkte via deres egen netside." + +#: templates/web/base/admin/report_blocks.html:16 +msgid "Remove flag" +msgstr "Fjern markering" + +#: templates/web/base/admin/report_edit.html:110 +#: templates/web/base/admin/update_edit.html:62 +#: templates/web/zurich/admin/update_edit.html:35 +msgid "Remove photo (can't be undone!)" +msgstr "Fjern billede (kan ikke fortrydes!)" + +#: templates/web/fixmystreet/header_logo.html:2 +msgid "Report" +msgstr "Rapport" + +#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 +#: templates/web/zurich/footer.html:17 +#: templates/web/zurich/nav_over_content.html:4 +msgid "Report a problem" +msgstr "Rapportér et problem" + +#: templates/web/fixmystreet/report/display.html:32 +msgid "Report abuse" +msgstr "Rapportér misbrug" + +#: perllib/FixMyStreet/App/Controller/Rss.pm:295 +msgid "Report on %s" +msgstr "Rapport på %s" + +#: templates/web/base/report/new/fill_in_details_form.html:1 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 +msgid "Report your problem" +msgstr "Rapportér dit problem" + +#: templates/web/base/index.html:11 +#: templates/web/fixmystreet/around/intro.html:1 +#: templates/web/zurich/around/intro.html:1 +msgid "Report, view, or discuss local problems" +msgstr "Rapportér, find eller diskutér lokale problemer" + +#: templates/web/base/my/my.html:82 +msgid "Reported %s" +msgstr "Rapporteret %s" + +#: templates/web/base/my/my.html:80 +msgid "Reported %s, to %s" +msgstr "Rapporteret %s, til %s" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:580 +#: templates/web/base/contact/index.html:50 +#: templates/web/fixmystreet/contact/index.html:65 +msgid "Reported anonymously at %s" +msgstr "Rapporteret anonymt %s" + +#: templates/web/base/admin/questionnaire.html:5 +#: templates/web/base/questionnaire/index.html:53 +#: templates/web/fixmystreet/questionnaire/index.html:72 +msgid "Reported before" +msgstr "Rapporteret tidligere" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: templates/web/base/contact/index.html:52 +#: templates/web/fixmystreet/contact/index.html:67 +msgid "Reported by %s at %s" +msgstr "Publiceret af %s %s" + +#: templates/web/zurich/report/_main.html:2 +msgid "Reported in the %s category" +msgstr "Rapporteret i kategorien %s" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:576 +msgid "Reported in the %s category anonymously at %s" +msgstr "Rapporteret i kategorien %s anonymt %s" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:598 +msgid "Reported in the %s category by %s at %s" +msgstr "Rapporteret i kategorien %s af %s %s" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +msgid "Reported via %s anonymously at %s" +msgstr "Publiceret af %s anonymt %s" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 +msgid "Reported via %s by %s at %s" +msgstr "Rapporteret af %s af %s %s" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 +msgid "Reported via %s in the %s category anonymously at %s" +msgstr "Rapporteret af %s i kategorien %s anonymt %s" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 +msgid "Reported via %s in the %s category by %s at %s" +msgstr "Rapporteret af %s i kategorien %s af %s %s" + +#: templates/web/base/reports/index.html:21 +#, fuzzy +msgid "Reported within the last four weeks" +msgstr "Rapporteret i kategorien %s" + +#: templates/web/base/around/around_index.html:1 +#: templates/web/base/around/around_index.html:3 +#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/report/new/fill_in_details.html:0 +#: templates/web/base/report/new/fill_in_details.html:5 +#: templates/web/fixmystreet/around/around_index.html:2 +#: templates/web/zurich/report/new/fill_in_details_form.html:2 +msgid "Reporting a problem" +msgstr "Rapporterer et problem" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:294 +#: templates/web/zurich/header.html:60 +msgid "Reports" +msgstr "Rapporter" + +#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 +msgid "Reports are limited to %s characters in length. Please shorten your report" +msgstr "Rapporterne begrænses til %s tegn. Rapporten skal forkortes." + +#: templates/web/zurich/admin/index-sdm.html:7 +msgid "Reports awaiting approval" +msgstr "Rapporter som venter på godkendelse" + +#: templates/web/base/around/tabbed_lists.html:3 +msgid "Reports on and around the map" +msgstr "Problemer på og omkring kortet" + +#: templates/web/zurich/admin/index-sdm.html:10 +msgid "Reports published" +msgstr "Publicerede rapporter" + +#: templates/web/base/admin/report_edit.html:85 +msgid "Resend report" +msgstr "Send rapport igen" + +#: templates/web/base/js/translation_strings.html:28 +msgid "Right place?" +msgstr "Rigtig sted?" + +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:167 +#: perllib/FixMyStreet/Geocode/OSM.pm:152 +msgid "Road operator for this named road (derived from road reference number and type): %s" +msgstr "Vejoperatør for denne navngivne vej (udledt af vejens referencenummer og type) %s" + +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:164 +#: perllib/FixMyStreet/Geocode/OSM.pm:149 +msgid "Road operator for this named road (from OpenStreetMap): %s" +msgstr "Vejoperatør for denne navngivne vej (fra OpenStreetMap): %s" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1403 +#: templates/web/base/admin/report_edit.html:106 +#: templates/web/zurich/admin/report_edit.html:73 +msgid "Rotate Left" +msgstr "Rotér til venstre" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: templates/web/base/admin/report_edit.html:107 +#: templates/web/zurich/admin/report_edit.html:74 +msgid "Rotate Right" +msgstr "Rotér til højre" + +#: templates/web/base/js/translation_strings.html:46 +msgid "Satellite" +msgstr "Satelit" + +#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/category_edit.html:81 +#: templates/web/zurich/admin/body.html:59 +msgid "Save changes" +msgstr "Gem ændringer" + +#: templates/web/base/admin/reports.html:1 +#: templates/web/zurich/admin/reports.html:1 +msgid "Search Reports" +msgstr "Søg i rapporter" + +#: templates/web/base/admin/users.html:1 +msgid "Search Users" +msgstr "Søg i brugere" + +#: templates/web/zurich/header.html:77 +msgid "Search reports" +msgstr "Søg i rapporter" + +#: templates/web/base/admin/reports.html:5 +#: templates/web/base/admin/users.html:8 +#: templates/web/zurich/admin/reports.html:5 +msgid "Search:" +msgstr "Søg:" + +#: templates/web/base/admin/reports.html:26 +msgid "Searching found no reports." +msgstr "Søgningen fandt ingen rapporter." + +#: templates/web/base/admin/users.html:41 +msgid "Searching found no users." +msgstr "Søgningen fandt ingen brugere." + +#: templates/web/base/admin/body-form.html:33 +#: templates/web/zurich/admin/body-form.html:16 +msgid "Select a body" +msgstr "Vælg en myndighed" + +#: templates/web/base/reports/index.html:9 +msgid "Select a particular council to see the reports sent there." +msgstr "Vælg en bestemt myndighed for at se problemer som er sendt derhen." + +#: templates/web/base/admin/body-form.html:71 +#: templates/web/zurich/admin/body-form.html:26 +msgid "Select an area" +msgstr "Vælg et område" + +#: templates/web/base/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 "Vælg hvilken type varsel du ønsker og klik på knappen for en RSS-kilde, eller indtast din e-postadresse for at abonnere på et e-postvarsel." + +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 +msgid "Sent to %s %s later" +msgstr "Sendt til %s %s senere" + +#: templates/web/base/admin/report_edit.html:84 +msgid "Sent:" +msgstr "Sendt:" + +#: templates/web/base/admin/report_edit.html:89 +#: templates/web/zurich/admin/stats.html:45 +msgid "Service:" +msgstr "Tjeneste:" + +#: templates/web/fixmystreet/report/display.html:38 +msgid "Share" +msgstr "Del" + +#: templates/web/base/report/new/fill_in_details_form.html:192 +#: templates/web/base/report/update-form.html:157 +#: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 +#: templates/web/fixmystreet/report/update-form.html:146 +msgid "Show my name publicly" +msgstr "Vis mit navn offentligt" + +#: templates/web/base/around/display_location.html:67 +msgid "Show old" +msgstr "Vis gamle" + +#: templates/web/base/around/display_location.html:58 +msgid "Show pins" +msgstr "Vis nåle" + +#: templates/web/base/auth/general.html:3 +#: templates/web/base/auth/general.html:49 +#: templates/web/fixmystreet/auth/general.html:4 +#: templates/web/fixmystreet/auth/general.html:43 +#: templates/web/fixmystreet/auth/general.html:64 +#: templates/web/zurich/auth/general.html:18 +#: templates/web/zurich/auth/general.html:35 +msgid "Sign in" +msgstr "Log ind" + +#: templates/web/base/auth/general.html:74 +msgid "Sign in by email" +msgstr "Log ind via epost" + +#: templates/web/base/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 ind eller opret en konto" + +#: templates/web/base/auth/sign_out.html:1 templates/web/base/header.html:30 +#: templates/web/zurich/auth/sign_out.html:1 +msgid "Sign out" +msgstr "Log ud" + +#: templates/web/base/header.html:29 +msgid "Signed in as %s" +msgstr "Logget ind som %s" + +#: templates/web/base/report/new/fill_in_details_text.html:1 +msgid "Some categories may require additional information." +msgstr "Nogen kategorier kræver måske mere information" + +#: templates/web/base/admin/body-form.html:149 +#: templates/web/base/admin/body-form.html:150 +msgid "" +"Some endpoints require an <strong>API key</strong> to indicate that the reports are being\n" +" sent from your FixMyStreet installation." +msgstr "" +"Nogen leveringspunkter kræver en <strong>API-nøgle\n" +"</strong> for at indikere at rapporterne bliver sendt\n" +"fra din FixMinVej installation." + +#: templates/web/base/alert/index.html:42 +msgid "Some photos of recent reports" +msgstr "Nogen billeder af nylig meldte problemer" + +#: perllib/FixMyStreet/App/View/Email.pm:32 +#: perllib/FixMyStreet/App/View/Web.pm:43 +msgid "Some text to localize" +msgstr "Noget tekst at oversætte" + +#: perllib/FixMyStreet/Cobrand/UK.pm:78 +msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." +msgstr "Beklager det ser ud til at være et \"Crown dependency\"-postnummer, som vi ikke dækker." + +#: templates/web/base/tokens/abuse.html:5 +msgid "Sorry, there has been an error confirming your problem." +msgstr "Beklager, men der opstod et problem når vi forsøgte at bekræfte din problemrapport" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:214 +#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 +#: perllib/FixMyStreet/Geocode/Google.pm:47 +#: perllib/FixMyStreet/Geocode/OSM.pm:48 +msgid "Sorry, we could not find that location." +msgstr "Beklager, men vi kunne ikke finde dette sted." + +#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: perllib/FixMyStreet/Geocode/Google.pm:44 +#: perllib/FixMyStreet/Geocode/Zurich.pm:87 +msgid "Sorry, we could not parse that location. Please try again." +msgstr "Beklager, men vi kunne ikke tolke den position. Prøv venligst igen." + +#: templates/web/base/admin/stats.html:64 +msgid "Start Date:" +msgstr "Start-dato:" + +#: templates/web/base/admin/body.html:69 +#: templates/web/base/admin/flagged.html:18 +#: templates/web/base/admin/list_updates.html:11 +#: templates/web/base/admin/reports.html:15 +#: templates/web/fixmystreet/report/update-form.html:26 +msgid "State" +msgstr "Tilstand" + +#: templates/web/base/admin/report_edit.html:47 +#: templates/web/base/admin/update_edit.html:27 +#: templates/web/base/report/update-form.html:28 +#: templates/web/zurich/admin/report_edit-sdm.html:53 +#: templates/web/zurich/admin/report_edit.html:84 +#: templates/web/zurich/admin/update_edit.html:17 +msgid "State:" +msgstr "Tilstand:" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:308 +#: templates/web/base/admin/stats.html:1 +#: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 +msgid "Stats" +msgstr "Statistik" + +#: 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/base/report/updates.html:10 +msgid "Still open, via questionnaire, %s" +msgstr "Fortsat åben via spørgeskema, %s" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 +msgid "Subcategory: %s" +msgstr "Underkategori: %s" + +#: templates/web/zurich/admin/index-dm.html:27 +msgid "Subdivision/Body" +msgstr "Underafdeling/myndighed" + +#: templates/web/fixmystreet/contact/index.html:98 +msgid "Subject" +msgstr "Emne" + +#: templates/web/base/admin/report_edit.html:19 +#: templates/web/base/contact/index.html:88 +#: templates/web/base/report/new/fill_in_details_form.html:53 +#: templates/web/zurich/admin/report_edit.html:34 +msgid "Subject:" +msgstr "Emne:" + +#: templates/web/base/questionnaire/creator_fixed.html:19 +#: templates/web/base/report/new/fill_in_details_form.html:136 +#: templates/web/base/report/new/fill_in_details_form.html:158 +#: templates/web/base/report/new/fill_in_details_form.html:96 +#: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:91 +msgid "Submit" +msgstr "Send ind" + +#: templates/web/base/admin/report_edit.html:113 +#: templates/web/base/admin/update_edit.html:65 +#: templates/web/base/admin/user-form.html:56 +#: templates/web/zurich/admin/report_edit-sdm.html:64 +#: templates/web/zurich/admin/report_edit.html:221 +#: templates/web/zurich/admin/update_edit.html:38 +msgid "Submit changes" +msgstr "Indsend ændringer" + +#: templates/web/base/questionnaire/index.html:88 +#: templates/web/fixmystreet/questionnaire/index.html:106 +msgid "Submit questionnaire" +msgstr "Indsend spørgeskema" + +#: perllib/FixMyStreet/Cobrand/Zurich.pm:134 +#: 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:86 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/reports.html:13 +#: templates/web/zurich/report/banner.html:9 +msgid "Submitted" +msgstr "Sendt ind" + +#: templates/web/base/alert/updates.html:17 +#: templates/web/base/report/display.html:46 +#: templates/web/fixmystreet/alert/updates.html:23 +#: templates/web/fixmystreet/report/display.html:65 +msgid "Subscribe" +msgstr "Abonnér" + +#: templates/web/base/alert/_list.html:97 +#: templates/web/fixmystreet/alert/_list.html:92 +msgid "Subscribe me to an email alert" +msgstr "Jeg ønsker at abonnere på e-postvarsel" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1191 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:293 +#: templates/web/base/admin/bodies.html:25 +#: templates/web/base/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 "Opsummering" + +#: templates/web/base/reports/index.html:1 +#: templates/web/zurich/reports/index.html:0 +#: templates/web/zurich/reports/index.html:4 +msgid "Summary reports" +msgstr "Opsummeringsrapporter" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 +msgid "Survey" +msgstr "Spørgeundersøgelse" + +#: templates/web/base/admin/questionnaire.html:1 +msgid "Survey Results" +msgstr "Resultater fra spørgeundersøgelsen" + +#: templates/web/base/admin/list_updates.html:12 +#: templates/web/zurich/admin/list_updates.html:10 +#: templates/web/zurich/admin/list_updates.html:31 +msgid "Text" +msgstr "Tekst" + +#: templates/web/base/admin/body.html:28 +msgid "Text only version" +msgstr "Tekst-version" + +#: templates/web/base/admin/update_edit.html:20 +#: templates/web/zurich/admin/update_edit.html:12 +msgid "Text:" +msgstr "Tekst:" + +#: templates/web/base/tokens/confirm_problem.html:12 +msgid "Thank you for reporting this issue!" +msgstr "Tak for at du rapporterede dette problem!" + +#: templates/web/base/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 "Tak for at du forsøger at bekræfte din opdatering eller dit problem. Vi ser ud til at have en fejl hos os, så <a href=\"%s\">vær sød at fortælle os hvad som skete</a> så skal vi se på sagen." + +#: templates/web/base/tokens/confirm_update.html:15 +msgid "Thank you for updating this issue!" +msgstr "Tak for at du opdaterede dette problem!" + +#: templates/web/base/contact/submit.html:6 +#: templates/web/base/questionnaire/completed.html:5 +msgid "Thank you for your feedback" +msgstr "Tak for din tilbagemelding" + +#: templates/web/fixmystreet/around/around_index.html:28 +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 :" +msgstr "Tak for at du har lagt dit billede op. Vi skal nu placere dit problem, så vær sød at indtaste navnet på en vej eller et postnummer i området i boksen ovenfor :" + +#: templates/web/base/questionnaire/creator_fixed.html:9 +msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" +msgstr "Tak, glad for at høre at problemet er fikset! Vi vil gjerne spørge dig om du har rapporteret et problem til en myndighed tidligere?" + +#: perllib/FixMyStreet/App/Controller/Photo.pm:195 +msgid "That image doesn't appear to have uploaded correctly (%s), please try again." +msgstr "Billedet ser ikke ud til at være blevet lagt op rigtigt (%s), prøv igen." + +#: perllib/FixMyStreet/App/Controller/Council.pm:97 +msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." +msgstr "Det sted dækkes ikke af nogen myndighed, måske det er til søs eller udenfor landet - venligst forsøgm med et andet sted." + +#: perllib/FixMyStreet/App/Controller/Location.pm:126 +msgid "That location does not appear to be in the UK; please try again." +msgstr "Det sted virker ikke til at være i Storbritannien. Venligst prøv igen." + +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 +#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 +#: perllib/FixMyStreet/Cobrand/UK.pm:71 +msgid "That postcode was not recognised, sorry." +msgstr "Det postnummer blev ikke genkendt, beklager." + +#: perllib/FixMyStreet/App/Controller/Admin.pm:712 +#, fuzzy +msgid "That problem has been marked as sent." +msgstr "Det problem vil nu blive sendt igen." + +#: perllib/FixMyStreet/App/Controller/Admin.pm:704 +msgid "That problem will now be resent." +msgstr "Det problem vil nu blive sendt igen." + +#: perllib/FixMyStreet/App/Controller/Report.pm:118 +msgid "That report cannot be viewed on %s." +msgstr "Denne rapport kan ikke vises på %s." + +#: perllib/FixMyStreet/App/Controller/Report.pm:111 +msgid "That report has been removed from FixMyStreet." +msgstr "Den rapport er blevet fjernet fra FixMinVej." + +#: templates/web/base/admin/body.html:144 +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 "" +"Beskeder om denne kategori bliver sendt til <strong>E-postadressen</strong>.\n" +"For denne myndighed kan også andre kategorier have samme e-postadresse." + +#: templates/web/base/admin/body-form.html:123 +#: templates/web/base/admin/body-form.html:124 +msgid "" +"The <strong>endpoint</strong> is the URL of the service that FixMyStreet will connect to \n" +" when sending reports to this body." +msgstr "" +"<strong>Leveringspunktet</strong> er netadressen for den tjeneste, FixMinVej vil koble sig til\n" +"for beskeder til denne instans." + +#: templates/web/base/admin/body-form.html:136 +#: templates/web/base/admin/body-form.html:137 +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 "" +"<Strong>Jurisdiktion</strong> er kun nødvendig hvis leveringspunktet betjener mere \n" +"end én. Hvis myndigheden kører sit eget leveringspunkt, kan du normalt lade dette stå tomt." + +#: templates/web/base/admin/body-form.html:94 +#: templates/web/base/admin/body-form.html:95 +msgid "" +"The <strong>send method</strong> determines how problem reports will be sent to the body.\n" +" If you leave this blank, <strong>send method defaults to email</strong>." +msgstr "" +"<Strong>Sendemetoden</strong> bestemmer hvordan problembeskeder bliver sendt til myndigheden.\n" +"Hvis du lader dette stå tomt, <strong>er sendemetoden som standard til e-post</strong>." + +#: templates/web/base/open311/index.html:90 +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 "Open311 v2-atributten agency_responsible bruges for at opliste myndighederne som modtog problemrapporten, noget som ikke helt stemmer med hvordan atributten er defineret i Open311 v2-specifikationen." + +#: templates/web/base/admin/body-form.html:11 +#: templates/web/base/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 "" +"Administrationens <strong>navn</strong> identificerer instansen (for eksempel, <em>Borsetshire District Council</em>)\n" +"og kan blive vist udadtil." + +#: templates/web/base/auth/token.html:19 templates/web/base/email_sent.html:6 +msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." +msgstr "Bekræftelses-e-posten <strong>kan</strong> tage nogen få minutter før den kommer frem — så vær tålmodig." + +#: templates/web/base/report/new/fill_in_details_text.html:1 +#: templates/web/base/report/new/fill_in_details_text.html:3 +msgid "The council won’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 "" +"Administrationen vil ikke være i stand til at hjælpe medmindre du angiver så mange\n" +" detaljer som du kan. Beskriv nøjagtig placering for problemet (f.eks. på en\n" +" væg), hvad det er, hvor længe det har været der, en beskrivelse (og et billede af\n" +" problemet hvis du har et), osv." + +#: templates/web/fixmystreet/questionnaire/index.html:44 +msgid "The details of your problem are available from the other tab above." +msgstr "Detaljerne om dit problem er tilgængelige under den anden fane ovenfor." + +#: templates/web/base/questionnaire/index.html:25 +msgid "The details of your problem are available on the right hand side of this page." +msgstr "Detaljerne om dit problem er tilgængelig på højre kant af denne side." + +#: templates/web/base/admin/edit-league.html:3 +#: templates/web/base/admin/edit-league.html:4 +msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." +msgstr "The diligency prize league tabellen viser redaktørernes aktivitet, (hvem som har redigeret flest)." + +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 +#: perllib/FixMyStreet/App/Controller/Reports.pm:78 +msgid "The error was: %s" +msgstr "Fejlen var: %s" + +#: templates/web/base/open311/index.html:86 +msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." +msgstr "De følgende Open311 v2-atributter bliver returneret for hver forespørgsel: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code og service_name." + +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:159 +#: perllib/FixMyStreet/Geocode/OSM.pm:144 +msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap." +msgstr "Følgende information om nærmeste vej kan være unøjagtigt eller irrelevant, hvis problemet er nær flere veje eller nær en vej uden navn registreret i OpenStreetmap." + +#: db/alert_types.pl:19 db/alert_types.pl:23 db/alert_types.pl:27 +#: db/alert_types.pl:31 +msgid "The latest local problems reported by users" +msgstr "De sidste lokale problemer rapporteret af brugere" + +#: db/alert_types_eha.pl:13 +msgid "The latest local reports reported by users" +msgstr "De sidste lokale rapporter rapporteret af brugere" + +#: db/alert_types.pl:35 +msgid "The latest problems for {{COUNCIL}} reported by users" +msgstr "De sidste problemer for {{COUNCIL}} rapporteret af brugere" + +#: db/alert_types.pl:39 +msgid "The latest problems for {{COUNCIL}} within {{WARD}} ward reported by users" +msgstr "De sidste problemer for {{COUNCIL}} indenfor {{WARD}} bydel rapporteret af brugere" + +#: db/alert_types.pl:11 +msgid "The latest problems reported by users" +msgstr "De sidste problemer rapporteret af brugere" + +#: db/alert_types.pl:15 +msgid "The latest problems reported fixed by users" +msgstr "De sidste problemer som er rapporteret fikset af brugere" + +#: db/alert_types.pl:43 +msgid "The latest problems within {{NAME}}'s boundary reported by users" +msgstr "De sidste problemer indenfor grænsen til {{NAME}} rapporteret af brugere" + +#: db/alert_types_eha.pl:9 +msgid "The latest properties reported back to use by users" +msgstr "De sidste ejendomme rapporteret tilbage i brug af brugere" + +#: db/alert_types_eha.pl:20 +msgid "The latest reports for {{COUNCIL}} reported by users" +msgstr "De sidste rapporter for {{COUNCIL}} rapporteret af brugere" + +#: db/alert_types_eha.pl:24 +msgid "The latest reports for {{COUNCIL}} within {{WARD}} ward reported by users" +msgstr "De sidste rapporter for {{COUNCIL}} indenfor {{WARD}} bydel rapporteret af brugere" + +#: db/alert_types_eha.pl:28 +msgid "The latest reports within {{NAME}}'s boundary reported by users" +msgstr "De sidste rapporter indenfor grænsen til {{NAME}} rapporteret af brugere" + +#: templates/web/base/admin/body-form.html:58 +msgid "The list of available areas is being provided by the MapIt service at %s." +msgstr "Listen over tilgængelige områder kommer fra MapIt-tjenesten på %s." + +#: templates/web/base/auth/change_password.html:12 +#: templates/web/base/auth/change_password.html:16 +msgid "The passwords do not match" +msgstr "Adgangskoderne er ikke ens" + +#: templates/web/base/errors/page_error_404_not_found.html:10 +#: templates/web/base/errors/page_error_404_not_found.html:12 +msgid "The requested URL '%s' was not found on this server" +msgstr "Den forespurgte URL '%s' blev ikke fundet på denne server" + +#: templates/web/base/alert/_list.html:14 +#: templates/web/fixmystreet/alert/_list.html:16 +msgid "The simplest alert is our geographic one:" +msgstr "Den simpleste besked er vores geografiske:" + +#: templates/web/base/report/new/councils_extra_text.html:1 +#: templates/web/base/report/new/councils_text_some.html:10 +#: templates/web/base/report/new/fill_in_details_form.html:18 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:14 +msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." +msgstr "Opsummeringen og beskrivelsen vil også blive offentliggjort (se vores <a href=\"/privacy\">personvernregler</a>)." + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:300 +msgid "The user could not locate the problem on a map, but to see the area around the location they entered" +msgstr "Brugeren kunne ikke placere problemet på et kort, men kontrollér området omkring stedet de angav" + +#: templates/web/base/admin/user-form.html:12 +#: templates/web/base/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 "" +"Brugerens <strong>navn</strong> vises offentligt på rapporter som ikke er markeret med <em>anonymt</em>.\n" +"Navne er ikke nødvendigvis unikke." + +#: templates/web/base/reports/_problem-list.html:15 +msgid "There are no reports to show." +msgstr "Der er ingen rapporter at vise." + +#: perllib/FixMyStreet/App/Controller/Reports.pm:75 +msgid "There was a problem showing the All Reports page. Please try again later." +msgstr "Der var problemer med at vise 'Alle rapporter'-siden. Venligst prøv igen senere." + +#: perllib/FixMyStreet/App/Controller/Contact.pm:136 +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:59 +msgid "There was a problem showing this page. Please try again later." +msgstr "Der var problemer med at vise denne side. Venligst prøv igen senere." + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:762 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 +#: templates/web/base/auth/general.html:23 +#: templates/web/fixmystreet/auth/general.html:25 +#: 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 ‘sign in by email’ section of the form." +msgstr "Der var problemer med din e-post/adgangskode-kombination. Hvis du har glemt din adgangskode, eller hvis du ikke har en, så udfyld venligst 'Log ind via e-post'-delen af skemaet" + +#: perllib/FixMyStreet/App/Controller/Alert.pm:355 +msgid "There was a problem with your email/password combination. Please try again." +msgstr "Der var problemer med din epost/adgangskode-kombination. Vær sød at forsøge igen." + +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:272 +msgid "There was a problem with your update. Please try again." +msgstr "Der var problemer med din opdatering. Vær sød at forsøge igen." + +#: perllib/FixMyStreet/App/Controller/Contact.pm:140 +msgid "There were problems with your report. Please see below." +msgstr "Der var problemer med din rapport. Venligst se nedenfor." + +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:300 +msgid "There were problems with your update. Please see below." +msgstr "Der var problemer med din opdatering. Venligst se nedenfor." + +#: templates/web/base/admin/body-form.html:112 +#: templates/web/base/admin/body-form.html:113 +msgid "" +"These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.<br>\n" +" <strong>You don't need to set them if the Send Method is email.</strong>.\n" +" For more information on Open311, see \n" +" <a href='https://www.mysociety.org/2013/01/17/open311-explained/' class='admin-offsite-link'>this article</a>.\n" +" " +msgstr "" +"Disse indstillinger er for instanser som bruger Open311 (eller anden back-end integration) for at modtage problemrapporter. <br>\n" +"<strong>Du behøver ikke at sætte dem hvis Send Method er e-post. </strong>\n" +"For mere information om Open311, se\n" +"<a href='https://www.mysociety.org/2013/01/17/open311-explained/' class='admin-offsite-link'>denne artikel</a>." + +#: templates/web/base/open311/index.html:77 +msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." +msgstr "Denne API-implementation er under udarbejdelse og endnu ikke stabil. Den vil ændre sig uden varsel i fremtiden." + +#: templates/web/base/admin/body.html:44 +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 "" +"Denne myndighed dækker ikke noget område. Dette betyder at instansen ikke har jurisdiktion over rapporterede problemer <em>på noget sted</ em>.\n" +"Følgelig vil ingen af kategoriene vises i rullegardinkategori-menuen når brugere rapporterer problemer.\n" +"For tiden <strong>kan brugerne ikke rapportere problemer til denne myndighed</strong>." + +#: templates/web/base/admin/body.html:54 +msgid "This body has no contacts. This means that currently problems reported to this body <strong>will not be sent</strong>." +msgstr "Denne instans har ingen kontakter. Det betyder at i øjeblikket vil rapporterede problemer til denne instans <strong>ikke blive sendt</strong>." + +#: templates/web/base/admin/body-form.html:52 +#: templates/web/base/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 "" +"Denne instans får kun rapporter for problemer som er lokaliseret i <strong>area covered</strong>.\n" +"En instans vil ikke få nogen beskeder hvis det ikke dækker mindst ét område." + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:394 +msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." +msgstr "Denne e-post er blevet sendt til begge myndigheder som dækker stedet for problemet, da brugeren ikke kategoriserede det. Vær sød at ignorere den hvis I ikke er korrekt myndighed for at håndtere denne sag, eller give os besked om hvilken kategori af problemer dette er, så vi kan tilføje det i vores system." + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 +msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." +msgstr "Denne e-post er blevet sendt til flere myndigheder som dækker stedet for problemet, da den valgte kategori er tilgængelig for disse. Vær sød at ignorere e-posten hvis I ikke er korrekt myndighed for at håndtere denne sag." + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:902 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:972 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/Cobrand/UK.pm:43 +msgid "This information is required" +msgstr "Denne information er påkrævet" + +#: templates/web/base/debug_header.html:3 +msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." +msgstr "Dette er et udviklernetsted.Ting kan gå i stykker når som helst og databasen vil blive slettet periodisk." + +#: templates/web/base/reports/index.html:7 +msgid "This is a summary of all reports on this site." +msgstr "Dette er en oplistning af alle problemerne i denne tjeneste." + +#: templates/web/base/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 "Dette kan være fordi lænken er for gammel eller allerede brugt, eller at lænken ikke blev kopieret rigtigt." + +#: templates/web/base/report/banner.html:15 +msgid "This problem has been closed" +msgstr "Dette problem er lukket" + +#: templates/web/base/report/banner.html:12 +#: templates/web/base/report/update-form.html:48 +#: templates/web/fixmystreet/report/update-form.html:46 +msgid "This problem has been fixed" +msgstr "Dette problem er løst" + +#: templates/web/base/report/update-form.html:43 +#: templates/web/fixmystreet/report/update-form.html:40 +msgid "This problem has not been fixed" +msgstr "Dette problem er ikke blevet løst" + +#: templates/web/base/report/banner.html:19 +msgid "This problem is in progress" +msgstr "Dette problemet er under udførelse" + +#: templates/web/base/report/banner.html:9 +msgid "This problem is old and of unknown status." +msgstr "Dette problem er gammelt og med ukendt status." + +#: perllib/FixMyStreet/Cobrand/Zurich.pm:131 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:132 +#: templates/web/zurich/report/_main.html:14 +msgid "This report is awaiting moderation." +msgstr "Denne rapport afventer moderation" + +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:87 +msgid "This report is currently marked as closed." +msgstr "Denne rapport er for tiden markeret som lukket." + +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:85 +msgid "This report is currently marked as fixed." +msgstr "Denne rapport er for tiden markeret som fikset." + +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:89 +msgid "This report is currently marked as open." +msgstr "Denne rapport er for tiden markeret som åben." + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:311 +msgid "This report was submitted anonymously" +msgstr "Denne rapport blev rapporteret anonymt" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:293 +msgid "This web page also contains a photo of the problem, provided by the user." +msgstr "Denne netside indeholder også et billede af problemet, sendt ind af brugeren." + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 +#: templates/web/base/admin/timeline.html:1 +msgid "Timeline" +msgstr "Tidslinje" + +#: templates/web/base/admin/flagged.html:15 +#: templates/web/base/admin/reports.html:12 +msgid "Title" +msgstr "Titel" + +#: templates/web/base/around/_report_banner.html:2 +msgid "To <strong>report a problem</strong>, click on the map at the correct location." +msgstr "For at <strong>rapportere et problem</strong>, så klik på rette sted på kortet." + +#: templates/web/base/alert/index.html:27 +msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" +msgstr "Du finder lokale problemer ved at søge på dit postnummer, vejnavn eller sted" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:299 +msgid "To view a map of the precise location of this issue" +msgstr "For at se et kort med en mere præsis placering for dette problem." + +#: templates/web/base/admin/index.html:55 +#: templates/web/base/admin/questionnaire.html:24 +#: templates/web/base/admin/stats.html:24 +#: templates/web/base/admin/stats.html:43 +#: templates/web/zurich/admin/stats.html:30 +msgid "Total" +msgstr "Totalt" + +#: templates/web/base/js/translation_strings.html:29 +msgid "Try again" +msgstr "Prøv igen" + +#: templates/web/base/contact/submit.html:14 +msgid "Try emailing us directly:" +msgstr "Forsøg at sende epost direkte til os:" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 +#: templates/web/base/report/update-form.html:30 +#: templates/web/base/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 "Kan ikke fikses" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 +#: templates/web/base/admin/update_edit.html:28 +#: templates/web/zurich/admin/report_edit-sdm.html:45 +#: templates/web/zurich/admin/report_edit.html:58 +#: templates/web/zurich/admin/update_edit.html:18 +msgid "Unconfirmed" +msgstr "Ubekræftet" + +#: templates/web/fixmystreet/report/banner.html:9 +msgid "Unknown" +msgstr "Ukendt" + +#: perllib/FixMyStreet/App/Controller/Rss.pm:173 +msgid "Unknown alert type" +msgstr "Ukendt varsel-type" + +#: templates/web/base/js/translation_strings.html:39 +msgid "Unknown error" +msgstr "Ukendt fejl" + +#: perllib/FixMyStreet/App/Controller/Report.pm:106 +msgid "Unknown problem ID" +msgstr "Ukendt problem-Id" + +#: templates/web/fixmystreet/report/update-form.html:19 +msgid "Update" +msgstr "Opdatering" + +#: templates/web/base/admin/timeline.html:33 +msgid "Update %s created for problem %d; by %s" +msgstr "Opdatering %s oprettet for problem %d, af %s" + +#: templates/web/base/contact/index.html:21 +#: templates/web/fixmystreet/contact/index.html:36 +msgid "Update below added anonymously at %s" +msgstr "Opdateringen nedenfor lagt ind anonymt %s" + +#: templates/web/base/contact/index.html:23 +#: templates/web/fixmystreet/contact/index.html:38 +msgid "Update below added by %s at %s" +msgstr "Opdateringen nedenfor tilføjet af %s %s" + +#: templates/web/base/admin/body-form.html:240 +#: templates/web/zurich/admin/body-form.html:51 +msgid "Update body" +msgstr "Opdatér myndighed" + +#: templates/web/base/admin/index.html:49 +msgid "Update breakdown by state" +msgstr "Tilstandsfordeling for opdateringer" + +#: db/alert_types.pl:7 +msgid "Update by {{name}}" +msgstr "Opdateret af {{name}}" + +#: templates/web/base/admin/update_edit.html:42 +#: templates/web/zurich/admin/update_edit.html:25 +msgid "Update changed problem state to %s" +msgstr "En opdatering ændrede problemets status til %s" + +#: templates/web/base/admin/update_edit.html:44 +msgid "Update marked problem as fixed" +msgstr "En opdatering markerede dette problem som fikset." + +#: templates/web/base/admin/update_edit.html:46 +msgid "Update reopened problem" +msgstr "En opdatering gennåbnede problemet" + +#: templates/web/base/admin/body.html:101 +msgid "Update statuses" +msgstr "Opdatér tilstanden" + +#: templates/web/base/report/update-form.html:22 +msgid "Update:" +msgstr "Opdatering:" + +#: 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 "Opdateret" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1014 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:808 +#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:556 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:625 +msgid "Updated!" +msgstr "Opdateret!" + +#: templates/web/base/admin/list_updates.html:2 +#: templates/web/base/report/update.html:3 +#: templates/web/fixmystreet/report/update.html:5 +#: templates/web/zurich/admin/list_updates.html:24 +#: templates/web/zurich/report/updates.html:2 +msgid "Updates" +msgstr "Opdateringer" + +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 +msgid "Updates are limited to %s characters in length. Please shorten your update" +msgstr "Opdateringer er begrænset til %s tegn i længde. Venligst skriv en kortere tekst." + +#: db/alert_types.pl:5 db/alert_types.pl:6 +msgid "Updates on {{title}}" +msgstr "Opdateringer af {{title}}" + +#: templates/web/base/report/display.html:0 +#: templates/web/base/report/display.html:5 +#: templates/web/fixmystreet/report/display.html:0 +#: templates/web/fixmystreet/report/display.html:9 +msgid "Updates to this problem, FixMyStreet" +msgstr "Opdateringer for dette problem, FixMinVej" + +#: templates/web/base/admin/body.html:182 +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 "Brug <strong>notater</strong> for at notere detaljer som skal vises i admin-grænsefladen. Notater vises ikke offentligt og bliver ikke sendt til myndigheden." + +#: templates/web/zurich/admin/list_updates.html:30 +#: templates/web/zurich/admin/list_updates.html:9 +msgid "User" +msgstr "Bruger" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1357 +msgid "User flag removed" +msgstr "Brugermarkering fjernet" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1329 +msgid "User flagged" +msgstr "Bruger markeret" + +#: templates/web/base/admin/users.html:5 +msgid "User search finds matches in users' names and email addresses." +msgstr "Brugersøgning finder træf på brugernavne og epostadresser. " + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:307 +#: templates/web/base/admin/flagged.html:29 +#: templates/web/zurich/header.html:69 +msgid "Users" +msgstr "Brugere" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:374 +#: perllib/FixMyStreet/App/Controller/Admin.pm:404 +#: perllib/FixMyStreet/App/Controller/Admin.pm:421 +msgid "Values updated" +msgstr "Værdier opdateret" + +#: templates/web/base/admin/report_edit.html:18 +#: templates/web/base/admin/update_edit.html:18 +#: templates/web/zurich/admin/report_edit-sdm.html:21 +#: templates/web/zurich/admin/report_edit.html:20 +#: templates/web/zurich/admin/update_edit.html:10 +msgid "View report on site" +msgstr "Se rapport på netstedet" + +#: templates/web/base/reports/body.html:14 +msgid "View reports by ward" +msgstr "Se rapport per bydel" + +#: templates/web/base/around/display_location.html:0 +#: templates/web/base/around/display_location.html:35 +msgid "Viewing a location" +msgstr "Ser på et sted" + +#: templates/web/base/report/display.html:0 +#: templates/web/fixmystreet/report/display.html:0 +msgid "Viewing a problem" +msgstr "Ser på et problem" + +#: templates/web/base/reports/body.html:16 +msgid "Wards of this council" +msgstr "Bydele indenfor denne myndighed" + +#: templates/web/base/alert/choose.html:6 +#: templates/web/base/around/around_index.html:16 +#: templates/web/fixmystreet/around/around_index.html:17 +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 fandt mere en et træf for dette sted. Vi viser op til ti træf, så forsøg en anden søgning hvis dit sted ikke er her." + +#: templates/web/base/auth/token.html:8 +msgid "We have not been able to confirm your account - sorry." +msgstr "Vi har ikke kunnet bekræfte din konto - beklager." + +#: templates/web/base/auth/token.html:16 +msgid "We have sent you an email containing a link to confirm your account." +msgstr "Vi har sendt dig en epost som indeholder link for at bekræfte din konto." + +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:2 +#: templates/web/fixmystreet/report/update-form.html:77 +msgid "We never show your email" +msgstr "Vi viser aldrig din e-postadresse" + +#: templates/web/fixmystreet/report/new/form_user_loggedin.html:31 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:65 +msgid "We never show your email address or phone number." +msgstr "Vi viser aldrig din e-postadresse eller dit telefonnummer" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:403 +msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." +msgstr "Vi indser at %s kan være ansvarlig for dette problem, men vi mangler for tiden kontaktinformation for dem. Hvis du kender en egnet kontaktadresse, så tag kontakt med os." + +#: templates/web/base/index-steps.html:31 +msgid "We send it to the council on your behalf" +msgstr "Vi sender til myndigheden på dine vegne" + +#: templates/web/base/report/new/notes.html:4 +#: templates/web/zurich/report/new/notes.html:4 +msgid "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>" +msgstr "Vi vil kun bruge personlig information om dig i henhold til vore <a href=\"/faq#privacy\">privatlivssregler.</a>" + +#: templates/web/base/questionnaire/completed-open.html:2 +msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" +msgstr "" + +#: templates/web/base/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 "Vi ønsker at få din tilbagemelding om hvad du mener om denne tjeneste. Bare udfyld skemaet, eller send en e-post <a href='mailto:%s'>%s</a>:" + +#: templates/web/base/contact/submit.html:7 +msgid "We’ll get back to you as soon as we can." +msgstr "" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 +msgid "What’s the issue, and where is it?" +msgstr "" + +#: templates/web/base/admin/category_edit.html:87 +#: templates/web/zurich/admin/body.html:18 +msgid "When edited" +msgstr "Hvornår redigeret" + +#: templates/web/base/admin/problem_row.html:35 +msgid "When sent" +msgstr "Hvornår sendt" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 +msgid "Whole block of empty flats" +msgstr "Hel blok med tomme lejligheder" + +#: templates/web/base/tokens/confirm_alert.html:7 +msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." +msgstr "Hvorfor stoppe der? <a href=\"/alert\">Sæt flere varsler</a> op gratis." + +#: templates/web/base/open311/index.html:92 +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øger efter forespørgsler, så er det også muligt at søge efter agency_responsible for at begrænse det til forespørgsler som er sendt til en enkelt admindstration. Søgtetermen er administrations-IDen som angivet af <a href=\"%s\">MaPit</a>." + +#: templates/web/fixmystreet/front/footer-marketing.html:17 +msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." +msgstr "Kunne du tænke dig at bidrage til FixMinVej? Vores kKildekoden er frit programmel og <a href=\"http://fixmystreet.org\">tilgængelig via fixmystreet.org</a>." + +#: templates/web/base/questionnaire/index.html:78 +#: templates/web/fixmystreet/questionnaire/index.html:97 +msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" +msgstr "Kunne du tænke dig at modtage en ny forespørgsel om 4 uger, som minder dig om at tjekke status?" + +#: templates/web/base/report/new/notes.html:7 +msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." +msgstr "Når du skriver din besked med kun store bogstaver bliver den vanskelig at læse. Det samme gælder manglende tegnsætning." + +#: templates/web/base/report/new/fill_in_details_form.html:4 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:5 +msgid "Wrong location? Just click again on the map." +msgstr "Forkert sted? Bare klik igen på kortet." + +#: templates/web/base/admin/stats.html:10 +msgid "Year" +msgstr "År" + +#: templates/web/base/admin/bodies.html:66 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 +#: templates/web/base/admin/category_edit.html:5 +#: templates/web/base/admin/flagged.html:47 +#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:34 +#: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/problem_row.html:20 +#: templates/web/base/admin/report_edit.html:76 +#: templates/web/base/admin/report_edit.html:93 +#: templates/web/base/admin/update_edit.html:24 +#: templates/web/base/admin/users.html:31 +#: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/questionnaire/index.html:42 +#: templates/web/base/questionnaire/index.html:81 +#: templates/web/fixmystreet/questionnaire/index.html:100 +#: templates/web/fixmystreet/questionnaire/index.html:61 +msgid "Yes" +msgstr "Ja" + +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:17 +#: templates/web/fixmystreet/report/update-form.html:91 +msgid "Yes I have a password" +msgstr "Ja, jeg har en adgangskode" + +#: templates/web/base/contact/index.html:39 +#: templates/web/fixmystreet/contact/index.html:54 +msgid "You are complaining that this problem report was unnecessarily moderated:" +msgstr "Du klager over at denne problemrapport blev modereret uden grund:" + +#: templates/web/base/contact/index.html:41 +#: templates/web/fixmystreet/contact/index.html:56 +msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" +msgstr "Du rapporterer at følgende problem er stødende, indeholder personlig information eller lignende:" + +#: templates/web/base/contact/index.html:15 +#: templates/web/fixmystreet/contact/index.html:30 +msgid "You are reporting the following update for being abusive, containing personal information, or similar:" +msgstr "Du rapporterer at følgende opdatering er stødende, indeholder personlig information, eller lignende:" + +#: templates/web/zurich/tokens/confirm_problem.html:5 +#: templates/web/zurich/tokens/confirm_problem.html:8 +msgid "You can <a href=\"%s%s\">view the problem on this site</a>." +msgstr "Du kan <a href=\"%s%s\">læse om problemet på denne side</a>." + +#: templates/web/base/admin/user-form.html:48 +msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." +msgstr "Du kan føje en misbrugers epostadresse til misbrugslisten, hvilket automatisk skjuler (og aldrig sender) rapporter vedkommende opretter." + +#: templates/web/fixmystreet/contact/index.html:121 +msgid "You can contact technical support on <a href='mailto:%s'>%s</a>" +msgstr "Du kan kontakte teknisk support via <a href='mailto:%s'>%s</a>" + +#: templates/web/base/admin/flagged.html:5 +msgid "" +"You can flag any report or user by editing them, and they will be listed on this page.\n" +" For example, this can useful if you want to keep an eye on a user who has posted inappropriate\n" +" reports in the past." +msgstr "" +"Du kan markere alle beskeder eller brugere ved at redigere dem, og de bliver ført op på denne side.\n" +"For eksempel kan dette være nyttigt hvis du ønsker at holde et øje med en bruger som tidligere har indsendt upassende beskeder. " + +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 +#: templates/web/base/report/new/councils_text_some.html:21 +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 hjælpe os ved at finde en kontakt-e-post for lokale problemer i %s, og sende den via e-post til os på <a href='mailto:%s'>%s</a>." + +#: templates/web/base/admin/body-form.html:85 +msgid "You can mark a body as deleted if you do not want it to be active on the site." +msgstr "Du kan markere en myndighed som slettet hvis du ikke ønsker at den skal være aktiv på dette netsted." + +#: templates/web/base/js/translation_strings.html:36 +msgid "You declined; please fill in the box above" +msgstr "Du afviste; venligst udfyld boksen ovenfor" + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38 +msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" +msgstr "Du har allerede besvaret dette spørgeskema. Hvis du har spørgsmål, venligst <a href='%s'>tag kontakt</a>, eller <a href='%s'>se på dit problem</a>.\n" + +#: templates/web/base/questionnaire/index.html:68 +#: templates/web/base/report/new/fill_in_details_form.html:75 +#: templates/web/fixmystreet/questionnaire/index.html:88 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 +#: templates/web/zurich/report/new/fill_in_details_form.html:58 +msgid "You have already attached a photo to this report, attaching another one will replace it." +msgstr "Du har allerede vedlagt et billede til dette problem. At vedlægge et andet vil erstatte dette." + +#: templates/web/base/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 vedlagt et billede til denne opdatering. At vedlægge et andet vil erstatte dette." + +#: templates/web/base/auth/sign_out.html:4 +#: templates/web/zurich/auth/sign_out.html:3 +msgid "You have been signed out" +msgstr "Du er allerede logget ud" + +#: 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 "Du har placeret problemet ved punktet i kortet som er markeret med en grøn nål. Hvis dette ikke er korrekt placering kan du klikke på kortet igen." + +#: 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 nu lykkes med at bekræfte din e-postadresse." + +#: templates/web/base/report/display.html:20 +#: templates/web/base/report/new/fill_in_details.html:37 +#: templates/web/fixmystreet/report/display.html:17 +msgid "You have successfully signed in; please check and confirm your details are accurate:" +msgstr "Du har lykkes med at logge ind. Venligst kontrollér og bekræft at dine detaljer er korrekte:" + +#: templates/web/base/my/my.html:20 templates/web/fixmystreet/my/my.html:20 +msgid "You haven’t created any reports yet. <a href=\"%s\">Report a problem now.</a>" +msgstr "Du har ikke lavet en rapport endnu. <a href=\"%s\">Rapportér et problem nu.</a>" + +#: templates/web/base/email_sent.html:13 +msgid "You must now click the link in the email we've just sent you." +msgstr "Du skal nu åbne lænken i e-posten vi netop har sendt dig." + +#: templates/web/base/admin/index.html:18 +msgid "You need to <a href=\"%s\">add some bodies</a> (such as councils or departments) before any reports can be sent." +msgstr "Du skal <a href=\"%s\">add some bodies</a> (som kommuner eller afdelinger) før rapporten kan blive sendt. " + +#: templates/web/base/admin/bodies.html:7 +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 "" +"Du skal tilføje instanser (for eksempel kommuner eller afdelinger), så du derefter kan tilføje \n" +"grupper af problemer de kan håndtere (som hul i gader og veje, eller gadelys) og kontakter (som en e-postadresse) som beskeder kan sendes til." + +#: templates/web/base/admin/report_edit.html:85 +msgid "You really want to resend?" +msgstr "Ønsker du virkelig at sende igen?" + +#: templates/web/base/my/my.html:0 templates/web/base/my/my.html:15 +#: templates/web/base/my/my.html:4 templates/web/fixmystreet/my/my.html:0 +#: templates/web/fixmystreet/my/my.html:15 +#: templates/web/fixmystreet/my/my.html:4 +msgid "Your Reports" +msgstr "Dine rapporter" + +#: 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:91 +#: templates/web/fixmystreet/report/display.html:62 +#: templates/web/fixmystreet/report/display.html:64 +#: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 +#: templates/web/fixmystreet/report/update-form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:71 +msgid "Your email" +msgstr "Din e-post" + +#: templates/web/fixmystreet/auth/general.html:27 +#: templates/web/fixmystreet/report/update-form.html:82 +#: templates/web/zurich/auth/general.html:30 +#: templates/web/zurich/auth/general.html:58 +msgid "Your email address" +msgstr "Din e-postadresse" + +#: templates/web/base/auth/general.html:27 +msgid "Your email address:" +msgstr "Din e-postadresse:" + +#: templates/web/base/alert/_list.html:92 +#: templates/web/base/report/new/fill_in_details_form.html:106 +#: templates/web/base/report/update-form.html:81 +msgid "Your email:" +msgstr "Din e-post" + +#: 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 bruge personlig information om dig i henhold til vores <a href=\"/faq#privacy\">privatlivsregler.</a>" + +#: templates/web/fixmystreet/auth/general.html:54 +#: templates/web/fixmystreet/contact/index.html:84 +#: templates/web/fixmystreet/report/new/form_user_loggedin.html:18 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 +#: templates/web/fixmystreet/report/update-form.html:142 +#: templates/web/zurich/auth/general.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:81 +msgid "Your name" +msgstr "Dit navn" + +#: templates/web/base/auth/general.html:59 +#: templates/web/base/contact/index.html:73 +#: templates/web/base/report/new/fill_in_details_form.html:185 +#: templates/web/base/report/update-form.html:151 +msgid "Your name:" +msgstr "Dit navn:" + +#: templates/web/fixmystreet/auth/general.html:42 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:22 +#: templates/web/fixmystreet/report/update-form.html:96 +#: templates/web/zurich/auth/general.html:34 +msgid "Your password" +msgstr "Din adgangskode" + +#: templates/web/base/auth/change_password.html:6 +msgid "Your password has been changed" +msgstr "Din adgangskode er blevet ændret" + +#: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 +#: templates/web/zurich/report/new/fill_in_details_form.html:87 +msgid "Your phone number" +msgstr "Dit telefonnummer" + +#: templates/web/fixmystreet/questionnaire/index.html:16 +msgid "Your report" +msgstr "Dine rapporter" + +#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:24 +msgid "Your reports" +msgstr "Dine opdateringer" + +#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:41 +msgid "Your updates" +msgstr "Dine opdateringer" + +#: templates/web/base/contact/index.html:81 +msgid "Your email:" +msgstr "Din e-post:" + +#: templates/web/base/admin/timeline.html:4 +msgid "by %s" +msgstr "af %s" + +#: templates/web/base/reports/body.html:6 +#: templates/web/base/reports/body.html:7 +msgid "council" +msgstr "myndighed (fx kommune)" + +#: templates/web/base/admin/report_edit.html:32 +#: templates/web/zurich/admin/report_edit-sdm.html:40 +#: templates/web/zurich/admin/report_edit.html:54 +msgid "didn't use map" +msgstr "brugte ikke kort" + +#: templates/web/base/alert/index.html:33 +#: templates/web/fixmystreet/around/postcode_form.html:20 +msgid "e.g. ‘%s’ or ‘%s’" +msgstr "" + +#: templates/web/base/admin/body-form.html:188 +#: templates/web/base/admin/flagged.html:51 +msgid "edit user" +msgstr "redigér bruger" + +#: templates/web/base/admin/index.html:34 +#: templates/web/zurich/admin/index.html:5 +msgid "from %d different users" +msgstr "fra %d forskellige brugere" + +#: templates/web/fixmystreet/report/_item.html:17 +#: templates/web/zurich/report/_item.html:16 +msgid "last updated %s" +msgstr "sidst opdateret %s" + +#: perllib/Utils.pm:235 +msgid "less than a minute" +msgstr "mindre end et minut" + +#: templates/web/base/report/updates.html:57 +msgid "marked as a duplicate report" +msgstr "markeret som duplikeret rapport" + +#: templates/web/base/report/updates.html:47 +msgid "marked as action scheduled" +msgstr "markeret som planlagt" + +#: templates/web/base/report/updates.html:59 +msgid "marked as an internal referral" +msgstr "markeret som en intern henvisning" + +#: templates/web/base/report/updates.html:49 +msgid "marked as closed" +msgstr "markeret som lukket" + +#: templates/web/base/report/updates.html:28 +#: templates/web/base/report/updates.html:51 +msgid "marked as fixed" +msgstr "markeret som fikset" + +#: templates/web/base/report/updates.html:45 +msgid "marked as in progress" +msgstr "markeret som under udførelse" + +#: templates/web/base/report/updates.html:41 +msgid "marked as investigating" +msgstr "markeret som undersøges" + +#: templates/web/base/report/updates.html:55 +msgid "marked as not the council's responsibility" +msgstr "markeret som ikke myndighedens ansvar" + +#: templates/web/base/report/updates.html:43 +msgid "marked as planned" +msgstr "markeret som planlagt" + +#: templates/web/base/report/updates.html:53 +msgid "marked as unable to fix" +msgstr "markeret som uløseligt" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:130 +#: templates/web/base/admin/questionnaire.html:15 +#: templates/web/base/admin/questionnaire.html:16 +msgid "n/a" +msgstr "n/a" + +#: templates/web/base/alert/_list.html:87 +#: templates/web/fixmystreet/alert/_list.html:85 +msgid "or" +msgstr "eller" + +#: templates/web/base/js/translation_strings.html:27 +msgid "or locate me automatically" +msgstr "eller find min position automatisk" + +#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:30 +#: templates/web/zurich/admin/report_edit-sdm.html:27 +#: templates/web/zurich/admin/report_edit-sdm.html:29 +#: templates/web/zurich/admin/report_edit-sdm.html:36 +#: templates/web/zurich/admin/report_edit-sdm.html:38 +#: templates/web/zurich/admin/report_edit.html:27 +#: templates/web/zurich/admin/report_edit.html:29 +#: templates/web/zurich/admin/report_edit.html:38 +#: templates/web/zurich/admin/report_edit.html:40 +#: templates/web/zurich/admin/report_edit.html:50 +#: templates/web/zurich/admin/report_edit.html:52 +msgid "originally entered: “%s”" +msgstr "oprinnelig lagt ind: “%s”" + +#: templates/web/base/admin/report_edit.html:43 +msgid "other areas:" +msgstr "andre områder:" + +#: templates/web/base/report/updates.html:29 +#: templates/web/base/report/updates.html:39 +msgid "reopened" +msgstr "åbnet igen" + +#: templates/web/fixmystreet/header.html:59 +#: templates/web/zurich/footer.html:12 +msgid "sign out" +msgstr "log ud" + +#: templates/web/base/report/new/fill_in_details_form.html:12 +#: templates/web/base/report/new/fill_in_details_form.html:15 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 +msgid "the local council" +msgstr "den lokale myndighed" + +#: templates/web/base/report/_main.html:57 +#: templates/web/zurich/report/_main.html:5 +msgid "there is no pin shown as the user did not use the map" +msgstr "Der vises ingen nål på grund af at brugeren ikke brugte kortet" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:379 +msgid "this type of local problem" +msgstr "denne type lokalt problem" + +#: perllib/Utils.pm:207 +msgid "today" +msgstr "idag" + +#: templates/web/base/admin/report_edit.html:32 +#: templates/web/zurich/admin/report_edit-sdm.html:40 +#: templates/web/zurich/admin/report_edit.html:54 +msgid "used map" +msgstr "brugte kort" + +#: templates/web/base/admin/update_edit.html:35 +msgid "user is from same council as problem - %d" +msgstr "bruger er fra samme myndighed som problemet - %d" + +#: templates/web/base/admin/update_edit.html:38 +msgid "user is problem owner" +msgstr "bruger er ejer af problemet" + +#: templates/web/base/reports/body.html:0 +#: templates/web/base/reports/body.html:3 +msgid "ward" +msgstr "bydel" + +#: templates/web/base/front/stats.html:17 +#, perl-format +msgid "<big>%s</big> report recently" +msgid_plural "<big>%s</big> reports recently" +msgstr[0] "<big>%s</big> rapporteret<br>for nyligt" +msgstr[1] "<big>%s</big> rapporteret<br>for nyligt" + +#: perllib/Utils.pm:254 +#, perl-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d time" +msgstr[1] "%d timer" + +#: templates/web/base/report/_support.html:6 +#, perl-format +msgid "%d supporter" +msgid_plural "%d supporters" +msgstr[0] "%d supporter" +msgstr[1] "%d supportere" + +#: perllib/Utils.pm:256 +#, perl-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d minut" +msgstr[1] "%d minutter" + +#: templates/web/base/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> rapport-<br>opdatering" +msgstr[1] "<big>%s</big> rapport-<br>opdateringer" + +#: 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] "Vi har endnu ikke detaljer for myndigheden som dækker dette sted." +msgstr[1] "Vi har endnu ikke detaljer for myndighederne som dækker dette sted." + +#: perllib/Utils.pm:250 +#, perl-format +msgid "%d week" +msgid_plural "%d weeks" +msgstr[0] "%d uge" +msgstr[1] "%d uger" + +#: templates/web/base/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> rapport sidste uge" +msgstr[1] "<big>%s</big> rapporter sidste uge" + +#: templates/web/base/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> fikset sidste måned" +msgstr[1] "<big>%s</big> fikset sidste måned" + +#: perllib/Utils.pm:252 +#, perl-format +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "%d dag" +msgstr[1] "%d dage" + +#: templates/web/base/report/new/councils_text_some.html:13 +#, 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 endnu <strong>ikke</strong> detaljerne for den anden myndighed som dækker dette sted." +msgstr[1] "Vi har endnu <strong>ikke</strong> detaljerne for de andre myndigheder som dækker dette sted." + +#~ msgid "For council(s):" +#~ msgstr "For myndighederne:" diff --git a/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/de_CH.UTF-8/LC_MESSAGES/FixMyStreet.po index d61ec929d..c7b47b702 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: 2015-01-20 16:59+0000\n" -"PO-Revision-Date: 2014-11-19 18:30+0000\n" +"POT-Creation-Date: 2015-07-31 14:28+0100\n" +"PO-Revision-Date: 2015-07-10 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,17 +18,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:618 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:386 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:392 msgid " and " msgstr "und" -#: templates/web/base/report/new/councils_text_all.html:12 -#: templates/web/base/report/new/councils_text_all.html:19 -#: templates/web/base/report/new/councils_text_all.html:5 -#: templates/web/base/report/new/councils_text_none.html:19 -#: templates/web/base/report/new/councils_text_none.html:21 -#: templates/web/base/report/new/councils_text_some.html:20 +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_none.html:11 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " @@ -64,22 +62,26 @@ msgstr "%d bis %d von %d" msgid "%s - Summary reports" msgstr "Alle Meldungen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:672 msgid "%s ref: %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:265 perllib/FixMyStreet/Cobrand/UK.pm:277 +#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:554 +#: perllib/FixMyStreet/DB/Result/Problem.pm:559 msgid "%s, reported at %s" msgstr "Gemeldet von %s um %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:304 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "%s, within %s ward" msgstr "" +#: perllib/FixMyStreet/Map/OSM.pm:42 +msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" +msgstr "" + #: templates/web/base/email_sent.html:29 msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" msgstr "" @@ -93,7 +95,7 @@ msgid "(Don't worry — we'll hang on to your update while you're checking y msgstr "" #: templates/web/base/admin/report_blocks.html:11 -#: templates/web/base/admin/users.html:29 +#: templates/web/base/admin/users.html:31 msgid "(Email in abuse table)" msgstr "" @@ -121,7 +123,7 @@ msgstr "(beantwortet)" msgid "(fixed)" msgstr "(beantwortet)" -#: templates/web/base/index.html:9 +#: templates/web/base/index.html:8 templates/web/base/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äden, Graffitis usw.)" @@ -131,8 +133,8 @@ msgstr "(z.B. illegale Deponien, Strassenschäden, Graffitis usw.)" msgid "(not sent to council)" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:218 -#: templates/web/zurich/report/new/fill_in_details_form.html:94 +#: templates/web/base/report/new/fill_in_details_form.html:199 +#: templates/web/zurich/report/new/fill_in_details_form.html:77 msgid "(optional)" msgstr "(optional)" @@ -145,7 +147,7 @@ msgstr "" msgid "(sent to both)" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:212 +#: templates/web/base/report/new/fill_in_details_form.html:193 msgid "(we never show your email address or phone number)" msgstr "(Ihre E-Mail Adresse und Telefonnummer werden nie angezeigt)" @@ -153,14 +155,13 @@ 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:635 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:662 -#: perllib/FixMyStreet/DB/Result/Problem.pm:393 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Wählen Sie eine Kategorie --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 -#: perllib/FixMyStreet/DB/Result/Problem.pm:399 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:630 +#: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "" @@ -172,37 +173,7 @@ msgid "" " Maybe add some <code>MAPIT_TYPES</code> to your config file?" msgstr "" -#: templates/web/base/questionnaire/completed.html:20 -msgid "<p style=\"font-size:150%\">Thank you very much for filling in our questionnaire; glad to hear it’s been fixed.</p>" -msgstr "" - -#: templates/web/fiksgatami/questionnaire/completed-open.html:1 -msgid "" -"<p style=\"font-size:150%\">We’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’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/base/questionnaire/completed-open.html:6 -msgid "" -"<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" -"suggestions: why not try writing to your local representatives or, if\n" -"it’s a problem that could be fixed by local people working together, why\n" -"not <a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n" -"</p>" -msgstr "" - -#: templates/web/base/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/base/around/_report_banner.html:4 +#: templates/web/base/around/_report_banner.html:3 #: templates/web/base/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'>Überspringen</a>.</small>" @@ -229,7 +200,7 @@ msgstr "Neu Registrieren" msgid "<strong>No</strong>, I do not, let me sign in by email:" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:163 +#: templates/web/base/report/new/fill_in_details_form.html:144 msgid "<strong>No</strong>, let me confirm my report by email:" msgstr "" @@ -237,13 +208,8 @@ msgstr "" msgid "<strong>No</strong>, let me confirm my update by email:" msgstr "" -#: templates/web/base/tokens/confirm_problem.html:19 -#: templates/web/base/tokens/confirm_problem.html:20 -msgid "<strong>We will now send it to the council</strong>." -msgstr "" - #: templates/web/base/auth/general.html:37 -#: templates/web/base/report/new/fill_in_details_form.html:141 +#: templates/web/base/report/new/fill_in_details_form.html:122 #: templates/web/base/report/update-form.html:95 #: templates/web/fixmystreet/auth/general.html:37 #: templates/web/fixmystreet/auth/general.html:39 @@ -257,8 +223,8 @@ msgstr "Passwort" msgid "About us" msgstr "Über uns" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:39 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:52 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:31 #: templates/web/fixmystreet/report/update-form.html:28 @@ -274,26 +240,26 @@ msgid "" " categories of problem) to each body." msgstr "" -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/body.html:56 msgid "Add a contact using the form below." msgstr "" #: templates/web/base/admin/bodies.html:74 -#: templates/web/base/admin/body-form.html:233 +#: templates/web/base/admin/body-form.html:240 #: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "Adresse hinzufügen" -#: templates/web/base/admin/body.html:108 +#: templates/web/base/admin/body.html:116 #: templates/web/zurich/admin/body.html:31 msgid "Add new category" msgstr "Füge neue Kategorie hinzu" -#: templates/web/base/admin/users.html:45 +#: templates/web/base/admin/users.html:47 msgid "Add user" msgstr "User hinzufügen" -#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:70 +#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:52 msgid "Added %s" msgstr "" @@ -320,9 +286,7 @@ msgstr "" msgid "All Reports" msgstr "Alle Meldungen" -#: templates/web/base/footer.html:11 templates/web/fiksgatami/footer.html:23 -#: templates/web/fiksgatami/nn/footer.html:23 -#: templates/web/fixmystreet/footer.html:26 +#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:26 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:19 @@ -339,19 +303,9 @@ msgstr "Alle Meldungen von %s bis %s" msgid "All the information you provide here will be sent to" msgstr "" -#: templates/web/base/report/new/councils_text_all.html:12 -#: templates/web/base/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/base/report/new/councils_text_all.html:5 -#: templates/web/base/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/base/report/new/councils_text_all.html:19 -#: templates/web/base/report/new/councils_text_all.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:13 +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_all.html:4 +#: templates/web/base/report/new/fill_in_details_form.html:12 #: templates/web/base/report/new/fill_in_details_form.html:14 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 @@ -368,7 +322,7 @@ msgstr "" msgid "Anonymous" msgstr "Anonym" -#: templates/web/base/admin/report_edit.html:62 +#: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:23 msgid "Anonymous:" msgstr "Anonym:" @@ -377,18 +331,18 @@ msgstr "Anonym:" msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?" msgstr "" -#: templates/web/fiksgatami/front/footer-marketing.html:14 #: templates/web/fixmystreet/front/footer-marketing.html:16 msgid "Are you a developer?" msgstr "" #: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 msgid "Area covered" msgstr "Gebiet" #: templates/web/base/admin/bodies.html:15 -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/body.html:60 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "" @@ -406,7 +360,7 @@ msgstr "Einer externen Stelle zuweisen:" msgid "Assign to subdivision:" msgstr "An Fachbereich zuweisen:" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:163 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:165 #: templates/web/zurich/report/updates.html:11 msgid "Assigned to %s" msgstr "Besten Dank für Ihre Meldung. Wir haben Ihr Anliegen an %s weitergeleitet, da es nicht in den Zuständigkeitsbereich der am Pilot beteiligten Fachbereiche fällt.<br/>Freundliche Grüsse <br/>Ihre Stadt Zürich" @@ -419,7 +373,7 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:348 +#: perllib/FixMyStreet/DB/Result/Problem.pm:373 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "Überprüfung ausstehend" @@ -432,8 +386,8 @@ msgstr "Zurück" msgid "Ban email address" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:297 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:301 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" msgstr "Externe Adressen" @@ -444,6 +398,7 @@ msgstr "Externe Adressen" msgid "Body" msgstr "Organisation" +#: templates/web/base/admin/report_edit.html:34 #: templates/web/base/admin/user-form.html:32 msgid "Body:" msgstr "Organisation:" @@ -456,16 +411,15 @@ msgstr "" msgid "Can't see the map? <em>Skip this step</em>" msgstr "Karte nicht sichtbar? <em>Überspringen Sie diesen Schritt</em>" -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:55 #: templates/web/base/report/new/category.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:53 +#: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 #: templates/web/zurich/admin/stats.html:50 -#: templates/web/zurich/report/new/fill_in_details_form.html:50 msgid "Category" msgstr "Kategorie" @@ -473,17 +427,16 @@ msgstr "Kategorie" msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:138 #: templates/web/base/admin/category_edit.html:23 -#: templates/web/base/admin/report_edit.html:61 -#: templates/web/base/report/new/fill_in_details_form.html:68 +#: templates/web/base/admin/report_edit.html:74 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/report_edit-sdm.html:42 #: templates/web/zurich/admin/report_edit.html:140 msgid "Category:" msgstr "Kategorie:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:377 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383 msgid "Category: %s" msgstr "Kategorie: %s" @@ -494,19 +447,19 @@ msgstr "Kategorie: %s" msgid "Change password" msgstr "Passwort ändern" -#: templates/web/base/admin/body.html:152 +#: templates/web/base/admin/body.html:160 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/base/admin/body.html:163 +#: templates/web/base/admin/body.html:171 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/base/admin/body.html:183 +#: templates/web/base/admin/body.html:191 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -517,7 +470,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:122 +#: templates/web/base/admin/body.html:130 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." @@ -533,16 +486,16 @@ msgstr "" msgid "Click map to report a problem" msgstr "Mangel lokalisieren" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:45 -#: templates/web/base/admin/report_edit.html:47 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:58 +#: templates/web/base/admin/report_edit.html:60 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/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:95 #: templates/web/zurich/admin/report_edit.html:97 #: templates/web/zurich/admin/stats.html:31 @@ -550,11 +503,12 @@ msgstr "Mangel lokalisieren" msgid "Closed" msgstr "Beantwortet" -#: perllib/FixMyStreet/DB/Result/Problem.pm:762 +#: perllib/FixMyStreet/DB/Result/Problem.pm:771 msgid "Closed by council" msgstr "" -#: templates/web/base/my/my.html:40 templates/web/fixmystreet/my/my.html:46 +#: templates/web/base/my/my.html:40 +#: templates/web/fixmystreet/my/_problem-list.html:12 msgid "Closed reports" msgstr "" @@ -562,7 +516,7 @@ msgstr "" msgid "Closed:" msgstr "Beantwortet:" -#: templates/web/base/around/tabbed_lists.html:11 +#: templates/web/base/around/tabbed_lists.html:10 #: templates/web/base/around/tabbed_lists.html:12 msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "" @@ -577,26 +531,26 @@ msgstr "Koordinaten:" msgid "Cobrand" msgstr "" -#: templates/web/base/admin/report_edit.html:75 +#: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:50 msgid "Cobrand data:" msgstr "" -#: templates/web/base/admin/report_edit.html:74 +#: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:49 msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" -#: templates/web/base/admin/category_edit.html:47 +#: templates/web/base/admin/category_edit.html:52 msgid "Configure Endpoint" msgstr "" -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/body.html:72 msgid "Confirm" msgstr "Bestätigen" @@ -617,10 +571,10 @@ msgstr "" msgid "Confirmation" msgstr "Bestätigung" -#: templates/web/base/admin/body.html:158 -#: templates/web/base/admin/body.html:71 -#: templates/web/base/admin/category_edit.html:32 -#: templates/web/base/admin/category_edit.html:84 +#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/category_edit.html:37 +#: templates/web/base/admin/category_edit.html:89 #: templates/web/zurich/admin/stats.html:40 msgid "Confirmed" msgstr "Bestätigt" @@ -631,7 +585,7 @@ msgstr "" #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 -#: templates/web/base/admin/report_edit.html:70 +#: templates/web/base/admin/report_edit.html:83 msgid "Confirmed:" msgstr "Bestätigt:" @@ -648,13 +602,12 @@ msgid "Contact Us" msgstr "" #: templates/web/base/contact/index.html:6 -#: templates/web/base/contact/submit.html:3 #: templates/web/fixmystreet/contact/index.html:20 msgid "Contact the team" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1327 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1355 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1325 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1353 msgid "Could not find user" msgstr "" @@ -672,6 +625,10 @@ msgstr "" msgid "Council contacts for %s" msgstr "Kontaktdetails von %s" +#: perllib/FixMyStreet/DB/Result/Problem.pm:670 +msgid "Council ref: %s" +msgstr "" + #: templates/web/base/admin/stats.html:84 msgid "Council:" msgstr "" @@ -687,7 +644,7 @@ msgstr "" msgid "Create a report" msgstr "Erfasse eine Meldung" -#: templates/web/base/admin/body.html:200 +#: templates/web/base/admin/body.html:208 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "" @@ -699,7 +656,7 @@ msgid "Created" msgstr "Erstellt" #: templates/web/base/admin/list_updates.html:38 -#: templates/web/base/admin/report_edit.html:69 +#: templates/web/base/admin/report_edit.html:82 #: templates/web/base/admin/update_edit.html:51 #: templates/web/zurich/admin/report_edit-sdm.html:47 #: templates/web/zurich/admin/report_edit.html:61 @@ -716,7 +673,7 @@ msgstr "Aktueller Status" msgid "Currently no bodies have been created." msgstr "Bisher wurden noch keine Organisationseinheiten erfasst." -#: templates/web/base/dashboard/index.html:6 +#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 msgid "Dashboard" msgstr "" @@ -726,14 +683,14 @@ msgid "Dealt with by subdivision within 5 working days" msgstr "Innerhalb von fünf Arbeitstagen abgeschlossen" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:169 -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:37 -#: templates/web/base/admin/category_edit.html:85 +#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:81 +#: templates/web/base/admin/category_edit.html:42 +#: templates/web/base/admin/category_edit.html:90 msgid "Deleted" msgstr "Gelöscht" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:43 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -753,7 +710,7 @@ msgstr "Beschreibung" msgid "Details:" msgstr "Beschreibung:" -#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/body.html:87 msgid "Devolved" msgstr "" @@ -781,8 +738,8 @@ msgstr "" msgid "Don't like forms?" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:47 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:60 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:32 #: templates/web/fixmystreet/report/update-form.html:28 @@ -790,7 +747,7 @@ msgstr "" msgid "Duplicate" msgstr "" -#: templates/web/base/admin/body.html:98 +#: templates/web/base/admin/body.html:106 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" @@ -800,20 +757,20 @@ msgstr "" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 -#: templates/web/base/admin/users.html:31 +#: templates/web/base/admin/users.html:33 #: templates/web/zurich/admin/problem_row.html:42 msgid "Edit" msgstr "" -#: templates/web/base/admin/body.html:212 +#: templates/web/base/admin/body.html:220 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "Details editieren" #: templates/web/base/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:2 +#: 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:2 +#: templates/web/zurich/admin/report_edit.html:1 #: templates/web/zurich/admin/report_edit.html:5 msgid "Editing problem %d" msgstr "Meldung %d bearbeiten" @@ -827,12 +784,12 @@ msgstr "" msgid "Editing user %d" msgstr "" -#: templates/web/base/admin/category_edit.html:86 +#: templates/web/base/admin/category_edit.html:91 msgid "Editor" msgstr "" #: templates/web/base/admin/bodies.html:23 -#: templates/web/base/admin/category_edit.html:83 +#: templates/web/base/admin/category_edit.html:88 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 #: templates/web/fixmystreet/auth/general.html:21 @@ -843,15 +800,23 @@ msgstr "" msgid "Email" msgstr "E-Mail" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1303 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1301 msgid "Email added to abuse list" msgstr "" -#: templates/web/base/admin/body.html:147 +#: templates/web/base/admin/body.html:155 msgid "Email address:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1300 +#: templates/web/base/tokens/confirm_alert.html:6 +msgid "Email alert created" +msgstr "" + +#: templates/web/base/tokens/confirm_alert.html:10 +msgid "Email alert deleted" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1298 msgid "Email already in abuse list" msgstr "" @@ -863,8 +828,8 @@ msgstr "" msgid "Email me updates" msgstr "Schicken Sie mir Aktualisierungen" -#: templates/web/base/admin/category_edit.html:26 -#: templates/web/base/admin/report_edit.html:67 +#: templates/web/base/admin/category_edit.html:31 +#: templates/web/base/admin/report_edit.html:80 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 @@ -875,32 +840,32 @@ msgstr "Schicken Sie mir Aktualisierungen" msgid "Email:" msgstr "E-mail:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:322 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 msgid "Email: %s" msgstr "E-mail:" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 msgid "Empty flat or maisonette" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:631 msgid "Empty house or bungalow" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:622 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty office or other commercial" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:623 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Empty pub or bar" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:624 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty public building - school, hospital, etc." msgstr "" -#: templates/web/base/admin/body-form.html:158 -#: templates/web/base/admin/body-form.html:159 +#: templates/web/base/admin/body-form.html:162 +#: templates/web/base/admin/body-form.html:163 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" @@ -908,8 +873,8 @@ msgid "" " <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>." msgstr "" -#: templates/web/base/admin/body-form.html:215 -#: templates/web/base/admin/body-form.html:216 +#: templates/web/base/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:223 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" @@ -920,11 +885,11 @@ msgstr "" msgid "End Date:" msgstr "" -#: templates/web/base/admin/body-form.html:126 +#: templates/web/base/admin/body-form.html:130 msgid "Endpoint" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:72 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:73 msgid "Enter a Zürich street name" msgstr "Ungefähre Adresse des Mangels" @@ -937,7 +902,9 @@ msgstr "Geben Sie eine Adresse an" msgid "Enter a nearby postcode, or street name and area" msgstr "Ungefähre Adresse des Mangels" +#: templates/web/base/around/postcode_form.html:1 #: templates/web/base/around/postcode_form.html:2 +#: templates/web/fixmystreet/around/postcode_form.html:10 #: templates/web/fixmystreet/around/postcode_form.html:11 msgid "Enter a nearby street name and area" msgstr "Ungefähre Adresse des Mangels" @@ -947,7 +914,7 @@ msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "" #: templates/web/base/auth/general.html:64 -#: templates/web/base/report/new/fill_in_details_form.html:170 +#: templates/web/base/report/new/fill_in_details_form.html:151 #: templates/web/base/report/update-form.html:124 msgid "Enter a new password:" msgstr "" @@ -959,7 +926,7 @@ msgstr "" msgid "Enter a password" msgstr "Ihr Passwort" -#: templates/web/base/index-steps.html:33 +#: templates/web/base/index-steps.html:26 msgid "Enter details of the problem" msgstr "Beschreiben Sie den Mangel" @@ -982,16 +949,21 @@ msgstr "Beispieladresse" msgid "Examples:" msgstr "Beispiele:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:47 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" -#: templates/web/base/admin/report_edit.html:76 +#: templates/web/base/admin/body-form.html:81 +msgid "External URL" +msgstr "" + +#: templates/web/base/admin/category_edit.html:27 +#: templates/web/base/admin/report_edit.html:92 msgid "Extra data:" msgstr "" -#: templates/web/base/contact/submit.html:15 -msgid "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>." +#: templates/web/base/contact/submit.html:13 +msgid "Failed to send message" msgstr "" #: templates/web/zurich/admin/index-dm.html:33 @@ -1004,7 +976,7 @@ msgstr "Alle Meldungen" msgid "First time" msgstr "" -#: templates/web/base/admin/body.html:40 +#: templates/web/base/admin/body.html:48 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" @@ -1035,9 +1007,9 @@ msgid "" msgstr "" #: templates/web/base/admin/index.html:55 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:41 -#: templates/web/base/admin/report_edit.html:42 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:54 +#: templates/web/base/admin/report_edit.html:55 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/update-form.html:30 @@ -1048,17 +1020,18 @@ msgstr "" msgid "Fixed" msgstr "Beantwortet" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:43 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:56 msgid "Fixed - Council" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:42 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:55 msgid "Fixed - User" msgstr "" -#: templates/web/base/my/my.html:35 templates/web/fixmystreet/my/my.html:41 +#: templates/web/base/my/my.html:35 +#: templates/web/fixmystreet/my/_problem-list.html:7 msgid "Fixed reports" msgstr "" @@ -1066,7 +1039,7 @@ msgstr "" msgid "Fixed:" msgstr "" -#: templates/web/base/admin/body-form.html:84 +#: templates/web/base/admin/body-form.html:89 #: templates/web/zurich/admin/body-form.html:36 msgid "Flag as deleted" msgstr "Als gelöscht markieren" @@ -1075,7 +1048,7 @@ msgstr "Als gelöscht markieren" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "" @@ -1084,7 +1057,7 @@ msgstr "" msgid "Flagged reports and users" msgstr "" -#: templates/web/base/admin/user-form.html:45 +#: templates/web/base/admin/user-form.html:46 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page." msgstr "" @@ -1092,8 +1065,8 @@ msgstr "" msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." msgstr "" -#: templates/web/base/admin/report_edit.html:78 -#: templates/web/base/admin/user-form.html:51 +#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/user-form.html:52 msgid "Flagged:" msgstr "" @@ -1102,10 +1075,6 @@ msgstr "" msgid "Follow a ward link to view only reports within that ward." msgstr "" -#: templates/web/base/admin/report_edit.html:30 -msgid "For council(s):" -msgstr "" - #: templates/web/base/admin/body-form.html:65 msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "" @@ -1118,8 +1087,6 @@ msgstr "Ihr Passwort" #: templates/web/base/faq/faq-en-gb.html:1 #: templates/web/base/static/privacy.html:1 #: templates/web/base/static/privacy.html:2 -#: templates/web/fiksgatami/faq/faq-nb.html:1 -#: templates/web/fiksgatami/nn/faq/faq-nn.html:1 msgid "Frequently Asked Questions" msgstr "Hilfe" @@ -1132,13 +1099,13 @@ msgstr "" msgid "Get updates" msgstr "" -#: templates/web/fixmystreet/reports/_rss.html:4 +#: templates/web/fixmystreet/reports/_rss.html:3 #: 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:4 +#: templates/web/fixmystreet/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "" @@ -1147,6 +1114,10 @@ msgstr "" msgid "Give me an RSS feed" msgstr "" +#: templates/web/base/questionnaire/completed.html:14 +msgid "Glad to hear it’s been fixed!" +msgstr "" + #: templates/web/base/alert/index.html:34 #: templates/web/base/around/postcode_form.html:8 #: templates/web/fixmystreet/around/postcode_form.html:21 @@ -1154,7 +1125,7 @@ msgstr "" msgid "Go" msgstr "Los" -#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:93 msgid "Going to send questionnaire?" msgstr "" @@ -1176,9 +1147,7 @@ msgstr "" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "" -#: templates/web/base/footer.html:15 templates/web/fiksgatami/footer.html:27 -#: templates/web/fiksgatami/nn/footer.html:27 -#: templates/web/fixmystreet/footer.html:30 +#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:30 #: templates/web/zurich/faq/faq-de-ch.html:1 #: templates/web/zurich/footer.html:21 #: templates/web/zurich/nav_over_content.html:8 @@ -1190,18 +1159,17 @@ msgstr "Hilfe" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "" -#: templates/web/fiksgatami/header.html:48 -#: templates/web/fixmystreet/header.html:52 +#: templates/web/fixmystreet/header.html:58 #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "Hallo %s" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:50 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:63 +#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/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:86 #: templates/web/zurich/admin/report_edit.html:90 #: templates/web/zurich/admin/stats.html:32 @@ -1217,7 +1185,7 @@ msgstr "Alte ausblenden" msgid "Hide pins" msgstr "Stecknadeln ausblenden" -#: templates/web/base/admin/category_edit.html:79 +#: templates/web/base/admin/category_edit.html:84 msgid "History" msgstr "History" @@ -1233,19 +1201,25 @@ msgstr "Erfassen Sie eine neue Meldung:" msgid "How to send successful reports" msgstr "Anleitung" -#: perllib/FixMyStreet/App/Controller/Admin.pm:742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:740 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" +#: templates/web/base/tokens/confirm_problem.html:23 +#: templates/web/base/tokens/confirm_problem.html:27 +msgid "I just reported a problem on @fixmystreet" +msgstr "" + +#: templates/web/base/tokens/confirm_update.html:19 +#: templates/web/base/tokens/confirm_update.html:23 +msgid "I just updated a problem on @fixmystreet" msgstr "" -#: 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." +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:260 +#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 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öst werden. Falls Sie die URL aus einer Mail kopiert haben, überprüfen Sie bitte ob Sie die gesamte URL kopiert haben.\n" @@ -1267,7 +1241,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:125 +#: templates/web/base/admin/body.html:133 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." @@ -1285,7 +1259,12 @@ msgstr "" msgid "If you do not, your update will not be posted." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:9 +#: templates/web/base/questionnaire/completed.html:8 +msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." +msgstr "" + +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:8 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 "" @@ -1301,34 +1280,34 @@ msgid "" "your experience of getting the problem fixed?" msgstr "" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/body.html:149 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/base/admin/body-form.html:200 -#: templates/web/base/admin/body-form.html:201 +#: templates/web/base/admin/body-form.html:207 +#: templates/web/base/admin/body-form.html:208 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable <strong>extended Open311 stauses</strong> if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/body-form.html:187 -#: templates/web/base/admin/body-form.html:188 +#: templates/web/base/admin/body-form.html:194 +#: templates/web/base/admin/body-form.html:195 msgid "" "If you've enabled Open311 update-sending above, enable <strong>suppression of alerts</strong> \n" " if you do <strong>not</strong> want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/body-form.html:173 -#: templates/web/base/admin/body-form.html:174 +#: templates/web/base/admin/body-form.html:177 +#: templates/web/base/admin/body-form.html:178 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:127 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 msgid "Illegal ID" msgstr "Unbekannt ID" @@ -1353,17 +1332,21 @@ 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:143 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:38 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:144 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 #: templates/web/fixmystreet/report/banner.html:19 -#: templates/web/zurich/admin/header.html:2 +#: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 #: templates/web/zurich/admin/report_edit.html:99 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "In Bearbeitung" +#: templates/web/base/tokens/confirm_alert.html:11 +msgid "Inbox zero, here we come!" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:160 msgid "Include reporter personal details" msgstr "Persönliche Angaben des Meldenden mitsenden" @@ -1372,7 +1355,7 @@ msgstr "Persönliche Angaben des Meldenden mitsenden" msgid "Include unconfirmed reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:354 +#: perllib/FixMyStreet/App/Controller/Open311.pm:359 msgid "Incorrect has_photo value \"%s\"" msgstr "" @@ -1380,29 +1363,29 @@ msgstr "" msgid "Internal notes" msgstr "Interne Notizen" -#: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:61 msgid "Internal referral" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:339 +#: perllib/FixMyStreet/App/Controller/Open311.pm:344 msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1114 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1112 msgid "Invalid end date" msgstr "Ung&ultiges Enddatum" -#: perllib/FixMyStreet/App/Controller/Open311.pm:432 +#: perllib/FixMyStreet/App/Controller/Open311.pm:437 msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1110 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 msgid "Invalid start date" msgstr "Ung&ultiges Startdatum" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:37 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:50 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 #: templates/web/base/report/update-form.html:30 @@ -1416,8 +1399,12 @@ msgstr "" msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "" +#: templates/web/base/tokens/confirm_problem.html:14 +msgid "It’s on its way to the council right now." +msgstr "" + #: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:150 +#: templates/web/base/report/new/fill_in_details_form.html:131 #: templates/web/base/report/update-form.html:104 #: templates/web/fixmystreet/auth/general.html:47 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 @@ -1426,12 +1413,12 @@ msgstr "" msgid "Keep me signed in on this computer" msgstr "Angemeldet bleiben" -#: templates/web/base/admin/body.html:62 +#: templates/web/base/admin/body.html:70 #: templates/web/zurich/admin/body.html:16 msgid "Last editor" msgstr "Letzter Bearbeiter" -#: templates/web/base/admin/report_edit.html:72 +#: templates/web/base/admin/report_edit.html:88 msgid "Last update:" msgstr "Letzte Bearbeitung" @@ -1439,43 +1426,38 @@ msgstr "Letzte Bearbeitung" msgid "Last update:" msgstr "Letzte Bearbeitung" -#: templates/web/base/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:229 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "" -#: templates/web/base/admin/body.html:17 templates/web/base/admin/body.html:19 +#: templates/web/base/admin/body.html:27 msgid "List all reported problems" msgstr "Liste aller Meldungen" -#: templates/web/base/report/new/fill_in_details_form.html:69 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:54 -#: templates/web/zurich/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/category_wrapper.html:4 msgid "Loading..." msgstr "" #: templates/web/base/alert/choose.html:1 #: templates/web/base/alert/choose.html:3 #: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3 -#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:5 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5 #: templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 -#: templates/web/base/tokens/confirm_alert.html:4 #: templates/web/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "" -#: templates/web/base/alert/list.html:13 templates/web/base/alert/list.html:14 -#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:3 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:12 +#: templates/web/base/alert/list.html:14 templates/web/base/alert/list.html:3 msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "" -#: templates/web/base/footer.html:13 templates/web/fiksgatami/footer.html:25 -#: templates/web/fiksgatami/nn/footer.html:25 -#: templates/web/fixmystreet/footer.html:28 +#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:28 msgid "Local alerts" msgstr "RSS" -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:25 msgid "Locate the problem on a map of the area" msgstr "Lokalisieren Sie den Mangel auf der Karte" @@ -1484,17 +1466,26 @@ msgid "MAP" msgstr "" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" msgstr "" -#: perllib/FixMyStreet/Map/OSM.pm:42 -msgid "Map © <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>" +#: templates/web/base/admin/report_edit.html:86 +msgid "Mark as sent" msgstr "" -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/user-form.html:44 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." msgstr "" +#: templates/web/base/reports/index.html:24 +msgid "Marked fixed/closed in the past eight weeks" +msgstr "" + +#: templates/web/base/reports/index.html:25 +msgid "Marked fixed/closed more than eight weeks ago" +msgstr "" + #: templates/web/fixmystreet/contact/index.html:106 msgid "Message" msgstr "Nachricht" @@ -1503,7 +1494,7 @@ msgstr "Nachricht" msgid "Message:" msgstr "Nachricht:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:440 +#: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" msgstr "" @@ -1533,11 +1524,11 @@ msgstr "Meldungen in der Nähe" #: templates/web/fixmystreet/report/update-form.html:138 #: 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:94 +#: templates/web/zurich/report/new/fill_in_details_form.html:77 msgid "Name" msgstr "Name" -#: templates/web/base/admin/report_edit.html:66 +#: templates/web/base/admin/report_edit.html:79 #: templates/web/base/admin/update_edit.html:32 #: templates/web/base/admin/user-form.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:43 @@ -1546,25 +1537,25 @@ msgstr "Name" msgid "Name:" msgstr "Name:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:321 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:313 msgid "Name: %s" msgstr "Name: %s" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:186 -#: perllib/FixMyStreet/Geocode/OSM.pm:164 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 +#: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:137 +#: perllib/FixMyStreet/Cobrand/UK.pm:127 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 +#: perllib/FixMyStreet/Cobrand/Default.pm:442 +#: perllib/FixMyStreet/Cobrand/Default.pm:482 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:277 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1578,11 +1569,11 @@ msgstr "Fast Fertig! Bitte checken Sie Ihre Mailbox..." msgid "New <br>problems" msgstr "Neue <br>Meldungen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:264 +#: perllib/FixMyStreet/App/Controller/Admin.pm:261 msgid "New body added" msgstr "Neue Organisation hinzugefügt" -#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:379 msgid "New category contact added" msgstr "" @@ -1655,15 +1646,15 @@ msgstr "Neue Antwort" msgid "Next" msgstr "Weiter" -#: templates/web/base/admin/body.html:72 templates/web/base/admin/body.html:74 -#: templates/web/base/admin/body.html:78 templates/web/base/admin/body.html:80 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:93 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:44 @@ -1681,7 +1672,7 @@ msgstr "" msgid "No council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:376 +#: perllib/FixMyStreet/DB/Result/Problem.pm:401 msgid "No council selected" msgstr "" @@ -1722,12 +1713,12 @@ msgid "" " your config file is not pointing to a live MapIt service." msgstr "" -#: templates/web/base/report/_support.html:3 +#: templates/web/base/report/_support.html:2 #: templates/web/base/report/_support.html:4 msgid "No supporters" msgstr "" -#: templates/web/base/admin/report_edit.html:30 +#: templates/web/base/admin/report_edit.html:41 #: templates/web/zurich/admin/report_edit-sdm.html:46 #: templates/web/zurich/admin/report_edit.html:60 msgid "None" @@ -1742,8 +1733,8 @@ msgid "" " activity across their body), the ability to hide reports or set special report statuses." msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:46 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -1759,12 +1750,12 @@ msgstr "Anderer Fachbereich zuständig" msgid "Not reported before" msgstr "" -#: templates/web/base/report/_main.html:61 +#: templates/web/base/report/_main.html:62 msgid "Not reported to council" msgstr "" -#: templates/web/base/admin/body.html:63 -#: templates/web/base/admin/category_edit.html:87 +#: templates/web/base/admin/body.html:71 +#: templates/web/base/admin/category_edit.html:92 #: templates/web/zurich/admin/body.html:17 msgid "Note" msgstr "" @@ -1773,8 +1764,8 @@ msgstr "" 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/base/admin/body.html:178 -#: templates/web/base/admin/category_edit.html:44 +#: templates/web/base/admin/body.html:186 +#: templates/web/base/admin/category_edit.html:49 #: templates/web/zurich/admin/body.html:53 msgid "Note:" msgstr "" @@ -1787,7 +1778,7 @@ msgstr "" msgid "Now to submit your report…" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:132 +#: templates/web/base/report/new/fill_in_details_form.html:113 msgid "Now to submit your report… do you have a FixMyStreet password?" msgstr "" @@ -1804,7 +1795,7 @@ msgid "OK" msgstr "" #: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:16 +#: templates/web/base/report/update.html:17 msgid "Offensive? Unsuitable? Tell us" msgstr "" @@ -1824,19 +1815,19 @@ msgstr "" msgid "Older <br>problems" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:37 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 msgid "One-line summary" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:137 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:36 -#: templates/web/base/admin/report_edit.html:37 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:138 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:49 +#: templates/web/base/admin/report_edit.html:50 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/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:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/report_edit.html:86 #: templates/web/zurich/admin/report_edit.html:88 @@ -1845,10 +1836,19 @@ msgstr "" msgid "Open" msgstr "Aufgenommen" -#: templates/web/base/my/my.html:30 templates/web/fixmystreet/my/my.html:36 +#: templates/web/base/reports/index.html:22 +msgid "Open for more than four weeks, with an update within the past eight weeks" +msgstr "" + +#: templates/web/base/my/my.html:30 +#: templates/web/fixmystreet/my/_problem-list.html:2 msgid "Open reports" msgstr "Offene Meldungen" +#: templates/web/base/reports/index.html:23 +msgid "Open, but not had any update in eight weeks" +msgstr "" + #: templates/web/base/open311/index.html:70 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "" @@ -1871,15 +1871,15 @@ msgstr "" msgid "Or you can subscribe to an alert based upon what ward or council you’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:560 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 -#: perllib/FixMyStreet/DB/Result/Problem.pm:592 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:372 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 +#: perllib/FixMyStreet/DB/Result/Problem.pm:597 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:393 msgid "Other" msgstr "" @@ -1901,8 +1901,8 @@ msgstr "" msgid "Parent" msgstr "Gehört zu" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 msgid "Partial" msgstr "" @@ -1922,7 +1922,7 @@ msgstr "" msgid "Permalink" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:100 +#: templates/web/zurich/report/new/fill_in_details_form.html:83 msgid "Phone number" msgstr "Telefonnummer" @@ -1931,27 +1931,27 @@ msgstr "Telefonnummer" msgid "Phone number (optional)" msgstr "Telefonnummer (optional)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:286 -#: templates/web/base/admin/report_edit.html:68 -#: templates/web/base/report/new/fill_in_details_form.html:216 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:291 +#: templates/web/base/admin/report_edit.html:81 +#: templates/web/base/report/new/fill_in_details_form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:46 #: templates/web/zurich/admin/report_edit.html:60 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Telefonnummer:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:72 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 #: 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 +#: templates/web/zurich/report/new/fill_in_details_form.html:51 msgid "Photo" msgstr "Foto" #: templates/web/base/questionnaire/index.html:71 -#: templates/web/base/report/new/fill_in_details_form.html:103 +#: templates/web/base/report/new/fill_in_details_form.html:84 #: templates/web/base/report/update-form.html:62 #: templates/web/fixmystreet/questionnaire/index.html:91 msgid "Photo:" @@ -1965,11 +1965,11 @@ msgstr "Fotos von neuen Meldungen in der Nähe" msgid "Place pin on map" msgstr "Pin auf der Karte absetzen" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:38 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/zurich/admin/header.html:2 +#: 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:86 @@ -2003,20 +2003,19 @@ msgstr "Bitte überprüfen Sie Ihr E-Mail" msgid "Please check your email address is correct" msgstr "Bitte überprüfen Sie ob Ihre E-Mail Adresse korrekt ist" -#: perllib/FixMyStreet/App/Controller/Admin.pm:349 -#: 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:395 +#: perllib/FixMyStreet/App/Controller/Admin.pm:343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:876 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 +#: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" msgstr "Bitte wählen Sie eine Kategorie" -#: perllib/FixMyStreet/DB/Result/Problem.pm:401 +#: perllib/FixMyStreet/DB/Result/Problem.pm:418 msgid "Please choose a property type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:370 msgid "Please correct the errors below" msgstr "" @@ -2032,8 +2031,8 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:352 -#: perllib/FixMyStreet/DB/Result/Comment.pm:133 +#: perllib/FixMyStreet/App/Controller/Admin.pm:346 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "" @@ -2044,15 +2043,15 @@ msgstr "" msgid "Please enter a password" msgstr "Obligatorisches Feld" -#: perllib/FixMyStreet/App/Controller/Contact.pm:108 -#: perllib/FixMyStreet/DB/Result/Problem.pm:370 +#: perllib/FixMyStreet/App/Controller/Contact.pm:113 +#: perllib/FixMyStreet/DB/Result/Problem.pm:395 #: templates/web/base/js/translation_strings.html:3 msgid "Please enter a subject" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1050 -#: perllib/FixMyStreet/App/Controller/Admin.pm:351 -#: perllib/FixMyStreet/App/Controller/Admin.pm:997 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin.pm:995 #: perllib/FixMyStreet/DB/Result/User.pm:127 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 @@ -2060,16 +2059,16 @@ msgid "Please enter a valid email" msgstr "Bitte geben Sie eine gültige E-Mail Adresse an" #: perllib/FixMyStreet/App/Controller/Alert.pm:346 -#: perllib/FixMyStreet/App/Controller/Contact.pm:118 +#: perllib/FixMyStreet/App/Controller/Contact.pm:123 msgid "Please enter a valid email address" msgstr "Bitte geben Sie eine gültige E-Mail Adresse an" -#: perllib/FixMyStreet/DB/Result/Problem.pm:373 +#: perllib/FixMyStreet/DB/Result/Problem.pm:398 #: templates/web/base/js/translation_strings.html:4 msgid "Please enter some details" msgstr "Bitte geben Sie einige Details an" -#: perllib/FixMyStreet/App/Controller/Contact.pm:107 +#: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/User.pm:124 #: templates/web/base/auth/general.html:13 #: templates/web/base/auth/general.html:8 @@ -2083,7 +2082,7 @@ msgid "Please enter your email" msgstr "Ihre E-Mail Adresse" #: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:75 msgid "Please enter your email address" msgstr "Ihre E-Mail Adresse" @@ -2091,14 +2090,14 @@ msgstr "Ihre E-Mail Adresse" msgid "Please enter your first name" msgstr "Bitte geben Sie Ihren Namen an" -#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: perllib/FixMyStreet/Cobrand/UK.pm:318 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:106 -#: perllib/FixMyStreet/DB/Result/Comment.pm:130 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Contact.pm:111 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 +#: perllib/FixMyStreet/DB/Result/Problem.pm:406 #: perllib/FixMyStreet/DB/Result/User.pm:120 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" @@ -2121,7 +2120,7 @@ msgstr "Bitte geben Sie Ihre E-Mail-Adresse an" msgid "Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a href=\"/\">front page</a>." msgstr "<a href=\"%s\">Erneut anmelden</a> oder <a href=\"/\">zurück zur Startseite</a>." -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:8 msgid "Please fill in details of the problem below." msgstr "" @@ -2136,7 +2135,7 @@ msgstr "Beschreiben Sie den Mangel." msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "Füllen Sie das Formular mit den Details des Mangels aus und beschreiben Sie den Ort des Mangels möglichst genau." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:251 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" @@ -2159,16 +2158,16 @@ msgstr "" msgid "Please note:" msgstr "Hinweise:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:246 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:254 msgid "Please provide some explanation as to why you're reopening this report" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:261 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 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:247 msgid "Please say whether you've ever reported a problem to your council before" msgstr "" @@ -2180,7 +2179,7 @@ msgstr "" msgid "Please select the type of alert you want" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please state whether or not the problem has been fixed" msgstr "" @@ -2188,15 +2187,13 @@ msgstr "" msgid "Please take a look at the updates that have been left." msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:176 +#: perllib/FixMyStreet/App/Controller/Photo.pm:177 +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 +#: perllib/FixMyStreet/App/Controller/Photo.pm:189 msgid "Please upload a JPEG image only" msgstr "Bitte laden Sie nur JPEG Bilder hoch." -#: perllib/FixMyStreet/App/Controller/Photo.pm:183 -msgid "Please upload a JPEG image only\n" -msgstr "Bitte laden Sie nur JPEG Bilder hoch\n" - -#: perllib/FixMyStreet/App/Controller/Contact.pm:109 +#: perllib/FixMyStreet/App/Controller/Contact.pm:114 msgid "Please write a message" msgstr "" @@ -2235,14 +2232,14 @@ msgstr "Zurück" msgid "Privacy" msgstr "" -#: templates/web/base/admin/body.html:194 -#: templates/web/base/admin/body.html:77 -#: templates/web/base/admin/category_edit.html:40 -#: templates/web/base/admin/report_edit.html:79 +#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:85 +#: templates/web/base/admin/category_edit.html:45 +#: templates/web/base/admin/report_edit.html:95 msgid "Private" msgstr "" -#: templates/web/base/maps/openlayers.html:86 +#: templates/web/base/maps/openlayers.html:89 msgid "Problem" msgstr "Meldung" @@ -2263,7 +2260,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "Meldungen nach Status sortiert" -#: perllib/FixMyStreet/App/Controller/Admin.pm:968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:966 msgid "Problem marked as open." msgstr "" @@ -2298,16 +2295,15 @@ msgstr "Meldungen, welche kürzlich beantwortet wurden" msgid "Problems within %.1fkm of this location" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:629 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:114 +#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:151 -#: perllib/FixMyStreet/Cobrand/UK.pm:217 +#: perllib/FixMyStreet/Cobrand/UK.pm:207 msgid "Problems within %s" msgstr "Meldungen innerhalb %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:122 -#: perllib/FixMyStreet/Cobrand/UK.pm:231 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "Problems within %s ward" msgstr "" @@ -2325,7 +2321,7 @@ msgstr "" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "" -#: templates/web/base/admin/report_edit.html:32 +#: templates/web/base/admin/report_edit.html:45 msgid "Property address:" msgstr "" @@ -2342,7 +2338,7 @@ 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/base/report/new/fill_in_details_form.html:174 +#: templates/web/base/report/new/fill_in_details_form.html:155 #: templates/web/base/report/update-form.html:128 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 #: templates/web/fixmystreet/report/update-form.html:119 @@ -2363,7 +2359,7 @@ msgstr "Foto veröffentlichen" msgid "Publish the response" msgstr "Antwort veröffentlichen" -#: templates/web/base/questionnaire/completed.html:2 +#: templates/web/base/questionnaire/completed.html:1 #: templates/web/base/questionnaire/index.html:0 #: templates/web/base/questionnaire/index.html:14 #: templates/web/base/questionnaire/index.html:4 @@ -2382,11 +2378,12 @@ msgstr "" msgid "Questionnaire %d sent for problem %d" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 msgid "Questionnaire filled in by problem reporter" msgstr "" #: templates/web/base/alert/_list.html:21 +#: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display.html:50 #: templates/web/base/reports/_rss.html:1 @@ -2396,11 +2393,11 @@ msgstr "" msgid "RSS feed" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:260 perllib/FixMyStreet/Cobrand/UK.pm:272 +#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 msgid "RSS feed for %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "RSS feed for %s ward, %s" msgstr "" @@ -2408,15 +2405,11 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:167 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:175 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:185 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:193 -#: perllib/FixMyStreet/Cobrand/UK.pm:286 perllib/FixMyStreet/Cobrand/UK.pm:298 +#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 msgid "RSS feed of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 msgid "RSS feed of %s, within %s ward" msgstr "" @@ -2429,20 +2422,19 @@ msgstr "" msgid "RSS feed of problems in this %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:630 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:115 +#: perllib/FixMyStreet/Cobrand/Default.pm:651 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:150 -#: perllib/FixMyStreet/Cobrand/UK.pm:224 +#: perllib/FixMyStreet/Cobrand/UK.pm:214 msgid "RSS feed of problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 -#: perllib/FixMyStreet/Cobrand/UK.pm:230 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s ward" msgstr "" -#: templates/web/base/around/display_location.html:3 +#: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:4 msgid "RSS feed of recent local problems" msgstr "" @@ -2482,15 +2474,18 @@ msgstr "Züri wie neu dient dazu Mängel an der Infrastruktur zu melden. msgid "Remove flag" msgstr "" -#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/report_edit.html:110 #: templates/web/base/admin/update_edit.html:62 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "" -#: templates/web/base/footer.html:7 templates/web/fiksgatami/footer.html:19 -#: templates/web/fiksgatami/nn/footer.html:19 -#: templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 +msgid "Report" +msgstr "" + +#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 #: templates/web/zurich/footer.html:17 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2500,11 +2495,6 @@ msgstr "Eine Meldung erfassen" msgid "Report abuse" msgstr "Missbrauch melden" -#: templates/web/base/report_created.html:1 -#: templates/web/base/report_created.html:3 -msgid "Report created" -msgstr "" - #: perllib/FixMyStreet/App/Controller/Rss.pm:295 msgid "Report on %s" msgstr "" @@ -2528,7 +2518,7 @@ msgstr "" msgid "Reported %s, to %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:580 #: templates/web/base/contact/index.html:50 #: templates/web/fixmystreet/contact/index.html:65 msgid "Reported anonymously at %s" @@ -2540,7 +2530,7 @@ msgstr "Anonym gemeldet um" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:598 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 #: templates/web/base/contact/index.html:52 #: templates/web/fixmystreet/contact/index.html:67 msgid "Reported by %s at %s" @@ -2550,31 +2540,36 @@ msgstr "Gemeldet von %s um %s" msgid "Reported in the %s category" msgstr "In der Kategorie %s gemeldet" -#: perllib/FixMyStreet/DB/Result/Problem.pm:571 +#: perllib/FixMyStreet/DB/Result/Problem.pm:576 msgid "Reported in the %s category anonymously at %s" msgstr "In der Kategorie %s um %s gemeldet" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:598 msgid "Reported in the %s category by %s at %s" msgstr "Gemeldet in der Kategorie %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:567 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 msgid "Reported via %s anonymously at %s" msgstr "Anonym gemeldet von %s um %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:589 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:563 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:583 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 msgid "Reported via %s in the %s category by %s at %s" msgstr "" -#: templates/web/base/around/around_index.html:2 +#: templates/web/base/reports/index.html:21 +#, fuzzy +msgid "Reported within the last four weeks" +msgstr "In der Kategorie %s gemeldet" + +#: templates/web/base/around/around_index.html:1 #: templates/web/base/around/around_index.html:3 #: templates/web/base/js/translation_strings.html:41 #: templates/web/base/report/new/fill_in_details.html:0 @@ -2584,14 +2579,13 @@ msgstr "" msgid "Reporting a problem" msgstr "Ihre Meldung" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:294 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "Meldungen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:409 -#: perllib/FixMyStreet/DB/Result/Problem.pm:413 +#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" @@ -2607,7 +2601,7 @@ msgstr "" msgid "Reports published" msgstr "Beantwortet" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:85 msgid "Resend report" msgstr "" @@ -2615,36 +2609,35 @@ msgstr "" msgid "Right place?" msgstr "Richtiger Ort?" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:193 -#: perllib/FixMyStreet/Geocode/OSM.pm:171 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:167 +#: perllib/FixMyStreet/Geocode/OSM.pm:152 msgid "Road operator for this named road (derived from road reference number and type): %s" msgstr "" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:190 -#: perllib/FixMyStreet/Geocode/OSM.pm:168 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:164 +#: perllib/FixMyStreet/Geocode/OSM.pm:149 msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1394 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 -#: templates/web/base/admin/report_edit.html:90 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1403 +#: templates/web/base/admin/report_edit.html:106 #: templates/web/zurich/admin/report_edit.html:73 msgid "Rotate Left" msgstr "Links drehen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1394 -#: templates/web/base/admin/report_edit.html:91 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: templates/web/base/admin/report_edit.html:107 #: templates/web/zurich/admin/report_edit.html:74 msgid "Rotate Right" msgstr "Rechts drehen" #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:200 -#: templates/web/base/admin/category_edit.html:76 +#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/category_edit.html:81 #: templates/web/zurich/admin/body.html:59 msgid "Save changes" msgstr "Speichern" @@ -2672,7 +2665,7 @@ msgstr "Suchen:" msgid "Searching found no reports." msgstr "" -#: templates/web/base/admin/users.html:39 +#: templates/web/base/admin/users.html:41 msgid "Searching found no users." msgstr "" @@ -2695,15 +2688,15 @@ 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:680 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "Sent to %s %s later" msgstr "" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:84 msgid "Sent:" msgstr "Gesendet:" -#: templates/web/base/admin/report_edit.html:73 +#: templates/web/base/admin/report_edit.html:89 #: templates/web/zurich/admin/stats.html:45 msgid "Service:" msgstr "" @@ -2712,7 +2705,7 @@ msgstr "" msgid "Share" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:211 +#: templates/web/base/report/new/fill_in_details_form.html:192 #: templates/web/base/report/update-form.html:157 #: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 @@ -2757,12 +2750,12 @@ msgstr "Ausloggen" msgid "Signed in as %s" msgstr "" -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 msgid "Some categories may require additional information." msgstr "" -#: templates/web/base/admin/body-form.html:145 -#: templates/web/base/admin/body-form.html:146 +#: templates/web/base/admin/body-form.html:149 +#: templates/web/base/admin/body-form.html:150 msgid "" "Some endpoints require an <strong>API key</strong> to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -2773,11 +2766,11 @@ msgid "Some photos of recent reports" msgstr "" #: perllib/FixMyStreet/App/View/Email.pm:32 -#: perllib/FixMyStreet/App/View/Web.pm:44 +#: perllib/FixMyStreet/App/View/Web.pm:43 msgid "Some text to localize" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:88 +#: perllib/FixMyStreet/Cobrand/UK.pm:78 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -2785,17 +2778,16 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:215 -#: perllib/FixMyStreet/Geocode.pm:26 perllib/FixMyStreet/Geocode/Bing.pm:56 -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:73 -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:93 -#: perllib/FixMyStreet/Geocode/Google.pm:72 -#: perllib/FixMyStreet/Geocode/OSM.pm:64 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:214 +#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 +#: perllib/FixMyStreet/Geocode/Google.pm:47 +#: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "Diese Adresse wurde nicht gefunden." -#: perllib/FixMyStreet/Geocode/Bing.pm:51 -#: perllib/FixMyStreet/Geocode/Google.pm:67 +#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: perllib/FixMyStreet/Geocode/Google.pm:44 #: perllib/FixMyStreet/Geocode/Zurich.pm:87 msgid "Sorry, we could not parse that location. Please try again." msgstr "Diese Adresse wurde nicht gefunden." @@ -2804,7 +2796,7 @@ msgstr "Diese Adresse wurde nicht gefunden." msgid "Start Date:" msgstr "" -#: templates/web/base/admin/body.html:61 +#: templates/web/base/admin/body.html:69 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 @@ -2812,7 +2804,7 @@ msgstr "" msgid "State" msgstr "Status" -#: templates/web/base/admin/report_edit.html:34 +#: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 #: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:53 @@ -2821,8 +2813,8 @@ msgstr "Status" msgid "State:" msgstr "Status:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1200 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:304 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:308 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" @@ -2838,7 +2830,7 @@ msgstr "" msgid "Still open, via questionnaire, %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:381 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 msgid "Subcategory: %s" msgstr "" @@ -2858,19 +2850,19 @@ msgid "Subject:" msgstr "Titel:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:115 -#: templates/web/base/report/new/fill_in_details_form.html:155 -#: templates/web/base/report/new/fill_in_details_form.html:177 +#: templates/web/base/report/new/fill_in_details_form.html:136 +#: templates/web/base/report/new/fill_in_details_form.html:158 +#: templates/web/base/report/new/fill_in_details_form.html:96 #: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 -#: templates/web/zurich/report/new/fill_in_details_form.html:108 +#: templates/web/zurich/report/new/fill_in_details_form.html:91 msgid "Submit" msgstr "Abschicken" -#: templates/web/base/admin/report_edit.html:97 +#: templates/web/base/admin/report_edit.html:113 #: templates/web/base/admin/update_edit.html:65 -#: templates/web/base/admin/user-form.html:55 +#: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:64 #: templates/web/zurich/admin/report_edit.html:221 #: templates/web/zurich/admin/update_edit.html:38 @@ -2882,8 +2874,8 @@ msgstr "Speichern" msgid "Submit questionnaire" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:133 -#: templates/web/zurich/admin/header.html:2 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:134 +#: 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 @@ -2907,8 +2899,8 @@ msgstr "" msgid "Subscribe me to an email alert" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1191 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:293 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 #: templates/web/zurich/admin/index-dm.html:1 @@ -2924,7 +2916,7 @@ msgstr "Zusammenfassung" msgid "Summary reports" msgstr "Alle Meldungen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 msgid "Survey" msgstr "" @@ -2938,7 +2930,7 @@ msgstr "" msgid "Text" msgstr "" -#: templates/web/base/admin/body.html:21 +#: templates/web/base/admin/body.html:28 msgid "Text only version" msgstr "" @@ -2947,49 +2939,55 @@ msgstr "" msgid "Text:" msgstr "" -#: templates/web/base/tokens/confirm_update.html:9 -msgid "Thank you — you can <a href=\"%s\">view your updated problem</a> on the site." -msgstr "Danke — Sie können Ihre aktualisierte Meldung <a href=\"%s\">auf der Webseite anschauen</a>." - -#: templates/web/base/tokens/confirm_problem.html:18 -msgid "Thank you for reporting this issue" +#: templates/web/base/tokens/confirm_problem.html:12 +msgid "Thank you for reporting this issue!" msgstr "" #: templates/web/base/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/fixmystreet/around/around_index.html:28 -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 :" +#: templates/web/base/tokens/confirm_update.html:15 +msgid "Thank you for updating this issue!" msgstr "" -#: templates/web/base/contact/submit.html:8 -msgid "Thanks for your feedback. We'll get back to you as soon as we can!" +#: templates/web/base/contact/submit.html:6 +#: templates/web/base/questionnaire/completed.html:5 +msgid "Thank you for your feedback" +msgstr "" + +#: templates/web/fixmystreet/around/around_index.html:28 +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 :" msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:9 msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:190 +#: perllib/FixMyStreet/App/Controller/Photo.pm:195 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Council.pm:100 +#: perllib/FixMyStreet/App/Controller/Council.pm:97 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "Sie können Mängel nur innerhalb der Stadt Zürich melden. Verwenden Sie dafür die Adressuche." -#: perllib/FixMyStreet/App/Controller/Location.pm:124 +#: perllib/FixMyStreet/App/Controller/Location.pm:126 msgid "That location does not appear to be in the UK; please try again." msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:81 +#: perllib/FixMyStreet/Cobrand/UK.pm:71 msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:713 +#: perllib/FixMyStreet/App/Controller/Admin.pm:712 +#, fuzzy +msgid "That problem has been marked as sent." +msgstr "Dieser Mangel wurde behoben" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:704 msgid "That problem will now be resent." msgstr "" @@ -3001,28 +2999,28 @@ msgstr "Diese Meldung wurde von Züri wie neu entfernt." msgid "That report has been removed from FixMyStreet." msgstr "Diese Meldung wurde von Züri wie neu entfernt." -#: templates/web/base/admin/body.html:136 +#: templates/web/base/admin/body.html:144 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/base/admin/body-form.html:119 -#: templates/web/base/admin/body-form.html:120 +#: templates/web/base/admin/body-form.html:123 +#: templates/web/base/admin/body-form.html:124 msgid "" "The <strong>endpoint</strong> is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." msgstr "" -#: templates/web/base/admin/body-form.html:132 -#: templates/web/base/admin/body-form.html:133 +#: templates/web/base/admin/body-form.html:136 +#: templates/web/base/admin/body-form.html:137 msgid "" "The <strong>jurisdiction</strong> is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" -#: templates/web/base/admin/body-form.html:90 -#: templates/web/base/admin/body-form.html:91 +#: templates/web/base/admin/body-form.html:94 +#: templates/web/base/admin/body-form.html:95 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>." @@ -3043,7 +3041,7 @@ msgstr "" msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." msgstr "" -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:3 msgid "The council won’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ö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." @@ -3070,8 +3068,8 @@ 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:185 -#: perllib/FixMyStreet/Geocode/OSM.pm:163 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:159 +#: perllib/FixMyStreet/Geocode/OSM.pm:144 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap." msgstr "" @@ -3129,7 +3127,7 @@ msgstr "" msgid "The passwords do not match" msgstr "" -#: templates/web/base/errors/page_error_404_not_found.html:11 +#: templates/web/base/errors/page_error_404_not_found.html:10 #: templates/web/base/errors/page_error_404_not_found.html:12 msgid "The requested URL '%s' was not found on this server" msgstr "" @@ -3146,7 +3144,7 @@ msgstr "" msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:295 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:300 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" @@ -3157,16 +3155,20 @@ msgid "" " Names are not necessarily unique." msgstr "" +#: templates/web/base/reports/_problem-list.html:15 +msgid "There are no reports to show." +msgstr "" + #: perllib/FixMyStreet/App/Controller/Reports.pm:75 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:131 +#: perllib/FixMyStreet/App/Controller/Contact.pm:136 #: 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/New.pm:762 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 #: templates/web/base/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:25 @@ -3182,7 +3184,7 @@ msgstr "" msgid "There was a problem with your update. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:135 +#: perllib/FixMyStreet/App/Controller/Contact.pm:140 msgid "There were problems with your report. Please see below." msgstr "" @@ -3190,8 +3192,8 @@ msgstr "" msgid "There were problems with your update. Please see below." msgstr "" -#: templates/web/base/admin/body-form.html:108 -#: templates/web/base/admin/body-form.html:109 +#: templates/web/base/admin/body-form.html:112 +#: templates/web/base/admin/body-form.html:113 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" @@ -3204,14 +3206,14 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" -#: templates/web/base/admin/body.html:36 +#: templates/web/base/admin/body.html:44 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported <em>at any location</em>.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" " Currently, users <strong>cannot report problems to this body</strong>." msgstr "" -#: templates/web/base/admin/body.html:46 +#: templates/web/base/admin/body.html:54 msgid "This body has no contacts. This means that currently problems reported to this body <strong>will not be sent</strong>." msgstr "" @@ -3222,18 +3224,18 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:388 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:394 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:391 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 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:136 -#: perllib/FixMyStreet/Cobrand/UK.pm:53 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:902 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:972 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/Cobrand/UK.pm:43 msgid "This information is required" msgstr "Diese Information wird benötigt" @@ -3272,8 +3274,8 @@ 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:130 #: perllib/FixMyStreet/Cobrand/Zurich.pm:131 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:132 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Überprüfung ausstehend" @@ -3290,15 +3292,15 @@ msgstr "" msgid "This report is currently marked as open." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:319 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:311 msgid "This report was submitted anonymously" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:293 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -3316,7 +3318,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:294 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:299 msgid "To view a map of the precise location of this issue" msgstr "" @@ -3332,8 +3334,12 @@ msgstr "Total" msgid "Try again" msgstr "Erneut versuchen" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:46 +#: templates/web/base/contact/submit.html:14 +msgid "Try emailing us directly:" +msgstr "" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -3341,8 +3347,8 @@ msgstr "Erneut versuchen" msgid "Unable to fix" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/admin/update_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:45 #: templates/web/zurich/admin/report_edit.html:58 @@ -3384,7 +3390,7 @@ msgstr "" msgid "Update below added by %s at %s" msgstr "" -#: templates/web/base/admin/body-form.html:233 +#: templates/web/base/admin/body-form.html:240 #: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "Speichern" @@ -3410,7 +3416,7 @@ msgstr "" msgid "Update reopened problem" msgstr "" -#: templates/web/base/admin/body.html:93 +#: templates/web/base/admin/body.html:101 msgid "Update statuses" msgstr "" @@ -3424,12 +3430,12 @@ msgstr "" msgid "Updated" msgstr "Aktualisiert" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1016 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1060 -#: perllib/FixMyStreet/App/Controller/Admin.pm:810 -#: perllib/FixMyStreet/App/Controller/Admin.pm:958 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:549 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:618 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1014 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:808 +#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:556 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:625 msgid "Updated!" msgstr "Aktualisiert!" @@ -3441,7 +3447,7 @@ msgstr "Aktualisiert!" msgid "Updates" msgstr "Antwort" -#: perllib/FixMyStreet/DB/Result/Comment.pm:139 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -3456,7 +3462,7 @@ msgstr "" msgid "Updates to this problem, FixMyStreet" msgstr "" -#: templates/web/base/admin/body.html:174 +#: templates/web/base/admin/body.html:182 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 "" @@ -3465,11 +3471,11 @@ msgstr "" msgid "User" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1357 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1331 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1329 msgid "User flagged" msgstr "" @@ -3477,16 +3483,16 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:303 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:307 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:380 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:430 +#: perllib/FixMyStreet/App/Controller/Admin.pm:374 +#: perllib/FixMyStreet/App/Controller/Admin.pm:404 +#: perllib/FixMyStreet/App/Controller/Admin.pm:421 msgid "Values updated" msgstr "" @@ -3540,11 +3546,11 @@ msgstr "Ihr E-Mail wird nie angezeigt" msgid "We never show your email address or phone number." msgstr "Ihre E-Mail Adresse oder Telefonnummer werden nie angezeigt" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:403 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/base/index-steps.html:38 +#: templates/web/base/index-steps.html:31 msgid "We send it to the council on your behalf" msgstr "" @@ -3553,15 +3559,23 @@ msgstr "" msgid "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>" msgstr "Ihre persönlichen Angaben werden nur für interne Zwecke verwendet und nicht veröffentlicht." +#: templates/web/base/questionnaire/completed-open.html:2 +msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" +msgstr "" + #: templates/web/base/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/fixmystreet/report/new/fill_in_details_form.html:41 +#: templates/web/base/contact/submit.html:7 +msgid "We’ll get back to you as soon as we can." +msgstr "" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 msgid "What’s the issue, and where is it?" msgstr "" -#: templates/web/base/admin/category_edit.html:82 +#: templates/web/base/admin/category_edit.html:87 #: templates/web/zurich/admin/body.html:18 msgid "When edited" msgstr "Wann editiert" @@ -3570,15 +3584,18 @@ msgstr "Wann editiert" msgid "When sent" msgstr "Wann gesendet" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Whole block of empty flats" msgstr "" +#: templates/web/base/tokens/confirm_alert.html:7 +msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." +msgstr "" + #: templates/web/base/open311/index.html:92 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/fiksgatami/front/footer-marketing.html:15 #: templates/web/fixmystreet/front/footer-marketing.html:17 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" @@ -3602,18 +3619,18 @@ msgid "Year" msgstr "Jahr" #: templates/web/base/admin/bodies.html:66 -#: templates/web/base/admin/body.html:72 templates/web/base/admin/body.html:74 -#: templates/web/base/admin/body.html:78 templates/web/base/admin/body.html:80 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:76 +#: templates/web/base/admin/report_edit.html:93 #: templates/web/base/admin/update_edit.html:24 -#: templates/web/base/admin/users.html:29 +#: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:42 #: templates/web/base/questionnaire/index.html:81 @@ -3642,14 +3659,12 @@ msgstr "" msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/tokens/confirm_problem.html:25 -#: templates/web/base/tokens/confirm_problem.html:26 -#: templates/web/zurich/tokens/confirm_problem.html:6 +#: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:8 msgid "You can <a href=\"%s%s\">view the problem on this site</a>." msgstr "Danke! Sie können Ihre aktualisierte Meldung <a href=\"%s%s\">auf der Webseite anschauen</a>." -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:48 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -3664,14 +3679,14 @@ msgid "" " reports in the past." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:19 -#: templates/web/base/report/new/councils_text_none.html:20 -#: templates/web/base/report/new/councils_text_some.html:20 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." msgstr "" -#: templates/web/base/admin/body-form.html:81 +#: templates/web/base/admin/body-form.html:85 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" @@ -3684,10 +3699,10 @@ msgid "You have already answered this questionnaire. If you have a question, ple msgstr "" #: templates/web/base/questionnaire/index.html:68 -#: templates/web/base/report/new/fill_in_details_form.html:94 +#: templates/web/base/report/new/fill_in_details_form.html:75 #: templates/web/fixmystreet/questionnaire/index.html:88 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:79 -#: templates/web/zurich/report/new/fill_in_details_form.html:75 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 +#: templates/web/zurich/report/new/fill_in_details_form.html:58 msgid "You have already attached a photo to this report, attaching another one will replace it." msgstr "Sie haben bereits ein Photo angehängt. Laden Sie ein neues hoch um es zu ersetzen." @@ -3696,7 +3711,7 @@ msgstr "Sie haben bereits ein Photo angehängt. Laden Sie ein neues hoch um msgid "You have already attached a photo to this update, attaching another one will replace it." msgstr "" -#: templates/web/base/auth/sign_out.html:3 +#: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" msgstr "Sie haben sich abgemeldet" @@ -3705,26 +3720,11 @@ msgstr "Sie haben sich abgemeldet" msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. " msgstr "Der grüne Punkt lokalisiert Ihre Meldung auf der Karte. Falls dieser Ort nicht stimmt, kann der Pin verschoben werden." -#: templates/web/base/tokens/confirm_alert.html:8 -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ätigt. " -#: templates/web/base/tokens/confirm_update.html:14 -msgid "You have successfully confirmed your update and you can now <a href=\"%s\">view it on the site</a>." -msgstr "" - -#: templates/web/base/tokens/confirm_alert.html:12 -msgid "You have successfully created your alert." -msgstr "" - -#: templates/web/base/tokens/confirm_alert.html:10 -msgid "You have successfully deleted your alert." -msgstr "" - #: templates/web/base/report/display.html:20 #: templates/web/base/report/new/fill_in_details.html:37 #: templates/web/fixmystreet/report/display.html:17 @@ -3750,7 +3750,7 @@ msgid "" " contacts (such as an email address) to which reports are sent." msgstr "" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:85 msgid "You really want to resend?" msgstr "" @@ -3770,7 +3770,7 @@ msgstr "Ihre Meldungen" #: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 #: templates/web/fixmystreet/report/update-form.html:76 -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:71 msgid "Your email" msgstr "E-Mail Adresse" @@ -3786,7 +3786,7 @@ msgid "Your email address:" msgstr "Ihre E-Mail Adresse:" #: templates/web/base/alert/_list.html:92 -#: templates/web/base/report/new/fill_in_details_form.html:125 +#: templates/web/base/report/new/fill_in_details_form.html:106 #: templates/web/base/report/update-form.html:81 msgid "Your email:" msgstr "Ihre E-Mail:" @@ -3801,13 +3801,13 @@ msgstr "Wir verwenden Ihre persönlichen Daten nur entsprechend unserer <a h #: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 #: templates/web/fixmystreet/report/update-form.html:142 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:98 +#: templates/web/zurich/report/new/fill_in_details_form.html:81 msgid "Your name" msgstr "Ihr Name" #: templates/web/base/auth/general.html:59 #: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:204 +#: templates/web/base/report/new/fill_in_details_form.html:185 #: templates/web/base/report/update-form.html:151 msgid "Your name:" msgstr "Ihr Name:" @@ -3825,33 +3825,19 @@ msgstr "Ihr Passwort wurde geändert" #: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 -#: templates/web/zurich/report/new/fill_in_details_form.html:104 +#: templates/web/zurich/report/new/fill_in_details_form.html:87 msgid "Your phone number" msgstr "Ihre Telefonnummer" -#: templates/web/base/tokens/confirm_problem.html:4 -msgid "Your problem has been confirmed!" -msgstr "" - #: templates/web/fixmystreet/questionnaire/index.html:16 msgid "Your report" msgstr "Ihre Meldung" -#: templates/web/base/report_created.html:6 -msgid "Your report has been created and will shortly be sent." -msgstr "" - -#: templates/web/base/footer.html:9 templates/web/fiksgatami/footer.html:21 -#: templates/web/fiksgatami/nn/footer.html:21 -#: templates/web/fixmystreet/footer.html:24 +#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:24 msgid "Your reports" msgstr "Ihre Meldungen" -#: templates/web/base/tokens/confirm_update.html:4 -msgid "Your update has been confirmed!" -msgstr "" - -#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:59 +#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:41 msgid "Your updates" msgstr "" @@ -3868,11 +3854,7 @@ msgstr "" msgid "council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:665 -msgid "council ref: %s" -msgstr "" - -#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:32 #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:54 msgid "didn't use map" @@ -3883,6 +3865,7 @@ msgstr "hat Karte nicht verwendet" msgid "e.g. ‘%s’ or ‘%s’" msgstr "z.B. ‘%s’ oder ‘%s’" +#: templates/web/base/admin/body-form.html:188 #: templates/web/base/admin/flagged.html:51 msgid "edit user" msgstr "" @@ -3897,7 +3880,7 @@ msgstr "von %d verschiedenen Personen" msgid "last updated %s" msgstr "letzte Bearbeitung %s" -#: perllib/Utils.pm:263 +#: perllib/Utils.pm:235 msgid "less than a minute" msgstr "weniger als einer Minute" @@ -3957,22 +3940,22 @@ msgstr "oder" msgid "or locate me automatically" msgstr "oder automatisch lokalisieren" -#: templates/web/base/admin/report_edit.html:25 -#: templates/web/base/admin/report_edit.html:26 -#: templates/web/zurich/admin/report_edit-sdm.html:28 +#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:30 +#: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit-sdm.html:29 -#: templates/web/zurich/admin/report_edit-sdm.html:37 +#: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:38 -#: templates/web/zurich/admin/report_edit.html:28 +#: templates/web/zurich/admin/report_edit.html:27 #: templates/web/zurich/admin/report_edit.html:29 -#: templates/web/zurich/admin/report_edit.html:39 +#: templates/web/zurich/admin/report_edit.html:38 #: templates/web/zurich/admin/report_edit.html:40 -#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit.html:50 #: templates/web/zurich/admin/report_edit.html:52 msgid "originally entered: “%s”" msgstr "Originaltext: “%s”" -#: templates/web/base/admin/report_edit.html:30 +#: templates/web/base/admin/report_edit.html:43 msgid "other areas:" msgstr "" @@ -3981,13 +3964,12 @@ msgstr "" msgid "reopened" msgstr "" -#: templates/web/fiksgatami/header.html:49 -#: templates/web/fixmystreet/header.html:53 +#: templates/web/fixmystreet/header.html:59 #: templates/web/zurich/footer.html:12 msgid "sign out" msgstr "ausloggen" -#: templates/web/base/report/new/fill_in_details_form.html:13 +#: templates/web/base/report/new/fill_in_details_form.html:12 #: templates/web/base/report/new/fill_in_details_form.html:15 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 @@ -3999,15 +3981,15 @@ 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ützt hat" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:373 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:379 msgid "this type of local problem" msgstr "" -#: perllib/Utils.pm:235 +#: perllib/Utils.pm:207 msgid "today" msgstr "heute" -#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:32 #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:54 msgid "used map" @@ -4033,7 +4015,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:254 #, perl-format msgid "%d hour" msgid_plural "%d hours" @@ -4047,7 +4029,7 @@ msgid_plural "%d supporters" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:284 +#: perllib/Utils.pm:256 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -4068,7 +4050,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:250 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -4089,7 +4071,7 @@ 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:280 +#: perllib/Utils.pm:252 #, perl-format msgid "%d day" msgid_plural "%d days" @@ -4102,6 +4084,3 @@ msgid "We do <strong>not</strong> yet have details for the other council that co msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location." msgstr[0] "" msgstr[1] "" - -#~ msgid "Configuration updated - contacts will be generated automatically later" -#~ msgstr "Aktualisiert" diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po index b2df04805..203311153 100644 --- a/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/de_DE.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -4,14 +4,14 @@ # Matthew Somerville <matthew@mysociety.org>, 2011-06-03. # # Translators: -# Ettore Atalan <atalanttore@googlemail.com>, 2014 +# Ettore Atalan <atalanttore@googlemail.com>, 2015 # MatHut <mathias.huter@gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2015-01-20 16:59+0000\n" -"PO-Revision-Date: 2014-11-19 18:50+0000\n" +"POT-Creation-Date: 2015-07-31 14:28+0100\n" +"PO-Revision-Date: 2015-07-10 13:59+0000\n" "Last-Translator: Ettore Atalan <atalanttore@googlemail.com>\n" "Language-Team: German (Germany) (http://www.transifex.com/projects/p/fixmystreet/language/de_DE/)\n" "Language: de_DE\n" @@ -20,17 +20,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:618 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:386 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:392 msgid " and " msgstr "und" -#: templates/web/base/report/new/councils_text_all.html:12 -#: templates/web/base/report/new/councils_text_all.html:19 -#: templates/web/base/report/new/councils_text_all.html:5 -#: templates/web/base/report/new/councils_text_none.html:19 -#: templates/web/base/report/new/councils_text_none.html:21 -#: templates/web/base/report/new/councils_text_some.html:20 +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_none.html:11 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " @@ -66,22 +64,26 @@ msgstr "%d an %d von %d" msgid "%s - Summary reports" msgstr "%s - Zusammenfassungen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:672 msgid "%s ref: %s" -msgstr "" +msgstr "%s ref: %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:265 perllib/FixMyStreet/Cobrand/UK.pm:277 +#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 msgid "%s ward, %s" msgstr "%s Stadtteil, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:554 +#: perllib/FixMyStreet/DB/Result/Problem.pm:559 msgid "%s, reported at %s" msgstr "%s, gemeldet am %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:304 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "%s, within %s ward" msgstr "" +#: perllib/FixMyStreet/Map/OSM.pm:42 +msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" +msgstr "" + #: templates/web/base/email_sent.html:29 msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" msgstr "" @@ -95,7 +97,7 @@ msgid "(Don't worry — we'll hang on to your update while you're checking y msgstr "" #: templates/web/base/admin/report_blocks.html:11 -#: templates/web/base/admin/users.html:29 +#: templates/web/base/admin/users.html:31 msgid "(Email in abuse table)" msgstr "" @@ -123,7 +125,7 @@ msgstr "(geschlossen)" msgid "(fixed)" msgstr "(gelöst)" -#: templates/web/base/index.html:9 +#: templates/web/base/index.html:8 templates/web/base/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äden, Graffitis usw.)" @@ -133,8 +135,8 @@ msgstr "(z.B. illegale Deponien, Strassenschäden, Graffitis usw.)" msgid "(not sent to council)" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:218 -#: templates/web/zurich/report/new/fill_in_details_form.html:94 +#: templates/web/base/report/new/fill_in_details_form.html:199 +#: templates/web/zurich/report/new/fill_in_details_form.html:77 msgid "(optional)" msgstr "(optional)" @@ -147,7 +149,7 @@ msgstr "(öffentlich)" msgid "(sent to both)" msgstr "(gesendet an beide)" -#: templates/web/base/report/new/fill_in_details_form.html:212 +#: templates/web/base/report/new/fill_in_details_form.html:193 msgid "(we never show your email address or phone number)" msgstr "(ihre eMail-Adresse oder Telefonnummer werden nie angezeigt)" @@ -155,14 +157,13 @@ 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:635 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:662 -#: perllib/FixMyStreet/DB/Result/Problem.pm:393 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Wählen Sie eine Kategorie --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 -#: perllib/FixMyStreet/DB/Result/Problem.pm:399 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:630 +#: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "" @@ -174,37 +175,7 @@ msgid "" " Maybe add some <code>MAPIT_TYPES</code> to your config file?" msgstr "" -#: templates/web/base/questionnaire/completed.html:20 -msgid "<p style=\"font-size:150%\">Thank you very much for filling in our questionnaire; glad to hear it’s been fixed.</p>" -msgstr "" - -#: templates/web/fiksgatami/questionnaire/completed-open.html:1 -msgid "" -"<p style=\"font-size:150%\">We’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’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/base/questionnaire/completed-open.html:6 -msgid "" -"<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" -"suggestions: why not try writing to your local representatives or, if\n" -"it’s a problem that could be fixed by local people working together, why\n" -"not <a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n" -"</p>" -msgstr "" - -#: templates/web/base/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/base/around/_report_banner.html:4 +#: templates/web/base/around/_report_banner.html:3 #: templates/web/base/around/_report_banner.html:5 msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>" msgstr "" @@ -231,7 +202,7 @@ msgstr "" msgid "<strong>No</strong>, I do not, let me sign in by email:" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:163 +#: templates/web/base/report/new/fill_in_details_form.html:144 msgid "<strong>No</strong>, let me confirm my report by email:" msgstr "" @@ -239,13 +210,8 @@ msgstr "" msgid "<strong>No</strong>, let me confirm my update by email:" msgstr "" -#: templates/web/base/tokens/confirm_problem.html:19 -#: templates/web/base/tokens/confirm_problem.html:20 -msgid "<strong>We will now send it to the council</strong>." -msgstr "" - #: templates/web/base/auth/general.html:37 -#: templates/web/base/report/new/fill_in_details_form.html:141 +#: templates/web/base/report/new/fill_in_details_form.html:122 #: templates/web/base/report/update-form.html:95 #: templates/web/fixmystreet/auth/general.html:37 #: templates/web/fixmystreet/auth/general.html:39 @@ -259,14 +225,14 @@ msgstr "<strong>Ja</strong>, ich habe ein Passwort" msgid "About us" msgstr "Über uns" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:39 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:52 #: templates/web/base/report/update-form.html:30 #: templates/web/base/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 "" +msgstr "Aktion geplant" #: templates/web/base/admin/body-form.html:3 #: templates/web/base/admin/body-form.html:4 @@ -276,26 +242,26 @@ msgid "" " categories of problem) to each body." msgstr "" -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/body.html:56 msgid "Add a contact using the form below." msgstr "" #: templates/web/base/admin/bodies.html:74 -#: templates/web/base/admin/body-form.html:233 +#: templates/web/base/admin/body-form.html:240 #: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "" -#: templates/web/base/admin/body.html:108 +#: templates/web/base/admin/body.html:116 #: templates/web/zurich/admin/body.html:31 msgid "Add new category" msgstr "Füge neue Kategorie hinzu" -#: templates/web/base/admin/users.html:45 +#: templates/web/base/admin/users.html:47 msgid "Add user" msgstr "Benutzer hinzufügen" -#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:70 +#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:52 msgid "Added %s" msgstr "%s hinzugefügt" @@ -322,9 +288,7 @@ msgstr "" msgid "All Reports" msgstr "Alle Meldungen" -#: templates/web/base/footer.html:11 templates/web/fiksgatami/footer.html:23 -#: templates/web/fiksgatami/nn/footer.html:23 -#: templates/web/fixmystreet/footer.html:26 +#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:26 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:19 @@ -341,19 +305,9 @@ msgstr "Alle Berichte zwischen %s und %s" msgid "All the information you provide here will be sent to" msgstr "" -#: templates/web/base/report/new/councils_text_all.html:12 -#: templates/web/base/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/base/report/new/councils_text_all.html:5 -#: templates/web/base/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/base/report/new/councils_text_all.html:19 -#: templates/web/base/report/new/councils_text_all.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:13 +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_all.html:4 +#: templates/web/base/report/new/fill_in_details_form.html:12 #: templates/web/base/report/new/fill_in_details_form.html:14 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 @@ -370,7 +324,7 @@ msgstr "" msgid "Anonymous" msgstr "Anonym" -#: templates/web/base/admin/report_edit.html:62 +#: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:23 msgid "Anonymous:" msgstr "Anonym:" @@ -379,18 +333,18 @@ msgstr "Anonym:" msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?" msgstr "" -#: templates/web/fiksgatami/front/footer-marketing.html:14 #: templates/web/fixmystreet/front/footer-marketing.html:16 msgid "Are you a developer?" msgstr "Sind Sie ein Entwickler?" #: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 msgid "Area covered" msgstr "Gebiet abgedeckt" #: templates/web/base/admin/bodies.html:15 -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/body.html:60 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "" @@ -408,7 +362,7 @@ msgstr "" msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:163 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:165 #: templates/web/zurich/report/updates.html:11 msgid "Assigned to %s" msgstr "" @@ -421,7 +375,7 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:348 +#: perllib/FixMyStreet/DB/Result/Problem.pm:373 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "Wartet auf Moderation" @@ -434,8 +388,8 @@ msgstr "Zurück" msgid "Ban email address" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:297 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:301 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" msgstr "" @@ -446,6 +400,7 @@ msgstr "" msgid "Body" msgstr "" +#: templates/web/base/admin/report_edit.html:34 #: templates/web/base/admin/user-form.html:32 msgid "Body:" msgstr "" @@ -458,16 +413,15 @@ msgstr "Nach Datum" msgid "Can't see the map? <em>Skip this step</em>" msgstr "" -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:55 #: templates/web/base/report/new/category.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:53 +#: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 #: templates/web/zurich/admin/stats.html:50 -#: templates/web/zurich/report/new/fill_in_details_form.html:50 msgid "Category" msgstr "Kategorie" @@ -475,17 +429,16 @@ msgstr "Kategorie" msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:138 #: templates/web/base/admin/category_edit.html:23 -#: templates/web/base/admin/report_edit.html:61 -#: templates/web/base/report/new/fill_in_details_form.html:68 +#: templates/web/base/admin/report_edit.html:74 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/report_edit-sdm.html:42 #: templates/web/zurich/admin/report_edit.html:140 msgid "Category:" msgstr "Kategorie:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:377 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383 msgid "Category: %s" msgstr "Kategorie: %s" @@ -496,19 +449,19 @@ msgstr "Kategorie: %s" msgid "Change password" msgstr "Passwort ändern" -#: templates/web/base/admin/body.html:152 +#: templates/web/base/admin/body.html:160 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/base/admin/body.html:163 +#: templates/web/base/admin/body.html:171 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/base/admin/body.html:183 +#: templates/web/base/admin/body.html:191 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -519,7 +472,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:122 +#: templates/web/base/admin/body.html:130 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." @@ -535,16 +488,16 @@ msgstr "" msgid "Click map to report a problem" msgstr "Klicken Sie in die Karte um eine Meldung zu erfassen" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:45 -#: templates/web/base/admin/report_edit.html:47 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:58 +#: templates/web/base/admin/report_edit.html:60 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/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:95 #: templates/web/zurich/admin/report_edit.html:97 #: templates/web/zurich/admin/stats.html:31 @@ -552,11 +505,12 @@ msgstr "Klicken Sie in die Karte um eine Meldung zu erfassen" msgid "Closed" msgstr "Geschlossen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:762 +#: perllib/FixMyStreet/DB/Result/Problem.pm:771 msgid "Closed by council" msgstr "" -#: templates/web/base/my/my.html:40 templates/web/fixmystreet/my/my.html:46 +#: templates/web/base/my/my.html:40 +#: templates/web/fixmystreet/my/_problem-list.html:12 msgid "Closed reports" msgstr "Geschlossene Berichte" @@ -564,7 +518,7 @@ msgstr "Geschlossene Berichte" msgid "Closed:" msgstr "Geschlossen:" -#: templates/web/base/around/tabbed_lists.html:11 +#: templates/web/base/around/tabbed_lists.html:10 #: templates/web/base/around/tabbed_lists.html:12 msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "" @@ -579,26 +533,26 @@ msgstr "Koordinaten:" msgid "Cobrand" msgstr "" -#: templates/web/base/admin/report_edit.html:75 +#: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:50 msgid "Cobrand data:" msgstr "" -#: templates/web/base/admin/report_edit.html:74 +#: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:49 msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Konfiguration" -#: templates/web/base/admin/category_edit.html:47 +#: templates/web/base/admin/category_edit.html:52 msgid "Configure Endpoint" msgstr "Endpunkt konfigurieren" -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/body.html:72 msgid "Confirm" msgstr "Bestätigen" @@ -619,10 +573,10 @@ msgstr "" msgid "Confirmation" msgstr "Bestätigung" -#: templates/web/base/admin/body.html:158 -#: templates/web/base/admin/body.html:71 -#: templates/web/base/admin/category_edit.html:32 -#: templates/web/base/admin/category_edit.html:84 +#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/category_edit.html:37 +#: templates/web/base/admin/category_edit.html:89 #: templates/web/zurich/admin/stats.html:40 msgid "Confirmed" msgstr "Bestätigt" @@ -633,7 +587,7 @@ msgstr "Bestätigte Berichte zwischen %s und %s" #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 -#: templates/web/base/admin/report_edit.html:70 +#: templates/web/base/admin/report_edit.html:83 msgid "Confirmed:" msgstr "Bestätigt:" @@ -650,13 +604,12 @@ msgid "Contact Us" msgstr "Kontaktieren Sie uns" #: templates/web/base/contact/index.html:6 -#: templates/web/base/contact/submit.html:3 #: templates/web/fixmystreet/contact/index.html:20 msgid "Contact the team" msgstr "Kontaktieren Sie das Team" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1327 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1355 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1325 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1353 msgid "Could not find user" msgstr "Benutzer konnte nicht gefunden werden" @@ -674,6 +627,10 @@ msgstr "" msgid "Council contacts for %s" msgstr "" +#: perllib/FixMyStreet/DB/Result/Problem.pm:670 +msgid "Council ref: %s" +msgstr "" + #: templates/web/base/admin/stats.html:84 msgid "Council:" msgstr "" @@ -689,7 +646,7 @@ msgstr "Anzahl" msgid "Create a report" msgstr "Erfasse eine Meldung" -#: templates/web/base/admin/body.html:200 +#: templates/web/base/admin/body.html:208 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Kategorie erstellen" @@ -701,7 +658,7 @@ msgid "Created" msgstr "Erstellt" #: templates/web/base/admin/list_updates.html:38 -#: templates/web/base/admin/report_edit.html:69 +#: templates/web/base/admin/report_edit.html:82 #: templates/web/base/admin/update_edit.html:51 #: templates/web/zurich/admin/report_edit-sdm.html:47 #: templates/web/zurich/admin/report_edit.html:61 @@ -718,7 +675,7 @@ msgstr "Aktueller Status" msgid "Currently no bodies have been created." msgstr "" -#: templates/web/base/dashboard/index.html:6 +#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 msgid "Dashboard" msgstr "Übersichtsseite" @@ -728,14 +685,14 @@ msgid "Dealt with by subdivision within 5 working days" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:169 -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:37 -#: templates/web/base/admin/category_edit.html:85 +#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:81 +#: templates/web/base/admin/category_edit.html:42 +#: templates/web/base/admin/category_edit.html:90 msgid "Deleted" msgstr "Gelöscht" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:43 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -755,7 +712,7 @@ msgstr "Beschreibung" msgid "Details:" msgstr "Beschreibung:" -#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/body.html:87 msgid "Devolved" msgstr "" @@ -783,8 +740,8 @@ msgstr "Weiß ich nicht" msgid "Don't like forms?" msgstr "Sie mögen keine Formulare?" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:47 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:60 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:32 #: templates/web/fixmystreet/report/update-form.html:28 @@ -792,7 +749,7 @@ msgstr "Sie mögen keine Formulare?" msgid "Duplicate" msgstr "Duplizieren" -#: templates/web/base/admin/body.html:98 +#: templates/web/base/admin/body.html:106 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" @@ -802,20 +759,20 @@ msgstr "" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 -#: templates/web/base/admin/users.html:31 +#: templates/web/base/admin/users.html:33 #: templates/web/zurich/admin/problem_row.html:42 msgid "Edit" msgstr "Bearbeiten" -#: templates/web/base/admin/body.html:212 +#: templates/web/base/admin/body.html:220 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "" #: templates/web/base/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:2 +#: 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:2 +#: templates/web/zurich/admin/report_edit.html:1 #: templates/web/zurich/admin/report_edit.html:5 msgid "Editing problem %d" msgstr "Problem %d wird bearbeitet" @@ -829,12 +786,12 @@ msgstr "Aktualisierung %d wird bearbeitet" msgid "Editing user %d" msgstr "Benutzer %d wird bearbeitet" -#: templates/web/base/admin/category_edit.html:86 +#: templates/web/base/admin/category_edit.html:91 msgid "Editor" msgstr "Editor" #: templates/web/base/admin/bodies.html:23 -#: templates/web/base/admin/category_edit.html:83 +#: templates/web/base/admin/category_edit.html:88 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 #: templates/web/fixmystreet/auth/general.html:21 @@ -845,15 +802,23 @@ msgstr "Editor" msgid "Email" msgstr "E-Mail" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1303 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1301 msgid "Email added to abuse list" msgstr "" -#: templates/web/base/admin/body.html:147 +#: templates/web/base/admin/body.html:155 msgid "Email address:" msgstr "E-Mail-Adresse:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1300 +#: templates/web/base/tokens/confirm_alert.html:6 +msgid "Email alert created" +msgstr "E-Mail-Benachrichtigung erstellt" + +#: templates/web/base/tokens/confirm_alert.html:10 +msgid "Email alert deleted" +msgstr "E-Mail-Benachrichtigung gelöscht" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1298 msgid "Email already in abuse list" msgstr "" @@ -865,8 +830,8 @@ msgstr "" msgid "Email me updates" msgstr "Schicken sie mir Aktualisierungen" -#: templates/web/base/admin/category_edit.html:26 -#: templates/web/base/admin/report_edit.html:67 +#: templates/web/base/admin/category_edit.html:31 +#: templates/web/base/admin/report_edit.html:80 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 @@ -877,32 +842,32 @@ msgstr "Schicken sie mir Aktualisierungen" msgid "Email:" msgstr "E-Mail:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:322 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 msgid "Email: %s" msgstr "E-Mail: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 msgid "Empty flat or maisonette" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:631 msgid "Empty house or bungalow" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:622 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty office or other commercial" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:623 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Empty pub or bar" msgstr "Leere Kneipe oder Bar" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:624 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty public building - school, hospital, etc." msgstr "" -#: templates/web/base/admin/body-form.html:158 -#: templates/web/base/admin/body-form.html:159 +#: templates/web/base/admin/body-form.html:162 +#: templates/web/base/admin/body-form.html:163 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" @@ -910,8 +875,8 @@ msgid "" " <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>." msgstr "" -#: templates/web/base/admin/body-form.html:215 -#: templates/web/base/admin/body-form.html:216 +#: templates/web/base/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:223 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" @@ -922,11 +887,11 @@ msgstr "" msgid "End Date:" msgstr "Enddatum:" -#: templates/web/base/admin/body-form.html:126 +#: templates/web/base/admin/body-form.html:130 msgid "Endpoint" msgstr "Endpunkt" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:72 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:73 msgid "Enter a Zürich street name" msgstr "" @@ -939,7 +904,9 @@ msgstr "" msgid "Enter a nearby postcode, or street name and area" msgstr "Geben Sie eine Adresse an" +#: templates/web/base/around/postcode_form.html:1 #: templates/web/base/around/postcode_form.html:2 +#: templates/web/fixmystreet/around/postcode_form.html:10 #: templates/web/fixmystreet/around/postcode_form.html:11 msgid "Enter a nearby street name and area" msgstr "Geben Sie eine Adresse an" @@ -949,7 +916,7 @@ msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "" #: templates/web/base/auth/general.html:64 -#: templates/web/base/report/new/fill_in_details_form.html:170 +#: templates/web/base/report/new/fill_in_details_form.html:151 #: templates/web/base/report/update-form.html:124 msgid "Enter a new password:" msgstr "Geben Sie ein neues Passwort ein:" @@ -961,7 +928,7 @@ msgstr "Geben Sie ein neues Passwort ein:" msgid "Enter a password" msgstr "Geben Sie ein Passwort ein" -#: templates/web/base/index-steps.html:33 +#: templates/web/base/index-steps.html:26 msgid "Enter details of the problem" msgstr "Beschreiben sie den Mangel" @@ -984,16 +951,21 @@ msgstr "Beispieladresse" msgid "Examples:" msgstr "Beispiele:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:47 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" -#: templates/web/base/admin/report_edit.html:76 +#: templates/web/base/admin/body-form.html:81 +msgid "External URL" +msgstr "" + +#: templates/web/base/admin/category_edit.html:27 +#: templates/web/base/admin/report_edit.html:92 msgid "Extra data:" msgstr "Zusätzliche Daten:" -#: templates/web/base/contact/submit.html:15 -msgid "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>." +#: templates/web/base/contact/submit.html:13 +msgid "Failed to send message" msgstr "" #: templates/web/zurich/admin/index-dm.html:33 @@ -1004,9 +976,9 @@ msgstr "Berichtliste filtern" #: templates/web/base/questionnaire/index.html:55 #: templates/web/fixmystreet/questionnaire/index.html:74 msgid "First time" -msgstr "" +msgstr "Erstes Mal" -#: templates/web/base/admin/body.html:40 +#: templates/web/base/admin/body.html:48 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" @@ -1037,9 +1009,9 @@ msgid "" msgstr "" #: templates/web/base/admin/index.html:55 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:41 -#: templates/web/base/admin/report_edit.html:42 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:54 +#: templates/web/base/admin/report_edit.html:55 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/update-form.html:30 @@ -1050,17 +1022,18 @@ msgstr "" msgid "Fixed" msgstr "Gelöst" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:43 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:56 msgid "Fixed - Council" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:42 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:55 msgid "Fixed - User" msgstr "" -#: templates/web/base/my/my.html:35 templates/web/fixmystreet/my/my.html:41 +#: templates/web/base/my/my.html:35 +#: templates/web/fixmystreet/my/_problem-list.html:7 msgid "Fixed reports" msgstr "" @@ -1068,7 +1041,7 @@ msgstr "" msgid "Fixed:" msgstr "" -#: templates/web/base/admin/body-form.html:84 +#: templates/web/base/admin/body-form.html:89 #: templates/web/zurich/admin/body-form.html:36 msgid "Flag as deleted" msgstr "" @@ -1077,7 +1050,7 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "" @@ -1086,7 +1059,7 @@ msgstr "" msgid "Flagged reports and users" msgstr "" -#: templates/web/base/admin/user-form.html:45 +#: templates/web/base/admin/user-form.html:46 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page." msgstr "" @@ -1094,8 +1067,8 @@ msgstr "" msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." msgstr "" -#: templates/web/base/admin/report_edit.html:78 -#: templates/web/base/admin/user-form.html:51 +#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/user-form.html:52 msgid "Flagged:" msgstr "" @@ -1104,10 +1077,6 @@ msgstr "" msgid "Follow a ward link to view only reports within that ward." msgstr "" -#: templates/web/base/admin/report_edit.html:30 -msgid "For council(s):" -msgstr "" - #: templates/web/base/admin/body-form.html:65 msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "" @@ -1120,8 +1089,6 @@ msgstr "Passwort vergessen?" #: templates/web/base/faq/faq-en-gb.html:1 #: templates/web/base/static/privacy.html:1 #: templates/web/base/static/privacy.html:2 -#: templates/web/fiksgatami/faq/faq-nb.html:1 -#: templates/web/fiksgatami/nn/faq/faq-nn.html:1 msgid "Frequently Asked Questions" msgstr "Häufig gestellte Fragen" @@ -1132,23 +1099,27 @@ msgstr "GeoRSS auf Google Maps" #: templates/web/fixmystreet/around/_updates.html:3 #: templates/web/fixmystreet/report/display.html:35 msgid "Get updates" -msgstr "" +msgstr "Aktualisierungen holen" -#: templates/web/fixmystreet/reports/_rss.html:4 +#: templates/web/fixmystreet/reports/_rss.html:3 #: templates/web/fixmystreet/reports/_rss.html:9 msgid "Get updates of %s problems" -msgstr "" +msgstr "Aktualisierungen von %s Problemen holen" #: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:4 +#: templates/web/fixmystreet/reports/_rss.html:3 msgid "Get updates of problems in this %s" -msgstr "" +msgstr "Aktualisierungen von Problemen in diesem %s holen" #: templates/web/base/alert/_list.html:83 #: templates/web/fixmystreet/alert/_list.html:82 msgid "Give me an RSS feed" msgstr "" +#: templates/web/base/questionnaire/completed.html:14 +msgid "Glad to hear it’s been fixed!" +msgstr "" + #: templates/web/base/alert/index.html:34 #: templates/web/base/around/postcode_form.html:8 #: templates/web/fixmystreet/around/postcode_form.html:21 @@ -1156,7 +1127,7 @@ msgstr "" msgid "Go" msgstr "Los" -#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:93 msgid "Going to send questionnaire?" msgstr "" @@ -1178,9 +1149,7 @@ msgstr "" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "" -#: templates/web/base/footer.html:15 templates/web/fiksgatami/footer.html:27 -#: templates/web/fiksgatami/nn/footer.html:27 -#: templates/web/fixmystreet/footer.html:30 +#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:30 #: templates/web/zurich/faq/faq-de-ch.html:1 #: templates/web/zurich/footer.html:21 #: templates/web/zurich/nav_over_content.html:8 @@ -1192,18 +1161,17 @@ msgstr "Hilfe" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "" -#: templates/web/fiksgatami/header.html:48 -#: templates/web/fixmystreet/header.html:52 +#: templates/web/fixmystreet/header.html:58 #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "Hallo %s" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:50 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:63 +#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/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:86 #: templates/web/zurich/admin/report_edit.html:90 #: templates/web/zurich/admin/stats.html:32 @@ -1219,7 +1187,7 @@ msgstr "Alte ausblenden" msgid "Hide pins" msgstr "Stecknadeln ausblenden" -#: templates/web/base/admin/category_edit.html:79 +#: templates/web/base/admin/category_edit.html:84 msgid "History" msgstr "History" @@ -1235,19 +1203,25 @@ msgstr "Erfasse eine neue Meldung:" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:740 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" +#: templates/web/base/tokens/confirm_problem.html:23 +#: templates/web/base/tokens/confirm_problem.html:27 +msgid "I just reported a problem on @fixmystreet" 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." +#: templates/web/base/tokens/confirm_update.html:19 +#: templates/web/base/tokens/confirm_update.html:23 +msgid "I just updated a problem on @fixmystreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:260 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +msgid "I'm afraid we couldn't locate your problem in the database.\n" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 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öst werden. Falls sie die URL aus einer Mail kopiert haben, überprüfen sie bitte ob sie die gesamte URL kopiert haben.\n" @@ -1269,7 +1243,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:125 +#: templates/web/base/admin/body.html:133 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." @@ -1287,7 +1261,12 @@ msgstr "" msgid "If you do not, your update will not be posted." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:9 +#: templates/web/base/questionnaire/completed.html:8 +msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." +msgstr "" + +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:8 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 "" @@ -1303,34 +1282,34 @@ msgid "" "your experience of getting the problem fixed?" msgstr "" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/body.html:149 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/base/admin/body-form.html:200 -#: templates/web/base/admin/body-form.html:201 +#: templates/web/base/admin/body-form.html:207 +#: templates/web/base/admin/body-form.html:208 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable <strong>extended Open311 stauses</strong> if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/body-form.html:187 -#: templates/web/base/admin/body-form.html:188 +#: templates/web/base/admin/body-form.html:194 +#: templates/web/base/admin/body-form.html:195 msgid "" "If you've enabled Open311 update-sending above, enable <strong>suppression of alerts</strong> \n" " if you do <strong>not</strong> want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/body-form.html:173 -#: templates/web/base/admin/body-form.html:174 +#: templates/web/base/admin/body-form.html:177 +#: templates/web/base/admin/body-form.html:178 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:127 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 msgid "Illegal ID" msgstr "Unbekannt ID" @@ -1355,17 +1334,21 @@ 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:143 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:38 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:144 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 #: templates/web/fixmystreet/report/banner.html:19 -#: templates/web/zurich/admin/header.html:2 +#: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 #: templates/web/zurich/admin/report_edit.html:99 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "In Bearbeitung" +#: templates/web/base/tokens/confirm_alert.html:11 +msgid "Inbox zero, here we come!" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:160 msgid "Include reporter personal details" msgstr "" @@ -1374,37 +1357,37 @@ msgstr "" msgid "Include unconfirmed reports" msgstr "Unbestätigte Berichte miteinbeziehen" -#: perllib/FixMyStreet/App/Controller/Open311.pm:354 +#: perllib/FixMyStreet/App/Controller/Open311.pm:359 msgid "Incorrect has_photo value \"%s\"" msgstr "" #: templates/web/zurich/admin/list_updates.html:3 msgid "Internal notes" -msgstr "" +msgstr "Interne Hinweise" -#: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:61 msgid "Internal referral" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:339 +#: perllib/FixMyStreet/App/Controller/Open311.pm:344 msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1114 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1112 msgid "Invalid end date" msgstr "Ung&ultiges Enddatum" -#: perllib/FixMyStreet/App/Controller/Open311.pm:432 +#: perllib/FixMyStreet/App/Controller/Open311.pm:437 msgid "Invalid format %s specified." msgstr "Ungültiges Format %s angegeben." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1110 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 msgid "Invalid start date" msgstr "Ung&ultiges Startdatum" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:37 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:50 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 #: templates/web/base/report/update-form.html:30 @@ -1412,14 +1395,18 @@ msgstr "Ung&ultiges Startdatum" #: templates/web/fixmystreet/report/update-form.html:28 #: templates/web/fixmystreet/report/update-form.html:29 msgid "Investigating" -msgstr "" +msgstr "Untersuchen" #: 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/base/tokens/confirm_problem.html:14 +msgid "It’s on its way to the council right now." +msgstr "" + #: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:150 +#: templates/web/base/report/new/fill_in_details_form.html:131 #: templates/web/base/report/update-form.html:104 #: templates/web/fixmystreet/auth/general.html:47 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 @@ -1428,12 +1415,12 @@ msgstr "" msgid "Keep me signed in on this computer" msgstr "" -#: templates/web/base/admin/body.html:62 +#: templates/web/base/admin/body.html:70 #: templates/web/zurich/admin/body.html:16 msgid "Last editor" msgstr "Letzter Bearbeiter" -#: templates/web/base/admin/report_edit.html:72 +#: templates/web/base/admin/report_edit.html:88 msgid "Last update:" msgstr "Letzte Bearbeitung" @@ -1441,43 +1428,38 @@ msgstr "Letzte Bearbeitung" msgid "Last update:" msgstr "Letzte Aktualisierung:" -#: templates/web/base/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:229 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "" -#: templates/web/base/admin/body.html:17 templates/web/base/admin/body.html:19 +#: templates/web/base/admin/body.html:27 msgid "List all reported problems" msgstr "Liste aller Meldungen" -#: templates/web/base/report/new/fill_in_details_form.html:69 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:54 -#: templates/web/zurich/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/category_wrapper.html:4 msgid "Loading..." msgstr "Lade..." #: templates/web/base/alert/choose.html:1 #: templates/web/base/alert/choose.html:3 #: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3 -#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:5 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5 #: templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 -#: templates/web/base/tokens/confirm_alert.html:4 #: templates/web/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "" -#: templates/web/base/alert/list.html:13 templates/web/base/alert/list.html:14 -#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:3 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:12 +#: templates/web/base/alert/list.html:14 templates/web/base/alert/list.html:3 msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "" -#: templates/web/base/footer.html:13 templates/web/fiksgatami/footer.html:25 -#: templates/web/fiksgatami/nn/footer.html:25 -#: templates/web/fixmystreet/footer.html:28 +#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:28 msgid "Local alerts" msgstr "RSS" -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:25 msgid "Locate the problem on a map of the area" msgstr "Identifizieren Sie den Mangel auf der Karte" @@ -1486,15 +1468,25 @@ msgid "MAP" msgstr "KARTE" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" +msgstr "Karte" + +#: templates/web/base/admin/report_edit.html:86 +#, fuzzy +msgid "Mark as sent" +msgstr "als geschlossen markiert" + +#: templates/web/base/admin/user-form.html:44 +msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." msgstr "" -#: perllib/FixMyStreet/Map/OSM.pm:42 -msgid "Map © <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>" +#: templates/web/base/reports/index.html:24 +msgid "Marked fixed/closed in the past eight weeks" msgstr "" -#: templates/web/base/admin/user-form.html:43 -msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." +#: templates/web/base/reports/index.html:25 +msgid "Marked fixed/closed more than eight weeks ago" msgstr "" #: templates/web/fixmystreet/contact/index.html:106 @@ -1505,7 +1497,7 @@ msgstr "Nachricht" msgid "Message:" msgstr "Nachricht:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:440 +#: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" msgstr "Fehlendes jurisdiction_id" @@ -1535,11 +1527,11 @@ msgstr "Meldungen in der Nähe" #: templates/web/fixmystreet/report/update-form.html:138 #: 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:94 +#: templates/web/zurich/report/new/fill_in_details_form.html:77 msgid "Name" msgstr "Name" -#: templates/web/base/admin/report_edit.html:66 +#: templates/web/base/admin/report_edit.html:79 #: templates/web/base/admin/update_edit.html:32 #: templates/web/base/admin/user-form.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:43 @@ -1548,25 +1540,25 @@ msgstr "Name" msgid "Name:" msgstr "Name:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:321 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:313 msgid "Name: %s" msgstr "Name: %s" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:186 -#: perllib/FixMyStreet/Geocode/OSM.pm:164 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 +#: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:137 +#: perllib/FixMyStreet/Cobrand/UK.pm:127 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 +#: perllib/FixMyStreet/Cobrand/Default.pm:442 +#: perllib/FixMyStreet/Cobrand/Default.pm:482 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:277 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1580,11 +1572,11 @@ msgstr "Fast Fertig! Bitte checken Sie ihre Mailbox..." msgid "New <br>problems" msgstr "Neue <br>Probleme" -#: perllib/FixMyStreet/App/Controller/Admin.pm:264 +#: perllib/FixMyStreet/App/Controller/Admin.pm:261 msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:379 msgid "New category contact added" msgstr "" @@ -1599,7 +1591,7 @@ msgstr "" #: db/alert_types_eha.pl:12 msgid "New local reports on reportemptyhomes.com" -msgstr "" +msgstr "Neue lokale Berichte auf reportemptyhomes.com" #: db/alert_types.pl:38 msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" @@ -1615,7 +1607,7 @@ msgstr "Neue Probleme auf FixMyStreet" #: db/alert_types.pl:34 msgid "New problems to {{COUNCIL}} on FixMyStreet" -msgstr "" +msgstr "Neue Probleme an {{COUNCIL}} auf FixMyStreet" #: db/alert_types.pl:42 msgid "New problems within {{NAME}}'s boundary on FixMyStreet" @@ -1639,11 +1631,11 @@ msgstr "" #: db/alert_types_eha.pl:19 msgid "New reports to {{COUNCIL}} on reportemptyhomes.com" -msgstr "" +msgstr "Neue Berichte an {{COUNCIL}} auf reportemptyhomes.com" #: db/alert_types_eha.pl:27 msgid "New reports within {{NAME}}'s boundary on reportemptyhomes.com" -msgstr "" +msgstr "Neue Berichte innerhalb {{NAME}}s Grenze auf reportemptyhomes.com" #: templates/web/base/admin/questionnaire.html:24 msgid "New state" @@ -1657,15 +1649,15 @@ msgstr "Neue Aktualisierung:" msgid "Next" msgstr "Weiter" -#: templates/web/base/admin/body.html:72 templates/web/base/admin/body.html:74 -#: templates/web/base/admin/body.html:78 templates/web/base/admin/body.html:80 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:93 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:44 @@ -1683,7 +1675,7 @@ msgstr "" msgid "No council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:376 +#: perllib/FixMyStreet/DB/Result/Problem.pm:401 msgid "No council selected" msgstr "" @@ -1724,12 +1716,12 @@ msgid "" " your config file is not pointing to a live MapIt service." msgstr "" -#: templates/web/base/report/_support.html:3 +#: templates/web/base/report/_support.html:2 #: templates/web/base/report/_support.html:4 msgid "No supporters" msgstr "Keine Unterstützer" -#: templates/web/base/admin/report_edit.html:30 +#: templates/web/base/admin/report_edit.html:41 #: templates/web/zurich/admin/report_edit-sdm.html:46 #: templates/web/zurich/admin/report_edit.html:60 msgid "None" @@ -1744,8 +1736,8 @@ msgid "" " activity across their body), the ability to hide reports or set special report statuses." msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:46 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -1761,12 +1753,12 @@ msgstr "" msgid "Not reported before" msgstr "Nicht vorher berichtet" -#: templates/web/base/report/_main.html:61 +#: templates/web/base/report/_main.html:62 msgid "Not reported to council" msgstr "" -#: templates/web/base/admin/body.html:63 -#: templates/web/base/admin/category_edit.html:87 +#: templates/web/base/admin/body.html:71 +#: templates/web/base/admin/category_edit.html:92 #: templates/web/zurich/admin/body.html:17 msgid "Note" msgstr "Anmerkung" @@ -1775,8 +1767,8 @@ msgstr "Anmerkung" 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/base/admin/body.html:178 -#: templates/web/base/admin/category_edit.html:44 +#: templates/web/base/admin/body.html:186 +#: templates/web/base/admin/category_edit.html:49 #: templates/web/zurich/admin/body.html:53 msgid "Note:" msgstr "Anmerkung:" @@ -1789,7 +1781,7 @@ msgstr "Anmerkung: <strong>%s</strong>" msgid "Now to submit your report…" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:132 +#: templates/web/base/report/new/fill_in_details_form.html:113 msgid "Now to submit your report… do you have a FixMyStreet password?" msgstr "" @@ -1806,7 +1798,7 @@ msgid "OK" msgstr "OK" #: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:16 +#: templates/web/base/report/update.html:17 msgid "Offensive? Unsuitable? Tell us" msgstr "" @@ -1826,19 +1818,19 @@ msgstr "" msgid "Older <br>problems" msgstr "Ältere <br>Probleme" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:37 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 msgid "One-line summary" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:137 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:36 -#: templates/web/base/admin/report_edit.html:37 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:138 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:49 +#: templates/web/base/admin/report_edit.html:50 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/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:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/report_edit.html:86 #: templates/web/zurich/admin/report_edit.html:88 @@ -1847,10 +1839,19 @@ msgstr "" msgid "Open" msgstr "Öffnen" -#: templates/web/base/my/my.html:30 templates/web/fixmystreet/my/my.html:36 +#: templates/web/base/reports/index.html:22 +msgid "Open for more than four weeks, with an update within the past eight weeks" +msgstr "" + +#: templates/web/base/my/my.html:30 +#: templates/web/fixmystreet/my/_problem-list.html:2 msgid "Open reports" msgstr "Offene Berichte" +#: templates/web/base/reports/index.html:23 +msgid "Open, but not had any update in eight weeks" +msgstr "" + #: templates/web/base/open311/index.html:70 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "" @@ -1873,15 +1874,15 @@ msgstr "" msgid "Or you can subscribe to an alert based upon what ward or council you’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:560 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 -#: perllib/FixMyStreet/DB/Result/Problem.pm:592 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:372 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 +#: perllib/FixMyStreet/DB/Result/Problem.pm:597 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:393 msgid "Other" msgstr "Andere" @@ -1903,8 +1904,8 @@ msgstr "Seite nicht gefunden" msgid "Parent" msgstr "Übergeordnet" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 msgid "Partial" msgstr "Teilweise" @@ -1924,7 +1925,7 @@ msgstr "Passwort:" msgid "Permalink" msgstr "Permalink" -#: templates/web/zurich/report/new/fill_in_details_form.html:100 +#: templates/web/zurich/report/new/fill_in_details_form.html:83 msgid "Phone number" msgstr "Telefonnummer" @@ -1933,27 +1934,27 @@ msgstr "Telefonnummer" msgid "Phone number (optional)" msgstr "Telefonnummer (optional)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:286 -#: templates/web/base/admin/report_edit.html:68 -#: templates/web/base/report/new/fill_in_details_form.html:216 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:291 +#: templates/web/base/admin/report_edit.html:81 +#: templates/web/base/report/new/fill_in_details_form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:46 #: templates/web/zurich/admin/report_edit.html:60 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Telefonnummer:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:72 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 #: 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 +#: templates/web/zurich/report/new/fill_in_details_form.html:51 msgid "Photo" msgstr "Foto" #: templates/web/base/questionnaire/index.html:71 -#: templates/web/base/report/new/fill_in_details_form.html:103 +#: templates/web/base/report/new/fill_in_details_form.html:84 #: templates/web/base/report/update-form.html:62 #: templates/web/fixmystreet/questionnaire/index.html:91 msgid "Photo:" @@ -1967,11 +1968,11 @@ msgstr "Fotos von neuen Meldungen in der Nähe" msgid "Place pin on map" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:38 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/zurich/admin/header.html:2 +#: 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:86 @@ -2005,20 +2006,19 @@ msgstr "Bitte überprüfen sie ihre eMail" msgid "Please check your email address is correct" msgstr "Bitte überprüfen Sie ob Ihre eMail-Adresse korrekt ist" -#: perllib/FixMyStreet/App/Controller/Admin.pm:349 -#: 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:395 +#: perllib/FixMyStreet/App/Controller/Admin.pm:343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:876 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 +#: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" msgstr "Bitte wählen Sie eine Kategorie" -#: perllib/FixMyStreet/DB/Result/Problem.pm:401 +#: perllib/FixMyStreet/DB/Result/Problem.pm:418 msgid "Please choose a property type" msgstr "Bitte wählen Sie eine Eigentumsart" -#: perllib/FixMyStreet/App/Controller/Admin.pm:376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:370 msgid "Please correct the errors below" msgstr "" @@ -2034,8 +2034,8 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:352 -#: perllib/FixMyStreet/DB/Result/Comment.pm:133 +#: perllib/FixMyStreet/App/Controller/Admin.pm:346 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "Bitte geben Sie eine Nachricht ein" @@ -2046,15 +2046,15 @@ msgstr "Bitte geben Sie eine Nachricht ein" msgid "Please enter a password" msgstr "Bitte geben Sie ein Passwort ein" -#: perllib/FixMyStreet/App/Controller/Contact.pm:108 -#: perllib/FixMyStreet/DB/Result/Problem.pm:370 +#: perllib/FixMyStreet/App/Controller/Contact.pm:113 +#: perllib/FixMyStreet/DB/Result/Problem.pm:395 #: templates/web/base/js/translation_strings.html:3 msgid "Please enter a subject" msgstr "Bitte geben Sie einen Betreff ein" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1050 -#: perllib/FixMyStreet/App/Controller/Admin.pm:351 -#: perllib/FixMyStreet/App/Controller/Admin.pm:997 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin.pm:995 #: perllib/FixMyStreet/DB/Result/User.pm:127 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 @@ -2062,16 +2062,16 @@ msgid "Please enter a valid email" msgstr "Bitte geben Sie eine gültige eMail-Adresse an" #: perllib/FixMyStreet/App/Controller/Alert.pm:346 -#: perllib/FixMyStreet/App/Controller/Contact.pm:118 +#: perllib/FixMyStreet/App/Controller/Contact.pm:123 msgid "Please enter a valid email address" msgstr "Bitte geben Sie eine gültige eMail-Adresse an" -#: perllib/FixMyStreet/DB/Result/Problem.pm:373 +#: perllib/FixMyStreet/DB/Result/Problem.pm:398 #: templates/web/base/js/translation_strings.html:4 msgid "Please enter some details" msgstr "Bitte geben Sie einiges Details an" -#: perllib/FixMyStreet/App/Controller/Contact.pm:107 +#: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/User.pm:124 #: templates/web/base/auth/general.html:13 #: templates/web/base/auth/general.html:8 @@ -2085,7 +2085,7 @@ msgid "Please enter your email" msgstr "Bitte geben Sie Ihre eMail-Adresse an" #: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:75 msgid "Please enter your email address" msgstr "Bitte geben Sie eine Ihre eMail-Adresse an" @@ -2093,14 +2093,14 @@ msgstr "Bitte geben Sie eine Ihre eMail-Adresse an" msgid "Please enter your first name" msgstr "Bitte geben Sie Ihren Vornamen ein" -#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: perllib/FixMyStreet/Cobrand/UK.pm:318 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:106 -#: perllib/FixMyStreet/DB/Result/Comment.pm:130 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Contact.pm:111 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 +#: perllib/FixMyStreet/DB/Result/Problem.pm:406 #: perllib/FixMyStreet/DB/Result/User.pm:120 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" @@ -2123,7 +2123,7 @@ msgstr "Bitte geben Sie Ihren Titel ein" msgid "Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a href=\"/\">front page</a>." msgstr "" -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:8 msgid "Please fill in details of the problem below." msgstr "" @@ -2138,7 +2138,7 @@ msgstr "" msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:251 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" @@ -2161,16 +2161,16 @@ msgstr "" msgid "Please note:" msgstr "Hinweise:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:246 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:254 msgid "Please provide some explanation as to why you're reopening this report" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:261 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 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:247 msgid "Please say whether you've ever reported a problem to your council before" msgstr "" @@ -2182,7 +2182,7 @@ msgstr "" msgid "Please select the type of alert you want" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please state whether or not the problem has been fixed" msgstr "" @@ -2190,21 +2190,19 @@ msgstr "" msgid "Please take a look at the updates that have been left." msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:176 +#: perllib/FixMyStreet/App/Controller/Photo.pm:177 +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 +#: perllib/FixMyStreet/App/Controller/Photo.pm:189 msgid "Please upload a JPEG image only" msgstr "Bitte nur ein JPEG-BIld hochladen" -#: perllib/FixMyStreet/App/Controller/Photo.pm:183 -msgid "Please upload a JPEG image only\n" -msgstr "Bitte nur ein JPEG-BIld hochladen\n" - -#: perllib/FixMyStreet/App/Controller/Contact.pm:109 +#: perllib/FixMyStreet/App/Controller/Contact.pm:114 msgid "Please write a message" msgstr "Bitte schreiben Sie eine Nachricht" #: templates/web/fixmystreet/report/update-form.html:23 msgid "Please write your update here" -msgstr "" +msgstr "Bitte schreiben Sie hier Ihre Aktualisierung" #: templates/web/base/contact/index.html:100 #: templates/web/base/report/update-form.html:109 @@ -2237,14 +2235,14 @@ msgstr "Vorherige" msgid "Privacy" msgstr "Datenschutz" -#: templates/web/base/admin/body.html:194 -#: templates/web/base/admin/body.html:77 -#: templates/web/base/admin/category_edit.html:40 -#: templates/web/base/admin/report_edit.html:79 +#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:85 +#: templates/web/base/admin/category_edit.html:45 +#: templates/web/base/admin/report_edit.html:95 msgid "Private" msgstr "Privat" -#: templates/web/base/maps/openlayers.html:86 +#: templates/web/base/maps/openlayers.html:89 msgid "Problem" msgstr "Meldung" @@ -2265,7 +2263,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:966 msgid "Problem marked as open." msgstr "Problem als offen markiert." @@ -2300,34 +2298,33 @@ msgstr "Meldungen, welche kürzlich gelöst wurden" msgid "Problems within %.1fkm of this location" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:629 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:114 +#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:151 -#: perllib/FixMyStreet/Cobrand/UK.pm:217 +#: perllib/FixMyStreet/Cobrand/UK.pm:207 msgid "Problems within %s" msgstr "Meldungen innerhalb %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:122 -#: perllib/FixMyStreet/Cobrand/UK.pm:231 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "Problems within %s ward" msgstr "" #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:24 msgid "Problems within %s, FixMyStreet" -msgstr "" +msgstr "Probleme innerhalb %s, FixMyStreet" #: templates/web/base/alert/_list.html:40 #: templates/web/fixmystreet/alert/_list.html:42 msgid "Problems within the boundary of:" -msgstr "" +msgstr "Probleme innerhalb der Grenze von:" #: db/alert_types_eha.pl:8 msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "" -#: templates/web/base/admin/report_edit.html:32 +#: templates/web/base/admin/report_edit.html:45 msgid "Property address:" msgstr "Immobilien-Adresse:" @@ -2344,7 +2341,7 @@ 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/base/report/new/fill_in_details_form.html:174 +#: templates/web/base/report/new/fill_in_details_form.html:155 #: templates/web/base/report/update-form.html:128 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 #: templates/web/fixmystreet/report/update-form.html:119 @@ -2365,7 +2362,7 @@ msgstr "Foto veröffentlichen" msgid "Publish the response" msgstr "" -#: templates/web/base/questionnaire/completed.html:2 +#: templates/web/base/questionnaire/completed.html:1 #: templates/web/base/questionnaire/index.html:0 #: templates/web/base/questionnaire/index.html:14 #: templates/web/base/questionnaire/index.html:4 @@ -2384,11 +2381,12 @@ msgstr "" msgid "Questionnaire %d sent for problem %d" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 msgid "Questionnaire filled in by problem reporter" msgstr "" #: templates/web/base/alert/_list.html:21 +#: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display.html:50 #: templates/web/base/reports/_rss.html:1 @@ -2398,11 +2396,11 @@ msgstr "" msgid "RSS feed" msgstr "RSS-Feed" -#: perllib/FixMyStreet/Cobrand/UK.pm:260 perllib/FixMyStreet/Cobrand/UK.pm:272 +#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 msgid "RSS feed for %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "RSS feed for %s ward, %s" msgstr "" @@ -2410,15 +2408,11 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:167 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:175 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:185 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:193 -#: perllib/FixMyStreet/Cobrand/UK.pm:286 perllib/FixMyStreet/Cobrand/UK.pm:298 +#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 msgid "RSS feed of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 msgid "RSS feed of %s, within %s ward" msgstr "" @@ -2431,20 +2425,19 @@ msgstr "" msgid "RSS feed of problems in this %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:630 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:115 +#: perllib/FixMyStreet/Cobrand/Default.pm:651 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:150 -#: perllib/FixMyStreet/Cobrand/UK.pm:224 +#: perllib/FixMyStreet/Cobrand/UK.pm:214 msgid "RSS feed of problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 -#: perllib/FixMyStreet/Cobrand/UK.pm:230 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s ward" msgstr "" -#: templates/web/base/around/display_location.html:3 +#: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:4 msgid "RSS feed of recent local problems" msgstr "" @@ -2484,15 +2477,18 @@ msgstr "Fix My Zürich wird primär dafür verwendet, physische M&au msgid "Remove flag" msgstr "" -#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/report_edit.html:110 #: templates/web/base/admin/update_edit.html:62 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Foto entfernen (kann nicht rückgängig gemacht werden!)" -#: templates/web/base/footer.html:7 templates/web/fiksgatami/footer.html:19 -#: templates/web/fiksgatami/nn/footer.html:19 -#: templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 +msgid "Report" +msgstr "" + +#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 #: templates/web/zurich/footer.html:17 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2502,11 +2498,6 @@ msgstr "Eine Meldung erfassen" msgid "Report abuse" msgstr "Missbrauch melden" -#: templates/web/base/report_created.html:1 -#: templates/web/base/report_created.html:3 -msgid "Report created" -msgstr "Bericht erstellt" - #: perllib/FixMyStreet/App/Controller/Rss.pm:295 msgid "Report on %s" msgstr "Bericht auf %s" @@ -2530,7 +2521,7 @@ msgstr "" msgid "Reported %s, to %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:580 #: templates/web/base/contact/index.html:50 #: templates/web/fixmystreet/contact/index.html:65 msgid "Reported anonymously at %s" @@ -2542,7 +2533,7 @@ msgstr "Anonym gemeldet um" msgid "Reported before" msgstr "Vorher berichtet" -#: perllib/FixMyStreet/DB/Result/Problem.pm:598 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 #: templates/web/base/contact/index.html:52 #: templates/web/fixmystreet/contact/index.html:67 msgid "Reported by %s at %s" @@ -2552,31 +2543,35 @@ msgstr "Gemeldet von %s um %s" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:571 +#: perllib/FixMyStreet/DB/Result/Problem.pm:576 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:598 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:567 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 msgid "Reported via %s anonymously at %s" msgstr "Anonym gemeldet von %s um %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:589 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 msgid "Reported via %s by %s at %s" msgstr "Gemeldet von %s um %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:563 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Anonym gemeldet von %s um %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:583 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 msgid "Reported via %s in the %s category by %s at %s" msgstr "Gemeldet von %s um %s" -#: templates/web/base/around/around_index.html:2 +#: templates/web/base/reports/index.html:21 +msgid "Reported within the last four weeks" +msgstr "" + +#: templates/web/base/around/around_index.html:1 #: templates/web/base/around/around_index.html:3 #: templates/web/base/js/translation_strings.html:41 #: templates/web/base/report/new/fill_in_details.html:0 @@ -2586,20 +2581,19 @@ msgstr "Gemeldet von %s um %s" msgid "Reporting a problem" msgstr "Verfassen Sie eine Meldung" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:294 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "Berichte" -#: perllib/FixMyStreet/DB/Result/Problem.pm:409 -#: perllib/FixMyStreet/DB/Result/Problem.pm:413 +#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 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 "" +msgstr "Berichte warten auf Moderation" #: templates/web/base/around/tabbed_lists.html:3 msgid "Reports on and around the map" @@ -2609,7 +2603,7 @@ msgstr "" msgid "Reports published" msgstr "Berichte veröffentlicht" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:85 msgid "Resend report" msgstr "Bericht erneut senden" @@ -2617,36 +2611,35 @@ msgstr "Bericht erneut senden" msgid "Right place?" msgstr "Richtiger Ort?" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:193 -#: perllib/FixMyStreet/Geocode/OSM.pm:171 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:167 +#: perllib/FixMyStreet/Geocode/OSM.pm:152 msgid "Road operator for this named road (derived from road reference number and type): %s" msgstr "" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:190 -#: perllib/FixMyStreet/Geocode/OSM.pm:168 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:164 +#: perllib/FixMyStreet/Geocode/OSM.pm:149 msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1394 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 -#: templates/web/base/admin/report_edit.html:90 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1403 +#: templates/web/base/admin/report_edit.html:106 #: templates/web/zurich/admin/report_edit.html:73 msgid "Rotate Left" msgstr "Nach links drehen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1394 -#: templates/web/base/admin/report_edit.html:91 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: templates/web/base/admin/report_edit.html:107 #: templates/web/zurich/admin/report_edit.html:74 msgid "Rotate Right" msgstr "Nach rechts drehen" #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" -msgstr "" +msgstr "Satellit" -#: templates/web/base/admin/body.html:200 -#: templates/web/base/admin/category_edit.html:76 +#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/category_edit.html:81 #: templates/web/zurich/admin/body.html:59 msgid "Save changes" msgstr "Änderungen speichern" @@ -2674,7 +2667,7 @@ msgstr "Suchen:" msgid "Searching found no reports." msgstr "" -#: templates/web/base/admin/users.html:39 +#: templates/web/base/admin/users.html:41 msgid "Searching found no users." msgstr "" @@ -2697,15 +2690,15 @@ msgstr "Wählen Sie ein Gebiet" 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:680 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "Sent to %s %s later" msgstr "" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:84 msgid "Sent:" msgstr "Gesendet:" -#: templates/web/base/admin/report_edit.html:73 +#: templates/web/base/admin/report_edit.html:89 #: templates/web/zurich/admin/stats.html:45 msgid "Service:" msgstr "Dienst:" @@ -2714,7 +2707,7 @@ msgstr "Dienst:" msgid "Share" msgstr "Teilen" -#: templates/web/base/report/new/fill_in_details_form.html:211 +#: templates/web/base/report/new/fill_in_details_form.html:192 #: templates/web/base/report/update-form.html:157 #: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 @@ -2742,7 +2735,7 @@ msgstr "Anmelden" #: templates/web/base/auth/general.html:74 msgid "Sign in by email" -msgstr "" +msgstr "Per E-Mail anmelden" #: templates/web/base/auth/general.html:1 #: templates/web/fixmystreet/auth/general.html:1 @@ -2759,12 +2752,12 @@ msgstr "Abmelden" msgid "Signed in as %s" msgstr "Angemeldet als %s" -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 msgid "Some categories may require additional information." msgstr "" -#: templates/web/base/admin/body-form.html:145 -#: templates/web/base/admin/body-form.html:146 +#: templates/web/base/admin/body-form.html:149 +#: templates/web/base/admin/body-form.html:150 msgid "" "Some endpoints require an <strong>API key</strong> to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -2775,11 +2768,11 @@ msgid "Some photos of recent reports" msgstr "" #: perllib/FixMyStreet/App/View/Email.pm:32 -#: perllib/FixMyStreet/App/View/Web.pm:44 +#: perllib/FixMyStreet/App/View/Web.pm:43 msgid "Some text to localize" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:88 +#: perllib/FixMyStreet/Cobrand/UK.pm:78 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -2787,17 +2780,16 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:215 -#: perllib/FixMyStreet/Geocode.pm:26 perllib/FixMyStreet/Geocode/Bing.pm:56 -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:73 -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:93 -#: perllib/FixMyStreet/Geocode/Google.pm:72 -#: perllib/FixMyStreet/Geocode/OSM.pm:64 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:214 +#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 +#: perllib/FixMyStreet/Geocode/Google.pm:47 +#: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "" -#: perllib/FixMyStreet/Geocode/Bing.pm:51 -#: perllib/FixMyStreet/Geocode/Google.pm:67 +#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: perllib/FixMyStreet/Geocode/Google.pm:44 #: perllib/FixMyStreet/Geocode/Zurich.pm:87 msgid "Sorry, we could not parse that location. Please try again." msgstr "" @@ -2806,7 +2798,7 @@ msgstr "" msgid "Start Date:" msgstr "Startdatum:" -#: templates/web/base/admin/body.html:61 +#: templates/web/base/admin/body.html:69 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 @@ -2814,7 +2806,7 @@ msgstr "Startdatum:" msgid "State" msgstr "Status" -#: templates/web/base/admin/report_edit.html:34 +#: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 #: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:53 @@ -2823,8 +2815,8 @@ msgstr "Status" msgid "State:" msgstr "Status:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1200 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:304 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:308 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" @@ -2840,7 +2832,7 @@ msgstr "Status" msgid "Still open, via questionnaire, %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:381 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 msgid "Subcategory: %s" msgstr "Unterkategorie: %s" @@ -2860,19 +2852,19 @@ msgid "Subject:" msgstr "Titel:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:115 -#: templates/web/base/report/new/fill_in_details_form.html:155 -#: templates/web/base/report/new/fill_in_details_form.html:177 +#: templates/web/base/report/new/fill_in_details_form.html:136 +#: templates/web/base/report/new/fill_in_details_form.html:158 +#: templates/web/base/report/new/fill_in_details_form.html:96 #: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 -#: templates/web/zurich/report/new/fill_in_details_form.html:108 +#: templates/web/zurich/report/new/fill_in_details_form.html:91 msgid "Submit" msgstr "Abschicken" -#: templates/web/base/admin/report_edit.html:97 +#: templates/web/base/admin/report_edit.html:113 #: templates/web/base/admin/update_edit.html:65 -#: templates/web/base/admin/user-form.html:55 +#: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:64 #: templates/web/zurich/admin/report_edit.html:221 #: templates/web/zurich/admin/update_edit.html:38 @@ -2884,8 +2876,8 @@ msgstr "Änderungen senden" msgid "Submit questionnaire" msgstr "Fragebogen absenden" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:133 -#: templates/web/zurich/admin/header.html:2 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:134 +#: 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 @@ -2909,8 +2901,8 @@ msgstr "Abonnieren" msgid "Subscribe me to an email alert" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1191 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:293 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 #: templates/web/zurich/admin/index-dm.html:1 @@ -2924,9 +2916,9 @@ msgstr "Zusammenfassung" #: templates/web/zurich/reports/index.html:0 #: templates/web/zurich/reports/index.html:4 msgid "Summary reports" -msgstr "" +msgstr "Zusammenfassungsberichte" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 msgid "Survey" msgstr "Umfrage" @@ -2940,7 +2932,7 @@ msgstr "Umfrageergebnisse" msgid "Text" msgstr "Text" -#: templates/web/base/admin/body.html:21 +#: templates/web/base/admin/body.html:28 msgid "Text only version" msgstr "" @@ -2949,82 +2941,88 @@ msgstr "" msgid "Text:" msgstr "Text:" -#: templates/web/base/tokens/confirm_update.html:9 -msgid "Thank you — you can <a href=\"%s\">view your updated problem</a> on the site." -msgstr "" - -#: templates/web/base/tokens/confirm_problem.html:18 -msgid "Thank you for reporting this issue" +#: templates/web/base/tokens/confirm_problem.html:12 +msgid "Thank you for reporting this issue!" msgstr "" #: templates/web/base/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/fixmystreet/around/around_index.html:28 -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 :" +#: templates/web/base/tokens/confirm_update.html:15 +msgid "Thank you for updating this issue!" msgstr "" -#: templates/web/base/contact/submit.html:8 -msgid "Thanks for your feedback. We'll get back to you as soon as we can!" +#: templates/web/base/contact/submit.html:6 +#: templates/web/base/questionnaire/completed.html:5 +msgid "Thank you for your feedback" +msgstr "Vielen Dank für Ihre Rückmeldung" + +#: templates/web/fixmystreet/around/around_index.html:28 +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 :" msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:9 msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:190 +#: perllib/FixMyStreet/App/Controller/Photo.pm:195 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Council.pm:100 +#: perllib/FixMyStreet/App/Controller/Council.pm:97 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 +#: perllib/FixMyStreet/App/Controller/Location.pm:126 msgid "That location does not appear to be in the UK; please try again." msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:81 +#: perllib/FixMyStreet/Cobrand/UK.pm:71 msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:713 +#: perllib/FixMyStreet/App/Controller/Admin.pm:712 +#, fuzzy +msgid "That problem has been marked as sent." +msgstr "Das Problem wird jetzt erneut gesendet." + +#: perllib/FixMyStreet/App/Controller/Admin.pm:704 msgid "That problem will now be resent." -msgstr "" +msgstr "Das Problem wird jetzt erneut gesendet." #: perllib/FixMyStreet/App/Controller/Report.pm:118 msgid "That report cannot be viewed on %s." -msgstr "" +msgstr "Dieser Bericht kann nicht auf %s angeschaut werden." #: perllib/FixMyStreet/App/Controller/Report.pm:111 msgid "That report has been removed from FixMyStreet." msgstr "Diese Meldung wurde von Fix My Zürich entfernt." -#: templates/web/base/admin/body.html:136 +#: templates/web/base/admin/body.html:144 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/base/admin/body-form.html:119 -#: templates/web/base/admin/body-form.html:120 +#: templates/web/base/admin/body-form.html:123 +#: templates/web/base/admin/body-form.html:124 msgid "" "The <strong>endpoint</strong> is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." msgstr "" -#: templates/web/base/admin/body-form.html:132 -#: templates/web/base/admin/body-form.html:133 +#: templates/web/base/admin/body-form.html:136 +#: templates/web/base/admin/body-form.html:137 msgid "" "The <strong>jurisdiction</strong> is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" -#: templates/web/base/admin/body-form.html:90 -#: templates/web/base/admin/body-form.html:91 +#: templates/web/base/admin/body-form.html:94 +#: templates/web/base/admin/body-form.html:95 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>." @@ -3045,7 +3043,7 @@ msgstr "" msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." msgstr "" -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:3 msgid "The council won’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 "" @@ -3072,8 +3070,8 @@ msgstr "Der Fehler war: %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:185 -#: perllib/FixMyStreet/Geocode/OSM.pm:163 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:159 +#: perllib/FixMyStreet/Geocode/OSM.pm:144 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap." msgstr "" @@ -3131,7 +3129,7 @@ msgstr "" msgid "The passwords do not match" msgstr "Die Passwörter stimmen nicht überein" -#: templates/web/base/errors/page_error_404_not_found.html:11 +#: templates/web/base/errors/page_error_404_not_found.html:10 #: templates/web/base/errors/page_error_404_not_found.html:12 msgid "The requested URL '%s' was not found on this server" msgstr "" @@ -3148,7 +3146,7 @@ msgstr "" msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:295 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:300 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" @@ -3159,16 +3157,20 @@ msgid "" " Names are not necessarily unique." msgstr "" +#: templates/web/base/reports/_problem-list.html:15 +msgid "There are no reports to show." +msgstr "" + #: perllib/FixMyStreet/App/Controller/Reports.pm:75 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:131 +#: perllib/FixMyStreet/App/Controller/Contact.pm:136 #: 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/New.pm:762 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 #: templates/web/base/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:25 @@ -3182,18 +3184,18 @@ msgstr "" #: perllib/FixMyStreet/App/Controller/Report/Update.pm:272 msgid "There was a problem with your update. Please try again." -msgstr "" +msgstr "Es gab ein Problem mit Ihrer Aktualisierung. Bitte versuchen Sie es erneut." -#: perllib/FixMyStreet/App/Controller/Contact.pm:135 +#: perllib/FixMyStreet/App/Controller/Contact.pm:140 msgid "There were problems with your report. Please see below." -msgstr "" +msgstr "Es gab ein Problem mit Ihrem Bericht. Bitte versuchen Sie es erneut." #: perllib/FixMyStreet/App/Controller/Report/Update.pm:300 msgid "There were problems with your update. Please see below." -msgstr "" +msgstr "Es gab Probleme mit Ihrer Aktualisierung. Bitte versuchen Sie es erneut." -#: templates/web/base/admin/body-form.html:108 -#: templates/web/base/admin/body-form.html:109 +#: templates/web/base/admin/body-form.html:112 +#: templates/web/base/admin/body-form.html:113 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" @@ -3206,14 +3208,14 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" -#: templates/web/base/admin/body.html:36 +#: templates/web/base/admin/body.html:44 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported <em>at any location</em>.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" " Currently, users <strong>cannot report problems to this body</strong>." msgstr "" -#: templates/web/base/admin/body.html:46 +#: templates/web/base/admin/body.html:54 msgid "This body has no contacts. This means that currently problems reported to this body <strong>will not be sent</strong>." msgstr "" @@ -3224,18 +3226,18 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:388 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:394 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:391 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 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:136 -#: perllib/FixMyStreet/Cobrand/UK.pm:53 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:902 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:972 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/Cobrand/UK.pm:43 msgid "This information is required" msgstr "Diese Information wird benötigt" @@ -3274,33 +3276,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:130 #: perllib/FixMyStreet/Cobrand/Zurich.pm:131 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:132 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." -msgstr "" +msgstr "Dieser Bericht wartet auf Moderation." #: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:87 msgid "This report is currently marked as closed." -msgstr "" +msgstr "Dieser Bericht ist aktuell als geschlossen markiert." #: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:85 msgid "This report is currently marked as fixed." -msgstr "" +msgstr "Dieser Bericht ist aktuell als behoben markiert." #: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:89 msgid "This report is currently marked as open." -msgstr "" +msgstr "Dieser Bericht ist aktuell als offen markiert." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:319 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:311 msgid "This report was submitted anonymously" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:293 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Zeitleiste" @@ -3318,7 +3320,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:294 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:299 msgid "To view a map of the precise location of this issue" msgstr "" @@ -3334,17 +3336,21 @@ msgstr "Total" msgid "Try again" msgstr "Erneut versuchen" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:46 +#: templates/web/base/contact/submit.html:14 +msgid "Try emailing us directly:" +msgstr "" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 #: templates/web/base/report/update-form.html:30 #: templates/web/base/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 "" +msgstr "Kann nicht behoben werden" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/admin/update_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:45 #: templates/web/zurich/admin/report_edit.html:58 @@ -3358,7 +3364,7 @@ msgstr "Unbekannt" #: perllib/FixMyStreet/App/Controller/Rss.pm:173 msgid "Unknown alert type" -msgstr "" +msgstr "Unbekannter Benachrichtigungstyp" #: templates/web/base/js/translation_strings.html:39 msgid "Unknown error" @@ -3386,7 +3392,7 @@ msgstr "" msgid "Update below added by %s at %s" msgstr "" -#: templates/web/base/admin/body-form.html:233 +#: templates/web/base/admin/body-form.html:240 #: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "" @@ -3412,7 +3418,7 @@ msgstr "" msgid "Update reopened problem" msgstr "" -#: templates/web/base/admin/body.html:93 +#: templates/web/base/admin/body.html:101 msgid "Update statuses" msgstr "" @@ -3426,12 +3432,12 @@ msgstr "Aktualisierung:" msgid "Updated" msgstr "Aktualisiert" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1016 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1060 -#: perllib/FixMyStreet/App/Controller/Admin.pm:810 -#: perllib/FixMyStreet/App/Controller/Admin.pm:958 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:549 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:618 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1014 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:808 +#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:556 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:625 msgid "Updated!" msgstr "Aktualisiert!" @@ -3443,13 +3449,13 @@ msgstr "Aktualisiert!" msgid "Updates" msgstr "Aktualisierungen" -#: perllib/FixMyStreet/DB/Result/Comment.pm:139 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 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 "" +msgstr "Aktualisierungen auf {{title}}" #: templates/web/base/report/display.html:0 #: templates/web/base/report/display.html:5 @@ -3458,7 +3464,7 @@ msgstr "" msgid "Updates to this problem, FixMyStreet" msgstr "" -#: templates/web/base/admin/body.html:174 +#: templates/web/base/admin/body.html:182 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 "" @@ -3467,11 +3473,11 @@ msgstr "" msgid "User" msgstr "Benutzer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1357 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1331 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1329 msgid "User flagged" msgstr "" @@ -3479,16 +3485,16 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:303 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:307 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Benutzer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:380 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:430 +#: perllib/FixMyStreet/App/Controller/Admin.pm:374 +#: perllib/FixMyStreet/App/Controller/Admin.pm:404 +#: perllib/FixMyStreet/App/Controller/Admin.pm:421 msgid "Values updated" msgstr "Werte aktualisiert" @@ -3542,11 +3548,11 @@ msgstr "Ihre eMail wird nie angezeigt" msgid "We never show your email address or phone number." msgstr "Ihre eMail-Adresse oder Telefonnummer werden nie angezeigt" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:403 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/base/index-steps.html:38 +#: templates/web/base/index-steps.html:31 msgid "We send it to the council on your behalf" msgstr "" @@ -3555,15 +3561,23 @@ msgstr "" msgid "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>" msgstr "" +#: templates/web/base/questionnaire/completed-open.html:2 +msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" +msgstr "" + #: templates/web/base/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/fixmystreet/report/new/fill_in_details_form.html:41 +#: templates/web/base/contact/submit.html:7 +msgid "We’ll get back to you as soon as we can." +msgstr "" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 msgid "What’s the issue, and where is it?" msgstr "" -#: templates/web/base/admin/category_edit.html:82 +#: templates/web/base/admin/category_edit.html:87 #: templates/web/zurich/admin/body.html:18 msgid "When edited" msgstr "Wann editiert" @@ -3572,15 +3586,18 @@ msgstr "Wann editiert" msgid "When sent" msgstr "Wann gesendet" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Whole block of empty flats" msgstr "" +#: templates/web/base/tokens/confirm_alert.html:7 +msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." +msgstr "" + #: templates/web/base/open311/index.html:92 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/fiksgatami/front/footer-marketing.html:15 #: templates/web/fixmystreet/front/footer-marketing.html:17 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" @@ -3604,18 +3621,18 @@ msgid "Year" msgstr "Jahr" #: templates/web/base/admin/bodies.html:66 -#: templates/web/base/admin/body.html:72 templates/web/base/admin/body.html:74 -#: templates/web/base/admin/body.html:78 templates/web/base/admin/body.html:80 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:76 +#: templates/web/base/admin/report_edit.html:93 #: templates/web/base/admin/update_edit.html:24 -#: templates/web/base/admin/users.html:29 +#: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:42 #: templates/web/base/questionnaire/index.html:81 @@ -3644,14 +3661,12 @@ msgstr "" msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/tokens/confirm_problem.html:25 -#: templates/web/base/tokens/confirm_problem.html:26 -#: templates/web/zurich/tokens/confirm_problem.html:6 +#: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:8 msgid "You can <a href=\"%s%s\">view the problem on this site</a>." msgstr "" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:48 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -3666,14 +3681,14 @@ msgid "" " reports in the past." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:19 -#: templates/web/base/report/new/councils_text_none.html:20 -#: templates/web/base/report/new/councils_text_some.html:20 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." msgstr "" -#: templates/web/base/admin/body-form.html:81 +#: templates/web/base/admin/body-form.html:85 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" @@ -3686,10 +3701,10 @@ msgid "You have already answered this questionnaire. If you have a question, ple msgstr "" #: templates/web/base/questionnaire/index.html:68 -#: templates/web/base/report/new/fill_in_details_form.html:94 +#: templates/web/base/report/new/fill_in_details_form.html:75 #: templates/web/fixmystreet/questionnaire/index.html:88 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:79 -#: templates/web/zurich/report/new/fill_in_details_form.html:75 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 +#: templates/web/zurich/report/new/fill_in_details_form.html:58 msgid "You have already attached a photo to this report, attaching another one will replace it." msgstr "" @@ -3698,7 +3713,7 @@ msgstr "" msgid "You have already attached a photo to this update, attaching another one will replace it." msgstr "" -#: templates/web/base/auth/sign_out.html:3 +#: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" msgstr "Sie wurden abgemeldet" @@ -3707,26 +3722,11 @@ msgstr "Sie wurden abgemeldet" msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. " msgstr "Der gr¨ne Pin auf der Karte repräsentiert ihre Meldung. Falls dieser Ort nicht der Richtige ist, klicken Sie einfach nochmals am richtigen Ort auf die Karte." -#: templates/web/base/tokens/confirm_alert.html:8 -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 E-Mail-Adresse erfolgreich bestätigt." -#: templates/web/base/tokens/confirm_update.html:14 -msgid "You have successfully confirmed your update and you can now <a href=\"%s\">view it on the site</a>." -msgstr "" - -#: templates/web/base/tokens/confirm_alert.html:12 -msgid "You have successfully created your alert." -msgstr "" - -#: templates/web/base/tokens/confirm_alert.html:10 -msgid "You have successfully deleted your alert." -msgstr "" - #: templates/web/base/report/display.html:20 #: templates/web/base/report/new/fill_in_details.html:37 #: templates/web/fixmystreet/report/display.html:17 @@ -3752,7 +3752,7 @@ msgid "" " contacts (such as an email address) to which reports are sent." msgstr "" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:85 msgid "You really want to resend?" msgstr "Möchten Sie wirklich erneut senden?" @@ -3772,7 +3772,7 @@ msgstr "Ihre Berichte" #: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 #: templates/web/fixmystreet/report/update-form.html:76 -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:71 msgid "Your email" msgstr "Ihre eMail" @@ -3788,7 +3788,7 @@ msgid "Your email address:" msgstr "Ihre eMail-Adresse:" #: templates/web/base/alert/_list.html:92 -#: templates/web/base/report/new/fill_in_details_form.html:125 +#: templates/web/base/report/new/fill_in_details_form.html:106 #: templates/web/base/report/update-form.html:81 msgid "Your email:" msgstr "Ihre eMail:" @@ -3803,13 +3803,13 @@ msgstr "" #: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 #: templates/web/fixmystreet/report/update-form.html:142 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:98 +#: templates/web/zurich/report/new/fill_in_details_form.html:81 msgid "Your name" msgstr "Ihr Name" #: templates/web/base/auth/general.html:59 #: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:204 +#: templates/web/base/report/new/fill_in_details_form.html:185 #: templates/web/base/report/update-form.html:151 msgid "Your name:" msgstr "Ihr Name:" @@ -3827,33 +3827,19 @@ msgstr "Ihr Passwort wurde geändert" #: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 -#: templates/web/zurich/report/new/fill_in_details_form.html:104 +#: templates/web/zurich/report/new/fill_in_details_form.html:87 msgid "Your phone number" msgstr "Ihre Telefonnummer" -#: templates/web/base/tokens/confirm_problem.html:4 -msgid "Your problem has been confirmed!" -msgstr "Ihr Problem wurde bestätigt!" - #: templates/web/fixmystreet/questionnaire/index.html:16 msgid "Your report" msgstr "Ihre Meldung" -#: templates/web/base/report_created.html:6 -msgid "Your report has been created and will shortly be sent." -msgstr "" - -#: templates/web/base/footer.html:9 templates/web/fiksgatami/footer.html:21 -#: templates/web/fiksgatami/nn/footer.html:21 -#: templates/web/fixmystreet/footer.html:24 +#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:24 msgid "Your reports" msgstr "Ihre Meldungen" -#: templates/web/base/tokens/confirm_update.html:4 -msgid "Your update has been confirmed!" -msgstr "Ihre Aktualisierung wurde bestätigt!" - -#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:59 +#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:41 msgid "Your updates" msgstr "Ihre Aktualisierungen" @@ -3870,11 +3856,7 @@ msgstr "von %s" msgid "council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:665 -msgid "council ref: %s" -msgstr "" - -#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:32 #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:54 msgid "didn't use map" @@ -3885,6 +3867,7 @@ msgstr "hat Karte nicht verwendet" msgid "e.g. ‘%s’ or ‘%s’" msgstr "z.B. ‘%s’ oder ‘%s’" +#: templates/web/base/admin/body-form.html:188 #: templates/web/base/admin/flagged.html:51 msgid "edit user" msgstr "Benutzer bearbeiten" @@ -3899,7 +3882,7 @@ msgstr "von %d verschiedenen Benutzern" msgid "last updated %s" msgstr "zuletzt aktualisiert %s" -#: perllib/Utils.pm:263 +#: perllib/Utils.pm:235 msgid "less than a minute" msgstr "weniger als einer Minute" @@ -3909,7 +3892,7 @@ msgstr "" #: templates/web/base/report/updates.html:47 msgid "marked as action scheduled" -msgstr "" +msgstr "als Aktion geplant markiert" #: templates/web/base/report/updates.html:59 msgid "marked as an internal referral" @@ -3926,11 +3909,11 @@ msgstr "als gelöst markiert" #: templates/web/base/report/updates.html:45 msgid "marked as in progress" -msgstr "" +msgstr "als in Bearbeitung markiert" #: templates/web/base/report/updates.html:41 msgid "marked as investigating" -msgstr "" +msgstr "als untersuchend markiert" #: templates/web/base/report/updates.html:55 msgid "marked as not the council's responsibility" @@ -3959,37 +3942,36 @@ msgstr "oder" msgid "or locate me automatically" msgstr "" -#: templates/web/base/admin/report_edit.html:25 -#: templates/web/base/admin/report_edit.html:26 -#: templates/web/zurich/admin/report_edit-sdm.html:28 +#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:30 +#: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit-sdm.html:29 -#: templates/web/zurich/admin/report_edit-sdm.html:37 +#: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:38 -#: templates/web/zurich/admin/report_edit.html:28 +#: templates/web/zurich/admin/report_edit.html:27 #: templates/web/zurich/admin/report_edit.html:29 -#: templates/web/zurich/admin/report_edit.html:39 +#: templates/web/zurich/admin/report_edit.html:38 #: templates/web/zurich/admin/report_edit.html:40 -#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit.html:50 #: templates/web/zurich/admin/report_edit.html:52 msgid "originally entered: “%s”" msgstr "" -#: templates/web/base/admin/report_edit.html:30 +#: templates/web/base/admin/report_edit.html:43 msgid "other areas:" msgstr "andere Gebiete:" #: templates/web/base/report/updates.html:29 #: templates/web/base/report/updates.html:39 msgid "reopened" -msgstr "" +msgstr "erneut geöffnet" -#: templates/web/fiksgatami/header.html:49 -#: templates/web/fixmystreet/header.html:53 +#: templates/web/fixmystreet/header.html:59 #: templates/web/zurich/footer.html:12 msgid "sign out" msgstr "ausloggen" -#: templates/web/base/report/new/fill_in_details_form.html:13 +#: templates/web/base/report/new/fill_in_details_form.html:12 #: templates/web/base/report/new/fill_in_details_form.html:15 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 @@ -4001,15 +3983,15 @@ msgstr "" msgid "there is no pin shown as the user did not use the map" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:373 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:379 msgid "this type of local problem" msgstr "" -#: perllib/Utils.pm:235 +#: perllib/Utils.pm:207 msgid "today" msgstr "heute" -#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:32 #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:54 msgid "used map" @@ -4035,7 +4017,7 @@ msgid_plural "<big>%s</big> reports recently" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:282 +#: perllib/Utils.pm:254 #, perl-format msgid "%d hour" msgid_plural "%d hours" @@ -4049,7 +4031,7 @@ msgid_plural "%d supporters" msgstr[0] "%d Unterstützer" msgstr[1] "%d Unterstützer" -#: perllib/Utils.pm:284 +#: perllib/Utils.pm:256 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -4070,7 +4052,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:250 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -4091,7 +4073,7 @@ 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" -#: perllib/Utils.pm:280 +#: perllib/Utils.pm:252 #, perl-format msgid "%d day" msgid_plural "%d days" diff --git a/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po index f90cacde5..e649315ca 100644 --- a/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/el_GR.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -4,8 +4,8 @@ # Matthew Somerville <matthew@mysociety.org>, 2011-06-03. # # Translators: -# Andreas <hibaman@hotmail.com>, 2014-2015 -# Petros Freris (Πέτρος Φρέρης) <petrosfreris@gmail.com>, 2014-2015 +# basanas1606, 2015 +# basanas1606, 2015 # Theodore D <diamaltho@gmail.com>, 2015 # Vassilis Perantzakis <vaspervnp@yahoo.gr>, 2015 # Σίμος Δαλκυριάδης <press@pirateparty.gr>, 2015 @@ -13,9 +13,9 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2015-01-20 16:59+0000\n" -"PO-Revision-Date: 2015-01-20 14:09+0000\n" -"Last-Translator: Theodore D <diamaltho@gmail.com>\n" +"POT-Creation-Date: 2015-07-31 14:28+0100\n" +"PO-Revision-Date: 2015-07-10 13:31+0000\n" +"Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Greek (Greece) (http://www.transifex.com/projects/p/fixmystreet/language/el_GR/)\n" "Language: el_GR\n" "MIME-Version: 1.0\n" @@ -23,17 +23,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:618 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:386 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:392 msgid " and " msgstr "και" -#: templates/web/base/report/new/councils_text_all.html:12 -#: templates/web/base/report/new/councils_text_all.html:19 -#: templates/web/base/report/new/councils_text_all.html:5 -#: templates/web/base/report/new/councils_text_none.html:19 -#: templates/web/base/report/new/councils_text_none.html:21 -#: templates/web/base/report/new/councils_text_some.html:20 +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_none.html:11 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " @@ -46,11 +44,11 @@ msgstr "%d επιβεβαιωμένες ειδοποιήσεις, %d μη επι #: templates/web/base/admin/index.html:38 #: templates/web/zurich/admin/index.html:6 msgid "%d council contacts – %d confirmed, %d unconfirmed" -msgstr "%d επαφές δημοτικού συμβουλίου – %d επιβεβαιωμένες, %d ανεπιβεβαίωτες" +msgstr "%d επαφές υπηρεσίας – %d επιβεβαιωμένες, %d ανεπιβεβαίωτες" #: templates/web/base/admin/edit-league.html:12 msgid "%d edits by %s" -msgstr "%d επεξεργασίες από %s" +msgstr "%d επεξεργασίες από "%s"" #: templates/web/base/admin/index.html:35 msgid "%d live updates" @@ -69,21 +67,25 @@ msgstr "%d μέχρι %d από %d" msgid "%s - Summary reports" msgstr "%s - Συνοπτικές αναφορές" -#: perllib/FixMyStreet/DB/Result/Problem.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:672 msgid "%s ref: %s" msgstr "%s αναφ.: %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:265 perllib/FixMyStreet/Cobrand/UK.pm:277 +#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 msgid "%s ward, %s" -msgstr "%s πτέρυγα, %s" +msgstr "%s περιοχή, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:554 +#: perllib/FixMyStreet/DB/Result/Problem.pm:559 msgid "%s, reported at %s" -msgstr "%s, έγινε αναφορά στο %s" +msgstr "%s, έγινε αναφορά στο "%s"" -#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:304 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "%s, within %s ward" -msgstr "%s, στην πτέρυγα %s" +msgstr "%s, στην περιοχή %quot;%s"" + +#: perllib/FixMyStreet/Map/OSM.pm:42 +msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" +msgstr "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> και συνεργάτες" #: templates/web/base/email_sent.html:29 msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" @@ -98,19 +100,19 @@ msgid "(Don't worry — we'll hang on to your update while you're checking y msgstr "(Μην ανησυχείς — θα παραμείνουμε στην ενημέρωσή σου μέχρι να ελέγξεις το email σου.)" #: templates/web/base/admin/report_blocks.html:11 -#: templates/web/base/admin/users.html:29 +#: templates/web/base/admin/users.html:31 msgid "(Email in abuse table)" msgstr "(το email βρίσκεται στη μαύρη λίστα)" #: templates/web/base/alert/_list.html:20 #: templates/web/fixmystreet/alert/_list.html:24 msgid "(a default distance which covers roughly 200,000 people)" -msgstr "(προεπιλεγμένη απόσταση που καλύπτει περίπου 200.000 άτομα)" +msgstr "(αντιστοιχεί σε περιοχή όπου κατοικούν περίπου 200.000 άτομα)" #: templates/web/base/alert/_list.html:25 #: templates/web/fixmystreet/alert/_list.html:28 msgid "(alternatively the RSS feed can be customised, within" -msgstr "(εναλλακτικά, η ροή RSS μπορεί να προσαρμοστεί, μέσα σε" +msgstr "(εναλλακτικά, μπορείς να λαμβάνεις ειδοποιήσεις για ζητήματα σε ακτίνα " #: templates/web/base/around/around_map_list_items.html:12 #: templates/web/base/around/on_map_list_items.html:9 @@ -126,31 +128,31 @@ msgstr "(έκλεισε)" msgid "(fixed)" msgstr "(διορθώθηκε)" -#: templates/web/base/index.html:9 +#: templates/web/base/index.html:8 templates/web/base/index.html:9 #: templates/web/fixmystreet/around/intro.html:2 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" -msgstr "(όπως graffiti, παρατημένα σκουπίδια, σπασμένα πλακάκια πεζοδρομίο ή φώτα από δρόμους)" +msgstr "(όπως graffiti, παρατημένα σκουπίδια, σπασμένες πλάκες πεζοδρομίου ή καμένα φώτα δρόμων)" #: templates/web/base/reports/_list-entry.html:4 #: templates/web/fixmystreet/report/_item.html:21 msgid "(not sent to council)" -msgstr "(δεν αποστάλθηκε στο δημοτικό συμβούλιο)" +msgstr "(δεν αποστάλθηκε σε υπηρεσία)" -#: templates/web/base/report/new/fill_in_details_form.html:218 -#: templates/web/zurich/report/new/fill_in_details_form.html:94 +#: templates/web/base/report/new/fill_in_details_form.html:199 +#: templates/web/zurich/report/new/fill_in_details_form.html:77 msgid "(optional)" msgstr "(προαιρετικό)" #: templates/web/fixmystreet/report/public_label.html:1 msgid "(public)" -msgstr "(δημόσιο)" +msgstr "(φαίνεται δημόσια)" #: templates/web/base/reports/_list-entry.html:2 #: templates/web/fixmystreet/report/_item.html:20 msgid "(sent to both)" -msgstr "(στάλθηκε και στους δύο)" +msgstr "(στάλθηκε και στις δύο)" -#: templates/web/base/report/new/fill_in_details_form.html:212 +#: templates/web/base/report/new/fill_in_details_form.html:193 msgid "(we never show your email address or phone number)" msgstr "(δεν φαίνεται ποτέ το email ή ο τηλεφωνικός αριθμός σου)" @@ -158,16 +160,15 @@ msgstr "(δεν φαίνεται ποτέ το email ή ο τηλεφωνικό msgid "(we never show your email)" msgstr "(δεν φαίνεται ποτέ το email σου)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:662 -#: perllib/FixMyStreet/DB/Result/Problem.pm:393 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Διάλεξε κατηγορία --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 -#: perllib/FixMyStreet/DB/Result/Problem.pm:399 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:630 +#: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" -msgstr "-- Διάλεξε κατηγορία ακινήτου --" +msgstr "-- Διάλεξε είδος ακινήτου --" #: templates/web/base/admin/body-form.html:42 #: templates/web/base/admin/body-form.html:43 @@ -180,48 +181,7 @@ msgstr "" "Μάλλον γι'αυτό η κατηγορία \"περιοχή αρμοδιότητας\" είναι κενή (παρακάτω).<br>\n" "Μήπως να προσθέσετε μερικά <code>MAPIT_TYPES</code> στο αρχείο ρυθμίσεων;" -#: templates/web/base/questionnaire/completed.html:20 -msgid "<p style=\"font-size:150%\">Thank you very much for filling in our questionnaire; glad to hear it’s been fixed.</p>" -msgstr "<p style=\"font-size:150%\">Ευχαριστούμε πολύ που συμπλήρωσες το ερωτηματολόγιό μας. Χαιρόμαστε που μαθαίνουμε ότι διορθώθηκε.</p>" - -#: templates/web/fiksgatami/questionnaire/completed-open.html:1 -msgid "" -"<p style=\"font-size:150%\">We’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’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%\">Λυπούμαστε που το ακούμε αυτό. Έχουμε δύο\n" -"προτάσεις: δοκίμασε να <a href=\"http://www.norge.no/styresmakter/\">απευθυνθείς\n" -"απευθείας στο(υς) σύμβουλο(υς)</a>, ή αν πρόκειται για πρόβλημα που θα μπορούσε να\n" -"διορθωθεί συνεργατικά από τους τοπικούς κατοίκους, γιατί να μην\n" -"<a href=\"http://www.pledgebank.com/new\">δημιουργήσεις και δημοσιεύσεις μία \"υπόσχεση δράσης\"</a>;\n" -"</p>" - -#: templates/web/base/questionnaire/completed-open.html:6 -msgid "" -"<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" -"suggestions: why not try writing to your local representatives or, if\n" -"it’s a problem that could be fixed by local people working together, why\n" -"not <a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n" -"</p>" -msgstr "" -"<p style=\"font-size:150%\">Λυπούμαστε που το ακούμε αυτό. Έχουμε δύο\n" -"προτάσεις: δοκίμασε να επικοινωνήσεις με τους τοπικούς αντιπροσώπους ή, αν\n" -"πρόκειται για πρόβλημα που μπορεί να διορθωθεί συνεργατικά από τους τοπικούς κατοίκους,\n" -"γιατί να μην <a href=\"http://www.pledgebank.com/new\">δημιουργήσεις και να δημοσιεύσεις μία \"υπόσχεση δράσης\"</a>;\n" -"</p>" - -#: templates/web/base/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>Σε ευχαριστούμε πολύ για τη συμπλήρωση του ερωτηματολογίου. Αν μάθεις περισσότερες πληροφορίες για την κατάσταση του προβλήματός σου, σε παρακαλούμε να επιστρέψεις στην ιστοσελίδα και να γράψεις μια σχετική ενημέρωση.</p>" - -#: templates/web/base/around/_report_banner.html:4 +#: templates/web/base/around/_report_banner.html:3 #: templates/web/base/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>" @@ -242,13 +202,13 @@ msgstr "<strong>Όχι</strong> Να γίνει επιβεβαίωση της ε #: templates/web/fixmystreet/auth/general.html:51 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" -msgstr "<strong>Όχι</strong> Να συνδεθώ μέσω email" +msgstr "<strong>Όχι</strong> να συνδεθώ μέσω email" #: templates/web/base/auth/general.html:55 msgid "<strong>No</strong>, I do not, let me sign in by email:" msgstr "<strong>Όχι<strong>, να συνδεθώ μέσω email:" -#: templates/web/base/report/new/fill_in_details_form.html:163 +#: templates/web/base/report/new/fill_in_details_form.html:144 msgid "<strong>No</strong>, let me confirm my report by email:" msgstr "<strong>Όχι<strong>, να γίνει επιβεβαίωση της αναφοράς μέσω email:" @@ -256,13 +216,8 @@ msgstr "<strong>Όχι<strong>, να γίνει επιβεβαίωση της α msgid "<strong>No</strong>, let me confirm my update by email:" msgstr "<strong>Όχι</strong>, να γίνει επιβεβαίωση της ενημέρωσης μέσω email:" -#: templates/web/base/tokens/confirm_problem.html:19 -#: templates/web/base/tokens/confirm_problem.html:20 -msgid "<strong>We will now send it to the council</strong>." -msgstr "<strong>Τώρα θα το αποστείλουμε στο συμβούλιο</strong>." - #: templates/web/base/auth/general.html:37 -#: templates/web/base/report/new/fill_in_details_form.html:141 +#: templates/web/base/report/new/fill_in_details_form.html:122 #: templates/web/base/report/update-form.html:95 #: templates/web/fixmystreet/auth/general.html:37 #: templates/web/fixmystreet/auth/general.html:39 @@ -276,8 +231,8 @@ msgstr "<strong>Ναι</strong> έχω κωδικό πρόσβασης" msgid "About us" msgstr "Σχετικά με εμάς" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:39 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:52 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:31 #: templates/web/fixmystreet/report/update-form.html:28 @@ -292,31 +247,31 @@ 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 "" -"Πρόσθεσε ένα <strong>σώμα</strong> για κάθε διοικητικό σώμα, όπως για παράδειγμα ένα συμβούλιο ή τμήμα\n" -"στο οποίο θα μπορούν να στέλνονται οι αναφορές προβλημάτων. Μπορείς να προσθέσεις μία ή περισσότερες επαφές (για διαφορετικές κατηγορίες προβλημάτων) στο κάθε σώμα." +"Πρόσθεσε έναν <strong>τομέα</strong> για κάθε υπηρεσία, όπως για παράδειγμα μια υπηρεσία ή τμήμα\n" +"στο οποίο θα μπορούν να στέλνονται οι αναφορές προβλημάτων. Μπορείς να προσθέσεις μία ή περισσότερες επαφές (για διαφορετικές κατηγορίες προβλημάτων) στον κάθε τομέα." -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/body.html:56 msgid "Add a contact using the form below." msgstr "Πρόσθεσε μία επαφή χρησιμοποιώντας την παρακάτω φόρμα." #: templates/web/base/admin/bodies.html:74 -#: templates/web/base/admin/body-form.html:233 +#: templates/web/base/admin/body-form.html:240 #: templates/web/zurich/admin/body-form.html:51 msgid "Add body" -msgstr "Προσθήκη σώματος" +msgstr "Προσθήκη τομέα" -#: templates/web/base/admin/body.html:108 +#: templates/web/base/admin/body.html:116 #: templates/web/zurich/admin/body.html:31 msgid "Add new category" msgstr "Προσθήκη νέας κατηγορίας" -#: templates/web/base/admin/users.html:45 +#: templates/web/base/admin/users.html:47 msgid "Add user" msgstr "Προσθήκη χρήστη" -#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:70 +#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:52 msgid "Added %s" -msgstr "Προστέθηκε %s" +msgstr "Προστέθηκε %s" #: templates/web/base/auth/change_password.html:29 msgid "Again:" @@ -324,7 +279,7 @@ msgstr "Ξανά:" #: templates/web/base/admin/timeline.html:35 msgid "Alert %d created for %s, type %s, parameters %s / %s" -msgstr "Η ειδοποίηση %d δημιουργήθηκε για %s, κατηγορία %s, παράμετροι %s / %s" +msgstr "Η ειδοποίηση %d δημιουργήθηκε για το "%s", κατηγορία %s, παράμετροι %s / %s" #: templates/web/base/admin/timeline.html:37 msgid "Alert %d disabled (created %s)" @@ -341,9 +296,7 @@ msgstr "Ειδοποίησέ με για μελλοντικές ενημερώσ msgid "All Reports" msgstr "Όλες οι Αναφορές" -#: templates/web/base/footer.html:11 templates/web/fiksgatami/footer.html:23 -#: templates/web/fiksgatami/nn/footer.html:23 -#: templates/web/fixmystreet/footer.html:26 +#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:26 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:19 @@ -358,26 +311,16 @@ msgstr "Όλες οι αναφορές από %s μέχρι %s" #: templates/web/base/report/new/councils_text_some.html:2 msgid "All the information you provide here will be sent to" -msgstr "Όλες οι πληροφορίες που καταχωρήθηκαν εδώ θα αποσταλούν " - -#: templates/web/base/report/new/councils_text_all.html:12 -#: templates/web/base/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>" +msgstr "Όλες οι πληροφορίες που καταχωρήθηκαν εδώ θα αποσταλούν στο" -#: templates/web/base/report/new/councils_text_all.html:5 -#: templates/web/base/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> ή σε ένα σχετικό σώμα της περιοχής." - -#: templates/web/base/report/new/councils_text_all.html:19 -#: templates/web/base/report/new/councils_text_all.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:13 +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_all.html:4 +#: templates/web/base/report/new/fill_in_details_form.html:12 #: templates/web/base/report/new/fill_in_details_form.html:14 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 msgid "All the information you provide here will be sent to <strong>%s</strong>." -msgstr "Όλες οι πληροφορίες που καταχωρήθηκαν εδώ θα αποσταλούν στο <strong>%s</strong>." +msgstr "Όλες οι πληροφορίες που καταχωρήθηκαν εδώ θα αποσταλούν στο <strong>"%s"</strong>." #: templates/web/base/questionnaire/index.html:36 #: templates/web/fixmystreet/questionnaire/index.html:55 @@ -389,7 +332,7 @@ msgstr "Το πρόβλημα ενημερώθηκε ως διορθωμένο." msgid "Anonymous" msgstr "Ανώνυμος" -#: templates/web/base/admin/report_edit.html:62 +#: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:23 msgid "Anonymous:" msgstr "Ανώνυμος:" @@ -398,20 +341,20 @@ msgstr "Ανώνυμος:" msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?" msgstr "Είσαι <strong>προγραμματιστής</strong>; Θα ήθελες να συνεισφέρεις στο FixMyStreet;" -#: templates/web/fiksgatami/front/footer-marketing.html:14 #: templates/web/fixmystreet/front/footer-marketing.html:16 msgid "Are you a developer?" msgstr "Είσαι προγραμματιστής;" #: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 msgid "Area covered" msgstr "Περιοχή αρμοδιότητας" #: templates/web/base/admin/bodies.html:15 -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/body.html:60 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." -msgstr "" +msgstr "Δεδομένου ότι αυτό είναι ένα δοκιμαστικό site και το %s είναι ψευδές, οι αναφορές που γίνονται σε αυτό το site θα σταλούν στις δοκιμαστικές αναφορές προβλημάτων και όχι στην κανονική επαφή που υπάρχει για την κατηγορία αναφοράς των προβλημάτων." #: templates/web/zurich/admin/report_edit.html:141 #: templates/web/zurich/admin/stats.html:36 @@ -420,27 +363,27 @@ msgstr "Ανάθεση σε διαφορετική κατηγορία:" #: templates/web/zurich/admin/report_edit.html:150 msgid "Assign to external body:" -msgstr "Ανάθεση σε εξωτερικό σώμα:" +msgstr "Ανάθεση σε εξωτερικό τομέα:" #: templates/web/zurich/admin/report_edit.html:130 #: templates/web/zurich/admin/report_edit.html:187 msgid "Assign to subdivision:" msgstr "Ανάθεση στο τμήμα:" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:163 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:165 #: templates/web/zurich/report/updates.html:11 msgid "Assigned to %s" -msgstr "Ανατέθηκε στο %s" +msgstr "Ανατέθηκε στο "%s"" #: templates/web/base/open311/index.html:84 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 "Σε κάθε query επιστρέφονται το πολύ %d αιτήματα. Τα αιτήματα που επιστρέφονται ταξινομούνται κατά requested_datetime, οπότε για να λάβεις όλα τα αιτήματα, κάνε μερικές αναζητήσεις αλλάζοντας το start_date και το end_date." +msgstr "Σε κάθε αναζήτηση επιστρέφονται το πολύ %d αιτήματα. Τα αιτήματα που επιστρέφονται ταξινομούνται κατά requested_datetime, οπότε για να λάβεις όλα τα αιτήματα, κάνε μερικές αναζητήσεις αλλάζοντας το start_date και το end_date." #: templates/web/base/open311/index.html:76 msgid "At the moment only searching for and looking at reports work." msgstr "Αυτή τη στιγμή λειτουργούν μόνο η αναζήτηση και η προβολή αναφορών." -#: perllib/FixMyStreet/DB/Result/Problem.pm:348 +#: perllib/FixMyStreet/DB/Result/Problem.pm:373 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "Σε αναμονή ελέγχου" @@ -453,21 +396,22 @@ msgstr "Πίσω" msgid "Ban email address" msgstr "Αποκλεισμός της διεύθυνσης email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:297 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:301 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" -msgstr "Σώματα" +msgstr "Τομείς" #: templates/web/base/admin/flagged.html:17 #: templates/web/base/admin/reports.html:14 #: templates/web/base/admin/users.html:17 msgid "Body" -msgstr "Σώμα" +msgstr "Τομέας" +#: templates/web/base/admin/report_edit.html:34 #: templates/web/base/admin/user-form.html:32 msgid "Body:" -msgstr "Σώμα:" +msgstr "Τομέας:" #: templates/web/base/admin/stats.html:80 msgid "By Date" @@ -477,16 +421,15 @@ msgstr "Ανά ημερομηνία" msgid "Can't see the map? <em>Skip this step</em>" msgstr "Δεν μπορείς να δεις τον χάρτη; <em>Παράλειψη βήματος</em>" -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:55 #: templates/web/base/report/new/category.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:53 +#: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 #: templates/web/zurich/admin/stats.html:50 -#: templates/web/zurich/report/new/fill_in_details_form.html:50 msgid "Category" msgstr "Κατηγορία" @@ -494,17 +437,16 @@ msgstr "Κατηγορία" msgid "Category fix rate for problems > 4 weeks old" msgstr "Μέσος όρος διόρθωσης προβλημάτων για την κατηγορία > 4 εβδομάδες" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:138 #: templates/web/base/admin/category_edit.html:23 -#: templates/web/base/admin/report_edit.html:61 -#: templates/web/base/report/new/fill_in_details_form.html:68 +#: templates/web/base/admin/report_edit.html:74 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/report_edit-sdm.html:42 #: templates/web/zurich/admin/report_edit.html:140 msgid "Category:" msgstr "Κατηγορία:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:377 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383 msgid "Category: %s" msgstr "Κατηγορία: %s" @@ -515,7 +457,7 @@ msgstr "Κατηγορία: %s" msgid "Change password" msgstr "Αλλαγή κωδικού πρόσβασης" -#: templates/web/base/admin/body.html:152 +#: templates/web/base/admin/body.html:160 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." @@ -523,7 +465,7 @@ msgstr "" "Τσέκαρε το <strong>επιβεβαιώθηκε</strong> για να φαίνεται ότι αυτή η επαφή έχει επιβεβαιωθεί ως σωστή.\n" "Αν δεν είσαι σίγουρος για την προέλευση ή την εγκυρότητα της επαφής, άφησε το μη τσεκαρισμένο." -#: templates/web/base/admin/body.html:163 +#: templates/web/base/admin/body.html:171 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." @@ -531,7 +473,7 @@ msgstr "" "Τσέκαρε το <strong>διαγράφηκε</strong> για να αφαιρέσεις την κατηγορία από χρήση.\n" "Δεν θα φαίνεται ως διαθέσιμη κατηγορία στο μενού της σελίδας \"Ανάφερε ένα πρόβλημα\"." -#: templates/web/base/admin/body.html:183 +#: templates/web/base/admin/body.html:191 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -545,15 +487,13 @@ msgstr "" "<br>\n" "Κανονικά, οι κατηγορίες δεν είναι ιδιωτικές.\n" "<br>\n" -"Αυτό είναι κατάλληλο σε ζητήματα που θέλεις να επιτρέψεις σε χρήστες να υποβάλλουν αναφορές στο σώμα, αλλά για τα οποία δεν χρειάζεται η αναφορά να είναι δημόσια. Ένα τέτοιο παράδειγμα είναι αν κάποιος θέλει να ζητήσει έναν επιπλέον κάδο απορριμάτων σε συγκεκριμένη διεύθυνση." +"Αυτό είναι κατάλληλο για ζητήματα που θέλεις να επιτρέψεις σε χρήστες να υποβάλλουν αναφορές στον τομέα, αλλά για τα οποία δεν χρειάζεται η αναφορά να είναι δημόσια. Ένα τέτοιο παράδειγμα είναι αν κάποιος θέλει να ζητήσει έναν επιπλέον κάδο απορριμάτων σε συγκεκριμένη διεύθυνση." -#: templates/web/base/admin/body.html:122 +#: templates/web/base/admin/body.html:130 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 "" -"Επίλεξε ένα όνομα <strong>κατηγορίας</strong> που να έχει νόημα για τους πολίτες (π.χ., \"Λακκούβες\", \"Φωτισμός δρόμων\") αλλά βοηθάει\n" -"επίσης και το σώμα. Αυτά θα φαίνονται στο μενού της σελίδας \"Ανάφερε ένα πρόβλημα\"." +msgstr "Επίλεξε ένα όνομα <strong>κατηγορίας</strong> που να έχει νόημα για τους πολίτες (π.χ., \"Λακκούβες\", \"Φωτισμός δρόμων\") αλλά είναι χρήσιμο και για τον τομέα. Αυτά θα φαίνονται στο μενού της σελίδας \"Ανάφερε ένα πρόβλημα\"." #: templates/web/base/admin/stats.html:65 #: templates/web/base/admin/stats.html:71 @@ -565,16 +505,16 @@ msgstr "Κάνε κλικ εδώ ή κάνε εισαγωγή με τη μορφ msgid "Click map to report a problem" msgstr "Κάνε κλικ στον χάρτη για να αναφέρεις ένα πρόβλημα" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:45 -#: templates/web/base/admin/report_edit.html:47 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:58 +#: templates/web/base/admin/report_edit.html:60 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/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:95 #: templates/web/zurich/admin/report_edit.html:97 #: templates/web/zurich/admin/stats.html:31 @@ -582,11 +522,12 @@ msgstr "Κάνε κλικ στον χάρτη για να αναφέρεις έ msgid "Closed" msgstr "Κλειστό" -#: perllib/FixMyStreet/DB/Result/Problem.pm:762 +#: perllib/FixMyStreet/DB/Result/Problem.pm:771 msgid "Closed by council" -msgstr "Κλειστό από το συμβούλιο" +msgstr "Κλειστό από την υπηρεσία" -#: templates/web/base/my/my.html:40 templates/web/fixmystreet/my/my.html:46 +#: templates/web/base/my/my.html:40 +#: templates/web/fixmystreet/my/_problem-list.html:12 msgid "Closed reports" msgstr "Κλειστές αναφορές" @@ -594,10 +535,10 @@ msgstr "Κλειστές αναφορές" msgid "Closed:" msgstr "Κλειστό:" -#: templates/web/base/around/tabbed_lists.html:11 +#: templates/web/base/around/tabbed_lists.html:10 #: templates/web/base/around/tabbed_lists.html:12 msgid "Closest nearby problems <small>(within %skm)</small>" -msgstr "Κοντινότερα προβλήματα <small>(σε ακτίνα %s χμ)</small>" +msgstr "Κοντινότερα προβλήματα <small>(σε ακτίνα %s χλμ)</small>" #: templates/web/base/admin/report_edit.html:23 #: templates/web/zurich/admin/report_edit-sdm.html:33 @@ -609,26 +550,26 @@ msgstr "Συντεταγμένες:" msgid "Cobrand" msgstr "Προστεθέν σήμα" -#: templates/web/base/admin/report_edit.html:75 +#: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:50 msgid "Cobrand data:" msgstr "Δεδομένα προστεθέντος σήματος:" -#: templates/web/base/admin/report_edit.html:74 +#: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:49 msgid "Cobrand:" msgstr "Προστεθέν σήμα:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Ρυθμίσεις" -#: templates/web/base/admin/category_edit.html:47 +#: templates/web/base/admin/category_edit.html:52 msgid "Configure Endpoint" msgstr "Ρύθμιση σημείου τερματισμού" -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/body.html:72 msgid "Confirm" msgstr "Επιβεβαίωση" @@ -649,10 +590,10 @@ msgstr "Κάνε επιβεβαίωση μέσω email παρακάτω, εισ msgid "Confirmation" msgstr "Επιβεβαίωση" -#: templates/web/base/admin/body.html:158 -#: templates/web/base/admin/body.html:71 -#: templates/web/base/admin/category_edit.html:32 -#: templates/web/base/admin/category_edit.html:84 +#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/category_edit.html:37 +#: templates/web/base/admin/category_edit.html:89 #: templates/web/zurich/admin/stats.html:40 msgid "Confirmed" msgstr "Επιβεβαιώθηκε" @@ -663,7 +604,7 @@ msgstr "Επιβεβαιωμένες αναφορές μεταξύ %s και %s" #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 -#: templates/web/base/admin/report_edit.html:70 +#: templates/web/base/admin/report_edit.html:83 msgid "Confirmed:" msgstr "Επιβεβαιώθηκε:" @@ -677,16 +618,15 @@ msgstr "Επικοινωνία με το FixMyStreet" #: templates/web/fixmystreet/contact/index.html:1 #: templates/web/fixmystreet/contact/index.html:2 msgid "Contact Us" -msgstr "Επικοινωνήστε με εμάς" +msgstr "Επικοινώνησε με εμάς" #: templates/web/base/contact/index.html:6 -#: templates/web/base/contact/submit.html:3 #: templates/web/fixmystreet/contact/index.html:20 msgid "Contact the team" -msgstr "Επικοινωνήστε με την ομάδα διαχείρισης" +msgstr "Επικοινώνησε με την ομάδα διαχείρισης" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1327 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1355 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1325 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1353 msgid "Could not find user" msgstr "Δεν είναι δυνατή η εύρεση χρήστη" @@ -696,17 +636,21 @@ msgstr "Δεν είναι δυνατή η εύρεση της τοποθεσία #: templates/web/base/admin/list_updates.html:9 msgid "Council" -msgstr "Δημοτικό συμβούλιο" +msgstr "Υπηρεσία" #: templates/web/base/admin/body.html:1 #: templates/web/base/admin/category_edit.html:1 #: templates/web/zurich/admin/body.html:1 msgid "Council contacts for %s" -msgstr "Επαφές δημοτικού συμβουλίου για %s" +msgstr "Επαφές υπηρεσίας για "%s"" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:670 +msgid "Council ref: %s" +msgstr "υπηρεσία αναφ.: %s" #: templates/web/base/admin/stats.html:84 msgid "Council:" -msgstr "Δημοτικό συμβούλιο:" +msgstr "Υπηρεσία:" #: templates/web/base/admin/stats.html:12 #: templates/web/base/admin/stats.html:32 @@ -719,7 +663,7 @@ msgstr "Καταμέτρηση" msgid "Create a report" msgstr "Δημιουργία αναφοράς" -#: templates/web/base/admin/body.html:200 +#: templates/web/base/admin/body.html:208 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Δημιουργία κατηγορίας" @@ -731,7 +675,7 @@ msgid "Created" msgstr "Δημιουργήθηκε" #: templates/web/base/admin/list_updates.html:38 -#: templates/web/base/admin/report_edit.html:69 +#: templates/web/base/admin/report_edit.html:82 #: templates/web/base/admin/update_edit.html:51 #: templates/web/zurich/admin/report_edit-sdm.html:47 #: templates/web/zurich/admin/report_edit.html:61 @@ -746,26 +690,26 @@ msgstr "Κατάσταση" #: templates/web/base/admin/bodies.html:5 #: templates/web/base/admin/index.html:16 msgid "Currently no bodies have been created." -msgstr "Δεν έχουν δημιουργηθεί σώματα μέχρι στιγμής." +msgstr "Δεν έχουν δημιουργηθεί τομείς μέχρι στιγμής." -#: templates/web/base/dashboard/index.html:6 +#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 msgid "Dashboard" -msgstr "Πρόχειρο" +msgstr "Πίνακας Ελέγχου" #: templates/web/zurich/admin/stats.html:35 msgid "Dealt with by subdivision within 5 working days" msgstr "Εξετάστηκε από το τμήμα μέσα σε 5 εργάσιμες ημέρες" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:169 -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:37 -#: templates/web/base/admin/category_edit.html:85 +#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:81 +#: templates/web/base/admin/category_edit.html:42 +#: templates/web/base/admin/category_edit.html:90 msgid "Deleted" msgstr "Διαγραμμένα" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:43 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -785,7 +729,7 @@ msgstr "Πληροφορίες" msgid "Details:" msgstr "Πληροφορίες:" -#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/body.html:87 msgid "Devolved" msgstr "Μεταβιβάστηκε" @@ -813,8 +757,8 @@ msgstr "Δεν γνωρίζω" msgid "Don't like forms?" msgstr "Δεν σου αρέσουν οι φόρμες;" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:47 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:60 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:32 #: templates/web/fixmystreet/report/update-form.html:28 @@ -822,33 +766,33 @@ msgstr "Δεν σου αρέσουν οι φόρμες;" msgid "Duplicate" msgstr "Διπλότυπο" -#: templates/web/base/admin/body.html:98 +#: templates/web/base/admin/body.html:106 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 "" -"Κάθε επαφή για το σώμα έχει μία κατηγορία, που φαίνεται δημόσια.\n" -"Διαφορετικές κατηγορίες <strong>μπορούν να έχουν την ίδια επαφή</strong> (διεύθυνση email).\n" -"Αυτό σημαίνει ότι μπορείς να προσθέσεις πολλές κατηγορίες ακόμη και αν έχεις μία επαφή για το σώμα." +"Κάθε επαφή του τομέα είναι υπεύθυνη για μία κατηγορία, που φαίνεται δημόσια.\n" +"Διαφορετικές κατηγορίες <strong>μπορούν να ανήκουν στην ίδια επαφή</strong> (διεύθυνση email).\n" +"Αυτό σημαίνει ότι μπορείς να προσθέσεις πολλές κατηγορίες ακόμη και αν έχεις μία επαφή στον τομέα." #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 -#: templates/web/base/admin/users.html:31 +#: templates/web/base/admin/users.html:33 #: templates/web/zurich/admin/problem_row.html:42 msgid "Edit" msgstr "Επεξεργασία" -#: templates/web/base/admin/body.html:212 +#: templates/web/base/admin/body.html:220 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" -msgstr "Επεξεργασία λεπτομερειών του σώματος" +msgstr "Επεξεργασία λεπτομερειών του τομέα" #: templates/web/base/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:2 +#: 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:2 +#: templates/web/zurich/admin/report_edit.html:1 #: templates/web/zurich/admin/report_edit.html:5 msgid "Editing problem %d" msgstr "Γίνεται επεξεργασία του προβλήματος %d" @@ -862,12 +806,12 @@ msgstr "Γίνεται επεξεργασία της ενημέρωσης %d" msgid "Editing user %d" msgstr "Γίνεται επεξεργασία του χρήστη %d" -#: templates/web/base/admin/category_edit.html:86 +#: templates/web/base/admin/category_edit.html:91 msgid "Editor" msgstr "Επεξεργαστής" #: templates/web/base/admin/bodies.html:23 -#: templates/web/base/admin/category_edit.html:83 +#: templates/web/base/admin/category_edit.html:88 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 #: templates/web/fixmystreet/auth/general.html:21 @@ -878,15 +822,23 @@ msgstr "Επεξεργαστής" msgid "Email" msgstr "Email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1303 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1301 msgid "Email added to abuse list" msgstr "Το Email προστέθηκε στην μαύρη λίστα" -#: templates/web/base/admin/body.html:147 +#: templates/web/base/admin/body.html:155 msgid "Email address:" msgstr "Ηλεκτρονική διεύθυνση:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1300 +#: templates/web/base/tokens/confirm_alert.html:6 +msgid "Email alert created" +msgstr "Η ειδοποίηση μέσω email δημιουργήθηκε" + +#: templates/web/base/tokens/confirm_alert.html:10 +msgid "Email alert deleted" +msgstr "Η ειδοποίηση μέσω email διεγράφη" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1298 msgid "Email already in abuse list" msgstr "Το Email είναι ήδη στην μαύρη λίστα" @@ -898,8 +850,8 @@ msgstr "Στείλε μου email για νέα προβλήματα της πε msgid "Email me updates" msgstr "Στείλτε Email για ενημερώσεις" -#: templates/web/base/admin/category_edit.html:26 -#: templates/web/base/admin/report_edit.html:67 +#: templates/web/base/admin/category_edit.html:31 +#: templates/web/base/admin/report_edit.html:80 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 @@ -910,32 +862,32 @@ msgstr "Στείλτε Email για ενημερώσεις" msgid "Email:" msgstr "Email:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:322 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 msgid "Email: %s" msgstr "Email: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 msgid "Empty flat or maisonette" msgstr "Άδειο διαμέρισμα ή μεζονέτα" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:631 msgid "Empty house or bungalow" msgstr "Άδειο σπίτι ή μονοκατοικία" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:622 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty office or other commercial" msgstr "Άδειο γραφείο ή άλλος χώρος εμπορικής χρήσης" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:623 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Empty pub or bar" msgstr "Άδειο μπαρ" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:624 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty public building - school, hospital, etc." msgstr "Άδειο δημόσιο κτήριο - σχολείο, νοσοκομείο, κτλ." -#: templates/web/base/admin/body-form.html:158 -#: templates/web/base/admin/body-form.html:159 +#: templates/web/base/admin/body-form.html:162 +#: templates/web/base/admin/body-form.html:163 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" @@ -943,67 +895,69 @@ msgid "" " <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>." msgstr "" "Ενεργοποίησε το <strong>Open311 update-sending</strong> αν πρόκειται το τελικό σημείο - endpoint - να αποστέλλει και να λαμβάνει\n" -"ενημερώσεις για τις υπάρχουσες αναφορές. Αν δεν είσαι σίγουρος, που πιθανά δεν είσαι, άστο αμαρκάριστο.\n" -"Για περισσότερες πληροφορίες δες σε\n" +"ενημερώσεις για τις υπάρχουσες αναφορές. Αν δεν είσαι σίγουρος, τότε μάλλον δεν αποστέλλει ούτε λαμβάνει ενημερώσεις, οπότε άστο αμαρκάριστο.\n" +"Για περισσότερες πληροφορίες δες\n" "<a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>αυτό το άρθρο</a>." -#: templates/web/base/admin/body-form.html:215 -#: templates/web/base/admin/body-form.html:216 +#: templates/web/base/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:223 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 "" -"Με την ενεργοποίηση αυτής της ρύθμισης <strong>μπορεί να αποκεντρωθεί</strong>, αν μια ή περισσότερες επαφές έχουν ένα \n" -"διαφορετικό τελικό σημείο - endpoint - (και μέθοδο αποστολής) από τα σώματα. Για παράδειγμα, αν οι αναφορές από κάποια κατηγορία\n" +"Ενεργοποίησε τη ρύθμιση <strong>μπορεί να αποκεντρωθεί</strong>, αν μια ή περισσότερες επαφές έχουν ένα \n" +"διαφορετικό τελικό σημείο - endpoint - (και μέθοδο αποστολής) από αυτό του τομέα. Για παράδειγμα, όταν οι αναφορές από κάποια κατηγορία\n" "προβλημάτων πρέπει να σταλούν με email, ενώ κάποιες άλλες μπορούν να σταλούν με το Open311." #: templates/web/base/admin/stats.html:70 msgid "End Date:" msgstr "Ημερομηνία Λήξης:" -#: templates/web/base/admin/body-form.html:126 +#: templates/web/base/admin/body-form.html:130 msgid "Endpoint" msgstr "Σημείο τερματισμού" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:72 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:73 msgid "Enter a Zürich street name" msgstr "Δώσε μια ονομασία για την οδό" #: perllib/FixMyStreet/Cobrand/UK.pm:13 msgid "Enter a nearby UK postcode, or street name and area" -msgstr "Εισαγωγή ενός κοντινού ταχυδρομικού κώδικα, οδού ή περιοχής" +msgstr "Γράψε έναν κοντινό ταχυδρομικό κώδικα, οδό ή περιοχή" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 msgid "Enter a nearby postcode, or street name and area" -msgstr "Εισαγωγή κοντινού ταχυδρομικού κώδικα, οδού ή περιοχής" +msgstr "Γράψε έναν κοντινό ταχυδρομικό κώδικα, οδό ή περιοχή" +#: templates/web/base/around/postcode_form.html:1 #: templates/web/base/around/postcode_form.html:2 +#: templates/web/fixmystreet/around/postcode_form.html:10 #: templates/web/fixmystreet/around/postcode_form.html:11 msgid "Enter a nearby street name and area" -msgstr "Εισαγωγή κοντινής οδού ή περιοχής" +msgstr "Γράψε μία κοντινή οδό ή περιοχή" #: perllib/FixMyStreet/Cobrand/ZeroTB.pm:7 msgid "Enter a nearby street name and area, postal code or district in Delhi" -msgstr "Εισαγωγή κοντινής οδού και περιοχής, ταχυδρομικού κώδικα ή περιφέρειας στο Δελχί" +msgstr "Γράψε μία κοντινή οδό, περιοχή, ταχυδρομικό κώδικα ή περιφέρεια" #: templates/web/base/auth/general.html:64 -#: templates/web/base/report/new/fill_in_details_form.html:170 +#: templates/web/base/report/new/fill_in_details_form.html:151 #: templates/web/base/report/update-form.html:124 msgid "Enter a new password:" -msgstr "Καταχώρισε ένα νέο κωδικό πρόσβασης:" +msgstr "Γράψε ένα νέο κωδικό πρόσβασης:" #: templates/web/fixmystreet/auth/general.html:63 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:75 #: templates/web/fixmystreet/report/update-form.html:123 #: templates/web/zurich/auth/general.html:65 msgid "Enter a password" -msgstr "Καταχώρισε ένα κωδικό πρόσβασης" +msgstr "Γράψε ένα κωδικό πρόσβασης" -#: templates/web/base/index-steps.html:33 +#: templates/web/base/index-steps.html:26 msgid "Enter details of the problem" -msgstr "Καταχώρισε λεπτομέρειες σχετικά με το πρόβλημα" +msgstr "Γράψε λεπτομέρειες σχετικά με το πρόβλημα" #: templates/web/base/auth/token.html:5 #: templates/web/base/errors/generic.html:1 @@ -1024,17 +978,22 @@ msgstr "Παράδειγμα ταχυδρομικού κώδικα %s" msgid "Examples:" msgstr "Παραδείγματα:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:47 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" -msgstr "Εξήγησε ποιο είναι το πρόβλημα, που βρίσκεται ακριβώς και πόσο καιρό βρίσκεται εκεί..." +msgstr "Εξήγησε ποιο είναι το πρόβλημα, που βρίσκεται ακριβώς και για πόσο καιρό υπάρχει..." -#: templates/web/base/admin/report_edit.html:76 +#: templates/web/base/admin/body-form.html:81 +msgid "External URL" +msgstr "" + +#: templates/web/base/admin/category_edit.html:27 +#: templates/web/base/admin/report_edit.html:92 msgid "Extra data:" msgstr "Επιπλέον δεδομένα:" -#: templates/web/base/contact/submit.html:15 -msgid "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>." -msgstr "Αποτυχία αποστολής του μηνύματος. Παρακαλούμε προσπάθησε ξανά, ή <a href=\"mailto:%s\">στείλε μας email</a>." +#: templates/web/base/contact/submit.html:13 +msgid "Failed to send message" +msgstr "Αποτυχία αποστολής μηνύματος" #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 @@ -1046,7 +1005,7 @@ msgstr "Φίλτρο λίστας αναφοράς" msgid "First time" msgstr "Πρώτη φορά" -#: templates/web/base/admin/body.html:40 +#: templates/web/base/admin/body.html:48 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "Διόρθωσέ το επιλέγοντας μία <strong>περιοχή αρμοδιότητας</strong> στη φόρμα <em>Επεξεργασία λεπτομερειών του σώματος</em> παρακάτω." @@ -1063,7 +1022,7 @@ 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 και ειδοποιήσεις μέσω email για τοπικά προβλήματα, καθώς και ειδοποιήσεις για μία συγκεκριμένη πτέρυγα ή συμβούλιο, ή για όλα τα προβλήματα σε ορισμένη ακτίνα απόστασης από κάποια περιοχή." +msgstr "Το FixMyStreet έχει μία ποικιλία από πηγές RSS και ειδοποιήσεις μέσω email για τα τοπικά προβλήματα, καθώς και ειδοποιήσεις για έναν συγκεκριμένο τομέα ή υπηρεσία, ή για όλα τα προβλήματα σε μια ορισμένη ακτίνα απόστασης από κάποια τοποθεσία." #: templates/web/base/alert/_list.html:71 #: templates/web/fixmystreet/alert/_list.html:73 @@ -1076,16 +1035,12 @@ msgid "" "for the county council." msgstr "" "Το FixMyStreet στέλνει διαφορετικές κατηγορίες προβλημάτων\n" -"στα κατάλληλα συμβούλια, οπότε προβλήματα με προκαθορισμένα όρια ενός συγκεκριμένου συμβουλίου\n" -"μπορεί να μην ταιριάζουν με τα προβλήματα που αποστέλλονται σε αυτό το συμβούλιο. Για παράδειγμα, μια αναφορά για ένα graffiti\n" -"που θα σταλεί σε ένα τοπικό συμβούλιο, θα εμφανίζεται στις προειδοποιήσεις του τοπικού\n" -"συμβουλίου αλλά θα εμφανίζεται και στις προειδοποιήσεις \"Εντός του τομέα ευθύνης\"\n" -"και του περιφερειακού συμβουλίου." +"στις κατάλληλες υπηρεσίες, οπότε κάποια προβλήματα που στέλνονται σε μία υπηρεσία μπορεί να μην ταιριάζουν με τα προκαθορισμένα όρια της αρμοδιότητάς της. Για παράδειγμα, μια αναφορά για ένα graffiti θα σταλεί στην υπηρεσία που είναι αρμόδια για την περιοχή, άρα θα εμφανίζεται και στις δύο κατηγορίες ειδοποιήσεων της υπηρεσίας, ενώ όσον αφορά την επικεφαλής υπηρεσία θα εμφανίζεται μόνο στην κατηγορία ειδοποιήσεων \"Εντός του τομέα ευθύνης\"." #: templates/web/base/admin/index.html:55 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:41 -#: templates/web/base/admin/report_edit.html:42 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:54 +#: templates/web/base/admin/report_edit.html:55 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/update-form.html:30 @@ -1096,17 +1051,18 @@ msgstr "" msgid "Fixed" msgstr "Διορθώθηκε" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:43 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:56 msgid "Fixed - Council" -msgstr "Διορθώθηκε - Δημοτικό Συμβούλιο" +msgstr "Διορθώθηκε - Υπηρεσία" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:42 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:55 msgid "Fixed - User" msgstr "Διορθώθηκε - Χρήστης" -#: templates/web/base/my/my.html:35 templates/web/fixmystreet/my/my.html:41 +#: templates/web/base/my/my.html:35 +#: templates/web/fixmystreet/my/_problem-list.html:7 msgid "Fixed reports" msgstr "Αναφορές για Διορθωμένα" @@ -1114,7 +1070,7 @@ msgstr "Αναφορές για Διορθωμένα" msgid "Fixed:" msgstr "Διορθώθηκε:" -#: templates/web/base/admin/body-form.html:84 +#: templates/web/base/admin/body-form.html:89 #: templates/web/zurich/admin/body-form.html:36 msgid "Flag as deleted" msgstr "Σήμανση ως διαγραμμένο" @@ -1123,7 +1079,7 @@ msgstr "Σήμανση ως διαγραμμένο" msgid "Flag user" msgstr "Επισήμανση χρήστη" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Επισημασμένα" @@ -1132,27 +1088,23 @@ msgstr "Επισημασμένα" msgid "Flagged reports and users" msgstr "Επισημασμένες αναφορές και χρήστες" -#: templates/web/base/admin/user-form.html:45 +#: templates/web/base/admin/user-form.html:46 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page." msgstr "Οι επισημασμένοι χρήστες καταγράφονται στη σελίδα <a href='%s'>επισημασμένων</a>." #: templates/web/base/admin/flagged.html:31 msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." -msgstr "Οι επισημασμένοι χρήστες δεν περιορίζονται με κανέναν τρόπο. Είναι απλά μία λίστα από χρήστες που έχουν επισημανθεί για λόγους προσοχής." +msgstr "Οι επισημασμένοι χρήστες δεν υφίστανται κάποιο είδος περιορισμού. Είναι απλά μία λίστα από χρήστες που έχουν επισημανθεί ώστε να ξεχωρίζουν." -#: templates/web/base/admin/report_edit.html:78 -#: templates/web/base/admin/user-form.html:51 +#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/user-form.html:52 msgid "Flagged:" msgstr "Επισημασμένοι:" #: templates/web/base/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/base/admin/report_edit.html:30 -msgid "For council(s):" -msgstr "Για το Δημοτικό Συμβούλιο:" +msgstr "Ακολούθησε ένα σύνδεσμο περιοχής για να δεις μόνο αναφορές που αφορούν αυτήν την περιοχή." #: templates/web/base/admin/body-form.html:65 msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." @@ -1166,8 +1118,6 @@ msgstr "Ξέχασες τον κωδικό πρόσβασής σου;" #: templates/web/base/faq/faq-en-gb.html:1 #: templates/web/base/static/privacy.html:1 #: templates/web/base/static/privacy.html:2 -#: templates/web/fiksgatami/faq/faq-nb.html:1 -#: templates/web/fiksgatami/nn/faq/faq-nn.html:1 msgid "Frequently Asked Questions" msgstr "Συχνές Ερωτήσεις" @@ -1180,21 +1130,25 @@ msgstr "GeoRSS στους Χάρτες Google" msgid "Get updates" msgstr "Λήψη ενημερώσεων" -#: templates/web/fixmystreet/reports/_rss.html:4 +#: templates/web/fixmystreet/reports/_rss.html:3 #: templates/web/fixmystreet/reports/_rss.html:9 msgid "Get updates of %s problems" -msgstr "Λήψη ενημερώσεων από προβλήματα %s" +msgstr "Λήψη ενημερώσεων για προβλήματα %s" #: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:4 +#: templates/web/fixmystreet/reports/_rss.html:3 msgid "Get updates of problems in this %s" -msgstr "Λήψη ενημερώσεων από προβλήματα σε αυτό το %s" +msgstr "Λήψη ενημερώσεων για προβλήματα σε αυτό το "%s"" #: templates/web/base/alert/_list.html:83 #: templates/web/fixmystreet/alert/_list.html:82 msgid "Give me an RSS feed" msgstr "Λήψη μίας ροής RSS " +#: templates/web/base/questionnaire/completed.html:14 +msgid "Glad to hear it’s been fixed!" +msgstr "Χαιρόμαστε που φτιάχτηκε!" + #: templates/web/base/alert/index.html:34 #: templates/web/base/around/postcode_form.html:8 #: templates/web/fixmystreet/around/postcode_form.html:21 @@ -1202,7 +1156,7 @@ msgstr "Λήψη μίας ροής RSS " msgid "Go" msgstr "Εμπρός" -#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:93 msgid "Going to send questionnaire?" msgstr "Σκοπεύεις να στείλεις ερωτηματολόγιο;" @@ -1212,7 +1166,7 @@ msgstr "Γράφημα της δημιουργίας προβλημάτων (κ #: templates/web/base/reports/index.html:12 msgid "Greyed-out lines are councils that no longer exist." -msgstr "Οι γκρίζες γραμμές είναι συμβούλια που δεν υπάρχουν πλέον." +msgstr "Οι γκρίζες ονομασίες είναι υπηρεσίες που δεν υπάρχουν πλέον." #: templates/web/base/questionnaire/index.html:37 #: templates/web/fixmystreet/questionnaire/index.html:56 @@ -1222,11 +1176,9 @@ msgstr "Διορθώθηκε το πρόβλημα;" #: templates/web/base/questionnaire/index.html:50 #: templates/web/fixmystreet/questionnaire/index.html:69 msgid "Have you ever reported a problem to a council before, or is this your first time?" -msgstr "Έχεις αναφέρει ποτέ ξανά ένα πρόβλημα στο Δημοτικό συμβούλιο, ή αυτή είναι η πρώτη φορά;" +msgstr "Έχεις αναφέρει ποτέ ξανά ένα πρόβλημα στην υπηρεσία ή αυτή είναι η πρώτη φορά;" -#: templates/web/base/footer.html:15 templates/web/fiksgatami/footer.html:27 -#: templates/web/fiksgatami/nn/footer.html:27 -#: templates/web/fixmystreet/footer.html:30 +#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:30 #: templates/web/zurich/faq/faq-de-ch.html:1 #: templates/web/zurich/footer.html:21 #: templates/web/zurich/nav_over_content.html:8 @@ -1236,20 +1188,19 @@ msgstr "Βοήθεια" #: templates/web/base/alert/_list.html:6 #: templates/web/fixmystreet/alert/_list.html:8 msgid "Here are the types of local problem alerts for ‘%s’." -msgstr "Εδώ υπάρχουν κατηγορίες ειδοποιήσεων για τοπικά προβλήματα για %lsquo;%s’." +msgstr "Αυτές είναι οι κατηγορίες ειδοποιήσεων για τοπικά προβλήματα για ‘%s’." -#: templates/web/fiksgatami/header.html:48 -#: templates/web/fixmystreet/header.html:52 +#: templates/web/fixmystreet/header.html:58 #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "Γεια %s" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:50 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:63 +#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/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:86 #: templates/web/zurich/admin/report_edit.html:90 #: templates/web/zurich/admin/stats.html:32 @@ -1265,7 +1216,7 @@ msgstr "Απόκρυψη παλιών" msgid "Hide pins" msgstr "Απόκρυψη καρφιτσών" -#: templates/web/base/admin/category_edit.html:79 +#: templates/web/base/admin/category_edit.html:84 msgid "History" msgstr "Ιστορικό" @@ -1275,25 +1226,31 @@ msgstr "Αρχική" #: templates/web/base/index-steps.html:1 msgid "How to report a problem" -msgstr "Πως γίνεται αναφορά ενός προβλήματος" +msgstr "Πώς να αναφέρεις ένα πρόβλημα" #: templates/web/base/js/translation_strings.html:33 msgid "How to send successful reports" -msgstr "Πως να στέλνεις επιτυχημένες αναφορές" +msgstr "Πώς να στείλεις επιτυχημένες αναφορές" -#: perllib/FixMyStreet/App/Controller/Admin.pm:742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:740 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 "Δεν μπορέσαμε να εντοπίσουμε το πρόβλημά σας στην βάση δεδομένων.\n" +#: templates/web/base/tokens/confirm_problem.html:23 +#: templates/web/base/tokens/confirm_problem.html:27 +msgid "I just reported a problem on @fixmystreet" +msgstr "Μόλις ανέφερα ένα πρόβλημα στο @fixmystreet" + +#: templates/web/base/tokens/confirm_update.html:19 +#: templates/web/base/tokens/confirm_update.html:23 +msgid "I just updated a problem on @fixmystreet" +msgstr "Μόλις ενημέρωσα ένα πρόβλημα στο @fixmystreet" -#: 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 "Φοβούμαστε ότι δεν μπορέσαμε να επαληθεύσουμε αυτό το token, μιας και η αναφορά έγινε πολύ παλιά." +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +msgid "I'm afraid we couldn't locate your problem in the database.\n" +msgstr "Δεν μπορέσαμε να εντοπίσουμε το πρόβλημά σου στην βάση δεδομένων.\n" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:260 +#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 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 "Φοβούμαστε ότι δεν μπορέσαμε να επαληθεύσουμε αυτό το token. Αν αντέγραψες τη διεύθυνση URL από κάποιο email, παρακαλούμε έλεγξε ότι την αντέγραψες επακριβώς.\n" @@ -1314,30 +1271,35 @@ 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 "" -"Έγινε ταυτοποίηση ενός <strong>γονέα</strong> σε ένα σώμα που και το ίδιο είναι μέρος ενός άλλου σώματος.\n" -"Για βασικές διαρθρώσεις, δεν χρειάζεται να συνδέσεις τα σώματα μεταξύ τους, με αυτόν τον τρόπο." +"Κάνε ταυτοποίηση ενός <strong>γονέα</strong> αν αυτός ο τομέας είναι από μόνος του μέρος ενός άλλου τομέα.\n" +"Για βασικές διαρθρώσεις, δεν χρειάζεται να συνδέσεις τους τομείς μεταξύ τους, με αυτόν τον τρόπο." -#: templates/web/base/admin/body.html:125 +#: templates/web/base/admin/body.html:133 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 "Αν δύο ή περισσότερα σώματα υπηρετούν την ίδια περιοχή, το FixMyStreet συνδυάζει τις ίδιες κατηγορίες σε μία ενιαία καταχώριση στο μενού. Αν θες να χρησιμοποιήσεις αυτή τη δυνατότητα, βεβαιώσου ότι σε κάθε σώμα το όνομα της συγκεκριμένης κατηγορίας είναι ίδιο." +msgstr "Αν δύο ή περισσότεροι τομείς υπηρετούν την ίδια περιοχή, το FixMyStreet συνδυάζει τις ίδιες κατηγορίες σε μία ενιαία καταχώριση στο μενού. Αν θες να χρησιμοποιήσεις αυτή τη δυνατότητα, βεβαιώσου ότι σε κάθε τομέα το όνομα της συγκεκριμένης κατηγορίας είναι ίδιο." #: templates/web/base/email_sent.html:19 msgid "If you do not, your alert will not be activated." -msgstr "Εάν όχι, η ειδοποίησή σας δεν θα υποβληθεί." +msgstr "Αλλιώς, η ειδοποίησή σας δεν θα υποβληθεί." #: templates/web/base/email_sent.html:15 msgid "If you do not, your problem will not be posted." -msgstr "Εάν όχι, το πρόβλημα δεν θα υποβληθεί." +msgstr "Αλλιώς, το πρόβλημα δεν θα υποβληθεί." #: templates/web/base/email_sent.html:17 msgid "If you do not, your update will not be posted." -msgstr "Εάν όχι, η ενημέρωση δεν θα υποβληθεί." +msgstr "Αλλιώς, η ενημέρωση δεν θα υποβληθεί." -#: templates/web/base/report/new/councils_text_none.html:9 +#: templates/web/base/questionnaire/completed.html:8 +msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." +msgstr "Αν μάθεις περισσότερες πληροφορίες για την κατάσταση του προβλήματός σου, σε παρακαλούμε να επιστρέψεις στην ιστοσελίδα και να γράψεις μια σχετική ενημέρωση." + +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:8 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 "Αν υποβάλεις ένα πρόβλημα εδώ, το θέμα και οι λεπτομέρειες του προβλήματος θα είναι δημόσιες, αλλά το πρόβλημα <strong>δεν</strong> θα υποβληθεί στο συμβούλιο." +msgstr "Αν υποβάλεις ένα πρόβλημα εδώ, το θέμα και οι λεπτομέρειες του προβλήματος θα είναι δημόσιες, αλλά το πρόβλημα <strong>δεν</strong> θα υποβληθεί στην υπηρεσία." #: templates/web/base/auth/token.html:22 templates/web/base/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." @@ -1349,14 +1311,14 @@ 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 "Αν επιθυμείς να αφήσεις μία δημόσια ενημέρωση για το πρόβλημα, παρακαλούμε γράψ' την εδώ (σημείωση: δεν θα αποσταλεί στο συμβούλιο). Για παράδειγμα, ποια ήταν η εμπειρία που είχες κατά τη διόρθωση του προβλήματος;" +msgstr "Αν επιθυμείς να αφήσεις μία δημόσια ενημέρωση για το πρόβλημα, παρακαλούμε γράψ' την εδώ (σημείωση: δεν θα αποσταλεί στην υπηρεσία). Για παράδειγμα, ποια ήταν η εμπειρία που είχες για την διόρθωση του προβλήματος;" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/body.html:149 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "Αν χρησιμοποιείς κάποια μέθοδο αποστολής <strong>εκτός από email</strong>, γράψε το ID της υπηρεσίας (Open311) ή κάποιο ισοδύναμο ID εδώ." -#: templates/web/base/admin/body-form.html:200 -#: templates/web/base/admin/body-form.html:201 +#: templates/web/base/admin/body-form.html:207 +#: templates/web/base/admin/body-form.html:208 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" @@ -1365,22 +1327,22 @@ msgstr "" "Αν έχεις ενεργοποιήσει την αποστολή ενημερώσεων μέσω Open311 παραπάνω, το Open311 συνήθως δέχεται μόνο τις καταστάσεις OPEN ή CLOSED στις ενημερώσεις του. Ενεργοποίησε τις <strong>πρόσθετες καταστάσεις Open311</strong> αν επιθυμείς να επιτρέψεις τη χρήση επιπλέον καταστάσεων.\n" "Έλεγξε ότι το cobrand σου υποστηρίζει αυτή τη λειτουργία πριν την ενεργοποιήσεις." -#: templates/web/base/admin/body-form.html:187 -#: templates/web/base/admin/body-form.html:188 +#: templates/web/base/admin/body-form.html:194 +#: templates/web/base/admin/body-form.html:195 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 "Αν έχεις ενεργοποιήσει την αποστολή ενημερώσεων μέσω Open311 παραπάνω, ενεργοποίησε την <strong>απόκρυψη ειδοποιήσεων</strong> αν <strong>δεν</strong> επιθυμείς να ειδοποιείται ο συγκεκριμένος χρήστης όποτε δημιουργούνται αυτές οι ενημερώσεις." -#: templates/web/base/admin/body-form.html:173 -#: templates/web/base/admin/body-form.html:174 +#: templates/web/base/admin/body-form.html:177 +#: templates/web/base/admin/body-form.html:178 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 "Αν έχεις ενεργοποιήσει την αποστολή ενημερώσεων μέσω Open311 παραπάνω, πρέπει να προσδιορίσεις ποιος <strong>χρήστης</strong> του FixMyStreet θα χαρακτηρίζεται ως ο δημιουργός αυτών των ενημερώσεων όποτε εμφανίζονται στην ιστοσελίδα. Παρακαλούμε γράψε τον αριθμό ID αυτού του χρήστη." -#: perllib/FixMyStreet/App/Controller/Contact.pm:127 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 msgid "Illegal ID" msgstr "Λανθασμένη ID" @@ -1405,17 +1367,21 @@ msgstr "Βρίσκεται στον πίνακα καταχρήσεων;" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "Επιπλέον, θα επιστραφούν οι παρακάτω ιδιότητες που δεν περιλαμβάνονται στις προδιαγραφές του Open311 v2: agency_sent_datetime, title (επιστρέφεται επίσης ως μέρος της περιγραφής), interface_used, comment_count, requestor_name (υπάρχει μόνο εφόσον ο αιτών επιτρέψει την εμφάνιση του ονόματός του στην ιστοσελίδα)." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:38 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:144 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 #: templates/web/fixmystreet/report/banner.html:19 -#: templates/web/zurich/admin/header.html:2 +#: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 #: templates/web/zurich/admin/report_edit.html:99 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "Σε εξέλιξη" +#: templates/web/base/tokens/confirm_alert.html:11 +msgid "Inbox zero, here we come!" +msgstr "Δεν έχετε νέα μηνύματα!" + #: templates/web/zurich/admin/report_edit.html:160 msgid "Include reporter personal details" msgstr "Να περιλαμβάνονται οι προσωπικές πληροφορίες του υποβολέα" @@ -1424,7 +1390,7 @@ msgstr "Να περιλαμβάνονται οι προσωπικές πληρο msgid "Include unconfirmed reports" msgstr "Να περιλαμβάνονται μη επιβεβαιωμένες αναφορές" -#: perllib/FixMyStreet/App/Controller/Open311.pm:354 +#: perllib/FixMyStreet/App/Controller/Open311.pm:359 msgid "Incorrect has_photo value \"%s\"" msgstr "Εσφαλμένη τιμή has_photo \"%s\"" @@ -1432,29 +1398,29 @@ msgstr "Εσφαλμένη τιμή has_photo \"%s\"" msgid "Internal notes" msgstr "Εσωτερικές οδηγίες" -#: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:61 msgid "Internal referral" msgstr "Εσωτερική αναφορά" -#: perllib/FixMyStreet/App/Controller/Open311.pm:339 +#: perllib/FixMyStreet/App/Controller/Open311.pm:344 msgid "Invalid agency_responsible value %s" msgstr "Εσφαλμένη τιμή agency_responsible %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1114 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1112 msgid "Invalid end date" msgstr "Λανθασμένη ημερομηνία λήξης" -#: perllib/FixMyStreet/App/Controller/Open311.pm:432 +#: perllib/FixMyStreet/App/Controller/Open311.pm:437 msgid "Invalid format %s specified." msgstr "Λανθασμένη μορφοποίηση %s." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1110 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 msgid "Invalid start date" msgstr "Λανθασμένη ημερομηνία έναρξης" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:37 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:50 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 #: templates/web/base/report/update-form.html:30 @@ -1468,8 +1434,12 @@ msgstr "Γίνεται διερεύνηση" msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "Συχνά είναι γρηγορότερο να <a href=\"%s\">ελέγξεις τις Συχνές Ερωτήσεις</a> για να δεις αν η απάντηση που ψάχνεις βρίσκεται εκεί." +#: templates/web/base/tokens/confirm_problem.html:14 +msgid "It’s on its way to the council right now." +msgstr "Το δημοτικό συμβούλιο ενημερώνεται για το πρόβλημα." + #: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:150 +#: templates/web/base/report/new/fill_in_details_form.html:131 #: templates/web/base/report/update-form.html:104 #: templates/web/fixmystreet/auth/general.html:47 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 @@ -1478,12 +1448,12 @@ msgstr "Συχνά είναι γρηγορότερο να <a href=\"%s\">ελέ msgid "Keep me signed in on this computer" msgstr "Να παραμείνω συνδεδεμένος από αυτήν τη συσκευή" -#: templates/web/base/admin/body.html:62 +#: templates/web/base/admin/body.html:70 #: templates/web/zurich/admin/body.html:16 msgid "Last editor" msgstr "Τελευταίος επεξεργαστής" -#: templates/web/base/admin/report_edit.html:72 +#: templates/web/base/admin/report_edit.html:88 msgid "Last update:" msgstr "Τελευταία ενημέρωση" @@ -1491,62 +1461,67 @@ msgstr "Τελευταία ενημέρωση" msgid "Last update:" msgstr "Τελευταία ενημέρωση:" -#: templates/web/base/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:229 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." -msgstr "Άφησέ το κενό αν όλες οι αναφορές σε αυτό το σώμα πρέπει να στέλνονται με την ίδια μέθοδο αποστολής (π.χ., \"%s\")." +msgstr "Άφησέ το κενό αν όλες οι αναφορές σε αυτόν τον τομέα πρέπει να στέλνονται με την ίδια μέθοδο αποστολής (π.χ., \"%s\")." -#: templates/web/base/admin/body.html:17 templates/web/base/admin/body.html:19 +#: templates/web/base/admin/body.html:27 msgid "List all reported problems" msgstr "Λίστα όλων των αναφερθέντων προβλημάτων" -#: templates/web/base/report/new/fill_in_details_form.html:69 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:54 -#: templates/web/zurich/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/category_wrapper.html:4 msgid "Loading..." msgstr "Φορτώνει..." #: templates/web/base/alert/choose.html:1 #: templates/web/base/alert/choose.html:3 #: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3 -#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:5 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5 #: templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 -#: templates/web/base/tokens/confirm_alert.html:4 #: templates/web/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "Τοπικές ροές RSS και ειδοποιήσεις email" -#: templates/web/base/alert/list.html:13 templates/web/base/alert/list.html:14 -#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:3 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:12 +#: templates/web/base/alert/list.html:14 templates/web/base/alert/list.html:3 msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Τοπικές ροές RSS και ειδοποιήσεις email για ‘%s’" -#: templates/web/base/footer.html:13 templates/web/fiksgatami/footer.html:25 -#: templates/web/fiksgatami/nn/footer.html:25 -#: templates/web/fixmystreet/footer.html:28 +#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:28 msgid "Local alerts" msgstr "Τοπικές ειδοποιήσεις" -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:25 msgid "Locate the problem on a map of the area" -msgstr "Εντοπίστε το πρόβλημα στον χάρτη της περιοχής" +msgstr "Εντόπισε το πρόβλημα στον χάρτη της περιοχής" #: templates/web/base/js/translation_strings.html:43 msgid "MAP" msgstr "ΧΑΡΤΗΣ" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" -msgstr "" +msgstr "Χάρτης" -#: perllib/FixMyStreet/Map/OSM.pm:42 -msgid "Map © <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 "Χάρτες © <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> και συνεργάτες, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA</a>" +#: templates/web/base/admin/report_edit.html:86 +#, fuzzy +msgid "Mark as sent" +msgstr "σημειωμένο ως κλειστό" -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/user-form.html:44 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." msgstr "Να επισημάνεις ως <strong>επισημασμένους</strong> τους χρήστες των οποίων τη συμπεριφορά θα ήθελες να παρακολουθείς." +#: templates/web/base/reports/index.html:24 +msgid "Marked fixed/closed in the past eight weeks" +msgstr "" + +#: templates/web/base/reports/index.html:25 +msgid "Marked fixed/closed more than eight weeks ago" +msgstr "" + #: templates/web/fixmystreet/contact/index.html:106 msgid "Message" msgstr "Μήνυμα" @@ -1555,7 +1530,7 @@ msgstr "Μήνυμα" msgid "Message:" msgstr "Μήνυμα:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:440 +#: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" msgstr "Λείπει το jurisdiction_id" @@ -1585,11 +1560,11 @@ msgstr "Περισσότερα προβλήματα στην περιοχή" #: templates/web/fixmystreet/report/update-form.html:138 #: 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:94 +#: templates/web/zurich/report/new/fill_in_details_form.html:77 msgid "Name" msgstr "Όνομα" -#: templates/web/base/admin/report_edit.html:66 +#: templates/web/base/admin/report_edit.html:79 #: templates/web/base/admin/update_edit.html:32 #: templates/web/base/admin/user-form.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:43 @@ -1598,45 +1573,45 @@ msgstr "Όνομα" msgid "Name:" msgstr "Όνομα:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:321 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:313 msgid "Name: %s" msgstr "Όνομα: %s" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:186 -#: perllib/FixMyStreet/Geocode/OSM.pm:164 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 +#: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" -msgstr "Πλησιέστερη ονομασμένη οδός στην καρφίτσα που τοποθετήθηκε στον χάρτη (παρέχεται αυτόματα από το OpenStreetMap): %s%s" +msgstr "Η οδός που βρίσκεται πλησιέστερα στην καρφίτσα που τοποθετήθηκε στον χάρτη (παρέχεται αυτόματα από το OpenStreetMap): %s%s" -#: perllib/FixMyStreet/Cobrand/UK.pm:137 +#: perllib/FixMyStreet/Cobrand/UK.pm:127 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" -msgstr "Πλησιέστερος ταχυδρομικός κώδικας στην καρφίτσα που τοποθετήθηκε στον χάρτη (παρέχεται αυτόματα): %s (%sm μακριά)" +msgstr "Ο ταχυδρομικός κώδικας που βρίσκεται πλησιέστερα στην καρφίτσα που τοποθετήθηκε στον χάρτη (παρέχεται αυτόματα): %s (%sm μακριά)" -#: perllib/FixMyStreet/Cobrand/Default.pm:421 -#: perllib/FixMyStreet/Cobrand/Default.pm:461 +#: perllib/FixMyStreet/Cobrand/Default.pm:442 +#: perllib/FixMyStreet/Cobrand/Default.pm:482 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" -msgstr "Πλησιέστερη οδός στην καρφίτσα που τοποθετήθηκε στον χάρτη (παρέχεται αυτόματα από το Bing Maps): %s" +msgstr "Η οδός που βρίσκεται πλησιέστερα στην καρφίτσα που τοποθετήθηκε στον χάρτη (παρέχεται αυτόματα από το Bing Maps): %s" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:277 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" msgstr "" -"Πλησιέστερη οδός στην καρφίτσα που τοποθετήθηκε στον χάρτη (παρέχεται αυτόματα από το Bing Maps): %s\n" +"Η οδός που βρίσκεται πλησιέστερα στην καρφίτσα που τοποθετήθηκε στον χάρτη (παρέχεται αυτόματα από το Bing Maps): %s\n" "\n" #: templates/web/base/email_sent.html:3 msgid "Nearly Done! Now check your email..." -msgstr "Σχεδόν Τελειώσαμε! Τώρα έλεγξε το email σου..." +msgstr "Σχεδόν τελειώσαμε! Τώρα έλεγξε το email σου..." #: templates/web/base/reports/index.html:21 msgid "New <br>problems" msgstr "Νέα <br>προβλήματα" -#: perllib/FixMyStreet/App/Controller/Admin.pm:264 +#: perllib/FixMyStreet/App/Controller/Admin.pm:261 msgid "New body added" -msgstr "Προστέθηκε νέο σώμα" +msgstr "Προστέθηκε νέος τομέας" -#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:379 msgid "New category contact added" msgstr "Προστέθηκε νέα επαφή κατηγορίας" @@ -1655,7 +1630,7 @@ msgstr "Νέες τοπικές αναφορές στο reportemptyhomes.com" #: db/alert_types.pl:38 msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" -msgstr "Νέα προβλήματα για το {{COUNCIL}} στην πτέρυγα {{WARD}} στο FixMyStreet" +msgstr "Νέα προβλήματα για το {{COUNCIL}} στην περιοχή {{WARD}} στο FixMyStreet" #: db/alert_types.pl:26 db/alert_types.pl:30 msgid "New problems near {{POSTCODE}} on FixMyStreet" @@ -1679,7 +1654,7 @@ msgstr "Νέες αναφορές" #: db/alert_types_eha.pl:23 msgid "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com" -msgstr "Νέες αναφορές για το {{COUNCIL}} στην πτέρυγα {{WARD}} στο reportemptyhomes.com" +msgstr "Νέες αναφορές για το {{COUNCIL}} στην περιοχή {{WARD}} στο reportemptyhomes.com" #: db/alert_types_eha.pl:5 msgid "New reports on reportemptyhomes.com" @@ -1709,15 +1684,15 @@ msgstr "Νέα ενημέρωση:" msgid "Next" msgstr "Επόμενο" -#: templates/web/base/admin/body.html:72 templates/web/base/admin/body.html:74 -#: templates/web/base/admin/body.html:78 templates/web/base/admin/body.html:80 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:93 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:44 @@ -1729,15 +1704,15 @@ msgstr "Όχι" #: templates/web/base/admin/user-form.html:33 msgid "No body" -msgstr "Κανένα σώμα" +msgstr "Κανένας τομέας" #: templates/web/base/admin/stats.html:85 msgid "No council" -msgstr "Κανένα συμβούλιο" +msgstr "Καμιά υπηρεσία" -#: perllib/FixMyStreet/DB/Result/Problem.pm:376 +#: perllib/FixMyStreet/DB/Result/Problem.pm:401 msgid "No council selected" -msgstr "Κανένα επιλεγμένο συμβούλιο" +msgstr "Δεν επιλέχθηκε κάποια υπηρεσία" #: templates/web/base/admin/edit-league.html:17 msgid "No edits have yet been made." @@ -1776,12 +1751,12 @@ msgid "" " your config file is not pointing to a live MapIt service." msgstr "Δεν είναι διαθέσιμες μέχρι στιγμής συγκεκριμένες περιοχές, επειδή το <code>MAPIT_URL</code> στο αρχείο ρυθμίσεών σου δεν οδηγεί σε μία ενεργή υπηρεσία MapIt." -#: templates/web/base/report/_support.html:3 +#: templates/web/base/report/_support.html:2 #: templates/web/base/report/_support.html:4 msgid "No supporters" msgstr "Δεν υπάρχουν υποστηρικτές" -#: templates/web/base/admin/report_edit.html:30 +#: templates/web/base/admin/report_edit.html:41 #: templates/web/zurich/admin/report_edit-sdm.html:46 #: templates/web/zurich/admin/report_edit.html:60 msgid "None" @@ -1795,12 +1770,12 @@ msgid "" " Depending on the implementation, staff users may have access to the dashboard (summary of\n" " activity across their body), the ability to hide reports or set special report statuses." msgstr "" -"Οι κανονικοί (δημόσιοι) χρήστες δεν θα έπρεπε να είναι συσχετισμένοι με οποιοδήποτε <strong>σώμα</strong>.<br>\n" -"Χρήστες εξουσιοδοτημένου προσωπικού μπορούν να συσχετιστούν με το σώμα που αντιπροσωπεύουν.<br>\n" -"Ανάλογα με την υλοποίηση, οι χρήστες προσωπικού ίσως έχουν πρόσβαση στον πίνακα εργαλείων (περίληψη της δραστηριότητάς τους μέσα στο σώμα), τη δυνατότητα να κρύβουν αναφορές ή να ορίζουν ειδικές αναφορές κατάστασης." +"Οι κανονικοί (δημόσιοι) χρήστες δεν θα έπρεπε να είναι συσχετισμένοι με οποιοδήποτε <strong>τομέα</strong>.<br>\n" +"Χρήστες εξουσιοδοτημένου προσωπικού μπορούν να συσχετιστούν με τον τομέα που αντιπροσωπεύουν.<br>\n" +"Ανάλογα με την υλοποίηση, οι χρήστες προσωπικού ίσως έχουν πρόσβαση στον πίνακα εργαλείων (περίληψη της δραστηριότητάς τους μέσα στον τομέα), τη δυνατότητα να κρύβουν αναφορές ή να ορίζουν ειδικές αναφορές κατάστασης." -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:46 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -1816,12 +1791,12 @@ msgstr "Δεν αφορά το τμήμα μου" msgid "Not reported before" msgstr "Δεν αναφέρθηκε στο παρελθόν" -#: templates/web/base/report/_main.html:61 +#: templates/web/base/report/_main.html:62 msgid "Not reported to council" -msgstr "Δεν αναφέρθηκε στο συμβούλιο" +msgstr "Δεν αναφέρθηκε σε υπηρεσία" -#: templates/web/base/admin/body.html:63 -#: templates/web/base/admin/category_edit.html:87 +#: templates/web/base/admin/body.html:71 +#: templates/web/base/admin/category_edit.html:92 #: templates/web/zurich/admin/body.html:17 msgid "Note" msgstr "Σημείωση" @@ -1830,8 +1805,8 @@ msgstr "Σημείωση" 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/base/admin/body.html:178 -#: templates/web/base/admin/category_edit.html:44 +#: templates/web/base/admin/body.html:186 +#: templates/web/base/admin/category_edit.html:49 #: templates/web/zurich/admin/body.html:53 msgid "Note:" msgstr "Σημείωση:" @@ -1844,7 +1819,7 @@ msgstr "Σημείωση: <strong>%s</strong>" msgid "Now to submit your report…" msgstr "Τώρα, για να υποβάλεις την αναφορά σου…" -#: templates/web/base/report/new/fill_in_details_form.html:132 +#: templates/web/base/report/new/fill_in_details_form.html:113 msgid "Now to submit your report… do you have a FixMyStreet password?" msgstr "Τώρα, για να υποβάλεις την αναφορά σου… έχεις κωδικό στο FixMyStreet;" @@ -1861,7 +1836,7 @@ msgid "OK" msgstr "ΟΚ" #: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:16 +#: templates/web/base/report/update.html:17 msgid "Offensive? Unsuitable? Tell us" msgstr "Προσβλητικό; Ακατάλληλο; Πες μας" @@ -1881,19 +1856,19 @@ msgstr "Παλιά <br>διορθωμένα" msgid "Older <br>problems" msgstr "Παλιά <br>προβλήματα" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:37 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 msgid "One-line summary" msgstr "Περίληψη μιας γραμμής" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:137 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:36 -#: templates/web/base/admin/report_edit.html:37 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:138 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:49 +#: templates/web/base/admin/report_edit.html:50 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/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:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/report_edit.html:86 #: templates/web/zurich/admin/report_edit.html:88 @@ -1902,10 +1877,19 @@ msgstr "Περίληψη μιας γραμμής" msgid "Open" msgstr "Ανοιχτό" -#: templates/web/base/my/my.html:30 templates/web/fixmystreet/my/my.html:36 +#: templates/web/base/reports/index.html:22 +msgid "Open for more than four weeks, with an update within the past eight weeks" +msgstr "" + +#: templates/web/base/my/my.html:30 +#: templates/web/fixmystreet/my/_problem-list.html:2 msgid "Open reports" msgstr "Ανοιχτές αναφορές" +#: templates/web/base/reports/index.html:23 +msgid "Open, but not had any update in eight weeks" +msgstr "" + #: templates/web/base/open311/index.html:70 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "Open311 API για τον server του mySociety FixMyStreet" @@ -1926,17 +1910,17 @@ msgstr "Ή προβλήματα που αναφέρθηκαν σε:" #: templates/web/base/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’re in:" -msgstr "Ή μπορείς να γίνεις συνδρομητής σε μία ειδοποίηση βάσει της πτέρυγας ή του συμβουλίου στο οποίο βρίσκεσαι:" +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:560 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 -#: perllib/FixMyStreet/DB/Result/Problem.pm:592 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:372 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 +#: perllib/FixMyStreet/DB/Result/Problem.pm:597 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:393 msgid "Other" msgstr "Άλλα" @@ -1958,8 +1942,8 @@ msgstr "Η σελίδα δεν βρέθηκε" msgid "Parent" msgstr "Πηγή" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 msgid "Partial" msgstr "Εν μέρει" @@ -1973,13 +1957,13 @@ msgstr "Κωδικός πρόσβασης (προαιρετικό)" #: templates/web/base/auth/change_password.html:25 msgid "Password:" -msgstr "Κωδικός πρόσβασης:" +msgstr "Νέος κωδικός πρόσβασης:" #: templates/web/base/js/translation_strings.html:48 msgid "Permalink" msgstr "Σύνδεσμος" -#: templates/web/zurich/report/new/fill_in_details_form.html:100 +#: templates/web/zurich/report/new/fill_in_details_form.html:83 msgid "Phone number" msgstr "Αριθμός τηλεφώνου" @@ -1988,27 +1972,27 @@ msgstr "Αριθμός τηλεφώνου" msgid "Phone number (optional)" msgstr "Αριθμός τηλεφώνου (προαιρετικό)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:286 -#: templates/web/base/admin/report_edit.html:68 -#: templates/web/base/report/new/fill_in_details_form.html:216 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:291 +#: templates/web/base/admin/report_edit.html:81 +#: templates/web/base/report/new/fill_in_details_form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:46 #: templates/web/zurich/admin/report_edit.html:60 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Τηλέφωνο:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:72 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 #: 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 +#: templates/web/zurich/report/new/fill_in_details_form.html:51 msgid "Photo" msgstr "Φωτογραφία" #: templates/web/base/questionnaire/index.html:71 -#: templates/web/base/report/new/fill_in_details_form.html:103 +#: templates/web/base/report/new/fill_in_details_form.html:84 #: templates/web/base/report/update-form.html:62 #: templates/web/fixmystreet/questionnaire/index.html:91 msgid "Photo:" @@ -2022,11 +2006,11 @@ msgstr "Φωτογραφίες από κοντινές και πρόσφατες msgid "Place pin on map" msgstr "Θέση της περιοχής στο χάρτη" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:38 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/zurich/admin/header.html:2 +#: 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:86 @@ -2060,20 +2044,19 @@ msgstr "Παρακαλούμε έλεγξε το email σου" msgid "Please check your email address is correct" msgstr "Παρακαλούμε έλεγξε αν η διεύθυνση email είναι σωστή" -#: perllib/FixMyStreet/App/Controller/Admin.pm:349 -#: 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:395 +#: perllib/FixMyStreet/App/Controller/Admin.pm:343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:876 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 +#: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" msgstr "Παρακαλούμε επίλεξε μια κατηγορία" -#: perllib/FixMyStreet/DB/Result/Problem.pm:401 +#: perllib/FixMyStreet/DB/Result/Problem.pm:418 msgid "Please choose a property type" msgstr "Παρακαλούμε επίλεξε ένα είδος ακινήτου" -#: perllib/FixMyStreet/App/Controller/Admin.pm:376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:370 msgid "Please correct the errors below" msgstr "Παρακαλούμε διόρθωσε τα παρακάτω λάθη" @@ -2083,14 +2066,14 @@ 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 "Παρακαλούμε <strong>μην</strong> αναφέρεις προβλήματα μέσω αυτής της φόρμας. Τα μηνύματα πηγαίνουν απευθείας στην ομάδα που βρίσκεται πίσω από το FixMyStreet, όχι σε κάποιο συμβούλιο. Για να αναφέρεις ένα πρόβλημα, παρακαλούμε <a href=\"/\">πήγαινε στην αρχική σελίδα</a> και ακολούθησε τις οδηγίες." +msgstr "Παρακαλούμε <strong>μην</strong> αναφέρεις προβλήματα μέσω αυτής της φόρμας. Τα μηνύματα πηγαίνουν απευθείας στην ομάδα που βρίσκεται πίσω από το FixMyStreet, όχι σε κάποια υπηρεσία. Για να αναφέρεις ένα πρόβλημα, παρακαλούμε <a href=\"/\">πήγαινε στην αρχική σελίδα</a> και ακολούθησε τις οδηγίες." #: templates/web/base/report/new/notes.html:6 msgid "Please do not be abusive — abusing your council devalues the service for all users." -msgstr "Παρακαλούμε να μην είσαι καταχρηστικός — η κατάχρηση του συμβουλίου απαξιώνει την υπηρεσία για όλους τους χρήστες." +msgstr "Παρακαλούμε να μην κάνεις κατάχρηση — η κατάχρηση της υπηρεσίας υποβαθμίζει την αξία της για όλους τους χρήστες." -#: perllib/FixMyStreet/App/Controller/Admin.pm:352 -#: perllib/FixMyStreet/DB/Result/Comment.pm:133 +#: perllib/FixMyStreet/App/Controller/Admin.pm:346 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "Παρακαλούμε γράψε ένα μήνυμα" @@ -2101,15 +2084,15 @@ msgstr "Παρακαλούμε γράψε ένα μήνυμα" msgid "Please enter a password" msgstr "Παρακαλούμε γράψε έναν κωδικό πρόσβασης" -#: perllib/FixMyStreet/App/Controller/Contact.pm:108 -#: perllib/FixMyStreet/DB/Result/Problem.pm:370 +#: perllib/FixMyStreet/App/Controller/Contact.pm:113 +#: perllib/FixMyStreet/DB/Result/Problem.pm:395 #: templates/web/base/js/translation_strings.html:3 msgid "Please enter a subject" msgstr "Παρακαλούμε γράψε ένα θέμα" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1050 -#: perllib/FixMyStreet/App/Controller/Admin.pm:351 -#: perllib/FixMyStreet/App/Controller/Admin.pm:997 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin.pm:995 #: perllib/FixMyStreet/DB/Result/User.pm:127 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 @@ -2117,16 +2100,16 @@ msgid "Please enter a valid email" msgstr "Παρακαλούμε γράψε ένα έγκυρο email" #: perllib/FixMyStreet/App/Controller/Alert.pm:346 -#: perllib/FixMyStreet/App/Controller/Contact.pm:118 +#: perllib/FixMyStreet/App/Controller/Contact.pm:123 msgid "Please enter a valid email address" msgstr "Παρακαλούμε γράψε μία έγκυρη διεύθυνση email" -#: perllib/FixMyStreet/DB/Result/Problem.pm:373 +#: perllib/FixMyStreet/DB/Result/Problem.pm:398 #: templates/web/base/js/translation_strings.html:4 msgid "Please enter some details" msgstr "Παρακαλούμε γράψε μερικές λεπτομέρειες" -#: perllib/FixMyStreet/App/Controller/Contact.pm:107 +#: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/User.pm:124 #: templates/web/base/auth/general.html:13 #: templates/web/base/auth/general.html:8 @@ -2140,7 +2123,7 @@ msgid "Please enter your email" msgstr "Παρακαλούμε γράψε το email σου" #: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:75 msgid "Please enter your email address" msgstr "Παρακαλούμε γράψε τη διεύθυνση email σου" @@ -2148,14 +2131,14 @@ msgstr "Παρακαλούμε γράψε τη διεύθυνση email σου" msgid "Please enter your first name" msgstr "Παρακαλούμε γράψε το όνομά σου" -#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: perllib/FixMyStreet/Cobrand/UK.pm:318 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" -msgstr "Παρακαλούμε γράψε το ονοματεπώνυμό σου, τα συμβούλια χρειάζονται αυτή την πληροφορία – αν δεν επιθυμείς να εμφανίζεται το όνομά σου στην ιστοσελίδα, ξετσέκαρε το πεδίο παρακάτω" +msgstr "Παρακαλούμε γράψε το ονοματεπώνυμό σου, οι υπηρεσίες χρειάζονται αυτή την πληροφορία – αν δεν επιθυμείς να εμφανίζεται το όνομά σου στην ιστοσελίδα, ξετσέκαρε το πεδίο παρακάτω" -#: perllib/FixMyStreet/App/Controller/Contact.pm:106 -#: perllib/FixMyStreet/DB/Result/Comment.pm:130 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Contact.pm:111 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 +#: perllib/FixMyStreet/DB/Result/Problem.pm:406 #: perllib/FixMyStreet/DB/Result/User.pm:120 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" @@ -2178,7 +2161,7 @@ msgstr "Παρακαλούμε γράψε τον τίτλο σου" msgid "Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a href=\"/\">front page</a>." msgstr "Μη διστάσεις να <a href=\"%s\">συνδεθείς ξανά</a>, ή να επιστρέψεις στην <a href=\"/\">αρχική σελίδα</a>." -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:8 msgid "Please fill in details of the problem below." msgstr "Παρακαλούμε συμπλήρωσε τις λεπτομέρειες του προβλήματος παρακάτω." @@ -2193,17 +2176,17 @@ msgstr "Παρακαλούμε συμπλήρωσε τις λεπτομέρει msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "Παρακαλούμε συμπλήρωσε την παρακάτω φόρμα με τις λεπτομέρειες του προβλήματος, και περίγραψε την τοποθεσία όσο ακριβέστερα γίνεται στο πεδίο με τις λεπτομέρειες." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:251 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 "Παρακαλούμε σημείωσε ότι οι ενημερώσεις δεν στέλνονται στο συμβούλιο." +msgstr "Παρακαλούμε σημείωσε ότι οι ενημερώσεις δεν στέλνονται στην υπηρεσία." #: templates/web/base/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 "Παρακαλούμε σημείωσε ότι οι ενημερώσεις δεν στέλνονται στο συμβούλιο. Αν αφήσεις το όνομά σου θα είναι δημόσιο. Οι πληροφορίες θα χρησιμοποιηθούν μόνο σύμφωνα με την <a href=\"/faq#privacy\">πολιτική απορρήτου</a>" +msgstr "Παρακαλούμε σημείωσε ότι οι ενημερώσεις δεν στέλνονται στην υπηρεσία. Αν αφήσεις το όνομά σου θα είναι δημόσιο. Οι πληροφορίες θα χρησιμοποιηθούν μόνο σύμφωνα με την <a href=\"/faq#privacy\">πολιτική απορρήτου</a>" #: templates/web/base/report/new/fill_in_details_form.html:8 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:21 @@ -2216,18 +2199,18 @@ msgstr "Παρακαλούμε σημείωσε ότι η αναφορά σου msgid "Please note:" msgstr "Παρακαλούμε σημείωσε ότι:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:246 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:254 msgid "Please provide some explanation as to why you're reopening this report" msgstr "Παρακαλούμε δώσε μερικές εξηγήσεις για τους λόγους που ξανανοίγεις αυτή την αναφορά" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:261 msgid "Please provide some text as well as a photo" -msgstr "Παρακαλούμε γράψε μερικό κείμενο καθώς και μία φωτογραφία" +msgstr "Παρακαλούμε γράψε κείμενο καθώς και δώσε μία φωτογραφία" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:247 msgid "Please say whether you've ever reported a problem to your council before" -msgstr "Παρακαλούμε πες αν έχεις ξαναναφέρει ένα πρόβλημα στο συμβούλιό σου στο παρελθόν" +msgstr "Παρακαλούμε πες αν έχεις ξαναναφέρει ένα πρόβλημα στην υπηρεσία στο παρελθόν" #: perllib/FixMyStreet/App/Controller/Alert.pm:80 msgid "Please select the feed you want" @@ -2237,7 +2220,7 @@ msgstr "Παρακαλούμε επίλεξε τη ροή που επιθυμε msgid "Please select the type of alert you want" msgstr "Παρακαλούμε επίλεξε το είδος της ειδοποίησης που επιθυμείς" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please state whether or not the problem has been fixed" msgstr "Παρακαλούμε δήλωσε αν το πρόβλημα έχει διορθωθεί ή όχι" @@ -2245,15 +2228,13 @@ msgstr "Παρακαλούμε δήλωσε αν το πρόβλημα έχει msgid "Please take a look at the updates that have been left." msgstr "Παρακαλούμε ρίξε μια ματιά στις ενημερώσεις που έχουν μείνει" -#: perllib/FixMyStreet/App/Controller/Photo.pm:176 +#: perllib/FixMyStreet/App/Controller/Photo.pm:177 +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 +#: perllib/FixMyStreet/App/Controller/Photo.pm:189 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 "Παρακαλούμε ανέβασε μία εικόνα JPEG μόνο\n" - -#: perllib/FixMyStreet/App/Controller/Contact.pm:109 +#: perllib/FixMyStreet/App/Controller/Contact.pm:114 msgid "Please write a message" msgstr "Παρακαλούμε γράψε ένα μήνυμα" @@ -2292,14 +2273,14 @@ msgstr "Προηγούμενα" msgid "Privacy" msgstr "Ιδιωτικότητα" -#: templates/web/base/admin/body.html:194 -#: templates/web/base/admin/body.html:77 -#: templates/web/base/admin/category_edit.html:40 -#: templates/web/base/admin/report_edit.html:79 +#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:85 +#: templates/web/base/admin/category_edit.html:45 +#: templates/web/base/admin/report_edit.html:95 msgid "Private" msgstr "Ιδιωτικό" -#: templates/web/base/maps/openlayers.html:86 +#: templates/web/base/maps/openlayers.html:89 msgid "Problem" msgstr "Πρόβλημα" @@ -2313,14 +2294,14 @@ msgstr "Το πρόβλημα %s επιβεβαιώθηκε" #: templates/web/base/admin/timeline.html:26 msgid "Problem %s sent to council %s" -msgstr "Το πρόβλημα %s στάλθηκε στο συμβούλιο %s" +msgstr "Το πρόβλημα %s στάλθηκε στην υπηρεσία %s" #: templates/web/base/admin/index.html:47 #: templates/web/zurich/admin/index.html:9 msgid "Problem breakdown by state" msgstr "Ανάλυση προβλήματος ανά κατάσταση" -#: perllib/FixMyStreet/App/Controller/Admin.pm:968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:966 msgid "Problem marked as open." msgstr "Το πρόβλημα επισημάνθηκε ως ανοιχτό." @@ -2353,20 +2334,19 @@ msgstr "Προσφάτως αναφερθέντα προβλήματα διορ #: templates/web/base/alert/_list.html:19 #: templates/web/fixmystreet/alert/_list.html:21 msgid "Problems within %.1fkm of this location" -msgstr "Προβλήματα σε ακτίνα %.1fχμ από αυτήν την τοποθεσία" +msgstr "Λήψη ειδοποιήσεων για προβλήματα σε ακτίνα %.1f χλμ από εδώ" -#: perllib/FixMyStreet/Cobrand/Default.pm:629 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:114 +#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:151 -#: perllib/FixMyStreet/Cobrand/UK.pm:217 +#: perllib/FixMyStreet/Cobrand/UK.pm:207 msgid "Problems within %s" -msgstr "Προβλήματα στο %s" +msgstr "Προβλήματα στο "%s"" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:122 -#: perllib/FixMyStreet/Cobrand/UK.pm:231 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "Problems within %s ward" -msgstr "Προβλήματα στην πτέρυγα %s" +msgstr "Προβλήματα στην περιοχή "%s"" #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:24 @@ -2382,7 +2362,7 @@ msgstr "Προβλήματα μέσα στα όρια του:" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "Ιδιοκτησίες που πρόσφατα αναφέρθηκε ότι επαναλειτουργούν στο reportemptyhomes.com" -#: templates/web/base/admin/report_edit.html:32 +#: templates/web/base/admin/report_edit.html:45 msgid "Property address:" msgstr "Διεύθυνση ακινήτου:" @@ -2399,7 +2379,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/base/report/new/fill_in_details_form.html:174 +#: templates/web/base/report/new/fill_in_details_form.html:155 #: templates/web/base/report/update-form.html:128 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 #: templates/web/fixmystreet/report/update-form.html:119 @@ -2420,7 +2400,7 @@ msgstr "Δημοσίευσε τη φωτογραφία" msgid "Publish the response" msgstr "Δημοσίευσε την απάντηση" -#: templates/web/base/questionnaire/completed.html:2 +#: templates/web/base/questionnaire/completed.html:1 #: templates/web/base/questionnaire/index.html:0 #: templates/web/base/questionnaire/index.html:14 #: templates/web/base/questionnaire/index.html:4 @@ -2439,11 +2419,12 @@ msgstr "Το ερωτηματολόγιο %d απαντήθηκε για το π msgid "Questionnaire %d sent for problem %d" msgstr "Το ερωτηματολόγιο %d στάλθηκε για το πρόβλημα %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 msgid "Questionnaire filled in by problem reporter" msgstr "Το ερωτηματολόγιο συμπληρώθηκε από τον υποβολέα του προβλήματος" #: templates/web/base/alert/_list.html:21 +#: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display.html:50 #: templates/web/base/reports/_rss.html:1 @@ -2453,29 +2434,25 @@ msgstr "Το ερωτηματολόγιο συμπληρώθηκε από τον msgid "RSS feed" msgstr "Ροή RSS" -#: perllib/FixMyStreet/Cobrand/UK.pm:260 perllib/FixMyStreet/Cobrand/UK.pm:272 +#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 msgid "RSS feed for %s" -msgstr "Ροή RSS για %s" +msgstr "Ροή RSS για "%s"" -#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "RSS feed for %s ward, %s" -msgstr "Ροή RSS για την πτέρυγα %s, %s" +msgstr "Ροή RSS για την περιοχή %s, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:167 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:175 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:185 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:193 -#: perllib/FixMyStreet/Cobrand/UK.pm:286 perllib/FixMyStreet/Cobrand/UK.pm:298 +#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 msgid "RSS feed of %s" msgstr "Ροή RSS από %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 msgid "RSS feed of %s, within %s ward" -msgstr "Ροή RSS από %s, στην πτέρυγα %s" +msgstr "Ροή RSS από %s, στην περιοχή "%s"" #: templates/web/base/alert/_list.html:21 #: templates/web/fixmystreet/alert/_list.html:22 @@ -2484,22 +2461,21 @@ msgstr "Ροή RSS για κοντινά προβλήματα" #: templates/web/base/reports/_rss.html:1 msgid "RSS feed of problems in this %s" -msgstr "Ροή RSS για προβλήματα σε αυτό το %s" +msgstr "Ροή RSS για προβλήματα σε αυτό το "%s"" -#: perllib/FixMyStreet/Cobrand/Default.pm:630 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:115 +#: perllib/FixMyStreet/Cobrand/Default.pm:651 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:150 -#: perllib/FixMyStreet/Cobrand/UK.pm:224 +#: perllib/FixMyStreet/Cobrand/UK.pm:214 msgid "RSS feed of problems within %s" -msgstr "Ροή RSS για προβλήματα στο %s" +msgstr "Ροή RSS για προβλήματα στο "%s"" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 -#: perllib/FixMyStreet/Cobrand/UK.pm:230 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s ward" -msgstr "Ροή RSS για προβλήματα στην πτέρυγα %s" +msgstr "Ροή RSS για προβλήματα στην περιοχή "%s"" -#: templates/web/base/around/display_location.html:3 +#: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:4 msgid "RSS feed of recent local problems" msgstr "Ροή RSS για πρόσφατα τοπικά προβλήματα" @@ -2529,25 +2505,28 @@ msgstr "Πρόσφατα <br>διορθωμένα" #: templates/web/base/index.html:30 #: templates/web/fixmystreet/front/recent.html:11 msgid "Recently reported problems" -msgstr "Πρόσφατα διορθωμένα προβλήματα" +msgstr "Πρόσφατες αναφορές προβλημάτων" #: templates/web/zurich/report/new/notes.html:5 msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website." -msgstr "Θυμήσου ότι το FixMyStreet είναι πρωταρχικά για την αναφορά φυσικών προβλημάτων που μπορούν να διορθωθούν. Αν το πρόβλημα δεν είναι κατάλληλο για υποβολή μέσω αυτής της ιστοσελίδας μπορείς να επικοινωνήσεις με το συμβούλιό σου απευθείας μέσω της ιστοσελίδας του." +msgstr "Θυμήσου ότι το FixMyStreet έχει ως πρωταρχικό σκοπό την αναφορά φυσικών προβλημάτων που μπορούν να διορθωθούν. Αν το πρόβλημα δεν είναι κατάλληλο για υποβολή μέσω αυτής της ιστοσελίδας μπορείς να επικοινωνήσεις με την υπηρεσία απευθείας μέσω της ιστοσελίδας της." #: templates/web/base/admin/report_blocks.html:16 msgid "Remove flag" msgstr "Αφαίρεση σήμανσης" -#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/report_edit.html:110 #: templates/web/base/admin/update_edit.html:62 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Αφαίρεση φωτογραφίας (δεν αναιρείται!)" -#: templates/web/base/footer.html:7 templates/web/fiksgatami/footer.html:19 -#: templates/web/fiksgatami/nn/footer.html:19 -#: templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 +msgid "Report" +msgstr "" + +#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 #: templates/web/zurich/footer.html:17 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2557,14 +2536,9 @@ msgstr "Αναφορά προβλήματος" msgid "Report abuse" msgstr "Αναφορά κατάχρησης" -#: templates/web/base/report_created.html:1 -#: templates/web/base/report_created.html:3 -msgid "Report created" -msgstr "Η αναφορά δημιουργήθηκε" - #: perllib/FixMyStreet/App/Controller/Rss.pm:295 msgid "Report on %s" -msgstr "Αναφορά στο %s" +msgstr "Αναφορά στο "%s"" #: templates/web/base/report/new/fill_in_details_form.html:1 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 @@ -2575,7 +2549,7 @@ msgstr "Ανάφερε το πρόβλημά σου" #: templates/web/fixmystreet/around/intro.html:1 #: templates/web/zurich/around/intro.html:1 msgid "Report, view, or discuss local problems" -msgstr "Ανάφερε, δες, ή συζήτησε τοπικά προβλήματα" +msgstr "Ανάφερε, δες ή συζήτησε τα τοπικά προβλήματα" #: templates/web/base/my/my.html:82 msgid "Reported %s" @@ -2585,11 +2559,11 @@ msgstr "Αναφέρθηκε %s" msgid "Reported %s, to %s" msgstr "Αναφέρθηκε %s, στο %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:580 #: templates/web/base/contact/index.html:50 #: templates/web/fixmystreet/contact/index.html:65 msgid "Reported anonymously at %s" -msgstr "Αναφέρθηκε ανώνυμα στο %s" +msgstr "Αναφέρθηκε ανώνυμα στις %s" #: templates/web/base/admin/questionnaire.html:5 #: templates/web/base/questionnaire/index.html:53 @@ -2597,41 +2571,46 @@ msgstr "Αναφέρθηκε ανώνυμα στο %s" msgid "Reported before" msgstr "Αναφέρθηκε προηγουμένως" -#: perllib/FixMyStreet/DB/Result/Problem.pm:598 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 #: templates/web/base/contact/index.html:52 #: templates/web/fixmystreet/contact/index.html:67 msgid "Reported by %s at %s" -msgstr "Αναφέρθηκε από %s στο %s" +msgstr "Αναφέρθηκε από %s στις %s" #: templates/web/zurich/report/_main.html:2 msgid "Reported in the %s category" msgstr "Αναφέρθηκε στην κατηγορία %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:571 +#: perllib/FixMyStreet/DB/Result/Problem.pm:576 msgid "Reported in the %s category anonymously at %s" -msgstr "Αναφέρθηκε στην κατηγορία %s, ανώνυμα στο %s" +msgstr "Αναφέρθηκε στην κατηγορία %s, ανώνυμα στις %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:598 msgid "Reported in the %s category by %s at %s" -msgstr "Αναφέρθηκε στην κατηγορία %s από τον %s στο %s" +msgstr "Αναφέρθηκε στην κατηγορία %s από τον %s στις %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:567 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 msgid "Reported via %s anonymously at %s" -msgstr "Αναφέρθηκε μέσω %s ανώνυμα στο %s" +msgstr "Αναφέρθηκε μέσω %s ανώνυμα στις %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:589 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 msgid "Reported via %s by %s at %s" -msgstr "Αναφέρθηκε μέσω %s από τον %s στο %s" +msgstr "Αναφέρθηκε μέσω %s από τον %s στις %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:563 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 msgid "Reported via %s in the %s category anonymously at %s" -msgstr "Αναφέρθηκε μέσω %s στην κατηγορία %s ανώνυμα στο %s" +msgstr "Αναφέρθηκε μέσω %s στην κατηγορία %s ανώνυμα στις %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:583 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 msgid "Reported via %s in the %s category by %s at %s" -msgstr "Αναφέρθηκε μέσω %s στην κατηγορία %s από τον %s στο %s" +msgstr "Αναφέρθηκε μέσω %s στην κατηγορία %s από τον %s στις %s" -#: templates/web/base/around/around_index.html:2 +#: templates/web/base/reports/index.html:21 +#, fuzzy +msgid "Reported within the last four weeks" +msgstr "Αναφέρθηκε στην κατηγορία %s" + +#: templates/web/base/around/around_index.html:1 #: templates/web/base/around/around_index.html:3 #: templates/web/base/js/translation_strings.html:41 #: templates/web/base/report/new/fill_in_details.html:0 @@ -2641,14 +2620,13 @@ msgstr "Αναφέρθηκε μέσω %s στην κατηγορία %s από msgid "Reporting a problem" msgstr "Αναφορά προβλήματος" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:294 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "Αναφορές" -#: perllib/FixMyStreet/DB/Result/Problem.pm:409 -#: perllib/FixMyStreet/DB/Result/Problem.pm:413 +#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "Οι αναφορές έχουν όριο %s χαρακτήρων. Παρακαλούμε συντόμευσε την αναφορά σου" @@ -2664,7 +2642,7 @@ msgstr "Αναφορές κοντά στον χάρτη" msgid "Reports published" msgstr "Αναφορές που δημοσιεύθηκαν" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:85 msgid "Resend report" msgstr "Επαναποστολή αναφοράς" @@ -2672,36 +2650,35 @@ msgstr "Επαναποστολή αναφοράς" msgid "Right place?" msgstr "Σωστή τοποθεσία;" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:193 -#: perllib/FixMyStreet/Geocode/OSM.pm:171 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:167 +#: perllib/FixMyStreet/Geocode/OSM.pm:152 msgid "Road operator for this named road (derived from road reference number and type): %s" msgstr "Χειριστής δρόμου για την ονομασμένη οδό (που πρόερχεται από τον αριθμό και το είδος αναφοράς οδού): %s" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:190 -#: perllib/FixMyStreet/Geocode/OSM.pm:168 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:164 +#: perllib/FixMyStreet/Geocode/OSM.pm:149 msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Χειριστής δρόμου για την ονομασμένη οδο (από το OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1394 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 -#: templates/web/base/admin/report_edit.html:90 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1403 +#: templates/web/base/admin/report_edit.html:106 #: templates/web/zurich/admin/report_edit.html:73 msgid "Rotate Left" msgstr "Περιστροφή αριστερά" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1394 -#: templates/web/base/admin/report_edit.html:91 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: templates/web/base/admin/report_edit.html:107 #: templates/web/zurich/admin/report_edit.html:74 msgid "Rotate Right" msgstr "Περιστροφή δεξιά" #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" -msgstr "" +msgstr "Δορυφόρος" -#: templates/web/base/admin/body.html:200 -#: templates/web/base/admin/category_edit.html:76 +#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/category_edit.html:81 #: templates/web/zurich/admin/body.html:59 msgid "Save changes" msgstr "Αποθήκευση αλλαγών" @@ -2729,7 +2706,7 @@ msgstr "Αναζήτηση:" msgid "Searching found no reports." msgstr "Η αναζήτηση δε βρήκε καμία αναφορά." -#: templates/web/base/admin/users.html:39 +#: templates/web/base/admin/users.html:41 msgid "Searching found no users." msgstr "Η αναζήτηση δε βρήκε κανένα χρήστη." @@ -2740,7 +2717,7 @@ msgstr "Επίλεξε ένα σώμα" #: templates/web/base/reports/index.html:9 msgid "Select a particular council to see the reports sent there." -msgstr "Επίλεξε ένα συγκεκριμένο συμβούλιο για να δεις τις αναφορές που στάλθηκαν εκεί." +msgstr "Επίλεξε μια συγκεκριμένη υπηρεσία για να δεις τις αναφορές που στάλθηκαν εκεί." #: templates/web/base/admin/body-form.html:71 #: templates/web/zurich/admin/body-form.html:26 @@ -2750,17 +2727,17 @@ msgstr "Διάλεξε μια περιοχή" #: templates/web/base/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 "Διάλεξε ποιον τύπο ειδοποίησης θα προτιμούσες και κάνε κλικ στο κουμπί για μία ροή RSS, ή γράψε τη διεύθυνση email σου για να γίνεις συνδρομητής σε μία ειδοποίηση μέσω email." +msgstr "Διάλεξε ποιο είδος ειδοποίησης θα προτιμούσες και μετά κάνε κλικ στο κουμπί για να οδηγηθείς σε μία ροή RSS, ή γράψε τη διεύθυνση email σου για να ειδοποιείσαι μέσω email." -#: perllib/FixMyStreet/DB/Result/Problem.pm:680 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "Sent to %s %s later" msgstr "Στάλθηκε στο %s %s αργότερα" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:84 msgid "Sent:" msgstr "Στάλθηκε:" -#: templates/web/base/admin/report_edit.html:73 +#: templates/web/base/admin/report_edit.html:89 #: templates/web/zurich/admin/stats.html:45 msgid "Service:" msgstr "Υπηρεσία:" @@ -2769,7 +2746,7 @@ msgstr "Υπηρεσία:" msgid "Share" msgstr "Κοινοποίηση" -#: templates/web/base/report/new/fill_in_details_form.html:211 +#: templates/web/base/report/new/fill_in_details_form.html:192 #: templates/web/base/report/update-form.html:157 #: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 @@ -2814,12 +2791,12 @@ msgstr "Αποσύνδεση" msgid "Signed in as %s" msgstr "Συνδεδεμένος ως %s" -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 msgid "Some categories may require additional information." msgstr "Μερικές κατηγορίες ίσως απαιτούν πρόσθετες πληροφορίες." -#: templates/web/base/admin/body-form.html:145 -#: templates/web/base/admin/body-form.html:146 +#: templates/web/base/admin/body-form.html:149 +#: templates/web/base/admin/body-form.html:150 msgid "" "Some endpoints require an <strong>API key</strong> to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -2830,11 +2807,11 @@ msgid "Some photos of recent reports" msgstr "Μερικές φωτογραφίες από πρόσφατες αναφορές" #: perllib/FixMyStreet/App/View/Email.pm:32 -#: perllib/FixMyStreet/App/View/Web.pm:44 +#: perllib/FixMyStreet/App/View/Web.pm:43 msgid "Some text to localize" msgstr "Κείμενο για εντοπισμό" -#: perllib/FixMyStreet/Cobrand/UK.pm:88 +#: perllib/FixMyStreet/Cobrand/UK.pm:78 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "Συγνώμη, φαίνεται πως αυτός ο ταχυδρομικός κώδικας είναι Crown dependency postcode, δεν καλύπτουμε τέτοιους ΤΚ," @@ -2842,17 +2819,16 @@ msgstr "Συγνώμη, φαίνεται πως αυτός ο ταχυδρομι msgid "Sorry, there has been an error confirming your problem." msgstr "Συγνώμη, υπήρξε βλάβη στην επιβεβαίωση του προβλήματός σου." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:215 -#: perllib/FixMyStreet/Geocode.pm:26 perllib/FixMyStreet/Geocode/Bing.pm:56 -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:73 -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:93 -#: perllib/FixMyStreet/Geocode/Google.pm:72 -#: perllib/FixMyStreet/Geocode/OSM.pm:64 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:214 +#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 +#: perllib/FixMyStreet/Geocode/Google.pm:47 +#: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "Συγνώμη, δεν μπορέσαμε να βρούμε αυτήν την τοποθεσία." -#: perllib/FixMyStreet/Geocode/Bing.pm:51 -#: perllib/FixMyStreet/Geocode/Google.pm:67 +#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: perllib/FixMyStreet/Geocode/Google.pm:44 #: perllib/FixMyStreet/Geocode/Zurich.pm:87 msgid "Sorry, we could not parse that location. Please try again." msgstr "Συγνώμη, δεν μπορέσαμε να αναλύσουμε αυτήν την τοποθεσία. Παρακαλούμε προσπάθησε ξανά." @@ -2861,7 +2837,7 @@ msgstr "Συγνώμη, δεν μπορέσαμε να αναλύσουμε αυ msgid "Start Date:" msgstr "Ημερομηνία Έναρξης:" -#: templates/web/base/admin/body.html:61 +#: templates/web/base/admin/body.html:69 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 @@ -2869,7 +2845,7 @@ msgstr "Ημερομηνία Έναρξης:" msgid "State" msgstr "Κατάσταση" -#: templates/web/base/admin/report_edit.html:34 +#: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 #: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:53 @@ -2878,8 +2854,8 @@ msgstr "Κατάσταση" msgid "State:" msgstr "Κατάσταση:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1200 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:304 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:308 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" @@ -2895,7 +2871,7 @@ msgstr "Κατάσταση" msgid "Still open, via questionnaire, %s" msgstr "Ακόμη ανοιχτό, μέσω ερωτηματολογίου, %s" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:381 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 msgid "Subcategory: %s" msgstr "Υποκατηγορία: %s" @@ -2915,19 +2891,19 @@ msgid "Subject:" msgstr "Θέμα:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:115 -#: templates/web/base/report/new/fill_in_details_form.html:155 -#: templates/web/base/report/new/fill_in_details_form.html:177 +#: templates/web/base/report/new/fill_in_details_form.html:136 +#: templates/web/base/report/new/fill_in_details_form.html:158 +#: templates/web/base/report/new/fill_in_details_form.html:96 #: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 -#: templates/web/zurich/report/new/fill_in_details_form.html:108 +#: templates/web/zurich/report/new/fill_in_details_form.html:91 msgid "Submit" msgstr "Υποβολή" -#: templates/web/base/admin/report_edit.html:97 +#: templates/web/base/admin/report_edit.html:113 #: templates/web/base/admin/update_edit.html:65 -#: templates/web/base/admin/user-form.html:55 +#: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:64 #: templates/web/zurich/admin/report_edit.html:221 #: templates/web/zurich/admin/update_edit.html:38 @@ -2939,8 +2915,8 @@ msgstr "Υποβολή αλλαγών" msgid "Submit questionnaire" msgstr "Υποβολή ερωτηματολογίου" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:133 -#: templates/web/zurich/admin/header.html:2 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:134 +#: 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 @@ -2964,8 +2940,8 @@ msgstr "Γίνε συνδρομητής" msgid "Subscribe me to an email alert" msgstr "Γίνε συνδρομητής σε ειδοποιήσεις μέσω email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1191 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:293 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 #: templates/web/zurich/admin/index-dm.html:1 @@ -2981,7 +2957,7 @@ msgstr "Περίληψη" msgid "Summary reports" msgstr "Περιληπτικές αναφορές" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 msgid "Survey" msgstr "Έρευνα" @@ -2995,7 +2971,7 @@ msgstr "Αποτελέσματα έρευνας" msgid "Text" msgstr "Κείμενο" -#: templates/web/base/admin/body.html:21 +#: templates/web/base/admin/body.html:28 msgid "Text only version" msgstr "Έκδοση απλού κειμένου" @@ -3004,49 +2980,55 @@ msgstr "Έκδοση απλού κειμένου" msgid "Text:" msgstr "Κείμενο:" -#: templates/web/base/tokens/confirm_update.html:9 -msgid "Thank you — you can <a href=\"%s\">view your updated problem</a> on the site." -msgstr "Ευχαριστούμε — μπορείς να <a href=\"%s\">δεις το ενημερωμένο πρόβλημά σου</a> στην ιστοσελίδα." - -#: templates/web/base/tokens/confirm_problem.html:18 -msgid "Thank you for reporting this issue" -msgstr "Ευχαριστούμε που ανέφερες αυτό το ζήτημα" +#: templates/web/base/tokens/confirm_problem.html:12 +msgid "Thank you for reporting this issue!" +msgstr "Ευχαριστούμε που ανέφερες αυτό το ζήτημα!" #: templates/web/base/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 "Ευχαριστούμε που προσπάθησες να επιβεβαιώσεις την ενημέρωση ή το πρόβλημά σου. Μάλλον όμως εμφανίστηκε σε εμάς κάποια βλάβη, οπότε <a href=\"%s\">παρακαλούμε ενημέρωσέ μας για το τι έγινε</a> και θα το κοιτάξουμε." +#: templates/web/base/tokens/confirm_update.html:15 +msgid "Thank you for updating this issue!" +msgstr "Ευχαριστούμε που ενημέρωσες αυτό το ζήτημα!" + +#: templates/web/base/contact/submit.html:6 +#: templates/web/base/questionnaire/completed.html:5 +msgid "Thank you for your feedback" +msgstr "Ευχαριστούμε για την πληροφόρηση" + #: templates/web/fixmystreet/around/around_index.html:28 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 :" msgstr "Ευχαριστούμε που ανέβασες την φωτογραφία σου. Τώρα χρειάζεται να εντοπίσουμε το πρόβλημά σου, άρα παρακαλούμε γράψε μία κοντινή οδό ή ταχυδρομικό κώδικα στο πεδίο από πάνω :" -#: templates/web/base/contact/submit.html:8 -msgid "Thanks for your feedback. We'll get back to you as soon as we can!" -msgstr "Ευχαριστούμε για πληροφόρηση. Θα σου απαντήσουμε όσο το δυνατόν συντομότερα!" - #: templates/web/base/questionnaire/creator_fixed.html:9 msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" -msgstr "Ευχαριστούμε, χαιρόμαστε που διορθώθηκε! Μπορούμε απλά να σε ρωτήσουμε αν έχεις αναφέρει ξανά κάποιο πρόβλημα σε συμβούλιο στο παρελθόν;" +msgstr "Ευχαριστούμε, χαιρόμαστε που διορθώθηκε! Μπορούμε απλά να σε ρωτήσουμε αν έχεις αναφέρει ξανά κάποιο πρόβλημα στην υπηρεσία στο παρελθόν;" -#: perllib/FixMyStreet/App/Controller/Photo.pm:190 +#: perllib/FixMyStreet/App/Controller/Photo.pm:195 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Η εικόνα δεν φαίνεται να έχει μεταφορτωθεί σωστά (%s), παρακαλούμε προσπάθησε ξανά." -#: perllib/FixMyStreet/App/Controller/Council.pm:100 +#: perllib/FixMyStreet/App/Controller/Council.pm:97 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 +#: perllib/FixMyStreet/App/Controller/Location.pm:126 msgid "That location does not appear to be in the UK; please try again." msgstr "Η τοποθεσία δεν φαίνεται να βρίσκεται στην Ελλάδα. Παρακαλούμε προσπάθησε ξανά." #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:81 +#: perllib/FixMyStreet/Cobrand/UK.pm:71 msgid "That postcode was not recognised, sorry." msgstr "Ο ταχυδρομικός κώδικας δεν αναγνωρίστηκε, λυπούμαστε." -#: perllib/FixMyStreet/App/Controller/Admin.pm:713 +#: perllib/FixMyStreet/App/Controller/Admin.pm:712 +#, fuzzy +msgid "That problem has been marked as sent." +msgstr "Το πρόβλημα τώρα θα αποσταλθεί ξανά." + +#: perllib/FixMyStreet/App/Controller/Admin.pm:704 msgid "That problem will now be resent." msgstr "Το πρόβλημα τώρα θα αποσταλθεί ξανά." @@ -3058,7 +3040,7 @@ msgstr "Η αναφορά δεν μπορεί να προβληθεί σε %s." msgid "That report has been removed from FixMyStreet." msgstr "Η αναφορά αφαιρέθηκε από το FixMyStreet." -#: templates/web/base/admin/body.html:136 +#: templates/web/base/admin/body.html:144 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." @@ -3066,22 +3048,22 @@ msgstr "" "Οι αναφορές αυτής της κατηγορίας θα σταλθούν στη <strong>διεύθυνση email</strong>.\n" "Άλλες κατηγορίες αυτού του σώματος ίσως έχουν την ίδια διεύθυνση email." -#: templates/web/base/admin/body-form.html:119 -#: templates/web/base/admin/body-form.html:120 +#: templates/web/base/admin/body-form.html:123 +#: templates/web/base/admin/body-form.html:124 msgid "" "The <strong>endpoint</strong> is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." msgstr "Το <strong>σημείο τερματισμού</strong> είναι η διεύθυνση URL της υπηρεσίας στην οποία συνδέεται το FixMyStreet όταν στέλνονται αναφορές σε αυτό το σώμα." -#: templates/web/base/admin/body-form.html:132 -#: templates/web/base/admin/body-form.html:133 +#: templates/web/base/admin/body-form.html:136 +#: templates/web/base/admin/body-form.html:137 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 "Η <strong>αρμοδιότητα</strong> χρειάζεται μόνο αν το σημείο τερματισμού υπηρετεί παραπάνω από έναν. Αν το σώμα έχει το δικό του σημείο τερματισμού, μπορείς συνήθως να την αφήσεις κενή." -#: templates/web/base/admin/body-form.html:90 -#: templates/web/base/admin/body-form.html:91 +#: templates/web/base/admin/body-form.html:94 +#: templates/web/base/admin/body-form.html:95 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>." @@ -3091,7 +3073,7 @@ msgstr "" #: templates/web/base/open311/index.html:90 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 "Η ιδιότητα agency_responsible του Open311 v2 χρησιμοποιείται για να καταγράφονται οι διοικήσεις που έλαβαν την αναφορά προβλήματος, που δεν είναι ακριβώς ο τρόπος με τον οποίο ορίζεται αυτή η ιδιότητα στις προδιαγραφές του Open311 v2." +msgstr "Η ιδιότητα agency_responsible του Open311 v2 χρησιμοποιείται για να καταγράφονται οι υπηρεσίες που έλαβαν την αναφορά προβλήματος, που δεν είναι ακριβώς ο τρόπος με τον οποίο ορίζεται αυτή η ιδιότητα στις προδιαγραφές του Open311 v2." #: templates/web/base/admin/body-form.html:11 #: templates/web/base/admin/body-form.html:12 @@ -3099,17 +3081,17 @@ msgid "" "The body's <strong>name</strong> identifies the body (for example, <em>Borsetshire District Council</em>)\n" " and may be displayed publically." msgstr "" -"Το <strong>όνομα</strong> του σώματος ταυτοποιεί το σώμα (για παράδειγμα, <em>Συμβούλιο Βόρειας Συνοικίας</em>)\n" +"Το <strong>όνομα</strong> της υπηρεσίας ταυτοποιεί την υπηρεσία (για παράδειγμα, <em>Υπηρεσία Καθαριότητας</em>)\n" "και ίσως προβληθεί δημόσια." #: templates/web/base/auth/token.html:19 templates/web/base/email_sent.html:6 msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." msgstr "<strong>Ίσως</strong> χρειαστούν μερικά λεπτά για να φτάσει το email επιβεβαίωσης — <em>παρακαλούμε</em> να είσαι υπομονετικός." -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:3 msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." -msgstr "Το συμβούλιο δεν θα μπορέσει να βοηθήσει εκτός αν συμπληρώσεις όσες περισσότερες λεπτομέρειες μπορείς. Παρακαλούμε περίγραψε την ακριβή τοποθεσία του προβλήματος (για παράδειγμα: πάνω σε έναν τοίχο), ποιο είναι αυτό, για πόσο καιρό βρίσκεται εκεί, μία περιγραφή (και μία φωτογραφία του προβλήματος αν έχεις), κλπ." +msgstr "Η υπηρεσία δεν θα μπορέσει να βοηθήσει εκτός αν συμπληρώσεις όσες περισσότερες λεπτομέρειες μπορείς. Παρακαλούμε περίγραψε την ακριβή τοποθεσία του προβλήματος (για παράδειγμα: πάνω στον κόκκινο τοίχο), ποιο είναι αυτό, για πόσο καιρό υπάρχει, μία περιγραφή (και μία φωτογραφία του προβλήματος αν έχεις), κλπ." #: templates/web/fixmystreet/questionnaire/index.html:44 msgid "The details of your problem are available from the other tab above." @@ -3133,8 +3115,8 @@ msgstr "Το σφάλμα ήταν: %s" msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "Οι παρακάτω ιδιότητες του Open311 v2 επιστρέφονται για κάθε αίτημα: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code και service_name." -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:185 -#: perllib/FixMyStreet/Geocode/OSM.pm:163 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:159 +#: perllib/FixMyStreet/Geocode/OSM.pm:144 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap." msgstr "Οι ακόλουθες πληροφορίες σχετικά με την πλησιέστερη οδό ίσως είναι ανακριβείς ή άσχετες, αν το πρόβλημα βρίσκεται κοντά σε πολλές οδούς ή κοντά σε μια οδό χωρίς καταχωρημένο όνομα στο OpenStreetMap." @@ -3153,7 +3135,7 @@ msgstr "Τα πιο πρόσφατα προβλήματα για το {{COUNCIL} #: db/alert_types.pl:39 msgid "The latest problems for {{COUNCIL}} within {{WARD}} ward reported by users" -msgstr "Τα πιο πρόσφατα προβλήματα για το {{COUNCIL}} στην πτέρυγα {{WARD}} που αναφέρθηκαν από χρήστες" +msgstr "Τα πιο πρόσφατα προβλήματα για το {{COUNCIL}} στην περιοχή {{WARD}} που αναφέρθηκαν από χρήστες" #: db/alert_types.pl:11 msgid "The latest problems reported by users" @@ -3177,7 +3159,7 @@ msgstr "Οι πιο πρόσφατες αναφορές για το {{COUNCIL}} #: db/alert_types_eha.pl:24 msgid "The latest reports for {{COUNCIL}} within {{WARD}} ward reported by users" -msgstr "Οι πιο πρόσφατες αναφορές για το {{COUNCIL}} στην πτέρυγα {{WARD}} που αναφέρθηκαν από χρήστες" +msgstr "Οι πιο πρόσφατες αναφορές για το {{COUNCIL}} στην περιοχή {{WARD}} που αναφέρθηκαν από χρήστες" #: db/alert_types_eha.pl:28 msgid "The latest reports within {{NAME}}'s boundary reported by users" @@ -3192,7 +3174,7 @@ msgstr "Η λίστα των διαθέσιμων περιοχών παρέχε msgid "The passwords do not match" msgstr "Οι κωδικοί πρόσβασης δεν ταιριάζουν" -#: templates/web/base/errors/page_error_404_not_found.html:11 +#: templates/web/base/errors/page_error_404_not_found.html:10 #: templates/web/base/errors/page_error_404_not_found.html:12 msgid "The requested URL '%s' was not found on this server" msgstr "Η ζητούμενη διεύθυνση URL '%s' δε βρέθηκε στον server" @@ -3200,7 +3182,7 @@ msgstr "Η ζητούμενη διεύθυνση URL '%s' δε βρέθηκε σ #: templates/web/base/alert/_list.html:14 #: templates/web/fixmystreet/alert/_list.html:16 msgid "The simplest alert is our geographic one:" -msgstr "Η απλούστερη ειδοποίησή μας είναι η γεωγραφική:" +msgstr "Για να λαμβάνεις ειδοποιήσεις που αφορούν ζητήματα της περιοχής:" #: templates/web/base/report/new/councils_extra_text.html:1 #: templates/web/base/report/new/councils_text_some.html:10 @@ -3209,7 +3191,7 @@ msgstr "Η απλούστερη ειδοποίησή μας είναι η γεω msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "Η περίληψη και η περιγραφή θα είναι επίσης δημόσιες (δες την <a href=\"/privacy\">πολιτική απορρήτου</a>)." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:295 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:300 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "Ο χρήστης δεν μπορέσε να εντοπίσει το πρόβλημα στον χάρτη, αλλά για να δει την περιοχή κοντά στην τοποθεσία έγραψε" @@ -3222,16 +3204,20 @@ msgstr "" "Το <strong>όνομα</strong> του χρήστη προβάλλεται δημόσια σε αναφορές που δεν έχουν επισημανθεί ως <em>ανώνυμες</em>.\n" "Τα ονόματα δεν είναι απαραιτήτως μοναδικά." +#: templates/web/base/reports/_problem-list.html:15 +msgid "There are no reports to show." +msgstr "" + #: perllib/FixMyStreet/App/Controller/Reports.pm:75 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "Υπήρξε πρόβλημα στην προβολή της σελίδας Όλες οι Αναφορές. Παρακαλούμε προσπάθησε ξανά αργότερα." -#: perllib/FixMyStreet/App/Controller/Contact.pm:131 +#: perllib/FixMyStreet/App/Controller/Contact.pm:136 #: 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/New.pm:762 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 #: templates/web/base/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:25 @@ -3247,7 +3233,7 @@ msgstr "Υπήρξε πρόβλημα με τον συνδυασμό email/κω msgid "There was a problem with your update. Please try again." msgstr "Υπήρξε πρόβλημα με την ενημέρωσή σου. Παρακαλούμε προσπάθησε ξανά." -#: perllib/FixMyStreet/App/Controller/Contact.pm:135 +#: perllib/FixMyStreet/App/Controller/Contact.pm:140 msgid "There were problems with your report. Please see below." msgstr "Υπήρξαν προβλήματα με την αναφορά σου. Παρακαλούμε δες παρακάτω." @@ -3255,8 +3241,8 @@ msgstr "Υπήρξαν προβλήματα με την αναφορά σου. msgid "There were problems with your update. Please see below." msgstr "Υπήρξαν προβλήματα με την ενημέρωσή σου. Παρακαλούμε δες παρακάτω." -#: templates/web/base/admin/body-form.html:108 -#: templates/web/base/admin/body-form.html:109 +#: templates/web/base/admin/body-form.html:112 +#: templates/web/base/admin/body-form.html:113 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" @@ -3264,7 +3250,7 @@ msgid "" " <a href='https://www.mysociety.org/2013/01/17/open311-explained/' class='admin-offsite-link'>this article</a>.\n" " " msgstr "" -"Αυτές οι ρυθμίσεις είναι για σώματα που χρησιμοποιούν το Open311 (ή κάποια άλλη πλατφόρμα) για να δέχονται αναφορές προβλημάτων.<br>\n" +"Αυτές οι ρυθμίσεις είναι για τις υπηρεσίες που χρησιμοποιούν το Open311 (ή κάποια άλλη πλατφόρμα) για να δέχονται αναφορές προβλημάτων.<br>\n" "<strong>Δεν χρειάζεται να τις ρυθμίσεις αν η Μέθοδος Αποστολής είναι μέσω email.</strong>\n" "Για περισσότερες πληροφορίες σχετικά με το Open311, δες <a href='https://www.mysociety.org/2013/01/17/open311-explained/' class='admin-offsite-link'>αυτό το άρθρο</a>." @@ -3272,7 +3258,7 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Αυτή η υλοποίηση του API είναι έργο σε εξέλιξη και δεν είναι ακόμη σταθερή. Θα αλλάξει χωρίς προειδοποιήσεις στο μέλλον." -#: templates/web/base/admin/body.html:36 +#: templates/web/base/admin/body.html:44 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" @@ -3282,9 +3268,9 @@ msgstr "" "Συνεπώς, καμία από τις κατηγορίες του δε θα εμφανιστούν στο μενού κατηγοριών όταν οι χρήστες αναφέρουν προβλήματα.\n" "Μέχρι στιγμής, οι χρήστες <strong>δεν μπορούν να αναφέρουν προβλήματα σε αυτό το σώμα</strong>." -#: templates/web/base/admin/body.html:46 +#: templates/web/base/admin/body.html:54 msgid "This body has no contacts. This means that currently problems reported to this body <strong>will not be sent</strong>." -msgstr "Αυτό το σώμα δεν έχει καμία επαφή. Αυτό σημαίνει ότι μέχρι στιγμής τα προβλήματα που αναφέρονται σε αυτό το σώμα <strong>δεν θα στέλνονται</strong>." +msgstr "Αυτό η υπηρεσία δεν έχει επαφές. Αυτό σημαίνει ότι μέχρι στιγμής τα προβλήματα που αναφέρονται σε αυτήν την υπηρεσία <strong>δεν θα στέλνονται</strong>." #: templates/web/base/admin/body-form.html:52 #: templates/web/base/admin/body-form.html:53 @@ -3292,21 +3278,21 @@ 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 "" -"Αυτό το σώμα θα δέχεται μόνο αναφορές για προβλήματα που βρίσκονται στην <strong>περιοχή αρμοδιότητας</strong>.\n" -"Ένα σώμα δεν θα δέχεται καμία αναφορά, εκτός αν είναι αρμόδιο για τουλάχιστον μία περιοχή." +"Αυτή η υπηρεσία θα δέχεται μόνο αναφορές για προβλήματα που βρίσκονται στην <strong>περιοχή αρμοδιότητας της</strong>.\n" +"Μια υπηρεσία δεν θα δέχεται καμία αναφορά, εκτός αν είναι αρμόδια για τουλάχιστον μία περιοχή." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:388 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:394 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." -msgstr "Αυτό το email στάλθηκε και στα δύο συμβούλια που είναι αρμόδια στην τοποθεσία του προβλήματος, μιας και ο χρήστης δεν το κατηγοριοποίησε. Παρακαλούμε αγνόησέ το αν το συμβούλιό σου δεν είναι αρμόδιο για την αντιμετώπιση του ζητήματος, ή ενημέρωσέ μας για τη σωστή κατηγορία του προβλήματος ώστε να την προσθέσουμε στο σύστημα." +msgstr "Αυτό το email στάλθηκε και στις δύο υπηρεσίες που είναι αρμόδιες για την τοποθεσία του προβλήματος, μιας και ο χρήστης δεν το κατηγοριοποίησε. Παρακαλούμε αγνόησέ το αν η υπηρεσία σου δεν είναι αρμόδια για την αντιμετώπιση του ζητήματος, ή ενημέρωσέ μας για τη σωστή κατηγορία του προβλήματος ώστε να την προσθέσουμε στο σύστημα." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:391 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." -msgstr "Αυτό το email στάλθηκε σε πολλά συμβούλια που είναι αρμόδια στην τοποθεσία του προβλήματος, αφού η επιλεγμένη κατηγορία συμπεριλαμβάνεται σε καθένα από αυτά. Παρακαλούμε αγνόησέ το αν το συμβούλιο σου δεν είναι αρμόδιο για την αντιμετώπιση του ζητήματος." +msgstr "Αυτό το email στάλθηκε σε πολλές υπηρεσίες που είναι αρμόδιες για την τοποθεσία του προβλήματος, αφού η επιλεγμένη κατηγορία συμπεριλαμβάνεται σε κάθε μια από αυτές. Παρακαλούμε αγνόησέ το αν η υπηρεσία σου δεν είναι αρμόδια για την αντιμετώπιση του ζητήματος." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:136 -#: perllib/FixMyStreet/Cobrand/UK.pm:53 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:902 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:972 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/Cobrand/UK.pm:43 msgid "This information is required" msgstr "Αυτή η πληροφορία απαιτείται" @@ -3345,8 +3331,8 @@ msgstr "Αυτό το πρόβλημα βρίσκεται σε εξέλιξη" msgid "This problem is old and of unknown status." msgstr "Αυτό το πρόβλημα είναι παλιό και σε άγνωστη κατάσταση." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:130 #: perllib/FixMyStreet/Cobrand/Zurich.pm:131 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:132 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Αυτή η αναφορά αναμένει έγκριση." @@ -3363,15 +3349,15 @@ msgstr "Αυτή η αναφορά είναι προς το παρόν κατα msgid "This report is currently marked as open." msgstr "Αυτή η αναφορά είναι προς το παρόν καταχωρημένη ως ανοιχτή." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:319 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:311 msgid "This report was submitted anonymously" msgstr "Αυτή η αναφορά υποβλήθηκε ανώνυμα" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:293 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Αυτή η ιστοσελίδα περιέχει επίσης μία φωτογραφία του προβλήματος, που παρέχεται από το χρήστη." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Χρονοδιάγραμμα" @@ -3389,7 +3375,7 @@ msgstr "Για να <strong>αναφέρεις ένα πρόβλημα</strong>, 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:294 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:299 msgid "To view a map of the precise location of this issue" msgstr "Για την προβολή ενός χάρτη με την ακριβή τοποθεσία του ζητήματος" @@ -3405,8 +3391,12 @@ msgstr "Σύνολο" msgid "Try again" msgstr "Δοκίμασε ξανά" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:46 +#: templates/web/base/contact/submit.html:14 +msgid "Try emailing us directly:" +msgstr "Στείλε μας ένα email:" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -3414,8 +3404,8 @@ msgstr "Δοκίμασε ξανά" msgid "Unable to fix" msgstr "Δεν είναι εφικτή η διόρθωση" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/admin/update_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:45 #: templates/web/zurich/admin/report_edit.html:58 @@ -3457,7 +3447,7 @@ msgstr "Η παρακάτω ενημέρωση προστέθηκε ανώνυμ msgid "Update below added by %s at %s" msgstr "Η παρακάτω ενημέρωση προστέθηκε από %s στις %s" -#: templates/web/base/admin/body-form.html:233 +#: templates/web/base/admin/body-form.html:240 #: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "Ενημέρωση σώματος" @@ -3483,7 +3473,7 @@ msgstr "Η ενημέρωση επισήμανε το πρόβλημα ως δι msgid "Update reopened problem" msgstr "Η ενημέρωση άνοιξε ξανά το πρόβλημα" -#: templates/web/base/admin/body.html:93 +#: templates/web/base/admin/body.html:101 msgid "Update statuses" msgstr "Καταστάσεις ενημέρωσης" @@ -3497,12 +3487,12 @@ msgstr "Ενημέρωση:" msgid "Updated" msgstr "Ενημερώθηκε" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1016 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1060 -#: perllib/FixMyStreet/App/Controller/Admin.pm:810 -#: perllib/FixMyStreet/App/Controller/Admin.pm:958 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:549 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:618 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1014 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:808 +#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:556 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:625 msgid "Updated!" msgstr "Ενημερώθηκε!" @@ -3514,13 +3504,13 @@ msgstr "Ενημερώθηκε!" msgid "Updates" msgstr "Ενημερώσεις" -#: perllib/FixMyStreet/DB/Result/Comment.pm:139 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "Οι ενημερώσεις έχουν όριο χαρακτήρων %s. Παρακαλούμε συντόμευσε την ενημέρωσή σου" #: db/alert_types.pl:5 db/alert_types.pl:6 msgid "Updates on {{title}}" -msgstr "Ενημερώσεις στο {{title}}" +msgstr "Ενημερώσεις για {{title}}" #: templates/web/base/report/display.html:0 #: templates/web/base/report/display.html:5 @@ -3529,20 +3519,20 @@ msgstr "Ενημερώσεις στο {{title}}" msgid "Updates to this problem, FixMyStreet" msgstr "Ενημερώσεις για το πρόβλημα, FixMyStreet" -#: templates/web/base/admin/body.html:174 +#: templates/web/base/admin/body.html:182 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 "Χρησιμοποίησε την <strong>σημείωση</strong> για να καταγράψεις τις λεπτομέρειες που θα φαίνονται στον διαχειριστή. Οι σημειώσεις δεν εμφανίζονται δημόσια και δεν αποστέλλονται στο σώμα." +msgstr "Χρησιμοποίησε την <strong>σημείωση</strong> για να καταγράψεις τις λεπτομέρειες που θα φαίνονται στον διαχειριστή. Οι σημειώσεις δεν εμφανίζονται δημόσια και δεν αποστέλλονται στον τομέα." #: 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:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1357 msgid "User flag removed" msgstr "Η επισήμανση του χρήστη αφαιρέθηκε" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1331 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1329 msgid "User flagged" msgstr "Ο χρήστης επισημάνθηκε" @@ -3550,16 +3540,16 @@ msgstr "Ο χρήστης επισημάνθηκε" msgid "User search finds matches in users' names and email addresses." msgstr "Η αναζήτηση χρηστών βρίσκει αποτελέσματα για ονόματα χρηστών και διευθύνσεις email." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:303 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:307 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Χρήστες" -#: perllib/FixMyStreet/App/Controller/Admin.pm:380 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:430 +#: perllib/FixMyStreet/App/Controller/Admin.pm:374 +#: perllib/FixMyStreet/App/Controller/Admin.pm:404 +#: perllib/FixMyStreet/App/Controller/Admin.pm:421 msgid "Values updated" msgstr "Οι τιμές ενημερώθηκαν" @@ -3593,7 +3583,7 @@ msgstr "Πτέρυγες του συμβουλίου" #: templates/web/base/around/around_index.html:16 #: templates/web/fixmystreet/around/around_index.html:17 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 "Βρήκαμε παραπάνω από ένα αποτέλεσμα για αυτήν την τοποθεσία. Δείχνουμε μέχρι 10 αποτελέσματα, παρακαλούμε δοκίμασε διαφορετική αναζήτηση αν αυτό που ψάχνεις δε βρίσκεται εδώ." +msgstr "Βρήκαμε παραπάνω από ένα αποτέλεσμα για αυτήν την τοποθεσία. Εδώ παρουσιάζουμε 10 αποτελέσματα, παρακαλούμε δοκίμασε άλλη αναζήτηση αν δε βρήκες αυτό που έψαχνες." #: templates/web/base/auth/token.html:8 msgid "We have not been able to confirm your account - sorry." @@ -3613,28 +3603,36 @@ msgstr "Δε δείχνουμε ποτέ το email σου" msgid "We never show your email address or phone number." msgstr "Δε δείχνουμε ποτέ το email ή το τηλέφωνό σου" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:403 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "Καταλαβαίνουμε ότι το πρόβλημα ίσως είναι στην ευθύνη του %s. Ωστόσο, μέχρι στιγμής δεν έχουμε πληροφορίες επικοινωνίας μαζί τους. Αν γνωρίζεις μία κατάλληλη διεύθυνση επικοινωνίας, παρακαλούμε επικοινώνησε μαζί τους." -#: templates/web/base/index-steps.html:38 +#: templates/web/base/index-steps.html:31 msgid "We send it to the council on your behalf" -msgstr "Θα το στείλουμε στο συμβούλιο εκ μέρους σου" +msgstr "Και εμείς θα το στείλουμε στην υπηρεσία εκ μέρους σου" #: templates/web/base/report/new/notes.html:4 #: templates/web/zurich/report/new/notes.html:4 msgid "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>" msgstr "Θα χρησιμοποιήσουμε τις προσωπικές σου πληροφορίες μόνο σύμφωνα με την <a href=\"/privacy\">πολιτική απορρήτου.</a>" +#: templates/web/base/questionnaire/completed-open.html:2 +msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" +msgstr "Λυπούμαστε που το πρόβλημα δε λύθηκε. Γιατί δε δοκιμάζετε να επικοινωνήσετε απευθείας με τις τοπικές αρχές;" + #: templates/web/base/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 "Θα θέλαμε να ακούσουμε τι σκέφτεσαι για αυτόν τον ιστότοπο. Απλά συμπλήρωσε την φόρμα ή στείλε μας e-mail στο <a href='mailto:%s'>%s</a>:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:41 +#: templates/web/base/contact/submit.html:7 +msgid "We’ll get back to you as soon as we can." +msgstr "Θα σου απαντήσουμε όσο το δυνατόν συντομότερα." + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 msgid "What’s the issue, and where is it?" msgstr "Ποιο είναι το θέμα και που βρίσκεται;" -#: templates/web/base/admin/category_edit.html:82 +#: templates/web/base/admin/category_edit.html:87 #: templates/web/zurich/admin/body.html:18 msgid "When edited" msgstr "Όταν διορθώθηκε" @@ -3643,15 +3641,18 @@ msgstr "Όταν διορθώθηκε" msgid "When sent" msgstr "Όταν αποστάλθηκε " -#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Whole block of empty flats" msgstr "Ολόκληρο τετράγωνο από άδεια διαμερίσματα" +#: templates/web/base/tokens/confirm_alert.html:7 +msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." +msgstr "Μόνο αυτό? <a href=\"/alert\">Πρόσθεσε περισσότερες ειδοποιήσεις</a> δωρεάν." + #: templates/web/base/open311/index.html:92 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 "Με τις αναζητήσεις αιτημάτων, είναι επίσης δυνατό να αναζητήσεις με το πεδίο agency_responsible περιορίζοντας τα αποτελέσματα στις αιτήσεις που στέλνονται σε έναν συγκεκριμένο τομέα. Ο όρος αναζήτησης είναι ο Κωδικός (ID) ενός τομέα που παρέχεται από το <a href=\"%s\">MapIt</a>." -#: templates/web/fiksgatami/front/footer-marketing.html:15 #: templates/web/fixmystreet/front/footer-marketing.html:17 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "Θα ήθελες να συνεισφέρεις στο FixMyStreet; Ο κώδικας μας είναι ανοιχτής πηγής και <a href=\"http://fixmystreet.org\">διαθέσιμος στο fixmystreet.org</a>." @@ -3663,7 +3664,7 @@ msgstr "Θα ήθελες να λάβεις και άλλο ερωτηματολ #: templates/web/base/report/new/notes.html:7 msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." -msgstr "Η γραφή του μηνύματός μόνο με κεφαλαία γράμματα δυσκολεύει την ανάγνωσή του και δεν περιέχει σημεία στίξης. " +msgstr "Να χρησιμοποιείς τα κατάλληλα σημεία στίξης και να αποφεύγεις να γράφεις μόνο με κεφαλαία γράμματα, ώστε το μήνυμά σου να είναι εύκολο στην ανάγνωση." #: templates/web/base/report/new/fill_in_details_form.html:4 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:5 @@ -3675,18 +3676,18 @@ msgid "Year" msgstr "Έτος" #: templates/web/base/admin/bodies.html:66 -#: templates/web/base/admin/body.html:72 templates/web/base/admin/body.html:74 -#: templates/web/base/admin/body.html:78 templates/web/base/admin/body.html:80 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:76 +#: templates/web/base/admin/report_edit.html:93 #: templates/web/base/admin/update_edit.html:24 -#: templates/web/base/admin/users.html:29 +#: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:42 #: templates/web/base/questionnaire/index.html:81 @@ -3708,21 +3709,19 @@ msgstr "Παραπονιέσαι ότι, αυτή η αναφορά προβλή #: templates/web/base/contact/index.html:41 #: templates/web/fixmystreet/contact/index.html:56 msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" -msgstr "Αναφέρεις ότι η παρακάτω αναφορά προβλήματος είναι καταχρηστική, περιέχει προσωπικές πληροφορίες ή κάτι παρόμοιο:" +msgstr "Με το παρόν, δηλώνεις ότι η παρακάτω αναφορά προβλήματος είναι καταχρηστική, περιέχει προσωπικές πληροφορίες ή κάτι παρόμοιο:" #: templates/web/base/contact/index.html:15 #: templates/web/fixmystreet/contact/index.html:30 msgid "You are reporting the following update for being abusive, containing personal information, or similar:" -msgstr "Αναφέρεις ότι η παρακάτω ενημέρωση είναι καταχρηστική, περιέχει προσωπικές πληροφορίες ή κάτι παρόμοιο: " +msgstr "Με το παρόν, δηλώνεις ότι η παρακάτω ενημέρωση είναι καταχρηστική, περιέχει προσωπικές πληροφορίες ή κάτι παρόμοιο: " -#: templates/web/base/tokens/confirm_problem.html:25 -#: templates/web/base/tokens/confirm_problem.html:26 -#: templates/web/zurich/tokens/confirm_problem.html:6 +#: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:8 msgid "You can <a href=\"%s%s\">view the problem on this site</a>." msgstr "Μπορείς να <a href=\"%s%s\">δεις το πρόβλημα σε αυτόν τον ιστότοπο</a>." -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:48 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "Μπορείς να προσθέσεις την ηλεκτρονική διεύθυνση ενός καταχρηστικού χρήστη στην λίστα καταχρήσεων, κάτι που αυτόματα θα αποκρύπτει (και δεν θα αποστέλλει) αναφορές που αυτός δημιουργεί." @@ -3740,16 +3739,16 @@ msgstr "" "Για παράδειγμα, αυτό θα ήταν χρήσιμο αν θα ήθελες να παρακολουθήσεις κάποιον χρήστη που καταχώρησε ακατάλληλες\n" "αναφορές στο παρελθόν." -#: templates/web/base/report/new/councils_text_none.html:19 -#: templates/web/base/report/new/councils_text_none.html:20 -#: templates/web/base/report/new/councils_text_some.html:20 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 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 "Μπορείς να μας βοηθήσεις με το να βρεις ένα email επικοινωνίας για τα τοπικά προβλήματα για %s και να μας την στείλεις με e-mail στο <a href='mailto:%s'>%s</a>." -#: templates/web/base/admin/body-form.html:81 +#: templates/web/base/admin/body-form.html:85 msgid "You can mark a body as deleted if you do not want it to be active on the site." -msgstr "Μπορείς να επισημάνεις ένα σώμα ως διαγεγραμμένο αν δεν θέλεις να είναι ενεργό σε αυτόν τον ιστότοπο." +msgstr "Μπορείς να επισημάνεις έναν τομέα ως διαγεγραμμένο αν δεν θέλεις να είναι ενεργός σε αυτόν τον ιστότοπο." #: templates/web/base/js/translation_strings.html:36 msgid "You declined; please fill in the box above" @@ -3760,10 +3759,10 @@ msgid "You have already answered this questionnaire. If you have a question, ple msgstr "Έχεις ήδη απαντήσεις σε αυτό το ερωτηματολόγιο. Αν έχεις κάποιος απορία, παρακαλούμε <a href='%s'>επικοινώνησε</a>, ή <a href='%s'>δες το πρόβλημά σου</a>.\n" #: templates/web/base/questionnaire/index.html:68 -#: templates/web/base/report/new/fill_in_details_form.html:94 +#: templates/web/base/report/new/fill_in_details_form.html:75 #: templates/web/fixmystreet/questionnaire/index.html:88 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:79 -#: templates/web/zurich/report/new/fill_in_details_form.html:75 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 +#: templates/web/zurich/report/new/fill_in_details_form.html:58 msgid "You have already attached a photo to this report, attaching another one will replace it." msgstr "Έχεις ήδη προσθέσει μια φωτογραφία σε αυτή την αναφορά, αν προσθέσεις μια καινούρια θα την αντικαταστήσει. " @@ -3772,7 +3771,7 @@ msgstr "Έχεις ήδη προσθέσει μια φωτογραφία σε α msgid "You have already attached a photo to this update, attaching another one will replace it." msgstr "Έχεις ήδη προσθέσει μια φωτογραφία σε αυτή την αναφορά, αν προσθέσεις μια καινούρια θα την αντικαταστήσει. " -#: templates/web/base/auth/sign_out.html:3 +#: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" msgstr "Έχεις αποσυνδεθεί" @@ -3781,26 +3780,11 @@ msgstr "Έχεις αποσυνδεθεί" 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/base/tokens/confirm_alert.html:8 -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 "Επιβεβαίωσες την διεύθυνση email σου επιτυχώς." -#: templates/web/base/tokens/confirm_update.html:14 -msgid "You have successfully confirmed your update and you can now <a href=\"%s\">view it on the site</a>." -msgstr "Έχεις με επιτυχία επιβεβαιώσει την ενημέρωση, μπορείς τώρα να <a href=\"%s\">την δεις στον ιστότοπο</a>." - -#: templates/web/base/tokens/confirm_alert.html:12 -msgid "You have successfully created your alert." -msgstr "Έχεις με επιτυχία δημιουργήσει την προειδοποίησή σου." - -#: templates/web/base/tokens/confirm_alert.html:10 -msgid "You have successfully deleted your alert." -msgstr "Έχεις με επιτυχία διαγράψει την προειδοποίησή σου." - #: templates/web/base/report/display.html:20 #: templates/web/base/report/new/fill_in_details.html:37 #: templates/web/fixmystreet/report/display.html:17 @@ -3817,7 +3801,7 @@ msgstr "Θα πρέπει να κάνεις κλικ πάνω στον σύνδ #: templates/web/base/admin/index.html:18 msgid "You need to <a href=\"%s\">add some bodies</a> (such as councils or departments) before any reports can be sent." -msgstr "Θα πρέπει να <a href=\"%s\">προσθέσεις κάποια σώματα</a> (όπως συμβούλια ή τμήματα) πριν να είναι διαθέσιμη η αποστολή αναφορών." +msgstr "Θα πρέπει να <a href=\"%s\">προσθέσεις κάποιες υπηρεσίες</a> (όπως υπηρεσίες ή τομείς) πριν να είναι διαθέσιμη η αποστολή αναφορών." #: templates/web/base/admin/bodies.html:7 msgid "" @@ -3825,11 +3809,11 @@ msgid "" " the categories of problems they can handle (such as potholes or streetlights) and the\n" " contacts (such as an email address) to which reports are sent." msgstr "" -"Θα πρέπει πρώτα να προσθέσεις κάποια σώματα (όπως πχ. συμβούλια ή τμήματα) έτσι ώστε να μπορείς μετά να προσθέσεις\n" -"τις κατηγορίες προβλημάτων που αυτά μπορούν να αντιμετωπίσουν (όπως πχ. λακκούβες ή φωτισμός δρόμων)\n" -"και επαφές (όπως πχ. e-mail διευθύνσεις) στις οποίες μπορούν να αποσταλούν οι αναφορές." +"Θα πρέπει πρώτα να προσθέσεις κάποιες υπηρεσίες (όπως πχ. υπηρεσίες ή τομείς) έτσι ώστε να μπορείς μετά να προσθέσεις\n" +"τις κατηγορίες προβλημάτων που αυτές μπορούν να αντιμετωπίσουν (όπως πχ. λακκούβες ή φωτισμός δρόμων)\n" +"και τις επαφές (όπως πχ. e-mail διευθύνσεις) στις οποίες μπορούν να αποσταλούν οι αναφορές." -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:85 msgid "You really want to resend?" msgstr "Είσαι σίγουρος ότι θέλεις να το ξαναστείλεις;" @@ -3849,7 +3833,7 @@ msgstr "Οι Αναφορές σου" #: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 #: templates/web/fixmystreet/report/update-form.html:76 -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:71 msgid "Your email" msgstr "Το e-mail σου" @@ -3865,7 +3849,7 @@ msgid "Your email address:" msgstr "Η διεύθυνση του e-mail σου:" #: templates/web/base/alert/_list.html:92 -#: templates/web/base/report/new/fill_in_details_form.html:125 +#: templates/web/base/report/new/fill_in_details_form.html:106 #: templates/web/base/report/update-form.html:81 msgid "Your email:" msgstr "Το e-mail σου:" @@ -3880,13 +3864,13 @@ msgstr "Οι πληροφορίες σου θα χρησιμοποιηθούν #: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 #: templates/web/fixmystreet/report/update-form.html:142 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:98 +#: templates/web/zurich/report/new/fill_in_details_form.html:81 msgid "Your name" msgstr "Το όνομά σου" #: templates/web/base/auth/general.html:59 #: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:204 +#: templates/web/base/report/new/fill_in_details_form.html:185 #: templates/web/base/report/update-form.html:151 msgid "Your name:" msgstr "Το όνομά σου:" @@ -3904,33 +3888,19 @@ msgstr "Ο κωδικός σου έχει αλλάξει" #: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 -#: templates/web/zurich/report/new/fill_in_details_form.html:104 +#: templates/web/zurich/report/new/fill_in_details_form.html:87 msgid "Your phone number" msgstr "Ο αριθμός τηλεφώνου σου" -#: templates/web/base/tokens/confirm_problem.html:4 -msgid "Your problem has been confirmed!" -msgstr "Το πρόβλημα έχει επιβεβαιωθεί!" - #: templates/web/fixmystreet/questionnaire/index.html:16 msgid "Your report" msgstr "Η αναφορά σου" -#: templates/web/base/report_created.html:6 -msgid "Your report has been created and will shortly be sent." -msgstr "Η αναφορά σου έχει δημιουργηθεί και σύντομα θα αποσταλεί." - -#: templates/web/base/footer.html:9 templates/web/fiksgatami/footer.html:21 -#: templates/web/fiksgatami/nn/footer.html:21 -#: templates/web/fixmystreet/footer.html:24 +#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:24 msgid "Your reports" msgstr "Οι αναφορές σου" -#: templates/web/base/tokens/confirm_update.html:4 -msgid "Your update has been confirmed!" -msgstr "Η ενημέρωση έχει επιβεβαιωθεί!" - -#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:59 +#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:41 msgid "Your updates" msgstr "Οι ενημερώσεις σου" @@ -3945,13 +3915,9 @@ msgstr "από %s" #: templates/web/base/reports/body.html:6 #: templates/web/base/reports/body.html:7 msgid "council" -msgstr "συμβούλιο" +msgstr "υπηρεσία" -#: perllib/FixMyStreet/DB/Result/Problem.pm:665 -msgid "council ref: %s" -msgstr "συμβούλιο αναφ.: %s" - -#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:32 #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:54 msgid "didn't use map" @@ -3962,6 +3928,7 @@ msgstr "δεν χρησιμοποιήθηκε χάρτης" msgid "e.g. ‘%s’ or ‘%s’" msgstr "π.χ. ‘%s’ ή ‘%s’" +#: templates/web/base/admin/body-form.html:188 #: templates/web/base/admin/flagged.html:51 msgid "edit user" msgstr "επεξεργασία χρήστη" @@ -3976,7 +3943,7 @@ msgstr "από %d διαφορετικούς χρήστες" msgid "last updated %s" msgstr "τελευταία ενημέρωση %s" -#: perllib/Utils.pm:263 +#: perllib/Utils.pm:235 msgid "less than a minute" msgstr "λιγότερο από ένα λεπτό" @@ -3999,7 +3966,7 @@ msgstr "σημειωμένο ως κλειστό" #: templates/web/base/report/updates.html:28 #: templates/web/base/report/updates.html:51 msgid "marked as fixed" -msgstr "σημειωμένο ως διεκπεραιωμένο" +msgstr "σημειωμένο ως διορθωμένο" #: templates/web/base/report/updates.html:45 msgid "marked as in progress" @@ -4011,7 +3978,7 @@ msgstr "σημειωμένο ως υπό έλεγχο" #: templates/web/base/report/updates.html:55 msgid "marked as not the council's responsibility" -msgstr "σημειωμένο ως εκτός αρμοδιότητας του συμβουλίου" +msgstr "σημειωμένο ως εκτός αρμοδιότητας της υπηρεσίας" #: templates/web/base/report/updates.html:43 msgid "marked as planned" @@ -4034,24 +4001,24 @@ msgstr "ή" #: templates/web/base/js/translation_strings.html:27 msgid "or locate me automatically" -msgstr "ή τοποθέτησε με αυτόματα" +msgstr "ή να βρεθεί η τοποθεσία μου αυτόματα" -#: templates/web/base/admin/report_edit.html:25 -#: templates/web/base/admin/report_edit.html:26 -#: templates/web/zurich/admin/report_edit-sdm.html:28 +#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:30 +#: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit-sdm.html:29 -#: templates/web/zurich/admin/report_edit-sdm.html:37 +#: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:38 -#: templates/web/zurich/admin/report_edit.html:28 +#: templates/web/zurich/admin/report_edit.html:27 #: templates/web/zurich/admin/report_edit.html:29 -#: templates/web/zurich/admin/report_edit.html:39 +#: templates/web/zurich/admin/report_edit.html:38 #: templates/web/zurich/admin/report_edit.html:40 -#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit.html:50 #: templates/web/zurich/admin/report_edit.html:52 msgid "originally entered: “%s”" msgstr "αναφέρθηκε αρχικά από: “%s”" -#: templates/web/base/admin/report_edit.html:30 +#: templates/web/base/admin/report_edit.html:43 msgid "other areas:" msgstr "άλλες περιοχές:" @@ -4060,33 +4027,32 @@ msgstr "άλλες περιοχές:" msgid "reopened" msgstr "άνοιξε ξανά" -#: templates/web/fiksgatami/header.html:49 -#: templates/web/fixmystreet/header.html:53 +#: templates/web/fixmystreet/header.html:59 #: templates/web/zurich/footer.html:12 msgid "sign out" msgstr "έξοδος" -#: templates/web/base/report/new/fill_in_details_form.html:13 +#: templates/web/base/report/new/fill_in_details_form.html:12 #: templates/web/base/report/new/fill_in_details_form.html:15 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 msgid "the local council" -msgstr "το τοπικό συμβούλιο" +msgstr "η τοπική υπηρεσία" #: templates/web/base/report/_main.html:57 #: templates/web/zurich/report/_main.html:5 msgid "there is no pin shown as the user did not use the map" -msgstr "δεν υπάρχει σημείωση στον χάρτη επειδή ο χρήστης δεν χρησιμοποίησε τον χάρτη" +msgstr "δεν υπάρχει καρφίτσα στον χάρτη επειδή ο χρήστης δεν χρησιμοποίησε τον χάρτη" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:373 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:379 msgid "this type of local problem" -msgstr "αυτός ο τύπος τοπικού προβλήματος" +msgstr "αυτή η κατηγορία τοπικού προβλήματος" -#: perllib/Utils.pm:235 +#: perllib/Utils.pm:207 msgid "today" msgstr "σήμερα" -#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:32 #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:54 msgid "used map" @@ -4094,7 +4060,7 @@ msgstr "χάρτης σε χρήση" #: templates/web/base/admin/update_edit.html:35 msgid "user is from same council as problem - %d" -msgstr "ο χρήστης είναι από το ίδιο συμβούλιο όπως και το πρόβλημα - %d" +msgstr "ο χρήστης είναι από την ίδια υπηρεσία όπως και το πρόβλημα - %d" #: templates/web/base/admin/update_edit.html:38 msgid "user is problem owner" @@ -4112,7 +4078,7 @@ msgid_plural "<big>%s</big> reports recently" msgstr[0] "<big>%s</big> πρόσφατη αναφορά" msgstr[1] "<big>%s</big> πρόσφατες αναφορές" -#: perllib/Utils.pm:282 +#: perllib/Utils.pm:254 #, perl-format msgid "%d hour" msgid_plural "%d hours" @@ -4126,7 +4092,7 @@ msgid_plural "%d supporters" msgstr[0] "%d υποστηρικτής" msgstr[1] "%d υποστηρικτές" -#: perllib/Utils.pm:284 +#: perllib/Utils.pm:256 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -4145,9 +4111,9 @@ msgstr[1] "<big>%s</big> ενημερώσεις σε αναφορές" 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[1] "Δεν έχουμε ακόμη λεπτομέρειες για τις υπηρεσίες που είναι αρμόδιες σε αυτήν την τοποθεσία." -#: perllib/Utils.pm:278 +#: perllib/Utils.pm:250 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -4168,7 +4134,7 @@ msgid_plural "<big>%s</big> fixed in past month" msgstr[0] "<big>%s</big> διορθώθηκε μέσα στον προηγούμενο μήνα" msgstr[1] "<big>%s</big> διορθώθηκαν μέσα στον προηγούμενο μήνα" -#: perllib/Utils.pm:280 +#: perllib/Utils.pm:252 #, perl-format msgid "%d day" msgid_plural "%d days" @@ -4180,10 +4146,7 @@ msgstr[1] "%d ημέρες" msgid "We do <strong>not</strong> yet have details for the other council that covers this location." msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location." msgstr[0] "<strong>Δεν</strong> έχουμε ακόμη λεπτομέρειες για το άλλο συμβούλιο που είναι αρμόδια σε αυτήν την τοποθεσία." -msgstr[1] "<strong>Δεν</strong> έχουμε ακόμη λεπτομέρειες για τα υπόλοιπα συμβούλια που είναι αρμόδια σε αυτήν την τοποθεσία." - -#~ msgid "Configuration updated - contacts will be generated automatically later" -#~ msgstr "Οι ρυθμίσεις ενημερώθηκαν - οι επαφές θα δημιουργηθούν αυτόματα σε λίγο" +msgstr[1] "<strong>Δεν</strong> έχουμε ακόμη λεπτομέρειες για τις υπόλοιπες υπηρεσίες που είναι αρμόδιες για αυτήν την τοποθεσία." -#~ msgid "The subject and details of the problem will be public, plus your name if you give us permission." -#~ msgstr "Το θέμα και οι λεπτομέρειες του προβλήματος θα είναι δημόσια, καθώς και το όνομά σου αν μας το επιτρέψεις." +#~ msgid "For council(s):" +#~ msgstr "Για την υπηρεσία (-ες):" diff --git a/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po index 9d165ec98..d0b8e4873 100644 --- a/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/es.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -4,14 +4,16 @@ # Matthew Somerville <matthew@mysociety.org>, 2011-06-03. # # Translators: +# Francisco Jimenez Asensio <ocm@ocmalcantarilla.es>, 2015 # jvlopez <jesusvlopez@gmail.com>, 2014 # lfalvarez <luisfelipealvarez@gmail.com>, 2014 +# mySociety <transifex@mysociety.org>, 2015 msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2015-01-20 16:59+0000\n" -"PO-Revision-Date: 2014-11-19 18:31+0000\n" +"POT-Creation-Date: 2015-07-31 14:28+0100\n" +"PO-Revision-Date: 2015-07-10 13:32+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/fixmystreet/language/es/)\n" "Language: es\n" @@ -20,17 +22,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:618 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:386 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:392 msgid " and " msgstr " y " -#: templates/web/base/report/new/councils_text_all.html:12 -#: templates/web/base/report/new/councils_text_all.html:19 -#: templates/web/base/report/new/councils_text_all.html:5 -#: templates/web/base/report/new/councils_text_none.html:19 -#: templates/web/base/report/new/councils_text_none.html:21 -#: templates/web/base/report/new/councils_text_some.html:20 +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_none.html:11 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " @@ -66,22 +66,26 @@ msgstr "%d a %d de %d" msgid "%s - Summary reports" msgstr "%s - Informes de notificación" -#: perllib/FixMyStreet/DB/Result/Problem.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:672 msgid "%s ref: %s" msgstr "%s ref: %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:265 perllib/FixMyStreet/Cobrand/UK.pm:277 +#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 msgid "%s ward, %s" msgstr "%s barrio, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:554 +#: perllib/FixMyStreet/DB/Result/Problem.pm:559 msgid "%s, reported at %s" msgstr "%s, reportado el %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:304 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "%s, within %s ward" msgstr "%s , en %s barrio" +#: perllib/FixMyStreet/Map/OSM.pm:42 +msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" +msgstr "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> colaboradores" + #: templates/web/base/email_sent.html:29 msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" msgstr "(No se preocupe — nosotors mantendremos su alerta mientras usted revisa su email.)" @@ -95,7 +99,7 @@ msgid "(Don't worry — we'll hang on to your update while you're checking y msgstr "(No se preocupe — nosotros mantendremos su actualización mientras usted revisa su email.)" #: templates/web/base/admin/report_blocks.html:11 -#: templates/web/base/admin/users.html:29 +#: templates/web/base/admin/users.html:31 msgid "(Email in abuse table)" msgstr "(Correo electrónico en el cuadro abuso)" @@ -123,7 +127,7 @@ msgstr "(cerrado)" msgid "(fixed)" msgstr "(arreglado)" -#: templates/web/base/index.html:9 +#: templates/web/base/index.html:8 templates/web/base/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)" @@ -133,21 +137,21 @@ msgstr "(como graffitis, basura ilegal, pavimentación o alumbrado roto)" msgid "(not sent to council)" msgstr "(sin enviar al Ayuntamiento)" -#: templates/web/base/report/new/fill_in_details_form.html:218 -#: templates/web/zurich/report/new/fill_in_details_form.html:94 +#: templates/web/base/report/new/fill_in_details_form.html:199 +#: templates/web/zurich/report/new/fill_in_details_form.html:77 msgid "(optional)" msgstr "(opcional)" #: templates/web/fixmystreet/report/public_label.html:1 msgid "(public)" -msgstr "" +msgstr "(público)" #: templates/web/base/reports/_list-entry.html:2 #: templates/web/fixmystreet/report/_item.html:20 msgid "(sent to both)" msgstr "(enviado a ambos)" -#: templates/web/base/report/new/fill_in_details_form.html:212 +#: templates/web/base/report/new/fill_in_details_form.html:193 msgid "(we never show your email address or phone number)" msgstr "(nunca se muestra su dirección de correo electrónico o número de teléfono)" @@ -155,14 +159,13 @@ 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:635 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:662 -#: perllib/FixMyStreet/DB/Result/Problem.pm:393 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Elige una categoría --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 -#: perllib/FixMyStreet/DB/Result/Problem.pm:399 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:630 +#: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Escoja un tipo de propiedad --" @@ -173,65 +176,23 @@ msgid "" " This is probably why \"area covered\" is empty (below).<br>\n" " Maybe add some <code>MAPIT_TYPES</code> to your config file?" msgstr "" +"<code>MAPIT_URL</code> está fijado (<code>%s</code>) pero no hay <code>MAPIT_TYPES</code>.<br>\n" +"Probablemente por eso el \"area cubierta\" está vacía (abajo).<br>\n" +"Habrá que añadir <code>MAPIT_TYPES</code> en su archivo de configuración?" -#: templates/web/base/questionnaire/completed.html:20 -msgid "<p style=\"font-size:150%\">Thank you very much for filling in our questionnaire; glad to hear it’s been fixed.</p>" -msgstr "<p style=\"font-size:150%\"> Muchas gracias por rellenar el cuestionario; alegra saber que ha sido arreglado </ p>." - -#: templates/web/fiksgatami/questionnaire/completed-open.html:1 -msgid "" -"<p style=\"font-size:150%\">We’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’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%\"> Sentimos tener que oír eso. Tenemos dos\n" -"sugerencias: ¿por qué no tratar de escribir <a href=\"http://www.norge.no/styresmakter/\">\n" -"directamente a su concejal (es)</ a> o, si es un problema que podría ser\n" -"arreglado de forma conjunta por conciudadanos, ¿por qué no\n" -"<a href=\"http://www.pledgebank.com/new\">comprometerse y darlo a conocer</ a>?\n" -"</p>" - -#: templates/web/base/questionnaire/completed-open.html:6 -msgid "" -"<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" -"suggestions: why not try writing to your local representatives or, if\n" -"it’s a problem that could be fixed by local people working together, why\n" -"not <a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n" -"</p>" -msgstr "" -"<p style=\"font-size:150%\">Sentimos tener que oír eso. Tenemos dos\n" -"sugerencias: ¿por qué no tratar de escribir <a href=\"http://www.norge.no/styresmakter/\">\n" -"directamente a su concejal (es)</ a> o, si es un problema que podría ser\n" -"arreglado de forma conjunta por conciudadanos, ¿por qué no\n" -"<a href=\"http://www.pledgebank.com/new\">comprometerse y darlo a conocer</ a>?\n" -"</p>" - -#: templates/web/base/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>Muchas gracias por rellenar el cuestionario, si\n" -"descubre más información sobre el estado de su notificación, por favor vuelva\n" -" y realice una actualización.</p>" - -#: templates/web/base/around/_report_banner.html:4 +#: templates/web/base/around/_report_banner.html:3 #: templates/web/base/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>" +msgstr "<small>Si no puede ver el mapa, <a href='%s' rel='nofollow'> omita este paso</a>.</small>" #: templates/web/base/admin/index.html:33 #: templates/web/zurich/admin/index.html:4 msgid "<strong>%d</strong> live problems" -msgstr "<strong>%d</ strong> notificaciones en curso" +msgstr "<strong>%d</strong> notificaciones en curso" #: templates/web/fixmystreet/report/new/form_user_loggedout.html:39 msgid "<strong>No</strong> Let me confirm my report by email" -msgstr "<strong>No</ strong> permítanme confirmar mi notificación por email" +msgstr "<strong>No</strong> permítanme confirmar mi notificación por email" #: templates/web/fixmystreet/report/update-form.html:112 msgid "<strong>No</strong> Let me confirm my update by email" @@ -240,27 +201,22 @@ msgstr "<strong>No</strong> permítanme confirmar mi actualización por email" #: templates/web/fixmystreet/auth/general.html:51 #: templates/web/zurich/auth/general.html:51 msgid "<strong>No</strong> let me sign in by email" -msgstr "<strong>No</ strong> permítanme registrarme por email" +msgstr "<strong>No</strong> permítanme registrarme por email" #: templates/web/base/auth/general.html:55 msgid "<strong>No</strong>, I do not, let me sign in by email:" msgstr "<strong>No</strong>, no lo haré, permítanme registrarme por email:" -#: templates/web/base/report/new/fill_in_details_form.html:163 +#: templates/web/base/report/new/fill_in_details_form.html:144 msgid "<strong>No</strong>, let me confirm my report by email:" -msgstr "<strong>No</ strong>, permítanme confirmar mi notificación por email:" +msgstr "<strong>No</strong>, permítanme confirmar mi notificación por email:" #: templates/web/base/report/update-form.html:117 msgid "<strong>No</strong>, let me confirm my update by email:" msgstr "<strong>No</strong>, permítanme confirmar mi actualización por correo electrónico:" -#: templates/web/base/tokens/confirm_problem.html:19 -#: templates/web/base/tokens/confirm_problem.html:20 -msgid "<strong>We will now send it to the council</strong>." -msgstr "" - #: templates/web/base/auth/general.html:37 -#: templates/web/base/report/new/fill_in_details_form.html:141 +#: templates/web/base/report/new/fill_in_details_form.html:122 #: templates/web/base/report/update-form.html:95 #: templates/web/fixmystreet/auth/general.html:37 #: templates/web/fixmystreet/auth/general.html:39 @@ -274,8 +230,8 @@ msgstr "<strong>Sí</strong> tengo una contraseña" msgid "About us" msgstr "¿Quiénes somos?" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:39 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:52 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:31 #: templates/web/fixmystreet/report/update-form.html:28 @@ -294,26 +250,26 @@ msgstr "" "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/base/admin/body.html:48 +#: templates/web/base/admin/body.html:56 msgid "Add a contact using the form below." msgstr "Añada un contacto usando el siguiente formulario" #: templates/web/base/admin/bodies.html:74 -#: templates/web/base/admin/body-form.html:233 +#: templates/web/base/admin/body-form.html:240 #: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "Agregue un órgano" -#: templates/web/base/admin/body.html:108 +#: templates/web/base/admin/body.html:116 #: templates/web/zurich/admin/body.html:31 msgid "Add new category" msgstr "Agregar nueva categoría" -#: templates/web/base/admin/users.html:45 +#: templates/web/base/admin/users.html:47 msgid "Add user" msgstr "Añade un usuario" -#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:70 +#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:52 msgid "Added %s" msgstr "Añadido %s" @@ -340,9 +296,7 @@ msgstr "Avisarme de las actualizaciones futuras" msgid "All Reports" msgstr "Todas las notificaciones" -#: templates/web/base/footer.html:11 templates/web/fiksgatami/footer.html:23 -#: templates/web/fiksgatami/nn/footer.html:23 -#: templates/web/fixmystreet/footer.html:26 +#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:26 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:19 @@ -359,19 +313,9 @@ msgstr "Todos los reportes entre %s y %s" msgid "All the information you provide here will be sent to" msgstr "Toda la información proporcionada será enviada a" -#: templates/web/base/report/new/councils_text_all.html:12 -#: templates/web/base/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/base/report/new/councils_text_all.html:5 -#: templates/web/base/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/base/report/new/councils_text_all.html:19 -#: templates/web/base/report/new/councils_text_all.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:13 +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_all.html:4 +#: templates/web/base/report/new/fill_in_details_form.html:12 #: templates/web/base/report/new/fill_in_details_form.html:14 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 @@ -388,29 +332,29 @@ msgstr "Una actualización marcó esta notificación como arreglada." msgid "Anonymous" msgstr "Anónimo" -#: templates/web/base/admin/report_edit.html:62 +#: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:23 msgid "Anonymous:" msgstr "Anónimo:" #: templates/web/base/footer.html:26 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?" +msgstr "¿Eres <strong>programador</strong>? ¿Te gustaría contribuir a FixMyStreet?" -#: templates/web/fiksgatami/front/footer-marketing.html:14 #: templates/web/fixmystreet/front/footer-marketing.html:16 msgid "Are you a developer?" msgstr "¿Eres programador?" #: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 msgid "Area covered" msgstr "Area cubierta" #: templates/web/base/admin/bodies.html:15 -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/body.html:60 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." -msgstr "" +msgstr "Como se trata de un lugar y %s es falsa, los informes realizados en este sitio serán enviados al administrador del sitio para su resolución, no al contacto dado para la categoría del informe." #: templates/web/zurich/admin/report_edit.html:141 #: templates/web/zurich/admin/stats.html:36 @@ -426,7 +370,7 @@ msgstr "Asignar a un órgano externo:" msgid "Assign to subdivision:" msgstr "Asigne a la subdivisión" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:163 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:165 #: templates/web/zurich/report/updates.html:11 msgid "Assigned to %s" msgstr "Asignado a %s" @@ -439,7 +383,7 @@ msgstr "Se devuelven como máximo %d solicitudes por cada consulta. Las solicitu msgid "At the moment only searching for and looking at reports work." msgstr "Por el momento sólo funcionan las búsquedas y las vistas de notificaciones." -#: perllib/FixMyStreet/DB/Result/Problem.pm:348 +#: perllib/FixMyStreet/DB/Result/Problem.pm:373 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "En espera de moderación" @@ -452,11 +396,11 @@ msgstr "Atras" msgid "Ban email address" msgstr "Prohibir dirección de email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:297 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:301 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" -msgstr "" +msgstr "Cuerpos" #: templates/web/base/admin/flagged.html:17 #: templates/web/base/admin/reports.html:14 @@ -464,6 +408,7 @@ msgstr "" msgid "Body" msgstr "Órgano" +#: templates/web/base/admin/report_edit.html:34 #: templates/web/base/admin/user-form.html:32 msgid "Body:" msgstr "Órgano:" @@ -476,16 +421,15 @@ msgstr "Por Fecha" msgid "Can't see the map? <em>Skip this step</em>" msgstr "¿No puedes ver el mapa? <em>Salte este paso</em>" -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:55 #: templates/web/base/report/new/category.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:53 +#: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 #: templates/web/zurich/admin/stats.html:50 -#: templates/web/zurich/report/new/fill_in_details_form.html:50 msgid "Category" msgstr "Categoría" @@ -493,17 +437,16 @@ msgstr "Categoría" msgid "Category fix rate for problems > 4 weeks old" msgstr "Categoría ratio de arreglo de problemas > 4 semanas" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:138 #: templates/web/base/admin/category_edit.html:23 -#: templates/web/base/admin/report_edit.html:61 -#: templates/web/base/report/new/fill_in_details_form.html:68 +#: templates/web/base/admin/report_edit.html:74 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/report_edit-sdm.html:42 #: templates/web/zurich/admin/report_edit.html:140 msgid "Category:" msgstr "Categoría:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:377 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383 msgid "Category: %s" msgstr "Categoría: %s" @@ -514,19 +457,23 @@ msgstr "Categoría: %s" msgid "Change password" msgstr "Cambiar contraseña" -#: templates/web/base/admin/body.html:152 +#: templates/web/base/admin/body.html:160 msgid "" "Check <strong>confirmed</strong> to indicate that this contact has been confirmed as correct.\n" " If you are not sure of the origin or validity of the contact, leave this unchecked." msgstr "" +"Marcar <strong>confirmado</ strong> para indicar que este contacto se ha confirmado como correcto.\n" +"Si no está seguro del origen o la validez del contacto, deje esta casilla sin marcar." -#: templates/web/base/admin/body.html:163 +#: templates/web/base/admin/body.html:171 msgid "" "Check <strong>deleted</strong> to remove the category from use. \n" " It will not appear as an available category in the drop-down menu on the report-a-problem page." msgstr "" +"Marcar <strong>borrado</ strong> para eliminar la categoría de uso. \n" +"No va a aparecer como una categoría disponible en el menú desplegable que aparece cuando informa de un problema." -#: templates/web/base/admin/body.html:183 +#: templates/web/base/admin/body.html:191 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -544,32 +491,34 @@ msgstr "" "no hay mayor interés en ser desplegados. En el Reino Unido, hemos utilizado esto para servicios como requerir un\n" "basurero extra en una dirección específica" -#: templates/web/base/admin/body.html:122 +#: templates/web/base/admin/body.html:130 msgid "" "Choose a <strong>category</strong> name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" " to the body too. These will appear in the drop-down menu on the report-a-problem page." msgstr "" +"Elegir un nombre de la <strong>categoria</strong> que tenga sentido para el público (por ejemplo, \"baches\", \"El alumbrado público\"), pero es útil\n" +"para el organismo también. Estos aparecerán en el menú desplegable cuando informe de un problema." #: templates/web/base/admin/stats.html:65 #: templates/web/base/admin/stats.html:71 msgid "Click here or enter as dd/mm/yyyy" -msgstr "" +msgstr "Haga click aqui o introduzca dd/mm/yyyy" #: templates/web/base/js/translation_strings.html:50 #: templates/web/fixmystreet/around/_report_banner.html:2 msgid "Click map to report a problem" msgstr "Haga clic en el mapa para notificar un problema" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:45 -#: templates/web/base/admin/report_edit.html:47 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:58 +#: templates/web/base/admin/report_edit.html:60 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/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:95 #: templates/web/zurich/admin/report_edit.html:97 #: templates/web/zurich/admin/stats.html:31 @@ -577,11 +526,12 @@ msgstr "Haga clic en el mapa para notificar un problema" msgid "Closed" msgstr "Cerrada" -#: perllib/FixMyStreet/DB/Result/Problem.pm:762 +#: perllib/FixMyStreet/DB/Result/Problem.pm:771 msgid "Closed by council" msgstr "Cerrado por el Ayuntamiento" -#: templates/web/base/my/my.html:40 templates/web/fixmystreet/my/my.html:46 +#: templates/web/base/my/my.html:40 +#: templates/web/fixmystreet/my/_problem-list.html:12 msgid "Closed reports" msgstr "Informes cerrados" @@ -589,7 +539,7 @@ msgstr "Informes cerrados" msgid "Closed:" msgstr "Cerrado:" -#: templates/web/base/around/tabbed_lists.html:11 +#: templates/web/base/around/tabbed_lists.html:10 #: templates/web/base/around/tabbed_lists.html:12 msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "Problemas cercanos <small>(dentro de %%s km)</small>" @@ -604,26 +554,26 @@ msgstr "Coordenadas:" msgid "Cobrand" msgstr "Cobrand" -#: templates/web/base/admin/report_edit.html:75 +#: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:50 msgid "Cobrand data:" msgstr "Datos cobrand:" -#: templates/web/base/admin/report_edit.html:74 +#: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:49 msgid "Cobrand:" msgstr "Cobrand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" -msgstr "" +msgstr "Configuración" -#: templates/web/base/admin/category_edit.html:47 +#: templates/web/base/admin/category_edit.html:52 msgid "Configure Endpoint" -msgstr "" +msgstr "Configurar punto" -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/body.html:72 msgid "Confirm" msgstr "Confirmar" @@ -634,7 +584,7 @@ msgstr "Confirmar cuenta" #: templates/web/fixmystreet/report/new/form_user_loggedout.html:33 #: templates/web/fixmystreet/report/update-form.html:107 msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated." -msgstr "" +msgstr "Confirme por correo electrónico a continuación, proporcionando una nueva contraseña en ese punto. Al confirmar, su contraseña se actualizará." #: templates/web/base/questionnaire/creator_fixed.html:1 #: templates/web/base/tokens/confirm_problem.html:1 @@ -644,21 +594,21 @@ msgstr "" msgid "Confirmation" msgstr "Confirmación" -#: templates/web/base/admin/body.html:158 -#: templates/web/base/admin/body.html:71 -#: templates/web/base/admin/category_edit.html:32 -#: templates/web/base/admin/category_edit.html:84 +#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/category_edit.html:37 +#: templates/web/base/admin/category_edit.html:89 #: templates/web/zurich/admin/stats.html:40 msgid "Confirmed" msgstr "Confirmado" #: templates/web/base/admin/stats.html:5 msgid "Confirmed reports between %s and %s" -msgstr "" +msgstr "Informes confirmados entre %s y %s" #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 -#: templates/web/base/admin/report_edit.html:70 +#: templates/web/base/admin/report_edit.html:83 msgid "Confirmed:" msgstr "Confirmado:" @@ -675,19 +625,18 @@ msgid "Contact Us" msgstr "Contáctenos" #: templates/web/base/contact/index.html:6 -#: templates/web/base/contact/submit.html:3 #: templates/web/fixmystreet/contact/index.html:20 msgid "Contact the team" msgstr "Contactar con el equipo" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1327 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1355 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1325 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1353 msgid "Could not find user" msgstr "No se pudo encontrar usuario" #: templates/web/base/js/translation_strings.html:37 msgid "Could not look up location" -msgstr "" +msgstr "No se pudo consultar la ubicación" #: templates/web/base/admin/list_updates.html:9 msgid "Council" @@ -699,6 +648,10 @@ msgstr "Ayuntamiento" msgid "Council contacts for %s" msgstr "Contactos del Ayuntamiento para %s" +#: perllib/FixMyStreet/DB/Result/Problem.pm:670 +msgid "Council ref: %s" +msgstr "referencia Ayuntamiento: %s" + #: templates/web/base/admin/stats.html:84 msgid "Council:" msgstr "Ayuntamiento:" @@ -714,7 +667,7 @@ msgstr "Total" msgid "Create a report" msgstr "Crear una notificación" -#: templates/web/base/admin/body.html:200 +#: templates/web/base/admin/body.html:208 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Crear una categoría" @@ -726,7 +679,7 @@ msgid "Created" msgstr "Creado" #: templates/web/base/admin/list_updates.html:38 -#: templates/web/base/admin/report_edit.html:69 +#: templates/web/base/admin/report_edit.html:82 #: templates/web/base/admin/update_edit.html:51 #: templates/web/zurich/admin/report_edit-sdm.html:47 #: templates/web/zurich/admin/report_edit.html:61 @@ -741,31 +694,31 @@ msgstr "Estado actual" #: templates/web/base/admin/bodies.html:5 #: templates/web/base/admin/index.html:16 msgid "Currently no bodies have been created." -msgstr "" +msgstr "Actualmente no se han creado organismos." -#: templates/web/base/dashboard/index.html:6 +#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 msgid "Dashboard" msgstr "Cuadro de mando" #: templates/web/zurich/admin/stats.html:35 msgid "Dealt with by subdivision within 5 working days" -msgstr "" +msgstr "Tratado por el departamento dentro de los 5 días hábiles" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:169 -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:37 -#: templates/web/base/admin/category_edit.html:85 +#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:81 +#: templates/web/base/admin/category_edit.html:42 +#: templates/web/base/admin/category_edit.html:90 msgid "Deleted" msgstr "Eliminado" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:43 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 #: 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 "" +msgstr "Descripción" #: templates/web/base/js/translation_strings.html:34 #: templates/web/zurich/report/new/fill_in_details_form.html:42 @@ -780,9 +733,9 @@ msgstr "Detalles" msgid "Details:" msgstr "Detalles:" -#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/body.html:87 msgid "Devolved" -msgstr "" +msgstr "Transferido" #: templates/web/base/admin/edit-league.html:8 msgid "Diligency prize league table" @@ -806,18 +759,18 @@ msgstr "No lo se" #: templates/web/fixmystreet/contact/index.html:118 msgid "Don't like forms?" -msgstr "" +msgstr "¿No te gustan los formularios?" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:47 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:60 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:32 #: templates/web/fixmystreet/report/update-form.html:28 #: templates/web/fixmystreet/report/update-form.html:30 msgid "Duplicate" -msgstr "" +msgstr "Duplicado" -#: templates/web/base/admin/body.html:98 +#: templates/web/base/admin/body.html:106 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" @@ -830,20 +783,20 @@ msgstr "" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 -#: templates/web/base/admin/users.html:31 +#: templates/web/base/admin/users.html:33 #: templates/web/zurich/admin/problem_row.html:42 msgid "Edit" msgstr "Editar" -#: templates/web/base/admin/body.html:212 +#: templates/web/base/admin/body.html:220 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "Editar los detalles del órgano" #: templates/web/base/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:2 +#: 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:2 +#: templates/web/zurich/admin/report_edit.html:1 #: templates/web/zurich/admin/report_edit.html:5 msgid "Editing problem %d" msgstr "Editando problema %d" @@ -857,12 +810,12 @@ msgstr "Editando actualización %d" msgid "Editing user %d" msgstr "Editando usuario %d" -#: templates/web/base/admin/category_edit.html:86 +#: templates/web/base/admin/category_edit.html:91 msgid "Editor" msgstr "Editor" #: templates/web/base/admin/bodies.html:23 -#: templates/web/base/admin/category_edit.html:83 +#: templates/web/base/admin/category_edit.html:88 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 #: templates/web/fixmystreet/auth/general.html:21 @@ -873,15 +826,23 @@ msgstr "Editor" msgid "Email" msgstr "Email:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1303 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1301 msgid "Email added to abuse list" msgstr "Email añadido a lista de abusos" -#: templates/web/base/admin/body.html:147 +#: templates/web/base/admin/body.html:155 msgid "Email address:" -msgstr "" +msgstr "Dirección de email:" + +#: templates/web/base/tokens/confirm_alert.html:6 +msgid "Email alert created" +msgstr "Creada alerta de email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1300 +#: templates/web/base/tokens/confirm_alert.html:10 +msgid "Email alert deleted" +msgstr "Borrada alerta de email" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1298 msgid "Email already in abuse list" msgstr "Email ya incluido en lista de abusos" @@ -893,8 +854,8 @@ msgstr "Reciba por email nuevos problemas locales" msgid "Email me updates" msgstr "Recibir por email actualizaciones" -#: templates/web/base/admin/category_edit.html:26 -#: templates/web/base/admin/report_edit.html:67 +#: templates/web/base/admin/category_edit.html:31 +#: templates/web/base/admin/report_edit.html:80 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 @@ -905,58 +866,65 @@ msgstr "Recibir por email actualizaciones" msgid "Email:" msgstr "Email:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:322 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 msgid "Email: %s" -msgstr "" +msgstr "Email: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 msgid "Empty flat or maisonette" msgstr "Piso o duplex vacío" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:631 msgid "Empty house or bungalow" msgstr "Casa o bungalow vacío" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:622 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty office or other commercial" msgstr "Oficina u otros establecimientos comerciales vacíos" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:623 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Empty pub or bar" msgstr "Pub o bar vacío" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:624 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty public building - school, hospital, etc." msgstr "Edificio público vacío - escuela, hospital, etc" -#: templates/web/base/admin/body-form.html:158 -#: templates/web/base/admin/body-form.html:159 +#: templates/web/base/admin/body-form.html:162 +#: templates/web/base/admin/body-form.html:163 msgid "" "Enable <strong>Open311 update-sending</strong> if the endpoint will send and receive\n" " updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" " For more information, see \n" " <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>." msgstr "" +"Activar <strong>Open311 para notificación de incidencias</strong> si el Ayuntamiento lo usa para enviar y recibir\n" +"notificaciones y actualizaciones. Si no está seguro, mejor no lo active.\n" +"Para más información vea\n" +"<a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>este documento</a>." -#: templates/web/base/admin/body-form.html:215 -#: templates/web/base/admin/body-form.html:216 +#: templates/web/base/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:223 msgid "" "Enable this <strong>can be devolved</strong> setting if one or more contacts have a \n" " different endpoint (and send method) from the body's. For example, if reports for some categories of\n" " problem must be emailed, while others can be sent over Open311." msgstr "" +"Habilitar esto <strong>para ser transferido</ strong> establecer si uno o más contactos tienen unos\n" +"límites diferentes (y enviar método) desde el organismo. Por ejemplo, si los informes para algunas categorías de \n" +"incidencia deben ser enviadas por correo electrónico, mientras que otros pueden ser enviados a través Open311." #: templates/web/base/admin/stats.html:70 msgid "End Date:" -msgstr "" +msgstr "Fecha final:" -#: templates/web/base/admin/body-form.html:126 +#: templates/web/base/admin/body-form.html:130 msgid "Endpoint" -msgstr "" +msgstr "Punto final" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:72 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:73 msgid "Enter a Zürich street name" -msgstr "" +msgstr "Introduzca un Zürich nombre de calle" #: perllib/FixMyStreet/Cobrand/UK.pm:13 msgid "Enter a nearby UK postcode, or street name and area" @@ -967,17 +935,19 @@ msgstr "Introduzca un código postal cercano de su región, o nombre de la calle 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/base/around/postcode_form.html:1 #: templates/web/base/around/postcode_form.html:2 +#: templates/web/fixmystreet/around/postcode_form.html:10 #: templates/web/fixmystreet/around/postcode_form.html:11 msgid "Enter a nearby street name and area" msgstr "Introduzca un nombre de la calle y la zona cercana" #: perllib/FixMyStreet/Cobrand/ZeroTB.pm:7 msgid "Enter a nearby street name and area, postal code or district in Delhi" -msgstr "" +msgstr "Introduzca un nombre de calle cercana y área, código postal o distrito en Nueva Delhi" #: templates/web/base/auth/general.html:64 -#: templates/web/base/report/new/fill_in_details_form.html:170 +#: templates/web/base/report/new/fill_in_details_form.html:151 #: templates/web/base/report/update-form.html:124 msgid "Enter a new password:" msgstr "Introduzca una nueva contraseña:" @@ -989,7 +959,7 @@ msgstr "Introduzca una nueva contraseña:" msgid "Enter a password" msgstr "Introduzca una contraseña" -#: templates/web/base/index-steps.html:33 +#: templates/web/base/index-steps.html:26 msgid "Enter details of the problem" msgstr "Introduzca detalles del problema" @@ -1012,31 +982,36 @@ msgstr "Ejemplo de código postal %s" msgid "Examples:" msgstr "Ejemplos:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:47 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" +msgstr "Explique lo que está mal, exactamente donde está, y el tiempo que ha estado ahí ..." + +#: templates/web/base/admin/body-form.html:81 +msgid "External URL" msgstr "" -#: templates/web/base/admin/report_edit.html:76 +#: templates/web/base/admin/category_edit.html:27 +#: templates/web/base/admin/report_edit.html:92 msgid "Extra data:" msgstr "Datos adicionales:" -#: templates/web/base/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>." +#: templates/web/base/contact/submit.html:13 +msgid "Failed to send message" +msgstr "Fallo en el envío del mensaje" #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 msgid "Filter report list" -msgstr "" +msgstr "Filtrar lista de informes" #: templates/web/base/questionnaire/index.html:55 #: templates/web/fixmystreet/questionnaire/index.html:74 msgid "First time" msgstr "Primera vez" -#: templates/web/base/admin/body.html:40 +#: templates/web/base/admin/body.html:48 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." -msgstr "" +msgstr "Arreglar esto eligiendo un <strong>área cubierta</ strong> en <em>Editar detalles del organismo</ em> del siguiente formulario." #: templates/web/base/header.html:24 msgid "FixMyStreet" @@ -1074,9 +1049,9 @@ msgstr "" " para la Diputación Provincial." #: templates/web/base/admin/index.html:55 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:41 -#: templates/web/base/admin/report_edit.html:42 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:54 +#: templates/web/base/admin/report_edit.html:55 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/update-form.html:30 @@ -1087,17 +1062,18 @@ msgstr "" msgid "Fixed" msgstr "Arreglado" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:43 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:56 msgid "Fixed - Council" msgstr "Arreglado - Ayuntamiento" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:42 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:55 msgid "Fixed - User" msgstr "Arreglado - Usuario" -#: templates/web/base/my/my.html:35 templates/web/fixmystreet/my/my.html:41 +#: templates/web/base/my/my.html:35 +#: templates/web/fixmystreet/my/_problem-list.html:7 msgid "Fixed reports" msgstr "Notificaciones arregladas" @@ -1105,34 +1081,34 @@ msgstr "Notificaciones arregladas" msgid "Fixed:" msgstr "Arreglado:" -#: templates/web/base/admin/body-form.html:84 +#: templates/web/base/admin/body-form.html:89 #: templates/web/zurich/admin/body-form.html:36 msgid "Flag as deleted" -msgstr "" +msgstr "Marcar como borrado" #: templates/web/base/admin/report_blocks.html:16 msgid "Flag user" msgstr "Marca usuario" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Marcado" #: templates/web/base/admin/flagged.html:1 msgid "Flagged reports and users" -msgstr "" +msgstr "Señalizar informes y usuarios" -#: templates/web/base/admin/user-form.html:45 +#: templates/web/base/admin/user-form.html:46 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page." -msgstr "" +msgstr "Los usuarios marcados se listan en página de<a href='%s'>marcados</a>" #: templates/web/base/admin/flagged.html:31 msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." -msgstr "" +msgstr "Los usuarios marcados no se limitan de ninguna manera. Esto es sólo una lista de usuarios que se han marcado para la atención." -#: templates/web/base/admin/report_edit.html:78 -#: templates/web/base/admin/user-form.html:51 +#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/user-form.html:52 msgid "Flagged:" msgstr "Marcado:" @@ -1141,24 +1117,18 @@ msgstr "Marcado:" msgid "Follow a ward link to view only reports within that ward." msgstr "Clic en el enlace de un barrio para ver solo las notificaciones en ese barrio" -#: templates/web/base/admin/report_edit.html:30 -msgid "For council(s):" -msgstr "Por Concejalía(s):" - #: templates/web/base/admin/body-form.html:65 msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." -msgstr "" +msgstr "Para más información, vea <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Cómo FixMyStreet usa Mapit</a>." #: templates/web/fixmystreet/report/new/form_user_loggedout.html:32 #: templates/web/fixmystreet/report/update-form.html:106 msgid "Forgotten your password?" -msgstr "" +msgstr "¿Olvidó su contraseña?" #: templates/web/base/faq/faq-en-gb.html:1 #: templates/web/base/static/privacy.html:1 #: templates/web/base/static/privacy.html:2 -#: templates/web/fiksgatami/faq/faq-nb.html:1 -#: templates/web/fiksgatami/nn/faq/faq-nn.html:1 msgid "Frequently Asked Questions" msgstr "Preguntas frecuentes" @@ -1171,13 +1141,13 @@ msgstr "GeoRSS en Google Maps" msgid "Get updates" msgstr "Recibe actualizaciones" -#: templates/web/fixmystreet/reports/_rss.html:4 +#: templates/web/fixmystreet/reports/_rss.html:3 #: 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:4 +#: templates/web/fixmystreet/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "Recibe actualizaciones de los problemas en este %s" @@ -1186,6 +1156,10 @@ msgstr "Recibe actualizaciones de los problemas en este %s" msgid "Give me an RSS feed" msgstr "Dame un feed RSS" +#: templates/web/base/questionnaire/completed.html:14 +msgid "Glad to hear it’s been fixed!" +msgstr "Me alegra saber que ha sido arreglado!" + #: templates/web/base/alert/index.html:34 #: templates/web/base/around/postcode_form.html:8 #: templates/web/fixmystreet/around/postcode_form.html:21 @@ -1193,7 +1167,7 @@ msgstr "Dame un feed RSS" msgid "Go" msgstr "Ir" -#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:93 msgid "Going to send questionnaire?" msgstr "¿Va a enviar cuestionario?" @@ -1215,9 +1189,7 @@ msgstr "¿Ha sido corregido este problema?" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "¿Alguna vez informó de un problema a un Ayuntamiento antes, o es tu primera vez?" -#: templates/web/base/footer.html:15 templates/web/fiksgatami/footer.html:27 -#: templates/web/fiksgatami/nn/footer.html:27 -#: templates/web/fixmystreet/footer.html:30 +#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:30 #: templates/web/zurich/faq/faq-de-ch.html:1 #: templates/web/zurich/footer.html:21 #: templates/web/zurich/nav_over_content.html:8 @@ -1229,18 +1201,17 @@ msgstr "Ayuda" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "Estos son los tipos de alertas de problemas locales para '%s'." -#: templates/web/fiksgatami/header.html:48 -#: templates/web/fixmystreet/header.html:52 +#: templates/web/fixmystreet/header.html:58 #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "Hola %s" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:50 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:63 +#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/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:86 #: templates/web/zurich/admin/report_edit.html:90 #: templates/web/zurich/admin/stats.html:32 @@ -1256,13 +1227,13 @@ msgstr "Ocultar antiguos" msgid "Hide pins" msgstr "Ocultar pines" -#: templates/web/base/admin/category_edit.html:79 +#: templates/web/base/admin/category_edit.html:84 msgid "History" msgstr "Historial" #: templates/web/base/js/translation_strings.html:31 msgid "Home" -msgstr "" +msgstr "Inicio" #: templates/web/base/index-steps.html:1 msgid "How to report a problem" @@ -1270,21 +1241,27 @@ msgstr "Cómo notificar un problema" #: templates/web/base/js/translation_strings.html:33 msgid "How to send successful reports" -msgstr "" +msgstr "¿Como enviar informes exitosos?" -#: perllib/FixMyStreet/App/Controller/Admin.pm:742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:740 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Me temo que no puede confirmar informes no confirmados." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:89 +#: templates/web/base/tokens/confirm_problem.html:23 +#: templates/web/base/tokens/confirm_problem.html:27 +msgid "I just reported a problem on @fixmystreet" +msgstr "Me acaba de informar un problema en @fixmystreet" + +#: templates/web/base/tokens/confirm_update.html:19 +#: templates/web/base/tokens/confirm_update.html:23 +msgid "I just updated a problem on @fixmystreet" +msgstr "Acabo de actualizar un problema en @fixmystreet" + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Me temo que no se ha podido localizar su problema en la base de datos.\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 "Me temo que no ha podido verificar token, ya que el informe se hizo hace mucho tiempo." - -#: perllib/FixMyStreet/App/Controller/Tokens.pm:260 +#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 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" @@ -1305,28 +1282,37 @@ msgid "" "Identify a <strong>parent</strong> if this body is itself part of another body.\n" " For basic installations, you don't need to join bodies in this way." msgstr "" +"Identificar una <strong>matriz</ strong> si este organismo es en sí misma parte de otro organismo.\n" +"Para las instalaciones básicas, no necesita asociar los organismos de esta manera." -#: templates/web/base/admin/body.html:125 +#: templates/web/base/admin/body.html:133 msgid "" "If two or more bodies serve the same location, FixMyStreet combines identical categories into a single entry in\n" " the menu. Make sure you use the same category name in the bodies if you want this to happen." msgstr "" +"Si dos o más organismos tienen la misma ubicación, FixMyStreet combina categorías idénticas en una sola entrada en\n" +"el menú. Asegúrese de que utiliza el mismo nombre de la categoría en los órganos si usted desea que esto suceda." #: templates/web/base/email_sent.html:19 msgid "If you do not, your alert will not be activated." -msgstr "" +msgstr "Si no lo hace, la alerta no se activará." #: templates/web/base/email_sent.html:15 msgid "If you do not, your problem will not be posted." -msgstr "" +msgstr "Si no lo hace, el problema no será publicado." #: templates/web/base/email_sent.html:17 msgid "If you do not, your update will not be posted." -msgstr "" +msgstr "Si no lo hace, no se publicará su actualización." + +#: templates/web/base/questionnaire/completed.html:8 +msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." +msgstr "Si usted consigue algo más de información sobre el estado de su problema, por favor regrese al sitio y deje una actualización." -#: templates/web/base/report/new/councils_text_none.html:9 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:8 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." +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." #: templates/web/base/auth/token.html:22 templates/web/base/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." @@ -1343,34 +1329,42 @@ msgstr "" "(tenga en cuenta que no se enviará al Ayuntamiento). Por ejemplo, ¿cómo fue su experiencia\n" "su de que su problema fuera solucionado?" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/body.html:149 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." -msgstr "" +msgstr "Si estás utilizando <strong> un método de envío que no es email </ strong>, introduzca el ID de servicio (Open311) o identificador equivalente aquí." -#: templates/web/base/admin/body-form.html:200 -#: templates/web/base/admin/body-form.html:201 +#: templates/web/base/admin/body-form.html:207 +#: templates/web/base/admin/body-form.html:208 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable <strong>extended Open311 stauses</strong> if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" +"Si ha habilitado en Open311 actualización de envío anterior, Open311 normalmente sólo acepta el estado abierto o cerrado en\n" +"sus actualizaciones. Activar <strong>extensión de stauses Open311</ strong> si desea permitir que los estados adicionales sean pasados.\n" +"Compruebe que su cobrand admite esta función antes de encenderlo." -#: templates/web/base/admin/body-form.html:187 -#: templates/web/base/admin/body-form.html:188 +#: templates/web/base/admin/body-form.html:194 +#: templates/web/base/admin/body-form.html:195 msgid "" "If you've enabled Open311 update-sending above, enable <strong>suppression of alerts</strong> \n" " if you do <strong>not</strong> want that user to be notified whenever these updates are created." msgstr "" +"Si ha habilitado el envío por Open311, podrá <strong>suprimir las alertas</strong>\n" +"si <strong>no</ strong> lo hace el usuario será notificado cada vez que se crean estas actualizaciones." -#: templates/web/base/admin/body-form.html:173 -#: templates/web/base/admin/body-form.html:174 +#: templates/web/base/admin/body-form.html:177 +#: templates/web/base/admin/body-form.html:178 msgid "" "If you've enabled Open311 update-sending above, you must identify which \n" " FixMyStreet <strong>user</strong> will be attributed as the creator of those updates\n" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" +"Si ha habilitado Open311 para el envío o actualización anterior, debe identificar qué \n" +"<strong>usuario</ strong> de FixMyStreet es el creador de esos cambios\n" +"cuando se muestran en el sitio. Introduzca el ID (número) del usuario." -#: perllib/FixMyStreet/App/Controller/Contact.pm:127 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 msgid "Illegal ID" msgstr "ID ilegal" @@ -1389,62 +1383,66 @@ msgstr "En Progreso" #: templates/web/base/admin/flagged.html:39 msgid "In abuse table?" -msgstr "" +msgstr "abuso de la tabla?" #: templates/web/base/open311/index.html:88 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:143 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:38 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:144 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 #: templates/web/fixmystreet/report/banner.html:19 -#: templates/web/zurich/admin/header.html:2 +#: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 #: templates/web/zurich/admin/report_edit.html:99 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "En Progreso" +#: templates/web/base/tokens/confirm_alert.html:11 +msgid "Inbox zero, here we come!" +msgstr "Bandeja de entrada cero, allá vamos!" + #: templates/web/zurich/admin/report_edit.html:160 msgid "Include reporter personal details" -msgstr "" +msgstr "Incluya datos personales en el informe" #: templates/web/base/admin/stats.html:76 msgid "Include unconfirmed reports" msgstr "Incluir notificaciones no confirmadas" -#: perllib/FixMyStreet/App/Controller/Open311.pm:354 +#: perllib/FixMyStreet/App/Controller/Open311.pm:359 msgid "Incorrect has_photo value \"%s\"" msgstr "Valor incorrecto para has_photo \"%s\"" #: templates/web/zurich/admin/list_updates.html:3 msgid "Internal notes" -msgstr "" +msgstr "Notas internas" -#: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:61 msgid "Internal referral" -msgstr "" +msgstr "Remisión interna" -#: perllib/FixMyStreet/App/Controller/Open311.pm:339 +#: perllib/FixMyStreet/App/Controller/Open311.pm:344 msgid "Invalid agency_responsible value %s" msgstr "Valor inválido para agency_responsible %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1114 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1112 msgid "Invalid end date" msgstr "Fecha de fin inválida" -#: perllib/FixMyStreet/App/Controller/Open311.pm:432 +#: perllib/FixMyStreet/App/Controller/Open311.pm:437 msgid "Invalid format %s specified." msgstr "Formato no válido %s especificado." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1110 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 msgid "Invalid start date" msgstr "Fecha de inicio no válida" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:37 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:50 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 #: templates/web/base/report/update-form.html:30 @@ -1456,10 +1454,14 @@ msgstr "Investigando" #: 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 "" +msgstr "A menudo es más rápido <a href=\"%s\">consultar nuestras preguntas frecuentes</a> y ver si la respuesta está allí." + +#: templates/web/base/tokens/confirm_problem.html:14 +msgid "It’s on its way to the council right now." +msgstr "De camino al ayuntamiento en este momento" #: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:150 +#: templates/web/base/report/new/fill_in_details_form.html:131 #: templates/web/base/report/update-form.html:104 #: templates/web/fixmystreet/auth/general.html:47 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 @@ -1468,12 +1470,12 @@ msgstr "" msgid "Keep me signed in on this computer" msgstr "Recordar mi contraseña en este ordenador" -#: templates/web/base/admin/body.html:62 +#: templates/web/base/admin/body.html:70 #: templates/web/zurich/admin/body.html:16 msgid "Last editor" msgstr "Último editor" -#: templates/web/base/admin/report_edit.html:72 +#: templates/web/base/admin/report_edit.html:88 msgid "Last update:" msgstr "Última actualización:" @@ -1481,60 +1483,65 @@ msgstr "Última actualización:" msgid "Last update:" msgstr "Última actualización:" -#: templates/web/base/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:229 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." -msgstr "" +msgstr "Deje en blanco si todos los informes a este órgano deben ser enviados utilizando el mismo método de envío (e.g., \"%s\")." -#: templates/web/base/admin/body.html:17 templates/web/base/admin/body.html:19 +#: templates/web/base/admin/body.html:27 msgid "List all reported problems" msgstr "Listar todos los problemas notificados" -#: templates/web/base/report/new/fill_in_details_form.html:69 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:54 -#: templates/web/zurich/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/category_wrapper.html:4 msgid "Loading..." msgstr "Cargando..." #: templates/web/base/alert/choose.html:1 #: templates/web/base/alert/choose.html:3 #: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3 -#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:5 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5 #: templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 -#: templates/web/base/tokens/confirm_alert.html:4 #: templates/web/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "Feeds RSS locales y alertas por email" -#: templates/web/base/alert/list.html:13 templates/web/base/alert/list.html:14 -#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:3 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:12 +#: templates/web/base/alert/list.html:14 templates/web/base/alert/list.html:3 msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Feeds RSS locales y alertas por email para '%s'" -#: templates/web/base/footer.html:13 templates/web/fiksgatami/footer.html:25 -#: templates/web/fiksgatami/nn/footer.html:25 -#: templates/web/fixmystreet/footer.html:28 +#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:28 msgid "Local alerts" msgstr "Alertas locales" -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:25 msgid "Locate the problem on a map of the area" msgstr "Busque el problema en un mapa de la zona" #: templates/web/base/js/translation_strings.html:43 msgid "MAP" -msgstr "" +msgstr "MAPA" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" -msgstr "" +msgstr " Mapa" -#: perllib/FixMyStreet/Map/OSM.pm:42 -msgid "Map © <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 "Mapa © <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\">OpenStreetMap</ a> y colaboradores, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA</a>" +#: templates/web/base/admin/report_edit.html:86 +#, fuzzy +msgid "Mark as sent" +msgstr "marcado como cerrado" -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/user-form.html:44 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." +msgstr "Señalar usuarios cuyo comportamiento desea mantener como <strong>marcado</strong>." + +#: templates/web/base/reports/index.html:24 +msgid "Marked fixed/closed in the past eight weeks" +msgstr "" + +#: templates/web/base/reports/index.html:25 +msgid "Marked fixed/closed more than eight weeks ago" msgstr "" #: templates/web/fixmystreet/contact/index.html:106 @@ -1545,13 +1552,13 @@ msgstr "Mensaje:" msgid "Message:" msgstr "Mensaje:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:440 +#: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" msgstr "Falta jurisdiction_id" #: templates/web/zurich/admin/stats.html:34 msgid "Moderated by division within one working day" -msgstr "" +msgstr "Moderado en el plazo de un día laborable" #: templates/web/base/admin/stats.html:11 msgid "Month" @@ -1575,11 +1582,11 @@ msgstr "Más problemas cercanos" #: templates/web/fixmystreet/report/update-form.html:138 #: 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:94 +#: templates/web/zurich/report/new/fill_in_details_form.html:77 msgid "Name" msgstr "Nombre" -#: templates/web/base/admin/report_edit.html:66 +#: templates/web/base/admin/report_edit.html:79 #: templates/web/base/admin/update_edit.html:32 #: templates/web/base/admin/user-form.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:43 @@ -1588,25 +1595,25 @@ msgstr "Nombre" msgid "Name:" msgstr "Nombre:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:321 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:313 msgid "Name: %s" -msgstr "" +msgstr "Nombre: %s" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:186 -#: perllib/FixMyStreet/Geocode/OSM.pm:164 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 +#: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "Camino más cercano al pin colocado en el mapa (se genera automáticamente utilizando OpenStreetMap): %s%s" -#: perllib/FixMyStreet/Cobrand/UK.pm:137 +#: perllib/FixMyStreet/Cobrand/UK.pm:127 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:421 -#: perllib/FixMyStreet/Cobrand/Default.pm:461 +#: perllib/FixMyStreet/Cobrand/Default.pm:442 +#: perllib/FixMyStreet/Cobrand/Default.pm:482 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:288 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:277 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1622,18 +1629,18 @@ msgstr "¡Casi terminado! Ahora compruebe su correo electrónico ..." msgid "New <br>problems" msgstr "Nuevos <br>problemas" -#: perllib/FixMyStreet/App/Controller/Admin.pm:264 +#: perllib/FixMyStreet/App/Controller/Admin.pm:261 msgid "New body added" -msgstr "" +msgstr "Nuevo organismo añadido" -#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:379 msgid "New category contact added" msgstr "Añadida nueva categoría de contactos" #: templates/web/zurich/admin/report_edit-sdm.html:55 #: templates/web/zurich/admin/report_edit.html:81 msgid "New internal note:" -msgstr "" +msgstr "Nueva nota interna:" #: db/alert_types.pl:18 db/alert_types.pl:22 msgid "New local problems on FixMyStreet" @@ -1665,7 +1672,7 @@ msgstr "Nuevos problemas en los límites de {{NAME}} en FixMyStreet" #: templates/web/zurich/admin/index-sdm.html:4 msgid "New reports" -msgstr "" +msgstr "Nuevos informes" #: db/alert_types_eha.pl:23 msgid "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com" @@ -1693,21 +1700,21 @@ msgstr "Nuevo estado" #: templates/web/zurich/admin/report_edit-sdm.html:58 msgid "New update:" -msgstr "" +msgstr "Nueva actualización" #: templates/web/base/pagination.html:13 msgid "Next" -msgstr "" +msgstr "Siguiente" -#: templates/web/base/admin/body.html:72 templates/web/base/admin/body.html:74 -#: templates/web/base/admin/body.html:78 templates/web/base/admin/body.html:80 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:93 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:44 @@ -1725,7 +1732,7 @@ msgstr "Sin órgano" msgid "No council" msgstr "Sin Ayuntamiento" -#: perllib/FixMyStreet/DB/Result/Problem.pm:376 +#: perllib/FixMyStreet/DB/Result/Problem.pm:401 msgid "No council selected" msgstr "Ningún Ayuntamiento seleccionado" @@ -1735,15 +1742,15 @@ msgstr "No se han hecho ediciones aún-" #: templates/web/base/admin/flagged.html:25 msgid "No flagged problems found." -msgstr "" +msgstr "No se encuentran problemas marcados" #: templates/web/base/admin/flagged.html:58 msgid "No flagged users found." -msgstr "" +msgstr "No se encuentran usuarios marcados" #: templates/web/zurich/admin/report_edit-sdm.html:65 msgid "No further updates" -msgstr "" +msgstr "No hay más actualizaciones" #: templates/web/base/around/around_map_list_items.html:17 #: templates/web/fixmystreet/around/around_map_list_items.html:8 @@ -1757,7 +1764,7 @@ msgstr "No se han notificado problemas todavía." #: templates/web/base/js/translation_strings.html:38 msgid "No result returned" -msgstr "" +msgstr "Ningún resultado devuelto" #: templates/web/base/admin/body-form.html:60 #: templates/web/base/admin/body-form.html:61 @@ -1765,13 +1772,15 @@ msgid "" "No specific areas are currently available, because the <code>MAPIT_URL</code> in\n" " your config file is not pointing to a live MapIt service." msgstr "" +"No hay áreas específicas disponibles en la actualidad, debido a que el <code>MAPIT_URL</ code> en\n" +"su archivo de configuración no está apuntando a un servicio MapIt activo." -#: templates/web/base/report/_support.html:3 +#: templates/web/base/report/_support.html:2 #: templates/web/base/report/_support.html:4 msgid "No supporters" msgstr "No hay seguidores" -#: templates/web/base/admin/report_edit.html:30 +#: templates/web/base/admin/report_edit.html:41 #: templates/web/zurich/admin/report_edit-sdm.html:46 #: templates/web/zurich/admin/report_edit.html:60 msgid "None" @@ -1785,30 +1794,34 @@ msgid "" " Depending on the implementation, staff users may have access to the dashboard (summary of\n" " activity across their body), the ability to hide reports or set special report statuses." msgstr "" +"Normalmente los usuarios (públicos) no deben estar asociados con cualquier <strong>organismo</ strong>. <br>\n" +"El personal autorizado pueden asociarse con el departamento que representan. <br>\n" +"Dependiendo de la implementación, el personal pueden tener acceso al tablero (resumen de\n" +"la actividad a través de su departamento), la capacidad de ocultar los informes o estados especiales del informe." -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:46 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 #: templates/web/base/report/update-form.html:30 #: templates/web/base/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 "" +msgstr "No reponsable" #: templates/web/zurich/admin/report_edit-sdm.html:18 msgid "Not for my subdivision" -msgstr "" +msgstr "No para mi subdivisión" #: templates/web/base/admin/questionnaire.html:6 msgid "Not reported before" msgstr "No se notificó antes" -#: templates/web/base/report/_main.html:61 +#: templates/web/base/report/_main.html:62 msgid "Not reported to council" msgstr "Sin comunicar al Ayuntamiento" -#: templates/web/base/admin/body.html:63 -#: templates/web/base/admin/category_edit.html:87 +#: templates/web/base/admin/body.html:71 +#: templates/web/base/admin/category_edit.html:92 #: templates/web/zurich/admin/body.html:17 msgid "Note" msgstr "Nota" @@ -1817,8 +1830,8 @@ msgstr "Nota" msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" msgstr "Tenga en cuenta que al incluir notificaciones no confirmadas usamos la fecha de creación de la notificación y puede no coincidir con el mes en el que fue confirmado, así que los números pueden variar un poco." -#: templates/web/base/admin/body.html:178 -#: templates/web/base/admin/category_edit.html:44 +#: templates/web/base/admin/body.html:186 +#: templates/web/base/admin/category_edit.html:49 #: templates/web/zurich/admin/body.html:53 msgid "Note:" msgstr "Nota:" @@ -1831,7 +1844,7 @@ msgstr "Nota: <strong>%s</strong>" msgid "Now to submit your report…" msgstr "Y ahora a enviar tu notificación ..." -#: templates/web/base/report/new/fill_in_details_form.html:132 +#: templates/web/base/report/new/fill_in_details_form.html:113 msgid "Now to submit your report… do you have a FixMyStreet password?" msgstr "Y ahora a enviar tu notificación ... no tienes contraseña en FixMyStreet?" @@ -1845,10 +1858,10 @@ msgstr "Y ahora a enviar tu actualización ... no tienes contraseña en FixMyStr #: templates/web/base/js/translation_strings.html:42 msgid "OK" -msgstr "" +msgstr "Ok" #: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:16 +#: templates/web/base/report/update.html:17 msgid "Offensive? Unsuitable? Tell us" msgstr "Ofensiva? Inadecuado? Cuéntanos" @@ -1868,19 +1881,19 @@ msgstr "Antiguo <br>arreglado" msgid "Older <br>problems" msgstr "Problemas <br>antiguos" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:37 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 msgid "One-line summary" -msgstr "" +msgstr "Resumen on-line" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:137 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:36 -#: templates/web/base/admin/report_edit.html:37 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:138 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:49 +#: templates/web/base/admin/report_edit.html:50 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/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:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/report_edit.html:86 #: templates/web/zurich/admin/report_edit.html:88 @@ -1889,10 +1902,19 @@ msgstr "" msgid "Open" msgstr "Abierto" -#: templates/web/base/my/my.html:30 templates/web/fixmystreet/my/my.html:36 +#: templates/web/base/reports/index.html:22 +msgid "Open for more than four weeks, with an update within the past eight weeks" +msgstr "" + +#: templates/web/base/my/my.html:30 +#: templates/web/fixmystreet/my/_problem-list.html:2 msgid "Open reports" msgstr "Notificaciones abiertas" +#: templates/web/base/reports/index.html:23 +msgid "Open, but not had any update in eight weeks" +msgstr "" + #: templates/web/base/open311/index.html:70 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "API Open311 para el servidor FixMyStreet de mySociety" @@ -1915,15 +1937,15 @@ msgstr "O problemas notificados a:" msgid "Or you can subscribe to an alert based upon what ward or council you’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:1057 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:662 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:663 -#: perllib/FixMyStreet/DB/Result/Problem.pm:560 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 -#: perllib/FixMyStreet/DB/Result/Problem.pm:592 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:372 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 +#: perllib/FixMyStreet/DB/Result/Problem.pm:597 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:393 msgid "Other" msgstr "Otros" @@ -1943,10 +1965,10 @@ msgstr "Página no encontrada" #: templates/web/base/admin/body-form.html:31 #: templates/web/zurich/admin/body-form.html:14 msgid "Parent" -msgstr "" +msgstr "Padre" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 msgid "Partial" msgstr "Parcial" @@ -1964,38 +1986,38 @@ msgstr "Contraseña:" #: templates/web/base/js/translation_strings.html:48 msgid "Permalink" -msgstr "" +msgstr "Enlace permanente" -#: templates/web/zurich/report/new/fill_in_details_form.html:100 +#: templates/web/zurich/report/new/fill_in_details_form.html:83 msgid "Phone number" -msgstr "" +msgstr "Número de teléfono" #: templates/web/fixmystreet/report/new/form_user_loggedin.html:26 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:62 msgid "Phone number (optional)" msgstr "Número de teléfono (opcional)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:286 -#: templates/web/base/admin/report_edit.html:68 -#: templates/web/base/report/new/fill_in_details_form.html:216 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:291 +#: templates/web/base/admin/report_edit.html:81 +#: templates/web/base/report/new/fill_in_details_form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:46 #: templates/web/zurich/admin/report_edit.html:60 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Teléfono:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:72 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 #: 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 +#: templates/web/zurich/report/new/fill_in_details_form.html:51 msgid "Photo" msgstr "Foto" #: templates/web/base/questionnaire/index.html:71 -#: templates/web/base/report/new/fill_in_details_form.html:103 +#: templates/web/base/report/new/fill_in_details_form.html:84 #: templates/web/base/report/update-form.html:62 #: templates/web/fixmystreet/questionnaire/index.html:91 msgid "Photo:" @@ -2007,13 +2029,13 @@ msgstr "Fotos notificaciones cercanas recientes" #: templates/web/base/js/translation_strings.html:30 msgid "Place pin on map" -msgstr "" +msgstr "Coloque el pin en el maña" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:38 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/zurich/admin/header.html:2 +#: 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:86 @@ -2047,22 +2069,21 @@ msgstr "Por favor, consulte su email" msgid "Please check your email address is correct" msgstr "Por favor, compruebe que su dirección de email es correcta" -#: perllib/FixMyStreet/App/Controller/Admin.pm:349 -#: 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:395 +#: perllib/FixMyStreet/App/Controller/Admin.pm:343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:876 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 +#: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" msgstr "Por favor, elija una categoría" -#: perllib/FixMyStreet/DB/Result/Problem.pm:401 +#: perllib/FixMyStreet/DB/Result/Problem.pm:418 msgid "Please choose a property type" msgstr "Por favor, elija un tipo de propiedad" -#: perllib/FixMyStreet/App/Controller/Admin.pm:376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:370 msgid "Please correct the errors below" -msgstr "" +msgstr "Por favor, corrija los errores a continuación" #: templates/web/base/contact/blurb.html:2 #: templates/web/fixmystreet/contact/blurb.html:12 @@ -2077,10 +2098,10 @@ msgstr "" #: templates/web/base/report/new/notes.html:6 msgid "Please do not be abusive — abusing your council devalues the service for all users." -msgstr "" +msgstr "Por favor no sea abusivo — abusando de su Ayuntamiento devaluará el servicio para el resto de usuarios." -#: perllib/FixMyStreet/App/Controller/Admin.pm:352 -#: perllib/FixMyStreet/DB/Result/Comment.pm:133 +#: perllib/FixMyStreet/App/Controller/Admin.pm:346 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "Por favor, rellene un mensaje." @@ -2091,15 +2112,15 @@ msgstr "Por favor, rellene un mensaje." msgid "Please enter a password" msgstr "Por favor, introduzca una contraseña" -#: perllib/FixMyStreet/App/Controller/Contact.pm:108 -#: perllib/FixMyStreet/DB/Result/Problem.pm:370 +#: perllib/FixMyStreet/App/Controller/Contact.pm:113 +#: perllib/FixMyStreet/DB/Result/Problem.pm:395 #: templates/web/base/js/translation_strings.html:3 msgid "Please enter a subject" msgstr "Por favor, introduzca un título" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1050 -#: perllib/FixMyStreet/App/Controller/Admin.pm:351 -#: perllib/FixMyStreet/App/Controller/Admin.pm:997 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin.pm:995 #: perllib/FixMyStreet/DB/Result/User.pm:127 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 @@ -2107,16 +2128,16 @@ msgid "Please enter a valid email" msgstr "Por favor, introduce una dirección de email válida" #: perllib/FixMyStreet/App/Controller/Alert.pm:346 -#: perllib/FixMyStreet/App/Controller/Contact.pm:118 +#: perllib/FixMyStreet/App/Controller/Contact.pm:123 msgid "Please enter a valid email address" msgstr "Por favor, introduzca una dirección válida de email" -#: perllib/FixMyStreet/DB/Result/Problem.pm:373 +#: perllib/FixMyStreet/DB/Result/Problem.pm:398 #: templates/web/base/js/translation_strings.html:4 msgid "Please enter some details" msgstr "Por favor, introduzca algunos detalles" -#: perllib/FixMyStreet/App/Controller/Contact.pm:107 +#: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/User.pm:124 #: templates/web/base/auth/general.html:13 #: templates/web/base/auth/general.html:8 @@ -2130,7 +2151,7 @@ msgid "Please enter your email" msgstr "Por favor, introduzca su dirección de email" #: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:75 msgid "Please enter your email address" msgstr "Email" @@ -2138,14 +2159,14 @@ msgstr "Email" msgid "Please enter your first name" msgstr "Por favor, indica tu nombre." -#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: perllib/FixMyStreet/Cobrand/UK.pm:318 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Por favor escriba su nombre completo, los Ayuntamientos necesitan esta información - si usted no desea que su nombre aparecerá en la página, desactive la casilla de abajo" -#: perllib/FixMyStreet/App/Controller/Contact.pm:106 -#: perllib/FixMyStreet/DB/Result/Comment.pm:130 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Contact.pm:111 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 +#: perllib/FixMyStreet/DB/Result/Problem.pm:406 #: perllib/FixMyStreet/DB/Result/User.pm:120 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" @@ -2153,7 +2174,7 @@ msgstr "Por favor, introduzca su nombre" #: templates/web/base/js/translation_strings.html:22 msgid "Please enter your phone number" -msgstr "" +msgstr "Por favor introduce tu telefono" #: templates/web/base/js/translation_strings.html:26 msgid "Please enter your second name" @@ -2166,9 +2187,9 @@ msgstr "Por favor, introduzca su título" #: templates/web/base/auth/sign_out.html:5 #: templates/web/zurich/auth/sign_out.html:5 msgid "Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a href=\"/\">front page</a>." -msgstr "" +msgstr "Por favor, siéntase libre para <a href=\"%s\">acceder de nuevo</a>, o volver a la <a href=\"/\">página inicial</a>." -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/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." @@ -2183,7 +2204,7 @@ msgstr "Por favor, rellene los datos del problema." msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "Por favor, complete el siguiente formulario con los detalles del problema y describa la ubicación con la mayor precisión posible en el cuadro de detalles." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:251 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Por favor, indique si desea otro cuestionario" @@ -2193,29 +2214,29 @@ msgstr "Tenga en cuenta que las actualizaciones no se envían al Ayuntamiento." #: templates/web/base/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 "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>" +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/base/report/new/fill_in_details_form.html:8 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:21 #: 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 "Por favor, tenga en cuenta la notificación <strong>no ha sido enviada aún</ strong>. Elija una categoría y añada más información a continuación antes que enviar." +msgstr "Por favor, tenga en cuenta la notificación <strong>no ha sido enviada aún</strong>. Elija una categoría y añada más información a continuación antes que enviar." #: templates/web/base/report/new/notes.html:1 #: templates/web/zurich/report/new/notes.html:1 msgid "Please note:" msgstr "Por favor, tenga en cuenta:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:246 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:254 msgid "Please provide some explanation as to why you're reopening this report" msgstr "Por favor, explique por qué está reabriendo esta notificación." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:261 msgid "Please provide some text as well as a photo" msgstr "Proporcione un texto así como una foto" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:247 msgid "Please say whether you've ever reported a problem to your council before" msgstr "Por favor, diga si alguna vez ha notificado de un problema al Ayuntamiento con anterioridad" @@ -2227,7 +2248,7 @@ msgstr "Por favor, seleccione el feed que desea" msgid "Please select the type of alert you want" msgstr "Por favor, seleccione el tipo de alerta que desea" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please state whether or not the problem has been fixed" msgstr "Por favor, indique si el problema se ha solucionado" @@ -2235,15 +2256,13 @@ msgstr "Por favor, indique si el problema se ha solucionado" msgid "Please take a look at the updates that have been left." msgstr "Por favor eche un vistazo a las actualizaciones que se han dejado." -#: perllib/FixMyStreet/App/Controller/Photo.pm:176 +#: perllib/FixMyStreet/App/Controller/Photo.pm:177 +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 +#: perllib/FixMyStreet/App/Controller/Photo.pm:189 msgid "Please upload a JPEG image only" msgstr "Por favor, suba una imagen JPEG" -#: perllib/FixMyStreet/App/Controller/Photo.pm:183 -msgid "Please upload a JPEG image only\n" -msgstr "Por favor, suba una imagen JPEG\n" - -#: perllib/FixMyStreet/App/Controller/Contact.pm:109 +#: perllib/FixMyStreet/App/Controller/Contact.pm:114 msgid "Please write a message" msgstr "Por favor, escriba un mensaje" @@ -2276,20 +2295,20 @@ msgstr "Publicado por %s en %s" #: templates/web/base/pagination.html:7 msgid "Previous" -msgstr "" +msgstr "Previo" #: templates/web/fixmystreet/footer.html:32 msgid "Privacy" -msgstr "" +msgstr "Privacidad" -#: templates/web/base/admin/body.html:194 -#: templates/web/base/admin/body.html:77 -#: templates/web/base/admin/category_edit.html:40 -#: templates/web/base/admin/report_edit.html:79 +#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:85 +#: templates/web/base/admin/category_edit.html:45 +#: templates/web/base/admin/report_edit.html:95 msgid "Private" -msgstr "" +msgstr "Privado" -#: templates/web/base/maps/openlayers.html:86 +#: templates/web/base/maps/openlayers.html:89 msgid "Problem" msgstr "Problema" @@ -2310,7 +2329,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:968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:966 msgid "Problem marked as open." msgstr "Problema marcado como abierto." @@ -2345,16 +2364,15 @@ 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:629 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:114 +#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:151 -#: perllib/FixMyStreet/Cobrand/UK.pm:217 +#: perllib/FixMyStreet/Cobrand/UK.pm:207 msgid "Problems within %s" msgstr "Problemas en %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:122 -#: perllib/FixMyStreet/Cobrand/UK.pm:231 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "Problems within %s ward" msgstr "Problemas en el barrio %s" @@ -2372,9 +2390,9 @@ msgstr "Problemas en los alrededores de:" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "Propiedades recientemente notificadas como vueltas a usar en reportemptyhomes.com" -#: templates/web/base/admin/report_edit.html:32 +#: templates/web/base/admin/report_edit.html:45 msgid "Property address:" -msgstr "" +msgstr "Dirección de la propiedad:" #: templates/web/base/report/new/category.html:8 msgid "Property type:" @@ -2387,9 +2405,9 @@ msgstr "Proporcionar una actualización" #: templates/web/fixmystreet/auth/general.html:59 msgid "Providing a name and password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." -msgstr "" +msgstr "Proporcionar un nombre y una contraseña es opcional, pero al hacerlo le permitirá informar más fácilmente problemas, actualizar y administrar sus informes." -#: templates/web/base/report/new/fill_in_details_form.html:174 +#: templates/web/base/report/new/fill_in_details_form.html:155 #: templates/web/base/report/update-form.html:128 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 #: templates/web/fixmystreet/report/update-form.html:119 @@ -2399,18 +2417,18 @@ msgstr "Proporcionar una contraseña es opcional, pero al hacerlo le permitirá #: templates/web/zurich/admin/report_edit.html:195 #: templates/web/zurich/admin/report_edit.html:211 msgid "Public response:" -msgstr "" +msgstr "Respuesta del público:" #: templates/web/zurich/admin/report_edit.html:77 #: templates/web/zurich/admin/stats.html:38 msgid "Publish photo" -msgstr "" +msgstr "Publicar foto" #: templates/web/zurich/admin/report_edit.html:219 msgid "Publish the response" -msgstr "" +msgstr "Publicar respuesta" -#: templates/web/base/questionnaire/completed.html:2 +#: templates/web/base/questionnaire/completed.html:1 #: templates/web/base/questionnaire/index.html:0 #: templates/web/base/questionnaire/index.html:14 #: templates/web/base/questionnaire/index.html:4 @@ -2429,11 +2447,12 @@ msgstr "Cuestionario %d respuesto para el problema de %d, %s para %s" msgid "Questionnaire %d sent for problem %d" msgstr "Cuestionario %d enviado para el problema %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 msgid "Questionnaire filled in by problem reporter" msgstr "Cuestionario cumplimentado por el notificador problema" #: templates/web/base/alert/_list.html:21 +#: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display.html:50 #: templates/web/base/reports/_rss.html:1 @@ -2443,11 +2462,11 @@ msgstr "Cuestionario cumplimentado por el notificador problema" msgid "RSS feed" msgstr "Feed RSS" -#: perllib/FixMyStreet/Cobrand/UK.pm:260 perllib/FixMyStreet/Cobrand/UK.pm:272 +#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 msgid "RSS feed for %s" msgstr "Feed RSS para %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "RSS feed for %s ward, %s" msgstr "Feed RSS para %s del barrio, %s" @@ -2455,15 +2474,11 @@ msgstr "Feed RSS para %s del barrio, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:167 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:175 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:185 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:193 -#: perllib/FixMyStreet/Cobrand/UK.pm:286 perllib/FixMyStreet/Cobrand/UK.pm:298 +#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 msgid "RSS feed of %s" msgstr "Feed RSS para %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 msgid "RSS feed of %s, within %s ward" msgstr "Feed RSS para %s, en el barrio %s" @@ -2476,20 +2491,19 @@ 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:630 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:115 +#: perllib/FixMyStreet/Cobrand/Default.pm:651 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:150 -#: perllib/FixMyStreet/Cobrand/UK.pm:224 +#: perllib/FixMyStreet/Cobrand/UK.pm:214 msgid "RSS feed of problems within %s" msgstr "Feed RSS de los problemas dentro de %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 -#: perllib/FixMyStreet/Cobrand/UK.pm:230 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s ward" msgstr "Feed RSS feed de los problemas dentro del barrio %s" -#: templates/web/base/around/display_location.html:3 +#: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:4 msgid "RSS feed of recent local problems" msgstr "Feed RSS de los problemas locales más recientes" @@ -2529,15 +2543,18 @@ msgstr "Recuerde que FixMyStreet es principalmente para informar sobre problemas msgid "Remove flag" msgstr "Eliminar Marca" -#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/report_edit.html:110 #: templates/web/base/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!)" -#: templates/web/base/footer.html:7 templates/web/fiksgatami/footer.html:19 -#: templates/web/fiksgatami/nn/footer.html:19 -#: templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 +msgid "Report" +msgstr "" + +#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 #: templates/web/zurich/footer.html:17 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2547,11 +2564,6 @@ msgstr "Notificar un problema" msgid "Report abuse" msgstr "Denunciar abuso" -#: templates/web/base/report_created.html:1 -#: templates/web/base/report_created.html:3 -msgid "Report created" -msgstr "" - #: perllib/FixMyStreet/App/Controller/Rss.pm:295 msgid "Report on %s" msgstr "Notificar sobre %s" @@ -2559,7 +2571,7 @@ msgstr "Notificar sobre %s" #: templates/web/base/report/new/fill_in_details_form.html:1 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 msgid "Report your problem" -msgstr "" +msgstr "Informe de su incidencia" #: templates/web/base/index.html:11 #: templates/web/fixmystreet/around/intro.html:1 @@ -2575,7 +2587,7 @@ msgstr "Notificado %s" msgid "Reported %s, to %s" msgstr "Notificados %s, a %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:580 #: templates/web/base/contact/index.html:50 #: templates/web/fixmystreet/contact/index.html:65 msgid "Reported anonymously at %s" @@ -2587,7 +2599,7 @@ msgstr "Notificado anónimamente en %s" msgid "Reported before" msgstr "Notificado con anterioridad" -#: perllib/FixMyStreet/DB/Result/Problem.pm:598 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 #: templates/web/base/contact/index.html:52 #: templates/web/fixmystreet/contact/index.html:67 msgid "Reported by %s at %s" @@ -2595,33 +2607,38 @@ msgstr "Notificado por %s en %s" #: templates/web/zurich/report/_main.html:2 msgid "Reported in the %s category" -msgstr "" +msgstr "informado en la categoría %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:571 +#: perllib/FixMyStreet/DB/Result/Problem.pm:576 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:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:598 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:567 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 msgid "Reported via %s anonymously at %s" msgstr "Notificado por %s de forma anónima en %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:589 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 msgid "Reported via %s by %s at %s" msgstr "Notificado por %s por %s en %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:563 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 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:583 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 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" -#: templates/web/base/around/around_index.html:2 +#: templates/web/base/reports/index.html:21 +#, fuzzy +msgid "Reported within the last four weeks" +msgstr "informado en la categoría %s" + +#: templates/web/base/around/around_index.html:1 #: templates/web/base/around/around_index.html:3 #: templates/web/base/js/translation_strings.html:41 #: templates/web/base/report/new/fill_in_details.html:0 @@ -2631,20 +2648,19 @@ msgstr "Notificado por %s en la categoría %s por %s en %s" msgid "Reporting a problem" msgstr "Notificar un problema" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:294 #: templates/web/zurich/header.html:60 msgid "Reports" -msgstr "" +msgstr "Informes" -#: perllib/FixMyStreet/DB/Result/Problem.pm:409 -#: perllib/FixMyStreet/DB/Result/Problem.pm:413 +#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 msgid "Reports are limited to %s characters in length. Please shorten your report" -msgstr "" +msgstr "Los informes se limitan a %s caracteres de longitud. Por favor, acorte su informe" #: templates/web/zurich/admin/index-sdm.html:7 msgid "Reports awaiting approval" -msgstr "" +msgstr "Informes en espera de aprobación" #: templates/web/base/around/tabbed_lists.html:3 msgid "Reports on and around the map" @@ -2652,46 +2668,45 @@ msgstr "Notificaciones en y alrededor del mapa" #: templates/web/zurich/admin/index-sdm.html:10 msgid "Reports published" -msgstr "" +msgstr "Informes publicados" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:85 msgid "Resend report" msgstr "Vuelva a enviar la notificación" #: templates/web/base/js/translation_strings.html:28 msgid "Right place?" -msgstr "" +msgstr "El lugar correcto?" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:193 -#: perllib/FixMyStreet/Geocode/OSM.pm:171 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:167 +#: perllib/FixMyStreet/Geocode/OSM.pm:152 msgid "Road operator for this named road (derived from road reference number and type): %s" msgstr "Operador de camino operador para este camino (derivado del número de referencia y tipo del camino): %s" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:190 -#: perllib/FixMyStreet/Geocode/OSM.pm:168 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:164 +#: perllib/FixMyStreet/Geocode/OSM.pm:149 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:1394 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 -#: templates/web/base/admin/report_edit.html:90 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1403 +#: templates/web/base/admin/report_edit.html:106 #: templates/web/zurich/admin/report_edit.html:73 msgid "Rotate Left" -msgstr "" +msgstr "Rotar a la izquierda" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1394 -#: templates/web/base/admin/report_edit.html:91 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: templates/web/base/admin/report_edit.html:107 #: templates/web/zurich/admin/report_edit.html:74 msgid "Rotate Right" -msgstr "" +msgstr "Rotar a la derecha" #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" -msgstr "" +msgstr "Satélite" -#: templates/web/base/admin/body.html:200 -#: templates/web/base/admin/category_edit.html:76 +#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/category_edit.html:81 #: templates/web/zurich/admin/body.html:59 msgid "Save changes" msgstr "Guardar cambios" @@ -2707,7 +2722,7 @@ msgstr "Buscar Usuarios" #: templates/web/zurich/header.html:77 msgid "Search reports" -msgstr "" +msgstr "Buscar informes" #: templates/web/base/admin/reports.html:5 #: templates/web/base/admin/users.html:8 @@ -2717,11 +2732,11 @@ msgstr "Buscar:" #: templates/web/base/admin/reports.html:26 msgid "Searching found no reports." -msgstr "" +msgstr "La búsqueda no encontró informes." -#: templates/web/base/admin/users.html:39 +#: templates/web/base/admin/users.html:41 msgid "Searching found no users." -msgstr "" +msgstr "La búsqueda no encontró usuarios." #: templates/web/base/admin/body-form.html:33 #: templates/web/zurich/admin/body-form.html:16 @@ -2730,36 +2745,36 @@ msgstr "Selecciona un órgano" #: templates/web/base/reports/index.html:9 msgid "Select a particular council to see the reports sent there." -msgstr "" +msgstr "Seleccione un Ayuntamiento para ver los informes que se le han enviado." #: templates/web/base/admin/body-form.html:71 #: templates/web/zurich/admin/body-form.html:26 msgid "Select an area" -msgstr "" +msgstr "Seleccione un área" #: templates/web/base/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 "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:680 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "Sent to %s %s later" msgstr "Enviado a %s %s después" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:84 msgid "Sent:" msgstr "Enviado:" -#: templates/web/base/admin/report_edit.html:73 +#: templates/web/base/admin/report_edit.html:89 #: templates/web/zurich/admin/stats.html:45 msgid "Service:" msgstr "Servicio:" #: templates/web/fixmystreet/report/display.html:38 msgid "Share" -msgstr "" +msgstr "Compartir" -#: templates/web/base/report/new/fill_in_details_form.html:211 +#: templates/web/base/report/new/fill_in_details_form.html:192 #: templates/web/base/report/update-form.html:157 #: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 @@ -2804,27 +2819,29 @@ msgstr "Salir" msgid "Signed in as %s" msgstr "Conectado como %s" -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 msgid "Some categories may require additional information." msgstr "Algunas categorías pueden requerir información adicional." -#: templates/web/base/admin/body-form.html:145 -#: templates/web/base/admin/body-form.html:146 +#: templates/web/base/admin/body-form.html:149 +#: templates/web/base/admin/body-form.html:150 msgid "" "Some endpoints require an <strong>API key</strong> to indicate that the reports are being\n" " sent from your FixMyStreet installation." msgstr "" +"Algunos puntos finales requieren una clave de <strong>API</ strong> para indicar que los informes están siendo\n" +"enviados desde su instalación FixMyStreet." #: templates/web/base/alert/index.html:42 msgid "Some photos of recent reports" msgstr "Algunas fotos de notificaciones recientes" #: perllib/FixMyStreet/App/View/Email.pm:32 -#: perllib/FixMyStreet/App/View/Web.pm:44 +#: perllib/FixMyStreet/App/View/Web.pm:43 msgid "Some text to localize" msgstr "Algún texto para localizar" -#: perllib/FixMyStreet/Cobrand/UK.pm:88 +#: perllib/FixMyStreet/Cobrand/UK.pm:78 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "Lo sentimos, eso parece ser un código postal dependiente de La Corona, los cuales no son soportados." @@ -2832,26 +2849,25 @@ msgstr "Lo sentimos, eso parece ser un código postal dependiente de La Corona, msgid "Sorry, there has been an error confirming your problem." msgstr "Lo sentimos, hubo un error confirmando su problema." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:215 -#: perllib/FixMyStreet/Geocode.pm:26 perllib/FixMyStreet/Geocode/Bing.pm:56 -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:73 -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:93 -#: perllib/FixMyStreet/Geocode/Google.pm:72 -#: perllib/FixMyStreet/Geocode/OSM.pm:64 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:214 +#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 +#: perllib/FixMyStreet/Geocode/Google.pm:47 +#: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "Lo sentimos, no hemos podido encontrar ese lugar." -#: perllib/FixMyStreet/Geocode/Bing.pm:51 -#: perllib/FixMyStreet/Geocode/Google.pm:67 +#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: perllib/FixMyStreet/Geocode/Google.pm:44 #: perllib/FixMyStreet/Geocode/Zurich.pm:87 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." #: templates/web/base/admin/stats.html:64 msgid "Start Date:" -msgstr "" +msgstr "Fecha de inicio:" -#: templates/web/base/admin/body.html:61 +#: templates/web/base/admin/body.html:69 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 @@ -2859,7 +2875,7 @@ msgstr "" msgid "State" msgstr "Estado" -#: templates/web/base/admin/report_edit.html:34 +#: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 #: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:53 @@ -2868,8 +2884,8 @@ msgstr "Estado" msgid "State:" msgstr "Estado/Prov.:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1200 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:304 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:308 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" @@ -2879,15 +2895,15 @@ msgstr "Estadísticas" #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 msgid "Status" -msgstr "" +msgstr "Estado" #: templates/web/base/report/updates.html:10 msgid "Still open, via questionnaire, %s" msgstr "Sigue abierta, a través de cuestionario, %s" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:381 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 msgid "Subcategory: %s" -msgstr "" +msgstr "Subcategoria: %s" #: templates/web/zurich/admin/index-dm.html:27 msgid "Subdivision/Body" @@ -2905,19 +2921,19 @@ msgid "Subject:" msgstr "Título:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:115 -#: templates/web/base/report/new/fill_in_details_form.html:155 -#: templates/web/base/report/new/fill_in_details_form.html:177 +#: templates/web/base/report/new/fill_in_details_form.html:136 +#: templates/web/base/report/new/fill_in_details_form.html:158 +#: templates/web/base/report/new/fill_in_details_form.html:96 #: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 -#: templates/web/zurich/report/new/fill_in_details_form.html:108 +#: templates/web/zurich/report/new/fill_in_details_form.html:91 msgid "Submit" msgstr "Enviar" -#: templates/web/base/admin/report_edit.html:97 +#: templates/web/base/admin/report_edit.html:113 #: templates/web/base/admin/update_edit.html:65 -#: templates/web/base/admin/user-form.html:55 +#: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:64 #: templates/web/zurich/admin/report_edit.html:221 #: templates/web/zurich/admin/update_edit.html:38 @@ -2929,8 +2945,8 @@ msgstr "Enviar Cambios" msgid "Submit questionnaire" msgstr "Enviar cuestionario" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:133 -#: templates/web/zurich/admin/header.html:2 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:134 +#: 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 @@ -2940,7 +2956,7 @@ msgstr "Enviar cuestionario" #: templates/web/zurich/admin/reports.html:13 #: templates/web/zurich/report/banner.html:9 msgid "Submitted" -msgstr "" +msgstr "Enviado" #: templates/web/base/alert/updates.html:17 #: templates/web/base/report/display.html:46 @@ -2954,8 +2970,8 @@ msgstr "Suscribirse" msgid "Subscribe me to an email alert" msgstr "Suscríbeme a alertas por email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1191 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:293 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 #: templates/web/zurich/admin/index-dm.html:1 @@ -2971,9 +2987,9 @@ msgstr "Resumen" msgid "Summary reports" msgstr "Resumen de notificaciones" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 msgid "Survey" -msgstr "" +msgstr "Encuesta" #: templates/web/base/admin/questionnaire.html:1 msgid "Survey Results" @@ -2985,7 +3001,7 @@ msgstr "Resultados de la Encuesta" msgid "Text" msgstr "Texto" -#: templates/web/base/admin/body.html:21 +#: templates/web/base/admin/body.html:28 msgid "Text only version" msgstr "Versión solo texto" @@ -2994,61 +3010,67 @@ msgstr "Versión solo texto" msgid "Text:" msgstr "Texto:" -#: templates/web/base/tokens/confirm_update.html:9 -msgid "Thank you — 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/base/tokens/confirm_problem.html:18 -msgid "Thank you for reporting this issue" -msgstr "" +#: templates/web/base/tokens/confirm_problem.html:12 +msgid "Thank you for reporting this issue!" +msgstr "Gracias por informar de esta incidencia!" #: templates/web/base/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 "Gracias por tratar de confirmar la actualización o problema. Parece que tenemos un error interno, así que <a href=\"%s\"> por favor, háganos saber lo que pasó </a> y echaremos un vistazo." +#: templates/web/base/tokens/confirm_update.html:15 +msgid "Thank you for updating this issue!" +msgstr "Gracias por actualizar esta incidencia!" + +#: templates/web/base/contact/submit.html:6 +#: templates/web/base/questionnaire/completed.html:5 +msgid "Thank you for your feedback" +msgstr "Gracias por su feedback" + #: templates/web/fixmystreet/around/around_index.html:28 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 :" msgstr "Gracias por subir tu foto. Ahora necesitamos situar el problema, así que por favor escriba el nombre o código postal de una calle cercana en el cuadro de arriba:" -#: templates/web/base/contact/submit.html:8 -msgid "Thanks for your feedback. We'll get back to you as soon as we can!" -msgstr "Gracias por tus comentarios. ¡Nos pondremos en contacto con usted tan pronto como nos sea posible!" - #: templates/web/base/questionnaire/creator_fixed.html:9 msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "Gracias, me alegro de oír que fue arreglado! ¿Podríamos preguntar si alguna vez ha notificado de un problema a un Ayuntamiento con anterioridad?" -#: perllib/FixMyStreet/App/Controller/Photo.pm:190 +#: perllib/FixMyStreet/App/Controller/Photo.pm:195 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:100 +#: perllib/FixMyStreet/App/Controller/Council.pm:97 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:124 +#: perllib/FixMyStreet/App/Controller/Location.pm:126 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:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:81 +#: perllib/FixMyStreet/Cobrand/UK.pm:71 msgid "That postcode was not recognised, sorry." msgstr "Ese código postal no fue reconocido, lo siento." -#: perllib/FixMyStreet/App/Controller/Admin.pm:713 +#: perllib/FixMyStreet/App/Controller/Admin.pm:712 +#, fuzzy +msgid "That problem has been marked as sent." +msgstr "El problema ahora será reenviado." + +#: perllib/FixMyStreet/App/Controller/Admin.pm:704 msgid "That problem will now be resent." msgstr "El problema ahora será reenviado." #: perllib/FixMyStreet/App/Controller/Report.pm:118 msgid "That report cannot be viewed on %s." -msgstr "" +msgstr "Este informe no se puede ver en %s." #: perllib/FixMyStreet/App/Controller/Report.pm:111 msgid "That report has been removed from FixMyStreet." msgstr "Esa notificación ha sido eliminada de FixMyStreet." -#: templates/web/base/admin/body.html:136 +#: templates/web/base/admin/body.html:144 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." @@ -3056,26 +3078,30 @@ 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/base/admin/body-form.html:119 -#: templates/web/base/admin/body-form.html:120 +#: templates/web/base/admin/body-form.html:123 +#: templates/web/base/admin/body-form.html:124 msgid "" "The <strong>endpoint</strong> is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." msgstr "" +"El <strong>límite</strong> es la URL del servicio al que FixMyStreet se conectará \n" +"cuando envíe informes al organismo." -#: templates/web/base/admin/body-form.html:132 -#: templates/web/base/admin/body-form.html:133 +#: templates/web/base/admin/body-form.html:136 +#: templates/web/base/admin/body-form.html:137 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 "" +msgstr "La <strong>jurisdicción</strong> sólo es necesaria si los límites incluyen a más de un municipio. Si el organismo funciona sólo con sus propios límites puede dejar en blanco esto." -#: templates/web/base/admin/body-form.html:90 -#: templates/web/base/admin/body-form.html:91 +#: templates/web/base/admin/body-form.html:94 +#: templates/web/base/admin/body-form.html:95 msgid "" "The <strong>send method</strong> determines how problem reports will be sent to the body.\n" " If you leave this blank, <strong>send method defaults to email</strong>." msgstr "" +"El <strong>método de envío</strong> determina como serán enviados los informes al organismo.\n" +"Si está en blanco, el método de envío por defecto <strong>será el correo electrónico</strong>." #: templates/web/base/open311/index.html:90 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." @@ -3087,15 +3113,17 @@ msgid "" "The body's <strong>name</strong> identifies the body (for example, <em>Borsetshire District Council</em>)\n" " and may be displayed publically." msgstr "" +"El <strong>nombre</strong> del organismo identifica al propio organismo (por ejemplo, <em>concejalía de obras</em>)\n" +"y puede ser mostrado públicamente. " #: templates/web/base/auth/token.html:19 templates/web/base/email_sent.html:6 msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <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/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:3 msgid "The council won’t be able to help unless you leave as much detail as you can. Please describe the exact location of the problem (e.g. on a wall), what it is, how long it has been there, a description (and a photo of the problem if you have one), etc." -msgstr "" +msgstr "El ayuntamiento dice no ser capaz de ayudar a menos que deje la mayor cantidad de detalles posibles. Por favor, describa la ubicación exacta del problema (por ejemplo, en una pared), lo que es, el tiempo que ha estado allí, una descripción (y una foto del problema si es posible), etc." #: templates/web/fixmystreet/questionnaire/index.html:44 msgid "The details of your problem are available from the other tab above." @@ -3108,7 +3136,7 @@ msgstr "Los detalles de su problema están disponibles en el lado derecho de est #: templates/web/base/admin/edit-league.html:3 #: templates/web/base/admin/edit-league.html:4 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." -msgstr "" +msgstr "Los premios a la responsabilidad mostrará la actividad de los editores (quien ha editado más registros)." #: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 #: perllib/FixMyStreet/App/Controller/Reports.pm:78 @@ -3119,8 +3147,8 @@ 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:185 -#: perllib/FixMyStreet/Geocode/OSM.pm:163 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:159 +#: perllib/FixMyStreet/Geocode/OSM.pm:144 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap." msgstr "La información siguiente sobre la carretera más cercana podría ser incorrecta o irrelevante si el problema se encuentra cerca de varias carreteras o cerca de una carretera sin nombre registrado en OpenStreetMap." @@ -3171,14 +3199,14 @@ msgstr "Últimas notificaciones en los límites de {{NAME}} 's notificadas por l #: templates/web/base/admin/body-form.html:58 msgid "The list of available areas is being provided by the MapIt service at %s." -msgstr "" +msgstr "La lista de áreas disponibles está siendo ofrecida por el servicio MapIt en %s." #: templates/web/base/auth/change_password.html:12 #: templates/web/base/auth/change_password.html:16 msgid "The passwords do not match" msgstr "Las contraseñas no coinciden." -#: templates/web/base/errors/page_error_404_not_found.html:11 +#: templates/web/base/errors/page_error_404_not_found.html:10 #: templates/web/base/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" @@ -3193,9 +3221,9 @@ msgstr "La alerta más sencilla es nuestra alerta geográfica:" #: templates/web/base/report/new/fill_in_details_form.html:18 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:14 msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." -msgstr "" +msgstr "El resumen y la descripción también se harán públicos (véase nuestra <a href=\"/privacy\">politica de privacidad</a>)." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:295 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:300 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." @@ -3205,17 +3233,23 @@ msgid "" "The user's <strong>name</strong> is displayed publicly on reports that have not been marked <em>anonymous</em>.\n" " Names are not necessarily unique." msgstr "" +"El usuario <strong>name</ strong> aparece públicamente en los informes que no han sido marcados como <em>anonymous</em>.\n" +"Los nombres no son necesariamente unicos." + +#: templates/web/base/reports/_problem-list.html:15 +msgid "There are no reports to show." +msgstr "" #: perllib/FixMyStreet/App/Controller/Reports.pm:75 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:131 +#: perllib/FixMyStreet/App/Controller/Contact.pm:136 #: 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:755 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:762 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 #: templates/web/base/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:25 @@ -3231,7 +3265,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:135 +#: perllib/FixMyStreet/App/Controller/Contact.pm:140 msgid "There were problems with your report. Please see below." msgstr "Hubo problemas con su notificación. Por favor, vea más abajo." @@ -3239,8 +3273,8 @@ msgstr "Hubo problemas con su notificación. Por favor, vea más abajo." msgid "There were problems with your update. Please see below." msgstr "Hubo problemas con la actualización. Por favor, vea más abajo." -#: templates/web/base/admin/body-form.html:108 -#: templates/web/base/admin/body-form.html:109 +#: templates/web/base/admin/body-form.html:112 +#: templates/web/base/admin/body-form.html:113 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" @@ -3248,21 +3282,28 @@ msgid "" " <a href='https://www.mysociety.org/2013/01/17/open311-explained/' class='admin-offsite-link'>this article</a>.\n" " " msgstr "" +"Estos ajustes son para los organismos que utilizan Open311 (u otra integración back-end) para recibir las incidencias.<br>\n" +"<Strong>Usted no tiene necesidad de hacerlo si el Método de envío es el correo electrónico.</ Strong>.\n" +"Para obtener más información sobre Open311, consulte\n" +"<a href='https://www.mysociety.org/2013/01/17/open311-explained/' class='admin-offsite-link'>este documento</a>." #: templates/web/base/open311/index.html:77 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Esta implementación de la API es un trabajo aún progreso y no es estable todavía. Se cambiará sin advertencias en el futuro." -#: templates/web/base/admin/body.html:36 +#: templates/web/base/admin/body.html:44 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported <em>at any location</em>.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" " Currently, users <strong>cannot report problems to this body</strong>." msgstr "" +"Este organismo no cubre ninguna zona. Esto significa que no tiene jurisdicción sobre los problemas reportados <em>en cualquier ubicación</ em>. \n" +"En consecuencia, ninguna de sus categorías aparecerá en el menú desplegable de categorías cuando los usuarios envíen incidencias.\n" +"Actualmente, los usuarios <strong>no pueden informar de problemas a este organismo</ strong>." -#: templates/web/base/admin/body.html:46 +#: templates/web/base/admin/body.html:54 msgid "This body has no contacts. This means that currently problems reported to this body <strong>will not be sent</strong>." -msgstr "" +msgstr "Este órgano no tiene contactos. Esto significa que en la actualidad las incidencias reportadas a este organismo <strong>no son enviadas</strong>." #: templates/web/base/admin/body-form.html:52 #: templates/web/base/admin/body-form.html:53 @@ -3270,19 +3311,21 @@ msgid "" "This body will only be sent reports for problems that are located in the <strong>area covered</strong>.\n" " A body will not receive any reports unless it covers at least one area." msgstr "" +"A este organismo sólo se enviarán informes de problemas que se encuentran en el <strong>área cubierta</strong>.\n" +"Un organismo no recibirá ningún informe salvo que represente al menos un área." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:388 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:394 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:391 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 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:898 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:136 -#: perllib/FixMyStreet/Cobrand/UK.pm:53 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:902 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:972 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/Cobrand/UK.pm:43 msgid "This information is required" msgstr "Esta información es necesaria" @@ -3292,11 +3335,11 @@ msgstr "Este es un sitio para desarrolladores, las cosas podrían romperse en cu #: templates/web/base/reports/index.html:7 msgid "This is a summary of all reports on this site." -msgstr "" +msgstr "Este es un resumen de todos los informes en este sitio." #: templates/web/base/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 "" +msgstr "Esto puede deberse a que el enlace es demasiado antiguo o ya utilizado, o la dirección no se ha copiado correctamente." #: templates/web/base/report/banner.html:15 msgid "This problem has been closed" @@ -3321,11 +3364,11 @@ 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:130 #: perllib/FixMyStreet/Cobrand/Zurich.pm:131 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:132 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." -msgstr "" +msgstr "Este informe está pendiente de moderación." #: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:87 msgid "This report is currently marked as closed." @@ -3339,15 +3382,15 @@ msgstr "Esta notificación está actualmente marcada como arreglada." msgid "This report is currently marked as open." msgstr "Esta notificación está marcada como abierta." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:319 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:311 msgid "This report was submitted anonymously" -msgstr "" +msgstr "Este informe se ha presentado de forma anónima." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:293 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:1196 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Cronología" @@ -3365,7 +3408,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:294 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:299 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" @@ -3379,19 +3422,23 @@ msgstr "Total" #: templates/web/base/js/translation_strings.html:29 msgid "Try again" -msgstr "" +msgstr "Inténtalo de nuevo" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:46 +#: templates/web/base/contact/submit.html:14 +msgid "Try emailing us directly:" +msgstr "Pruebe enviándonos un correo directamente:" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 #: templates/web/base/report/update-form.html:30 #: templates/web/base/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 "" +msgstr "Incapaz de arreglarlo" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/admin/update_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:45 #: templates/web/zurich/admin/report_edit.html:58 @@ -3409,7 +3456,7 @@ msgstr "Tipo de alerta desconocida" #: templates/web/base/js/translation_strings.html:39 msgid "Unknown error" -msgstr "" +msgstr "Error desconocido" #: perllib/FixMyStreet/App/Controller/Report.pm:106 msgid "Unknown problem ID" @@ -3433,7 +3480,7 @@ msgstr "La actualización de abajo fue añadida de forma anónima en %s" msgid "Update below added by %s at %s" msgstr "La actualización de abajo fue añadida por %s en %s" -#: templates/web/base/admin/body-form.html:233 +#: templates/web/base/admin/body-form.html:240 #: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "Actualizar órgano" @@ -3459,7 +3506,7 @@ msgstr "La actualización marcó el problema como arreglado" msgid "Update reopened problem" msgstr "La actualización reabrió el problema" -#: templates/web/base/admin/body.html:93 +#: templates/web/base/admin/body.html:101 msgid "Update statuses" msgstr "Actualización de estados" @@ -3471,14 +3518,14 @@ msgstr "Actualizar:" #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 msgid "Updated" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Admin.pm:1016 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1060 -#: perllib/FixMyStreet/App/Controller/Admin.pm:810 -#: perllib/FixMyStreet/App/Controller/Admin.pm:958 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:549 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:618 +msgstr "Actualizado" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1014 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:808 +#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:556 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:625 msgid "Updated!" msgstr "¡Actualizado!" @@ -3490,9 +3537,9 @@ msgstr "¡Actualizado!" msgid "Updates" msgstr "Actualizaciones" -#: perllib/FixMyStreet/DB/Result/Comment.pm:139 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" -msgstr "" +msgstr "Las actualizaciones están limitadas a %s caracteres de longitud. Por favor acorte su actualización." #: db/alert_types.pl:5 db/alert_types.pl:6 msgid "Updates on {{title}}" @@ -3505,37 +3552,37 @@ msgstr "Actualizaciones en {{title}}" msgid "Updates to this problem, FixMyStreet" msgstr "Actualizaciones para este problema, FixMyStreet" -#: templates/web/base/admin/body.html:174 +#: templates/web/base/admin/body.html:182 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 "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 msgid "User" -msgstr "" +msgstr "Usuario" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1357 msgid "User flag removed" msgstr "Eliminada marca de usuario" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1331 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1329 msgid "User flagged" msgstr "Usuario marcado" #: templates/web/base/admin/users.html:5 msgid "User search finds matches in users' names and email addresses." -msgstr "" +msgstr "La búsqueda ha encontrado coincidencias en nombres de usuarios y direcciones de email." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:303 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:307 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Usuarios" -#: perllib/FixMyStreet/App/Controller/Admin.pm:380 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:430 +#: perllib/FixMyStreet/App/Controller/Admin.pm:374 +#: perllib/FixMyStreet/App/Controller/Admin.pm:404 +#: perllib/FixMyStreet/App/Controller/Admin.pm:421 msgid "Values updated" msgstr "Valores actualizados" @@ -3573,7 +3620,7 @@ msgstr "Hemos encontrado más de una coincidencia para esa ubicación. Se muestr #: templates/web/base/auth/token.html:8 msgid "We have not been able to confirm your account - sorry." -msgstr "" +msgstr "No hemos podido confirmar su cuenta - lo sentimos." #: templates/web/base/auth/token.html:16 msgid "We have sent you an email containing a link to confirm your account." @@ -3589,11 +3636,11 @@ msgstr "Nunca mostramos su dirección de email" msgid "We never show your email address or phone number." msgstr "Nunca mostramos su dirección de email o número de teléfono." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:403 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." -#: templates/web/base/index-steps.html:38 +#: templates/web/base/index-steps.html:31 msgid "We send it to the council on your behalf" msgstr "Se lo enviamos al Ayuntamiento en su nombre" @@ -3602,15 +3649,23 @@ msgstr "Se lo enviamos al Ayuntamiento en su nombre" msgid "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>" msgstr "Sólo utilizaremos su información personal de acuerdo a nuestra <a href=\"/faq#privacy\">política de privacidad</a>." +#: templates/web/base/questionnaire/completed-open.html:2 +msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" +msgstr "Nosotros’re lamentamos que el problema no está arreglado. ¿Por qué no prueba a escribir a sus representantes locales?" + #: templates/web/base/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 "Nos encantaría saber lo que piensas acerca de este sitio. Sólo tienes que rellenar el formulario o enviar un correo electrónico a <a href='mailto:%s'>%s</a>:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:41 +#: templates/web/base/contact/submit.html:7 +msgid "We’ll get back to you as soon as we can." +msgstr "Gracias por tus comentarios. ¡Nos pondremos en contacto con usted tan pronto como nos sea posible!" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 msgid "What’s the issue, and where is it?" -msgstr "" +msgstr "¿Cual es el problema y donde está?" -#: templates/web/base/admin/category_edit.html:82 +#: templates/web/base/admin/category_edit.html:87 #: templates/web/zurich/admin/body.html:18 msgid "When edited" msgstr "Una vez editada" @@ -3619,18 +3674,21 @@ msgstr "Una vez editada" msgid "When sent" msgstr "Una vez enviada" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Whole block of empty flats" msgstr "Todo el bloque de pisos vacíos" +#: templates/web/base/tokens/confirm_alert.html:7 +msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." +msgstr "¿Porqué detenerse ahí? <a href=\"/alert\">Configure más alertas</a> gratis." + #: templates/web/base/open311/index.html:92 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/fiksgatami/front/footer-marketing.html:15 #: templates/web/fixmystreet/front/footer-marketing.html:17 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." -msgstr "" +msgstr "¿Quieres contribuir a FixMyStreet? Nuestro código es abierto y <a href=\"http://fixmystreet.org\">disponible en fixmystreet.org</a>." #: templates/web/base/questionnaire/index.html:78 #: templates/web/fixmystreet/questionnaire/index.html:97 @@ -3644,25 +3702,25 @@ msgstr "Escribir su mensaje completamente en mayúsculas hace que sea difícil d #: templates/web/base/report/new/fill_in_details_form.html:4 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:5 msgid "Wrong location? Just click again on the map." -msgstr "" +msgstr "Ubicación incorrecta? Simplemente haga clic de nuevo en el mapa." #: templates/web/base/admin/stats.html:10 msgid "Year" msgstr "Año" #: templates/web/base/admin/bodies.html:66 -#: templates/web/base/admin/body.html:72 templates/web/base/admin/body.html:74 -#: templates/web/base/admin/body.html:78 templates/web/base/admin/body.html:80 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:76 +#: templates/web/base/admin/report_edit.html:93 #: templates/web/base/admin/update_edit.html:24 -#: templates/web/base/admin/users.html:29 +#: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:42 #: templates/web/base/questionnaire/index.html:81 @@ -3679,7 +3737,7 @@ msgstr "Sí, tengo una contraseña" #: templates/web/base/contact/index.html:39 #: templates/web/fixmystreet/contact/index.html:54 msgid "You are complaining that this problem report was unnecessarily moderated:" -msgstr "" +msgstr "Vd. se está quejando de que el la incidencia fue innecesariamente moderada:" #: templates/web/base/contact/index.html:41 #: templates/web/fixmystreet/contact/index.html:56 @@ -3691,20 +3749,18 @@ msgstr "Estás reportando por abusiva la siguiente notificación, que contiene i 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/base/tokens/confirm_problem.html:25 -#: templates/web/base/tokens/confirm_problem.html:26 -#: templates/web/zurich/tokens/confirm_problem.html:6 +#: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:8 msgid "You can <a href=\"%s%s\">view the problem on this site</a>." -msgstr "" +msgstr "Vd. puede <a href=\"%s%s\">ver el problema en este sitio</a>." -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:48 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." -msgstr "" +msgstr "Puede agregar email del usuario abusivo a la lista de abusos, que oculta de forma automática (y nunca envía) los informes que crean." #: templates/web/fixmystreet/contact/index.html:121 msgid "You can contact technical support on <a href='mailto:%s'>%s</a>" -msgstr "" +msgstr "Puede ponerse en contacto con el soporte técnico en <a href='mailto:%s'>%s</a>" #: templates/web/base/admin/flagged.html:5 msgid "" @@ -3712,31 +3768,34 @@ msgid "" " For example, this can useful if you want to keep an eye on a user who has posted inappropriate\n" " reports in the past." msgstr "" +"Puede marcar cualquier informe o usuario mediante su edición, y serán listado en esta página\n" +"Por ejemplo, si quiere tener vigilado a un usuario que envió algún informe\n" +"inapropiado anteriormente." -#: templates/web/base/report/new/councils_text_none.html:19 -#: templates/web/base/report/new/councils_text_none.html:20 -#: templates/web/base/report/new/councils_text_some.html:20 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 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>." -#: templates/web/base/admin/body-form.html:81 +#: templates/web/base/admin/body-form.html:85 msgid "You can mark a body as deleted if you do not want it to be active on the site." -msgstr "" +msgstr "Puede marcar un organismo como eliminado si no quiere que aparezca activo en este sitio." #: templates/web/base/js/translation_strings.html:36 msgid "You declined; please fill in the box above" -msgstr "" +msgstr "Vd. ha sido rechazado; por favor, rellene el formulario de arriba" #: perllib/FixMyStreet/App/Controller/Questionnaire.pm:38 msgid "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" msgstr "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/base/questionnaire/index.html:68 -#: templates/web/base/report/new/fill_in_details_form.html:94 +#: templates/web/base/report/new/fill_in_details_form.html:75 #: templates/web/fixmystreet/questionnaire/index.html:88 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:79 -#: templates/web/zurich/report/new/fill_in_details_form.html:75 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 +#: templates/web/zurich/report/new/fill_in_details_form.html:58 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á." @@ -3745,7 +3804,7 @@ msgstr "Usted ya adjuntó una foto para esta notificación, adjuntando otra la r 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/base/auth/sign_out.html:3 +#: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" msgstr "Ha cerrado la sesión correctamente." @@ -3754,25 +3813,10 @@ msgstr "Ha cerrado la sesión correctamente." msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. " msgstr "Has ubicado el problema en el punto marcado con el pin verde en el mapa. Si este no es el lugar correcto, simplemente haga clic en el mapa de nuevo. " -#: templates/web/base/tokens/confirm_alert.html:8 -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/base/tokens/confirm_update.html:14 -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>." - -#: templates/web/base/tokens/confirm_alert.html:12 -msgid "You have successfully created your alert." -msgstr "Ha creado la alerta." - -#: templates/web/base/tokens/confirm_alert.html:10 -msgid "You have successfully deleted your alert." -msgstr "Ha borrado la alerta." +msgstr "Vd. ha confirmado correctamente su dirección de correo electrónico." #: templates/web/base/report/display.html:20 #: templates/web/base/report/new/fill_in_details.html:37 @@ -3782,15 +3826,15 @@ msgstr "Ha iniciado sesión correctamente, por favor revise y confirme si sus de #: templates/web/base/my/my.html:20 templates/web/fixmystreet/my/my.html:20 msgid "You haven’t created any reports yet. <a href=\"%s\">Report a problem now.</a>" -msgstr "" +msgstr "Tiene’t informes creados todavía. <a href=\"%s\">Informe de un problema ahora.</a>" #: templates/web/base/email_sent.html:13 msgid "You must now click the link in the email we've just sent you." -msgstr "" +msgstr "Ahora debe hacer clic en el enlace del correo electrónico que se le acaba de enviar" #: templates/web/base/admin/index.html:18 msgid "You need to <a href=\"%s\">add some bodies</a> (such as councils or departments) before any reports can be sent." -msgstr "" +msgstr "Vd. necesita <a href=\"%s\">añadir organismos</a> (como ayuntamiento o departamentos) para que el informe pueda ser enviado." #: templates/web/base/admin/bodies.html:7 msgid "" @@ -3798,8 +3842,11 @@ msgid "" " the categories of problems they can handle (such as potholes or streetlights) and the\n" " contacts (such as an email address) to which reports are sent." msgstr "" +"Es necesario crear organismos (como ayuntamientos o departamentos) para poder añadir\n" +"categorías de problemas que puedan solucionar (farolas o baches) y su\n" +"contacto (como una dirección de correo) para que los informes sean enviados." -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:85 msgid "You really want to resend?" msgstr "¿De verdad quiere volver a enviar?" @@ -3819,7 +3866,7 @@ msgstr "Sus notificaciones" #: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 #: templates/web/fixmystreet/report/update-form.html:76 -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:71 msgid "Your email" msgstr "Su email:" @@ -3835,7 +3882,7 @@ msgid "Your email address:" msgstr "Su dirección de email:" #: templates/web/base/alert/_list.html:92 -#: templates/web/base/report/new/fill_in_details_form.html:125 +#: templates/web/base/report/new/fill_in_details_form.html:106 #: templates/web/base/report/update-form.html:81 msgid "Your email:" msgstr "Su email:" @@ -3850,13 +3897,13 @@ msgstr "Su información sólo será usada de acuerdo con nuestra <a href=\"/priv #: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 #: templates/web/fixmystreet/report/update-form.html:142 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:98 +#: templates/web/zurich/report/new/fill_in_details_form.html:81 msgid "Your name" msgstr "Su Nombre" #: templates/web/base/auth/general.html:59 #: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:204 +#: templates/web/base/report/new/fill_in_details_form.html:185 #: templates/web/base/report/update-form.html:151 msgid "Your name:" msgstr "Su Nombre:" @@ -3874,33 +3921,19 @@ msgstr "Su contraseña ha cambiado." #: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 -#: templates/web/zurich/report/new/fill_in_details_form.html:104 +#: templates/web/zurich/report/new/fill_in_details_form.html:87 msgid "Your phone number" msgstr "Su número de teléfono" -#: templates/web/base/tokens/confirm_problem.html:4 -msgid "Your problem has been confirmed!" -msgstr "" - #: templates/web/fixmystreet/questionnaire/index.html:16 msgid "Your report" msgstr "Su notificación" -#: templates/web/base/report_created.html:6 -msgid "Your report has been created and will shortly be sent." -msgstr "" - -#: templates/web/base/footer.html:9 templates/web/fiksgatami/footer.html:21 -#: templates/web/fiksgatami/nn/footer.html:21 -#: templates/web/fixmystreet/footer.html:24 +#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:24 msgid "Your reports" msgstr "Sus notificaciones" -#: templates/web/base/tokens/confirm_update.html:4 -msgid "Your update has been confirmed!" -msgstr "" - -#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:59 +#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:41 msgid "Your updates" msgstr "Sus actualizaciones" @@ -3917,11 +3950,7 @@ msgstr "por %s" msgid "council" msgstr "Ayuntamiento" -#: perllib/FixMyStreet/DB/Result/Problem.pm:665 -msgid "council ref: %s" -msgstr "" - -#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:32 #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:54 msgid "didn't use map" @@ -3932,9 +3961,10 @@ msgstr "no utilizó mapa" msgid "e.g. ‘%s’ or ‘%s’" msgstr "por ejemplo, '%s' o '%s'" +#: templates/web/base/admin/body-form.html:188 #: templates/web/base/admin/flagged.html:51 msgid "edit user" -msgstr "" +msgstr "Editar usuario" #: templates/web/base/admin/index.html:34 #: templates/web/zurich/admin/index.html:5 @@ -3944,27 +3974,27 @@ msgstr "de %d usuarios diferentes" #: templates/web/fixmystreet/report/_item.html:17 #: templates/web/zurich/report/_item.html:16 msgid "last updated %s" -msgstr "" +msgstr "ultima actualización %s" -#: perllib/Utils.pm:263 +#: perllib/Utils.pm:235 msgid "less than a minute" msgstr "menos de un minuto" #: templates/web/base/report/updates.html:57 msgid "marked as a duplicate report" -msgstr "" +msgstr "marcado como un informe duplicado" #: templates/web/base/report/updates.html:47 msgid "marked as action scheduled" -msgstr "" +msgstr "marcado como acción programada" #: templates/web/base/report/updates.html:59 msgid "marked as an internal referral" -msgstr "" +msgstr "marcado como una referencia interna" #: templates/web/base/report/updates.html:49 msgid "marked as closed" -msgstr "" +msgstr "marcado como cerrado" #: templates/web/base/report/updates.html:28 #: templates/web/base/report/updates.html:51 @@ -3973,23 +4003,23 @@ msgstr "marcado como arreglado" #: templates/web/base/report/updates.html:45 msgid "marked as in progress" -msgstr "" +msgstr "marcado como en progreso" #: templates/web/base/report/updates.html:41 msgid "marked as investigating" -msgstr "" +msgstr "marcado como en investigación" #: templates/web/base/report/updates.html:55 msgid "marked as not the council's responsibility" -msgstr "" +msgstr "marcado como que el Ayuntamiento no es responsable" #: templates/web/base/report/updates.html:43 msgid "marked as planned" -msgstr "" +msgstr "marcado según lo previsto" #: templates/web/base/report/updates.html:53 msgid "marked as unable to fix" -msgstr "" +msgstr "marcado como que no se puede arreglar" #: perllib/FixMyStreet/App/Controller/Admin.pm:130 #: templates/web/base/admin/questionnaire.html:15 @@ -4004,24 +4034,24 @@ msgstr "o" #: templates/web/base/js/translation_strings.html:27 msgid "or locate me automatically" -msgstr "" +msgstr "o localizarme automaticamente" -#: templates/web/base/admin/report_edit.html:25 -#: templates/web/base/admin/report_edit.html:26 -#: templates/web/zurich/admin/report_edit-sdm.html:28 +#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:30 +#: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit-sdm.html:29 -#: templates/web/zurich/admin/report_edit-sdm.html:37 +#: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:38 -#: templates/web/zurich/admin/report_edit.html:28 +#: templates/web/zurich/admin/report_edit.html:27 #: templates/web/zurich/admin/report_edit.html:29 -#: templates/web/zurich/admin/report_edit.html:39 +#: templates/web/zurich/admin/report_edit.html:38 #: templates/web/zurich/admin/report_edit.html:40 -#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit.html:50 #: templates/web/zurich/admin/report_edit.html:52 msgid "originally entered: “%s”" -msgstr "" +msgstr "consignados inicialmente:" -#: templates/web/base/admin/report_edit.html:30 +#: templates/web/base/admin/report_edit.html:43 msgid "other areas:" msgstr "otras áreas:" @@ -4030,13 +4060,12 @@ msgstr "otras áreas:" msgid "reopened" msgstr "reabierto" -#: templates/web/fiksgatami/header.html:49 -#: templates/web/fixmystreet/header.html:53 +#: templates/web/fixmystreet/header.html:59 #: templates/web/zurich/footer.html:12 msgid "sign out" msgstr "Salir" -#: templates/web/base/report/new/fill_in_details_form.html:13 +#: templates/web/base/report/new/fill_in_details_form.html:12 #: templates/web/base/report/new/fill_in_details_form.html:15 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 @@ -4046,17 +4075,17 @@ msgstr "el Ayuntamiento local" #: templates/web/base/report/_main.html:57 #: templates/web/zurich/report/_main.html:5 msgid "there is no pin shown as the user did not use the map" -msgstr "" +msgstr "no hay pines porque el usuario no usó el mapa" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:373 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:379 msgid "this type of local problem" msgstr "este tipo de problema local" -#: perllib/Utils.pm:235 +#: perllib/Utils.pm:207 msgid "today" msgstr "hoy" -#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:32 #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:54 msgid "used map" @@ -4082,26 +4111,26 @@ 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:254 #, perl-format msgid "%d hour" msgid_plural "%d hours" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%d hora" +msgstr[1] "%d horas" #: templates/web/base/report/_support.html:6 #, perl-format msgid "%d supporter" msgid_plural "%d supporters" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%d simpatizante" +msgstr[1] "%d simpatizantes" -#: perllib/Utils.pm:284 +#: perllib/Utils.pm:256 #, perl-format msgid "%d minute" msgid_plural "%d minutes" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%d minuto" +msgstr[1] "%d minutos" #: templates/web/base/front/stats.html:29 #, perl-format @@ -4117,12 +4146,12 @@ 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:250 #, perl-format msgid "%d week" msgid_plural "%d weeks" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%d semana" +msgstr[1] "%d semanas" #: templates/web/base/front/stats.html:12 #, perl-format @@ -4138,12 +4167,12 @@ 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:280 +#: perllib/Utils.pm:252 #, perl-format msgid "%d day" msgid_plural "%d days" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "%d dia" +msgstr[1] "%d dias" #: templates/web/base/report/new/councils_text_some.html:13 #, perl-format @@ -4152,8 +4181,5 @@ 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." -#~ msgid "Configuration updated - contacts will be generated automatically later" -#~ msgstr "Configuración actualizada - los contactos se generarán automáticamente más tarde" - -#~ 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." +#~ msgid "For council(s):" +#~ msgstr "Por Concejalía(s):" diff --git a/locale/es_ES.UTF-8 b/locale/es_ES.UTF-8 new file mode 120000 index 000000000..76ffc6a26 --- /dev/null +++ b/locale/es_ES.UTF-8 @@ -0,0 +1 @@ +es.UTF-8
\ No newline at end of file diff --git a/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po index 104efca03..917253d33 100644 --- a/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/fr_FR.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -6,14 +6,15 @@ # Translators: # Christophe Ocivélo Saint-Etienne <ocivelo@gmail.com>, 2014 # fixmystreetfr <fixmystreet@fixmystreet.fr>, 2014 +# mySociety <transifex@mysociety.org>, 2015 # Tim Morley <>, 2012 msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2015-01-20 16:59+0000\n" -"PO-Revision-Date: 2014-11-20 19:58+0000\n" -"Last-Translator: fixmystreetfr <fixmystreet@fixmystreet.fr>\n" +"POT-Creation-Date: 2015-07-31 14:28+0100\n" +"PO-Revision-Date: 2015-07-10 13:31+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" "MIME-Version: 1.0\n" @@ -21,17 +22,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:618 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:386 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:392 msgid " and " msgstr " et " -#: templates/web/base/report/new/councils_text_all.html:12 -#: templates/web/base/report/new/councils_text_all.html:19 -#: templates/web/base/report/new/councils_text_all.html:5 -#: templates/web/base/report/new/councils_text_none.html:19 -#: templates/web/base/report/new/councils_text_none.html:21 -#: templates/web/base/report/new/councils_text_some.html:20 +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_none.html:11 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " @@ -67,22 +66,26 @@ msgstr "de %d à %d de %d" msgid "%s - Summary reports" msgstr "%s - Rapports sommaires" -#: perllib/FixMyStreet/DB/Result/Problem.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:672 msgid "%s ref: %s" msgstr "%s réf : %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:265 perllib/FixMyStreet/Cobrand/UK.pm:277 +#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 msgid "%s ward, %s" msgstr "Localité %s, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:554 +#: perllib/FixMyStreet/DB/Result/Problem.pm:559 msgid "%s, reported at %s" msgstr "%s, rapporté %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:304 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "%s, within %s ward" msgstr "%s, dans la localité %s" +#: perllib/FixMyStreet/Map/OSM.pm:42 +msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" +msgstr "" + #: templates/web/base/email_sent.html:29 msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" msgstr "(Pas d'inquiétude— nous conservons votre alerte pendant que vous vérifiez votre adresse courriel.)" @@ -96,7 +99,7 @@ msgid "(Don't worry — we'll hang on to your update while you're checking y msgstr "(Pas d'inquiétude— nous conservons votre mise à jour pendant que vous vérifiez votre adresse courriel.)" #: templates/web/base/admin/report_blocks.html:11 -#: templates/web/base/admin/users.html:29 +#: templates/web/base/admin/users.html:31 msgid "(Email in abuse table)" msgstr "(email dans la liste des abus)" @@ -124,7 +127,7 @@ msgstr "(fermé)" msgid "(fixed)" msgstr "(résolu)" -#: templates/web/base/index.html:9 +#: templates/web/base/index.html:8 templates/web/base/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)" @@ -134,8 +137,8 @@ msgstr "(comme des graffitis, immondices, trottoirs abimés ou éclairage public msgid "(not sent to council)" msgstr "(non signalé à l’administration)" -#: templates/web/base/report/new/fill_in_details_form.html:218 -#: templates/web/zurich/report/new/fill_in_details_form.html:94 +#: templates/web/base/report/new/fill_in_details_form.html:199 +#: templates/web/zurich/report/new/fill_in_details_form.html:77 msgid "(optional)" msgstr "(facultatif)" @@ -148,7 +151,7 @@ msgstr "(public)" msgid "(sent to both)" msgstr "(envoyé aux deux)" -#: templates/web/base/report/new/fill_in_details_form.html:212 +#: templates/web/base/report/new/fill_in_details_form.html:193 msgid "(we never show your email address or phone number)" msgstr "(nous n’affichons jamais votre email ou numéro de téléphone)" @@ -156,14 +159,13 @@ msgstr "(nous n’affichons jamais votre email ou numéro de téléphone)" msgid "(we never show your email)" msgstr "(nous n’affichons jamais votre email)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:662 -#: perllib/FixMyStreet/DB/Result/Problem.pm:393 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Choisissez une catégorie --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 -#: perllib/FixMyStreet/DB/Result/Problem.pm:399 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:630 +#: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Choisissez un type de propriété --" @@ -178,51 +180,7 @@ msgstr "" " Cela est probablement la raison pour laquelle \"zone couverte\" est vide (dessous).<br>\n" " Peut etre ajouter un <code>MAPIT_TYPES</code> a votre fichier de config?" -#: templates/web/base/questionnaire/completed.html:20 -msgid "<p style=\"font-size:150%\">Thank you very much for filling in our questionnaire; glad to hear it’s been fixed.</p>" -msgstr "<p style=\"font-size:150%\">Merci beaucoup d'avoir répondu à nos questions ; heureux d’apprendre que cela a été résolu.</p>" - -#: templates/web/fiksgatami/questionnaire/completed-open.html:1 -msgid "" -"<p style=\"font-size:150%\">We’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’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%\">Nous somme désolé d'entendre cela. Nous avons deux \n" -"suggestions: pourquoi ne pas essayer <a href=\"http://www.norge.no/styresmakter/\"> et écrire \n" -"directement à votre conseiller(s)</a>ou, si c'est un problème qui pourrait être \n" -"fixé par les populations locales, pourquoi ne pas\n" -"<a href=\"http://www.pledgebank.com/new\">déclarer votre engagement</a>?\n" -"</p>" - -#: templates/web/base/questionnaire/completed-open.html:6 -msgid "" -"<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" -"suggestions: why not try writing to your local representatives or, if\n" -"it’s a problem that could be fixed by local people working together, why\n" -"not <a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n" -"</p>" -msgstr "" -"<p style=\"font-size:150%\">Nous sommes peinés d'apprendre cela. Nous avons deux \n" -"suggestions: pourquoi ne pas essayer d'écrire à votre représentant local ou, si elle est \n" -"un problème qui pourrait être fixé par les populations locales, pourquoi pas\n" -"<a href=\"http://www.pledgebank.com/new\">déclarer un engagement</a>?\n" -"</p>" - -#: templates/web/base/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>Merci beaucoup d'avoir répondu à nos questions ; si vous\n" -"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/base/around/_report_banner.html:4 +#: templates/web/base/around/_report_banner.html:3 #: templates/web/base/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>" @@ -249,7 +207,7 @@ msgstr "<strong>Non</strong>, laissez-moi m'authentifier par email :" msgid "<strong>No</strong>, I do not, let me sign in by email:" msgstr "<strong>Non</strong>, je n'en ai pas, laissez-moi m'authentifier par email :" -#: templates/web/base/report/new/fill_in_details_form.html:163 +#: templates/web/base/report/new/fill_in_details_form.html:144 msgid "<strong>No</strong>, let me confirm my report by email:" msgstr "<strong>Non</strong>, laissez-moi confirmer mon rapport par email :" @@ -257,13 +215,8 @@ msgstr "<strong>Non</strong>, laissez-moi confirmer mon rapport par email :" msgid "<strong>No</strong>, let me confirm my update by email:" msgstr "<strong>Non</strong>, laissez-moi confirmer ma mise à jour par email :" -#: templates/web/base/tokens/confirm_problem.html:19 -#: templates/web/base/tokens/confirm_problem.html:20 -msgid "<strong>We will now send it to the council</strong>." -msgstr "<strong>Nous allons maintenant l'envoyer a l'administration</strong>." - #: templates/web/base/auth/general.html:37 -#: templates/web/base/report/new/fill_in_details_form.html:141 +#: templates/web/base/report/new/fill_in_details_form.html:122 #: templates/web/base/report/update-form.html:95 #: templates/web/fixmystreet/auth/general.html:37 #: templates/web/fixmystreet/auth/general.html:39 @@ -277,8 +230,8 @@ msgstr "<strong>Oui</strong>, j'ai un mot de passe :" msgid "About us" msgstr "À propos" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:39 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:52 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:31 #: templates/web/fixmystreet/report/update-form.html:28 @@ -297,26 +250,26 @@ msgstr "" " ou les rapports de problèmes peuvent être envoyés. Vous pouvez ajouter un ou plusieurs contact (pour differentes\n" " catégories de problèmes) à chaque body." -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/body.html:56 msgid "Add a contact using the form below." msgstr "Ajouter un contact en utilisant le formulaire ci-dessous." #: templates/web/base/admin/bodies.html:74 -#: templates/web/base/admin/body-form.html:233 +#: templates/web/base/admin/body-form.html:240 #: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "Ajouter un interlocuteur" -#: templates/web/base/admin/body.html:108 +#: templates/web/base/admin/body.html:116 #: templates/web/zurich/admin/body.html:31 msgid "Add new category" msgstr "Ajouter une nouvelle catégorie" -#: templates/web/base/admin/users.html:45 +#: templates/web/base/admin/users.html:47 msgid "Add user" msgstr "Ajouter un utilisateur" -#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:70 +#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:52 msgid "Added %s" msgstr "Ajouté %s" @@ -343,9 +296,7 @@ msgstr "M'alerter de futures mises à jour" msgid "All Reports" msgstr "Tous les rapports" -#: templates/web/base/footer.html:11 templates/web/fiksgatami/footer.html:23 -#: templates/web/fiksgatami/nn/footer.html:23 -#: templates/web/fixmystreet/footer.html:26 +#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:26 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:19 @@ -362,19 +313,9 @@ msgstr "Tous les rapports entre %s et %s" msgid "All the information you provide here will be sent to" msgstr "Toutes les informations que vous fournissez ici seront envoyées à" -#: templates/web/base/report/new/councils_text_all.html:12 -#: templates/web/base/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 "Toutes les informations que vous fournissez ici seront envoyées à <strong>%s</strong> ou <strong>au service des routes</strong>. " - -#: templates/web/base/report/new/councils_text_all.html:5 -#: templates/web/base/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/base/report/new/councils_text_all.html:19 -#: templates/web/base/report/new/councils_text_all.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:13 +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_all.html:4 +#: templates/web/base/report/new/fill_in_details_form.html:12 #: templates/web/base/report/new/fill_in_details_form.html:14 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 @@ -391,7 +332,7 @@ msgstr "Une mise à jour a marqué ce problème comme résolu" msgid "Anonymous" msgstr "Anonyme" -#: templates/web/base/admin/report_edit.html:62 +#: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:23 msgid "Anonymous:" msgstr "Anonyme :" @@ -400,18 +341,18 @@ 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 à FixMyStreet ?" -#: templates/web/fiksgatami/front/footer-marketing.html:14 #: templates/web/fixmystreet/front/footer-marketing.html:16 msgid "Are you a developer?" msgstr "Vous êtes un développeur ?" #: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 msgid "Area covered" msgstr "Zone couverte" #: templates/web/base/admin/bodies.html:15 -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/body.html:60 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "" @@ -429,7 +370,7 @@ msgstr "Affecté à un \"interlocuteur\" externe:" msgid "Assign to subdivision:" msgstr "Affecté à la subdivision:" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:163 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:165 #: templates/web/zurich/report/updates.html:11 msgid "Assigned to %s" msgstr "Affecté à %s" @@ -442,7 +383,7 @@ msgstr "Un maximum de %d requètes sont renvoyées pour chaque tentative. Les re msgid "At the moment only searching for and looking at reports work." msgstr "Pour le moment, seul la recherche et la consultation de rapports sont supportés." -#: perllib/FixMyStreet/DB/Result/Problem.pm:348 +#: perllib/FixMyStreet/DB/Result/Problem.pm:373 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "Attendant une modération" @@ -455,8 +396,8 @@ msgstr "Retour" msgid "Ban email address" msgstr "Bannir l'adresse mail" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:297 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:301 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" msgstr "Interlocuteurs" @@ -467,6 +408,7 @@ msgstr "Interlocuteurs" msgid "Body" msgstr "Interlocuteur" +#: templates/web/base/admin/report_edit.html:34 #: templates/web/base/admin/user-form.html:32 msgid "Body:" msgstr "Interlocuteur:" @@ -479,16 +421,15 @@ msgstr "Par Date" msgid "Can't see the map? <em>Skip this step</em>" msgstr "Vous ne pouvez pas voir le plan ? <em>Sautez cette étape</em>" -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:55 #: templates/web/base/report/new/category.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:53 +#: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 #: templates/web/zurich/admin/stats.html:50 -#: templates/web/zurich/report/new/fill_in_details_form.html:50 msgid "Category" msgstr "Catégorie" @@ -496,17 +437,16 @@ msgstr "Catégorie" msgid "Category fix rate for problems > 4 weeks old" msgstr "Taux de résolution pour les problèmes > 4 semaines" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:138 #: templates/web/base/admin/category_edit.html:23 -#: templates/web/base/admin/report_edit.html:61 -#: templates/web/base/report/new/fill_in_details_form.html:68 +#: templates/web/base/admin/report_edit.html:74 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/report_edit-sdm.html:42 #: templates/web/zurich/admin/report_edit.html:140 msgid "Category:" msgstr "Catégorie :" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:377 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383 msgid "Category: %s" msgstr "Catégorie : %s" @@ -517,7 +457,7 @@ msgstr "Catégorie : %s" msgid "Change password" msgstr "Changer le mot de passe" -#: templates/web/base/admin/body.html:152 +#: templates/web/base/admin/body.html:160 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." @@ -525,7 +465,7 @@ msgstr "" "Cochez <strong>confirmé</strong> pour signaler que ce contact a été confirmé comme correct.\n" "Si vous n'êtes pas sûr de l'origine ou de la validité du contact, laissez le décoché." -#: templates/web/base/admin/body.html:163 +#: templates/web/base/admin/body.html:171 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." @@ -533,7 +473,7 @@ msgstr "" "Cochez <strong>supprimé</strong> pour rendre la catégorie inutilisable. \n" "Elle n'apparaitra plus dans le menu déroulant de la page rapporter-un-problème." -#: templates/web/base/admin/body.html:183 +#: templates/web/base/admin/body.html:191 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -551,7 +491,7 @@ msgstr "" "à afficher le rapport. Au Royaume Uni, nous l'avons utilisé pour des services tels que demander une poubelle supplémentaire \n" "à une adresse donnée." -#: templates/web/base/admin/body.html:122 +#: templates/web/base/admin/body.html:130 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." @@ -570,16 +510,16 @@ msgstr "Cliquer ici ou saisir au format jj/mm/aaaa" msgid "Click map to report a problem" msgstr "Cliquez sur le plan pour signaler un problème" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:45 -#: templates/web/base/admin/report_edit.html:47 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:58 +#: templates/web/base/admin/report_edit.html:60 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/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:95 #: templates/web/zurich/admin/report_edit.html:97 #: templates/web/zurich/admin/stats.html:31 @@ -587,11 +527,12 @@ msgstr "Cliquez sur le plan pour signaler un problème" msgid "Closed" msgstr "Clos" -#: perllib/FixMyStreet/DB/Result/Problem.pm:762 +#: perllib/FixMyStreet/DB/Result/Problem.pm:771 msgid "Closed by council" msgstr "Clos par l'administration" -#: templates/web/base/my/my.html:40 templates/web/fixmystreet/my/my.html:46 +#: templates/web/base/my/my.html:40 +#: templates/web/fixmystreet/my/_problem-list.html:12 msgid "Closed reports" msgstr "Rapports clos" @@ -599,7 +540,7 @@ msgstr "Rapports clos" msgid "Closed:" msgstr "Clos :" -#: templates/web/base/around/tabbed_lists.html:11 +#: templates/web/base/around/tabbed_lists.html:10 #: templates/web/base/around/tabbed_lists.html:12 msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "Problèmes clos à proximité <small>(dans l'intervalle de %skm)</small>" @@ -614,26 +555,26 @@ msgstr "Coordonnées" msgid "Cobrand" msgstr "Collaboration" -#: templates/web/base/admin/report_edit.html:75 +#: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:50 msgid "Cobrand data:" msgstr "Données de collaboration :" -#: templates/web/base/admin/report_edit.html:74 +#: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:49 msgid "Cobrand:" msgstr "Collaboration :" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Configuration" -#: templates/web/base/admin/category_edit.html:47 +#: templates/web/base/admin/category_edit.html:52 msgid "Configure Endpoint" msgstr "Configurez Endpoint" -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/body.html:72 msgid "Confirm" msgstr "Confirmer" @@ -654,10 +595,10 @@ msgstr "Confirmer par courriel ci-dessous, en fournissant un nouveau mot de pass msgid "Confirmation" msgstr "Confirmation" -#: templates/web/base/admin/body.html:158 -#: templates/web/base/admin/body.html:71 -#: templates/web/base/admin/category_edit.html:32 -#: templates/web/base/admin/category_edit.html:84 +#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/category_edit.html:37 +#: templates/web/base/admin/category_edit.html:89 #: templates/web/zurich/admin/stats.html:40 msgid "Confirmed" msgstr "Confirmé" @@ -668,7 +609,7 @@ msgstr "Rapports confirmés entre %s et %s" #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 -#: templates/web/base/admin/report_edit.html:70 +#: templates/web/base/admin/report_edit.html:83 msgid "Confirmed:" msgstr "Confirmé :" @@ -685,13 +626,12 @@ msgid "Contact Us" msgstr "Nous contacter" #: templates/web/base/contact/index.html:6 -#: templates/web/base/contact/submit.html:3 #: templates/web/fixmystreet/contact/index.html:20 msgid "Contact the team" msgstr "Contacter l'équipe" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1327 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1355 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1325 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1353 msgid "Could not find user" msgstr "Impossible de trouver l'utilisateur" @@ -709,6 +649,10 @@ msgstr "Administration" msgid "Council contacts for %s" msgstr "Contacts de l'administration pour %s" +#: perllib/FixMyStreet/DB/Result/Problem.pm:670 +msgid "Council ref: %s" +msgstr "Ref. de la mairie : %s" + #: templates/web/base/admin/stats.html:84 msgid "Council:" msgstr "Administration :" @@ -724,7 +668,7 @@ msgstr "Nombre" msgid "Create a report" msgstr "Créer un rapport" -#: templates/web/base/admin/body.html:200 +#: templates/web/base/admin/body.html:208 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Créer une catégorie" @@ -736,7 +680,7 @@ msgid "Created" msgstr "Créé" #: templates/web/base/admin/list_updates.html:38 -#: templates/web/base/admin/report_edit.html:69 +#: templates/web/base/admin/report_edit.html:82 #: templates/web/base/admin/update_edit.html:51 #: templates/web/zurich/admin/report_edit-sdm.html:47 #: templates/web/zurich/admin/report_edit.html:61 @@ -753,7 +697,7 @@ msgstr "État actuel" msgid "Currently no bodies have been created." msgstr "Pour l'instant, aucun intelocuteur n'a été créé." -#: templates/web/base/dashboard/index.html:6 +#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 msgid "Dashboard" msgstr "Tableau de bord" @@ -763,14 +707,14 @@ msgid "Dealt with by subdivision within 5 working days" msgstr "Traité par la subdivision dans les 5 jours ouvrables" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:169 -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:37 -#: templates/web/base/admin/category_edit.html:85 +#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:81 +#: templates/web/base/admin/category_edit.html:42 +#: templates/web/base/admin/category_edit.html:90 msgid "Deleted" msgstr "Effacé" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:43 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -790,7 +734,7 @@ msgstr "Détails :" msgid "Details:" msgstr "Détails :" -#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/body.html:87 msgid "Devolved" msgstr "Transféré(e)" @@ -818,8 +762,8 @@ msgstr "Je ne sais pas" msgid "Don't like forms?" msgstr "Vous n'aimez pas les formulaires ?" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:47 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:60 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:32 #: templates/web/fixmystreet/report/update-form.html:28 @@ -827,7 +771,7 @@ msgstr "Vous n'aimez pas les formulaires ?" msgid "Duplicate" msgstr "Dupliqué" -#: templates/web/base/admin/body.html:98 +#: templates/web/base/admin/body.html:106 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" @@ -840,20 +784,20 @@ msgstr "" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 -#: templates/web/base/admin/users.html:31 +#: templates/web/base/admin/users.html:33 #: templates/web/zurich/admin/problem_row.html:42 msgid "Edit" msgstr "Éditer" -#: templates/web/base/admin/body.html:212 +#: templates/web/base/admin/body.html:220 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "Editer les détails de l'intelocuteur" #: templates/web/base/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:2 +#: 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:2 +#: templates/web/zurich/admin/report_edit.html:1 #: templates/web/zurich/admin/report_edit.html:5 msgid "Editing problem %d" msgstr "Édition du problème %d" @@ -867,12 +811,12 @@ msgstr "Édition de la mise à jour %d" msgid "Editing user %d" msgstr "Édition de l'utilisateur %d'" -#: templates/web/base/admin/category_edit.html:86 +#: templates/web/base/admin/category_edit.html:91 msgid "Editor" msgstr "Éditeur" #: templates/web/base/admin/bodies.html:23 -#: templates/web/base/admin/category_edit.html:83 +#: templates/web/base/admin/category_edit.html:88 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 #: templates/web/fixmystreet/auth/general.html:21 @@ -883,15 +827,23 @@ msgstr "Éditeur" msgid "Email" msgstr "Email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1303 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1301 msgid "Email added to abuse list" msgstr "Email rajouté à la liste des abus" -#: templates/web/base/admin/body.html:147 +#: templates/web/base/admin/body.html:155 msgid "Email address:" msgstr "Adresse courriel:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1300 +#: templates/web/base/tokens/confirm_alert.html:6 +msgid "Email alert created" +msgstr "" + +#: templates/web/base/tokens/confirm_alert.html:10 +msgid "Email alert deleted" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1298 msgid "Email already in abuse list" msgstr "Email déjà présent dans la liste des abus" @@ -903,8 +855,8 @@ msgstr "Envoyez-moi les nouveaux problèmes locaux" msgid "Email me updates" msgstr "Envoyez-moi les mises à jour" -#: templates/web/base/admin/category_edit.html:26 -#: templates/web/base/admin/report_edit.html:67 +#: templates/web/base/admin/category_edit.html:31 +#: templates/web/base/admin/report_edit.html:80 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 @@ -915,32 +867,32 @@ msgstr "Envoyez-moi les mises à jour" msgid "Email:" msgstr "Email :" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:322 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 msgid "Email: %s" msgstr "Courriel: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 msgid "Empty flat or maisonette" msgstr "appartement ou maisonnette vide" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:631 msgid "Empty house or bungalow" msgstr "maison ou bungalow vide" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:622 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty office or other commercial" msgstr "bureau ou commerce vide" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:623 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Empty pub or bar" msgstr "pub ou bar vide" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:624 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty public building - school, hospital, etc." msgstr "bâtiment public - école - hôpital, etc non renseigné." -#: templates/web/base/admin/body-form.html:158 -#: templates/web/base/admin/body-form.html:159 +#: templates/web/base/admin/body-form.html:162 +#: templates/web/base/admin/body-form.html:163 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" @@ -951,8 +903,8 @@ msgstr "" "Pour plus d' information, lire \n" "<a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>cet article</a>. %s" -#: templates/web/base/admin/body-form.html:215 -#: templates/web/base/admin/body-form.html:216 +#: templates/web/base/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:223 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" @@ -966,11 +918,11 @@ msgstr "" msgid "End Date:" msgstr "Date de fin:" -#: templates/web/base/admin/body-form.html:126 +#: templates/web/base/admin/body-form.html:130 msgid "Endpoint" msgstr "destinataire" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:72 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:73 msgid "Enter a Zürich street name" msgstr "Saisir un nom de rue Zücomplet" @@ -983,7 +935,9 @@ msgstr "Saisir un code postal proche, ou un nom de rue ou de localité" msgid "Enter a nearby postcode, or street name and area" msgstr "Saisir un code postal proche, ou une rue et une localité" +#: templates/web/base/around/postcode_form.html:1 #: templates/web/base/around/postcode_form.html:2 +#: templates/web/fixmystreet/around/postcode_form.html:10 #: templates/web/fixmystreet/around/postcode_form.html:11 msgid "Enter a nearby street name and area" msgstr "Saisissez un nom de rue proche, la localité ou le code postal" @@ -993,7 +947,7 @@ msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "Saisissez un nom de rue proche et une localité, le code postal et le district de Delhi" #: templates/web/base/auth/general.html:64 -#: templates/web/base/report/new/fill_in_details_form.html:170 +#: templates/web/base/report/new/fill_in_details_form.html:151 #: templates/web/base/report/update-form.html:124 msgid "Enter a new password:" msgstr "Saisissez un nouveau mot de passe :" @@ -1005,7 +959,7 @@ msgstr "Saisissez un nouveau mot de passe :" msgid "Enter a password" msgstr "Saisissez un mot de passe :" -#: templates/web/base/index-steps.html:33 +#: templates/web/base/index-steps.html:26 msgid "Enter details of the problem" msgstr "Saisissez les détails du problème" @@ -1028,17 +982,22 @@ msgstr "Exemple de code postal %s" msgid "Examples:" msgstr "Exemples :" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:47 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "Expliquez ce qui ne va pas, sa position exact, et depuis combien de temps..." -#: templates/web/base/admin/report_edit.html:76 +#: templates/web/base/admin/body-form.html:81 +msgid "External URL" +msgstr "" + +#: templates/web/base/admin/category_edit.html:27 +#: templates/web/base/admin/report_edit.html:92 msgid "Extra data:" msgstr "Donnée supplémentaire:" -#: templates/web/base/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>." +#: templates/web/base/contact/submit.html:13 +msgid "Failed to send message" +msgstr "" #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 @@ -1050,7 +1009,7 @@ msgstr "Liste de filtres de rapport" msgid "First time" msgstr "Première fois" -#: templates/web/base/admin/body.html:40 +#: templates/web/base/admin/body.html:48 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "Résoudre ceci en chosissant une <strong>zone couverte</strong> dans le formulaire <em>Saisie des détails interlocuteur</em> ci-dessous." @@ -1089,9 +1048,9 @@ msgstr "" "dans les deux les alertes des Ponts et Chaussées, mais uniquement dans l'alerte « À l'intérieur de » pour la commune." #: templates/web/base/admin/index.html:55 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:41 -#: templates/web/base/admin/report_edit.html:42 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:54 +#: templates/web/base/admin/report_edit.html:55 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/update-form.html:30 @@ -1102,17 +1061,18 @@ msgstr "" msgid "Fixed" msgstr "Résolu" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:43 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:56 msgid "Fixed - Council" msgstr "Résolu - Administration" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:42 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:55 msgid "Fixed - User" msgstr "Résolu - Usager" -#: templates/web/base/my/my.html:35 templates/web/fixmystreet/my/my.html:41 +#: templates/web/base/my/my.html:35 +#: templates/web/fixmystreet/my/_problem-list.html:7 msgid "Fixed reports" msgstr "Rapports résolus" @@ -1120,7 +1080,7 @@ msgstr "Rapports résolus" msgid "Fixed:" msgstr "Résolu :" -#: templates/web/base/admin/body-form.html:84 +#: templates/web/base/admin/body-form.html:89 #: templates/web/zurich/admin/body-form.html:36 msgid "Flag as deleted" msgstr "Signaler comme supprimé" @@ -1129,7 +1089,7 @@ msgstr "Signaler comme supprimé" msgid "Flag user" msgstr "Signaler l'usager" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Signalé" @@ -1138,7 +1098,7 @@ msgstr "Signalé" msgid "Flagged reports and users" msgstr "Rapports signalés et utilisateurs" -#: templates/web/base/admin/user-form.html:45 +#: templates/web/base/admin/user-form.html:46 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page." msgstr "Les utilisateurs signalés sont listés dans la page <a href='%s'>signalé</a>" @@ -1146,8 +1106,8 @@ msgstr "Les utilisateurs signalés sont listés dans la page <a href='%s'>signal msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." msgstr "Les utilisateurs signalés ne sont pas restreints en aucune façon. il s'agit juste d'une liste d'utilisateurs qui ont été marqués pour attention." -#: templates/web/base/admin/report_edit.html:78 -#: templates/web/base/admin/user-form.html:51 +#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/user-form.html:52 msgid "Flagged:" msgstr "Signalé :" @@ -1156,10 +1116,6 @@ msgstr "Signalé :" msgid "Follow a ward link to view only reports within that ward." msgstr "Suivez un lien de localité pour voir uniquement les rapports à l'intérieur de cette localité" -#: templates/web/base/admin/report_edit.html:30 -msgid "For council(s):" -msgstr "Pour la ou les administration(s) :" - #: templates/web/base/admin/body-form.html:65 msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "Pour plus d'information, Lire <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>comment FixMyStreet utilise Mapit</a>." @@ -1172,8 +1128,6 @@ msgstr "Vous avez oublié votre mot de passe? " #: templates/web/base/faq/faq-en-gb.html:1 #: templates/web/base/static/privacy.html:1 #: templates/web/base/static/privacy.html:2 -#: templates/web/fiksgatami/faq/faq-nb.html:1 -#: templates/web/fiksgatami/nn/faq/faq-nn.html:1 msgid "Frequently Asked Questions" msgstr "Foire Aux Questions" @@ -1186,13 +1140,13 @@ msgstr "GeoRSS sur Google Maps" msgid "Get updates" msgstr "Recevoir les mises à jour" -#: templates/web/fixmystreet/reports/_rss.html:4 +#: templates/web/fixmystreet/reports/_rss.html:3 #: templates/web/fixmystreet/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "Recevoir les mises à jours de %s problèmes" #: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:4 +#: templates/web/fixmystreet/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "Recevez les mises à jour pour les problèmes dans cette %s" @@ -1201,6 +1155,10 @@ msgstr "Recevez les mises à jour pour les problèmes dans cette %s" msgid "Give me an RSS feed" msgstr "Donnez-moi un flux RSS" +#: templates/web/base/questionnaire/completed.html:14 +msgid "Glad to hear it’s been fixed!" +msgstr "" + #: templates/web/base/alert/index.html:34 #: templates/web/base/around/postcode_form.html:8 #: templates/web/fixmystreet/around/postcode_form.html:21 @@ -1208,7 +1166,7 @@ msgstr "Donnez-moi un flux RSS" msgid "Go" msgstr "Ok" -#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:93 msgid "Going to send questionnaire?" msgstr "Envoi du questionnaire ?" @@ -1230,9 +1188,7 @@ msgstr "Est-ce que le problème a été réglé ?" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "Est-ce que vous aviez déjà signalé un problème à une administration, ou est-ce que c'est votre première fois ?" -#: templates/web/base/footer.html:15 templates/web/fiksgatami/footer.html:27 -#: templates/web/fiksgatami/nn/footer.html:27 -#: templates/web/fixmystreet/footer.html:30 +#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:30 #: templates/web/zurich/faq/faq-de-ch.html:1 #: templates/web/zurich/footer.html:21 #: templates/web/zurich/nav_over_content.html:8 @@ -1244,18 +1200,17 @@ msgstr "Aide" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "Voici les types de problèmes locaux pour « %s »." -#: templates/web/fiksgatami/header.html:48 -#: templates/web/fixmystreet/header.html:52 +#: templates/web/fixmystreet/header.html:58 #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "Bienvenue %s" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:50 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:63 +#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/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:86 #: templates/web/zurich/admin/report_edit.html:90 #: templates/web/zurich/admin/stats.html:32 @@ -1271,7 +1226,7 @@ msgstr "Cachés anciens" msgid "Hide pins" msgstr "Cacher les épingles" -#: templates/web/base/admin/category_edit.html:79 +#: templates/web/base/admin/category_edit.html:84 msgid "History" msgstr "Historique" @@ -1287,19 +1242,25 @@ msgstr "Comment signaler un problème" msgid "How to send successful reports" msgstr "Comment envoyer des rapports réussis" -#: perllib/FixMyStreet/App/Controller/Admin.pm:742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:740 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Je suis désolé, vous ne pouvez pas confirmer des rapports non validés" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:89 +#: templates/web/base/tokens/confirm_problem.html:23 +#: templates/web/base/tokens/confirm_problem.html:27 +msgid "I just reported a problem on @fixmystreet" +msgstr "" + +#: templates/web/base/tokens/confirm_update.html:19 +#: templates/web/base/tokens/confirm_update.html:23 +msgid "I just updated a problem on @fixmystreet" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Je suis désolé, nous n'avons pas trouvé votre problème dans notre base de données.\n" -#: 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 "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:260 +#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 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" @@ -1321,7 +1282,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "Identifier un <strong>parent</strong> si cet interlocuteur fait lui-même partie d'un autre intelocuteur. Pour des installations basiques, vous n'avez pas besoin de joindre des interlocuteurs de cette manière." -#: templates/web/base/admin/body.html:125 +#: templates/web/base/admin/body.html:133 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." @@ -1339,7 +1300,12 @@ msgstr "Si vous ne le faites pas, votre problème ne sera pas envoyé." msgid "If you do not, your update will not be posted." msgstr "Si vous ne le faites pas, votre mise à jour ne sera pas envoyée." -#: templates/web/base/report/new/councils_text_none.html:9 +#: templates/web/base/questionnaire/completed.html:8 +msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." +msgstr "" + +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:8 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." @@ -1358,12 +1324,12 @@ msgstr "" "(merci de noter que la mise à jour ne sera pas envoyée à l'administration). Par exemple, quelle\n" "était votre impression de la résolution de problème ?" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/body.html:149 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "Si vous utilisez <strong>une méthode d'envoi autre que le courriel</strong>, saisissez le service ID (Open311) ou un identifiant équivalent ici." -#: templates/web/base/admin/body-form.html:200 -#: templates/web/base/admin/body-form.html:201 +#: templates/web/base/admin/body-form.html:207 +#: templates/web/base/admin/body-form.html:208 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" @@ -1373,8 +1339,8 @@ msgstr "" " Activez <strong>extended Open311 stauses</strong> si vous voulez autoriser de passer d'autres états.\n" "Contrôlez que votre cobrand supporte cette fonctionnalité avant de basculer vers elle." -#: templates/web/base/admin/body-form.html:187 -#: templates/web/base/admin/body-form.html:188 +#: templates/web/base/admin/body-form.html:194 +#: templates/web/base/admin/body-form.html:195 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." @@ -1382,8 +1348,8 @@ msgstr "" "Si vous avez activé Open311 update-sending plus haut, activez <strong>suppression des alertes</strong> \n" "Si vous ne voulez <strong>pas</strong> prévenir cet utilisateur lorsque ces mises à jour sont créées." -#: templates/web/base/admin/body-form.html:173 -#: templates/web/base/admin/body-form.html:174 +#: templates/web/base/admin/body-form.html:177 +#: templates/web/base/admin/body-form.html:178 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" @@ -1392,7 +1358,7 @@ msgstr "" "Si vous avez activer Open311 update-sending plus haut, vous devez identifier quel <strong>utlisateur</strong> FixMyStreet sera défini comme le créateur de ces mises à jour.\n" "Lorsqu'elles sont montrées sur le site. saisir l' ID (nombre) de cet utilisateur." -#: perllib/FixMyStreet/App/Controller/Contact.pm:127 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 msgid "Illegal ID" msgstr "ID invalide" @@ -1417,17 +1383,21 @@ msgstr "En table d'abus ?" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "En plus, les attributs suivants qui ne font pas partie de la spécification Open311 v2 sont renvoyés : agency_sent_datetime, title (qui est aussi renvoyé dans la description), interface_used, comment_count, requestor_name (seulement s'il est présent et que le requérant nous a autorisé à l'afficher sur le site)" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:38 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:144 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 #: templates/web/fixmystreet/report/banner.html:19 -#: templates/web/zurich/admin/header.html:2 +#: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 #: templates/web/zurich/admin/report_edit.html:99 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "En cours" +#: templates/web/base/tokens/confirm_alert.html:11 +msgid "Inbox zero, here we come!" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:160 msgid "Include reporter personal details" msgstr "Inclure les détails personnels du reporter" @@ -1436,7 +1406,7 @@ msgstr "Inclure les détails personnels du reporter" msgid "Include unconfirmed reports" msgstr "Inclure les rapports non confirmés" -#: perllib/FixMyStreet/App/Controller/Open311.pm:354 +#: perllib/FixMyStreet/App/Controller/Open311.pm:359 msgid "Incorrect has_photo value \"%s\"" msgstr "Valeur has_photo invalide \"%s\"" @@ -1444,29 +1414,29 @@ msgstr "Valeur has_photo invalide \"%s\"" msgid "Internal notes" msgstr "Notes internes" -#: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:61 msgid "Internal referral" msgstr "Référence interne" -#: perllib/FixMyStreet/App/Controller/Open311.pm:339 +#: perllib/FixMyStreet/App/Controller/Open311.pm:344 msgid "Invalid agency_responsible value %s" msgstr "Valeur agency_responsible invalide \"%s\"" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1114 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1112 msgid "Invalid end date" msgstr "Date de fin invalide" -#: perllib/FixMyStreet/App/Controller/Open311.pm:432 +#: perllib/FixMyStreet/App/Controller/Open311.pm:437 msgid "Invalid format %s specified." msgstr "Format spécifié %s invalide" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1110 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 msgid "Invalid start date" msgstr "Date de début invalide" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:37 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:50 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 #: templates/web/base/report/update-form.html:30 @@ -1480,8 +1450,12 @@ msgstr "En examen" msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "Il est souvent plus rapide <a href=\"%s\">de parcourir notre FAQs</a> et d'y chercher la réponse." +#: templates/web/base/tokens/confirm_problem.html:14 +msgid "It’s on its way to the council right now." +msgstr "" + #: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:150 +#: templates/web/base/report/new/fill_in_details_form.html:131 #: templates/web/base/report/update-form.html:104 #: templates/web/fixmystreet/auth/general.html:47 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 @@ -1490,12 +1464,12 @@ msgstr "Il est souvent plus rapide <a href=\"%s\">de parcourir notre FAQs</a> et msgid "Keep me signed in on this computer" msgstr "Se souvenir de moi sur cet ordinateur" -#: templates/web/base/admin/body.html:62 +#: templates/web/base/admin/body.html:70 #: templates/web/zurich/admin/body.html:16 msgid "Last editor" msgstr "Dernier auteur" -#: templates/web/base/admin/report_edit.html:72 +#: templates/web/base/admin/report_edit.html:88 msgid "Last update:" msgstr "Dernière actualisation :" @@ -1503,43 +1477,38 @@ msgstr "Dernière actualisation :" msgid "Last update:" msgstr "Dernière actualisation :" -#: templates/web/base/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:229 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "Laisser ce champ vide si tous les rapports pour cet interlocuteur doivent être envoyés en utilisant la même méthode (cead, \"%s\")." -#: templates/web/base/admin/body.html:17 templates/web/base/admin/body.html:19 +#: templates/web/base/admin/body.html:27 msgid "List all reported problems" msgstr "Lister tous les problèmes rapportés" -#: templates/web/base/report/new/fill_in_details_form.html:69 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:54 -#: templates/web/zurich/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/category_wrapper.html:4 msgid "Loading..." msgstr "Chargement…" #: templates/web/base/alert/choose.html:1 #: templates/web/base/alert/choose.html:3 #: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3 -#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:5 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5 #: templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 -#: templates/web/base/tokens/confirm_alert.html:4 #: templates/web/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "Flux RSS et alertes email locaux" -#: templates/web/base/alert/list.html:13 templates/web/base/alert/list.html:14 -#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:3 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:12 +#: templates/web/base/alert/list.html:14 templates/web/base/alert/list.html:3 msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Flux RSS et alertes email locales pour « %s »" -#: templates/web/base/footer.html:13 templates/web/fiksgatami/footer.html:25 -#: templates/web/fiksgatami/nn/footer.html:25 -#: templates/web/fixmystreet/footer.html:28 +#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:28 msgid "Local alerts" msgstr "Alertes locales" -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:25 msgid "Locate the problem on a map of the area" msgstr "Localisez le problème sur un plan des alentours" @@ -1548,17 +1517,27 @@ msgid "MAP" msgstr "CARTE" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" msgstr "" -#: perllib/FixMyStreet/Map/OSM.pm:42 -msgid "Map © <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 "Plan © <a id=\"osm_link\" href=\"http://www.openstreetmap.lu/\">OpenStreetMap</a> et contributeurs, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA</a>" +#: templates/web/base/admin/report_edit.html:86 +#, fuzzy +msgid "Mark as sent" +msgstr "marqué comme terminé" -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/user-form.html:44 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." msgstr "Marquer les utilisateurs dont vous voulez surveiller le comportement comme <strong>cochés</strong>." +#: templates/web/base/reports/index.html:24 +msgid "Marked fixed/closed in the past eight weeks" +msgstr "" + +#: templates/web/base/reports/index.html:25 +msgid "Marked fixed/closed more than eight weeks ago" +msgstr "" + #: templates/web/fixmystreet/contact/index.html:106 msgid "Message" msgstr "Message" @@ -1567,7 +1546,7 @@ msgstr "Message" msgid "Message:" msgstr "Message :" -#: perllib/FixMyStreet/App/Controller/Open311.pm:440 +#: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" msgstr "jurisdiction_id manquant" @@ -1597,11 +1576,11 @@ msgstr "Encore plus de problèmes aux alentours" #: templates/web/fixmystreet/report/update-form.html:138 #: 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:94 +#: templates/web/zurich/report/new/fill_in_details_form.html:77 msgid "Name" msgstr "Nom" -#: templates/web/base/admin/report_edit.html:66 +#: templates/web/base/admin/report_edit.html:79 #: templates/web/base/admin/update_edit.html:32 #: templates/web/base/admin/user-form.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:43 @@ -1610,25 +1589,25 @@ msgstr "Nom" msgid "Name:" msgstr "Nom :" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:321 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:313 msgid "Name: %s" msgstr "Nom: %s" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:186 -#: perllib/FixMyStreet/Geocode/OSM.pm:164 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 +#: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "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:137 +#: perllib/FixMyStreet/Cobrand/UK.pm:127 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:421 -#: perllib/FixMyStreet/Cobrand/Default.pm:461 +#: perllib/FixMyStreet/Cobrand/Default.pm:442 +#: perllib/FixMyStreet/Cobrand/Default.pm:482 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:288 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:277 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1644,11 +1623,11 @@ msgstr "Presque fini! Maintenant allez voir vos emails…" msgid "New <br>problems" msgstr "Nouveaux <br />problèmes" -#: perllib/FixMyStreet/App/Controller/Admin.pm:264 +#: perllib/FixMyStreet/App/Controller/Admin.pm:261 msgid "New body added" msgstr "Nouveau body ajouté" -#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:379 msgid "New category contact added" msgstr "Nouveau contact de catégorie rajouté" @@ -1721,15 +1700,15 @@ msgstr "Nouvelle mise à jour:" msgid "Next" msgstr "Suivant" -#: templates/web/base/admin/body.html:72 templates/web/base/admin/body.html:74 -#: templates/web/base/admin/body.html:78 templates/web/base/admin/body.html:80 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:93 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:44 @@ -1747,7 +1726,7 @@ msgstr "Aucun intelocuteur" msgid "No council" msgstr "Pas d'administration" -#: perllib/FixMyStreet/DB/Result/Problem.pm:376 +#: perllib/FixMyStreet/DB/Result/Problem.pm:401 msgid "No council selected" msgstr "Aucune administration sélectionnée" @@ -1790,12 +1769,12 @@ msgstr "" "Aucune zone spécifique n'est pour l'instant disponible, parce que <code>MAPIT_URL</code> dans \n" "votre fichier de config ne pointe pas vers un service MapIt valide." -#: templates/web/base/report/_support.html:3 +#: templates/web/base/report/_support.html:2 #: templates/web/base/report/_support.html:4 msgid "No supporters" msgstr "Aucun supporter" -#: templates/web/base/admin/report_edit.html:30 +#: templates/web/base/admin/report_edit.html:41 #: templates/web/zurich/admin/report_edit-sdm.html:46 #: templates/web/zurich/admin/report_edit.html:60 msgid "None" @@ -1814,8 +1793,8 @@ msgstr "" "Suivant l'implémentation, les utilisateurs autorisés peuvent avoir accès au tableau de bord (résumé de \n" "l'activité concernant leur interloculteur), et la faculté de cacher des rapports ou de définir des statuts spéciaux pour les rapports." -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:46 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -1831,12 +1810,12 @@ msgstr "Pas pour ma subdivision" msgid "Not reported before" msgstr "Jamais signalé" -#: templates/web/base/report/_main.html:61 +#: templates/web/base/report/_main.html:62 msgid "Not reported to council" msgstr "Pas signalé à l'administration" -#: templates/web/base/admin/body.html:63 -#: templates/web/base/admin/category_edit.html:87 +#: templates/web/base/admin/body.html:71 +#: templates/web/base/admin/category_edit.html:92 #: templates/web/zurich/admin/body.html:17 msgid "Note" msgstr "Note" @@ -1845,8 +1824,8 @@ msgstr "Note" 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 "Notez que quand les rapports non confirmés sont inclus nous utilisons la date de création du rapport, qui peut être dans un autre mois que la date de confirmation, ce qui peut légèrement faire varier les chiffres." -#: templates/web/base/admin/body.html:178 -#: templates/web/base/admin/category_edit.html:44 +#: templates/web/base/admin/body.html:186 +#: templates/web/base/admin/category_edit.html:49 #: templates/web/zurich/admin/body.html:53 msgid "Note:" msgstr "Note :" @@ -1859,7 +1838,7 @@ msgstr "Note : <strong>%s</strong>" msgid "Now to submit your report…" msgstr "Maintenant pour envoyer votre rapport…" -#: templates/web/base/report/new/fill_in_details_form.html:132 +#: templates/web/base/report/new/fill_in_details_form.html:113 msgid "Now to submit your report… do you have a FixMyStreet password?" msgstr "Maintenant pour envoyer votre rapport… avez-vous un mot de passe FixMyStreet.fr ?" @@ -1876,7 +1855,7 @@ msgid "OK" msgstr "OK" #: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:16 +#: templates/web/base/report/update.html:17 msgid "Offensive? Unsuitable? Tell us" msgstr "Offensant ? Inapproprié ? Dites-le nous" @@ -1896,19 +1875,19 @@ msgstr "Anciens <br />résolus" msgid "Older <br>problems" msgstr "Anciens <br />problèmes" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:37 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 msgid "One-line summary" msgstr "Résumé" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:137 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:36 -#: templates/web/base/admin/report_edit.html:37 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:138 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:49 +#: templates/web/base/admin/report_edit.html:50 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/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:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/report_edit.html:86 #: templates/web/zurich/admin/report_edit.html:88 @@ -1917,10 +1896,19 @@ msgstr "Résumé" msgid "Open" msgstr "Ouvert" -#: templates/web/base/my/my.html:30 templates/web/fixmystreet/my/my.html:36 +#: templates/web/base/reports/index.html:22 +msgid "Open for more than four weeks, with an update within the past eight weeks" +msgstr "" + +#: templates/web/base/my/my.html:30 +#: templates/web/fixmystreet/my/_problem-list.html:2 msgid "Open reports" msgstr "Rapports ouverts" +#: templates/web/base/reports/index.html:23 +msgid "Open, but not had any update in eight weeks" +msgstr "" + #: templates/web/base/open311/index.html:70 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "API Open311 pour le serveur FixMyStreet.fr" @@ -1943,15 +1931,15 @@ msgstr "Ou problèmes signalés à :" msgid "Or you can subscribe to an alert based upon what ward or council you’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:1057 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:662 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:663 -#: perllib/FixMyStreet/DB/Result/Problem.pm:560 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 -#: perllib/FixMyStreet/DB/Result/Problem.pm:592 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:372 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 +#: perllib/FixMyStreet/DB/Result/Problem.pm:597 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:393 msgid "Other" msgstr "Autres" @@ -1973,8 +1961,8 @@ msgstr "Page Introuvable" msgid "Parent" msgstr "Parent" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 msgid "Partial" msgstr "Partiel" @@ -1994,7 +1982,7 @@ msgstr "Mot de passe :" msgid "Permalink" msgstr "Permalien" -#: templates/web/zurich/report/new/fill_in_details_form.html:100 +#: templates/web/zurich/report/new/fill_in_details_form.html:83 msgid "Phone number" msgstr "Numéro de téléphone" @@ -2003,27 +1991,27 @@ msgstr "Numéro de téléphone" msgid "Phone number (optional)" msgstr "Téléphone (facultatif)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:286 -#: templates/web/base/admin/report_edit.html:68 -#: templates/web/base/report/new/fill_in_details_form.html:216 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:291 +#: templates/web/base/admin/report_edit.html:81 +#: templates/web/base/report/new/fill_in_details_form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:46 #: templates/web/zurich/admin/report_edit.html:60 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Téléphone" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:72 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 #: 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 +#: templates/web/zurich/report/new/fill_in_details_form.html:51 msgid "Photo" msgstr "Photo" #: templates/web/base/questionnaire/index.html:71 -#: templates/web/base/report/new/fill_in_details_form.html:103 +#: templates/web/base/report/new/fill_in_details_form.html:84 #: templates/web/base/report/update-form.html:62 #: templates/web/fixmystreet/questionnaire/index.html:91 msgid "Photo:" @@ -2037,11 +2025,11 @@ msgstr "Photos de rapports récents à proximité" msgid "Place pin on map" msgstr "Placer l'épingle sur la carte" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:38 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/zurich/admin/header.html:2 +#: 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:86 @@ -2075,20 +2063,19 @@ msgstr "Merci de consulter vos emails" msgid "Please check your email address is correct" msgstr "Merci de vérifier que votre adresse email est correcte" -#: perllib/FixMyStreet/App/Controller/Admin.pm:349 -#: 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:395 +#: perllib/FixMyStreet/App/Controller/Admin.pm:343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:876 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 +#: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" msgstr "Merci de sélectionner une catégorie" -#: perllib/FixMyStreet/DB/Result/Problem.pm:401 +#: perllib/FixMyStreet/DB/Result/Problem.pm:418 msgid "Please choose a property type" msgstr "Merci de choisir un type de propriété" -#: perllib/FixMyStreet/App/Controller/Admin.pm:376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:370 msgid "Please correct the errors below" msgstr "Merci de corriger les erreurs ci-dessous" @@ -2107,8 +2094,8 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "Merci de ne pas injurieux — Calomnier l'administration dévalue le service pour tous les utilisateurs." -#: perllib/FixMyStreet/App/Controller/Admin.pm:352 -#: perllib/FixMyStreet/DB/Result/Comment.pm:133 +#: perllib/FixMyStreet/App/Controller/Admin.pm:346 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "Merci d'entrer un message" @@ -2119,15 +2106,15 @@ msgstr "Merci d'entrer un message" msgid "Please enter a password" msgstr "Merci d'entrer un mot de passe :" -#: perllib/FixMyStreet/App/Controller/Contact.pm:108 -#: perllib/FixMyStreet/DB/Result/Problem.pm:370 +#: perllib/FixMyStreet/App/Controller/Contact.pm:113 +#: perllib/FixMyStreet/DB/Result/Problem.pm:395 #: templates/web/base/js/translation_strings.html:3 msgid "Please enter a subject" msgstr "Merci d'enter un sujet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1050 -#: perllib/FixMyStreet/App/Controller/Admin.pm:351 -#: perllib/FixMyStreet/App/Controller/Admin.pm:997 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin.pm:995 #: perllib/FixMyStreet/DB/Result/User.pm:127 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 @@ -2135,16 +2122,16 @@ msgid "Please enter a valid email" msgstr "Merci d'entrer un email valide" #: perllib/FixMyStreet/App/Controller/Alert.pm:346 -#: perllib/FixMyStreet/App/Controller/Contact.pm:118 +#: perllib/FixMyStreet/App/Controller/Contact.pm:123 msgid "Please enter a valid email address" msgstr "Merci d'entrer une adresse email valide" -#: perllib/FixMyStreet/DB/Result/Problem.pm:373 +#: perllib/FixMyStreet/DB/Result/Problem.pm:398 #: templates/web/base/js/translation_strings.html:4 msgid "Please enter some details" msgstr "Merci d'entrer quelques détails" -#: perllib/FixMyStreet/App/Controller/Contact.pm:107 +#: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/User.pm:124 #: templates/web/base/auth/general.html:13 #: templates/web/base/auth/general.html:8 @@ -2158,7 +2145,7 @@ msgid "Please enter your email" msgstr "Merci d'entrer votre email" #: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:75 msgid "Please enter your email address" msgstr "Merci d'entrer votre adresse email" @@ -2166,14 +2153,14 @@ msgstr "Merci d'entrer votre adresse email" msgid "Please enter your first name" msgstr "Saisissez votre prénom" -#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: perllib/FixMyStreet/Cobrand/UK.pm:318 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Merci de saisir votre nom complet, les administrations ont besoin de cette information. Si vous ne souhaitez pas que votre nom soit affiché sur ce site, décochez la case ci-dessous" -#: perllib/FixMyStreet/App/Controller/Contact.pm:106 -#: perllib/FixMyStreet/DB/Result/Comment.pm:130 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Contact.pm:111 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 +#: perllib/FixMyStreet/DB/Result/Problem.pm:406 #: perllib/FixMyStreet/DB/Result/User.pm:120 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" @@ -2196,7 +2183,7 @@ msgstr "Saisissez votre profession" msgid "Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a href=\"/\">front page</a>." msgstr "Vous pouvez vous <a href=\"%s\">connecter à nouveau</a>, ou retourner à <a href=\"/\">la page d'acceuil</a>." -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:8 msgid "Please fill in details of the problem below." msgstr "Merci d'entrer les détails du problème ci-dessous" @@ -2211,7 +2198,7 @@ msgstr "Merci d'entrer les détails du problème." msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "Merci de remplir le formulaire ci-dessous avec les détails du problème, et de décrir l'emplacement aussi précisément que possible dans les détails." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:251 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Merci d'indiquer si vous souhaitez recevoir un autre questionnaire" @@ -2234,16 +2221,16 @@ msgstr "Merci de noter que votre rapport n'a <strong>pas</strong> été envoyé. msgid "Please note:" msgstr "Quelques remarques :" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:246 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:254 msgid "Please provide some explanation as to why you're reopening this report" msgstr "Merci d'expliquer pourquoi vous ré-ouvrez ce rapport" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:261 msgid "Please provide some text as well as a photo" msgstr "Merci de fournir du texte ainsi qu'une photo." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:247 msgid "Please say whether you've ever reported a problem to your council before" msgstr "Merci de nous dire si vous avez signalé un problème à une administration auparavant." @@ -2255,7 +2242,7 @@ msgstr "Merci de sélectionner le type de flux que vous voulez" msgid "Please select the type of alert you want" msgstr "Merci de sélectionner le type d'alerte que vous voulez" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please state whether or not the problem has been fixed" msgstr "Merci de préciser si le problème a été réglé ou non." @@ -2263,15 +2250,13 @@ msgstr "Merci de préciser si le problème a été réglé ou non." msgid "Please take a look at the updates that have been left." msgstr "Merci de consulter les mises à jour qui ont été laissées." -#: perllib/FixMyStreet/App/Controller/Photo.pm:176 +#: perllib/FixMyStreet/App/Controller/Photo.pm:177 +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 +#: perllib/FixMyStreet/App/Controller/Photo.pm:189 msgid "Please upload a JPEG image only" msgstr "Merci de charger uniquement des images JPEG" -#: perllib/FixMyStreet/App/Controller/Photo.pm:183 -msgid "Please upload a JPEG image only\n" -msgstr "Merci de ne charger que des images JPEG\n" - -#: perllib/FixMyStreet/App/Controller/Contact.pm:109 +#: perllib/FixMyStreet/App/Controller/Contact.pm:114 msgid "Please write a message" msgstr "Merci de saisir un message" @@ -2310,14 +2295,14 @@ msgstr "Précédent" msgid "Privacy" msgstr "Confidentialité" -#: templates/web/base/admin/body.html:194 -#: templates/web/base/admin/body.html:77 -#: templates/web/base/admin/category_edit.html:40 -#: templates/web/base/admin/report_edit.html:79 +#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:85 +#: templates/web/base/admin/category_edit.html:45 +#: templates/web/base/admin/report_edit.html:95 msgid "Private" msgstr "Privé" -#: templates/web/base/maps/openlayers.html:86 +#: templates/web/base/maps/openlayers.html:89 msgid "Problem" msgstr "Problème" @@ -2338,7 +2323,7 @@ msgstr "Problème %d signalé à l’administration %s" msgid "Problem breakdown by state" msgstr "Répartition des problèmes par état" -#: perllib/FixMyStreet/App/Controller/Admin.pm:968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:966 msgid "Problem marked as open." msgstr "Problème signalé comme ouvert." @@ -2373,16 +2358,15 @@ msgstr "Problèmes récemment signalés sur FixMyStreet.fr" msgid "Problems within %.1fkm of this location" msgstr "Problèmes à moins de %.1fkm de ce lieu" -#: perllib/FixMyStreet/Cobrand/Default.pm:629 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:114 +#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:151 -#: perllib/FixMyStreet/Cobrand/UK.pm:217 +#: perllib/FixMyStreet/Cobrand/UK.pm:207 msgid "Problems within %s" msgstr "Problèmes à l'intérieur de %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:122 -#: perllib/FixMyStreet/Cobrand/UK.pm:231 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "Problems within %s ward" msgstr "Problèmes dans la localité %s" @@ -2400,7 +2384,7 @@ msgstr "Problèmes à l'intérieur des limites de :" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "Propriétés récemments rapportés à remettrent en visibilité sur reportemptyhomes.com" -#: templates/web/base/admin/report_edit.html:32 +#: templates/web/base/admin/report_edit.html:45 msgid "Property address:" msgstr "Adresse de propriété:" @@ -2417,7 +2401,7 @@ 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 "Fournir un nom et un mot de passe est optionnel, mais cela vous permettra de soumettre des problèmes, faire des mises à jour et gérer les rapports plus facilement." -#: templates/web/base/report/new/fill_in_details_form.html:174 +#: templates/web/base/report/new/fill_in_details_form.html:155 #: templates/web/base/report/update-form.html:128 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 #: templates/web/fixmystreet/report/update-form.html:119 @@ -2438,7 +2422,7 @@ msgstr "Publier une photo" msgid "Publish the response" msgstr "Publier la réponse" -#: templates/web/base/questionnaire/completed.html:2 +#: templates/web/base/questionnaire/completed.html:1 #: templates/web/base/questionnaire/index.html:0 #: templates/web/base/questionnaire/index.html:14 #: templates/web/base/questionnaire/index.html:4 @@ -2457,11 +2441,12 @@ msgstr "Questionnaire %d rempli pour le problème %d, %s à %s" msgid "Questionnaire %d sent for problem %d" msgstr "Questionnaire %d envoyé pour le problème %s" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 msgid "Questionnaire filled in by problem reporter" msgstr "Questionnaire rempli par le requérant" #: templates/web/base/alert/_list.html:21 +#: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display.html:50 #: templates/web/base/reports/_rss.html:1 @@ -2471,11 +2456,11 @@ msgstr "Questionnaire rempli par le requérant" msgid "RSS feed" msgstr "Flux RSS" -#: perllib/FixMyStreet/Cobrand/UK.pm:260 perllib/FixMyStreet/Cobrand/UK.pm:272 +#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 msgid "RSS feed for %s" msgstr "Flux RSS pour %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "RSS feed for %s ward, %s" msgstr "Flux RSS pour la localité %s, %s" @@ -2483,15 +2468,11 @@ msgstr "Flux RSS pour la localité %s, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:167 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:175 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:185 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:193 -#: perllib/FixMyStreet/Cobrand/UK.pm:286 perllib/FixMyStreet/Cobrand/UK.pm:298 +#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 msgid "RSS feed of %s" msgstr "Flux RSS de %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 msgid "RSS feed of %s, within %s ward" msgstr "Flux RSS de %s, dans la localité %s" @@ -2504,20 +2485,19 @@ msgstr "Flux RSS de problèmes à proximité" msgid "RSS feed of problems in this %s" msgstr "Flux RSS des problèmes à l'intérieur de cette %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:630 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:115 +#: perllib/FixMyStreet/Cobrand/Default.pm:651 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:150 -#: perllib/FixMyStreet/Cobrand/UK.pm:224 +#: perllib/FixMyStreet/Cobrand/UK.pm:214 msgid "RSS feed of problems within %s" msgstr "Flux RSS des problèmes à l'intérieur de %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 -#: perllib/FixMyStreet/Cobrand/UK.pm:230 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s ward" msgstr "Flux RSS de problèmes à l'intérieur de la localité %s" -#: templates/web/base/around/display_location.html:3 +#: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:4 msgid "RSS feed of recent local problems" msgstr "Flux RSS des problèmes locaux récents" @@ -2557,15 +2537,18 @@ msgstr "Rappelez-vous que FixMyStreet est principalement destiné au signalement msgid "Remove flag" msgstr "Effacer le signalement" -#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/report_edit.html:110 #: templates/web/base/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é !)" -#: templates/web/base/footer.html:7 templates/web/fiksgatami/footer.html:19 -#: templates/web/fiksgatami/nn/footer.html:19 -#: templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 +msgid "Report" +msgstr "" + +#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 #: templates/web/zurich/footer.html:17 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2575,11 +2558,6 @@ msgstr "Signaler un problème" msgid "Report abuse" msgstr "Signaler un abus" -#: templates/web/base/report_created.html:1 -#: templates/web/base/report_created.html:3 -msgid "Report created" -msgstr "Rapport créé" - #: perllib/FixMyStreet/App/Controller/Rss.pm:295 msgid "Report on %s" msgstr "Signaler sur %s" @@ -2603,7 +2581,7 @@ msgstr "Signalé %s" msgid "Reported %s, to %s" msgstr "Signalé %s, à %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:580 #: templates/web/base/contact/index.html:50 #: templates/web/fixmystreet/contact/index.html:65 msgid "Reported anonymously at %s" @@ -2615,7 +2593,7 @@ msgstr "Signalé anonymement à %s" msgid "Reported before" msgstr "Signalé avant" -#: perllib/FixMyStreet/DB/Result/Problem.pm:598 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 #: templates/web/base/contact/index.html:52 #: templates/web/fixmystreet/contact/index.html:67 msgid "Reported by %s at %s" @@ -2625,31 +2603,36 @@ msgstr "Signalé par %s à %s" msgid "Reported in the %s category" msgstr "Rapporté dans la catégorie %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:571 +#: perllib/FixMyStreet/DB/Result/Problem.pm:576 msgid "Reported in the %s category anonymously at %s" msgstr "Signalé dans la catégorie %s anonymement à %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:598 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:567 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 msgid "Reported via %s anonymously at %s" msgstr "Signalé par %s anonymement à %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:589 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 msgid "Reported via %s by %s at %s" msgstr "Signalé par %s par %s à %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:563 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 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:583 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 msgid "Reported via %s in the %s category by %s at %s" msgstr "Signalé par %s dans la catégorie %s par %s" -#: templates/web/base/around/around_index.html:2 +#: templates/web/base/reports/index.html:21 +#, fuzzy +msgid "Reported within the last four weeks" +msgstr "Rapporté dans la catégorie %s" + +#: templates/web/base/around/around_index.html:1 #: templates/web/base/around/around_index.html:3 #: templates/web/base/js/translation_strings.html:41 #: templates/web/base/report/new/fill_in_details.html:0 @@ -2659,14 +2642,13 @@ msgstr "Signalé par %s dans la catégorie %s par %s" msgid "Reporting a problem" msgstr "Signalisation d'un problème" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:294 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "Rapports" -#: perllib/FixMyStreet/DB/Result/Problem.pm:409 -#: perllib/FixMyStreet/DB/Result/Problem.pm:413 +#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "Les rapports sont limités à %s caractères de long. Merci de raccourcir votre texte" @@ -2682,7 +2664,7 @@ msgstr "Rapports sur et autour de la carte" msgid "Reports published" msgstr "Rapports publiés" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:85 msgid "Resend report" msgstr "Renvoyer le rapport" @@ -2690,36 +2672,35 @@ msgstr "Renvoyer le rapport" msgid "Right place?" msgstr "Lieu correct?" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:193 -#: perllib/FixMyStreet/Geocode/OSM.pm:171 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:167 +#: perllib/FixMyStreet/Geocode/OSM.pm:152 msgid "Road operator for this named road (derived from road reference number and type): %s" msgstr "L'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:190 -#: perllib/FixMyStreet/Geocode/OSM.pm:168 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:164 +#: perllib/FixMyStreet/Geocode/OSM.pm:149 msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "L'opérateur pour cette route (selon OpenStreetMAp): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1394 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 -#: templates/web/base/admin/report_edit.html:90 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1403 +#: templates/web/base/admin/report_edit.html:106 #: templates/web/zurich/admin/report_edit.html:73 msgid "Rotate Left" msgstr "Pivoter à gauche" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1394 -#: templates/web/base/admin/report_edit.html:91 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: templates/web/base/admin/report_edit.html:107 #: templates/web/zurich/admin/report_edit.html:74 msgid "Rotate Right" msgstr "Pivoter à droite" #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:200 -#: templates/web/base/admin/category_edit.html:76 +#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/category_edit.html:81 #: templates/web/zurich/admin/body.html:59 msgid "Save changes" msgstr "Enregistrer les modifications" @@ -2747,7 +2728,7 @@ msgstr "Rechercher :" msgid "Searching found no reports." msgstr "Aucun rapport trouvé lors de la recherche." -#: templates/web/base/admin/users.html:39 +#: templates/web/base/admin/users.html:41 msgid "Searching found no users." msgstr "Aucun utilisateur trouvé lors de la recherche." @@ -2770,15 +2751,15 @@ msgstr "Sélectionnez une zone" 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:680 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "Sent to %s %s later" msgstr "Envoyé à %s %s plus tard)" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:84 msgid "Sent:" msgstr "Envoyé :" -#: templates/web/base/admin/report_edit.html:73 +#: templates/web/base/admin/report_edit.html:89 #: templates/web/zurich/admin/stats.html:45 msgid "Service:" msgstr "Service:" @@ -2787,7 +2768,7 @@ msgstr "Service:" msgid "Share" msgstr "Partagez" -#: templates/web/base/report/new/fill_in_details_form.html:211 +#: templates/web/base/report/new/fill_in_details_form.html:192 #: templates/web/base/report/update-form.html:157 #: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 @@ -2832,12 +2813,12 @@ msgstr "Déconnexion" msgid "Signed in as %s" msgstr "Connecté en tant que %s" -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 msgid "Some categories may require additional information." msgstr "Certaines catégories peuvent exiger des renseignements supplémentaires." -#: templates/web/base/admin/body-form.html:145 -#: templates/web/base/admin/body-form.html:146 +#: templates/web/base/admin/body-form.html:149 +#: templates/web/base/admin/body-form.html:150 msgid "" "Some endpoints require an <strong>API key</strong> to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -2850,11 +2831,11 @@ msgid "Some photos of recent reports" msgstr "Photos de rapports récents" #: perllib/FixMyStreet/App/View/Email.pm:32 -#: perllib/FixMyStreet/App/View/Web.pm:44 +#: perllib/FixMyStreet/App/View/Web.pm:43 msgid "Some text to localize" msgstr "Du texte pour localiser" -#: perllib/FixMyStreet/Cobrand/UK.pm:88 +#: perllib/FixMyStreet/Cobrand/UK.pm:78 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "Désolé, ceci semble être un code postal d'une dépendance de la Couronne, que nous ne couvrons pas." @@ -2862,17 +2843,16 @@ msgstr "Désolé, ceci semble être un code postal d'une dépendance de la Couro msgid "Sorry, there has been an error confirming your problem." msgstr "Désolé, il n'y a eu une erreur lors de la confirmation de votre problème." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:215 -#: perllib/FixMyStreet/Geocode.pm:26 perllib/FixMyStreet/Geocode/Bing.pm:56 -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:73 -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:93 -#: perllib/FixMyStreet/Geocode/Google.pm:72 -#: perllib/FixMyStreet/Geocode/OSM.pm:64 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:214 +#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 +#: perllib/FixMyStreet/Geocode/Google.pm:47 +#: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "Désolé, nous n'avons pas pu trouver cet emplacement." -#: perllib/FixMyStreet/Geocode/Bing.pm:51 -#: perllib/FixMyStreet/Geocode/Google.pm:67 +#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: perllib/FixMyStreet/Geocode/Google.pm:44 #: perllib/FixMyStreet/Geocode/Zurich.pm:87 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." @@ -2881,7 +2861,7 @@ msgstr "Désolé, nous n'avons pas pu trouver cet emplacement. Merci de réessay msgid "Start Date:" msgstr "Date de début:" -#: templates/web/base/admin/body.html:61 +#: templates/web/base/admin/body.html:69 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 @@ -2889,7 +2869,7 @@ msgstr "Date de début:" msgid "State" msgstr "État actuel" -#: templates/web/base/admin/report_edit.html:34 +#: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 #: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:53 @@ -2898,8 +2878,8 @@ msgstr "État actuel" msgid "State:" msgstr "État actuel :" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1200 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:304 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:308 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" @@ -2915,7 +2895,7 @@ msgstr "Statut" msgid "Still open, via questionnaire, %s" msgstr "Encore ouvert, via le questionnaire, %s" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:381 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 msgid "Subcategory: %s" msgstr "Sous-catégorie: %s" @@ -2935,19 +2915,19 @@ msgid "Subject:" msgstr "Sujet :" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:115 -#: templates/web/base/report/new/fill_in_details_form.html:155 -#: templates/web/base/report/new/fill_in_details_form.html:177 +#: templates/web/base/report/new/fill_in_details_form.html:136 +#: templates/web/base/report/new/fill_in_details_form.html:158 +#: templates/web/base/report/new/fill_in_details_form.html:96 #: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 -#: templates/web/zurich/report/new/fill_in_details_form.html:108 +#: templates/web/zurich/report/new/fill_in_details_form.html:91 msgid "Submit" msgstr "Envoyer" -#: templates/web/base/admin/report_edit.html:97 +#: templates/web/base/admin/report_edit.html:113 #: templates/web/base/admin/update_edit.html:65 -#: templates/web/base/admin/user-form.html:55 +#: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:64 #: templates/web/zurich/admin/report_edit.html:221 #: templates/web/zurich/admin/update_edit.html:38 @@ -2959,8 +2939,8 @@ msgstr "Envoyer les modifications" msgid "Submit questionnaire" msgstr "Envoi du questionnaire" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:133 -#: templates/web/zurich/admin/header.html:2 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:134 +#: 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 @@ -2984,8 +2964,8 @@ msgstr "S'abonner" msgid "Subscribe me to an email alert" msgstr "Abonnez moi à une alerte par email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1191 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:293 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 #: templates/web/zurich/admin/index-dm.html:1 @@ -3001,7 +2981,7 @@ msgstr "Résumé" msgid "Summary reports" msgstr "Rapports résumés" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 msgid "Survey" msgstr "Enquête" @@ -3015,7 +2995,7 @@ msgstr "Résultats de l'enquête" msgid "Text" msgstr "Texte" -#: templates/web/base/admin/body.html:21 +#: templates/web/base/admin/body.html:28 msgid "Text only version" msgstr "Version texte seulement" @@ -3024,49 +3004,55 @@ msgstr "Version texte seulement" msgid "Text:" msgstr "Texte :" -#: templates/web/base/tokens/confirm_update.html:9 -msgid "Thank you — you can <a href=\"%s\">view your updated problem</a> on the site." -msgstr "Merci — vous pouvez <a href=\"%s\">voir votre problème mis à jour</a> sur le site." - -#: templates/web/base/tokens/confirm_problem.html:18 -msgid "Thank you for reporting this issue" -msgstr "Merci d'avoir signalé ce problème" +#: templates/web/base/tokens/confirm_problem.html:12 +msgid "Thank you for reporting this issue!" +msgstr "" #: templates/web/base/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 "Merci d'essayer de confirmer votre mise à jour ou un problème. Nous semblons rencontrer une erreur de notre côté ; s'il vous plaît, <a href=\"%s\"> dites-nous nous ce qui s'est passé</ a> et nous nous pencherons sur la question." +msgstr "Merci d'essayer de confirmer votre mise à jour ou un problème. Nous semblons rencontrer une erreur de notre côté ; 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/base/tokens/confirm_update.html:15 +msgid "Thank you for updating this issue!" +msgstr "" + +#: templates/web/base/contact/submit.html:6 +#: templates/web/base/questionnaire/completed.html:5 +msgid "Thank you for your feedback" +msgstr "" #: templates/web/fixmystreet/around/around_index.html:28 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 :" msgstr "Merci d'avoir chargé votre photo. Nous avons besoin maintenant de localiser le problème, saisissez l'adresse et le code postal dans le champ ci-dessus :" -#: templates/web/base/contact/submit.html:8 -msgid "Thanks for your feedback. We'll get back to you as soon as we can!" -msgstr "Merci pour vos commentaires. Nous reviendrons vers vous dès que nous le pourrons !" - #: templates/web/base/questionnaire/creator_fixed.html:9 msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "Merci, heureux d'apprendre que cela a été résolu ! Pourrions-nous juste vous demander si vous aviez déjà signalé un problème à une administration auparavant ?" -#: perllib/FixMyStreet/App/Controller/Photo.pm:190 +#: perllib/FixMyStreet/App/Controller/Photo.pm:195 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Cette image ne semble pas avoir été chargée correctement (% s), réessayez s'il vous plaît." -#: perllib/FixMyStreet/App/Controller/Council.pm:100 +#: perllib/FixMyStreet/App/Controller/Council.pm:97 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "Ce lieu ne semble pas être couvert par une administration; peut-être est elle en dehors de la zone couverte. Merci de le saisir à nouveau." -#: perllib/FixMyStreet/App/Controller/Location.pm:124 +#: perllib/FixMyStreet/App/Controller/Location.pm:126 msgid "That location does not appear to be in the UK; please try again." msgstr "Ce lieu ne semble pas ce trouver au Royaume-Uni; Merci de le saisir à nouveau." #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:81 +#: perllib/FixMyStreet/Cobrand/UK.pm:71 msgid "That postcode was not recognised, sorry." msgstr "Ce code postal n'a pas été reconnu, désolé." -#: perllib/FixMyStreet/App/Controller/Admin.pm:713 +#: perllib/FixMyStreet/App/Controller/Admin.pm:712 +#, fuzzy +msgid "That problem has been marked as sent." +msgstr "Ce problème va maintenant être renvoyé." + +#: perllib/FixMyStreet/App/Controller/Admin.pm:704 msgid "That problem will now be resent." msgstr "Ce problème va maintenant être renvoyé." @@ -3078,7 +3064,7 @@ msgstr "Ce rapport ne peut pas être vu sur %s." msgid "That report has been removed from FixMyStreet." msgstr "Ce rapport a été retiré de FixMyStreet.fr." -#: templates/web/base/admin/body.html:136 +#: templates/web/base/admin/body.html:144 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." @@ -3086,8 +3072,8 @@ msgstr "" "Cette <strong>adresse courriel</strong> est le destinataire à qui le rapport sera envoyé pour cette catégorie. \n" "D'autres catégories de cet interlocuteur peuvent avoir la même adresse courriel." -#: templates/web/base/admin/body-form.html:119 -#: templates/web/base/admin/body-form.html:120 +#: templates/web/base/admin/body-form.html:123 +#: templates/web/base/admin/body-form.html:124 msgid "" "The <strong>endpoint</strong> is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." @@ -3095,8 +3081,8 @@ msgstr "" "Le <strong>destinataire</strong> est l'URL du service auquel FixMyStreet se connectera\n" "quand il enverra des rapports à cet interlocuteur." -#: templates/web/base/admin/body-form.html:132 -#: templates/web/base/admin/body-form.html:133 +#: templates/web/base/admin/body-form.html:136 +#: templates/web/base/admin/body-form.html:137 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." @@ -3104,8 +3090,8 @@ msgstr "" "La <strong>juridiction</strong> est seulement nécessaire si le destinataire en gère plus d'une.\n" " Si l'interlocuteur possède son propre destinataire, vous pouvez laisser ce champ vide." -#: templates/web/base/admin/body-form.html:90 -#: templates/web/base/admin/body-form.html:91 +#: templates/web/base/admin/body-form.html:94 +#: templates/web/base/admin/body-form.html:95 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>." @@ -3128,9 +3114,9 @@ msgstr "" #: templates/web/base/auth/token.html:19 templates/web/base/email_sent.html:6 msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." -msgstr "L'email de confirmation <strong>peut</ strong> prendre quelques minutes pour arriver — <em>merci</em> de patienter." +msgstr "L'email de confirmation <strong>peut</strong> prendre quelques minutes pour arriver — <em>merci</em> de patienter." -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:3 msgid "The council won’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 "L'administration ne pourra intervenir que si vous laissez autant de détails que possible. Décrivez la localisation exacte du problème, ce que c'est, depuis combien de temps il est présent, une description (et une photo du problème si vous en possédez une), etc. " @@ -3157,8 +3143,8 @@ 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:185 -#: perllib/FixMyStreet/Geocode/OSM.pm:163 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:159 +#: perllib/FixMyStreet/Geocode/OSM.pm:144 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap." msgstr "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." @@ -3216,7 +3202,7 @@ msgstr "La liste des zones disponibles est donnée par le service Mapit de %s. " msgid "The passwords do not match" msgstr "Les mots de passe ne correspondent pas" -#: templates/web/base/errors/page_error_404_not_found.html:11 +#: templates/web/base/errors/page_error_404_not_found.html:10 #: templates/web/base/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" @@ -3233,7 +3219,7 @@ msgstr "La plus simple de nos alertes est la géographique :" msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "Le résumé et la description seront également rendus publics (voir notre <a href=\"/privacy\"> politique de confidentialité </a>)." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:295 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:300 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é" @@ -3246,16 +3232,20 @@ msgstr "" "Le <strong>nom</strong> des utilisateurs est affiché publiquement sur les rapports qui n'ont pas été signalés comme <em>anonymes</em>.\n" "Les noms sont nécessairement uniques." +#: templates/web/base/reports/_problem-list.html:15 +msgid "There are no reports to show." +msgstr "" + #: perllib/FixMyStreet/App/Controller/Reports.pm:75 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:131 +#: perllib/FixMyStreet/App/Controller/Contact.pm:136 #: perllib/FixMyStreet/App/Controller/Dashboard.pm:59 msgid "There was a problem showing this page. Please try again later." msgstr "Il y a eu un problème pour afficher cette page. Merci de réessayer ultérieurement." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:755 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:762 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 #: templates/web/base/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:25 @@ -3271,7 +3261,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:135 +#: perllib/FixMyStreet/App/Controller/Contact.pm:140 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." @@ -3279,8 +3269,8 @@ msgstr "Il y a un problème avec votre rapport. Voir s'il vous plaît plus bas." msgid "There were problems with your update. Please see below." msgstr "Il y a un problème avec votre mise à jour. Voir s'il vous plaît plus bas." -#: templates/web/base/admin/body-form.html:108 -#: templates/web/base/admin/body-form.html:109 +#: templates/web/base/admin/body-form.html:112 +#: templates/web/base/admin/body-form.html:113 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" @@ -3296,7 +3286,7 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Cette implémentation de l'API est en cours de travaux et n'est pas encore stabilisée. Elle est susceptible de changer sans avertissement préalable à l'avenir." -#: templates/web/base/admin/body.html:36 +#: templates/web/base/admin/body.html:44 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" @@ -3306,7 +3296,7 @@ msgstr "" "Par conséquent, aucune de ses catégories n'apparaitra dans le menu déroulant \"Catégories\" lorsque les utilisateurs rapportent des problèmes.\n" "Pour l'instant, les utilisateurs <strong>ne peuvent rapporter de problèmes à cet interlocuteur</strong>." -#: templates/web/base/admin/body.html:46 +#: templates/web/base/admin/body.html:54 msgid "This body has no contacts. This means that currently problems reported to this body <strong>will not be sent</strong>." msgstr "Cet interlocuteur n'a aucun contact. Donc, les problèmes rapportés actuellement à cet interlocuteur <strong>ne seront pas envoyés</strong>." @@ -3319,18 +3309,18 @@ msgstr "" "Cet intelocuteur recevra seulement des rapports pour des problèmes qui sont situés sur sa <strong>zone couverte</strong>.\n" "Un interlocuteur ne recevra aucun rapport tant qu'il ne couvre aucune zone." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:388 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:394 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:391 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 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:898 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:136 -#: perllib/FixMyStreet/Cobrand/UK.pm:53 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:902 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:972 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/Cobrand/UK.pm:43 msgid "This information is required" msgstr "Ces renseignements sont nécessaires" @@ -3369,8 +3359,8 @@ 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:130 #: perllib/FixMyStreet/Cobrand/Zurich.pm:131 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:132 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Ce rapport attend une modération." @@ -3387,15 +3377,15 @@ msgstr "Ce rapport est actuellement marqué comme résolu." msgid "This report is currently marked as open." msgstr "Ce rapport est actuellement marqué comme ouvert." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:319 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:311 msgid "This report was submitted anonymously" msgstr "Ce rapport a été soumis anonymement" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:293 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:1196 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Chronologie" @@ -3407,13 +3397,13 @@ msgstr "Titre" #: templates/web/base/around/_report_banner.html:2 msgid "To <strong>report a problem</strong>, click on the map at the correct location." -msgstr "Pour <strong>signaler un problème</ strong>, cliquez sur la carte à l'emplacement correct." +msgstr "Pour <strong>signaler un problème</strong>, cliquez sur la carte à l'emplacement correct." #: templates/web/base/alert/index.html:27 msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "Pour afficher les alertes qui vous concernent, saisissez votre code postal ou le nom d'une rue et une localité" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:294 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:299 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" @@ -3429,8 +3419,12 @@ msgstr "Total" msgid "Try again" msgstr "Essayez à nouveau" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:46 +#: templates/web/base/contact/submit.html:14 +msgid "Try emailing us directly:" +msgstr "" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -3438,8 +3432,8 @@ msgstr "Essayez à nouveau" msgid "Unable to fix" msgstr "Ne peut être résolu" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/admin/update_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:45 #: templates/web/zurich/admin/report_edit.html:58 @@ -3481,7 +3475,7 @@ msgstr "Mise à jour ci-dessous ajoutée anonymement à %s" msgid "Update below added by %s at %s" msgstr "Mise à jour ci-dessous ajoutée par %s à %s" -#: templates/web/base/admin/body-form.html:233 +#: templates/web/base/admin/body-form.html:240 #: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "Interlocuteur pour la mise à jour " @@ -3507,7 +3501,7 @@ msgstr "Une mise à jour a marqué ce problème comme résolu" msgid "Update reopened problem" msgstr "Mettre a jour le problème réouvert" -#: templates/web/base/admin/body.html:93 +#: templates/web/base/admin/body.html:101 msgid "Update statuses" msgstr "Mettre à jour les statuts" @@ -3521,12 +3515,12 @@ msgstr "Mise à jour :" msgid "Updated" msgstr "Mis à jour" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1016 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1060 -#: perllib/FixMyStreet/App/Controller/Admin.pm:810 -#: perllib/FixMyStreet/App/Controller/Admin.pm:958 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:549 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:618 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1014 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:808 +#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:556 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:625 msgid "Updated!" msgstr "Mis à jour !" @@ -3538,7 +3532,7 @@ msgstr "Mis à jour !" msgid "Updates" msgstr "Mises à jour" -#: perllib/FixMyStreet/DB/Result/Comment.pm:139 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "Les mises à jour sont limitées à %s caractères de long. Merci de raccourcir votre texte" @@ -3553,7 +3547,7 @@ msgstr "Mises à jour sur {{title}}" msgid "Updates to this problem, FixMyStreet" msgstr "Mises à jour pour ce problème, FixMyStreet.fr" -#: templates/web/base/admin/body.html:174 +#: templates/web/base/admin/body.html:182 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 "Utiliser la <strong>note</strong> pour enregistrer des détails qui sont seulement affichée aux administrateurs. Les notes ne sont pas affichées publiquement, et ne sont pas envoyés à l'interlocuteur." @@ -3562,11 +3556,11 @@ msgstr "Utiliser la <strong>note</strong> pour enregistrer des détails qui sont msgid "User" msgstr "Utilisateur" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1357 msgid "User flag removed" msgstr "Utilisateur dé–signalé" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1331 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1329 msgid "User flagged" msgstr "Utilisateur signalé" @@ -3574,16 +3568,16 @@ msgstr "Utilisateur signalé" msgid "User search finds matches in users' names and email addresses." msgstr "La recherche utilisateurs parcourt les noms et adresses courriel." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:303 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:307 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Utilisateurs" -#: perllib/FixMyStreet/App/Controller/Admin.pm:380 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:430 +#: perllib/FixMyStreet/App/Controller/Admin.pm:374 +#: perllib/FixMyStreet/App/Controller/Admin.pm:404 +#: perllib/FixMyStreet/App/Controller/Admin.pm:421 msgid "Values updated" msgstr "Valeurs mises à jour" @@ -3637,11 +3631,11 @@ msgstr "Nous n’affichons jamais votre email" msgid "We never show your email address or phone number." msgstr "Nous n’affichons jamais votre email ou numéro de téléphone." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:403 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." -#: templates/web/base/index-steps.html:38 +#: templates/web/base/index-steps.html:31 msgid "We send it to the council on your behalf" msgstr "Nous l'envoyons à l'administration en votre nom" @@ -3650,15 +3644,23 @@ msgstr "Nous l'envoyons à l'administration en votre nom" msgid "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>" msgstr "Nous utiliserons vos informations personnelles en accord avec notre <a href=\"/privacy\">politique de confidentialité.</a>" +#: templates/web/base/questionnaire/completed-open.html:2 +msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" +msgstr "" + #: templates/web/base/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 "Nous aimerions beaucoup savoir ce que vous pensez de ce site. Il suffit de remplir ce formulaire, ou envoyez un email à <a href='mailto:%s'>%s</a>:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:41 +#: templates/web/base/contact/submit.html:7 +msgid "We’ll get back to you as soon as we can." +msgstr "" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 msgid "What’s the issue, and where is it?" msgstr "Quel est le problème, et où est-il?" -#: templates/web/base/admin/category_edit.html:82 +#: templates/web/base/admin/category_edit.html:87 #: templates/web/zurich/admin/body.html:18 msgid "When edited" msgstr "Édité le" @@ -3667,15 +3669,18 @@ msgstr "Édité le" msgid "When sent" msgstr "Envoyé le" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Whole block of empty flats" msgstr "Tout le bloc d'appartements vides" +#: templates/web/base/tokens/confirm_alert.html:7 +msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." +msgstr "" + #: templates/web/base/open311/index.html:92 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>." +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/fiksgatami/front/footer-marketing.html:15 #: templates/web/fixmystreet/front/footer-marketing.html:17 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "Aimeriez-vous contribuer à FixMyStreet? Notre code est open source et <a href=\"http://fixmystreetf.org\"> disponible sur fixmystreet.org </a>" @@ -3699,18 +3704,18 @@ msgid "Year" msgstr "Année" #: templates/web/base/admin/bodies.html:66 -#: templates/web/base/admin/body.html:72 templates/web/base/admin/body.html:74 -#: templates/web/base/admin/body.html:78 templates/web/base/admin/body.html:80 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:76 +#: templates/web/base/admin/report_edit.html:93 #: templates/web/base/admin/update_edit.html:24 -#: templates/web/base/admin/users.html:29 +#: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:42 #: templates/web/base/questionnaire/index.html:81 @@ -3739,14 +3744,12 @@ msgstr "Vous signalez le rapport de problème suivant comme étant violent, cont 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 similaires :" -#: templates/web/base/tokens/confirm_problem.html:25 -#: templates/web/base/tokens/confirm_problem.html:26 -#: templates/web/zurich/tokens/confirm_problem.html:6 +#: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:8 msgid "You can <a href=\"%s%s\">view the problem on this site</a>." msgstr "Vous pouvez <a href=\"%s%s\">consulter le problème sur ce site</a>." -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:48 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "Vous pouvez ajouter un courriel d'utilisateur abusif dans la liste des abus, qui cache automatiquement (et n'envoie jamais) les rapports qu'ils crèent." @@ -3764,14 +3767,14 @@ msgstr "" "Par exemple, ce la peut être utile si vous voulez garder un œil sur un utilisateur qui a envoyé des rapports inappropriés \n" "par le passé." -#: templates/web/base/report/new/councils_text_none.html:19 -#: templates/web/base/report/new/councils_text_none.html:20 -#: templates/web/base/report/new/councils_text_some.html:20 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 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>." -#: templates/web/base/admin/body-form.html:81 +#: templates/web/base/admin/body-form.html:85 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "Vous pouvez marqué un interlocuteur comme supprimé si vous ne voulez pas qu'il soit actif sur le site." @@ -3784,10 +3787,10 @@ msgid "You have already answered this questionnaire. If you have a question, ple msgstr "Vous avez déjà répondu à ce questionnaire. Si vous avez une question, <a href='%s'>entrez en contact avec nous</a>, ou <a href='%s'>affichez votre problème</a>.\n" #: templates/web/base/questionnaire/index.html:68 -#: templates/web/base/report/new/fill_in_details_form.html:94 +#: templates/web/base/report/new/fill_in_details_form.html:75 #: templates/web/fixmystreet/questionnaire/index.html:88 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:79 -#: templates/web/zurich/report/new/fill_in_details_form.html:75 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 +#: templates/web/zurich/report/new/fill_in_details_form.html:58 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." @@ -3796,7 +3799,7 @@ msgstr "Vous avez déjà joint une photo à ce rapport, en joindre un autre la r 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/base/auth/sign_out.html:3 +#: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" msgstr "Vous avez été déconnecté" @@ -3805,26 +3808,11 @@ msgstr "Vous avez été déconnecté" 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 "Vous avez localisé le problème au point marqué avec une épingle verte sur la carte. Si ce n'est pas le bon endroit, il suffit de cliquer à nouveau sur la carte." -#: templates/web/base/tokens/confirm_alert.html:8 -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 "Votre adresse courriel a bien été confirmée." -#: templates/web/base/tokens/confirm_update.html:14 -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>." - -#: templates/web/base/tokens/confirm_alert.html:12 -msgid "You have successfully created your alert." -msgstr "Vous avez réussi à créer votre alerte." - -#: templates/web/base/tokens/confirm_alert.html:10 -msgid "You have successfully deleted your alert." -msgstr "Vous avez réussi à effacer votre alerte." - #: templates/web/base/report/display.html:20 #: templates/web/base/report/new/fill_in_details.html:37 #: templates/web/fixmystreet/report/display.html:17 @@ -3850,7 +3838,7 @@ msgid "" " contacts (such as an email address) to which reports are sent." msgstr "Vous devez ajouter des interlocuteurs (comme des municipalités ou des services) avant de pouvoir ajouter les catégories de problèmes qu'il peuvent gérer (ex. trous dans la chaussée ou éclairage) et ajouter les contacts (ex. adresse courriel) à qui les rapports sont envoyés. " -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:85 msgid "You really want to resend?" msgstr "Vous voulez vraiment renvoyer?" @@ -3870,7 +3858,7 @@ msgstr "Vos rapports" #: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 #: templates/web/fixmystreet/report/update-form.html:76 -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:71 msgid "Your email" msgstr "Votre email" @@ -3886,7 +3874,7 @@ msgid "Your email address:" msgstr "Votre adresse mail:" #: templates/web/base/alert/_list.html:92 -#: templates/web/base/report/new/fill_in_details_form.html:125 +#: templates/web/base/report/new/fill_in_details_form.html:106 #: templates/web/base/report/update-form.html:81 msgid "Your email:" msgstr "Votre email:" @@ -3901,13 +3889,13 @@ msgstr "Votre information sera utilisée seulement en accord avec notre <a href= #: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 #: templates/web/fixmystreet/report/update-form.html:142 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:98 +#: templates/web/zurich/report/new/fill_in_details_form.html:81 msgid "Your name" msgstr "Votre nom" #: templates/web/base/auth/general.html:59 #: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:204 +#: templates/web/base/report/new/fill_in_details_form.html:185 #: templates/web/base/report/update-form.html:151 msgid "Your name:" msgstr "Votre nom :" @@ -3925,33 +3913,19 @@ msgstr "Votre mot de passe a été changé" #: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 -#: templates/web/zurich/report/new/fill_in_details_form.html:104 +#: templates/web/zurich/report/new/fill_in_details_form.html:87 msgid "Your phone number" msgstr "Votre numéro de téléphone" -#: templates/web/base/tokens/confirm_problem.html:4 -msgid "Your problem has been confirmed!" -msgstr "Votre problème a été confirmé!" - #: templates/web/fixmystreet/questionnaire/index.html:16 msgid "Your report" msgstr "Votre rapport" -#: templates/web/base/report_created.html:6 -msgid "Your report has been created and will shortly be sent." -msgstr "Votre rapport a été créé et sera envoyer très prochainement." - -#: templates/web/base/footer.html:9 templates/web/fiksgatami/footer.html:21 -#: templates/web/fiksgatami/nn/footer.html:21 -#: templates/web/fixmystreet/footer.html:24 +#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:24 msgid "Your reports" msgstr "Vos rapports" -#: templates/web/base/tokens/confirm_update.html:4 -msgid "Your update has been confirmed!" -msgstr "Votre mise à jour a été confirmée!" - -#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:59 +#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:41 msgid "Your updates" msgstr "Vos mises à jour" @@ -3968,11 +3942,7 @@ msgstr "par %s" msgid "council" msgstr "administration" -#: perllib/FixMyStreet/DB/Result/Problem.pm:665 -msgid "council ref: %s" -msgstr "Ref. de la mairie : %s" - -#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:32 #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:54 msgid "didn't use map" @@ -3983,6 +3953,7 @@ msgstr "n'a pas utilisé le plan" msgid "e.g. ‘%s’ or ‘%s’" msgstr "Par exemple '%s' ou '%s'" +#: templates/web/base/admin/body-form.html:188 #: templates/web/base/admin/flagged.html:51 msgid "edit user" msgstr "saisissez l'utilisateur" @@ -3997,7 +3968,7 @@ msgstr "de %d utilisateurs différents" msgid "last updated %s" msgstr "dernière mise à jour %s" -#: perllib/Utils.pm:263 +#: perllib/Utils.pm:235 msgid "less than a minute" msgstr "moins d'une minute" @@ -4057,22 +4028,22 @@ msgstr " ou " msgid "or locate me automatically" msgstr "Clickez ici pour vous localiser automatiquement" -#: templates/web/base/admin/report_edit.html:25 -#: templates/web/base/admin/report_edit.html:26 -#: templates/web/zurich/admin/report_edit-sdm.html:28 +#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:30 +#: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit-sdm.html:29 -#: templates/web/zurich/admin/report_edit-sdm.html:37 +#: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:38 -#: templates/web/zurich/admin/report_edit.html:28 +#: templates/web/zurich/admin/report_edit.html:27 #: templates/web/zurich/admin/report_edit.html:29 -#: templates/web/zurich/admin/report_edit.html:39 +#: templates/web/zurich/admin/report_edit.html:38 #: templates/web/zurich/admin/report_edit.html:40 -#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit.html:50 #: templates/web/zurich/admin/report_edit.html:52 msgid "originally entered: “%s”" msgstr "saisi initialement: “%s”" -#: templates/web/base/admin/report_edit.html:30 +#: templates/web/base/admin/report_edit.html:43 msgid "other areas:" msgstr "autres lieux:" @@ -4081,13 +4052,12 @@ msgstr "autres lieux:" msgid "reopened" msgstr "réouvert" -#: templates/web/fiksgatami/header.html:49 -#: templates/web/fixmystreet/header.html:53 +#: templates/web/fixmystreet/header.html:59 #: templates/web/zurich/footer.html:12 msgid "sign out" msgstr "déconnexion" -#: templates/web/base/report/new/fill_in_details_form.html:13 +#: templates/web/base/report/new/fill_in_details_form.html:12 #: templates/web/base/report/new/fill_in_details_form.html:15 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 @@ -4099,15 +4069,15 @@ msgstr "L'administration locale" msgid "there is no pin shown as the user did not use the map" msgstr "Il n'y a aucune épingle affichée parce que l'utilisateur n'a pas utilisé la carte" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:373 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:379 msgid "this type of local problem" msgstr "Ce type de problème local" -#: perllib/Utils.pm:235 +#: perllib/Utils.pm:207 msgid "today" msgstr "aujourd'hui" -#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:32 #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:54 msgid "used map" @@ -4133,7 +4103,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:254 #, perl-format msgid "%d hour" msgid_plural "%d hours" @@ -4147,7 +4117,7 @@ msgid_plural "%d supporters" msgstr[0] "%d supporter" msgstr[1] "%d supporters" -#: perllib/Utils.pm:284 +#: perllib/Utils.pm:256 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -4168,7 +4138,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:250 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -4189,7 +4159,7 @@ 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é" -#: perllib/Utils.pm:280 +#: perllib/Utils.pm:252 #, perl-format msgid "%d day" msgid_plural "%d days" @@ -4203,8 +4173,5 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils 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." -#~ msgid "Configuration updated - contacts will be generated automatically later" -#~ msgstr "Configuration mise à jour - les contacts seront génerés automatiquement par la suite" - -#~ 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." +#~ msgid "For council(s):" +#~ msgstr "Pour la ou les administration(s) :" diff --git a/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po index 0bee7796a..c1607570b 100644 --- a/locale/he_IL.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/he_IL.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: 2015-01-20 16:59+0000\n" -"PO-Revision-Date: 2014-11-19 18:31+0000\n" +"POT-Creation-Date: 2015-07-31 14:28+0100\n" +"PO-Revision-Date: 2015-07-10 13:29+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Hebrew (Israel) (http://www.transifex.com/projects/p/fixmystreet/language/he_IL/)\n" "Language: he_IL\n" @@ -19,17 +19,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:618 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:386 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:392 msgid " and " msgstr "" -#: templates/web/base/report/new/councils_text_all.html:12 -#: templates/web/base/report/new/councils_text_all.html:19 -#: templates/web/base/report/new/councils_text_all.html:5 -#: templates/web/base/report/new/councils_text_none.html:19 -#: templates/web/base/report/new/councils_text_none.html:21 -#: templates/web/base/report/new/councils_text_some.html:20 +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_none.html:11 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " @@ -65,22 +63,26 @@ msgstr "" msgid "%s - Summary reports" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:672 msgid "%s ref: %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:265 perllib/FixMyStreet/Cobrand/UK.pm:277 +#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:554 +#: perllib/FixMyStreet/DB/Result/Problem.pm:559 msgid "%s, reported at %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:304 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "%s, within %s ward" msgstr "" +#: perllib/FixMyStreet/Map/OSM.pm:42 +msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" +msgstr "" + #: templates/web/base/email_sent.html:29 msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" msgstr "" @@ -94,7 +96,7 @@ msgid "(Don't worry — we'll hang on to your update while you're checking y msgstr "" #: templates/web/base/admin/report_blocks.html:11 -#: templates/web/base/admin/users.html:29 +#: templates/web/base/admin/users.html:31 msgid "(Email in abuse table)" msgstr "" @@ -122,7 +124,7 @@ msgstr "" msgid "(fixed)" msgstr "" -#: templates/web/base/index.html:9 +#: templates/web/base/index.html:8 templates/web/base/index.html:9 #: templates/web/fixmystreet/around/intro.html:2 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "" @@ -132,8 +134,8 @@ msgstr "" msgid "(not sent to council)" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:218 -#: templates/web/zurich/report/new/fill_in_details_form.html:94 +#: templates/web/base/report/new/fill_in_details_form.html:199 +#: templates/web/zurich/report/new/fill_in_details_form.html:77 msgid "(optional)" msgstr "" @@ -146,7 +148,7 @@ msgstr "" msgid "(sent to both)" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:212 +#: templates/web/base/report/new/fill_in_details_form.html:193 msgid "(we never show your email address or phone number)" msgstr "" @@ -154,14 +156,13 @@ msgstr "" 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:393 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 -#: perllib/FixMyStreet/DB/Result/Problem.pm:399 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:630 +#: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "" @@ -173,37 +174,7 @@ msgid "" " Maybe add some <code>MAPIT_TYPES</code> to your config file?" msgstr "" -#: templates/web/base/questionnaire/completed.html:20 -msgid "<p style=\"font-size:150%\">Thank you very much for filling in our questionnaire; glad to hear it’s been fixed.</p>" -msgstr "" - -#: templates/web/fiksgatami/questionnaire/completed-open.html:1 -msgid "" -"<p style=\"font-size:150%\">We’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’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/base/questionnaire/completed-open.html:6 -msgid "" -"<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" -"suggestions: why not try writing to your local representatives or, if\n" -"it’s a problem that could be fixed by local people working together, why\n" -"not <a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n" -"</p>" -msgstr "" - -#: templates/web/base/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/base/around/_report_banner.html:4 +#: templates/web/base/around/_report_banner.html:3 #: templates/web/base/around/_report_banner.html:5 msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>" msgstr "" @@ -230,7 +201,7 @@ msgstr "" msgid "<strong>No</strong>, I do not, let me sign in by email:" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:163 +#: templates/web/base/report/new/fill_in_details_form.html:144 msgid "<strong>No</strong>, let me confirm my report by email:" msgstr "" @@ -238,13 +209,8 @@ msgstr "" msgid "<strong>No</strong>, let me confirm my update by email:" msgstr "" -#: templates/web/base/tokens/confirm_problem.html:19 -#: templates/web/base/tokens/confirm_problem.html:20 -msgid "<strong>We will now send it to the council</strong>." -msgstr "" - #: templates/web/base/auth/general.html:37 -#: templates/web/base/report/new/fill_in_details_form.html:141 +#: templates/web/base/report/new/fill_in_details_form.html:122 #: templates/web/base/report/update-form.html:95 #: templates/web/fixmystreet/auth/general.html:37 #: templates/web/fixmystreet/auth/general.html:39 @@ -258,8 +224,8 @@ msgstr "" msgid "About us" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:39 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:52 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:31 #: templates/web/fixmystreet/report/update-form.html:28 @@ -275,26 +241,26 @@ msgid "" " categories of problem) to each body." msgstr "" -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/body.html:56 msgid "Add a contact using the form below." msgstr "" #: templates/web/base/admin/bodies.html:74 -#: templates/web/base/admin/body-form.html:233 +#: templates/web/base/admin/body-form.html:240 #: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "" -#: templates/web/base/admin/body.html:108 +#: templates/web/base/admin/body.html:116 #: templates/web/zurich/admin/body.html:31 msgid "Add new category" msgstr "" -#: templates/web/base/admin/users.html:45 +#: templates/web/base/admin/users.html:47 msgid "Add user" msgstr "" -#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:70 +#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:52 msgid "Added %s" msgstr "" @@ -321,9 +287,7 @@ msgstr "" msgid "All Reports" msgstr "" -#: templates/web/base/footer.html:11 templates/web/fiksgatami/footer.html:23 -#: templates/web/fiksgatami/nn/footer.html:23 -#: templates/web/fixmystreet/footer.html:26 +#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:26 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:19 @@ -340,19 +304,9 @@ msgstr "" msgid "All the information you provide here will be sent to" msgstr "" -#: templates/web/base/report/new/councils_text_all.html:12 -#: templates/web/base/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/base/report/new/councils_text_all.html:5 -#: templates/web/base/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/base/report/new/councils_text_all.html:19 -#: templates/web/base/report/new/councils_text_all.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:13 +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_all.html:4 +#: templates/web/base/report/new/fill_in_details_form.html:12 #: templates/web/base/report/new/fill_in_details_form.html:14 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 @@ -369,7 +323,7 @@ msgstr "" msgid "Anonymous" msgstr "" -#: templates/web/base/admin/report_edit.html:62 +#: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:23 msgid "Anonymous:" msgstr "" @@ -378,18 +332,18 @@ msgstr "" msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?" msgstr "" -#: templates/web/fiksgatami/front/footer-marketing.html:14 #: templates/web/fixmystreet/front/footer-marketing.html:16 msgid "Are you a developer?" msgstr "" #: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 msgid "Area covered" msgstr "" #: templates/web/base/admin/bodies.html:15 -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/body.html:60 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "" @@ -407,7 +361,7 @@ msgstr "" msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:163 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:165 #: templates/web/zurich/report/updates.html:11 msgid "Assigned to %s" msgstr "" @@ -420,7 +374,7 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:348 +#: perllib/FixMyStreet/DB/Result/Problem.pm:373 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "" @@ -433,8 +387,8 @@ msgstr "" msgid "Ban email address" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:297 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:301 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" msgstr "" @@ -445,6 +399,7 @@ msgstr "" msgid "Body" msgstr "" +#: templates/web/base/admin/report_edit.html:34 #: templates/web/base/admin/user-form.html:32 msgid "Body:" msgstr "" @@ -457,16 +412,15 @@ msgstr "" msgid "Can't see the map? <em>Skip this step</em>" msgstr "" -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:55 #: templates/web/base/report/new/category.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:53 +#: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 #: templates/web/zurich/admin/stats.html:50 -#: templates/web/zurich/report/new/fill_in_details_form.html:50 msgid "Category" msgstr "" @@ -474,17 +428,16 @@ msgstr "" msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:138 #: templates/web/base/admin/category_edit.html:23 -#: templates/web/base/admin/report_edit.html:61 -#: templates/web/base/report/new/fill_in_details_form.html:68 +#: templates/web/base/admin/report_edit.html:74 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/report_edit-sdm.html:42 #: templates/web/zurich/admin/report_edit.html:140 msgid "Category:" msgstr "קטגוריה" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:377 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383 msgid "Category: %s" msgstr "קטגוריה: %s" @@ -495,19 +448,19 @@ msgstr "קטגוריה: %s" msgid "Change password" msgstr "החלף ססמא" -#: templates/web/base/admin/body.html:152 +#: templates/web/base/admin/body.html:160 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/base/admin/body.html:163 +#: templates/web/base/admin/body.html:171 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/base/admin/body.html:183 +#: templates/web/base/admin/body.html:191 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -518,7 +471,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:122 +#: templates/web/base/admin/body.html:130 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." @@ -534,16 +487,16 @@ msgstr "" msgid "Click map to report a problem" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:45 -#: templates/web/base/admin/report_edit.html:47 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:58 +#: templates/web/base/admin/report_edit.html:60 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/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:95 #: templates/web/zurich/admin/report_edit.html:97 #: templates/web/zurich/admin/stats.html:31 @@ -551,11 +504,12 @@ msgstr "" msgid "Closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:762 +#: perllib/FixMyStreet/DB/Result/Problem.pm:771 msgid "Closed by council" msgstr "" -#: templates/web/base/my/my.html:40 templates/web/fixmystreet/my/my.html:46 +#: templates/web/base/my/my.html:40 +#: templates/web/fixmystreet/my/_problem-list.html:12 msgid "Closed reports" msgstr "" @@ -563,7 +517,7 @@ msgstr "" msgid "Closed:" msgstr "" -#: templates/web/base/around/tabbed_lists.html:11 +#: templates/web/base/around/tabbed_lists.html:10 #: templates/web/base/around/tabbed_lists.html:12 msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "" @@ -578,26 +532,26 @@ msgstr "" msgid "Cobrand" msgstr "" -#: templates/web/base/admin/report_edit.html:75 +#: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:50 msgid "Cobrand data:" msgstr "" -#: templates/web/base/admin/report_edit.html:74 +#: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:49 msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "תצורה" -#: templates/web/base/admin/category_edit.html:47 +#: templates/web/base/admin/category_edit.html:52 msgid "Configure Endpoint" msgstr "" -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/body.html:72 msgid "Confirm" msgstr "אשר" @@ -618,10 +572,10 @@ msgstr "" msgid "Confirmation" msgstr "אישור" -#: templates/web/base/admin/body.html:158 -#: templates/web/base/admin/body.html:71 -#: templates/web/base/admin/category_edit.html:32 -#: templates/web/base/admin/category_edit.html:84 +#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/category_edit.html:37 +#: templates/web/base/admin/category_edit.html:89 #: templates/web/zurich/admin/stats.html:40 msgid "Confirmed" msgstr "אישר" @@ -632,7 +586,7 @@ msgstr "" #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 -#: templates/web/base/admin/report_edit.html:70 +#: templates/web/base/admin/report_edit.html:83 msgid "Confirmed:" msgstr "אישר:" @@ -649,13 +603,12 @@ msgid "Contact Us" msgstr "צור קשר" #: templates/web/base/contact/index.html:6 -#: templates/web/base/contact/submit.html:3 #: templates/web/fixmystreet/contact/index.html:20 msgid "Contact the team" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1327 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1355 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1325 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1353 msgid "Could not find user" msgstr "" @@ -673,6 +626,10 @@ msgstr "עירייה" msgid "Council contacts for %s" msgstr "" +#: perllib/FixMyStreet/DB/Result/Problem.pm:670 +msgid "Council ref: %s" +msgstr "" + #: templates/web/base/admin/stats.html:84 msgid "Council:" msgstr "" @@ -688,7 +645,7 @@ msgstr "ספירה" msgid "Create a report" msgstr "צור דו\"ח" -#: templates/web/base/admin/body.html:200 +#: templates/web/base/admin/body.html:208 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "צור קטגוריה" @@ -700,7 +657,7 @@ msgid "Created" msgstr "" #: templates/web/base/admin/list_updates.html:38 -#: templates/web/base/admin/report_edit.html:69 +#: templates/web/base/admin/report_edit.html:82 #: templates/web/base/admin/update_edit.html:51 #: templates/web/zurich/admin/report_edit-sdm.html:47 #: templates/web/zurich/admin/report_edit.html:61 @@ -717,7 +674,7 @@ msgstr "" msgid "Currently no bodies have been created." msgstr "" -#: templates/web/base/dashboard/index.html:6 +#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 msgid "Dashboard" msgstr "" @@ -727,14 +684,14 @@ msgid "Dealt with by subdivision within 5 working days" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:169 -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:37 -#: templates/web/base/admin/category_edit.html:85 +#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:81 +#: templates/web/base/admin/category_edit.html:42 +#: templates/web/base/admin/category_edit.html:90 msgid "Deleted" msgstr "נמחק" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:43 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -754,7 +711,7 @@ msgstr "פרטים" msgid "Details:" msgstr "" -#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/body.html:87 msgid "Devolved" msgstr "" @@ -782,8 +739,8 @@ msgstr "" msgid "Don't like forms?" msgstr "לא אוהב טפסים?" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:47 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:60 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:32 #: templates/web/fixmystreet/report/update-form.html:28 @@ -791,7 +748,7 @@ msgstr "לא אוהב טפסים?" msgid "Duplicate" msgstr "כפול" -#: templates/web/base/admin/body.html:98 +#: templates/web/base/admin/body.html:106 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" @@ -801,20 +758,20 @@ msgstr "" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 -#: templates/web/base/admin/users.html:31 +#: templates/web/base/admin/users.html:33 #: templates/web/zurich/admin/problem_row.html:42 msgid "Edit" msgstr "ערוך" -#: templates/web/base/admin/body.html:212 +#: templates/web/base/admin/body.html:220 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "ערוך פרטי גוף" #: templates/web/base/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:2 +#: 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:2 +#: templates/web/zurich/admin/report_edit.html:1 #: templates/web/zurich/admin/report_edit.html:5 msgid "Editing problem %d" msgstr "ערוך בעיה %d" @@ -828,12 +785,12 @@ msgstr "ערוך עידכון %d" msgid "Editing user %d" msgstr "ערוך משתמש %d" -#: templates/web/base/admin/category_edit.html:86 +#: templates/web/base/admin/category_edit.html:91 msgid "Editor" msgstr "עורך" #: templates/web/base/admin/bodies.html:23 -#: templates/web/base/admin/category_edit.html:83 +#: templates/web/base/admin/category_edit.html:88 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 #: templates/web/fixmystreet/auth/general.html:21 @@ -844,15 +801,23 @@ msgstr "עורך" msgid "Email" msgstr "דואר אלקטרוני" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1303 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1301 msgid "Email added to abuse list" msgstr "דואר אלקטרוני הוסף לרשימת המשתמשים לרעה" -#: templates/web/base/admin/body.html:147 +#: templates/web/base/admin/body.html:155 msgid "Email address:" msgstr "כתובת דואר אלקטרוני:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1300 +#: templates/web/base/tokens/confirm_alert.html:6 +msgid "Email alert created" +msgstr "" + +#: templates/web/base/tokens/confirm_alert.html:10 +msgid "Email alert deleted" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1298 msgid "Email already in abuse list" msgstr "דואר אלקטרוני כבר ברשימת המשתמשים לרעה" @@ -864,8 +829,8 @@ msgstr "שלח לי דואר אלקטרוני על בעיות מקומיות ח msgid "Email me updates" msgstr "שלח לי דואר אלקטרוני על עדכונים" -#: templates/web/base/admin/category_edit.html:26 -#: templates/web/base/admin/report_edit.html:67 +#: templates/web/base/admin/category_edit.html:31 +#: templates/web/base/admin/report_edit.html:80 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 @@ -876,32 +841,32 @@ msgstr "שלח לי דואר אלקטרוני על עדכונים" msgid "Email:" msgstr "דואר אלקטרוני:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:322 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 msgid "Email: %s" msgstr "דואר אלקטרוני: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 msgid "Empty flat or maisonette" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:631 msgid "Empty house or bungalow" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:622 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty office or other commercial" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:623 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Empty pub or bar" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:624 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty public building - school, hospital, etc." msgstr "" -#: templates/web/base/admin/body-form.html:158 -#: templates/web/base/admin/body-form.html:159 +#: templates/web/base/admin/body-form.html:162 +#: templates/web/base/admin/body-form.html:163 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" @@ -909,8 +874,8 @@ msgid "" " <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>." msgstr "" -#: templates/web/base/admin/body-form.html:215 -#: templates/web/base/admin/body-form.html:216 +#: templates/web/base/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:223 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" @@ -921,11 +886,11 @@ msgstr "" msgid "End Date:" msgstr "" -#: templates/web/base/admin/body-form.html:126 +#: templates/web/base/admin/body-form.html:130 msgid "Endpoint" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:72 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:73 msgid "Enter a Zürich street name" msgstr "" @@ -938,7 +903,9 @@ msgstr "" msgid "Enter a nearby postcode, or street name and area" msgstr "" +#: templates/web/base/around/postcode_form.html:1 #: templates/web/base/around/postcode_form.html:2 +#: templates/web/fixmystreet/around/postcode_form.html:10 #: templates/web/fixmystreet/around/postcode_form.html:11 msgid "Enter a nearby street name and area" msgstr "" @@ -948,7 +915,7 @@ msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "" #: templates/web/base/auth/general.html:64 -#: templates/web/base/report/new/fill_in_details_form.html:170 +#: templates/web/base/report/new/fill_in_details_form.html:151 #: templates/web/base/report/update-form.html:124 msgid "Enter a new password:" msgstr "" @@ -960,7 +927,7 @@ msgstr "" msgid "Enter a password" msgstr "" -#: templates/web/base/index-steps.html:33 +#: templates/web/base/index-steps.html:26 msgid "Enter details of the problem" msgstr "" @@ -983,16 +950,21 @@ msgstr "" msgid "Examples:" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:47 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" -#: templates/web/base/admin/report_edit.html:76 +#: templates/web/base/admin/body-form.html:81 +msgid "External URL" +msgstr "" + +#: templates/web/base/admin/category_edit.html:27 +#: templates/web/base/admin/report_edit.html:92 msgid "Extra data:" msgstr "" -#: templates/web/base/contact/submit.html:15 -msgid "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>." +#: templates/web/base/contact/submit.html:13 +msgid "Failed to send message" msgstr "" #: templates/web/zurich/admin/index-dm.html:33 @@ -1005,7 +977,7 @@ msgstr "" msgid "First time" msgstr "" -#: templates/web/base/admin/body.html:40 +#: templates/web/base/admin/body.html:48 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" @@ -1036,9 +1008,9 @@ msgid "" msgstr "" #: templates/web/base/admin/index.html:55 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:41 -#: templates/web/base/admin/report_edit.html:42 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:54 +#: templates/web/base/admin/report_edit.html:55 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/update-form.html:30 @@ -1049,17 +1021,18 @@ msgstr "" msgid "Fixed" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:43 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:56 msgid "Fixed - Council" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:42 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:55 msgid "Fixed - User" msgstr "" -#: templates/web/base/my/my.html:35 templates/web/fixmystreet/my/my.html:41 +#: templates/web/base/my/my.html:35 +#: templates/web/fixmystreet/my/_problem-list.html:7 msgid "Fixed reports" msgstr "" @@ -1067,7 +1040,7 @@ msgstr "" msgid "Fixed:" msgstr "" -#: templates/web/base/admin/body-form.html:84 +#: templates/web/base/admin/body-form.html:89 #: templates/web/zurich/admin/body-form.html:36 msgid "Flag as deleted" msgstr "" @@ -1076,7 +1049,7 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "" @@ -1085,7 +1058,7 @@ msgstr "" msgid "Flagged reports and users" msgstr "" -#: templates/web/base/admin/user-form.html:45 +#: templates/web/base/admin/user-form.html:46 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page." msgstr "" @@ -1093,8 +1066,8 @@ msgstr "" msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." msgstr "" -#: templates/web/base/admin/report_edit.html:78 -#: templates/web/base/admin/user-form.html:51 +#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/user-form.html:52 msgid "Flagged:" msgstr "" @@ -1103,10 +1076,6 @@ msgstr "" msgid "Follow a ward link to view only reports within that ward." msgstr "" -#: templates/web/base/admin/report_edit.html:30 -msgid "For council(s):" -msgstr "" - #: templates/web/base/admin/body-form.html:65 msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "" @@ -1119,8 +1088,6 @@ msgstr "" #: templates/web/base/faq/faq-en-gb.html:1 #: templates/web/base/static/privacy.html:1 #: templates/web/base/static/privacy.html:2 -#: templates/web/fiksgatami/faq/faq-nb.html:1 -#: templates/web/fiksgatami/nn/faq/faq-nn.html:1 msgid "Frequently Asked Questions" msgstr "" @@ -1133,13 +1100,13 @@ msgstr "" msgid "Get updates" msgstr "" -#: templates/web/fixmystreet/reports/_rss.html:4 +#: templates/web/fixmystreet/reports/_rss.html:3 #: 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 +#: templates/web/fixmystreet/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "" @@ -1148,6 +1115,10 @@ msgstr "" msgid "Give me an RSS feed" msgstr "" +#: templates/web/base/questionnaire/completed.html:14 +msgid "Glad to hear it’s been fixed!" +msgstr "" + #: templates/web/base/alert/index.html:34 #: templates/web/base/around/postcode_form.html:8 #: templates/web/fixmystreet/around/postcode_form.html:21 @@ -1155,7 +1126,7 @@ msgstr "" msgid "Go" msgstr "" -#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:93 msgid "Going to send questionnaire?" msgstr "" @@ -1177,9 +1148,7 @@ msgstr "" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "" -#: templates/web/base/footer.html:15 templates/web/fiksgatami/footer.html:27 -#: templates/web/fiksgatami/nn/footer.html:27 -#: templates/web/fixmystreet/footer.html:30 +#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:30 #: templates/web/zurich/faq/faq-de-ch.html:1 #: templates/web/zurich/footer.html:21 #: templates/web/zurich/nav_over_content.html:8 @@ -1191,18 +1160,17 @@ msgstr "" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "" -#: templates/web/fiksgatami/header.html:48 -#: templates/web/fixmystreet/header.html:52 +#: templates/web/fixmystreet/header.html:58 #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:50 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:63 +#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/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:86 #: templates/web/zurich/admin/report_edit.html:90 #: templates/web/zurich/admin/stats.html:32 @@ -1218,7 +1186,7 @@ msgstr "" msgid "Hide pins" msgstr "" -#: templates/web/base/admin/category_edit.html:79 +#: templates/web/base/admin/category_edit.html:84 msgid "History" msgstr "" @@ -1234,19 +1202,25 @@ msgstr "" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:740 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" +#: templates/web/base/tokens/confirm_problem.html:23 +#: templates/web/base/tokens/confirm_problem.html:27 +msgid "I just reported a problem on @fixmystreet" 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." +#: templates/web/base/tokens/confirm_update.html:19 +#: templates/web/base/tokens/confirm_update.html:23 +msgid "I just updated a problem on @fixmystreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:260 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +msgid "I'm afraid we couldn't locate your problem in the database.\n" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 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 "" @@ -1268,7 +1242,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:125 +#: templates/web/base/admin/body.html:133 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." @@ -1286,7 +1260,12 @@ msgstr "" msgid "If you do not, your update will not be posted." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:9 +#: templates/web/base/questionnaire/completed.html:8 +msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." +msgstr "" + +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:8 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 "" @@ -1302,34 +1281,34 @@ msgid "" "your experience of getting the problem fixed?" msgstr "" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/body.html:149 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/base/admin/body-form.html:200 -#: templates/web/base/admin/body-form.html:201 +#: templates/web/base/admin/body-form.html:207 +#: templates/web/base/admin/body-form.html:208 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable <strong>extended Open311 stauses</strong> if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/body-form.html:187 -#: templates/web/base/admin/body-form.html:188 +#: templates/web/base/admin/body-form.html:194 +#: templates/web/base/admin/body-form.html:195 msgid "" "If you've enabled Open311 update-sending above, enable <strong>suppression of alerts</strong> \n" " if you do <strong>not</strong> want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/body-form.html:173 -#: templates/web/base/admin/body-form.html:174 +#: templates/web/base/admin/body-form.html:177 +#: templates/web/base/admin/body-form.html:178 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:127 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 msgid "Illegal ID" msgstr "" @@ -1354,17 +1333,21 @@ 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:143 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:38 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:144 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 #: templates/web/fixmystreet/report/banner.html:19 -#: templates/web/zurich/admin/header.html:2 +#: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 #: templates/web/zurich/admin/report_edit.html:99 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "" +#: templates/web/base/tokens/confirm_alert.html:11 +msgid "Inbox zero, here we come!" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:160 msgid "Include reporter personal details" msgstr "" @@ -1373,7 +1356,7 @@ msgstr "" msgid "Include unconfirmed reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:354 +#: perllib/FixMyStreet/App/Controller/Open311.pm:359 msgid "Incorrect has_photo value \"%s\"" msgstr "" @@ -1381,29 +1364,29 @@ msgstr "" msgid "Internal notes" msgstr "" -#: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:61 msgid "Internal referral" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:339 +#: perllib/FixMyStreet/App/Controller/Open311.pm:344 msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1114 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1112 msgid "Invalid end date" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:432 +#: perllib/FixMyStreet/App/Controller/Open311.pm:437 msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1110 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 msgid "Invalid start date" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:37 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:50 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 #: templates/web/base/report/update-form.html:30 @@ -1417,8 +1400,12 @@ msgstr "" msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "" +#: templates/web/base/tokens/confirm_problem.html:14 +msgid "It’s on its way to the council right now." +msgstr "" + #: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:150 +#: templates/web/base/report/new/fill_in_details_form.html:131 #: templates/web/base/report/update-form.html:104 #: templates/web/fixmystreet/auth/general.html:47 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 @@ -1427,12 +1414,12 @@ msgstr "" msgid "Keep me signed in on this computer" msgstr "" -#: templates/web/base/admin/body.html:62 +#: templates/web/base/admin/body.html:70 #: templates/web/zurich/admin/body.html:16 msgid "Last editor" msgstr "" -#: templates/web/base/admin/report_edit.html:72 +#: templates/web/base/admin/report_edit.html:88 msgid "Last update:" msgstr "" @@ -1440,43 +1427,38 @@ msgstr "" msgid "Last update:" msgstr "" -#: templates/web/base/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:229 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "" -#: templates/web/base/admin/body.html:17 templates/web/base/admin/body.html:19 +#: templates/web/base/admin/body.html:27 msgid "List all reported problems" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:69 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:54 -#: templates/web/zurich/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/category_wrapper.html:4 msgid "Loading..." msgstr "" #: templates/web/base/alert/choose.html:1 #: templates/web/base/alert/choose.html:3 #: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3 -#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:5 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5 #: templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 -#: templates/web/base/tokens/confirm_alert.html:4 #: templates/web/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "" -#: templates/web/base/alert/list.html:13 templates/web/base/alert/list.html:14 -#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:3 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:12 +#: templates/web/base/alert/list.html:14 templates/web/base/alert/list.html:3 msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "" -#: templates/web/base/footer.html:13 templates/web/fiksgatami/footer.html:25 -#: templates/web/fiksgatami/nn/footer.html:25 -#: templates/web/fixmystreet/footer.html:28 +#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:28 msgid "Local alerts" msgstr "" -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:25 msgid "Locate the problem on a map of the area" msgstr "" @@ -1485,17 +1467,26 @@ msgid "MAP" msgstr "" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" msgstr "" -#: perllib/FixMyStreet/Map/OSM.pm:42 -msgid "Map © <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>" +#: templates/web/base/admin/report_edit.html:86 +msgid "Mark as sent" msgstr "" -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/user-form.html:44 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." msgstr "" +#: templates/web/base/reports/index.html:24 +msgid "Marked fixed/closed in the past eight weeks" +msgstr "" + +#: templates/web/base/reports/index.html:25 +msgid "Marked fixed/closed more than eight weeks ago" +msgstr "" + #: templates/web/fixmystreet/contact/index.html:106 msgid "Message" msgstr "" @@ -1504,7 +1495,7 @@ msgstr "" msgid "Message:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:440 +#: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" msgstr "" @@ -1534,11 +1525,11 @@ msgstr "" #: templates/web/fixmystreet/report/update-form.html:138 #: 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:94 +#: templates/web/zurich/report/new/fill_in_details_form.html:77 msgid "Name" msgstr "" -#: templates/web/base/admin/report_edit.html:66 +#: templates/web/base/admin/report_edit.html:79 #: templates/web/base/admin/update_edit.html:32 #: templates/web/base/admin/user-form.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:43 @@ -1547,25 +1538,25 @@ msgstr "" msgid "Name:" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:321 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:313 msgid "Name: %s" msgstr "" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:186 -#: perllib/FixMyStreet/Geocode/OSM.pm:164 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 +#: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:137 +#: perllib/FixMyStreet/Cobrand/UK.pm:127 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 +#: perllib/FixMyStreet/Cobrand/Default.pm:442 +#: perllib/FixMyStreet/Cobrand/Default.pm:482 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:277 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1579,11 +1570,11 @@ msgstr "" msgid "New <br>problems" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:264 +#: perllib/FixMyStreet/App/Controller/Admin.pm:261 msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:379 msgid "New category contact added" msgstr "" @@ -1656,15 +1647,15 @@ msgstr "" msgid "Next" msgstr "" -#: templates/web/base/admin/body.html:72 templates/web/base/admin/body.html:74 -#: templates/web/base/admin/body.html:78 templates/web/base/admin/body.html:80 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:93 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:44 @@ -1682,7 +1673,7 @@ msgstr "" msgid "No council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:376 +#: perllib/FixMyStreet/DB/Result/Problem.pm:401 msgid "No council selected" msgstr "" @@ -1723,12 +1714,12 @@ msgid "" " your config file is not pointing to a live MapIt service." msgstr "" -#: templates/web/base/report/_support.html:3 +#: templates/web/base/report/_support.html:2 #: templates/web/base/report/_support.html:4 msgid "No supporters" msgstr "" -#: templates/web/base/admin/report_edit.html:30 +#: templates/web/base/admin/report_edit.html:41 #: templates/web/zurich/admin/report_edit-sdm.html:46 #: templates/web/zurich/admin/report_edit.html:60 msgid "None" @@ -1743,8 +1734,8 @@ msgid "" " activity across their body), the ability to hide reports or set special report statuses." msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:46 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -1760,12 +1751,12 @@ msgstr "" msgid "Not reported before" msgstr "" -#: templates/web/base/report/_main.html:61 +#: templates/web/base/report/_main.html:62 msgid "Not reported to council" msgstr "" -#: templates/web/base/admin/body.html:63 -#: templates/web/base/admin/category_edit.html:87 +#: templates/web/base/admin/body.html:71 +#: templates/web/base/admin/category_edit.html:92 #: templates/web/zurich/admin/body.html:17 msgid "Note" msgstr "" @@ -1774,8 +1765,8 @@ msgstr "" 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/base/admin/body.html:178 -#: templates/web/base/admin/category_edit.html:44 +#: templates/web/base/admin/body.html:186 +#: templates/web/base/admin/category_edit.html:49 #: templates/web/zurich/admin/body.html:53 msgid "Note:" msgstr "" @@ -1788,7 +1779,7 @@ msgstr "" msgid "Now to submit your report…" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:132 +#: templates/web/base/report/new/fill_in_details_form.html:113 msgid "Now to submit your report… do you have a FixMyStreet password?" msgstr "" @@ -1805,7 +1796,7 @@ msgid "OK" msgstr "" #: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:16 +#: templates/web/base/report/update.html:17 msgid "Offensive? Unsuitable? Tell us" msgstr "" @@ -1825,19 +1816,19 @@ msgstr "" msgid "Older <br>problems" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:37 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 msgid "One-line summary" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:137 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:36 -#: templates/web/base/admin/report_edit.html:37 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:138 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:49 +#: templates/web/base/admin/report_edit.html:50 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/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:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/report_edit.html:86 #: templates/web/zurich/admin/report_edit.html:88 @@ -1846,10 +1837,19 @@ msgstr "" msgid "Open" msgstr "" -#: templates/web/base/my/my.html:30 templates/web/fixmystreet/my/my.html:36 +#: templates/web/base/reports/index.html:22 +msgid "Open for more than four weeks, with an update within the past eight weeks" +msgstr "" + +#: templates/web/base/my/my.html:30 +#: templates/web/fixmystreet/my/_problem-list.html:2 msgid "Open reports" msgstr "" +#: templates/web/base/reports/index.html:23 +msgid "Open, but not had any update in eight weeks" +msgstr "" + #: templates/web/base/open311/index.html:70 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "" @@ -1872,15 +1872,15 @@ msgstr "" msgid "Or you can subscribe to an alert based upon what ward or council you’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:560 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 -#: perllib/FixMyStreet/DB/Result/Problem.pm:592 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:372 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 +#: perllib/FixMyStreet/DB/Result/Problem.pm:597 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:393 msgid "Other" msgstr "" @@ -1902,8 +1902,8 @@ msgstr "" msgid "Parent" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 msgid "Partial" msgstr "" @@ -1923,7 +1923,7 @@ msgstr "" msgid "Permalink" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:100 +#: templates/web/zurich/report/new/fill_in_details_form.html:83 msgid "Phone number" msgstr "" @@ -1932,27 +1932,27 @@ msgstr "" msgid "Phone number (optional)" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:286 -#: templates/web/base/admin/report_edit.html:68 -#: templates/web/base/report/new/fill_in_details_form.html:216 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:291 +#: templates/web/base/admin/report_edit.html:81 +#: templates/web/base/report/new/fill_in_details_form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:46 #: templates/web/zurich/admin/report_edit.html:60 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:72 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 #: 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 +#: templates/web/zurich/report/new/fill_in_details_form.html:51 msgid "Photo" msgstr "" #: templates/web/base/questionnaire/index.html:71 -#: templates/web/base/report/new/fill_in_details_form.html:103 +#: templates/web/base/report/new/fill_in_details_form.html:84 #: templates/web/base/report/update-form.html:62 #: templates/web/fixmystreet/questionnaire/index.html:91 msgid "Photo:" @@ -1966,11 +1966,11 @@ msgstr "" msgid "Place pin on map" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:38 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/zurich/admin/header.html:2 +#: 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:86 @@ -2004,20 +2004,19 @@ msgstr "" msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:349 -#: 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:395 +#: perllib/FixMyStreet/App/Controller/Admin.pm:343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:876 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 +#: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:401 +#: perllib/FixMyStreet/DB/Result/Problem.pm:418 msgid "Please choose a property type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:370 msgid "Please correct the errors below" msgstr "" @@ -2033,8 +2032,8 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:352 -#: perllib/FixMyStreet/DB/Result/Comment.pm:133 +#: perllib/FixMyStreet/App/Controller/Admin.pm:346 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "" @@ -2045,15 +2044,15 @@ msgstr "" msgid "Please enter a password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:108 -#: perllib/FixMyStreet/DB/Result/Problem.pm:370 +#: perllib/FixMyStreet/App/Controller/Contact.pm:113 +#: perllib/FixMyStreet/DB/Result/Problem.pm:395 #: templates/web/base/js/translation_strings.html:3 msgid "Please enter a subject" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1050 -#: perllib/FixMyStreet/App/Controller/Admin.pm:351 -#: perllib/FixMyStreet/App/Controller/Admin.pm:997 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin.pm:995 #: perllib/FixMyStreet/DB/Result/User.pm:127 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 @@ -2061,16 +2060,16 @@ msgid "Please enter a valid email" msgstr "" #: perllib/FixMyStreet/App/Controller/Alert.pm:346 -#: perllib/FixMyStreet/App/Controller/Contact.pm:118 +#: perllib/FixMyStreet/App/Controller/Contact.pm:123 msgid "Please enter a valid email address" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:373 +#: perllib/FixMyStreet/DB/Result/Problem.pm:398 #: templates/web/base/js/translation_strings.html:4 msgid "Please enter some details" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:107 +#: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/User.pm:124 #: templates/web/base/auth/general.html:13 #: templates/web/base/auth/general.html:8 @@ -2084,7 +2083,7 @@ msgid "Please enter your email" msgstr "" #: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:75 msgid "Please enter your email address" msgstr "" @@ -2092,14 +2091,14 @@ msgstr "" msgid "Please enter your first name" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: perllib/FixMyStreet/Cobrand/UK.pm:318 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:106 -#: perllib/FixMyStreet/DB/Result/Comment.pm:130 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Contact.pm:111 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 +#: perllib/FixMyStreet/DB/Result/Problem.pm:406 #: perllib/FixMyStreet/DB/Result/User.pm:120 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" @@ -2122,7 +2121,7 @@ msgstr "" msgid "Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a href=\"/\">front page</a>." msgstr "" -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:8 msgid "Please fill in details of the problem below." msgstr "" @@ -2137,7 +2136,7 @@ msgstr "" msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:251 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" @@ -2160,16 +2159,16 @@ msgstr "" msgid "Please note:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:246 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:254 msgid "Please provide some explanation as to why you're reopening this report" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:261 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 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:247 msgid "Please say whether you've ever reported a problem to your council before" msgstr "" @@ -2181,7 +2180,7 @@ msgstr "" msgid "Please select the type of alert you want" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please state whether or not the problem has been fixed" msgstr "" @@ -2189,15 +2188,13 @@ msgstr "" msgid "Please take a look at the updates that have been left." msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:176 +#: perllib/FixMyStreet/App/Controller/Photo.pm:177 +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 +#: perllib/FixMyStreet/App/Controller/Photo.pm:189 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:109 +#: perllib/FixMyStreet/App/Controller/Contact.pm:114 msgid "Please write a message" msgstr "" @@ -2236,14 +2233,14 @@ msgstr "" msgid "Privacy" msgstr "" -#: templates/web/base/admin/body.html:194 -#: templates/web/base/admin/body.html:77 -#: templates/web/base/admin/category_edit.html:40 -#: templates/web/base/admin/report_edit.html:79 +#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:85 +#: templates/web/base/admin/category_edit.html:45 +#: templates/web/base/admin/report_edit.html:95 msgid "Private" msgstr "" -#: templates/web/base/maps/openlayers.html:86 +#: templates/web/base/maps/openlayers.html:89 msgid "Problem" msgstr "" @@ -2264,7 +2261,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:966 msgid "Problem marked as open." msgstr "" @@ -2299,16 +2296,15 @@ msgstr "" msgid "Problems within %.1fkm of this location" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:629 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:114 +#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:151 -#: perllib/FixMyStreet/Cobrand/UK.pm:217 +#: perllib/FixMyStreet/Cobrand/UK.pm:207 msgid "Problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:122 -#: perllib/FixMyStreet/Cobrand/UK.pm:231 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "Problems within %s ward" msgstr "" @@ -2326,7 +2322,7 @@ msgstr "" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "" -#: templates/web/base/admin/report_edit.html:32 +#: templates/web/base/admin/report_edit.html:45 msgid "Property address:" msgstr "" @@ -2343,7 +2339,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/base/report/new/fill_in_details_form.html:174 +#: templates/web/base/report/new/fill_in_details_form.html:155 #: templates/web/base/report/update-form.html:128 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 #: templates/web/fixmystreet/report/update-form.html:119 @@ -2364,7 +2360,7 @@ msgstr "" msgid "Publish the response" msgstr "" -#: templates/web/base/questionnaire/completed.html:2 +#: templates/web/base/questionnaire/completed.html:1 #: templates/web/base/questionnaire/index.html:0 #: templates/web/base/questionnaire/index.html:14 #: templates/web/base/questionnaire/index.html:4 @@ -2383,11 +2379,12 @@ msgstr "" msgid "Questionnaire %d sent for problem %d" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 msgid "Questionnaire filled in by problem reporter" msgstr "" #: templates/web/base/alert/_list.html:21 +#: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display.html:50 #: templates/web/base/reports/_rss.html:1 @@ -2397,11 +2394,11 @@ msgstr "" msgid "RSS feed" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:260 perllib/FixMyStreet/Cobrand/UK.pm:272 +#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 msgid "RSS feed for %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "RSS feed for %s ward, %s" msgstr "" @@ -2409,15 +2406,11 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:167 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:175 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:185 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:193 -#: perllib/FixMyStreet/Cobrand/UK.pm:286 perllib/FixMyStreet/Cobrand/UK.pm:298 +#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 msgid "RSS feed of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 msgid "RSS feed of %s, within %s ward" msgstr "" @@ -2430,20 +2423,19 @@ msgstr "" msgid "RSS feed of problems in this %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:630 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:115 +#: perllib/FixMyStreet/Cobrand/Default.pm:651 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:150 -#: perllib/FixMyStreet/Cobrand/UK.pm:224 +#: perllib/FixMyStreet/Cobrand/UK.pm:214 msgid "RSS feed of problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 -#: perllib/FixMyStreet/Cobrand/UK.pm:230 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s ward" msgstr "" -#: templates/web/base/around/display_location.html:3 +#: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:4 msgid "RSS feed of recent local problems" msgstr "" @@ -2483,15 +2475,18 @@ msgstr "" msgid "Remove flag" msgstr "" -#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/report_edit.html:110 #: templates/web/base/admin/update_edit.html:62 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "" -#: templates/web/base/footer.html:7 templates/web/fiksgatami/footer.html:19 -#: templates/web/fiksgatami/nn/footer.html:19 -#: templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 +msgid "Report" +msgstr "" + +#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 #: templates/web/zurich/footer.html:17 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2501,11 +2496,6 @@ msgstr "" msgid "Report abuse" msgstr "" -#: templates/web/base/report_created.html:1 -#: templates/web/base/report_created.html:3 -msgid "Report created" -msgstr "" - #: perllib/FixMyStreet/App/Controller/Rss.pm:295 msgid "Report on %s" msgstr "" @@ -2529,7 +2519,7 @@ msgstr "" msgid "Reported %s, to %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:580 #: templates/web/base/contact/index.html:50 #: templates/web/fixmystreet/contact/index.html:65 msgid "Reported anonymously at %s" @@ -2541,7 +2531,7 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:598 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 #: templates/web/base/contact/index.html:52 #: templates/web/fixmystreet/contact/index.html:67 msgid "Reported by %s at %s" @@ -2551,31 +2541,35 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:571 +#: perllib/FixMyStreet/DB/Result/Problem.pm:576 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:598 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:567 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:589 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:563 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:583 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 msgid "Reported via %s in the %s category by %s at %s" msgstr "" -#: templates/web/base/around/around_index.html:2 +#: templates/web/base/reports/index.html:21 +msgid "Reported within the last four weeks" +msgstr "" + +#: templates/web/base/around/around_index.html:1 #: templates/web/base/around/around_index.html:3 #: templates/web/base/js/translation_strings.html:41 #: templates/web/base/report/new/fill_in_details.html:0 @@ -2585,14 +2579,13 @@ msgstr "" msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:294 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:409 -#: perllib/FixMyStreet/DB/Result/Problem.pm:413 +#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" @@ -2608,7 +2601,7 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:85 msgid "Resend report" msgstr "" @@ -2616,36 +2609,35 @@ msgstr "" msgid "Right place?" msgstr "" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:193 -#: perllib/FixMyStreet/Geocode/OSM.pm:171 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:167 +#: perllib/FixMyStreet/Geocode/OSM.pm:152 msgid "Road operator for this named road (derived from road reference number and type): %s" msgstr "" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:190 -#: perllib/FixMyStreet/Geocode/OSM.pm:168 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:164 +#: perllib/FixMyStreet/Geocode/OSM.pm:149 msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1394 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 -#: templates/web/base/admin/report_edit.html:90 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1403 +#: templates/web/base/admin/report_edit.html:106 #: templates/web/zurich/admin/report_edit.html:73 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1394 -#: templates/web/base/admin/report_edit.html:91 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: templates/web/base/admin/report_edit.html:107 #: templates/web/zurich/admin/report_edit.html:74 msgid "Rotate Right" msgstr "" #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:200 -#: templates/web/base/admin/category_edit.html:76 +#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/category_edit.html:81 #: templates/web/zurich/admin/body.html:59 msgid "Save changes" msgstr "" @@ -2673,7 +2665,7 @@ msgstr "" msgid "Searching found no reports." msgstr "" -#: templates/web/base/admin/users.html:39 +#: templates/web/base/admin/users.html:41 msgid "Searching found no users." msgstr "" @@ -2696,15 +2688,15 @@ 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:680 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "Sent to %s %s later" msgstr "" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:84 msgid "Sent:" msgstr "" -#: templates/web/base/admin/report_edit.html:73 +#: templates/web/base/admin/report_edit.html:89 #: templates/web/zurich/admin/stats.html:45 msgid "Service:" msgstr "" @@ -2713,7 +2705,7 @@ msgstr "" msgid "Share" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:211 +#: templates/web/base/report/new/fill_in_details_form.html:192 #: templates/web/base/report/update-form.html:157 #: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 @@ -2758,12 +2750,12 @@ msgstr "" msgid "Signed in as %s" msgstr "" -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 msgid "Some categories may require additional information." msgstr "" -#: templates/web/base/admin/body-form.html:145 -#: templates/web/base/admin/body-form.html:146 +#: templates/web/base/admin/body-form.html:149 +#: templates/web/base/admin/body-form.html:150 msgid "" "Some endpoints require an <strong>API key</strong> to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -2774,11 +2766,11 @@ msgid "Some photos of recent reports" msgstr "" #: perllib/FixMyStreet/App/View/Email.pm:32 -#: perllib/FixMyStreet/App/View/Web.pm:44 +#: perllib/FixMyStreet/App/View/Web.pm:43 msgid "Some text to localize" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:88 +#: perllib/FixMyStreet/Cobrand/UK.pm:78 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -2786,17 +2778,16 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:215 -#: perllib/FixMyStreet/Geocode.pm:26 perllib/FixMyStreet/Geocode/Bing.pm:56 -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:73 -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:93 -#: perllib/FixMyStreet/Geocode/Google.pm:72 -#: perllib/FixMyStreet/Geocode/OSM.pm:64 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:214 +#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 +#: perllib/FixMyStreet/Geocode/Google.pm:47 +#: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "" -#: perllib/FixMyStreet/Geocode/Bing.pm:51 -#: perllib/FixMyStreet/Geocode/Google.pm:67 +#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: perllib/FixMyStreet/Geocode/Google.pm:44 #: perllib/FixMyStreet/Geocode/Zurich.pm:87 msgid "Sorry, we could not parse that location. Please try again." msgstr "" @@ -2805,7 +2796,7 @@ msgstr "" msgid "Start Date:" msgstr "" -#: templates/web/base/admin/body.html:61 +#: templates/web/base/admin/body.html:69 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 @@ -2813,7 +2804,7 @@ msgstr "" msgid "State" msgstr "" -#: templates/web/base/admin/report_edit.html:34 +#: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 #: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:53 @@ -2822,8 +2813,8 @@ msgstr "" msgid "State:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1200 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:304 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:308 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" @@ -2839,7 +2830,7 @@ msgstr "" msgid "Still open, via questionnaire, %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:381 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 msgid "Subcategory: %s" msgstr "" @@ -2859,19 +2850,19 @@ msgid "Subject:" msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:115 -#: templates/web/base/report/new/fill_in_details_form.html:155 -#: templates/web/base/report/new/fill_in_details_form.html:177 +#: templates/web/base/report/new/fill_in_details_form.html:136 +#: templates/web/base/report/new/fill_in_details_form.html:158 +#: templates/web/base/report/new/fill_in_details_form.html:96 #: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 -#: templates/web/zurich/report/new/fill_in_details_form.html:108 +#: templates/web/zurich/report/new/fill_in_details_form.html:91 msgid "Submit" msgstr "" -#: templates/web/base/admin/report_edit.html:97 +#: templates/web/base/admin/report_edit.html:113 #: templates/web/base/admin/update_edit.html:65 -#: templates/web/base/admin/user-form.html:55 +#: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:64 #: templates/web/zurich/admin/report_edit.html:221 #: templates/web/zurich/admin/update_edit.html:38 @@ -2883,8 +2874,8 @@ msgstr "" msgid "Submit questionnaire" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:133 -#: templates/web/zurich/admin/header.html:2 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:134 +#: 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 @@ -2908,8 +2899,8 @@ msgstr "" msgid "Subscribe me to an email alert" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1191 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:293 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 #: templates/web/zurich/admin/index-dm.html:1 @@ -2925,7 +2916,7 @@ msgstr "" msgid "Summary reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 msgid "Survey" msgstr "" @@ -2939,7 +2930,7 @@ msgstr "" msgid "Text" msgstr "" -#: templates/web/base/admin/body.html:21 +#: templates/web/base/admin/body.html:28 msgid "Text only version" msgstr "" @@ -2948,49 +2939,54 @@ msgstr "" msgid "Text:" msgstr "" -#: templates/web/base/tokens/confirm_update.html:9 -msgid "Thank you — you can <a href=\"%s\">view your updated problem</a> on the site." -msgstr "" - -#: templates/web/base/tokens/confirm_problem.html:18 -msgid "Thank you for reporting this issue" +#: templates/web/base/tokens/confirm_problem.html:12 +msgid "Thank you for reporting this issue!" msgstr "" #: templates/web/base/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/fixmystreet/around/around_index.html:28 -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 :" +#: templates/web/base/tokens/confirm_update.html:15 +msgid "Thank you for updating this issue!" +msgstr "" + +#: templates/web/base/contact/submit.html:6 +#: templates/web/base/questionnaire/completed.html:5 +msgid "Thank you for your feedback" msgstr "" -#: templates/web/base/contact/submit.html:8 -msgid "Thanks for your feedback. We'll get back to you as soon as we can!" +#: templates/web/fixmystreet/around/around_index.html:28 +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 :" msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:9 msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:190 +#: perllib/FixMyStreet/App/Controller/Photo.pm:195 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Council.pm:100 +#: perllib/FixMyStreet/App/Controller/Council.pm:97 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 +#: perllib/FixMyStreet/App/Controller/Location.pm:126 msgid "That location does not appear to be in the UK; please try again." msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:81 +#: perllib/FixMyStreet/Cobrand/UK.pm:71 msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:713 +#: perllib/FixMyStreet/App/Controller/Admin.pm:712 +msgid "That problem has been marked as sent." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:704 msgid "That problem will now be resent." msgstr "" @@ -3002,28 +2998,28 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "" -#: templates/web/base/admin/body.html:136 +#: templates/web/base/admin/body.html:144 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/base/admin/body-form.html:119 -#: templates/web/base/admin/body-form.html:120 +#: templates/web/base/admin/body-form.html:123 +#: templates/web/base/admin/body-form.html:124 msgid "" "The <strong>endpoint</strong> is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." msgstr "" -#: templates/web/base/admin/body-form.html:132 -#: templates/web/base/admin/body-form.html:133 +#: templates/web/base/admin/body-form.html:136 +#: templates/web/base/admin/body-form.html:137 msgid "" "The <strong>jurisdiction</strong> is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" -#: templates/web/base/admin/body-form.html:90 -#: templates/web/base/admin/body-form.html:91 +#: templates/web/base/admin/body-form.html:94 +#: templates/web/base/admin/body-form.html:95 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>." @@ -3044,7 +3040,7 @@ msgstr "" msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." msgstr "" -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:3 msgid "The council won’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 "" @@ -3071,8 +3067,8 @@ 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:185 -#: perllib/FixMyStreet/Geocode/OSM.pm:163 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:159 +#: perllib/FixMyStreet/Geocode/OSM.pm:144 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap." msgstr "" @@ -3130,7 +3126,7 @@ msgstr "" msgid "The passwords do not match" msgstr "" -#: templates/web/base/errors/page_error_404_not_found.html:11 +#: templates/web/base/errors/page_error_404_not_found.html:10 #: templates/web/base/errors/page_error_404_not_found.html:12 msgid "The requested URL '%s' was not found on this server" msgstr "" @@ -3147,7 +3143,7 @@ msgstr "" msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:295 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:300 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" @@ -3158,16 +3154,20 @@ msgid "" " Names are not necessarily unique." msgstr "" +#: templates/web/base/reports/_problem-list.html:15 +msgid "There are no reports to show." +msgstr "" + #: perllib/FixMyStreet/App/Controller/Reports.pm:75 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:131 +#: perllib/FixMyStreet/App/Controller/Contact.pm:136 #: 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/New.pm:762 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 #: templates/web/base/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:25 @@ -3183,7 +3183,7 @@ msgstr "" msgid "There was a problem with your update. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:135 +#: perllib/FixMyStreet/App/Controller/Contact.pm:140 msgid "There were problems with your report. Please see below." msgstr "" @@ -3191,8 +3191,8 @@ msgstr "" msgid "There were problems with your update. Please see below." msgstr "" -#: templates/web/base/admin/body-form.html:108 -#: templates/web/base/admin/body-form.html:109 +#: templates/web/base/admin/body-form.html:112 +#: templates/web/base/admin/body-form.html:113 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" @@ -3205,14 +3205,14 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" -#: templates/web/base/admin/body.html:36 +#: templates/web/base/admin/body.html:44 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported <em>at any location</em>.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" " Currently, users <strong>cannot report problems to this body</strong>." msgstr "" -#: templates/web/base/admin/body.html:46 +#: templates/web/base/admin/body.html:54 msgid "This body has no contacts. This means that currently problems reported to this body <strong>will not be sent</strong>." msgstr "" @@ -3223,18 +3223,18 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:388 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:394 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:391 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 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:136 -#: perllib/FixMyStreet/Cobrand/UK.pm:53 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:902 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:972 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/Cobrand/UK.pm:43 msgid "This information is required" msgstr "" @@ -3273,8 +3273,8 @@ msgstr "" msgid "This problem is old and of unknown status." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:130 #: perllib/FixMyStreet/Cobrand/Zurich.pm:131 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:132 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -3291,15 +3291,15 @@ msgstr "" msgid "This report is currently marked as open." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:319 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:311 msgid "This report was submitted anonymously" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:293 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -3317,7 +3317,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:294 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:299 msgid "To view a map of the precise location of this issue" msgstr "" @@ -3333,8 +3333,12 @@ msgstr "" msgid "Try again" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:46 +#: templates/web/base/contact/submit.html:14 +msgid "Try emailing us directly:" +msgstr "" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -3342,8 +3346,8 @@ msgstr "" msgid "Unable to fix" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/admin/update_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:45 #: templates/web/zurich/admin/report_edit.html:58 @@ -3385,7 +3389,7 @@ msgstr "" msgid "Update below added by %s at %s" msgstr "" -#: templates/web/base/admin/body-form.html:233 +#: templates/web/base/admin/body-form.html:240 #: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "" @@ -3411,7 +3415,7 @@ msgstr "" msgid "Update reopened problem" msgstr "" -#: templates/web/base/admin/body.html:93 +#: templates/web/base/admin/body.html:101 msgid "Update statuses" msgstr "" @@ -3425,12 +3429,12 @@ msgstr "" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1016 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1060 -#: perllib/FixMyStreet/App/Controller/Admin.pm:810 -#: perllib/FixMyStreet/App/Controller/Admin.pm:958 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:549 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:618 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1014 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:808 +#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:556 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:625 msgid "Updated!" msgstr "" @@ -3442,7 +3446,7 @@ msgstr "" msgid "Updates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:139 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -3457,7 +3461,7 @@ msgstr "" msgid "Updates to this problem, FixMyStreet" msgstr "" -#: templates/web/base/admin/body.html:174 +#: templates/web/base/admin/body.html:182 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 "" @@ -3466,11 +3470,11 @@ msgstr "" msgid "User" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1357 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1331 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1329 msgid "User flagged" msgstr "" @@ -3478,16 +3482,16 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:303 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:307 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:380 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:430 +#: perllib/FixMyStreet/App/Controller/Admin.pm:374 +#: perllib/FixMyStreet/App/Controller/Admin.pm:404 +#: perllib/FixMyStreet/App/Controller/Admin.pm:421 msgid "Values updated" msgstr "" @@ -3541,11 +3545,11 @@ msgstr "" msgid "We never show your email address or phone number." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:403 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/base/index-steps.html:38 +#: templates/web/base/index-steps.html:31 msgid "We send it to the council on your behalf" msgstr "" @@ -3554,15 +3558,23 @@ msgstr "" msgid "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>" msgstr "" +#: templates/web/base/questionnaire/completed-open.html:2 +msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" +msgstr "" + #: templates/web/base/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/fixmystreet/report/new/fill_in_details_form.html:41 +#: templates/web/base/contact/submit.html:7 +msgid "We’ll get back to you as soon as we can." +msgstr "" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 msgid "What’s the issue, and where is it?" msgstr "" -#: templates/web/base/admin/category_edit.html:82 +#: templates/web/base/admin/category_edit.html:87 #: templates/web/zurich/admin/body.html:18 msgid "When edited" msgstr "" @@ -3571,15 +3583,18 @@ msgstr "" msgid "When sent" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Whole block of empty flats" msgstr "" +#: templates/web/base/tokens/confirm_alert.html:7 +msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." +msgstr "" + #: templates/web/base/open311/index.html:92 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/fiksgatami/front/footer-marketing.html:15 #: templates/web/fixmystreet/front/footer-marketing.html:17 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" @@ -3603,18 +3618,18 @@ msgid "Year" msgstr "" #: templates/web/base/admin/bodies.html:66 -#: templates/web/base/admin/body.html:72 templates/web/base/admin/body.html:74 -#: templates/web/base/admin/body.html:78 templates/web/base/admin/body.html:80 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:76 +#: templates/web/base/admin/report_edit.html:93 #: templates/web/base/admin/update_edit.html:24 -#: templates/web/base/admin/users.html:29 +#: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:42 #: templates/web/base/questionnaire/index.html:81 @@ -3643,14 +3658,12 @@ msgstr "" msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/tokens/confirm_problem.html:25 -#: templates/web/base/tokens/confirm_problem.html:26 -#: templates/web/zurich/tokens/confirm_problem.html:6 +#: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:8 msgid "You can <a href=\"%s%s\">view the problem on this site</a>." msgstr "" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:48 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -3665,14 +3678,14 @@ msgid "" " reports in the past." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:19 -#: templates/web/base/report/new/councils_text_none.html:20 -#: templates/web/base/report/new/councils_text_some.html:20 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." msgstr "" -#: templates/web/base/admin/body-form.html:81 +#: templates/web/base/admin/body-form.html:85 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" @@ -3685,10 +3698,10 @@ msgid "You have already answered this questionnaire. If you have a question, ple msgstr "" #: templates/web/base/questionnaire/index.html:68 -#: templates/web/base/report/new/fill_in_details_form.html:94 +#: templates/web/base/report/new/fill_in_details_form.html:75 #: templates/web/fixmystreet/questionnaire/index.html:88 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:79 -#: templates/web/zurich/report/new/fill_in_details_form.html:75 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 +#: templates/web/zurich/report/new/fill_in_details_form.html:58 msgid "You have already attached a photo to this report, attaching another one will replace it." msgstr "" @@ -3697,7 +3710,7 @@ msgstr "" msgid "You have already attached a photo to this update, attaching another one will replace it." msgstr "" -#: templates/web/base/auth/sign_out.html:3 +#: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" msgstr "" @@ -3706,26 +3719,11 @@ msgstr "" 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/base/tokens/confirm_alert.html:8 -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/base/tokens/confirm_update.html:14 -msgid "You have successfully confirmed your update and you can now <a href=\"%s\">view it on the site</a>." -msgstr "" - -#: templates/web/base/tokens/confirm_alert.html:12 -msgid "You have successfully created your alert." -msgstr "" - -#: templates/web/base/tokens/confirm_alert.html:10 -msgid "You have successfully deleted your alert." -msgstr "" - #: templates/web/base/report/display.html:20 #: templates/web/base/report/new/fill_in_details.html:37 #: templates/web/fixmystreet/report/display.html:17 @@ -3751,7 +3749,7 @@ msgid "" " contacts (such as an email address) to which reports are sent." msgstr "" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:85 msgid "You really want to resend?" msgstr "" @@ -3771,7 +3769,7 @@ msgstr "" #: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 #: templates/web/fixmystreet/report/update-form.html:76 -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:71 msgid "Your email" msgstr "" @@ -3787,7 +3785,7 @@ msgid "Your email address:" msgstr "" #: templates/web/base/alert/_list.html:92 -#: templates/web/base/report/new/fill_in_details_form.html:125 +#: templates/web/base/report/new/fill_in_details_form.html:106 #: templates/web/base/report/update-form.html:81 msgid "Your email:" msgstr "" @@ -3802,13 +3800,13 @@ msgstr "" #: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 #: templates/web/fixmystreet/report/update-form.html:142 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:98 +#: templates/web/zurich/report/new/fill_in_details_form.html:81 msgid "Your name" msgstr "" #: templates/web/base/auth/general.html:59 #: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:204 +#: templates/web/base/report/new/fill_in_details_form.html:185 #: templates/web/base/report/update-form.html:151 msgid "Your name:" msgstr "" @@ -3826,33 +3824,19 @@ msgstr "" #: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 -#: templates/web/zurich/report/new/fill_in_details_form.html:104 +#: templates/web/zurich/report/new/fill_in_details_form.html:87 msgid "Your phone number" msgstr "" -#: templates/web/base/tokens/confirm_problem.html:4 -msgid "Your problem has been confirmed!" -msgstr "" - #: templates/web/fixmystreet/questionnaire/index.html:16 msgid "Your report" msgstr "" -#: templates/web/base/report_created.html:6 -msgid "Your report has been created and will shortly be sent." -msgstr "" - -#: templates/web/base/footer.html:9 templates/web/fiksgatami/footer.html:21 -#: templates/web/fiksgatami/nn/footer.html:21 -#: templates/web/fixmystreet/footer.html:24 +#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:24 msgid "Your reports" msgstr "" -#: templates/web/base/tokens/confirm_update.html:4 -msgid "Your update has been confirmed!" -msgstr "" - -#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:59 +#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:41 msgid "Your updates" msgstr "" @@ -3869,11 +3853,7 @@ msgstr "" msgid "council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:665 -msgid "council ref: %s" -msgstr "" - -#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:32 #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:54 msgid "didn't use map" @@ -3884,6 +3864,7 @@ msgstr "" msgid "e.g. ‘%s’ or ‘%s’" msgstr "" +#: templates/web/base/admin/body-form.html:188 #: templates/web/base/admin/flagged.html:51 msgid "edit user" msgstr "" @@ -3898,7 +3879,7 @@ msgstr "" msgid "last updated %s" msgstr "" -#: perllib/Utils.pm:263 +#: perllib/Utils.pm:235 msgid "less than a minute" msgstr "" @@ -3958,22 +3939,22 @@ msgstr "" msgid "or locate me automatically" msgstr "" -#: templates/web/base/admin/report_edit.html:25 -#: templates/web/base/admin/report_edit.html:26 -#: templates/web/zurich/admin/report_edit-sdm.html:28 +#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:30 +#: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit-sdm.html:29 -#: templates/web/zurich/admin/report_edit-sdm.html:37 +#: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:38 -#: templates/web/zurich/admin/report_edit.html:28 +#: templates/web/zurich/admin/report_edit.html:27 #: templates/web/zurich/admin/report_edit.html:29 -#: templates/web/zurich/admin/report_edit.html:39 +#: templates/web/zurich/admin/report_edit.html:38 #: templates/web/zurich/admin/report_edit.html:40 -#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit.html:50 #: templates/web/zurich/admin/report_edit.html:52 msgid "originally entered: “%s”" msgstr "" -#: templates/web/base/admin/report_edit.html:30 +#: templates/web/base/admin/report_edit.html:43 msgid "other areas:" msgstr "" @@ -3982,13 +3963,12 @@ msgstr "" msgid "reopened" msgstr "" -#: templates/web/fiksgatami/header.html:49 -#: templates/web/fixmystreet/header.html:53 +#: templates/web/fixmystreet/header.html:59 #: templates/web/zurich/footer.html:12 msgid "sign out" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:13 +#: templates/web/base/report/new/fill_in_details_form.html:12 #: templates/web/base/report/new/fill_in_details_form.html:15 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 @@ -4000,15 +3980,15 @@ msgstr "" msgid "there is no pin shown as the user did not use the map" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:373 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:379 msgid "this type of local problem" msgstr "" -#: perllib/Utils.pm:235 +#: perllib/Utils.pm:207 msgid "today" msgstr "" -#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:32 #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:54 msgid "used map" @@ -4034,7 +4014,7 @@ msgid_plural "<big>%s</big> reports recently" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:282 +#: perllib/Utils.pm:254 #, perl-format msgid "%d hour" msgid_plural "%d hours" @@ -4048,7 +4028,7 @@ msgid_plural "%d supporters" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:284 +#: perllib/Utils.pm:256 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -4069,7 +4049,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:250 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -4090,7 +4070,7 @@ msgid_plural "<big>%s</big> fixed in past month" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:280 +#: perllib/Utils.pm:252 #, perl-format msgid "%d day" msgid_plural "%d days" diff --git a/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/hr.UTF-8/LC_MESSAGES/FixMyStreet.po index 63a30425a..79e8efb6e 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: 2015-01-20 16:59+0000\n" -"PO-Revision-Date: 2014-11-19 18:30+0000\n" +"POT-Creation-Date: 2015-07-31 14:28+0100\n" +"PO-Revision-Date: 2015-07-10 13:31+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,17 +20,15 @@ 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:618 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:386 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:392 msgid " and " msgstr "i" -#: templates/web/base/report/new/councils_text_all.html:12 -#: templates/web/base/report/new/councils_text_all.html:19 -#: templates/web/base/report/new/councils_text_all.html:5 -#: templates/web/base/report/new/councils_text_none.html:19 -#: templates/web/base/report/new/councils_text_none.html:21 -#: templates/web/base/report/new/councils_text_some.html:20 +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_none.html:11 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " @@ -66,22 +64,26 @@ msgstr "" msgid "%s - Summary reports" msgstr "%s - Sažetak izvješća" -#: perllib/FixMyStreet/DB/Result/Problem.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:672 msgid "%s ref: %s" msgstr "%s ref: %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:265 perllib/FixMyStreet/Cobrand/UK.pm:277 +#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:554 +#: perllib/FixMyStreet/DB/Result/Problem.pm:559 msgid "%s, reported at %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:304 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "%s, within %s ward" msgstr "" +#: perllib/FixMyStreet/Map/OSM.pm:42 +msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" +msgstr "" + #: templates/web/base/email_sent.html:29 msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" msgstr "" @@ -95,7 +97,7 @@ msgid "(Don't worry — we'll hang on to your update while you're checking y msgstr "" #: templates/web/base/admin/report_blocks.html:11 -#: templates/web/base/admin/users.html:29 +#: templates/web/base/admin/users.html:31 msgid "(Email in abuse table)" msgstr "(Email na crnoj listi)" @@ -123,7 +125,7 @@ msgstr "(zatvoreno)" msgid "(fixed)" msgstr "(popravljeno)" -#: templates/web/base/index.html:9 +#: templates/web/base/index.html:8 templates/web/base/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...)" @@ -133,8 +135,8 @@ msgstr "(grafiti, ilegalno odlaganje otpada, oštećeni kolnici, klupe, lampe... msgid "(not sent to council)" msgstr "(nije poslano odgovornom tijelu)" -#: templates/web/base/report/new/fill_in_details_form.html:218 -#: templates/web/zurich/report/new/fill_in_details_form.html:94 +#: templates/web/base/report/new/fill_in_details_form.html:199 +#: templates/web/zurich/report/new/fill_in_details_form.html:77 msgid "(optional)" msgstr "(nije obavezno)" @@ -147,7 +149,7 @@ msgstr "" msgid "(sent to both)" msgstr "(poslano na obje adrese)" -#: templates/web/base/report/new/fill_in_details_form.html:212 +#: templates/web/base/report/new/fill_in_details_form.html:193 msgid "(we never show your email address or phone number)" msgstr "(vašu email adresu i broj telefona držimo u tajnosti)" @@ -155,14 +157,13 @@ 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:635 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:662 -#: perllib/FixMyStreet/DB/Result/Problem.pm:393 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Izaberi kategoriju --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 -#: perllib/FixMyStreet/DB/Result/Problem.pm:399 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:630 +#: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Izaberite vrstu posjeda --" @@ -174,45 +175,7 @@ msgid "" " Maybe add some <code>MAPIT_TYPES</code> to your config file?" msgstr "" -#: templates/web/base/questionnaire/completed.html:20 -msgid "<p style=\"font-size:150%\">Thank you very much for filling in our questionnaire; glad to hear it’s been fixed.</p>" -msgstr "<p style=\"font-size:150%\">Hvala Vam puno što ste ispunili naš upitnik; drago nam je čuti da je popravljeno</p>" - -#: templates/web/fiksgatami/questionnaire/completed-open.html:1 -msgid "" -"<p style=\"font-size:150%\">We’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’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%\">’Žao nam je što to čujemo. Imamo dva prijedloga: zašto ne biste <a href=\"http://www.norge.no/styresmakter/\">pisali\n" -"direktno vašem vijećniku(s)</a> ili, ako ’bi problem mogli rješiti lokalni stanovnici radeći zajedno, zašto se ne\n" -"<a href=\"http://www.pledgebank.com/new\">biste obvezali na to i isto objavili</a>?\n" -"</p>" - -#: templates/web/base/questionnaire/completed-open.html:6 -msgid "" -"<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" -"suggestions: why not try writing to your local representatives or, if\n" -"it’s a problem that could be fixed by local people working together, why\n" -"not <a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n" -"</p>" -msgstr "" -"<p style=\"font-size:150%\">’Žao nam je što to čujemo. Imamo dva prijedloga: zašto ne biste pokušali pisati vašem lokalnom predstavniku ili, ako ’s\n" -"problem mogu rješiti mještani radeći zajedno, zašto se ne \n" -"<a href=\"http://www.pledgebank.com/new\">biste obvezali na to i isto objavili</a>?\n" -"</p>" - -#: templates/web/base/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>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/base/around/_report_banner.html:4 +#: templates/web/base/around/_report_banner.html:3 #: templates/web/base/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>" @@ -239,7 +202,7 @@ msgstr "<strong>No</strong> prijavi se e-mailom" msgid "<strong>No</strong>, I do not, let me sign in by email:" msgstr "<strong>No</strong>, Nemam, prijavi me e-mailom:" -#: templates/web/base/report/new/fill_in_details_form.html:163 +#: templates/web/base/report/new/fill_in_details_form.html:144 msgid "<strong>No</strong>, let me confirm my report by email:" msgstr "<strong>No</strong>, potvrdi moju prijavu e-mailom:" @@ -247,13 +210,8 @@ msgstr "<strong>No</strong>, potvrdi moju prijavu e-mailom:" msgid "<strong>No</strong>, let me confirm my update by email:" msgstr "<strong>No</strong>, potvrdi moje ažuriranje e-mailom:" -#: templates/web/base/tokens/confirm_problem.html:19 -#: templates/web/base/tokens/confirm_problem.html:20 -msgid "<strong>We will now send it to the council</strong>." -msgstr "" - #: templates/web/base/auth/general.html:37 -#: templates/web/base/report/new/fill_in_details_form.html:141 +#: templates/web/base/report/new/fill_in_details_form.html:122 #: templates/web/base/report/update-form.html:95 #: templates/web/fixmystreet/auth/general.html:37 #: templates/web/fixmystreet/auth/general.html:39 @@ -267,8 +225,8 @@ msgstr "<strong>Da</strong> Imam password" msgid "About us" msgstr "O nama" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:39 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:52 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:31 #: templates/web/fixmystreet/report/update-form.html:28 @@ -284,26 +242,26 @@ msgid "" " categories of problem) to each body." msgstr "" -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/body.html:56 msgid "Add a contact using the form below." msgstr "" #: templates/web/base/admin/bodies.html:74 -#: templates/web/base/admin/body-form.html:233 +#: templates/web/base/admin/body-form.html:240 #: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "" -#: templates/web/base/admin/body.html:108 +#: templates/web/base/admin/body.html:116 #: templates/web/zurich/admin/body.html:31 msgid "Add new category" msgstr "Dodaj novu kategoriju" -#: templates/web/base/admin/users.html:45 +#: templates/web/base/admin/users.html:47 msgid "Add user" msgstr "" -#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:70 +#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:52 msgid "Added %s" msgstr "Dodano %s" @@ -330,9 +288,7 @@ msgstr "Javi mi buduće promjene" msgid "All Reports" msgstr "Sve Prijave" -#: templates/web/base/footer.html:11 templates/web/fiksgatami/footer.html:23 -#: templates/web/fiksgatami/nn/footer.html:23 -#: templates/web/fixmystreet/footer.html:26 +#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:26 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:19 @@ -349,19 +305,9 @@ 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/base/report/new/councils_text_all.html:12 -#: templates/web/base/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/base/report/new/councils_text_all.html:5 -#: templates/web/base/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/base/report/new/councils_text_all.html:19 -#: templates/web/base/report/new/councils_text_all.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:13 +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_all.html:4 +#: templates/web/base/report/new/fill_in_details_form.html:12 #: templates/web/base/report/new/fill_in_details_form.html:14 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 @@ -378,7 +324,7 @@ msgstr "Ažuriranjem je ovaj problem evidentiran kao popravljen." msgid "Anonymous" msgstr "Anonimno" -#: templates/web/base/admin/report_edit.html:62 +#: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:23 msgid "Anonymous:" msgstr "Anonimno:" @@ -387,18 +333,18 @@ 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/fiksgatami/front/footer-marketing.html:14 #: templates/web/fixmystreet/front/footer-marketing.html:16 msgid "Are you a developer?" msgstr "Jeste li programer?" #: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 msgid "Area covered" msgstr "" #: templates/web/base/admin/bodies.html:15 -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/body.html:60 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "" @@ -416,7 +362,7 @@ msgstr "" msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:163 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:165 #: templates/web/zurich/report/updates.html:11 msgid "Assigned to %s" msgstr "" @@ -429,7 +375,7 @@ msgstr "Većinom %d su zahtjevi vraćeni na query. Vraćeni zahtjevi poredani s msgid "At the moment only searching for and looking at reports work." msgstr "Trenutačno radi samo pretraživanje i pregledavanje prijava." -#: perllib/FixMyStreet/DB/Result/Problem.pm:348 +#: perllib/FixMyStreet/DB/Result/Problem.pm:373 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "" @@ -442,8 +388,8 @@ msgstr "" msgid "Ban email address" msgstr "Onemogući e-mail adrese" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:297 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:301 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" msgstr "" @@ -454,6 +400,7 @@ msgstr "" msgid "Body" msgstr "" +#: templates/web/base/admin/report_edit.html:34 #: templates/web/base/admin/user-form.html:32 msgid "Body:" msgstr "" @@ -466,16 +413,15 @@ msgstr "Po datumu" msgid "Can't see the map? <em>Skip this step</em>" msgstr "Ne možete vidjeti mapu? <em>Preskoči ovaj korak</em>" -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:55 #: templates/web/base/report/new/category.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:53 +#: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 #: templates/web/zurich/admin/stats.html:50 -#: templates/web/zurich/report/new/fill_in_details_form.html:50 msgid "Category" msgstr "Kategorija" @@ -483,17 +429,16 @@ msgstr "Kategorija" msgid "Category fix rate for problems > 4 weeks old" msgstr " Postotak popravaka za kategoriju > staro 4 tjedna" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:138 #: templates/web/base/admin/category_edit.html:23 -#: templates/web/base/admin/report_edit.html:61 -#: templates/web/base/report/new/fill_in_details_form.html:68 +#: templates/web/base/admin/report_edit.html:74 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/report_edit-sdm.html:42 #: templates/web/zurich/admin/report_edit.html:140 msgid "Category:" msgstr "Kategorija:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:377 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383 msgid "Category: %s" msgstr "Kategorija: %s" @@ -504,19 +449,19 @@ msgstr "Kategorija: %s" msgid "Change password" msgstr "Promijeni lozinku" -#: templates/web/base/admin/body.html:152 +#: templates/web/base/admin/body.html:160 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/base/admin/body.html:163 +#: templates/web/base/admin/body.html:171 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/base/admin/body.html:183 +#: templates/web/base/admin/body.html:191 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -527,7 +472,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:122 +#: templates/web/base/admin/body.html:130 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." @@ -543,16 +488,16 @@ msgstr "" msgid "Click map to report a problem" msgstr "Kliknite mapu da prijavite problem" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:45 -#: templates/web/base/admin/report_edit.html:47 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:58 +#: templates/web/base/admin/report_edit.html:60 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/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:95 #: templates/web/zurich/admin/report_edit.html:97 #: templates/web/zurich/admin/stats.html:31 @@ -560,11 +505,12 @@ msgstr "Kliknite mapu da prijavite problem" msgid "Closed" msgstr "Zatvoreno" -#: perllib/FixMyStreet/DB/Result/Problem.pm:762 +#: perllib/FixMyStreet/DB/Result/Problem.pm:771 msgid "Closed by council" msgstr "Zatvorilo je odgovorno tijelo" -#: templates/web/base/my/my.html:40 templates/web/fixmystreet/my/my.html:46 +#: templates/web/base/my/my.html:40 +#: templates/web/fixmystreet/my/_problem-list.html:12 msgid "Closed reports" msgstr "Zatvorene prijave" @@ -572,7 +518,7 @@ msgstr "Zatvorene prijave" msgid "Closed:" msgstr "Zatvoreno:" -#: templates/web/base/around/tabbed_lists.html:11 +#: templates/web/base/around/tabbed_lists.html:10 #: templates/web/base/around/tabbed_lists.html:12 msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "Najbliži problemi <small>(within %skm)</small>" @@ -587,26 +533,26 @@ msgstr "Koordinate:" msgid "Cobrand" msgstr "Cobrand" -#: templates/web/base/admin/report_edit.html:75 +#: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:50 msgid "Cobrand data:" msgstr "Cobrand podaci:" -#: templates/web/base/admin/report_edit.html:74 +#: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:49 msgid "Cobrand:" msgstr "Cobrand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" -#: templates/web/base/admin/category_edit.html:47 +#: templates/web/base/admin/category_edit.html:52 msgid "Configure Endpoint" msgstr "Konfiguriraj Endpoint" -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/body.html:72 msgid "Confirm" msgstr "Potvrdi" @@ -627,10 +573,10 @@ msgstr "Potvrdi pomoću dolje navedene e-mail adrese, a potom upiši novu lozink msgid "Confirmation" msgstr "Potvrda" -#: templates/web/base/admin/body.html:158 -#: templates/web/base/admin/body.html:71 -#: templates/web/base/admin/category_edit.html:32 -#: templates/web/base/admin/category_edit.html:84 +#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/category_edit.html:37 +#: templates/web/base/admin/category_edit.html:89 #: templates/web/zurich/admin/stats.html:40 msgid "Confirmed" msgstr "Potvrđeno" @@ -641,7 +587,7 @@ msgstr "Potvrđene prijave između %s i %s" #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 -#: templates/web/base/admin/report_edit.html:70 +#: templates/web/base/admin/report_edit.html:83 msgid "Confirmed:" msgstr "Potvrđeno:" @@ -658,13 +604,12 @@ msgid "Contact Us" msgstr "Kontaktiraj nas" #: templates/web/base/contact/index.html:6 -#: templates/web/base/contact/submit.html:3 #: templates/web/fixmystreet/contact/index.html:20 msgid "Contact the team" msgstr "Kontaktiraj tim" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1327 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1355 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1325 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1353 msgid "Could not find user" msgstr "Nepoznati korisnik" @@ -682,6 +627,10 @@ msgstr "Vijeće" msgid "Council contacts for %s" msgstr "Kontakti vijeća za %s" +#: perllib/FixMyStreet/DB/Result/Problem.pm:670 +msgid "Council ref: %s" +msgstr "odgovorno tijelo ref: %s" + #: templates/web/base/admin/stats.html:84 msgid "Council:" msgstr "Vijeće:" @@ -697,7 +646,7 @@ msgstr "Brojač" msgid "Create a report" msgstr "Kreiraj izvješće" -#: templates/web/base/admin/body.html:200 +#: templates/web/base/admin/body.html:208 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Kreiraj kategoriju" @@ -709,7 +658,7 @@ msgid "Created" msgstr "Kreirano" #: templates/web/base/admin/list_updates.html:38 -#: templates/web/base/admin/report_edit.html:69 +#: templates/web/base/admin/report_edit.html:82 #: templates/web/base/admin/update_edit.html:51 #: templates/web/zurich/admin/report_edit-sdm.html:47 #: templates/web/zurich/admin/report_edit.html:61 @@ -726,7 +675,7 @@ msgstr "Trenutno stanje" msgid "Currently no bodies have been created." msgstr "" -#: templates/web/base/dashboard/index.html:6 +#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 msgid "Dashboard" msgstr "Nadzorna ploča" @@ -736,14 +685,14 @@ msgid "Dealt with by subdivision within 5 working days" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:169 -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:37 -#: templates/web/base/admin/category_edit.html:85 +#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:81 +#: templates/web/base/admin/category_edit.html:42 +#: templates/web/base/admin/category_edit.html:90 msgid "Deleted" msgstr "Izbrisano" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:43 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -763,7 +712,7 @@ msgstr "Detalji" msgid "Details:" msgstr "Detalji:" -#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/body.html:87 msgid "Devolved" msgstr "Prenešeno" @@ -791,8 +740,8 @@ msgstr "Ne’znam" msgid "Don't like forms?" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:47 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:60 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:32 #: templates/web/fixmystreet/report/update-form.html:28 @@ -800,7 +749,7 @@ msgstr "" msgid "Duplicate" msgstr "" -#: templates/web/base/admin/body.html:98 +#: templates/web/base/admin/body.html:106 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" @@ -810,20 +759,20 @@ msgstr "" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 -#: templates/web/base/admin/users.html:31 +#: templates/web/base/admin/users.html:33 #: templates/web/zurich/admin/problem_row.html:42 msgid "Edit" msgstr "Uredi" -#: templates/web/base/admin/body.html:212 +#: templates/web/base/admin/body.html:220 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "" #: templates/web/base/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:2 +#: 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:2 +#: templates/web/zurich/admin/report_edit.html:1 #: templates/web/zurich/admin/report_edit.html:5 msgid "Editing problem %d" msgstr "Uređivanje problema %d" @@ -837,12 +786,12 @@ msgstr "Uređivanje ažuriranja %d" msgid "Editing user %d" msgstr "Uređivane korisnika %d" -#: templates/web/base/admin/category_edit.html:86 +#: templates/web/base/admin/category_edit.html:91 msgid "Editor" msgstr "Urednik" #: templates/web/base/admin/bodies.html:23 -#: templates/web/base/admin/category_edit.html:83 +#: templates/web/base/admin/category_edit.html:88 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 #: templates/web/fixmystreet/auth/general.html:21 @@ -853,15 +802,23 @@ msgstr "Urednik" msgid "Email" msgstr "E-mail" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1303 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1301 msgid "Email added to abuse list" msgstr "E-mail dodan na listu zloupotrebe" -#: templates/web/base/admin/body.html:147 +#: templates/web/base/admin/body.html:155 msgid "Email address:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1300 +#: templates/web/base/tokens/confirm_alert.html:6 +msgid "Email alert created" +msgstr "" + +#: templates/web/base/tokens/confirm_alert.html:10 +msgid "Email alert deleted" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1298 msgid "Email already in abuse list" msgstr "E-mail je već na listi zloupotrebe" @@ -873,8 +830,8 @@ msgstr "Pošalji nam e-mail o novom lokalnom problemu" msgid "Email me updates" msgstr "Pošalji mi e-mail o ažuriranjima" -#: templates/web/base/admin/category_edit.html:26 -#: templates/web/base/admin/report_edit.html:67 +#: templates/web/base/admin/category_edit.html:31 +#: templates/web/base/admin/report_edit.html:80 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 @@ -885,32 +842,32 @@ msgstr "Pošalji mi e-mail o ažuriranjima" msgid "Email:" msgstr "E-mail:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:322 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 msgid "Email: %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 msgid "Empty flat or maisonette" msgstr "Prazan stan ili kućica" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:631 msgid "Empty house or bungalow" msgstr "Prazna kuća ili bungalov" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:622 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty office or other commercial" msgstr "Prazan ured ili poslovni prostor" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:623 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Empty pub or bar" msgstr "Prazan kafić ili bar" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:624 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty public building - school, hospital, etc." msgstr "Prazne javne zgrade - škola, bolnica, itd." -#: templates/web/base/admin/body-form.html:158 -#: templates/web/base/admin/body-form.html:159 +#: templates/web/base/admin/body-form.html:162 +#: templates/web/base/admin/body-form.html:163 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" @@ -918,8 +875,8 @@ msgid "" " <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>." msgstr "" -#: templates/web/base/admin/body-form.html:215 -#: templates/web/base/admin/body-form.html:216 +#: templates/web/base/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:223 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" @@ -930,11 +887,11 @@ msgstr "" msgid "End Date:" msgstr "" -#: templates/web/base/admin/body-form.html:126 +#: templates/web/base/admin/body-form.html:130 msgid "Endpoint" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:72 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:73 msgid "Enter a Zürich street name" msgstr "" @@ -947,7 +904,9 @@ msgstr "Unesi obližnji poštanski broj ili ime ulice i kvarta" msgid "Enter a nearby postcode, or street name and area" msgstr "Unesi obližnji poštanski broj ili ime ulice i kvarta" +#: templates/web/base/around/postcode_form.html:1 #: templates/web/base/around/postcode_form.html:2 +#: templates/web/fixmystreet/around/postcode_form.html:10 #: templates/web/fixmystreet/around/postcode_form.html:11 msgid "Enter a nearby street name and area" msgstr "Unesi ime obližnje ulice i kvarta" @@ -957,7 +916,7 @@ msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "" #: templates/web/base/auth/general.html:64 -#: templates/web/base/report/new/fill_in_details_form.html:170 +#: templates/web/base/report/new/fill_in_details_form.html:151 #: templates/web/base/report/update-form.html:124 msgid "Enter a new password:" msgstr "Unesi novu lozinku:" @@ -969,7 +928,7 @@ msgstr "Unesi novu lozinku:" msgid "Enter a password" msgstr "Unesi lozinku" -#: templates/web/base/index-steps.html:33 +#: templates/web/base/index-steps.html:26 msgid "Enter details of the problem" msgstr "Unesi detalje o problemu" @@ -992,17 +951,22 @@ msgstr "Primjer poštanskog broja %s" msgid "Examples:" msgstr "Primjeri:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:47 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" -#: templates/web/base/admin/report_edit.html:76 +#: templates/web/base/admin/body-form.html:81 +msgid "External URL" +msgstr "" + +#: templates/web/base/admin/category_edit.html:27 +#: templates/web/base/admin/report_edit.html:92 msgid "Extra data:" msgstr "Dodatni podaci:" -#: templates/web/base/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>." +#: templates/web/base/contact/submit.html:13 +msgid "Failed to send message" +msgstr "" #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 @@ -1014,7 +978,7 @@ msgstr "" msgid "First time" msgstr "Prvi put" -#: templates/web/base/admin/body.html:40 +#: templates/web/base/admin/body.html:48 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" @@ -1053,9 +1017,9 @@ msgstr "" "županijskog vijeća." #: templates/web/base/admin/index.html:55 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:41 -#: templates/web/base/admin/report_edit.html:42 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:54 +#: templates/web/base/admin/report_edit.html:55 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/update-form.html:30 @@ -1066,17 +1030,18 @@ msgstr "" msgid "Fixed" msgstr "Popravljeno" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:43 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:56 msgid "Fixed - Council" msgstr "Popravljeno - odgovorno tijelo" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:42 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:55 msgid "Fixed - User" msgstr "Popravljeno - Korisnik" -#: templates/web/base/my/my.html:35 templates/web/fixmystreet/my/my.html:41 +#: templates/web/base/my/my.html:35 +#: templates/web/fixmystreet/my/_problem-list.html:7 msgid "Fixed reports" msgstr "Popravljene prijave" @@ -1084,7 +1049,7 @@ msgstr "Popravljene prijave" msgid "Fixed:" msgstr "Popravljeno:" -#: templates/web/base/admin/body-form.html:84 +#: templates/web/base/admin/body-form.html:89 #: templates/web/zurich/admin/body-form.html:36 msgid "Flag as deleted" msgstr "" @@ -1093,7 +1058,7 @@ msgstr "" msgid "Flag user" msgstr "Označi korisnika" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Označen" @@ -1102,7 +1067,7 @@ msgstr "Označen" msgid "Flagged reports and users" msgstr "" -#: templates/web/base/admin/user-form.html:45 +#: templates/web/base/admin/user-form.html:46 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page." msgstr "" @@ -1110,8 +1075,8 @@ msgstr "" msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." msgstr "" -#: templates/web/base/admin/report_edit.html:78 -#: templates/web/base/admin/user-form.html:51 +#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/user-form.html:52 msgid "Flagged:" msgstr "Označen:" @@ -1120,10 +1085,6 @@ msgstr "Označen:" msgid "Follow a ward link to view only reports within that ward." msgstr "" -#: templates/web/base/admin/report_edit.html:30 -msgid "For council(s):" -msgstr "Za županiju(e):" - #: templates/web/base/admin/body-form.html:65 msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "" @@ -1136,8 +1097,6 @@ msgstr "Zaboravili ste šifru?" #: templates/web/base/faq/faq-en-gb.html:1 #: templates/web/base/static/privacy.html:1 #: templates/web/base/static/privacy.html:2 -#: templates/web/fiksgatami/faq/faq-nb.html:1 -#: templates/web/fiksgatami/nn/faq/faq-nn.html:1 msgid "Frequently Asked Questions" msgstr "Često postavljana pitanja" @@ -1150,13 +1109,13 @@ msgstr "GeoRSS na Google Mapama" msgid "Get updates" msgstr "Primite ažuriranja" -#: templates/web/fixmystreet/reports/_rss.html:4 +#: templates/web/fixmystreet/reports/_rss.html:3 #: 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:4 +#: templates/web/fixmystreet/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "Primite ažuriranja problema u ovom %s" @@ -1165,6 +1124,10 @@ msgstr "Primite ažuriranja problema u ovom %s" msgid "Give me an RSS feed" msgstr "Prijavi se na RSS izvor" +#: templates/web/base/questionnaire/completed.html:14 +msgid "Glad to hear it’s been fixed!" +msgstr "" + #: templates/web/base/alert/index.html:34 #: templates/web/base/around/postcode_form.html:8 #: templates/web/fixmystreet/around/postcode_form.html:21 @@ -1172,7 +1135,7 @@ msgstr "Prijavi se na RSS izvor" msgid "Go" msgstr "Idi" -#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:93 msgid "Going to send questionnaire?" msgstr "Pošalji upitnik?" @@ -1194,9 +1157,7 @@ msgstr "Je li ovaj problem popravljen?" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "Jeste li prije prijavljivali problem odgovornom tijelu ili je ovo prvi put?" -#: templates/web/base/footer.html:15 templates/web/fiksgatami/footer.html:27 -#: templates/web/fiksgatami/nn/footer.html:27 -#: templates/web/fixmystreet/footer.html:30 +#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:30 #: templates/web/zurich/faq/faq-de-ch.html:1 #: templates/web/zurich/footer.html:21 #: templates/web/zurich/nav_over_content.html:8 @@ -1208,18 +1169,17 @@ msgstr "Pomoć" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "Vrste upozorenja za lokalne probleme ‘%s’." -#: templates/web/fiksgatami/header.html:48 -#: templates/web/fixmystreet/header.html:52 +#: templates/web/fixmystreet/header.html:58 #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "Zdravo %s" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:50 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:63 +#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/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:86 #: templates/web/zurich/admin/report_edit.html:90 #: templates/web/zurich/admin/stats.html:32 @@ -1235,7 +1195,7 @@ msgstr "Sakrij staro" msgid "Hide pins" msgstr "Sakrij pinove" -#: templates/web/base/admin/category_edit.html:79 +#: templates/web/base/admin/category_edit.html:84 msgid "History" msgstr "Povijest" @@ -1251,19 +1211,25 @@ msgstr "Kako prijaviti problem" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:740 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Nažalost, ne možeš potvrditi nepotvrđena izvješća" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:89 +#: templates/web/base/tokens/confirm_problem.html:23 +#: templates/web/base/tokens/confirm_problem.html:27 +msgid "I just reported a problem on @fixmystreet" +msgstr "" + +#: templates/web/base/tokens/confirm_update.html:19 +#: templates/web/base/tokens/confirm_update.html:23 +msgid "I just updated a problem on @fixmystreet" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Nažalost, ne možemo locirati tvoj problem u bazi podataka.⏎\n" -#: 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 "Nažalost, ne možemo provjeriti token jer je prijava davno izvršena." - -#: perllib/FixMyStreet/App/Controller/Tokens.pm:260 +#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 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" @@ -1285,7 +1251,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:125 +#: templates/web/base/admin/body.html:133 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." @@ -1303,7 +1269,12 @@ msgstr "" msgid "If you do not, your update will not be posted." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:9 +#: templates/web/base/questionnaire/completed.html:8 +msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." +msgstr "" + +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:8 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." @@ -1321,34 +1292,34 @@ msgstr "" "Ako želite iznijeti javno ažuriranje o problemu, molimo unesite ga ovdje\n" "(imajte na umu da neće biti poslano odgovornom tijelu). Na primjer, kakvo je vaše mišljenje o rješavanju problema?" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/body.html:149 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/base/admin/body-form.html:200 -#: templates/web/base/admin/body-form.html:201 +#: templates/web/base/admin/body-form.html:207 +#: templates/web/base/admin/body-form.html:208 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable <strong>extended Open311 stauses</strong> if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/body-form.html:187 -#: templates/web/base/admin/body-form.html:188 +#: templates/web/base/admin/body-form.html:194 +#: templates/web/base/admin/body-form.html:195 msgid "" "If you've enabled Open311 update-sending above, enable <strong>suppression of alerts</strong> \n" " if you do <strong>not</strong> want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/body-form.html:173 -#: templates/web/base/admin/body-form.html:174 +#: templates/web/base/admin/body-form.html:177 +#: templates/web/base/admin/body-form.html:178 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:127 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 msgid "Illegal ID" msgstr "Ilegalan ID" @@ -1373,17 +1344,21 @@ msgstr "" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "Nadalje, sljedeća svojstva koja nisu dio Open311 v2 specifikacija su vraćena: agencijski _poslano_datum-vrijeme, naslov (također vraćen kao dio opisa), sučelje_korišteno, brojač_komentara, ime_pretražitelja(prisutno samo ako je tražitelj dopustio prikaz imena na ovoj stranici)." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:38 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:144 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 #: templates/web/fixmystreet/report/banner.html:19 -#: templates/web/zurich/admin/header.html:2 +#: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 #: templates/web/zurich/admin/report_edit.html:99 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "U tijeku" +#: templates/web/base/tokens/confirm_alert.html:11 +msgid "Inbox zero, here we come!" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:160 msgid "Include reporter personal details" msgstr "" @@ -1392,7 +1367,7 @@ msgstr "" msgid "Include unconfirmed reports" msgstr "Uključi nepotvrđene prijave" -#: perllib/FixMyStreet/App/Controller/Open311.pm:354 +#: perllib/FixMyStreet/App/Controller/Open311.pm:359 msgid "Incorrect has_photo value \"%s\"" msgstr "Pogrešno ima_foto vrijednost\"%s\"" @@ -1400,29 +1375,29 @@ msgstr "Pogrešno ima_foto vrijednost\"%s\"" msgid "Internal notes" msgstr "" -#: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:61 msgid "Internal referral" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:339 +#: perllib/FixMyStreet/App/Controller/Open311.pm:344 msgid "Invalid agency_responsible value %s" msgstr "Nevažeća odgovorna_vrijednost agencije %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1114 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1112 msgid "Invalid end date" msgstr "Nevažeći datum završetka" -#: perllib/FixMyStreet/App/Controller/Open311.pm:432 +#: perllib/FixMyStreet/App/Controller/Open311.pm:437 msgid "Invalid format %s specified." msgstr "Naveden nevažeći %s format." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1110 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 msgid "Invalid start date" msgstr "Nevažeći datum početka" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:37 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:50 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 #: templates/web/base/report/update-form.html:30 @@ -1436,8 +1411,12 @@ msgstr "Istražujem" msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "" +#: templates/web/base/tokens/confirm_problem.html:14 +msgid "It’s on its way to the council right now." +msgstr "" + #: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:150 +#: templates/web/base/report/new/fill_in_details_form.html:131 #: templates/web/base/report/update-form.html:104 #: templates/web/fixmystreet/auth/general.html:47 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 @@ -1446,12 +1425,12 @@ msgstr "" msgid "Keep me signed in on this computer" msgstr "Ostani prijavljen na ovom računalu" -#: templates/web/base/admin/body.html:62 +#: templates/web/base/admin/body.html:70 #: templates/web/zurich/admin/body.html:16 msgid "Last editor" msgstr "Posljednji " -#: templates/web/base/admin/report_edit.html:72 +#: templates/web/base/admin/report_edit.html:88 msgid "Last update:" msgstr "Posljednje ažuriranje" @@ -1459,43 +1438,38 @@ msgstr "Posljednje ažuriranje" msgid "Last update:" msgstr "Posljednje ažuriranje:" -#: templates/web/base/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:229 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "" -#: templates/web/base/admin/body.html:17 templates/web/base/admin/body.html:19 +#: templates/web/base/admin/body.html:27 msgid "List all reported problems" msgstr "Izlistaj sve prijavljenje probleme" -#: templates/web/base/report/new/fill_in_details_form.html:69 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:54 -#: templates/web/zurich/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/category_wrapper.html:4 msgid "Loading..." msgstr "Učitavanje" #: templates/web/base/alert/choose.html:1 #: templates/web/base/alert/choose.html:3 #: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3 -#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:5 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5 #: templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 -#: templates/web/base/tokens/confirm_alert.html:4 #: templates/web/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "Lokalni RSS izvori i e-mail upozorenja" -#: templates/web/base/alert/list.html:13 templates/web/base/alert/list.html:14 -#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:3 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:12 +#: templates/web/base/alert/list.html:14 templates/web/base/alert/list.html:3 msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Lokalni RSS izvori i e-mail upozorenja za‘%s’" -#: templates/web/base/footer.html:13 templates/web/fiksgatami/footer.html:25 -#: templates/web/fiksgatami/nn/footer.html:25 -#: templates/web/fixmystreet/footer.html:28 +#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:28 msgid "Local alerts" msgstr "Lokalna upozorenja" -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:25 msgid "Locate the problem on a map of the area" msgstr "Lociraj problem na mapi područja" @@ -1504,17 +1478,26 @@ msgid "MAP" msgstr "" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" msgstr "" -#: perllib/FixMyStreet/Map/OSM.pm:42 -msgid "Map © <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 "Mapiraj i kopiraj; <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> i kontributori, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA</a>" +#: templates/web/base/admin/report_edit.html:86 +msgid "Mark as sent" +msgstr "" -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/user-form.html:44 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." msgstr "" +#: templates/web/base/reports/index.html:24 +msgid "Marked fixed/closed in the past eight weeks" +msgstr "" + +#: templates/web/base/reports/index.html:25 +msgid "Marked fixed/closed more than eight weeks ago" +msgstr "" + #: templates/web/fixmystreet/contact/index.html:106 msgid "Message" msgstr "Poruka" @@ -1523,7 +1506,7 @@ msgstr "Poruka" msgid "Message:" msgstr "Poruka:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:440 +#: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" msgstr "Nedostaje nadležni_ID" @@ -1553,11 +1536,11 @@ msgstr "Više problema u blizini" #: templates/web/fixmystreet/report/update-form.html:138 #: 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:94 +#: templates/web/zurich/report/new/fill_in_details_form.html:77 msgid "Name" msgstr "Ime" -#: templates/web/base/admin/report_edit.html:66 +#: templates/web/base/admin/report_edit.html:79 #: templates/web/base/admin/update_edit.html:32 #: templates/web/base/admin/user-form.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:43 @@ -1566,25 +1549,25 @@ msgstr "Ime" msgid "Name:" msgstr "Ime:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:321 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:313 msgid "Name: %s" msgstr "" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:186 -#: perllib/FixMyStreet/Geocode/OSM.pm:164 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 +#: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "Najbliža imenovana cesta smještena pokraj oznake na mapi (automatski generirano pomoću OpenStreetMap): %s%s" -#: perllib/FixMyStreet/Cobrand/UK.pm:137 +#: perllib/FixMyStreet/Cobrand/UK.pm:127 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:421 -#: perllib/FixMyStreet/Cobrand/Default.pm:461 +#: perllib/FixMyStreet/Cobrand/Default.pm:442 +#: perllib/FixMyStreet/Cobrand/Default.pm:482 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:288 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:277 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1600,11 +1583,11 @@ msgstr "Skoro učinjeno! Sada provjeri svoj e-mail..." msgid "New <br>problems" msgstr "Novi <br>problemi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:264 +#: perllib/FixMyStreet/App/Controller/Admin.pm:261 msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:379 msgid "New category contact added" msgstr "Novi kontakt dodan u kategoriju" @@ -1677,15 +1660,15 @@ msgstr "" msgid "Next" msgstr "" -#: templates/web/base/admin/body.html:72 templates/web/base/admin/body.html:74 -#: templates/web/base/admin/body.html:78 templates/web/base/admin/body.html:80 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:93 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:44 @@ -1703,7 +1686,7 @@ msgstr "" msgid "No council" msgstr "Nema odgovornog tijela" -#: perllib/FixMyStreet/DB/Result/Problem.pm:376 +#: perllib/FixMyStreet/DB/Result/Problem.pm:401 msgid "No council selected" msgstr "Nije odabrano odgovorno tijelo" @@ -1744,12 +1727,12 @@ msgid "" " your config file is not pointing to a live MapIt service." msgstr "" -#: templates/web/base/report/_support.html:3 +#: templates/web/base/report/_support.html:2 #: templates/web/base/report/_support.html:4 msgid "No supporters" msgstr "Bez podrške" -#: templates/web/base/admin/report_edit.html:30 +#: templates/web/base/admin/report_edit.html:41 #: templates/web/zurich/admin/report_edit-sdm.html:46 #: templates/web/zurich/admin/report_edit.html:60 msgid "None" @@ -1764,8 +1747,8 @@ msgid "" " activity across their body), the ability to hide reports or set special report statuses." msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:46 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -1781,12 +1764,12 @@ msgstr "" msgid "Not reported before" msgstr "Nije prethodno prijavljeno" -#: templates/web/base/report/_main.html:61 +#: templates/web/base/report/_main.html:62 msgid "Not reported to council" msgstr "Nije prijavljeno odgovornom tijelu" -#: templates/web/base/admin/body.html:63 -#: templates/web/base/admin/category_edit.html:87 +#: templates/web/base/admin/body.html:71 +#: templates/web/base/admin/category_edit.html:92 #: templates/web/zurich/admin/body.html:17 msgid "Note" msgstr "Napomena" @@ -1795,8 +1778,8 @@ msgstr "Napomena" 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 "Imajte na umu da kada uključujemo nepotvrđene prijave koristimo datum kada je prijava napravljena koji ne mora biti u istom mjesecu kada je prijava potvrđena pa stoga datumi mogu varirati" -#: templates/web/base/admin/body.html:178 -#: templates/web/base/admin/category_edit.html:44 +#: templates/web/base/admin/body.html:186 +#: templates/web/base/admin/category_edit.html:49 #: templates/web/zurich/admin/body.html:53 msgid "Note:" msgstr "Napomena:" @@ -1809,7 +1792,7 @@ msgstr "Napomena: <strong>%s</strong>" msgid "Now to submit your report…" msgstr "Podnesite svoju prijavu…" -#: templates/web/base/report/new/fill_in_details_form.html:132 +#: templates/web/base/report/new/fill_in_details_form.html:113 msgid "Now to submit your report… do you have a FixMyStreet password?" msgstr "Podnesite svoju prijavu… imate li Popravi.to lozinku?" @@ -1826,7 +1809,7 @@ msgid "OK" msgstr "" #: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:16 +#: templates/web/base/report/update.html:17 msgid "Offensive? Unsuitable? Tell us" msgstr "Uvredljivo? Neprikladno? Recite nam" @@ -1846,19 +1829,19 @@ msgstr "Starije <br>popravljeno" msgid "Older <br>problems" msgstr "Stariji <br>problemi" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:37 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 msgid "One-line summary" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:137 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:36 -#: templates/web/base/admin/report_edit.html:37 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:138 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:49 +#: templates/web/base/admin/report_edit.html:50 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/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:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/report_edit.html:86 #: templates/web/zurich/admin/report_edit.html:88 @@ -1867,10 +1850,19 @@ msgstr "" msgid "Open" msgstr "Otvori" -#: templates/web/base/my/my.html:30 templates/web/fixmystreet/my/my.html:36 +#: templates/web/base/reports/index.html:22 +msgid "Open for more than four weeks, with an update within the past eight weeks" +msgstr "" + +#: templates/web/base/my/my.html:30 +#: templates/web/fixmystreet/my/_problem-list.html:2 msgid "Open reports" msgstr "Otvori izvješća" +#: templates/web/base/reports/index.html:23 +msgid "Open, but not had any update in eight weeks" +msgstr "" + #: templates/web/base/open311/index.html:70 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "Open311 API za Popravi.to server" @@ -1893,15 +1885,15 @@ msgstr "Ili problemi prijavljeni:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Ili se možete pretplatiti na upozorenja unutar vašeg vijeća ’:" -#: 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:560 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 -#: perllib/FixMyStreet/DB/Result/Problem.pm:592 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:372 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 +#: perllib/FixMyStreet/DB/Result/Problem.pm:597 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:393 msgid "Other" msgstr "Drugo" @@ -1923,8 +1915,8 @@ msgstr "Stranica nije pronađena" msgid "Parent" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 msgid "Partial" msgstr "Djelomično" @@ -1944,7 +1936,7 @@ msgstr "Lozinka:" msgid "Permalink" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:100 +#: templates/web/zurich/report/new/fill_in_details_form.html:83 msgid "Phone number" msgstr "" @@ -1953,27 +1945,27 @@ msgstr "" msgid "Phone number (optional)" msgstr "Telefonski broj (neobavezan)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:286 -#: templates/web/base/admin/report_edit.html:68 -#: templates/web/base/report/new/fill_in_details_form.html:216 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:291 +#: templates/web/base/admin/report_edit.html:81 +#: templates/web/base/report/new/fill_in_details_form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:46 #: templates/web/zurich/admin/report_edit.html:60 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Telefon:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:72 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 #: 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 +#: templates/web/zurich/report/new/fill_in_details_form.html:51 msgid "Photo" msgstr "Slika" #: templates/web/base/questionnaire/index.html:71 -#: templates/web/base/report/new/fill_in_details_form.html:103 +#: templates/web/base/report/new/fill_in_details_form.html:84 #: templates/web/base/report/update-form.html:62 #: templates/web/fixmystreet/questionnaire/index.html:91 msgid "Photo:" @@ -1987,11 +1979,11 @@ msgstr "Fotografije posljednjih obližnjih prijava" msgid "Place pin on map" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:38 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/zurich/admin/header.html:2 +#: 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:86 @@ -2025,20 +2017,19 @@ msgstr "Provjeri svoj e-mail" msgid "Please check your email address is correct" msgstr "Provjerite je li vaša e-mail adresa točna" -#: perllib/FixMyStreet/App/Controller/Admin.pm:349 -#: 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:395 +#: perllib/FixMyStreet/App/Controller/Admin.pm:343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:876 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 +#: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" msgstr "Izaberi kategoriju" -#: perllib/FixMyStreet/DB/Result/Problem.pm:401 +#: perllib/FixMyStreet/DB/Result/Problem.pm:418 msgid "Please choose a property type" msgstr "Izaberi tip imovine" -#: perllib/FixMyStreet/App/Controller/Admin.pm:376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:370 msgid "Please correct the errors below" msgstr "" @@ -2057,8 +2048,8 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:352 -#: perllib/FixMyStreet/DB/Result/Comment.pm:133 +#: perllib/FixMyStreet/App/Controller/Admin.pm:346 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "Unesi poruku" @@ -2069,15 +2060,15 @@ msgstr "Unesi poruku" msgid "Please enter a password" msgstr "Unesi lozinku" -#: perllib/FixMyStreet/App/Controller/Contact.pm:108 -#: perllib/FixMyStreet/DB/Result/Problem.pm:370 +#: perllib/FixMyStreet/App/Controller/Contact.pm:113 +#: perllib/FixMyStreet/DB/Result/Problem.pm:395 #: templates/web/base/js/translation_strings.html:3 msgid "Please enter a subject" msgstr "Unesi predmet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1050 -#: perllib/FixMyStreet/App/Controller/Admin.pm:351 -#: perllib/FixMyStreet/App/Controller/Admin.pm:997 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin.pm:995 #: perllib/FixMyStreet/DB/Result/User.pm:127 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 @@ -2085,16 +2076,16 @@ msgid "Please enter a valid email" msgstr "Unesi valjani e-mail" #: perllib/FixMyStreet/App/Controller/Alert.pm:346 -#: perllib/FixMyStreet/App/Controller/Contact.pm:118 +#: perllib/FixMyStreet/App/Controller/Contact.pm:123 msgid "Please enter a valid email address" msgstr "Unesi valjanu e-mail adresu" -#: perllib/FixMyStreet/DB/Result/Problem.pm:373 +#: perllib/FixMyStreet/DB/Result/Problem.pm:398 #: templates/web/base/js/translation_strings.html:4 msgid "Please enter some details" msgstr "Unesi detalje" -#: perllib/FixMyStreet/App/Controller/Contact.pm:107 +#: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/User.pm:124 #: templates/web/base/auth/general.html:13 #: templates/web/base/auth/general.html:8 @@ -2108,7 +2099,7 @@ msgid "Please enter your email" msgstr "Unesi svoj e-mail" #: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:75 msgid "Please enter your email address" msgstr "Unesi svoju e-mail adresu" @@ -2116,14 +2107,14 @@ msgstr "Unesi svoju e-mail adresu" msgid "Please enter your first name" msgstr "Unesi svoje ime" -#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: perllib/FixMyStreet/Cobrand/UK.pm:318 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Molimo unesite svoje puno ime, odgovorno tijelo treba ovu informaciju – ako ne želite da vaše ime bude prikazano na stranici, odznačite kvadratić ispod" -#: perllib/FixMyStreet/App/Controller/Contact.pm:106 -#: perllib/FixMyStreet/DB/Result/Comment.pm:130 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Contact.pm:111 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 +#: perllib/FixMyStreet/DB/Result/Problem.pm:406 #: perllib/FixMyStreet/DB/Result/User.pm:120 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" @@ -2146,7 +2137,7 @@ msgstr "Unesite svoju titulu" msgid "Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a href=\"/\">front page</a>." msgstr "" -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:8 msgid "Please fill in details of the problem below." msgstr "Popunite detalje o problemu u nastavku." @@ -2161,7 +2152,7 @@ msgstr "Popunite detalje o problemu u nastavku." msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "Popunite detalje o problemu u nastavku i opišite lokaciju što preciznije." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:251 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Molimo navedite želite li primiti novi upitnik" @@ -2184,16 +2175,16 @@ msgstr "Napominjemo da vaša prijava <strong>još nije poslana</strong>. Izaberi msgid "Please note:" msgstr "Napominjemo:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:246 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:254 msgid "Please provide some explanation as to why you're reopening this report" msgstr "Molimo navedite obrazloženje ponovnog otvaranja ove prijave" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:261 msgid "Please provide some text as well as a photo" msgstr "Molimo unesite tekst i fotografiju " -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:247 msgid "Please say whether you've ever reported a problem to your council before" msgstr "Jeste li do sada ikada prijavljivali problem odgovoronom tijelu" @@ -2205,7 +2196,7 @@ msgstr "Izaberite izvor koji želite" msgid "Please select the type of alert you want" msgstr "Izaberite tip upozorenja koji želite" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please state whether or not the problem has been fixed" msgstr "Navedite je li problem rješen " @@ -2213,15 +2204,13 @@ msgstr "Navedite je li problem rješen " msgid "Please take a look at the updates that have been left." msgstr "Pregledajte ažuriranja" -#: perllib/FixMyStreet/App/Controller/Photo.pm:176 +#: perllib/FixMyStreet/App/Controller/Photo.pm:177 +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 +#: perllib/FixMyStreet/App/Controller/Photo.pm:189 msgid "Please upload a JPEG image only" msgstr "Molimo učitajte samo JPEG slike" -#: perllib/FixMyStreet/App/Controller/Photo.pm:183 -msgid "Please upload a JPEG image only\n" -msgstr "Molimo učitajte samo JPEG slike\n" - -#: perllib/FixMyStreet/App/Controller/Contact.pm:109 +#: perllib/FixMyStreet/App/Controller/Contact.pm:114 msgid "Please write a message" msgstr "Napiši poruku" @@ -2260,14 +2249,14 @@ msgstr "" msgid "Privacy" msgstr "" -#: templates/web/base/admin/body.html:194 -#: templates/web/base/admin/body.html:77 -#: templates/web/base/admin/category_edit.html:40 -#: templates/web/base/admin/report_edit.html:79 +#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:85 +#: templates/web/base/admin/category_edit.html:45 +#: templates/web/base/admin/report_edit.html:95 msgid "Private" msgstr "Privatno" -#: templates/web/base/maps/openlayers.html:86 +#: templates/web/base/maps/openlayers.html:89 msgid "Problem" msgstr "Problem" @@ -2288,7 +2277,7 @@ msgstr "Problem %s poslan odgovornom tijelu %s" msgid "Problem breakdown by state" msgstr "Analiza problema prema stanju" -#: perllib/FixMyStreet/App/Controller/Admin.pm:968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:966 msgid "Problem marked as open." msgstr "Problem označen kao otvoren." @@ -2323,16 +2312,15 @@ 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:629 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:114 +#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:151 -#: perllib/FixMyStreet/Cobrand/UK.pm:217 +#: perllib/FixMyStreet/Cobrand/UK.pm:207 msgid "Problems within %s" msgstr "Problemi unutar %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:122 -#: perllib/FixMyStreet/Cobrand/UK.pm:231 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "Problems within %s ward" msgstr "Problemi unutar %s ward" @@ -2350,7 +2338,7 @@ msgstr "Problemi unutar granice:" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "Objekti nedavno prijavljeni za ponovno korištenje na praznakuco.joj" -#: templates/web/base/admin/report_edit.html:32 +#: templates/web/base/admin/report_edit.html:45 msgid "Property address:" msgstr "" @@ -2367,7 +2355,7 @@ 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/base/report/new/fill_in_details_form.html:174 +#: templates/web/base/report/new/fill_in_details_form.html:155 #: templates/web/base/report/update-form.html:128 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 #: templates/web/fixmystreet/report/update-form.html:119 @@ -2388,7 +2376,7 @@ msgstr "" msgid "Publish the response" msgstr "" -#: templates/web/base/questionnaire/completed.html:2 +#: templates/web/base/questionnaire/completed.html:1 #: templates/web/base/questionnaire/index.html:0 #: templates/web/base/questionnaire/index.html:14 #: templates/web/base/questionnaire/index.html:4 @@ -2407,11 +2395,12 @@ msgstr " Upitnik %d odgovren za problem %d, %s za %s" msgid "Questionnaire %d sent for problem %d" msgstr "Upitnik %d poslan za problem %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 msgid "Questionnaire filled in by problem reporter" msgstr "Upitnik popunila osoba koja je prijavila problem" #: templates/web/base/alert/_list.html:21 +#: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display.html:50 #: templates/web/base/reports/_rss.html:1 @@ -2421,11 +2410,11 @@ msgstr "Upitnik popunila osoba koja je prijavila problem" msgid "RSS feed" msgstr "RSS izvor" -#: perllib/FixMyStreet/Cobrand/UK.pm:260 perllib/FixMyStreet/Cobrand/UK.pm:272 +#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 msgid "RSS feed for %s" msgstr "RSS izvor za %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "RSS feed for %s ward, %s" msgstr "RSS izvor za %s ward, %s" @@ -2433,15 +2422,11 @@ msgstr "RSS izvor za %s ward, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:167 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:175 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:185 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:193 -#: perllib/FixMyStreet/Cobrand/UK.pm:286 perllib/FixMyStreet/Cobrand/UK.pm:298 +#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 msgid "RSS feed of %s" msgstr "RSS izvor za %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 msgid "RSS feed of %s, within %s ward" msgstr "RSS izvor za %s, unutar %s ward" @@ -2454,20 +2439,19 @@ 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:630 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:115 +#: perllib/FixMyStreet/Cobrand/Default.pm:651 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:150 -#: perllib/FixMyStreet/Cobrand/UK.pm:224 +#: perllib/FixMyStreet/Cobrand/UK.pm:214 msgid "RSS feed of problems within %s" msgstr "RSS izvor za probleme unutar %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 -#: perllib/FixMyStreet/Cobrand/UK.pm:230 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s ward" msgstr "RSS izvor za probleme unutar %s ward" -#: templates/web/base/around/display_location.html:3 +#: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:4 msgid "RSS feed of recent local problems" msgstr "RSS izvor za nedavne lokalne probleme" @@ -2507,15 +2491,18 @@ msgstr "Popravi.to prvenstveno služi za izvještavanje fizičkih problema koji msgid "Remove flag" msgstr "Ukloni oznaku" -#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/report_edit.html:110 #: templates/web/base/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!)" -#: templates/web/base/footer.html:7 templates/web/fiksgatami/footer.html:19 -#: templates/web/fiksgatami/nn/footer.html:19 -#: templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 +msgid "Report" +msgstr "" + +#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 #: templates/web/zurich/footer.html:17 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2525,11 +2512,6 @@ msgstr "Prijavi problem" msgid "Report abuse" msgstr "Prijavi zloupotrebu" -#: templates/web/base/report_created.html:1 -#: templates/web/base/report_created.html:3 -msgid "Report created" -msgstr "" - #: perllib/FixMyStreet/App/Controller/Rss.pm:295 msgid "Report on %s" msgstr "Prijava za %s" @@ -2553,7 +2535,7 @@ msgstr "Prijavljeno %s" msgid "Reported %s, to %s" msgstr "Prijavljeno %s, za %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:580 #: templates/web/base/contact/index.html:50 #: templates/web/fixmystreet/contact/index.html:65 msgid "Reported anonymously at %s" @@ -2565,7 +2547,7 @@ msgstr "Prijavljeno anonimno %s" msgid "Reported before" msgstr "Prije prijavljeno" -#: perllib/FixMyStreet/DB/Result/Problem.pm:598 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 #: templates/web/base/contact/index.html:52 #: templates/web/fixmystreet/contact/index.html:67 msgid "Reported by %s at %s" @@ -2575,31 +2557,35 @@ msgstr "Prijavio %s za %s" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:571 +#: perllib/FixMyStreet/DB/Result/Problem.pm:576 msgid "Reported in the %s category anonymously at %s" msgstr "Prijavljeno %s u kategoriju anonimno u %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:598 msgid "Reported in the %s category by %s at %s" msgstr "Prijavio %s u kategoriju %s u %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:567 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 msgid "Reported via %s anonymously at %s" msgstr "Prijavio %s anonimno %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:589 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 msgid "Reported via %s by %s at %s" msgstr "Prijavio %s %s u %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:563 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 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:583 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 msgid "Reported via %s in the %s category by %s at %s" msgstr "Prijavio %s u %s kategoriju %s u %s" -#: templates/web/base/around/around_index.html:2 +#: templates/web/base/reports/index.html:21 +msgid "Reported within the last four weeks" +msgstr "" + +#: templates/web/base/around/around_index.html:1 #: templates/web/base/around/around_index.html:3 #: templates/web/base/js/translation_strings.html:41 #: templates/web/base/report/new/fill_in_details.html:0 @@ -2609,14 +2595,13 @@ msgstr "Prijavio %s u %s kategoriju %s u %s" msgid "Reporting a problem" msgstr "Prijavljivanje problema" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:294 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:409 -#: perllib/FixMyStreet/DB/Result/Problem.pm:413 +#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" @@ -2632,7 +2617,7 @@ msgstr "Prijave na i oko mape" msgid "Reports published" msgstr "" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:85 msgid "Resend report" msgstr "Ponovno pošalji prijavu" @@ -2640,36 +2625,35 @@ msgstr "Ponovno pošalji prijavu" msgid "Right place?" msgstr "" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:193 -#: perllib/FixMyStreet/Geocode/OSM.pm:171 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:167 +#: perllib/FixMyStreet/Geocode/OSM.pm:152 msgid "Road operator for this named road (derived from road reference number and type): %s" msgstr "Cestovni operater za ovu imenovanu cestu (izveden iz cestovnog referentnog broja i tipa): %s" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:190 -#: perllib/FixMyStreet/Geocode/OSM.pm:168 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:164 +#: perllib/FixMyStreet/Geocode/OSM.pm:149 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:1394 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 -#: templates/web/base/admin/report_edit.html:90 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1403 +#: templates/web/base/admin/report_edit.html:106 #: templates/web/zurich/admin/report_edit.html:73 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1394 -#: templates/web/base/admin/report_edit.html:91 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: templates/web/base/admin/report_edit.html:107 #: templates/web/zurich/admin/report_edit.html:74 msgid "Rotate Right" msgstr "" #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:200 -#: templates/web/base/admin/category_edit.html:76 +#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/category_edit.html:81 #: templates/web/zurich/admin/body.html:59 msgid "Save changes" msgstr "Spremi promjene" @@ -2697,7 +2681,7 @@ msgstr "Pretraži:" msgid "Searching found no reports." msgstr "" -#: templates/web/base/admin/users.html:39 +#: templates/web/base/admin/users.html:41 msgid "Searching found no users." msgstr "" @@ -2720,15 +2704,15 @@ 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:680 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "Sent to %s %s later" msgstr "Pošalji %s %s naknadno" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:84 msgid "Sent:" msgstr "Poslano:" -#: templates/web/base/admin/report_edit.html:73 +#: templates/web/base/admin/report_edit.html:89 #: templates/web/zurich/admin/stats.html:45 msgid "Service:" msgstr "Servis:" @@ -2737,7 +2721,7 @@ msgstr "Servis:" msgid "Share" msgstr "Podijeli" -#: templates/web/base/report/new/fill_in_details_form.html:211 +#: templates/web/base/report/new/fill_in_details_form.html:192 #: templates/web/base/report/update-form.html:157 #: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 @@ -2782,12 +2766,12 @@ msgstr "Odjavi se" msgid "Signed in as %s" msgstr "Prijavljen kao %s" -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 msgid "Some categories may require additional information." msgstr "Neke kategorije mogu zahtijevati dodatne informacije." -#: templates/web/base/admin/body-form.html:145 -#: templates/web/base/admin/body-form.html:146 +#: templates/web/base/admin/body-form.html:149 +#: templates/web/base/admin/body-form.html:150 msgid "" "Some endpoints require an <strong>API key</strong> to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -2798,11 +2782,11 @@ msgid "Some photos of recent reports" msgstr "Fotografije nedavnih prijava" #: perllib/FixMyStreet/App/View/Email.pm:32 -#: perllib/FixMyStreet/App/View/Web.pm:44 +#: perllib/FixMyStreet/App/View/Web.pm:43 msgid "Some text to localize" msgstr "Tekst za lakšu lokalizaciju" -#: perllib/FixMyStreet/Cobrand/UK.pm:88 +#: perllib/FixMyStreet/Cobrand/UK.pm:78 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "Žao nam je,ne pokrivamo područje na kojem se nalazi taj problem." @@ -2810,17 +2794,16 @@ msgstr "Žao nam je,ne pokrivamo područje na kojem se nalazi taj problem." msgid "Sorry, there has been an error confirming your problem." msgstr "Žao nam je, došlo je do greške pri potvrđivanju problema." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:215 -#: perllib/FixMyStreet/Geocode.pm:26 perllib/FixMyStreet/Geocode/Bing.pm:56 -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:73 -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:93 -#: perllib/FixMyStreet/Geocode/Google.pm:72 -#: perllib/FixMyStreet/Geocode/OSM.pm:64 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:214 +#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 +#: perllib/FixMyStreet/Geocode/Google.pm:47 +#: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "Žao nam je, ne možemo pronaći tu lokaciju." -#: perllib/FixMyStreet/Geocode/Bing.pm:51 -#: perllib/FixMyStreet/Geocode/Google.pm:67 +#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: perllib/FixMyStreet/Geocode/Google.pm:44 #: perllib/FixMyStreet/Geocode/Zurich.pm:87 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." @@ -2829,7 +2812,7 @@ msgstr "Žao nam je, nije moguće analizirati tu lokaciju. Molimo pokušajte pon msgid "Start Date:" msgstr "" -#: templates/web/base/admin/body.html:61 +#: templates/web/base/admin/body.html:69 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 @@ -2837,7 +2820,7 @@ msgstr "" msgid "State" msgstr "Stanje" -#: templates/web/base/admin/report_edit.html:34 +#: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 #: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:53 @@ -2846,8 +2829,8 @@ msgstr "Stanje" msgid "State:" msgstr "Stanje:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1200 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:304 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:308 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" @@ -2863,7 +2846,7 @@ msgstr "" msgid "Still open, via questionnaire, %s" msgstr "I dalje otvoreno, putem upitnika %s" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:381 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 msgid "Subcategory: %s" msgstr "" @@ -2883,19 +2866,19 @@ msgid "Subject:" msgstr "Predmet:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:115 -#: templates/web/base/report/new/fill_in_details_form.html:155 -#: templates/web/base/report/new/fill_in_details_form.html:177 +#: templates/web/base/report/new/fill_in_details_form.html:136 +#: templates/web/base/report/new/fill_in_details_form.html:158 +#: templates/web/base/report/new/fill_in_details_form.html:96 #: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 -#: templates/web/zurich/report/new/fill_in_details_form.html:108 +#: templates/web/zurich/report/new/fill_in_details_form.html:91 msgid "Submit" msgstr "Pošalji" -#: templates/web/base/admin/report_edit.html:97 +#: templates/web/base/admin/report_edit.html:113 #: templates/web/base/admin/update_edit.html:65 -#: templates/web/base/admin/user-form.html:55 +#: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:64 #: templates/web/zurich/admin/report_edit.html:221 #: templates/web/zurich/admin/update_edit.html:38 @@ -2907,8 +2890,8 @@ msgstr "Pošalji promjene" msgid "Submit questionnaire" msgstr "Pošalji upitnik" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:133 -#: templates/web/zurich/admin/header.html:2 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:134 +#: 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 @@ -2932,8 +2915,8 @@ msgstr "Pretplati se" msgid "Subscribe me to an email alert" msgstr "Pretplati se na e-mail upozorenja" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1191 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:293 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 #: templates/web/zurich/admin/index-dm.html:1 @@ -2949,7 +2932,7 @@ msgstr "Sažetak" msgid "Summary reports" msgstr "Sažetak prijava" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 msgid "Survey" msgstr "" @@ -2963,7 +2946,7 @@ msgstr "Rezultati ispitivanja" msgid "Text" msgstr "Tekst" -#: templates/web/base/admin/body.html:21 +#: templates/web/base/admin/body.html:28 msgid "Text only version" msgstr "Tekst samo verzija" @@ -2972,49 +2955,55 @@ msgstr "Tekst samo verzija" msgid "Text:" msgstr "Tekst:" -#: templates/web/base/tokens/confirm_update.html:9 -msgid "Thank you — you can <a href=\"%s\">view your updated problem</a> on the site." -msgstr "Hvala — možete <a href=\"%s\">pregledati vaš ažurirani post</a> na stranici." - -#: templates/web/base/tokens/confirm_problem.html:18 -msgid "Thank you for reporting this issue" +#: templates/web/base/tokens/confirm_problem.html:12 +msgid "Thank you for reporting this issue!" msgstr "" #: templates/web/base/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 "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/base/tokens/confirm_update.html:15 +msgid "Thank you for updating this issue!" +msgstr "" + +#: templates/web/base/contact/submit.html:6 +#: templates/web/base/questionnaire/completed.html:5 +msgid "Thank you for your feedback" +msgstr "" + #: templates/web/fixmystreet/around/around_index.html:28 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 :" msgstr "Hvala na učitavanju slike. Sada trebamo locirati problem pa vas molimo da unesete naziv obližnje ulice ili poštanski broj u gornji okvir : :" -#: templates/web/base/contact/submit.html:8 -msgid "Thanks for your feedback. We'll get back to you as soon as we can!" -msgstr "Zahvaljujemo se na feedbacku. Javit ćemo se čim stignemo!" - #: templates/web/base/questionnaire/creator_fixed.html:9 msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "Hvala, drago nam je čuti da je problem riješen! Htjeli bismo vas još samo upitati jeste li dosada prijavljivali problem odgovornom tijelu?" -#: perllib/FixMyStreet/App/Controller/Photo.pm:190 +#: perllib/FixMyStreet/App/Controller/Photo.pm:195 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:100 +#: perllib/FixMyStreet/App/Controller/Council.pm:97 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:124 +#: perllib/FixMyStreet/App/Controller/Location.pm:126 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:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:81 +#: perllib/FixMyStreet/Cobrand/UK.pm:71 msgid "That postcode was not recognised, sorry." msgstr "Žao nam je, poštanski broj nije prepoznat." -#: perllib/FixMyStreet/App/Controller/Admin.pm:713 +#: perllib/FixMyStreet/App/Controller/Admin.pm:712 +#, fuzzy +msgid "That problem has been marked as sent." +msgstr "Navedeni problem će biti ponovno poslan" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:704 msgid "That problem will now be resent." msgstr "Navedeni problem će biti ponovno poslan" @@ -3026,28 +3015,28 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "Navedena prijava je uklonjena s Popravi.to" -#: templates/web/base/admin/body.html:136 +#: templates/web/base/admin/body.html:144 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/base/admin/body-form.html:119 -#: templates/web/base/admin/body-form.html:120 +#: templates/web/base/admin/body-form.html:123 +#: templates/web/base/admin/body-form.html:124 msgid "" "The <strong>endpoint</strong> is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." msgstr "" -#: templates/web/base/admin/body-form.html:132 -#: templates/web/base/admin/body-form.html:133 +#: templates/web/base/admin/body-form.html:136 +#: templates/web/base/admin/body-form.html:137 msgid "" "The <strong>jurisdiction</strong> is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" -#: templates/web/base/admin/body-form.html:90 -#: templates/web/base/admin/body-form.html:91 +#: templates/web/base/admin/body-form.html:94 +#: templates/web/base/admin/body-form.html:95 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>." @@ -3068,7 +3057,7 @@ msgstr "" msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." msgstr "Molimo<strong> pričekajte </strong> — <em>email</em> potvrde." -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:3 msgid "The council won’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 "" @@ -3095,8 +3084,8 @@ 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:185 -#: perllib/FixMyStreet/Geocode/OSM.pm:163 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:159 +#: perllib/FixMyStreet/Geocode/OSM.pm:144 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap." msgstr "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" @@ -3154,7 +3143,7 @@ msgstr "" msgid "The passwords do not match" msgstr "Lozinke se ne podudaraju" -#: templates/web/base/errors/page_error_404_not_found.html:11 +#: templates/web/base/errors/page_error_404_not_found.html:10 #: templates/web/base/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" @@ -3171,7 +3160,7 @@ msgstr "Dojavljivanja problema preko karte:" msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:295 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:300 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" @@ -3182,16 +3171,20 @@ msgid "" " Names are not necessarily unique." msgstr "" +#: templates/web/base/reports/_problem-list.html:15 +msgid "There are no reports to show." +msgstr "" + #: perllib/FixMyStreet/App/Controller/Reports.pm:75 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:131 +#: perllib/FixMyStreet/App/Controller/Contact.pm:136 #: 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:755 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:762 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 #: templates/web/base/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:25 @@ -3207,7 +3200,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:135 +#: perllib/FixMyStreet/App/Controller/Contact.pm:140 msgid "There were problems with your report. Please see below." msgstr "Došlo je do problema pri prijavi. Detalje pogledajte u nastavku." @@ -3215,8 +3208,8 @@ msgstr "Došlo je do problema pri prijavi. Detalje pogledajte u nastavku." msgid "There were problems with your update. Please see below." msgstr "Došlo je do problema pri ažuriranju. Detalje pogledajte u nastavku." -#: templates/web/base/admin/body-form.html:108 -#: templates/web/base/admin/body-form.html:109 +#: templates/web/base/admin/body-form.html:112 +#: templates/web/base/admin/body-form.html:113 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" @@ -3229,14 +3222,14 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Razvoj API implementacije je u tijeku te još nije stabilizrana. Ubuduće će se mijenjati bez upozorenja." -#: templates/web/base/admin/body.html:36 +#: templates/web/base/admin/body.html:44 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported <em>at any location</em>.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" " Currently, users <strong>cannot report problems to this body</strong>." msgstr "" -#: templates/web/base/admin/body.html:46 +#: templates/web/base/admin/body.html:54 msgid "This body has no contacts. This means that currently problems reported to this body <strong>will not be sent</strong>." msgstr "" @@ -3247,18 +3240,18 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:388 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:394 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:391 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 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:898 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:136 -#: perllib/FixMyStreet/Cobrand/UK.pm:53 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:902 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:972 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/Cobrand/UK.pm:43 msgid "This information is required" msgstr "Potrebna informacija" @@ -3297,8 +3290,8 @@ 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:130 #: perllib/FixMyStreet/Cobrand/Zurich.pm:131 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:132 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -3315,15 +3308,15 @@ msgstr "Prijava je trenutno označena kao popravljena." msgid "This report is currently marked as open." msgstr "Prijava je trenutno označena kao otvorena." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:319 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:311 msgid "This report was submitted anonymously" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:293 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:1196 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Vremenska skala" @@ -3341,7 +3334,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:294 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:299 msgid "To view a map of the precise location of this issue" msgstr "Karta točne lokacije ovog problema" @@ -3357,8 +3350,12 @@ msgstr "Ukupno" msgid "Try again" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:46 +#: templates/web/base/contact/submit.html:14 +msgid "Try emailing us directly:" +msgstr "" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -3366,8 +3363,8 @@ msgstr "" msgid "Unable to fix" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/admin/update_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:45 #: templates/web/zurich/admin/report_edit.html:58 @@ -3409,7 +3406,7 @@ msgstr "Ažuriranje u nastavku dodao je anonimni korisnik u %s" msgid "Update below added by %s at %s" msgstr "Ažuriranje u nastavku dodao %s u %s" -#: templates/web/base/admin/body-form.html:233 +#: templates/web/base/admin/body-form.html:240 #: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "" @@ -3435,7 +3432,7 @@ msgstr "Ažuriranjem je problem označen kao popravljen" msgid "Update reopened problem" msgstr "Ažuriranjem je problem ponovno otvoren" -#: templates/web/base/admin/body.html:93 +#: templates/web/base/admin/body.html:101 msgid "Update statuses" msgstr "Status ažuriranja" @@ -3449,12 +3446,12 @@ msgstr "Ažuriranje:" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1016 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1060 -#: perllib/FixMyStreet/App/Controller/Admin.pm:810 -#: perllib/FixMyStreet/App/Controller/Admin.pm:958 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:549 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:618 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1014 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:808 +#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:556 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:625 msgid "Updated!" msgstr "Ažurirano!" @@ -3466,7 +3463,7 @@ msgstr "Ažurirano!" msgid "Updates" msgstr "Ažuriranja" -#: perllib/FixMyStreet/DB/Result/Comment.pm:139 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -3481,7 +3478,7 @@ msgstr "Ažuriranja za {{naslov}}" msgid "Updates to this problem, FixMyStreet" msgstr "Ažuriranja za ovaj problem,Popravi.to" -#: templates/web/base/admin/body.html:174 +#: templates/web/base/admin/body.html:182 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 "" @@ -3490,11 +3487,11 @@ msgstr "" msgid "User" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1357 msgid "User flag removed" msgstr "Korisnička oznaka uklonjena" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1331 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1329 msgid "User flagged" msgstr "Korisnik označen" @@ -3502,16 +3499,16 @@ msgstr "Korisnik označen" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:303 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:307 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Korisnici" -#: perllib/FixMyStreet/App/Controller/Admin.pm:380 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:430 +#: perllib/FixMyStreet/App/Controller/Admin.pm:374 +#: perllib/FixMyStreet/App/Controller/Admin.pm:404 +#: perllib/FixMyStreet/App/Controller/Admin.pm:421 msgid "Values updated" msgstr "Vrijednosti ažurirane" @@ -3565,11 +3562,11 @@ msgstr "Nikada ne prikazujemo vašu e-mail adresu" msgid "We never show your email address or phone number." msgstr "Nikada ne prikazujemo vašu e-mail adresu ili telefonski broj." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:403 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." -#: templates/web/base/index-steps.html:38 +#: templates/web/base/index-steps.html:31 msgid "We send it to the council on your behalf" msgstr "Poslan je odgovornom tijelu u Vaše ime" @@ -3578,15 +3575,23 @@ msgstr "Poslan je odgovornom tijelu u Vaše ime" 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>" +#: templates/web/base/questionnaire/completed-open.html:2 +msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" +msgstr "" + #: templates/web/base/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 "Rado bismo čuli Vaše mišljenje o ovoj stranici. Da biste to učinili, dovoljno je ispuniti obrazac ili poslati e-mail na <a href='mailto:%s'>%s</a>:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:41 +#: templates/web/base/contact/submit.html:7 +msgid "We’ll get back to you as soon as we can." +msgstr "" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 msgid "What’s the issue, and where is it?" msgstr "" -#: templates/web/base/admin/category_edit.html:82 +#: templates/web/base/admin/category_edit.html:87 #: templates/web/zurich/admin/body.html:18 msgid "When edited" msgstr "Prilikom ažuriranja" @@ -3595,15 +3600,18 @@ msgstr "Prilikom ažuriranja" msgid "When sent" msgstr "Prilikom slanja" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Whole block of empty flats" msgstr "Cijeli blok praznih stanova" +#: templates/web/base/tokens/confirm_alert.html:7 +msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." +msgstr "" + #: templates/web/base/open311/index.html:92 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/fiksgatami/front/footer-marketing.html:15 #: templates/web/fixmystreet/front/footer-marketing.html:17 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" @@ -3627,18 +3635,18 @@ msgid "Year" msgstr "Godina" #: templates/web/base/admin/bodies.html:66 -#: templates/web/base/admin/body.html:72 templates/web/base/admin/body.html:74 -#: templates/web/base/admin/body.html:78 templates/web/base/admin/body.html:80 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:76 +#: templates/web/base/admin/report_edit.html:93 #: templates/web/base/admin/update_edit.html:24 -#: templates/web/base/admin/users.html:29 +#: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:42 #: templates/web/base/questionnaire/index.html:81 @@ -3667,14 +3675,12 @@ msgstr "Sljedeće izvješće o problemu prijavljujete jer je uvredljivo, sadrži 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/base/tokens/confirm_problem.html:25 -#: templates/web/base/tokens/confirm_problem.html:26 -#: templates/web/zurich/tokens/confirm_problem.html:6 +#: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:8 msgid "You can <a href=\"%s%s\">view the problem on this site</a>." msgstr "" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:48 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -3689,14 +3695,14 @@ msgid "" " reports in the past." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:19 -#: templates/web/base/report/new/councils_text_none.html:20 -#: templates/web/base/report/new/councils_text_some.html:20 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 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>." -#: templates/web/base/admin/body-form.html:81 +#: templates/web/base/admin/body-form.html:85 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" @@ -3709,10 +3715,10 @@ msgid "You have already answered this questionnaire. If you have a question, ple msgstr "Već ste ogovorili na upitnik. Ako imate nekih pitanja, molimo da nam<a href='%s'>se javite</a>, ili<a href='%s'>pregledate problem koji vas zanima</a>.\n" #: templates/web/base/questionnaire/index.html:68 -#: templates/web/base/report/new/fill_in_details_form.html:94 +#: templates/web/base/report/new/fill_in_details_form.html:75 #: templates/web/fixmystreet/questionnaire/index.html:88 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:79 -#: templates/web/zurich/report/new/fill_in_details_form.html:75 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 +#: templates/web/zurich/report/new/fill_in_details_form.html:58 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." @@ -3721,7 +3727,7 @@ msgstr "Već ste priložiti fotografiju ovoj prijavi, ako dodate novu, zamijenit 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/base/auth/sign_out.html:3 +#: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" msgstr "Odjavljeni ste" @@ -3730,26 +3736,11 @@ msgstr "Odjavljeni ste" 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 "Locirali ste problem na mjestu označenom zelenom iglom na karti. Ako to nije točna lokacija, jednostavno opet kliknite na karti ." -#: templates/web/base/tokens/confirm_alert.html:8 -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/base/tokens/confirm_update.html:14 -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>." - -#: templates/web/base/tokens/confirm_alert.html:12 -msgid "You have successfully created your alert." -msgstr "Uspješno ste dodali upozorenje." - -#: templates/web/base/tokens/confirm_alert.html:10 -msgid "You have successfully deleted your alert." -msgstr "Uspješno ste izbrisali upozorenje." - #: templates/web/base/report/display.html:20 #: templates/web/base/report/new/fill_in_details.html:37 #: templates/web/fixmystreet/report/display.html:17 @@ -3775,7 +3766,7 @@ msgid "" " contacts (such as an email address) to which reports are sent." msgstr "" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:85 msgid "You really want to resend?" msgstr "Jeste li sigurni da želite ponovno poslati?" @@ -3795,7 +3786,7 @@ msgstr "Vaše prijave" #: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 #: templates/web/fixmystreet/report/update-form.html:76 -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:71 msgid "Your email" msgstr "Vaš e-mail" @@ -3811,7 +3802,7 @@ msgid "Your email address:" msgstr "Vaša e-mail adresa:" #: templates/web/base/alert/_list.html:92 -#: templates/web/base/report/new/fill_in_details_form.html:125 +#: templates/web/base/report/new/fill_in_details_form.html:106 #: templates/web/base/report/update-form.html:81 msgid "Your email:" msgstr "Vaš e-mail:" @@ -3826,13 +3817,13 @@ msgstr "Vaše informacije će se koristiti isključivo u skladu s našim<a href= #: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 #: templates/web/fixmystreet/report/update-form.html:142 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:98 +#: templates/web/zurich/report/new/fill_in_details_form.html:81 msgid "Your name" msgstr "Ime" #: templates/web/base/auth/general.html:59 #: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:204 +#: templates/web/base/report/new/fill_in_details_form.html:185 #: templates/web/base/report/update-form.html:151 msgid "Your name:" msgstr "Ime:" @@ -3850,33 +3841,19 @@ msgstr "Vaša lozinka je promijenjena" #: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 -#: templates/web/zurich/report/new/fill_in_details_form.html:104 +#: templates/web/zurich/report/new/fill_in_details_form.html:87 msgid "Your phone number" msgstr "Vaš broj telefona" -#: templates/web/base/tokens/confirm_problem.html:4 -msgid "Your problem has been confirmed!" -msgstr "" - #: templates/web/fixmystreet/questionnaire/index.html:16 msgid "Your report" msgstr "Vaša prijava" -#: templates/web/base/report_created.html:6 -msgid "Your report has been created and will shortly be sent." -msgstr "" - -#: templates/web/base/footer.html:9 templates/web/fiksgatami/footer.html:21 -#: templates/web/fiksgatami/nn/footer.html:21 -#: templates/web/fixmystreet/footer.html:24 +#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:24 msgid "Your reports" msgstr "Vaše prijave" -#: templates/web/base/tokens/confirm_update.html:4 -msgid "Your update has been confirmed!" -msgstr "" - -#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:59 +#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:41 msgid "Your updates" msgstr "Vaša ažuriranja" @@ -3893,11 +3870,7 @@ msgstr "od %s" msgid "council" msgstr "odgovorno tijelo" -#: perllib/FixMyStreet/DB/Result/Problem.pm:665 -msgid "council ref: %s" -msgstr "odgovorno tijelo ref: %s" - -#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:32 #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:54 msgid "didn't use map" @@ -3908,6 +3881,7 @@ msgstr "nije korištena karta" msgid "e.g. ‘%s’ or ‘%s’" msgstr "npr. ‘%s’ ili‘%s’" +#: templates/web/base/admin/body-form.html:188 #: templates/web/base/admin/flagged.html:51 msgid "edit user" msgstr "" @@ -3922,7 +3896,7 @@ msgstr "od %d različitih korisnika" msgid "last updated %s" msgstr "" -#: perllib/Utils.pm:263 +#: perllib/Utils.pm:235 msgid "less than a minute" msgstr "manje od minute" @@ -3982,22 +3956,22 @@ msgstr "ili" msgid "or locate me automatically" msgstr "" -#: templates/web/base/admin/report_edit.html:25 -#: templates/web/base/admin/report_edit.html:26 -#: templates/web/zurich/admin/report_edit-sdm.html:28 +#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:30 +#: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit-sdm.html:29 -#: templates/web/zurich/admin/report_edit-sdm.html:37 +#: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:38 -#: templates/web/zurich/admin/report_edit.html:28 +#: templates/web/zurich/admin/report_edit.html:27 #: templates/web/zurich/admin/report_edit.html:29 -#: templates/web/zurich/admin/report_edit.html:39 +#: templates/web/zurich/admin/report_edit.html:38 #: templates/web/zurich/admin/report_edit.html:40 -#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit.html:50 #: templates/web/zurich/admin/report_edit.html:52 msgid "originally entered: “%s”" msgstr "" -#: templates/web/base/admin/report_edit.html:30 +#: templates/web/base/admin/report_edit.html:43 msgid "other areas:" msgstr "druga područja:" @@ -4006,13 +3980,12 @@ msgstr "druga područja:" msgid "reopened" msgstr "ponovno otvoreno" -#: templates/web/fiksgatami/header.html:49 -#: templates/web/fixmystreet/header.html:53 +#: templates/web/fixmystreet/header.html:59 #: templates/web/zurich/footer.html:12 msgid "sign out" msgstr "odjavi se" -#: templates/web/base/report/new/fill_in_details_form.html:13 +#: templates/web/base/report/new/fill_in_details_form.html:12 #: templates/web/base/report/new/fill_in_details_form.html:15 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 @@ -4024,15 +3997,15 @@ 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:373 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:379 msgid "this type of local problem" msgstr "ovaj tip " -#: perllib/Utils.pm:235 +#: perllib/Utils.pm:207 msgid "today" msgstr "danas" -#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:32 #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:54 msgid "used map" @@ -4059,7 +4032,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:254 #, perl-format msgid "%d hour" msgid_plural "%d hours" @@ -4075,7 +4048,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: perllib/Utils.pm:284 +#: perllib/Utils.pm:256 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -4099,7 +4072,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:250 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -4123,7 +4096,7 @@ msgstr[0] "<big>%s</big> popravljeno u posljednjih mjesec dana" msgstr[1] "<big>%s</big> popravljeno u posljednjih mjesec dana" msgstr[2] "<big>%s</big> popravljeno u posljednjih mjesec dana" -#: perllib/Utils.pm:280 +#: perllib/Utils.pm:252 #, perl-format msgid "%d day" msgid_plural "%d days" @@ -4139,8 +4112,5 @@ 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." -#~ msgid "Configuration updated - contacts will be generated automatically later" -#~ msgstr "Konfiguracija ažurirana - kontakti će biti automatski generirani naknadno" - -#~ 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." +#~ msgid "For council(s):" +#~ msgstr "Za županiju(e):" diff --git a/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po index 2bbe898f2..fb37b73e7 100644 --- a/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/it.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -5,13 +5,14 @@ # # Translators: # claudio <claudio_carletti@hotmail.it>, 2013 +# Giuseppe Pignataro <rogepix@gmail.com>, 2015 # marcopas <passantemarco@gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2015-01-20 16:59+0000\n" -"PO-Revision-Date: 2014-11-19 18:30+0000\n" +"POT-Creation-Date: 2015-07-31 14:28+0100\n" +"PO-Revision-Date: 2015-07-10 13:29+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" @@ -20,17 +21,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:618 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:386 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:392 msgid " and " msgstr "e" -#: templates/web/base/report/new/councils_text_all.html:12 -#: templates/web/base/report/new/councils_text_all.html:19 -#: templates/web/base/report/new/councils_text_all.html:5 -#: templates/web/base/report/new/councils_text_none.html:19 -#: templates/web/base/report/new/councils_text_none.html:21 -#: templates/web/base/report/new/councils_text_some.html:20 +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_none.html:11 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " @@ -66,22 +65,26 @@ msgstr "%d a %d di %d" msgid "%s - Summary reports" msgstr "%s - Riassunto sulle segnalazioni" -#: perllib/FixMyStreet/DB/Result/Problem.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:672 msgid "%s ref: %s" msgstr "%s ref: %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:265 perllib/FixMyStreet/Cobrand/UK.pm:277 +#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 msgid "%s ward, %s" msgstr "%s quartiere, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:554 +#: perllib/FixMyStreet/DB/Result/Problem.pm:559 msgid "%s, reported at %s" msgstr "%s, segnalati al %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:304 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "%s, within %s ward" msgstr "%s dentro al quartiere %s" +#: perllib/FixMyStreet/Map/OSM.pm:42 +msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" +msgstr "" + #: templates/web/base/email_sent.html:29 msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" msgstr "(Non ti preoccupare — ci penseremo noi alla tua segnalazione mentre controlli l'email.)" @@ -95,7 +98,7 @@ msgid "(Don't worry — we'll hang on to your update while you're checking y msgstr "(Non ti preoccupare — ci penseremo noi al tuo aggiornamento mentre controlli l'email.)" #: templates/web/base/admin/report_blocks.html:11 -#: templates/web/base/admin/users.html:29 +#: templates/web/base/admin/users.html:31 msgid "(Email in abuse table)" msgstr "(Email nella tabella degli abusi)" @@ -123,7 +126,7 @@ msgstr "(chiuso)" msgid "(fixed)" msgstr "(risolto)" -#: templates/web/base/index.html:9 +#: templates/web/base/index.html:8 templates/web/base/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)" @@ -133,21 +136,21 @@ msgstr "(come gli atti vandalici, le discariche abusive, la pavimentazione e l'i msgid "(not sent to council)" msgstr "(non inviato al Comune)" -#: templates/web/base/report/new/fill_in_details_form.html:218 -#: templates/web/zurich/report/new/fill_in_details_form.html:94 +#: templates/web/base/report/new/fill_in_details_form.html:199 +#: templates/web/zurich/report/new/fill_in_details_form.html:77 msgid "(optional)" msgstr "(opzionale)" #: templates/web/fixmystreet/report/public_label.html:1 msgid "(public)" -msgstr "" +msgstr "(pubblico)" #: templates/web/base/reports/_list-entry.html:2 #: templates/web/fixmystreet/report/_item.html:20 msgid "(sent to both)" msgstr "(inviato ad entrambi)" -#: templates/web/base/report/new/fill_in_details_form.html:212 +#: templates/web/base/report/new/fill_in_details_form.html:193 msgid "(we never show your email address or phone number)" msgstr "(non mostreremo mai la tua email o il tuo numero di telefono)" @@ -155,14 +158,13 @@ msgstr "(non mostreremo mai la tua email o il tuo numero di telefono)" 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:393 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Scegli una categoria --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 -#: perllib/FixMyStreet/DB/Result/Problem.pm:399 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:630 +#: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Scegli un tipo di proprietà --" @@ -174,51 +176,7 @@ msgid "" " Maybe add some <code>MAPIT_TYPES</code> to your config file?" msgstr "" -#: templates/web/base/questionnaire/completed.html:20 -msgid "<p style=\"font-size:150%\">Thank you very much for filling in our questionnaire; glad to hear it’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’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’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/base/questionnaire/completed-open.html:6 -msgid "" -"<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" -"suggestions: why not try writing to your local representatives or, if\n" -"it’s a problem that could be fixed by local people working together, why\n" -"not <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/base/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/base/around/_report_banner.html:4 +#: templates/web/base/around/_report_banner.html:3 #: templates/web/base/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>" @@ -245,7 +203,7 @@ msgstr "<strong>No</strong> lasciami entrare con l'email" 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/base/report/new/fill_in_details_form.html:163 +#: templates/web/base/report/new/fill_in_details_form.html:144 msgid "<strong>No</strong>, let me confirm my report by email:" msgstr "<strong>No</strong>, lasciami confermare la mia segnalazione via email:" @@ -253,13 +211,8 @@ msgstr "<strong>No</strong>, lasciami confermare la mia segnalazione via email:" msgid "<strong>No</strong>, let me confirm my update by email:" msgstr "<strong>No</strong>, lasciami confermare il mio aggiornamento via email:" -#: templates/web/base/tokens/confirm_problem.html:19 -#: templates/web/base/tokens/confirm_problem.html:20 -msgid "<strong>We will now send it to the council</strong>." -msgstr "" - #: templates/web/base/auth/general.html:37 -#: templates/web/base/report/new/fill_in_details_form.html:141 +#: templates/web/base/report/new/fill_in_details_form.html:122 #: templates/web/base/report/update-form.html:95 #: templates/web/fixmystreet/auth/general.html:37 #: templates/web/fixmystreet/auth/general.html:39 @@ -273,8 +226,8 @@ msgstr "<strong>Si</strong> Ho già la password" msgid "About us" msgstr "Chi siamo" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:39 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:52 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:31 #: templates/web/fixmystreet/report/update-form.html:28 @@ -290,26 +243,26 @@ msgid "" " categories of problem) to each body." msgstr "" -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/body.html:56 msgid "Add a contact using the form below." msgstr "" #: templates/web/base/admin/bodies.html:74 -#: templates/web/base/admin/body-form.html:233 +#: templates/web/base/admin/body-form.html:240 #: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "Aggiungi un corpo" -#: templates/web/base/admin/body.html:108 +#: templates/web/base/admin/body.html:116 #: templates/web/zurich/admin/body.html:31 msgid "Add new category" msgstr "Aggiungi una nuova categoria" -#: templates/web/base/admin/users.html:45 +#: templates/web/base/admin/users.html:47 msgid "Add user" msgstr "Aggiungi un'utente" -#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:70 +#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:52 msgid "Added %s" msgstr "Aggiunti %s" @@ -336,9 +289,7 @@ msgstr "Avvisami su futuri aggiornamenti" msgid "All Reports" msgstr "Tutte le segnalazioni" -#: templates/web/base/footer.html:11 templates/web/fiksgatami/footer.html:23 -#: templates/web/fiksgatami/nn/footer.html:23 -#: templates/web/fixmystreet/footer.html:26 +#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:26 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:19 @@ -355,19 +306,9 @@ msgstr "Tutte le segnalazioni tra %s e %s" 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/base/report/new/councils_text_all.html:12 -#: templates/web/base/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/base/report/new/councils_text_all.html:5 -#: templates/web/base/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/base/report/new/councils_text_all.html:19 -#: templates/web/base/report/new/councils_text_all.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:13 +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_all.html:4 +#: templates/web/base/report/new/fill_in_details_form.html:12 #: templates/web/base/report/new/fill_in_details_form.html:14 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 @@ -384,7 +325,7 @@ msgstr "Un aggiornamento ha riportato questo problema come risolto." msgid "Anonymous" msgstr "Anonimo" -#: templates/web/base/admin/report_edit.html:62 +#: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:23 msgid "Anonymous:" msgstr "Anonimo:" @@ -393,18 +334,18 @@ msgstr "Anonimo:" 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/fiksgatami/front/footer-marketing.html:14 #: templates/web/fixmystreet/front/footer-marketing.html:16 msgid "Are you a developer?" msgstr "Sei uno sviluppatore?" #: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 msgid "Area covered" msgstr "Area coperta" #: templates/web/base/admin/bodies.html:15 -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/body.html:60 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "" @@ -422,7 +363,7 @@ msgstr "Assegna ad un corpo esterno:" msgid "Assign to subdivision:" msgstr "Assegna ad una subdivisione:" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:163 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:165 #: templates/web/zurich/report/updates.html:11 msgid "Assigned to %s" msgstr "Assegnato a %s" @@ -435,7 +376,7 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "Al momento funziona solo la ricerca e la visualizzazione delle segnalazioni." -#: perllib/FixMyStreet/DB/Result/Problem.pm:348 +#: perllib/FixMyStreet/DB/Result/Problem.pm:373 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "" @@ -448,8 +389,8 @@ msgstr "Indietro" msgid "Ban email address" msgstr "Vietare l'indirizzo email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:297 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:301 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" msgstr "Corpi" @@ -460,6 +401,7 @@ msgstr "Corpi" msgid "Body" msgstr "Corpo" +#: templates/web/base/admin/report_edit.html:34 #: templates/web/base/admin/user-form.html:32 msgid "Body:" msgstr "Corpo:" @@ -472,16 +414,15 @@ msgstr "Per data" msgid "Can't see the map? <em>Skip this step</em>" msgstr "Non puoi vedere la mappa? <em>Salta questo passaggio</em>" -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:55 #: templates/web/base/report/new/category.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:53 +#: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 #: templates/web/zurich/admin/stats.html:50 -#: templates/web/zurich/report/new/fill_in_details_form.html:50 msgid "Category" msgstr "Categoria" @@ -489,17 +430,16 @@ msgstr "Categoria" msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:138 #: templates/web/base/admin/category_edit.html:23 -#: templates/web/base/admin/report_edit.html:61 -#: templates/web/base/report/new/fill_in_details_form.html:68 +#: templates/web/base/admin/report_edit.html:74 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/report_edit-sdm.html:42 #: templates/web/zurich/admin/report_edit.html:140 msgid "Category:" msgstr "Categoria:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:377 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383 msgid "Category: %s" msgstr "Categoria: %s" @@ -510,19 +450,19 @@ msgstr "Categoria: %s" msgid "Change password" msgstr "Cambia la Password" -#: templates/web/base/admin/body.html:152 +#: templates/web/base/admin/body.html:160 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/base/admin/body.html:163 +#: templates/web/base/admin/body.html:171 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/base/admin/body.html:183 +#: templates/web/base/admin/body.html:191 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -533,7 +473,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:122 +#: templates/web/base/admin/body.html:130 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." @@ -549,16 +489,16 @@ msgstr "" msgid "Click map to report a problem" msgstr "Clicca sulla mappa per riportare un problema" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:45 -#: templates/web/base/admin/report_edit.html:47 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:58 +#: templates/web/base/admin/report_edit.html:60 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/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:95 #: templates/web/zurich/admin/report_edit.html:97 #: templates/web/zurich/admin/stats.html:31 @@ -566,11 +506,12 @@ msgstr "Clicca sulla mappa per riportare un problema" msgid "Closed" msgstr "Chiuso" -#: perllib/FixMyStreet/DB/Result/Problem.pm:762 +#: perllib/FixMyStreet/DB/Result/Problem.pm:771 msgid "Closed by council" msgstr "Chiuso dal comune" -#: templates/web/base/my/my.html:40 templates/web/fixmystreet/my/my.html:46 +#: templates/web/base/my/my.html:40 +#: templates/web/fixmystreet/my/_problem-list.html:12 msgid "Closed reports" msgstr "Segnalazione chiusa" @@ -578,7 +519,7 @@ msgstr "Segnalazione chiusa" msgid "Closed:" msgstr "Chiuso:" -#: templates/web/base/around/tabbed_lists.html:11 +#: templates/web/base/around/tabbed_lists.html:10 #: templates/web/base/around/tabbed_lists.html:12 msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "Problemi più vicini <small>(within %skm)</small>" @@ -593,26 +534,26 @@ msgstr "Coordinate:" msgid "Cobrand" msgstr "Cobrand" -#: templates/web/base/admin/report_edit.html:75 +#: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:50 msgid "Cobrand data:" msgstr "Dati del Cobrand:" -#: templates/web/base/admin/report_edit.html:74 +#: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:49 msgid "Cobrand:" msgstr "Cobrand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" -msgstr "" +msgstr "Configurazione" -#: templates/web/base/admin/category_edit.html:47 +#: templates/web/base/admin/category_edit.html:52 msgid "Configure Endpoint" msgstr "Configura il punto finale" -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/body.html:72 msgid "Confirm" msgstr "Conferma" @@ -633,10 +574,10 @@ msgstr "Conferma tramite l'email qui sotto ed una nuova password ti verrà forni msgid "Confirmation" msgstr "Conferma" -#: templates/web/base/admin/body.html:158 -#: templates/web/base/admin/body.html:71 -#: templates/web/base/admin/category_edit.html:32 -#: templates/web/base/admin/category_edit.html:84 +#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/category_edit.html:37 +#: templates/web/base/admin/category_edit.html:89 #: templates/web/zurich/admin/stats.html:40 msgid "Confirmed" msgstr "Confermato" @@ -647,7 +588,7 @@ msgstr "La segnalazione è confermata tra %s e %s" #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 -#: templates/web/base/admin/report_edit.html:70 +#: templates/web/base/admin/report_edit.html:83 msgid "Confirmed:" msgstr "Confermato:" @@ -664,13 +605,12 @@ msgid "Contact Us" msgstr "Contattaci" #: templates/web/base/contact/index.html:6 -#: templates/web/base/contact/submit.html:3 #: templates/web/fixmystreet/contact/index.html:20 msgid "Contact the team" msgstr "Contatta il team" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1327 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1355 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1325 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1353 msgid "Could not find user" msgstr "Non posso trovare l'utente" @@ -688,6 +628,10 @@ msgstr "Comune" msgid "Council contacts for %s" msgstr "I contatti del comune per %s" +#: perllib/FixMyStreet/DB/Result/Problem.pm:670 +msgid "Council ref: %s" +msgstr "" + #: templates/web/base/admin/stats.html:84 msgid "Council:" msgstr "Comune:" @@ -703,7 +647,7 @@ msgstr "Contare" msgid "Create a report" msgstr "Crea una segnalazione" -#: templates/web/base/admin/body.html:200 +#: templates/web/base/admin/body.html:208 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Crea una categoria" @@ -715,7 +659,7 @@ msgid "Created" msgstr "Creato" #: templates/web/base/admin/list_updates.html:38 -#: templates/web/base/admin/report_edit.html:69 +#: templates/web/base/admin/report_edit.html:82 #: templates/web/base/admin/update_edit.html:51 #: templates/web/zurich/admin/report_edit-sdm.html:47 #: templates/web/zurich/admin/report_edit.html:61 @@ -732,7 +676,7 @@ msgstr "Stato corrente" msgid "Currently no bodies have been created." msgstr "" -#: templates/web/base/dashboard/index.html:6 +#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 msgid "Dashboard" msgstr "Pannello di controllo" @@ -742,14 +686,14 @@ msgid "Dealt with by subdivision within 5 working days" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:169 -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:37 -#: templates/web/base/admin/category_edit.html:85 +#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:81 +#: templates/web/base/admin/category_edit.html:42 +#: templates/web/base/admin/category_edit.html:90 msgid "Deleted" msgstr "Eliminato" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:43 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -769,7 +713,7 @@ msgstr "Dettagli" msgid "Details:" msgstr "Dettagli:" -#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/body.html:87 msgid "Devolved" msgstr "Devoluto:" @@ -797,16 +741,16 @@ msgstr "Non lo so" msgid "Don't like forms?" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:47 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:60 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:32 #: templates/web/fixmystreet/report/update-form.html:28 #: templates/web/fixmystreet/report/update-form.html:30 msgid "Duplicate" -msgstr "" +msgstr "Duplica" -#: templates/web/base/admin/body.html:98 +#: templates/web/base/admin/body.html:106 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" @@ -816,20 +760,20 @@ msgstr "" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 -#: templates/web/base/admin/users.html:31 +#: templates/web/base/admin/users.html:33 #: templates/web/zurich/admin/problem_row.html:42 msgid "Edit" msgstr "Modifica" -#: templates/web/base/admin/body.html:212 +#: templates/web/base/admin/body.html:220 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "Modifica dettagli corpo" #: templates/web/base/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:2 +#: 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:2 +#: templates/web/zurich/admin/report_edit.html:1 #: templates/web/zurich/admin/report_edit.html:5 msgid "Editing problem %d" msgstr "Modifica problema %d" @@ -843,12 +787,12 @@ msgstr "Modifica aggiornamento %d" msgid "Editing user %d" msgstr "Modifica utente %d" -#: templates/web/base/admin/category_edit.html:86 +#: templates/web/base/admin/category_edit.html:91 msgid "Editor" msgstr "Editor" #: templates/web/base/admin/bodies.html:23 -#: templates/web/base/admin/category_edit.html:83 +#: templates/web/base/admin/category_edit.html:88 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 #: templates/web/fixmystreet/auth/general.html:21 @@ -859,15 +803,23 @@ msgstr "Editor" msgid "Email" msgstr "Email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1303 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1301 msgid "Email added to abuse list" msgstr "Email aggiunta alla lista abusi" -#: templates/web/base/admin/body.html:147 +#: templates/web/base/admin/body.html:155 msgid "Email address:" msgstr "Indirizzo email:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1300 +#: templates/web/base/tokens/confirm_alert.html:6 +msgid "Email alert created" +msgstr "" + +#: templates/web/base/tokens/confirm_alert.html:10 +msgid "Email alert deleted" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1298 msgid "Email already in abuse list" msgstr "Email già presente nella lista abusi" @@ -879,8 +831,8 @@ msgstr "Inviami via email i nuovi problemi locali" msgid "Email me updates" msgstr "Inviami via email gli aggiornamenti" -#: templates/web/base/admin/category_edit.html:26 -#: templates/web/base/admin/report_edit.html:67 +#: templates/web/base/admin/category_edit.html:31 +#: templates/web/base/admin/report_edit.html:80 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 @@ -891,32 +843,32 @@ msgstr "Inviami via email gli aggiornamenti" msgid "Email:" msgstr "Email:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:322 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 msgid "Email: %s" msgstr "Email: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 msgid "Empty flat or maisonette" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:631 msgid "Empty house or bungalow" msgstr "Case o bungalow vuoti" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:622 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty office or other commercial" msgstr "Uffici o altri locali commerciali vuoti" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:623 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Empty pub or bar" msgstr "Pub o bar vuoti" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:624 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty public building - school, hospital, etc." msgstr "Edifici pubblici - scuole, ospedali, ecc vuoti" -#: templates/web/base/admin/body-form.html:158 -#: templates/web/base/admin/body-form.html:159 +#: templates/web/base/admin/body-form.html:162 +#: templates/web/base/admin/body-form.html:163 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" @@ -924,8 +876,8 @@ msgid "" " <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>." msgstr "" -#: templates/web/base/admin/body-form.html:215 -#: templates/web/base/admin/body-form.html:216 +#: templates/web/base/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:223 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" @@ -936,11 +888,11 @@ msgstr "" msgid "End Date:" msgstr "Data di fine" -#: templates/web/base/admin/body-form.html:126 +#: templates/web/base/admin/body-form.html:130 msgid "Endpoint" msgstr "Punto finale" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:72 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:73 msgid "Enter a Zürich street name" msgstr "" @@ -953,7 +905,9 @@ msgstr "Inserisci il piu vicino codice postale UK, o il nome di una strada e una 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/base/around/postcode_form.html:1 #: templates/web/base/around/postcode_form.html:2 +#: templates/web/fixmystreet/around/postcode_form.html:10 #: 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à " @@ -963,7 +917,7 @@ msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "" #: templates/web/base/auth/general.html:64 -#: templates/web/base/report/new/fill_in_details_form.html:170 +#: templates/web/base/report/new/fill_in_details_form.html:151 #: templates/web/base/report/update-form.html:124 msgid "Enter a new password:" msgstr "Inserisci una nuova password:" @@ -975,7 +929,7 @@ msgstr "Inserisci una nuova password:" msgid "Enter a password" msgstr "Inserisci una password" -#: templates/web/base/index-steps.html:33 +#: templates/web/base/index-steps.html:26 msgid "Enter details of the problem" msgstr "Inserisci i dettagli del problema" @@ -998,17 +952,22 @@ msgstr "Esempio codice postale %s" msgid "Examples:" msgstr "Esempi:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:47 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" -#: templates/web/base/admin/report_edit.html:76 +#: templates/web/base/admin/body-form.html:81 +msgid "External URL" +msgstr "" + +#: templates/web/base/admin/category_edit.html:27 +#: templates/web/base/admin/report_edit.html:92 msgid "Extra data:" msgstr "Dati extra:" -#: templates/web/base/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/base/contact/submit.html:13 +msgid "Failed to send message" +msgstr "" #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 @@ -1020,7 +979,7 @@ msgstr "" msgid "First time" msgstr "Prima volta" -#: templates/web/base/admin/body.html:40 +#: templates/web/base/admin/body.html:48 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" @@ -1054,9 +1013,9 @@ msgid "" msgstr "" #: templates/web/base/admin/index.html:55 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:41 -#: templates/web/base/admin/report_edit.html:42 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:54 +#: templates/web/base/admin/report_edit.html:55 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/update-form.html:30 @@ -1067,17 +1026,18 @@ msgstr "" msgid "Fixed" msgstr "Risolto" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:43 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:56 msgid "Fixed - Council" msgstr "Risolto - Comune" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:42 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:55 msgid "Fixed - User" msgstr "Risolto - Utente" -#: templates/web/base/my/my.html:35 templates/web/fixmystreet/my/my.html:41 +#: templates/web/base/my/my.html:35 +#: templates/web/fixmystreet/my/_problem-list.html:7 msgid "Fixed reports" msgstr "Problemi risolti" @@ -1085,7 +1045,7 @@ msgstr "Problemi risolti" msgid "Fixed:" msgstr "Risolto:" -#: templates/web/base/admin/body-form.html:84 +#: templates/web/base/admin/body-form.html:89 #: templates/web/zurich/admin/body-form.html:36 msgid "Flag as deleted" msgstr "" @@ -1094,7 +1054,7 @@ msgstr "" msgid "Flag user" msgstr "Utente segnalato" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Segnalato" @@ -1103,7 +1063,7 @@ msgstr "Segnalato" msgid "Flagged reports and users" msgstr "" -#: templates/web/base/admin/user-form.html:45 +#: templates/web/base/admin/user-form.html:46 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page." msgstr "" @@ -1111,8 +1071,8 @@ msgstr "" msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." msgstr "" -#: templates/web/base/admin/report_edit.html:78 -#: templates/web/base/admin/user-form.html:51 +#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/user-form.html:52 msgid "Flagged:" msgstr "Segnalato:" @@ -1121,10 +1081,6 @@ msgstr "Segnalato:" msgid "Follow a ward link to view only reports within that ward." msgstr "" -#: templates/web/base/admin/report_edit.html:30 -msgid "For council(s):" -msgstr "" - #: templates/web/base/admin/body-form.html:65 msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "" @@ -1137,8 +1093,6 @@ msgstr "Hai dimenticato la tua password?" #: templates/web/base/faq/faq-en-gb.html:1 #: templates/web/base/static/privacy.html:1 #: templates/web/base/static/privacy.html:2 -#: templates/web/fiksgatami/faq/faq-nb.html:1 -#: templates/web/fiksgatami/nn/faq/faq-nn.html:1 msgid "Frequently Asked Questions" msgstr "Domande Frequenti" @@ -1151,13 +1105,13 @@ msgstr "GeoRSS su Google Maps" msgid "Get updates" msgstr "Ottieni aggiornamenti " -#: templates/web/fixmystreet/reports/_rss.html:4 +#: templates/web/fixmystreet/reports/_rss.html:3 #: 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 +#: templates/web/fixmystreet/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "Ottieni gli aggiornamenti dei problemi in questo %s" @@ -1166,6 +1120,10 @@ msgstr "Ottieni gli aggiornamenti dei problemi in questo %s" msgid "Give me an RSS feed" msgstr "Dammi un' RSS feed" +#: templates/web/base/questionnaire/completed.html:14 +msgid "Glad to hear it’s been fixed!" +msgstr "" + #: templates/web/base/alert/index.html:34 #: templates/web/base/around/postcode_form.html:8 #: templates/web/fixmystreet/around/postcode_form.html:21 @@ -1173,7 +1131,7 @@ msgstr "Dammi un' RSS feed" msgid "Go" msgstr "Vai" -#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:93 msgid "Going to send questionnaire?" msgstr "" @@ -1195,9 +1153,7 @@ msgstr "E' stato risolto questo problema?" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "Avevi mai segnalato un problema ad un comune precedentemente, o questa è la tua prima volta?" -#: templates/web/base/footer.html:15 templates/web/fiksgatami/footer.html:27 -#: templates/web/fiksgatami/nn/footer.html:27 -#: templates/web/fixmystreet/footer.html:30 +#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:30 #: templates/web/zurich/faq/faq-de-ch.html:1 #: templates/web/zurich/footer.html:21 #: templates/web/zurich/nav_over_content.html:8 @@ -1209,18 +1165,17 @@ msgstr "Aiuto" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "Qui trovi i tipi di avvertimenti sui problemi locali per ‘%s’." -#: templates/web/fiksgatami/header.html:48 -#: templates/web/fixmystreet/header.html:52 +#: templates/web/fixmystreet/header.html:58 #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "Ciao %s" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:50 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:63 +#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/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:86 #: templates/web/zurich/admin/report_edit.html:90 #: templates/web/zurich/admin/stats.html:32 @@ -1236,7 +1191,7 @@ msgstr "" msgid "Hide pins" msgstr "" -#: templates/web/base/admin/category_edit.html:79 +#: templates/web/base/admin/category_edit.html:84 msgid "History" msgstr "Cronologia" @@ -1252,19 +1207,25 @@ msgstr "Come segnalare un problema" msgid "How to send successful reports" msgstr "Come inviare segnalazioni di successo" -#: perllib/FixMyStreet/App/Controller/Admin.pm:742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:740 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 +#: templates/web/base/tokens/confirm_problem.html:23 +#: templates/web/base/tokens/confirm_problem.html:27 +msgid "I just reported a problem on @fixmystreet" +msgstr "" + +#: templates/web/base/tokens/confirm_update.html:19 +#: templates/web/base/tokens/confirm_update.html:23 +msgid "I just updated a problem on @fixmystreet" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 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 +#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 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" @@ -1286,7 +1247,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:125 +#: templates/web/base/admin/body.html:133 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." @@ -1304,7 +1265,12 @@ msgstr "Se non lo fai, il tuo problema non sarà postato." msgid "If you do not, your update will not be posted." msgstr "Se non lo fai, il tuo aggiornamento non sarà postato." -#: templates/web/base/report/new/councils_text_none.html:9 +#: templates/web/base/questionnaire/completed.html:8 +msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." +msgstr "" + +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:8 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." @@ -1323,34 +1289,34 @@ msgstr "" "(tieni presente che non verrà inviato al comune). Per esempio, com'è stata la⏎\n" "tua esperienza nell'ottenere il problema risolto?" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/body.html:149 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/base/admin/body-form.html:200 -#: templates/web/base/admin/body-form.html:201 +#: templates/web/base/admin/body-form.html:207 +#: templates/web/base/admin/body-form.html:208 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable <strong>extended Open311 stauses</strong> if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/body-form.html:187 -#: templates/web/base/admin/body-form.html:188 +#: templates/web/base/admin/body-form.html:194 +#: templates/web/base/admin/body-form.html:195 msgid "" "If you've enabled Open311 update-sending above, enable <strong>suppression of alerts</strong> \n" " if you do <strong>not</strong> want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/body-form.html:173 -#: templates/web/base/admin/body-form.html:174 +#: templates/web/base/admin/body-form.html:177 +#: templates/web/base/admin/body-form.html:178 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:127 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 msgid "Illegal ID" msgstr "ID illegale" @@ -1375,17 +1341,21 @@ 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:143 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:38 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:144 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 #: templates/web/fixmystreet/report/banner.html:19 -#: templates/web/zurich/admin/header.html:2 +#: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 #: templates/web/zurich/admin/report_edit.html:99 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "In corso" +#: templates/web/base/tokens/confirm_alert.html:11 +msgid "Inbox zero, here we come!" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:160 msgid "Include reporter personal details" msgstr "" @@ -1394,7 +1364,7 @@ msgstr "" msgid "Include unconfirmed reports" msgstr "Includi segnalazioni non confermate" -#: perllib/FixMyStreet/App/Controller/Open311.pm:354 +#: perllib/FixMyStreet/App/Controller/Open311.pm:359 msgid "Incorrect has_photo value \"%s\"" msgstr "" @@ -1402,29 +1372,29 @@ msgstr "" msgid "Internal notes" msgstr "" -#: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:61 msgid "Internal referral" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:339 +#: perllib/FixMyStreet/App/Controller/Open311.pm:344 msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1114 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1112 msgid "Invalid end date" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:432 +#: perllib/FixMyStreet/App/Controller/Open311.pm:437 msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1110 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 msgid "Invalid start date" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:37 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:50 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 #: templates/web/base/report/update-form.html:30 @@ -1438,8 +1408,12 @@ msgstr "Investigando" msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "" +#: templates/web/base/tokens/confirm_problem.html:14 +msgid "It’s on its way to the council right now." +msgstr "" + #: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:150 +#: templates/web/base/report/new/fill_in_details_form.html:131 #: templates/web/base/report/update-form.html:104 #: templates/web/fixmystreet/auth/general.html:47 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 @@ -1448,12 +1422,12 @@ msgstr "" msgid "Keep me signed in on this computer" msgstr "Lasciami loggato su questo computer" -#: templates/web/base/admin/body.html:62 +#: templates/web/base/admin/body.html:70 #: templates/web/zurich/admin/body.html:16 msgid "Last editor" msgstr "Ultima modifica" -#: templates/web/base/admin/report_edit.html:72 +#: templates/web/base/admin/report_edit.html:88 msgid "Last update:" msgstr "Ultimo aggiornamento:" @@ -1461,62 +1435,66 @@ msgstr "Ultimo aggiornamento:" msgid "Last update:" msgstr "Ultimo aggiornamento:" -#: templates/web/base/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:229 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "" -#: templates/web/base/admin/body.html:17 templates/web/base/admin/body.html:19 +#: templates/web/base/admin/body.html:27 msgid "List all reported problems" msgstr "Lista di tutti i problemi segnalati" -#: templates/web/base/report/new/fill_in_details_form.html:69 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:54 -#: templates/web/zurich/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/category_wrapper.html:4 msgid "Loading..." msgstr "Caricando..." #: templates/web/base/alert/choose.html:1 #: templates/web/base/alert/choose.html:3 #: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3 -#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:5 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5 #: templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 -#: templates/web/base/tokens/confirm_alert.html:4 #: templates/web/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "RSS feed locali ed avvertimenti via email" -#: templates/web/base/alert/list.html:13 templates/web/base/alert/list.html:14 -#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:3 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:12 +#: templates/web/base/alert/list.html:14 templates/web/base/alert/list.html:3 msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "RSS feed locali ed avvertimenti via email per ‘%s’" -#: templates/web/base/footer.html:13 templates/web/fiksgatami/footer.html:25 -#: templates/web/fiksgatami/nn/footer.html:25 -#: templates/web/fixmystreet/footer.html:28 +#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:28 msgid "Local alerts" msgstr "Segnalazioni locali" -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:25 msgid "Locate the problem on a map of the area" msgstr "Localizza il problema nella mappa della zona" #: templates/web/base/js/translation_strings.html:43 msgid "MAP" -msgstr "" +msgstr "MAPPA" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" -msgstr "" +msgstr "Mappa" -#: perllib/FixMyStreet/Map/OSM.pm:42 -msgid "Map © <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>" +#: templates/web/base/admin/report_edit.html:86 +msgid "Mark as sent" msgstr "" -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/user-form.html:44 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." msgstr "" +#: templates/web/base/reports/index.html:24 +msgid "Marked fixed/closed in the past eight weeks" +msgstr "" + +#: templates/web/base/reports/index.html:25 +msgid "Marked fixed/closed more than eight weeks ago" +msgstr "" + #: templates/web/fixmystreet/contact/index.html:106 msgid "Message" msgstr "Messaggio" @@ -1525,7 +1503,7 @@ msgstr "Messaggio" msgid "Message:" msgstr "Messaggio:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:440 +#: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" msgstr "" @@ -1555,11 +1533,11 @@ msgstr "Più problemi vicini" #: templates/web/fixmystreet/report/update-form.html:138 #: 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:94 +#: templates/web/zurich/report/new/fill_in_details_form.html:77 msgid "Name" msgstr "Nome" -#: templates/web/base/admin/report_edit.html:66 +#: templates/web/base/admin/report_edit.html:79 #: templates/web/base/admin/update_edit.html:32 #: templates/web/base/admin/user-form.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:43 @@ -1568,25 +1546,25 @@ msgstr "Nome" msgid "Name:" msgstr "Nome:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:321 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:313 msgid "Name: %s" msgstr "Nome: %s" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:186 -#: perllib/FixMyStreet/Geocode/OSM.pm:164 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 +#: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "Il più vicino nome della strada al segno posizionato sulla mappa (automaticamente generato usando OpenStreetMap): %s%s" -#: perllib/FixMyStreet/Cobrand/UK.pm:137 +#: perllib/FixMyStreet/Cobrand/UK.pm:127 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 +#: perllib/FixMyStreet/Cobrand/Default.pm:442 +#: perllib/FixMyStreet/Cobrand/Default.pm:482 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:277 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1600,11 +1578,11 @@ msgstr "Quasi fatto! Ora controlla la tua email..." msgid "New <br>problems" msgstr "Nuovi <br>problemi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:264 +#: perllib/FixMyStreet/App/Controller/Admin.pm:261 msgid "New body added" msgstr "Nuovo corpo aggiunto" -#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:379 msgid "New category contact added" msgstr "Nuova categoria contatto aggiunta" @@ -1677,15 +1655,15 @@ msgstr "Nuovo aggiornamento:" msgid "Next" msgstr "Prossimo" -#: templates/web/base/admin/body.html:72 templates/web/base/admin/body.html:74 -#: templates/web/base/admin/body.html:78 templates/web/base/admin/body.html:80 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:93 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:44 @@ -1703,7 +1681,7 @@ msgstr "Nessun corpo" msgid "No council" msgstr "Nessuno comune" -#: perllib/FixMyStreet/DB/Result/Problem.pm:376 +#: perllib/FixMyStreet/DB/Result/Problem.pm:401 msgid "No council selected" msgstr "Nessun comune selezionato" @@ -1744,12 +1722,12 @@ msgid "" " your config file is not pointing to a live MapIt service." msgstr "" -#: templates/web/base/report/_support.html:3 +#: templates/web/base/report/_support.html:2 #: templates/web/base/report/_support.html:4 msgid "No supporters" msgstr "Nessun sostenitore" -#: templates/web/base/admin/report_edit.html:30 +#: templates/web/base/admin/report_edit.html:41 #: templates/web/zurich/admin/report_edit-sdm.html:46 #: templates/web/zurich/admin/report_edit.html:60 msgid "None" @@ -1764,8 +1742,8 @@ msgid "" " activity across their body), the ability to hide reports or set special report statuses." msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:46 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -1781,12 +1759,12 @@ msgstr "" msgid "Not reported before" msgstr "Non segnalato precedente" -#: templates/web/base/report/_main.html:61 +#: templates/web/base/report/_main.html:62 msgid "Not reported to council" msgstr "Non segnalato al comune" -#: templates/web/base/admin/body.html:63 -#: templates/web/base/admin/category_edit.html:87 +#: templates/web/base/admin/body.html:71 +#: templates/web/base/admin/category_edit.html:92 #: templates/web/zurich/admin/body.html:17 msgid "Note" msgstr "Nota" @@ -1795,8 +1773,8 @@ msgstr "Nota" 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/base/admin/body.html:178 -#: templates/web/base/admin/category_edit.html:44 +#: templates/web/base/admin/body.html:186 +#: templates/web/base/admin/category_edit.html:49 #: templates/web/zurich/admin/body.html:53 msgid "Note:" msgstr "Nota:" @@ -1809,7 +1787,7 @@ msgstr "Nota: <strong>%s</strong>" msgid "Now to submit your report…" msgstr "Ora per inserire la tua segnalazione…" -#: templates/web/base/report/new/fill_in_details_form.html:132 +#: templates/web/base/report/new/fill_in_details_form.html:113 msgid "Now to submit your report… do you have a FixMyStreet password?" msgstr "Ora per inserire la tua segnalazione… Hai già la password per FixMyStreet?" @@ -1826,7 +1804,7 @@ msgid "OK" msgstr "OK" #: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:16 +#: templates/web/base/report/update.html:17 msgid "Offensive? Unsuitable? Tell us" msgstr "Offensivo? Non adatto? Contattaci" @@ -1846,19 +1824,19 @@ msgstr "Più vecchi <br> risolti" msgid "Older <br>problems" msgstr "Vecchi <br>problemi" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:37 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 msgid "One-line summary" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:137 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:36 -#: templates/web/base/admin/report_edit.html:37 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:138 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:49 +#: templates/web/base/admin/report_edit.html:50 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/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:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/report_edit.html:86 #: templates/web/zurich/admin/report_edit.html:88 @@ -1867,10 +1845,19 @@ msgstr "" msgid "Open" msgstr "Aperto" -#: templates/web/base/my/my.html:30 templates/web/fixmystreet/my/my.html:36 +#: templates/web/base/reports/index.html:22 +msgid "Open for more than four weeks, with an update within the past eight weeks" +msgstr "" + +#: templates/web/base/my/my.html:30 +#: templates/web/fixmystreet/my/_problem-list.html:2 msgid "Open reports" msgstr "Segnalazione aperta" +#: templates/web/base/reports/index.html:23 +msgid "Open, but not had any update in eight weeks" +msgstr "" + #: templates/web/base/open311/index.html:70 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "" @@ -1893,15 +1880,15 @@ msgstr "" msgid "Or you can subscribe to an alert based upon what ward or council you’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:560 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 -#: perllib/FixMyStreet/DB/Result/Problem.pm:592 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:372 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 +#: perllib/FixMyStreet/DB/Result/Problem.pm:597 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:393 msgid "Other" msgstr "Altro" @@ -1923,8 +1910,8 @@ msgstr "Pagina non trovata" msgid "Parent" msgstr "Parente" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 msgid "Partial" msgstr "Parziale" @@ -1944,7 +1931,7 @@ msgstr "Password:" msgid "Permalink" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:100 +#: templates/web/zurich/report/new/fill_in_details_form.html:83 msgid "Phone number" msgstr "Numero di telefono" @@ -1953,27 +1940,27 @@ msgstr "Numero di telefono" msgid "Phone number (optional)" msgstr "Numero di telefono (opzionale)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:286 -#: templates/web/base/admin/report_edit.html:68 -#: templates/web/base/report/new/fill_in_details_form.html:216 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:291 +#: templates/web/base/admin/report_edit.html:81 +#: templates/web/base/report/new/fill_in_details_form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:46 #: templates/web/zurich/admin/report_edit.html:60 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Telefono:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:72 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 #: 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 +#: templates/web/zurich/report/new/fill_in_details_form.html:51 msgid "Photo" msgstr "Foto" #: templates/web/base/questionnaire/index.html:71 -#: templates/web/base/report/new/fill_in_details_form.html:103 +#: templates/web/base/report/new/fill_in_details_form.html:84 #: templates/web/base/report/update-form.html:62 #: templates/web/fixmystreet/questionnaire/index.html:91 msgid "Photo:" @@ -1987,11 +1974,11 @@ msgstr "Foto delle piu vicine e recenti segnalazioni" msgid "Place pin on map" msgstr "Inserisci il cursore sulla mappa" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:38 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/zurich/admin/header.html:2 +#: 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:86 @@ -2025,20 +2012,19 @@ msgstr "Per favore controlla la tua email" msgid "Please check your email address is correct" msgstr "Per favore controlla che il tuo indirizzo email è corretto" -#: perllib/FixMyStreet/App/Controller/Admin.pm:349 -#: 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:395 +#: perllib/FixMyStreet/App/Controller/Admin.pm:343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:876 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 +#: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" msgstr "Per favore scegli una categoria" -#: perllib/FixMyStreet/DB/Result/Problem.pm:401 +#: perllib/FixMyStreet/DB/Result/Problem.pm:418 msgid "Please choose a property type" msgstr "Per favore scegli un tipo di proprietà" -#: perllib/FixMyStreet/App/Controller/Admin.pm:376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:370 msgid "Please correct the errors below" msgstr "" @@ -2057,8 +2043,8 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "Per favore non abusarne — abusandone il comune svaluterà il servizio per tutti gli utenti." -#: perllib/FixMyStreet/App/Controller/Admin.pm:352 -#: perllib/FixMyStreet/DB/Result/Comment.pm:133 +#: perllib/FixMyStreet/App/Controller/Admin.pm:346 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "Per favore inserisci un messaggio" @@ -2069,15 +2055,15 @@ msgstr "Per favore inserisci un messaggio" msgid "Please enter a password" msgstr "Per favore inserisci la password" -#: perllib/FixMyStreet/App/Controller/Contact.pm:108 -#: perllib/FixMyStreet/DB/Result/Problem.pm:370 +#: perllib/FixMyStreet/App/Controller/Contact.pm:113 +#: perllib/FixMyStreet/DB/Result/Problem.pm:395 #: templates/web/base/js/translation_strings.html:3 msgid "Please enter a subject" msgstr "Per favore inserisci il soggetto" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1050 -#: perllib/FixMyStreet/App/Controller/Admin.pm:351 -#: perllib/FixMyStreet/App/Controller/Admin.pm:997 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin.pm:995 #: perllib/FixMyStreet/DB/Result/User.pm:127 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 @@ -2085,16 +2071,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:118 +#: perllib/FixMyStreet/App/Controller/Contact.pm:123 msgid "Please enter a valid email address" msgstr "Per favore inserire un indirizzo email valido" -#: perllib/FixMyStreet/DB/Result/Problem.pm:373 +#: perllib/FixMyStreet/DB/Result/Problem.pm:398 #: templates/web/base/js/translation_strings.html:4 msgid "Please enter some details" msgstr "Per favore inserire qualche dettaglio " -#: perllib/FixMyStreet/App/Controller/Contact.pm:107 +#: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/User.pm:124 #: templates/web/base/auth/general.html:13 #: templates/web/base/auth/general.html:8 @@ -2108,7 +2094,7 @@ msgid "Please enter your email" msgstr "Per favore inserisci la tua email" #: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:75 msgid "Please enter your email address" msgstr "Per favore inserisci il tuo indirizzo email" @@ -2116,14 +2102,14 @@ msgstr "Per favore inserisci il tuo indirizzo email" msgid "Please enter your first name" msgstr "Per favore inserisci il tuo nome" -#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: perllib/FixMyStreet/Cobrand/UK.pm:318 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Per favore inserisci il tuo nome completo, i comuni hanno bisogno di questa informazione - Se non vuoi che il tuo nome venga mostrato sul sito, deseleziona il box qui sotto" -#: perllib/FixMyStreet/App/Controller/Contact.pm:106 -#: perllib/FixMyStreet/DB/Result/Comment.pm:130 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Contact.pm:111 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 +#: perllib/FixMyStreet/DB/Result/Problem.pm:406 #: perllib/FixMyStreet/DB/Result/User.pm:120 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" @@ -2146,7 +2132,7 @@ msgstr "Per favore inserisci il tuo titolo" 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/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:8 msgid "Please fill in details of the problem below." msgstr "Si prega di compilare i dettagli del problema qui di seguito." @@ -2161,7 +2147,7 @@ msgstr "SI prega di inserire i dettagli del problema" msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "Si prega di compilare il modulo sottostante con i dettagli del problema, e descrivere la posizione nel modo più preciso possibile, nella casella dettagli." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:251 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Per favore indicare se si vuole ricevere un altro questionario" @@ -2184,16 +2170,16 @@ msgstr "La tua segnalazione <strong>non è stata inviata</strong>. Scegli una ca msgid "Please note:" msgstr "Attenzione:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:246 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:254 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 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:261 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 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:247 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 " @@ -2205,7 +2191,7 @@ msgstr "Si prega di selezionare il feed che si vuole" msgid "Please select the type of alert you want" msgstr "Per favore seleziona il tipo di avvertimento che desideri" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please state whether or not the problem has been fixed" msgstr "Si prega di indicare se il problema è stato risolto" @@ -2213,15 +2199,13 @@ msgstr "Si prega di indicare se il problema è stato risolto" 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 +#: perllib/FixMyStreet/App/Controller/Photo.pm:177 +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 +#: perllib/FixMyStreet/App/Controller/Photo.pm:189 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:109 +#: perllib/FixMyStreet/App/Controller/Contact.pm:114 msgid "Please write a message" msgstr "Per favore scrivi un messaggio" @@ -2258,16 +2242,16 @@ msgstr "Precedente" #: templates/web/fixmystreet/footer.html:32 msgid "Privacy" -msgstr "" +msgstr "Privacy" -#: templates/web/base/admin/body.html:194 -#: templates/web/base/admin/body.html:77 -#: templates/web/base/admin/category_edit.html:40 -#: templates/web/base/admin/report_edit.html:79 +#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:85 +#: templates/web/base/admin/category_edit.html:45 +#: templates/web/base/admin/report_edit.html:95 msgid "Private" msgstr "Privato" -#: templates/web/base/maps/openlayers.html:86 +#: templates/web/base/maps/openlayers.html:89 msgid "Problem" msgstr "Problema" @@ -2288,7 +2272,7 @@ msgstr "Problema %s inviato al comune %s" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:966 msgid "Problem marked as open." msgstr "Problema marcato come aperto." @@ -2323,16 +2307,15 @@ msgstr "Problemi recentemente segnalati e risolti su FIxMyStreet" msgid "Problems within %.1fkm of this location" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:629 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:114 +#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:151 -#: perllib/FixMyStreet/Cobrand/UK.pm:217 +#: perllib/FixMyStreet/Cobrand/UK.pm:207 msgid "Problems within %s" msgstr "Problemi dentro %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:122 -#: perllib/FixMyStreet/Cobrand/UK.pm:231 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "Problems within %s ward" msgstr "Problemi dentro %s quartiere" @@ -2350,7 +2333,7 @@ msgstr "Problemi dentro i confini di:" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "" -#: templates/web/base/admin/report_edit.html:32 +#: templates/web/base/admin/report_edit.html:45 msgid "Property address:" msgstr "L'indirizzo della proprietà:" @@ -2367,7 +2350,7 @@ msgstr "Fornisci un'aggiornamento" 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/base/report/new/fill_in_details_form.html:174 +#: templates/web/base/report/new/fill_in_details_form.html:155 #: templates/web/base/report/update-form.html:128 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 #: templates/web/fixmystreet/report/update-form.html:119 @@ -2388,7 +2371,7 @@ msgstr "Pubblica la foto" msgid "Publish the response" msgstr "Pubblica la risposta" -#: templates/web/base/questionnaire/completed.html:2 +#: templates/web/base/questionnaire/completed.html:1 #: templates/web/base/questionnaire/index.html:0 #: templates/web/base/questionnaire/index.html:14 #: templates/web/base/questionnaire/index.html:4 @@ -2407,11 +2390,12 @@ msgstr "Questionario %d e risposte per il problema %d, %s o %s" msgid "Questionnaire %d sent for problem %d" msgstr "Questionario %d inviato per il problema %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 msgid "Questionnaire filled in by problem reporter" msgstr "" #: templates/web/base/alert/_list.html:21 +#: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display.html:50 #: templates/web/base/reports/_rss.html:1 @@ -2421,11 +2405,11 @@ msgstr "" msgid "RSS feed" msgstr "RSS feed" -#: perllib/FixMyStreet/Cobrand/UK.pm:260 perllib/FixMyStreet/Cobrand/UK.pm:272 +#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 msgid "RSS feed for %s" msgstr "RSS feed per %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "RSS feed for %s ward, %s" msgstr "" @@ -2433,15 +2417,11 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:167 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:175 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:185 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:193 -#: perllib/FixMyStreet/Cobrand/UK.pm:286 perllib/FixMyStreet/Cobrand/UK.pm:298 +#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 msgid "RSS feed of %s" msgstr "RSS feed di %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 msgid "RSS feed of %s, within %s ward" msgstr "RSS feed di %s, dentro al quartiere %s " @@ -2454,20 +2434,19 @@ msgstr "RSS feed dei problemi vicino" 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:115 +#: perllib/FixMyStreet/Cobrand/Default.pm:651 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:150 -#: perllib/FixMyStreet/Cobrand/UK.pm:224 +#: perllib/FixMyStreet/Cobrand/UK.pm:214 msgid "RSS feed of problems within %s" msgstr "RSS feed dei problemi dentro %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 -#: perllib/FixMyStreet/Cobrand/UK.pm:230 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s ward" msgstr "RSS feed di problemi dentro al quartiere %s " -#: templates/web/base/around/display_location.html:3 +#: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:4 msgid "RSS feed of recent local problems" msgstr "RSS feed dei recenti problemi locali" @@ -2507,15 +2486,18 @@ msgstr "Ricorda che FIxMyStreet serve per segnalare problemi materiali che posso msgid "Remove flag" msgstr "" -#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/report_edit.html:110 #: templates/web/base/admin/update_edit.html:62 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "" -#: templates/web/base/footer.html:7 templates/web/fiksgatami/footer.html:19 -#: templates/web/fiksgatami/nn/footer.html:19 -#: templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 +msgid "Report" +msgstr "" + +#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 #: templates/web/zurich/footer.html:17 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2525,11 +2507,6 @@ msgstr "Segnala un problema" msgid "Report abuse" msgstr "Segnala un abuso" -#: templates/web/base/report_created.html:1 -#: templates/web/base/report_created.html:3 -msgid "Report created" -msgstr "" - #: perllib/FixMyStreet/App/Controller/Rss.pm:295 msgid "Report on %s" msgstr "" @@ -2553,7 +2530,7 @@ msgstr "Riportati %s" msgid "Reported %s, to %s" msgstr "Riportati %s, a %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:580 #: templates/web/base/contact/index.html:50 #: templates/web/fixmystreet/contact/index.html:65 msgid "Reported anonymously at %s" @@ -2565,7 +2542,7 @@ msgstr "Riportati anonimamente al %s" msgid "Reported before" msgstr "Segnalati prima" -#: perllib/FixMyStreet/DB/Result/Problem.pm:598 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 #: templates/web/base/contact/index.html:52 #: templates/web/fixmystreet/contact/index.html:67 msgid "Reported by %s at %s" @@ -2575,31 +2552,36 @@ msgstr "Segnalato da %s al %s" msgid "Reported in the %s category" msgstr "Riportato nella categoria %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:571 +#: perllib/FixMyStreet/DB/Result/Problem.pm:576 msgid "Reported in the %s category anonymously at %s" msgstr "Riportato nella categoria %s anonimamente alle %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:598 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:567 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:589 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:563 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:583 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 msgid "Reported via %s in the %s category by %s at %s" msgstr "" -#: templates/web/base/around/around_index.html:2 +#: templates/web/base/reports/index.html:21 +#, fuzzy +msgid "Reported within the last four weeks" +msgstr "Riportato nella categoria %s" + +#: templates/web/base/around/around_index.html:1 #: templates/web/base/around/around_index.html:3 #: templates/web/base/js/translation_strings.html:41 #: templates/web/base/report/new/fill_in_details.html:0 @@ -2609,14 +2591,13 @@ msgstr "" msgid "Reporting a problem" msgstr "Stai segnalando un problema" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:294 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:409 -#: perllib/FixMyStreet/DB/Result/Problem.pm:413 +#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" @@ -2632,7 +2613,7 @@ msgstr "Segnalazioni sulla e intorno alla mappa" msgid "Reports published" msgstr "Segnalazioni pubblicate" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:85 msgid "Resend report" msgstr "Rinvia la segnalazione" @@ -2640,36 +2621,35 @@ msgstr "Rinvia la segnalazione" msgid "Right place?" msgstr "E' il posto giusto?" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:193 -#: perllib/FixMyStreet/Geocode/OSM.pm:171 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:167 +#: perllib/FixMyStreet/Geocode/OSM.pm:152 msgid "Road operator for this named road (derived from road reference number and type): %s" msgstr "" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:190 -#: perllib/FixMyStreet/Geocode/OSM.pm:168 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:164 +#: perllib/FixMyStreet/Geocode/OSM.pm:149 msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1394 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 -#: templates/web/base/admin/report_edit.html:90 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1403 +#: templates/web/base/admin/report_edit.html:106 #: templates/web/zurich/admin/report_edit.html:73 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1394 -#: templates/web/base/admin/report_edit.html:91 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: templates/web/base/admin/report_edit.html:107 #: templates/web/zurich/admin/report_edit.html:74 msgid "Rotate Right" msgstr "" #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:200 -#: templates/web/base/admin/category_edit.html:76 +#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/category_edit.html:81 #: templates/web/zurich/admin/body.html:59 msgid "Save changes" msgstr "Salva modifiche" @@ -2697,7 +2677,7 @@ msgstr "Cerca:" msgid "Searching found no reports." msgstr "" -#: templates/web/base/admin/users.html:39 +#: templates/web/base/admin/users.html:41 msgid "Searching found no users." msgstr "" @@ -2720,15 +2700,15 @@ msgstr "Seleziona un'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 "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:680 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "Sent to %s %s later" msgstr "" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:84 msgid "Sent:" msgstr "Inviato:" -#: templates/web/base/admin/report_edit.html:73 +#: templates/web/base/admin/report_edit.html:89 #: templates/web/zurich/admin/stats.html:45 msgid "Service:" msgstr "" @@ -2737,7 +2717,7 @@ msgstr "" msgid "Share" msgstr "Condividi" -#: templates/web/base/report/new/fill_in_details_form.html:211 +#: templates/web/base/report/new/fill_in_details_form.html:192 #: templates/web/base/report/update-form.html:157 #: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 @@ -2782,12 +2762,12 @@ msgstr "" msgid "Signed in as %s" msgstr "Entra come %s" -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 msgid "Some categories may require additional information." msgstr "Qualche categoria potrebbe richiedere ulteriori informazioni." -#: templates/web/base/admin/body-form.html:145 -#: templates/web/base/admin/body-form.html:146 +#: templates/web/base/admin/body-form.html:149 +#: templates/web/base/admin/body-form.html:150 msgid "" "Some endpoints require an <strong>API key</strong> to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -2798,11 +2778,11 @@ 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 +#: perllib/FixMyStreet/App/View/Web.pm:43 msgid "Some text to localize" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:88 +#: perllib/FixMyStreet/Cobrand/UK.pm:78 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -2810,17 +2790,16 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:215 -#: perllib/FixMyStreet/Geocode.pm:26 perllib/FixMyStreet/Geocode/Bing.pm:56 -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:73 -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:93 -#: perllib/FixMyStreet/Geocode/Google.pm:72 -#: perllib/FixMyStreet/Geocode/OSM.pm:64 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:214 +#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 +#: perllib/FixMyStreet/Geocode/Google.pm:47 +#: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "Ci scusiamo, non possiamo trovare questa zona." -#: perllib/FixMyStreet/Geocode/Bing.pm:51 -#: perllib/FixMyStreet/Geocode/Google.pm:67 +#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: perllib/FixMyStreet/Geocode/Google.pm:44 #: perllib/FixMyStreet/Geocode/Zurich.pm:87 msgid "Sorry, we could not parse that location. Please try again." msgstr "Ci scusiamo, non possiamo analizzare questa zona. Per favore prova ancora." @@ -2829,7 +2808,7 @@ msgstr "Ci scusiamo, non possiamo analizzare questa zona. Per favore prova ancor msgid "Start Date:" msgstr "Data di inizio:" -#: templates/web/base/admin/body.html:61 +#: templates/web/base/admin/body.html:69 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 @@ -2837,7 +2816,7 @@ msgstr "Data di inizio:" msgid "State" msgstr "Stato" -#: templates/web/base/admin/report_edit.html:34 +#: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 #: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:53 @@ -2846,8 +2825,8 @@ msgstr "Stato" msgid "State:" msgstr "Stato:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1200 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:304 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:308 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" @@ -2863,7 +2842,7 @@ msgstr "Status" msgid "Still open, via questionnaire, %s" msgstr "Ancora aperto, attraverso il questionario %s" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:381 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 msgid "Subcategory: %s" msgstr "Sottocategoria: %s" @@ -2883,19 +2862,19 @@ msgid "Subject:" msgstr "Soggetto:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:115 -#: templates/web/base/report/new/fill_in_details_form.html:155 -#: templates/web/base/report/new/fill_in_details_form.html:177 +#: templates/web/base/report/new/fill_in_details_form.html:136 +#: templates/web/base/report/new/fill_in_details_form.html:158 +#: templates/web/base/report/new/fill_in_details_form.html:96 #: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 -#: templates/web/zurich/report/new/fill_in_details_form.html:108 +#: templates/web/zurich/report/new/fill_in_details_form.html:91 msgid "Submit" msgstr "Invia" -#: templates/web/base/admin/report_edit.html:97 +#: templates/web/base/admin/report_edit.html:113 #: templates/web/base/admin/update_edit.html:65 -#: templates/web/base/admin/user-form.html:55 +#: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:64 #: templates/web/zurich/admin/report_edit.html:221 #: templates/web/zurich/admin/update_edit.html:38 @@ -2907,8 +2886,8 @@ msgstr "Invia modifiche" msgid "Submit questionnaire" msgstr "Invia questionario" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:133 -#: templates/web/zurich/admin/header.html:2 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:134 +#: 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 @@ -2932,8 +2911,8 @@ msgstr "Sottoscrivi" msgid "Subscribe me to an email alert" msgstr "Iscrivimi alle email di avviso" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1191 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:293 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 #: templates/web/zurich/admin/index-dm.html:1 @@ -2949,7 +2928,7 @@ msgstr "Sommario" msgid "Summary reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 msgid "Survey" msgstr "Sondaggio" @@ -2963,7 +2942,7 @@ msgstr "Risultati sondaggio" msgid "Text" msgstr "Testo" -#: templates/web/base/admin/body.html:21 +#: templates/web/base/admin/body.html:28 msgid "Text only version" msgstr "Solo versione testuale" @@ -2972,49 +2951,55 @@ msgstr "Solo versione testuale" msgid "Text:" msgstr "Testo:" -#: templates/web/base/tokens/confirm_update.html:9 -msgid "Thank you — you can <a href=\"%s\">view your updated problem</a> on the site." -msgstr "" - -#: templates/web/base/tokens/confirm_problem.html:18 -msgid "Thank you for reporting this issue" +#: templates/web/base/tokens/confirm_problem.html:12 +msgid "Thank you for reporting this issue!" msgstr "" #: templates/web/base/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/base/tokens/confirm_update.html:15 +msgid "Thank you for updating this issue!" +msgstr "" + +#: templates/web/base/contact/submit.html:6 +#: templates/web/base/questionnaire/completed.html:5 +msgid "Thank you for your feedback" +msgstr "" + #: templates/web/fixmystreet/around/around_index.html:28 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 :" 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 :" -#: templates/web/base/contact/submit.html:8 -msgid "Thanks for your feedback. We'll get back to you as soon as we can!" -msgstr "" - #: templates/web/base/questionnaire/creator_fixed.html:9 msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "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 +#: perllib/FixMyStreet/App/Controller/Photo.pm:195 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Council.pm:100 +#: perllib/FixMyStreet/App/Controller/Council.pm:97 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 +#: perllib/FixMyStreet/App/Controller/Location.pm:126 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:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:81 +#: perllib/FixMyStreet/Cobrand/UK.pm:71 msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:713 +#: perllib/FixMyStreet/App/Controller/Admin.pm:712 +#, fuzzy +msgid "That problem has been marked as sent." +msgstr "Questo problema è stato risolto" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:704 msgid "That problem will now be resent." msgstr "" @@ -3026,28 +3011,28 @@ msgstr "La segnalazione non può essere vista su %s." msgid "That report has been removed from FixMyStreet." msgstr "Quella segnalazione è stata rimossa da FixMyStreet" -#: templates/web/base/admin/body.html:136 +#: templates/web/base/admin/body.html:144 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/base/admin/body-form.html:119 -#: templates/web/base/admin/body-form.html:120 +#: templates/web/base/admin/body-form.html:123 +#: templates/web/base/admin/body-form.html:124 msgid "" "The <strong>endpoint</strong> is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." msgstr "" -#: templates/web/base/admin/body-form.html:132 -#: templates/web/base/admin/body-form.html:133 +#: templates/web/base/admin/body-form.html:136 +#: templates/web/base/admin/body-form.html:137 msgid "" "The <strong>jurisdiction</strong> is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" -#: templates/web/base/admin/body-form.html:90 -#: templates/web/base/admin/body-form.html:91 +#: templates/web/base/admin/body-form.html:94 +#: templates/web/base/admin/body-form.html:95 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>." @@ -3068,7 +3053,7 @@ msgstr "" msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." msgstr "" -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:3 msgid "The council won’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.." @@ -3095,8 +3080,8 @@ msgstr "L'errore era: %s" msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:185 -#: perllib/FixMyStreet/Geocode/OSM.pm:163 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:159 +#: perllib/FixMyStreet/Geocode/OSM.pm:144 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap." msgstr "" @@ -3154,7 +3139,7 @@ msgstr "" msgid "The passwords do not match" msgstr "Le passwords non corrispondono" -#: templates/web/base/errors/page_error_404_not_found.html:11 +#: templates/web/base/errors/page_error_404_not_found.html:10 #: templates/web/base/errors/page_error_404_not_found.html:12 msgid "The requested URL '%s' was not found on this server" msgstr "L'URL richiesta '%s' non è stata trovata su questo serverjavascript:;" @@ -3171,7 +3156,7 @@ msgstr "" msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:295 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:300 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" @@ -3182,16 +3167,20 @@ msgid "" " Names are not necessarily unique." msgstr "" +#: templates/web/base/reports/_problem-list.html:15 +msgid "There are no reports to show." +msgstr "" + #: perllib/FixMyStreet/App/Controller/Reports.pm:75 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:131 +#: perllib/FixMyStreet/App/Controller/Contact.pm:136 #: perllib/FixMyStreet/App/Controller/Dashboard.pm:59 msgid "There was a problem showing this page. Please try again later." msgstr "E' accaduto un problema visualizzando questa pagine. Per favore riprova ancora più tardi" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:755 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:762 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 #: templates/web/base/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:25 @@ -3207,7 +3196,7 @@ msgstr "E' accaduto un problema con la tua combinazione email/password. Per favo msgid "There was a problem with your update. Please try again." msgstr "C'è stato un problema con il tuo aggiornamento. Per favore prova ancora." -#: perllib/FixMyStreet/App/Controller/Contact.pm:135 +#: perllib/FixMyStreet/App/Controller/Contact.pm:140 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." @@ -3215,8 +3204,8 @@ msgstr "Ci sono stati dei problemi con la tua segnalazione. Per favore guarda qu msgid "There were problems with your update. Please see below." msgstr "" -#: templates/web/base/admin/body-form.html:108 -#: templates/web/base/admin/body-form.html:109 +#: templates/web/base/admin/body-form.html:112 +#: templates/web/base/admin/body-form.html:113 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" @@ -3229,14 +3218,14 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" -#: templates/web/base/admin/body.html:36 +#: templates/web/base/admin/body.html:44 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported <em>at any location</em>.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" " Currently, users <strong>cannot report problems to this body</strong>." msgstr "" -#: templates/web/base/admin/body.html:46 +#: templates/web/base/admin/body.html:54 msgid "This body has no contacts. This means that currently problems reported to this body <strong>will not be sent</strong>." msgstr "" @@ -3247,18 +3236,18 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:388 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:394 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:391 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 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:136 -#: perllib/FixMyStreet/Cobrand/UK.pm:53 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:902 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:972 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/Cobrand/UK.pm:43 msgid "This information is required" msgstr "Questa informazione è richiesta" @@ -3297,8 +3286,8 @@ msgstr "" msgid "This problem is old and of unknown status." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:130 #: perllib/FixMyStreet/Cobrand/Zurich.pm:131 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:132 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -3315,15 +3304,15 @@ msgstr "" msgid "This report is currently marked as open." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:319 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:311 msgid "This report was submitted anonymously" msgstr "Questo report è stato sottomesso in maniera anonima" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:293 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -3341,7 +3330,7 @@ msgstr "Per <strong>segnalare un problema</strong>, clicca sulla mappa nella cor 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:294 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:299 msgid "To view a map of the precise location of this issue" msgstr "" @@ -3357,8 +3346,12 @@ msgstr "Totale" msgid "Try again" msgstr "Prova ancora" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:46 +#: templates/web/base/contact/submit.html:14 +msgid "Try emailing us directly:" +msgstr "" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -3366,8 +3359,8 @@ msgstr "Prova ancora" msgid "Unable to fix" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/admin/update_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:45 #: templates/web/zurich/admin/report_edit.html:58 @@ -3409,7 +3402,7 @@ msgstr "" msgid "Update below added by %s at %s" msgstr "" -#: templates/web/base/admin/body-form.html:233 +#: templates/web/base/admin/body-form.html:240 #: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "" @@ -3435,7 +3428,7 @@ msgstr "Aggiorna segnalazione come risolta" msgid "Update reopened problem" msgstr "" -#: templates/web/base/admin/body.html:93 +#: templates/web/base/admin/body.html:101 msgid "Update statuses" msgstr "" @@ -3449,12 +3442,12 @@ msgstr "Aggiornamento:" msgid "Updated" msgstr "Aggiornato" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1016 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1060 -#: perllib/FixMyStreet/App/Controller/Admin.pm:810 -#: perllib/FixMyStreet/App/Controller/Admin.pm:958 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:549 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:618 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1014 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:808 +#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:556 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:625 msgid "Updated!" msgstr "Aggiornato!" @@ -3466,7 +3459,7 @@ msgstr "Aggiornato!" msgid "Updates" msgstr "Aggiornamenti" -#: perllib/FixMyStreet/DB/Result/Comment.pm:139 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -3481,7 +3474,7 @@ msgstr "" msgid "Updates to this problem, FixMyStreet" msgstr "" -#: templates/web/base/admin/body.html:174 +#: templates/web/base/admin/body.html:182 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 "" @@ -3490,11 +3483,11 @@ msgstr "" msgid "User" msgstr "Utente" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1357 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1331 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1329 msgid "User flagged" msgstr "" @@ -3502,16 +3495,16 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:303 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:307 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Utenti" -#: perllib/FixMyStreet/App/Controller/Admin.pm:380 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:430 +#: perllib/FixMyStreet/App/Controller/Admin.pm:374 +#: perllib/FixMyStreet/App/Controller/Admin.pm:404 +#: perllib/FixMyStreet/App/Controller/Admin.pm:421 msgid "Values updated" msgstr "" @@ -3565,11 +3558,11 @@ msgstr "" 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:397 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:403 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/base/index-steps.html:38 +#: templates/web/base/index-steps.html:31 msgid "We send it to the council on your behalf" msgstr "Lo invieremo noi al comune responsabile a tuo nome" @@ -3578,15 +3571,23 @@ msgstr "Lo invieremo noi al comune responsabile a tuo nome" 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/base/questionnaire/completed-open.html:2 +msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" +msgstr "" + #: templates/web/base/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/fixmystreet/report/new/fill_in_details_form.html:41 +#: templates/web/base/contact/submit.html:7 +msgid "We’ll get back to you as soon as we can." +msgstr "" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 msgid "What’s the issue, and where is it?" msgstr "" -#: templates/web/base/admin/category_edit.html:82 +#: templates/web/base/admin/category_edit.html:87 #: templates/web/zurich/admin/body.html:18 msgid "When edited" msgstr "" @@ -3595,15 +3596,18 @@ msgstr "" msgid "When sent" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Whole block of empty flats" msgstr "" +#: templates/web/base/tokens/confirm_alert.html:7 +msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." +msgstr "" + #: templates/web/base/open311/index.html:92 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/fiksgatami/front/footer-marketing.html:15 #: templates/web/fixmystreet/front/footer-marketing.html:17 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" @@ -3627,18 +3631,18 @@ msgid "Year" msgstr "Anno" #: templates/web/base/admin/bodies.html:66 -#: templates/web/base/admin/body.html:72 templates/web/base/admin/body.html:74 -#: templates/web/base/admin/body.html:78 templates/web/base/admin/body.html:80 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:76 +#: templates/web/base/admin/report_edit.html:93 #: templates/web/base/admin/update_edit.html:24 -#: templates/web/base/admin/users.html:29 +#: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:42 #: templates/web/base/questionnaire/index.html:81 @@ -3667,14 +3671,12 @@ msgstr "" msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/tokens/confirm_problem.html:25 -#: templates/web/base/tokens/confirm_problem.html:26 -#: templates/web/zurich/tokens/confirm_problem.html:6 +#: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:8 msgid "You can <a href=\"%s%s\">view the problem on this site</a>." msgstr "" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:48 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -3689,14 +3691,14 @@ msgid "" " reports in the past." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:19 -#: templates/web/base/report/new/councils_text_none.html:20 -#: templates/web/base/report/new/councils_text_some.html:20 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." msgstr "" -#: templates/web/base/admin/body-form.html:81 +#: templates/web/base/admin/body-form.html:85 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" @@ -3709,10 +3711,10 @@ msgid "You have already answered this questionnaire. If you have a question, ple msgstr "" #: templates/web/base/questionnaire/index.html:68 -#: templates/web/base/report/new/fill_in_details_form.html:94 +#: templates/web/base/report/new/fill_in_details_form.html:75 #: templates/web/fixmystreet/questionnaire/index.html:88 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:79 -#: templates/web/zurich/report/new/fill_in_details_form.html:75 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 +#: templates/web/zurich/report/new/fill_in_details_form.html:58 msgid "You have already attached a photo to this report, attaching another one will replace it." msgstr "" @@ -3721,7 +3723,7 @@ msgstr "" msgid "You have already attached a photo to this update, attaching another one will replace it." msgstr "" -#: templates/web/base/auth/sign_out.html:3 +#: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" msgstr "" @@ -3730,26 +3732,11 @@ msgstr "" 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/base/tokens/confirm_alert.html:8 -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 "Il tuo indirizzo email è stato confermato con successo." -#: templates/web/base/tokens/confirm_update.html:14 -msgid "You have successfully confirmed your update and you can now <a href=\"%s\">view it on the site</a>." -msgstr "" - -#: templates/web/base/tokens/confirm_alert.html:12 -msgid "You have successfully created your alert." -msgstr "" - -#: templates/web/base/tokens/confirm_alert.html:10 -msgid "You have successfully deleted your alert." -msgstr "" - #: templates/web/base/report/display.html:20 #: templates/web/base/report/new/fill_in_details.html:37 #: templates/web/fixmystreet/report/display.html:17 @@ -3775,7 +3762,7 @@ msgid "" " contacts (such as an email address) to which reports are sent." msgstr "" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:85 msgid "You really want to resend?" msgstr "" @@ -3795,7 +3782,7 @@ msgstr "Tue segnalazioni" #: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 #: templates/web/fixmystreet/report/update-form.html:76 -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:71 msgid "Your email" msgstr "La tua email" @@ -3811,7 +3798,7 @@ msgid "Your email address:" msgstr "Tuo indirizzo email:" #: templates/web/base/alert/_list.html:92 -#: templates/web/base/report/new/fill_in_details_form.html:125 +#: templates/web/base/report/new/fill_in_details_form.html:106 #: templates/web/base/report/update-form.html:81 msgid "Your email:" msgstr "La tua email:" @@ -3826,13 +3813,13 @@ msgstr "" #: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 #: templates/web/fixmystreet/report/update-form.html:142 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:98 +#: templates/web/zurich/report/new/fill_in_details_form.html:81 msgid "Your name" msgstr "Il tuo nome" #: templates/web/base/auth/general.html:59 #: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:204 +#: templates/web/base/report/new/fill_in_details_form.html:185 #: templates/web/base/report/update-form.html:151 msgid "Your name:" msgstr "Il tuo nome:" @@ -3850,33 +3837,19 @@ msgstr "La tua password è stata cambiata" #: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 -#: templates/web/zurich/report/new/fill_in_details_form.html:104 +#: templates/web/zurich/report/new/fill_in_details_form.html:87 msgid "Your phone number" msgstr "Il tuo numero di telefono" -#: templates/web/base/tokens/confirm_problem.html:4 -msgid "Your problem has been confirmed!" -msgstr "" - #: templates/web/fixmystreet/questionnaire/index.html:16 msgid "Your report" msgstr "La tua segnalazione" -#: templates/web/base/report_created.html:6 -msgid "Your report has been created and will shortly be sent." -msgstr "" - -#: templates/web/base/footer.html:9 templates/web/fiksgatami/footer.html:21 -#: templates/web/fiksgatami/nn/footer.html:21 -#: templates/web/fixmystreet/footer.html:24 +#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:24 msgid "Your reports" msgstr "Tue segnalazioni" -#: templates/web/base/tokens/confirm_update.html:4 -msgid "Your update has been confirmed!" -msgstr "" - -#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:59 +#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:41 msgid "Your updates" msgstr "" @@ -3893,11 +3866,7 @@ msgstr "da %s" msgid "council" msgstr "comune" -#: perllib/FixMyStreet/DB/Result/Problem.pm:665 -msgid "council ref: %s" -msgstr "" - -#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:32 #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:54 msgid "didn't use map" @@ -3908,6 +3877,7 @@ msgstr "mappa non usata" msgid "e.g. ‘%s’ or ‘%s’" msgstr "" +#: templates/web/base/admin/body-form.html:188 #: templates/web/base/admin/flagged.html:51 msgid "edit user" msgstr "Modifica utente" @@ -3922,7 +3892,7 @@ msgstr "da %d utenti differenti" msgid "last updated %s" msgstr "ultimo aggiornamento %s" -#: perllib/Utils.pm:263 +#: perllib/Utils.pm:235 msgid "less than a minute" msgstr "meno di un minuto" @@ -3982,22 +3952,22 @@ msgstr "o" msgid "or locate me automatically" msgstr "oppure fatti localizzare automaticamente" -#: templates/web/base/admin/report_edit.html:25 -#: templates/web/base/admin/report_edit.html:26 -#: templates/web/zurich/admin/report_edit-sdm.html:28 +#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:30 +#: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit-sdm.html:29 -#: templates/web/zurich/admin/report_edit-sdm.html:37 +#: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:38 -#: templates/web/zurich/admin/report_edit.html:28 +#: templates/web/zurich/admin/report_edit.html:27 #: templates/web/zurich/admin/report_edit.html:29 -#: templates/web/zurich/admin/report_edit.html:39 +#: templates/web/zurich/admin/report_edit.html:38 #: templates/web/zurich/admin/report_edit.html:40 -#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit.html:50 #: templates/web/zurich/admin/report_edit.html:52 msgid "originally entered: “%s”" msgstr "" -#: templates/web/base/admin/report_edit.html:30 +#: templates/web/base/admin/report_edit.html:43 msgid "other areas:" msgstr "altre aree:" @@ -4006,13 +3976,12 @@ msgstr "altre aree:" msgid "reopened" msgstr "riaperto" -#: templates/web/fiksgatami/header.html:49 -#: templates/web/fixmystreet/header.html:53 +#: templates/web/fixmystreet/header.html:59 #: templates/web/zurich/footer.html:12 msgid "sign out" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:13 +#: templates/web/base/report/new/fill_in_details_form.html:12 #: templates/web/base/report/new/fill_in_details_form.html:15 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 @@ -4024,15 +3993,15 @@ msgstr "" msgid "there is no pin shown as the user did not use the map" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:373 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:379 msgid "this type of local problem" msgstr "" -#: perllib/Utils.pm:235 +#: perllib/Utils.pm:207 msgid "today" msgstr "oggi" -#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:32 #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:54 msgid "used map" @@ -4058,7 +4027,7 @@ msgid_plural "<big>%s</big> reports recently" msgstr[0] "<big>%s</big> segnalazione recente" msgstr[1] "<big>%s</big> segnalazioni recenti" -#: perllib/Utils.pm:282 +#: perllib/Utils.pm:254 #, perl-format msgid "%d hour" msgid_plural "%d hours" @@ -4072,7 +4041,7 @@ msgid_plural "%d supporters" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:284 +#: perllib/Utils.pm:256 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -4093,7 +4062,7 @@ msgid_plural "We do not yet have details for the councils that cover this locati 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:278 +#: perllib/Utils.pm:250 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -4114,7 +4083,7 @@ 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:280 +#: perllib/Utils.pm:252 #, perl-format msgid "%d day" msgid_plural "%d days" @@ -4127,9 +4096,3 @@ msgid "We do <strong>not</strong> yet have details for the other council that co msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location." msgstr[0] "<strong>Non</strong>abbiamo ancora dettagli per un'altro comune che copre questa zona." msgstr[1] "<strong>Non</strong>abbiamo ancora dettagli sugli altri comuni che coprono questa zona." - -#~ msgid "Configuration updated - contacts will be generated automatically later" -#~ msgstr "Aggiornamento configurazione - i contatti verranno generati automaticamente più tardi" - -#~ 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." diff --git a/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po new file mode 100644 index 000000000..ab9ccab51 --- /dev/null +++ b/locale/lt_LT.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -0,0 +1,4165 @@ +# 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: +# Saimonas <saimonas.skurichinas@gmail.com>, 2015 +msgid "" +msgstr "" +"Project-Id-Version: fixmystreet\n" +"Report-Msgid-Bugs-To: matthew@mysociety.org\n" +"POT-Creation-Date: 2015-07-31 14:28+0100\n" +"PO-Revision-Date: 2015-07-10 13:29+0000\n" +"Last-Translator: mySociety <transifex@mysociety.org>\n" +"Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/fixmystreet/language/lt_LT/)\n" +"Language: lt_LT\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%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:392 +msgid " and " +msgstr "ir" + +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_none.html:11 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 +#: templates/web/base/report/new/councils_text_some.html:22 +#: templates/web/base/report/new/councils_text_some.html:5 +msgid " or " +msgstr "arba" + +#: templates/web/base/admin/index.html:36 +msgid "%d confirmed alerts, %d unconfirmed" +msgstr "%d patvirtinti pranešimai, %d nepatvirtinti" + +#: templates/web/base/admin/index.html:38 +#: templates/web/zurich/admin/index.html:6 +msgid "%d council contacts – %d confirmed, %d unconfirmed" +msgstr "%d tarybos kontaktai – %d patvirtinti, %d nepatvirtinti" + +#: templates/web/base/admin/edit-league.html:12 +msgid "%d edits by %s" +msgstr "%d pakeitimai pagal %s" + +#: templates/web/base/admin/index.html:35 +msgid "%d live updates" +msgstr "%d tiesioginiai atnaujinimai" + +#: templates/web/base/admin/index.html:37 +msgid "%d questionnaires sent – %d answered (%s%%)" +msgstr "%d klausimynai išsiųsti – %d atsakyti (%s%%)" + +#: templates/web/base/pagination.html:10 +msgid "%d to %d of %d" +msgstr "%d į %d iš %d" + +#: templates/web/base/reports/body.html:0 +#: templates/web/base/reports/body.html:23 +msgid "%s - Summary reports" +msgstr "%s - Suvestinės ataskaitos" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:672 +msgid "%s ref: %s" +msgstr "%s ref: %s" + +#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 +msgid "%s ward, %s" +msgstr "%s rajonas, %s" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:559 +msgid "%s, reported at %s" +msgstr "%s, pranešta %s" + +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 +msgid "%s, within %s ward" +msgstr "%s, viduje %s rajonas" + +#: perllib/FixMyStreet/Map/OSM.pm:42 +msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" +msgstr "" + +#: templates/web/base/email_sent.html:29 +msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" +msgstr "(Nesijaudinkite — jūsų pranešimas nedings, kol tikrinsite savo elektroninį paštą.)" + +#: templates/web/base/email_sent.html:25 +msgid "(Don't worry — we'll hang on to your problem report while you're checking your email.)" +msgstr "(Nesijaudinkite — jūsų problema nedings, kol tikrinsite savo elektroninį paštą.)" + +#: templates/web/base/email_sent.html:27 +msgid "(Don't worry — we'll hang on to your update while you're checking your email.)" +msgstr "(Nesijaudinkite — jūsų atnaujinimas nedings, kol tikrinsite savo elektroninį paštą.)" + +#: templates/web/base/admin/report_blocks.html:11 +#: templates/web/base/admin/users.html:31 +msgid "(Email in abuse table)" +msgstr "(Elektroninis paštas piktnaudžiavo lentelėje)" + +#: templates/web/base/alert/_list.html:20 +#: templates/web/fixmystreet/alert/_list.html:24 +msgid "(a default distance which covers roughly 200,000 people)" +msgstr "(numatytasis atstumas, kuris apima maždaug 200.000 žmonių)" + +#: templates/web/base/alert/_list.html:25 +#: templates/web/fixmystreet/alert/_list.html:28 +msgid "(alternatively the RSS feed can be customised, within" +msgstr "(arba RSS srautas gali būti pritaikytas pagal" + +#: templates/web/base/around/around_map_list_items.html:12 +#: templates/web/base/around/on_map_list_items.html:9 +#: templates/web/fixmystreet/report/_item.html:27 +#: templates/web/zurich/report/_item.html:21 +msgid "(closed)" +msgstr "(uždaryta)" + +#: templates/web/base/around/around_map_list_items.html:10 +#: templates/web/base/around/on_map_list_items.html:7 +#: templates/web/fixmystreet/report/_item.html:25 +#: templates/web/zurich/report/_item.html:19 +msgid "(fixed)" +msgstr "(atlikta)" + +#: templates/web/base/index.html:8 templates/web/base/index.html:9 +#: templates/web/fixmystreet/around/intro.html:2 +msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" +msgstr "(pavyzdžiui, grafitis, šiukšlės, duobė kelyje ar gatvės apšvietimas)" + +#: templates/web/base/reports/_list-entry.html:4 +#: templates/web/fixmystreet/report/_item.html:21 +msgid "(not sent to council)" +msgstr "(neišsiųsta savivaldybei)" + +#: templates/web/base/report/new/fill_in_details_form.html:199 +#: templates/web/zurich/report/new/fill_in_details_form.html:77 +msgid "(optional)" +msgstr "(pasirinktinai)" + +#: templates/web/fixmystreet/report/public_label.html:1 +msgid "(public)" +msgstr "(viešas)" + +#: templates/web/base/reports/_list-entry.html:2 +#: templates/web/fixmystreet/report/_item.html:20 +msgid "(sent to both)" +msgstr "(išsiųsta į abu)" + +#: templates/web/base/report/new/fill_in_details_form.html:193 +msgid "(we never show your email address or phone number)" +msgstr "(mes niekada nerodome jūsų el. pašto arba telefono numerio)" + +#: templates/web/base/report/update-form.html:158 +msgid "(we never show your email)" +msgstr "(mes niekada nerodome jūsų el. pašto)" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/DB/Result/Problem.pm:410 +msgid "-- Pick a category --" +msgstr "-- Išsirinktite kategorija --" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:630 +#: perllib/FixMyStreet/DB/Result/Problem.pm:416 +msgid "-- Pick a property type --" +msgstr "-- Pasirinkite nuosavybės tipą --" + +#: templates/web/base/admin/body-form.html:42 +#: templates/web/base/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> pasirinktas (<code>%s</code>) bet ne <code>MAPIT_TYPES</code>.<br>\n" +"Turbūt dėl to \"padengta sritis\" yra tuščia (žemiau).<br>\n" +"Galbūt pridėkite <code>MAPIT_TYPES</code> į savo config failą?" + +#: templates/web/base/around/_report_banner.html:3 +#: templates/web/base/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>Jeigu jūs nematote žemėlapio, <a href='%s' rel='nofollow'>tada praleiskite šitą žingsnį </a>.</small>" + +#: templates/web/base/admin/index.html:33 +#: templates/web/zurich/admin/index.html:4 +msgid "<strong>%d</strong> live problems" +msgstr "<strong>%d</strong> Problemos tiesiogiai" + +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:39 +msgid "<strong>No</strong> Let me confirm my report by email" +msgstr "<strong>Ne</strong> Leisti patvirtinti mano pranešimą el. paštu" + +#: templates/web/fixmystreet/report/update-form.html:112 +msgid "<strong>No</strong> Let me confirm my update by email" +msgstr "<strong>Ne</strong> Leisti patvirtinti mano atnaujinimą el. paštu" + +#: templates/web/fixmystreet/auth/general.html:51 +#: templates/web/zurich/auth/general.html:51 +msgid "<strong>No</strong> let me sign in by email" +msgstr "<strong>Ne</strong> leisti man prisijungti el. paštu" + +#: templates/web/base/auth/general.html:55 +msgid "<strong>No</strong>, I do not, let me sign in by email:" +msgstr "<strong>Ne</strong>, Aš nesu, leisti man prisijungti el. paštu:" + +#: templates/web/base/report/new/fill_in_details_form.html:144 +msgid "<strong>No</strong>, let me confirm my report by email:" +msgstr "<strong>Ne</strong>, leisti man patvirtinti mano pranešimą el. paštu:" + +#: templates/web/base/report/update-form.html:117 +msgid "<strong>No</strong>, let me confirm my update by email:" +msgstr "<strong>Ne</strong>č leisti patvirtinti mano atnaujinimą el. paštu:" + +#: templates/web/base/auth/general.html:37 +#: templates/web/base/report/new/fill_in_details_form.html:122 +#: templates/web/base/report/update-form.html:95 +#: templates/web/fixmystreet/auth/general.html:37 +#: templates/web/fixmystreet/auth/general.html:39 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:15 +#: templates/web/fixmystreet/report/update-form.html:89 +msgid "<strong>Yes</strong> I have a password" +msgstr "<strong>Taip</strong> Aš turiu slaptažodį" + +#: templates/web/base/static/about-en-gb.html:1 +#: templates/web/base/static/about-en-gb.html:3 +msgid "About us" +msgstr "Apie Mus" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:52 +#: templates/web/base/report/update-form.html:30 +#: templates/web/base/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 "Veiksmas suplanuotas" + +#: templates/web/base/admin/body-form.html:3 +#: templates/web/base/admin/body-form.html:4 +msgid "" +"Add a <strong>body</strong> for each administrative body, such as a council or department\n" +" to which problem reports can be sent. You can add one or more contacts (for different\n" +" categories of problem) to each body." +msgstr "" +"Pridėkite <strong>instituciją</strong> kiekvienai administracinei institucijai, pavyzdžiui savivaldybės narį arba departamentą\n" +"į kurį jūsų problema gali būti nusiųsta. Galite pridėti vieną arba daugau kontaktų (skirtingoms\n" +"problemų kategorijoms) kiekvienai institucijai ." + +#: templates/web/base/admin/body.html:56 +msgid "Add a contact using the form below." +msgstr "Pridėkite kontaktą naudodami žemiau pateikta anketa" + +#: templates/web/base/admin/bodies.html:74 +#: templates/web/base/admin/body-form.html:240 +#: templates/web/zurich/admin/body-form.html:51 +msgid "Add body" +msgstr "pridėti instituciją" + +#: templates/web/base/admin/body.html:116 +#: templates/web/zurich/admin/body.html:31 +msgid "Add new category" +msgstr "Pridėti naują kategoriją" + +#: templates/web/base/admin/users.html:47 +msgid "Add user" +msgstr "Pridėti vartotoją" + +#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:52 +msgid "Added %s" +msgstr "Pridėta %s" + +#: templates/web/base/auth/change_password.html:29 +msgid "Again:" +msgstr "Dar kartą:" + +#: templates/web/base/admin/timeline.html:35 +msgid "Alert %d created for %s, type %s, parameters %s / %s" +msgstr "" + +#: templates/web/base/admin/timeline.html:37 +msgid "Alert %d disabled (created %s)" +msgstr "" + +#: templates/web/base/report/update-form.html:163 +#: templates/web/fixmystreet/report/update-form.html:150 +msgid "Alert me to future updates" +msgstr "Įspėti mane apie atnaujinimus" + +#: templates/web/base/reports/index.html:3 +#: templates/web/zurich/admin/stats.html:5 +#: templates/web/zurich/reports/index.html:12 +msgid "All Reports" +msgstr "Visi Pranešimai" + +#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:26 +#: 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 "Visi pranešimai" + +#: templates/web/base/admin/stats.html:5 +#: templates/web/zurich/admin/stats.html:8 +msgid "All reports between %s and %s" +msgstr "Visi pranešimai nuo %s ir %s" + +#: templates/web/base/report/new/councils_text_some.html:2 +msgid "All the information you provide here will be sent to" +msgstr "Visa jūsų suteikta informacija bus išsiųsta" + +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_all.html:4 +#: templates/web/base/report/new/fill_in_details_form.html:12 +#: templates/web/base/report/new/fill_in_details_form.html:14 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 +msgid "All the information you provide here will be sent to <strong>%s</strong>." +msgstr "" +"Visa jūsų suteikta informacija bus išsiųsta į \n" +"<strong>%s</strong>." + +#: templates/web/base/questionnaire/index.html:36 +#: templates/web/fixmystreet/questionnaire/index.html:55 +msgid "An update marked this problem as fixed." +msgstr "Atnaujinimas - Problema sutvarkyta" + +#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/problem_row.html:20 +msgid "Anonymous" +msgstr "Anoniminis" + +#: templates/web/base/admin/report_edit.html:75 +#: templates/web/base/admin/update_edit.html:23 +msgid "Anonymous:" +msgstr "Anoniminis:" + +#: templates/web/base/footer.html:26 +msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?" +msgstr "Esi <strong>aplikacijų kūrėjas</strong>? Norėtum prisidėti prie projekto FixMyStreet?" + +#: templates/web/fixmystreet/front/footer-marketing.html:16 +msgid "Are you a developer?" +msgstr "Ar esi aplikacijų kūrėjas?" + +#: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/body.html:16 +#: templates/web/zurich/admin/body-form.html:24 +msgid "Area covered" +msgstr "Vietovė pažymėta" + +#: templates/web/base/admin/bodies.html:15 +#: templates/web/base/admin/body.html:60 +msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." +msgstr "Šiuo metu puslapis ir %s yra neveikiantis, sukurti pranešimai bus išsiųsti problemos siuntėjui, o ne kontaktui pateiktame pranešimo kategorijoje." + +#: templates/web/zurich/admin/report_edit.html:141 +#: templates/web/zurich/admin/stats.html:36 +msgid "Assign to different category:" +msgstr "Priskirti kitai kategorijai:" + +#: templates/web/zurich/admin/report_edit.html:150 +msgid "Assign to external body:" +msgstr "Priskirti išoriniai institucijai:" + +#: templates/web/zurich/admin/report_edit.html:130 +#: templates/web/zurich/admin/report_edit.html:187 +msgid "Assign to subdivision:" +msgstr "Priskirti padaliniui:" + +#: perllib/FixMyStreet/Cobrand/Zurich.pm:165 +#: templates/web/zurich/report/updates.html:11 +msgid "Assigned to %s" +msgstr "Priskirta to %s" + +#: templates/web/base/open311/index.html:84 +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 " %d prašymai yra grąžinami kiekvienai užklausai. Grąžinti prašymai sudėliojami šia tvarka requested_datetime, todėl norint gauti visus pranešimus atlikite kelias paieškas start_date ir end_date." + +#: templates/web/base/open311/index.html:76 +msgid "At the moment only searching for and looking at reports work." +msgstr "Šiuo metu veikia tiktai pranešimų peržiūra ir paieška." + +#: perllib/FixMyStreet/DB/Result/Problem.pm:373 +#: templates/web/zurich/report/_item.html:11 +msgid "Awaiting moderation" +msgstr "Laukiama " + +#: templates/web/base/js/translation_strings.html:32 +msgid "Back" +msgstr "Atgal" + +#: templates/web/base/admin/report_blocks.html:11 +msgid "Ban email address" +msgstr "Drausti el. paštą" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:301 +#: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 +msgid "Bodies" +msgstr "Institucijos" + +#: templates/web/base/admin/flagged.html:17 +#: templates/web/base/admin/reports.html:14 +#: templates/web/base/admin/users.html:17 +msgid "Body" +msgstr "Institucija" + +#: templates/web/base/admin/report_edit.html:34 +#: templates/web/base/admin/user-form.html:32 +msgid "Body:" +msgstr "Institucija:" + +#: templates/web/base/admin/stats.html:80 +msgid "By Date" +msgstr "Pagal Datą" + +#: templates/web/fixmystreet/around/_report_banner.html:8 +msgid "Can't see the map? <em>Skip this step</em>" +msgstr "Nematote žemėlapio? <em>Praleiskite šitą žingsnį</em>" + +#: templates/web/base/admin/body.html:68 +#: templates/web/base/admin/index.html:55 +#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category_wrapper.html:3 +#: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/admin/index-dm.html:23 +#: templates/web/zurich/admin/index-sdm.html:21 +#: templates/web/zurich/admin/reports.html:13 +#: templates/web/zurich/admin/stats.html:50 +msgid "Category" +msgstr "Kategorija" + +#: templates/web/base/admin/index.html:53 +msgid "Category fix rate for problems > 4 weeks old" +msgstr "Problemų kategorijoje tvarkymo sparta > 4 savaitės senumo" + +#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/category_edit.html:23 +#: templates/web/base/admin/report_edit.html:74 +#: templates/web/zurich/admin/body.html:43 +#: templates/web/zurich/admin/report_edit-sdm.html:42 +#: templates/web/zurich/admin/report_edit.html:140 +msgid "Category:" +msgstr "Kategorija:" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383 +msgid "Category: %s" +msgstr "Kategorija: %s" + +#: templates/web/base/auth/change_password.html:1 +#: templates/web/base/auth/change_password.html:3 +#: templates/web/base/auth/change_password.html:33 +#: templates/web/base/my/my.html:17 templates/web/fixmystreet/my/my.html:17 +msgid "Change password" +msgstr "Pakeisti slaptažodį" + +#: templates/web/base/admin/body.html:160 +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 "" +"Pažymėti <strong>patvirtinta</strong> norint nurodyti, kad kontaktas yra teisingas.\n" +"Jeigu abejojate kontakto tikrumoč siūlome palikti nežymėta." + +#: templates/web/base/admin/body.html:171 +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 "" +"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." + +#: templates/web/base/admin/body.html:191 +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 "" +"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." + +#: templates/web/base/admin/body.html:130 +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 "" +"Choose a <strong>category</strong> name that makes sense to the public (e.g., \"Pothole\", \"Street lighting\") but is helpful\n" +"to the body too. These will appear in the drop-down menu on the report-a-problem page." + +#: templates/web/base/admin/stats.html:65 +#: templates/web/base/admin/stats.html:71 +msgid "Click here or enter as dd/mm/yyyy" +msgstr "Paspausti čia arba įvesti dd/mm/yyyy" + +#: templates/web/base/js/translation_strings.html:50 +#: templates/web/fixmystreet/around/_report_banner.html:2 +msgid "Click map to report a problem" +msgstr "Paspaukite ant žemėlapio, kad pranešti problemą" + +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:58 +#: templates/web/base/admin/report_edit.html:60 +#: templates/web/base/dashboard/index.html:142 +#: templates/web/base/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:95 +#: templates/web/zurich/admin/report_edit.html:97 +#: templates/web/zurich/admin/stats.html:31 +#: templates/web/zurich/report/banner.html:13 +msgid "Closed" +msgstr "Uždaryta" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:771 +msgid "Closed by council" +msgstr "Uždaryta " + +#: templates/web/base/my/my.html:40 +#: templates/web/fixmystreet/my/_problem-list.html:12 +msgid "Closed reports" +msgstr "Uždaryti pranešimai" + +#: templates/web/base/admin/problem_row.html:38 +msgid "Closed:" +msgstr "Uždaryta:" + +#: templates/web/base/around/tabbed_lists.html:10 +#: templates/web/base/around/tabbed_lists.html:12 +msgid "Closest nearby problems <small>(within %skm)</small>" +msgstr "Netoliese esančios problemos <small>(within %skm)</small>" + +#: templates/web/base/admin/report_edit.html:23 +#: templates/web/zurich/admin/report_edit-sdm.html:33 +#: templates/web/zurich/admin/report_edit.html:46 +msgid "Co-ordinates:" +msgstr "Koordinatės:" + +#: templates/web/base/admin/list_updates.html:10 +msgid "Cobrand" +msgstr "Cobrand" + +#: templates/web/base/admin/report_edit.html:91 +#: templates/web/base/admin/update_edit.html:50 +msgid "Cobrand data:" +msgstr "Cobrand informacija:" + +#: templates/web/base/admin/report_edit.html:90 +#: templates/web/base/admin/update_edit.html:49 +msgid "Cobrand:" +msgstr "Cobrand:" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 +#: templates/web/base/admin/config_page.html:1 +msgid "Configuration" +msgstr "Nustatymai" + +#: templates/web/base/admin/category_edit.html:52 +msgid "Configure Endpoint" +msgstr "Nustatyti Pabaigos Tašką" + +#: templates/web/base/admin/body.html:72 +msgid "Confirm" +msgstr "Patvirtinti" + +#: templates/web/base/auth/token.html:1 +msgid "Confirm account" +msgstr "Patvirtinti paskyrą" + +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:33 +#: templates/web/fixmystreet/report/update-form.html:107 +msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated." +msgstr "Patvirtinti el. paštu, nurodant naują slaptažodį. Slaptažodis bus atnaujintas jums patvirtinus." + +#: templates/web/base/questionnaire/creator_fixed.html:1 +#: templates/web/base/tokens/confirm_problem.html:1 +#: templates/web/base/tokens/confirm_update.html:1 +#: templates/web/zurich/tokens/confirm_problem.html:1 +#: templates/web/zurich/tokens/confirm_problem.html:3 +msgid "Confirmation" +msgstr "Patvirtinimas" + +#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/category_edit.html:37 +#: templates/web/base/admin/category_edit.html:89 +#: templates/web/zurich/admin/stats.html:40 +msgid "Confirmed" +msgstr "Patvirtinta" + +#: templates/web/base/admin/stats.html:5 +msgid "Confirmed reports between %s and %s" +msgstr "Patvirtinti pranešimai tarp %s ir %s" + +#: templates/web/base/admin/list_updates.html:39 +#: templates/web/base/admin/problem_row.html:36 +#: templates/web/base/admin/report_edit.html:83 +msgid "Confirmed:" +msgstr "Patvirtinta:" + +#: templates/web/base/footer.html:24 +msgid "Contact FixMyStreet" +msgstr "Susiekti su FixMyStreet" + +#: templates/web/base/contact/index.html:1 +#: templates/web/base/contact/index.html:2 +#: templates/web/base/contact/submit.html:1 +#: templates/web/fixmystreet/contact/index.html:1 +#: templates/web/fixmystreet/contact/index.html:2 +msgid "Contact Us" +msgstr "Susiekite su Mumis" + +#: templates/web/base/contact/index.html:6 +#: templates/web/fixmystreet/contact/index.html:20 +msgid "Contact the team" +msgstr "Susisiekite su komanda" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1325 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1353 +msgid "Could not find user" +msgstr "Vartotojas nerastas" + +#: templates/web/base/js/translation_strings.html:37 +msgid "Could not look up location" +msgstr "Vieta nenustatyta" + +#: templates/web/base/admin/list_updates.html:9 +msgid "Council" +msgstr "Savivaldybė" + +#: templates/web/base/admin/body.html:1 +#: templates/web/base/admin/category_edit.html:1 +#: templates/web/zurich/admin/body.html:1 +msgid "Council contacts for %s" +msgstr "Tarybos kontaktai skirti %s" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:670 +msgid "Council ref: %s" +msgstr "" + +#: templates/web/base/admin/stats.html:84 +msgid "Council:" +msgstr "Savivaldybė:" + +#: templates/web/base/admin/stats.html:12 +#: templates/web/base/admin/stats.html:32 +#: templates/web/zurich/admin/stats.html:45 +#: templates/web/zurich/admin/stats.html:50 +msgid "Count" +msgstr "Skaičiavimas" + +#: templates/web/base/email_sent.html:1 +msgid "Create a report" +msgstr "Sukurti pranešimą" + +#: templates/web/base/admin/body.html:208 +#: templates/web/zurich/admin/body.html:59 +msgid "Create category" +msgstr "Sukurti kategoriją" + +#: templates/web/base/admin/problem_row.html:34 +#: templates/web/zurich/admin/list_updates.html:29 +#: templates/web/zurich/admin/list_updates.html:8 +msgid "Created" +msgstr "Sukurta" + +#: templates/web/base/admin/list_updates.html:38 +#: templates/web/base/admin/report_edit.html:82 +#: templates/web/base/admin/update_edit.html:51 +#: templates/web/zurich/admin/report_edit-sdm.html:47 +#: templates/web/zurich/admin/report_edit.html:61 +#: templates/web/zurich/admin/update_edit.html:29 +msgid "Created:" +msgstr "Sukurta:" + +#: templates/web/base/admin/stats.html:31 +msgid "Current state" +msgstr "Esama būsena" + +#: templates/web/base/admin/bodies.html:5 +#: templates/web/base/admin/index.html:16 +msgid "Currently no bodies have been created." +msgstr "Šiuo metu ne viena institucija nėra sukurta." + +#: templates/web/base/dashboard/index.html:5 +#: templates/web/base/dashboard/index.html:7 +msgid "Dashboard" +msgstr "Įrankių juosta" + +#: templates/web/zurich/admin/stats.html:35 +msgid "Dealt with by subdivision within 5 working days" +msgstr "Padalinys atliko per 5 darbo dienas" + +#: templates/web/base/admin/bodies.html:27 +#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:81 +#: templates/web/base/admin/category_edit.html:42 +#: templates/web/base/admin/category_edit.html:90 +msgid "Deleted" +msgstr "Ištrinta" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 +#: 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 "Aprašymas" + +#: templates/web/base/js/translation_strings.html:34 +#: templates/web/zurich/report/new/fill_in_details_form.html:42 +msgid "Details" +msgstr "Išsamiau" + +#: templates/web/base/admin/report_edit.html:20 +#: templates/web/base/report/new/fill_in_details_form.html:62 +#: templates/web/zurich/admin/report_edit-sdm.html:25 +#: templates/web/zurich/admin/report_edit.html:25 +#: templates/web/zurich/admin/report_edit.html:35 +msgid "Details:" +msgstr "Išsamiau:" + +#: templates/web/base/admin/body.html:87 +msgid "Devolved" +msgstr "Perduota" + +#: templates/web/base/admin/edit-league.html:8 +msgid "Diligency prize league table" +msgstr "Diligency prize league table" + +#: templates/web/fixmystreet/auth/general.html:31 +msgid "Do you have a FixMyBarangay password?" +msgstr "Ar jūs turite FixMyBarangay slaptažodį?" + +#: templates/web/base/auth/general.html:32 +#: templates/web/fixmystreet/auth/general.html:33 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:11 +#: templates/web/fixmystreet/report/update-form.html:86 +msgid "Do you have a FixMyStreet password?" +msgstr "Ar jūs turite FixMyStreet slaptažodį?" + +#: templates/web/base/questionnaire/index.html:46 +#: templates/web/fixmystreet/questionnaire/index.html:65 +msgid "Don’t know" +msgstr "Don’t nežinau" + +#: templates/web/fixmystreet/contact/index.html:118 +msgid "Don't like forms?" +msgstr "Nepatinka anketos?" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:60 +#: templates/web/base/report/update-form.html:30 +#: templates/web/base/report/update-form.html:32 +#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/fixmystreet/report/update-form.html:30 +msgid "Duplicate" +msgstr "Kopija" + +#: templates/web/base/admin/body.html:106 +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 "" +"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." + +#: templates/web/base/admin/list_updates.html:42 +#: templates/web/base/admin/problem_row.html:41 +#: templates/web/base/admin/users.html:33 +#: templates/web/zurich/admin/problem_row.html:42 +msgid "Edit" +msgstr "Redaguoti" + +#: templates/web/base/admin/body.html:220 +#: templates/web/zurich/admin/body.html:71 +msgid "Edit body details" +msgstr "Redaguoti institucijos informaciją" + +#: templates/web/base/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 +msgid "Editing problem %d" +msgstr "Redagavimo problema %d" + +#: templates/web/base/admin/update_edit.html:1 +#: templates/web/zurich/admin/update_edit.html:1 +msgid "Editing update %d" +msgstr "Atnaujinimo redagavimas %d" + +#: templates/web/base/admin/user_edit.html:1 +msgid "Editing user %d" +msgstr "Redaguoti vartotoją %d" + +#: templates/web/base/admin/category_edit.html:91 +msgid "Editor" +msgstr "Redaktorius" + +#: templates/web/base/admin/bodies.html:23 +#: templates/web/base/admin/category_edit.html:88 +#: templates/web/base/admin/flagged.html:38 +#: templates/web/base/admin/users.html:16 +#: templates/web/fixmystreet/auth/general.html:21 +#: templates/web/zurich/admin/body-form.html:9 +#: templates/web/zurich/admin/body.html:15 +#: templates/web/zurich/auth/general.html:24 +#: templates/web/zurich/auth/general.html:54 +msgid "Email" +msgstr "El. paštas" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1301 +msgid "Email added to abuse list" +msgstr "El. paštas pridėtas prie piktnaudžiavimo sąrašo" + +#: templates/web/base/admin/body.html:155 +msgid "Email address:" +msgstr "El. pašto adresas:" + +#: templates/web/base/tokens/confirm_alert.html:6 +msgid "Email alert created" +msgstr "" + +#: templates/web/base/tokens/confirm_alert.html:10 +msgid "Email alert deleted" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1298 +msgid "Email already in abuse list" +msgstr "El. paštas jau yra piktnaudžiavimo sąraše" + +#: templates/web/base/around/_updates.html:5 +msgid "Email me new local problems" +msgstr "Atsiųsti man naujas vietines problemas" + +#: templates/web/base/report/display.html:38 +msgid "Email me updates" +msgstr "Atsiųsti man atnaujinimus" + +#: templates/web/base/admin/category_edit.html:31 +#: templates/web/base/admin/report_edit.html:80 +#: templates/web/base/admin/update_edit.html:33 +#: templates/web/base/admin/user-form.html:20 +#: templates/web/base/alert/updates.html:13 +#: templates/web/base/report/display.html:42 +#: templates/web/zurich/admin/body.html:47 +#: templates/web/zurich/admin/report_edit-sdm.html:44 +#: templates/web/zurich/admin/report_edit.html:57 +msgid "Email:" +msgstr "El. paštas:" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 +msgid "Email: %s" +msgstr "El. paštas: %s" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 +msgid "Empty flat or maisonette" +msgstr "Apleistas butas" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:631 +msgid "Empty house or bungalow" +msgstr "Apleistas namas" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 +msgid "Empty office or other commercial" +msgstr "Apleista įtaiga arba kitas komercinės paskirties objektas" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 +msgid "Empty pub or bar" +msgstr "Apleistas baras" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 +msgid "Empty public building - school, hospital, etc." +msgstr "Apleistas viešosios paskirties pastatas - mokyklač ligonine ir t.t" + +#: templates/web/base/admin/body-form.html:162 +#: templates/web/base/admin/body-form.html:163 +msgid "" +"Enable <strong>Open311 update-sending</strong> if the endpoint will send and receive\n" +" updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" +" For more information, see \n" +" <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>." +msgstr "" +"Enable <strong>Open311 update-sending</strong> if the endpoint will send and receive\n" +"updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" +"For more information, see \n" +"<a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>." + +#: templates/web/base/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:223 +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 "" +"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." + +#: templates/web/base/admin/stats.html:70 +msgid "End Date:" +msgstr "Pabaigos Data:" + +#: templates/web/base/admin/body-form.html:130 +msgid "Endpoint" +msgstr "Pabaigos taškas" + +#: perllib/FixMyStreet/Cobrand/Zurich.pm:73 +msgid "Enter a Zürich street name" +msgstr "Įveskite Zürich gatvės pavadinimą" + +#: perllib/FixMyStreet/Cobrand/UK.pm:13 +msgid "Enter a nearby UK postcode, or street name and area" +msgstr "Įveskite artimiausia pašto kodą arba gatvės pavadinimą ir rajoną" + +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 +#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 +msgid "Enter a nearby postcode, or street name and area" +msgstr "Įveskite artimiausia pašto kodą arba gatvės pavadinimą ir rajoną" + +#: templates/web/base/around/postcode_form.html:1 +#: templates/web/base/around/postcode_form.html:2 +#: templates/web/fixmystreet/around/postcode_form.html:10 +#: templates/web/fixmystreet/around/postcode_form.html:11 +msgid "Enter a nearby street name and area" +msgstr "Įveskite artimiausios gatvės pavadinimą ir rajoną" + +#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:7 +msgid "Enter a nearby street name and area, postal code or district in Delhi" +msgstr "Įveskite artimiausia pašto kodą arba gatvės pavadinimą ir rajoną" + +#: templates/web/base/auth/general.html:64 +#: templates/web/base/report/new/fill_in_details_form.html:151 +#: templates/web/base/report/update-form.html:124 +msgid "Enter a new password:" +msgstr "Įveskite nauja slaptažodį:" + +#: templates/web/fixmystreet/auth/general.html:63 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:75 +#: templates/web/fixmystreet/report/update-form.html:123 +#: templates/web/zurich/auth/general.html:65 +msgid "Enter a password" +msgstr "Įveskite slaptažodį" + +#: templates/web/base/index-steps.html:26 +msgid "Enter details of the problem" +msgstr "įveskite problemos detales" + +#: templates/web/base/auth/token.html:5 +#: templates/web/base/errors/generic.html:1 +#: templates/web/base/errors/generic.html:3 +#: templates/web/base/tokens/abuse.html:1 +#: templates/web/base/tokens/abuse.html:3 +#: templates/web/base/tokens/error.html:1 +#: templates/web/base/tokens/error.html:3 +msgid "Error" +msgstr "Klaida" + +#: templates/web/base/admin/body.html:14 +#: templates/web/base/admin/category_edit.html:18 +msgid "Example postcode %s" +msgstr "Pašto kodo pavyzdys %s" + +#: templates/web/base/open311/index.html:94 +msgid "Examples:" +msgstr "Pavyzdžiai:" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 +msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" +msgstr "Apibūdinkite kas negerai, tikslią vietą ir kiek ilgai tai tęsiasi..." + +#: templates/web/base/admin/body-form.html:81 +msgid "External URL" +msgstr "" + +#: templates/web/base/admin/category_edit.html:27 +#: templates/web/base/admin/report_edit.html:92 +msgid "Extra data:" +msgstr "Papildoma informacija:" + +#: templates/web/base/contact/submit.html:13 +msgid "Failed to send message" +msgstr "" + +#: templates/web/zurich/admin/index-dm.html:33 +#: templates/web/zurich/admin/index-sdm.html:30 +msgid "Filter report list" +msgstr "Filtruoti pranešimo sąraša" + +#: templates/web/base/questionnaire/index.html:55 +#: templates/web/fixmystreet/questionnaire/index.html:74 +msgid "First time" +msgstr "Pirmas kartas" + +#: templates/web/base/admin/body.html:48 +msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." +msgstr "Suvarkyti tai pasirenkant <strong>pažymėta vietovę</strong> <em>Redaguoti informaciją</em>formą." + +#: templates/web/base/header.html:24 +msgid "FixMyStreet" +msgstr "FixMyStreet" + +#: templates/web/base/admin/header.html:10 +msgid "FixMyStreet admin:" +msgstr "FixMyStreet admin:" + +#: templates/web/base/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 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." + +#: templates/web/base/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’s alerts, but will only appear in the \"Within the boundary\" alert\n" +"for the county council." +msgstr "" +"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’s alerts, but will only appear in the \"Within the boundary\" alert\n" +"for the county council." + +#: templates/web/base/admin/index.html:55 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:54 +#: templates/web/base/admin/report_edit.html:55 +#: templates/web/base/dashboard/index.html:142 +#: templates/web/base/dashboard/index.html:144 +#: templates/web/base/report/update-form.html:30 +#: templates/web/base/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 "Sutvarkyta" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:56 +msgid "Fixed - Council" +msgstr "Sutvarkyta - Savivaldybe" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:55 +msgid "Fixed - User" +msgstr "Sutvarkyta - Vartotojas" + +#: templates/web/base/my/my.html:35 +#: templates/web/fixmystreet/my/_problem-list.html:7 +msgid "Fixed reports" +msgstr "Sutvarkyti pranešimai" + +#: templates/web/base/admin/problem_row.html:37 +msgid "Fixed:" +msgstr "Sutvarkyta:" + +#: templates/web/base/admin/body-form.html:89 +#: templates/web/zurich/admin/body-form.html:36 +msgid "Flag as deleted" +msgstr "Pažymeti kaip ištrinta" + +#: templates/web/base/admin/report_blocks.html:16 +msgid "Flag user" +msgstr "Pažymėti vartotoją" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: templates/web/base/admin/users.html:19 +msgid "Flagged" +msgstr "Pažymėta" + +#: templates/web/base/admin/flagged.html:1 +msgid "Flagged reports and users" +msgstr "Flagged reports and users" + +#: templates/web/base/admin/user-form.html:46 +msgid "Flagged users are listed on the <a href='%s'>flagged</a> page." +msgstr "Flagged users are listed on the <a href='%s'>flagged</a> page." + +#: templates/web/base/admin/flagged.html:31 +msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." +msgstr "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." + +#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/user-form.html:52 +msgid "Flagged:" +msgstr "Pažymėta:" + +#: templates/web/base/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 "Follow a ward link to view only reports within that ward." + +#: templates/web/base/admin/body-form.html:65 +msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." +msgstr "Daugiau informacijos rasite <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." + +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:32 +#: templates/web/fixmystreet/report/update-form.html:106 +msgid "Forgotten your password?" +msgstr "Pamiršote slaptažodį?" + +#: templates/web/base/faq/faq-en-gb.html:1 +#: templates/web/base/static/privacy.html:1 +#: templates/web/base/static/privacy.html:2 +msgid "Frequently Asked Questions" +msgstr "Dažniausiai Užduodami Klausimai" + +#: templates/web/base/open311/index.html:136 +msgid "GeoRSS on Google Maps" +msgstr "" + +#: templates/web/fixmystreet/around/_updates.html:3 +#: templates/web/fixmystreet/report/display.html:35 +msgid "Get updates" +msgstr "Gauti atnaujinimus" + +#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/fixmystreet/reports/_rss.html:9 +msgid "Get updates of %s problems" +msgstr "Gauti šių problemų %s atnaujinimus" + +#: templates/web/fixmystreet/reports/_rss.html:11 +#: templates/web/fixmystreet/reports/_rss.html:3 +msgid "Get updates of problems in this %s" +msgstr "Gauti problemų atnaujinimus iš %s" + +#: templates/web/base/alert/_list.html:83 +#: templates/web/fixmystreet/alert/_list.html:82 +msgid "Give me an RSS feed" +msgstr "Suteikti man RSS srautą" + +#: templates/web/base/questionnaire/completed.html:14 +msgid "Glad to hear it’s been fixed!" +msgstr "" + +#: templates/web/base/alert/index.html:34 +#: templates/web/base/around/postcode_form.html:8 +#: templates/web/fixmystreet/around/postcode_form.html:21 +#: templates/web/zurich/admin/stats.html:26 +msgid "Go" +msgstr "Pirmyn" + +#: templates/web/base/admin/report_edit.html:93 +msgid "Going to send questionnaire?" +msgstr "Ar ruošiates išsiųsti klausimyną?" + +#: templates/web/base/admin/index.html:43 +msgid "Graph of problem creation by status over time" +msgstr "Problemų sukurimo grafikas pagal statusą per laiką" + +#: templates/web/base/reports/index.html:12 +msgid "Greyed-out lines are councils that no longer exist." +msgstr "Pilkos eilutės nurodo nebeegsituojančius savivaldybės narius." + +#: templates/web/base/questionnaire/index.html:37 +#: templates/web/fixmystreet/questionnaire/index.html:56 +msgid "Has this problem been fixed?" +msgstr "Ar ši problema buvo sutvarkyta?" + +#: templates/web/base/questionnaire/index.html:50 +#: templates/web/fixmystreet/questionnaire/index.html:69 +msgid "Have you ever reported a problem to a council before, or is this your first time?" +msgstr "Ar esate pranešęs apie problema anksčiau, o gal tai pirmas kartas?" + +#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:30 +#: 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 "Pagalba" + +#: templates/web/base/alert/_list.html:6 +#: templates/web/fixmystreet/alert/_list.html:8 +msgid "Here are the types of local problem alerts for ‘%s’." +msgstr "Čia pateikti vietinių problemų tipų pranešimai skirti ‘%s’." + +#: templates/web/fixmystreet/header.html:58 +#: templates/web/zurich/footer.html:11 +msgid "Hi %s" +msgstr "Labas %s" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:63 +#: templates/web/base/admin/report_edit.html:64 +#: templates/web/base/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:86 +#: templates/web/zurich/admin/report_edit.html:90 +#: templates/web/zurich/admin/stats.html:32 +#: templates/web/zurich/admin/update_edit.html:18 +msgid "Hidden" +msgstr "Paslėpta" + +#: templates/web/base/around/display_location.html:65 +msgid "Hide old" +msgstr "Paslėpti senus" + +#: templates/web/base/around/display_location.html:60 +msgid "Hide pins" +msgstr "Paslėpti smeigtukus" + +#: templates/web/base/admin/category_edit.html:84 +msgid "History" +msgstr "Istorija" + +#: templates/web/base/js/translation_strings.html:31 +msgid "Home" +msgstr "Pradžia" + +#: templates/web/base/index-steps.html:1 +msgid "How to report a problem" +msgstr "Kaip pranešti apie problema" + +#: templates/web/base/js/translation_strings.html:33 +msgid "How to send successful reports" +msgstr "Kaip išsiųsti sėkminga pranešimą" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:740 +msgid "I am afraid you cannot confirm unconfirmed reports." +msgstr "Apgailestaujameč bet jūs negalite patvirtinti nepatvirtintų pranešimų." + +#: templates/web/base/tokens/confirm_problem.html:23 +#: templates/web/base/tokens/confirm_problem.html:27 +msgid "I just reported a problem on @fixmystreet" +msgstr "" + +#: templates/web/base/tokens/confirm_update.html:19 +#: templates/web/base/tokens/confirm_update.html:23 +msgid "I just updated a problem on @fixmystreet" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +msgid "I'm afraid we couldn't locate your problem in the database.\n" +msgstr "Apgailestaujame, bet jūsų problema nebuvo rasta duomenų bazėje.\n" + +#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 +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 "Apgailestaujame, bet žymė nebuvo patvirtinta. Prašome patikrinti ar jūs teisingai nukopijavote adresą iš savo el. pašto.\n" + +#: templates/web/base/admin/flagged.html:14 +#: templates/web/base/admin/list_updates.html:6 +#: templates/web/base/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/base/admin/body-form.html:24 +#: templates/web/base/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 "" +"Identify a <strong>parent</strong> if this body is itself part of another body.\n" +"For basic installations, you don't need to join bodies in this way." + +#: templates/web/base/admin/body.html:133 +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 "" +"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." + +#: templates/web/base/email_sent.html:19 +msgid "If you do not, your alert will not be activated." +msgstr "Priešingu atveju jūsų pranešimas nebus aktyvuotas." + +#: templates/web/base/email_sent.html:15 +msgid "If you do not, your problem will not be posted." +msgstr "Priešingu atveju jūsų pranešimas nebus patalpintas." + +#: templates/web/base/email_sent.html:17 +msgid "If you do not, your update will not be posted." +msgstr "Priešingu atveju jūsų atnaujinimas nebus patalpintas." + +#: templates/web/base/questionnaire/completed.html:8 +msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." +msgstr "" + +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:8 +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 "Jeigu jūs patalpinsite problema čia, tada problemos tema ir informacija taps viešai prieinama, tačiau <strong>nebus</strong> išsiųsta į savivaldybę." + +#: templates/web/base/auth/token.html:22 templates/web/base/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 "Patikrinkite savo el. pašto \"Junk mail\" arba \"Spam\" skyrius, nes kartais musų žinutės būna nusiųstos ten." + +#: templates/web/base/questionnaire/index.html:59 +#: templates/web/fixmystreet/questionnaire/index.html:78 +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 "" +"Jeigu norite palikti viešą problemos atnaujinimą prašome įvesti jį čia\n" +"(tai nebus nusiųsta į savivaldybę). Pvz, ką manote apie problemos sprendimo eigą?" + +#: templates/web/base/admin/body.html:149 +msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." +msgstr "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." + +#: templates/web/base/admin/body-form.html:207 +#: templates/web/base/admin/body-form.html:208 +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 "" +"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." + +#: templates/web/base/admin/body-form.html:194 +#: templates/web/base/admin/body-form.html:195 +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 "" +"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." + +#: templates/web/base/admin/body-form.html:177 +#: templates/web/base/admin/body-form.html:178 +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 "" +"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." + +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 +msgid "Illegal ID" +msgstr "Neteisėtas ID" + +#: perllib/FixMyStreet/App/Controller/Alert.pm:100 +msgid "Illegal feed selection" +msgstr "Neteisėtas srauto pasirinkimas" + +#: templates/web/base/dashboard/index.html:142 +#: templates/web/base/dashboard/index.html:144 +#: templates/web/base/report/update-form.html:30 +#: templates/web/base/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 "Apdorojama" + +#: templates/web/base/admin/flagged.html:39 +msgid "In abuse table?" +msgstr "į piknaudžiavimo lentelę?" + +#: templates/web/base/open311/index.html:88 +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:144 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 +#: 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:99 +#: templates/web/zurich/report/banner.html:15 +msgid "In progress" +msgstr "Apdorojama" + +#: templates/web/base/tokens/confirm_alert.html:11 +msgid "Inbox zero, here we come!" +msgstr "" + +#: templates/web/zurich/admin/report_edit.html:160 +msgid "Include reporter personal details" +msgstr "Pridėti siuntėjo asmeninę informacija" + +#: templates/web/base/admin/stats.html:76 +msgid "Include unconfirmed reports" +msgstr "Pridėti nepatvirtintus pranešimus" + +#: perllib/FixMyStreet/App/Controller/Open311.pm:359 +msgid "Incorrect has_photo value \"%s\"" +msgstr "Incorrect has_photo value \"%s\"" + +#: templates/web/zurich/admin/list_updates.html:3 +msgid "Internal notes" +msgstr "Internal notes" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:61 +msgid "Internal referral" +msgstr "Internal referral" + +#: perllib/FixMyStreet/App/Controller/Open311.pm:344 +msgid "Invalid agency_responsible value %s" +msgstr "Invalid agency_responsible value %s" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1112 +msgid "Invalid end date" +msgstr "Klaidina pabaigos data" + +#: perllib/FixMyStreet/App/Controller/Open311.pm:437 +msgid "Invalid format %s specified." +msgstr "Pasirinktas klaidingas formatas %s." + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 +msgid "Invalid start date" +msgstr "Klaidinga pradžios data" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:50 +#: templates/web/base/dashboard/index.html:142 +#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/report/update-form.html:30 +#: templates/web/base/report/update-form.html:31 +#: templates/web/fixmystreet/report/update-form.html:28 +#: templates/web/fixmystreet/report/update-form.html:29 +msgid "Investigating" +msgstr "Tyriama" + +#: 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 "Patikrinkite <a href=\"%s\">mūsų D.U.K</a> gal atsakymas yra ten." + +#: templates/web/base/tokens/confirm_problem.html:14 +msgid "It’s on its way to the council right now." +msgstr "" + +#: templates/web/base/auth/general.html:44 +#: templates/web/base/report/new/fill_in_details_form.html:131 +#: templates/web/base/report/update-form.html:104 +#: templates/web/fixmystreet/auth/general.html:47 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 +#: templates/web/fixmystreet/report/update-form.html:102 +#: templates/web/zurich/auth/general.html:40 +msgid "Keep me signed in on this computer" +msgstr "Palikti mane prisijungusi su šiuo komputeriu" + +#: templates/web/base/admin/body.html:70 +#: templates/web/zurich/admin/body.html:16 +msgid "Last editor" +msgstr "Paskutinis redaktorius" + +#: templates/web/base/admin/report_edit.html:88 +msgid "Last update:" +msgstr "Paskutinis atnaujinimas:" + +#: templates/web/base/admin/problem_row.html:39 +msgid "Last update:" +msgstr "Last update:" + +#: templates/web/base/admin/body-form.html:229 +msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." +msgstr "Palikite neužpildyta jeigu visi pranešimai šioje dalyje turi buti išsiųsti naudojant tą patį siuntimo metodą (pvz, \"%s\")." + +#: templates/web/base/admin/body.html:27 +msgid "List all reported problems" +msgstr "Pateikti visas praneštas problemas" + +#: templates/web/base/report/new/category_wrapper.html:4 +msgid "Loading..." +msgstr "Kraunama..." + +#: templates/web/base/alert/choose.html:1 +#: templates/web/base/alert/choose.html:3 +#: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5 +#: templates/web/base/alert/updates.html:1 +#: templates/web/base/tokens/confirm_alert.html:1 +#: templates/web/fixmystreet/alert/updates.html:1 +msgid "Local RSS feeds and email alerts" +msgstr "Vietiniai RSS srautai ir el. pašto pranešimai" + +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:12 +#: templates/web/base/alert/list.html:14 templates/web/base/alert/list.html:3 +msgid "Local RSS feeds and email alerts for ‘%s’" +msgstr "Vietiniai RSS srautai ir el. pašto pranešimai skirti ‘%s’" + +#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:28 +msgid "Local alerts" +msgstr "Vietiniai pranešimai" + +#: templates/web/base/index-steps.html:25 +msgid "Locate the problem on a map of the area" +msgstr "Nustatytį problemos vietą žemėlapyje" + +#: templates/web/base/js/translation_strings.html:43 +msgid "MAP" +msgstr "MAP" + +#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 +msgid "Map" +msgstr "Žemėlapis" + +#: templates/web/base/admin/report_edit.html:86 +msgid "Mark as sent" +msgstr "" + +#: templates/web/base/admin/user-form.html:44 +msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." +msgstr "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." + +#: templates/web/base/reports/index.html:24 +msgid "Marked fixed/closed in the past eight weeks" +msgstr "" + +#: templates/web/base/reports/index.html:25 +msgid "Marked fixed/closed more than eight weeks ago" +msgstr "" + +#: templates/web/fixmystreet/contact/index.html:106 +msgid "Message" +msgstr "Žinutė" + +#: templates/web/base/contact/index.html:97 +msgid "Message:" +msgstr "Žinutė:" + +#: perllib/FixMyStreet/App/Controller/Open311.pm:445 +msgid "Missing jurisdiction_id" +msgstr "Missing jurisdiction_id" + +#: templates/web/zurich/admin/stats.html:34 +msgid "Moderated by division within one working day" +msgstr "Moderated by division within one working day" + +#: templates/web/base/admin/stats.html:11 +msgid "Month" +msgstr "Mėnuo" + +#: templates/web/base/report/display.html:34 +msgid "More problems nearby" +msgstr "Daugiau šalia esančių problemų" + +#: templates/web/base/admin/bodies.html:21 +#: templates/web/base/admin/body-form.html:18 +#: templates/web/base/admin/flagged.html:16 +#: templates/web/base/admin/flagged.html:37 +#: templates/web/base/admin/list_updates.html:7 +#: templates/web/base/admin/reports.html:13 +#: templates/web/base/admin/users.html:15 +#: templates/web/base/reports/index.html:20 +#: templates/web/fixmystreet/auth/general.html:53 +#: templates/web/fixmystreet/report/new/form_user_loggedin.html:9 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:44 +#: templates/web/fixmystreet/report/update-form.html:138 +#: 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:77 +msgid "Name" +msgstr "Vardas" + +#: templates/web/base/admin/report_edit.html:79 +#: templates/web/base/admin/update_edit.html:32 +#: templates/web/base/admin/user-form.html:18 +#: templates/web/zurich/admin/report_edit-sdm.html:43 +#: templates/web/zurich/admin/report_edit.html:56 +#: templates/web/zurich/admin/stats.html:41 +msgid "Name:" +msgstr "Vardas:" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:313 +msgid "Name: %s" +msgstr "Vardas: %s" + +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 +#: perllib/FixMyStreet/Geocode/OSM.pm:145 +msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" +msgstr "Artimiausia gatvė esanti šalia smeigtuko (automatiškai sugeneruota naudojant OpenStreetMap): %s%s" + +#: perllib/FixMyStreet/Cobrand/UK.pm:127 +msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" +msgstr "Artimiausias pašto kodas esantis šalia smeigtuko žemėlapyje (sugeneruota automatiškai): %s (%sm toliau)" + +#: perllib/FixMyStreet/Cobrand/Default.pm:442 +#: perllib/FixMyStreet/Cobrand/Default.pm:482 +msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" +msgstr "Artimiausia gavtė esanti šalia smeigtuko žemėlapyje (sugeneruota automatiškai naudojant Bing Maps): %s " + +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:277 +msgid "" +"Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" +"\n" +msgstr "" +"Artimiausia gavtė esanti šalia smeigtuko žemėlapyje (sugeneruota automatiškai naudojant Bing Maps): %s \n" +"\n" + +#: templates/web/base/email_sent.html:3 +msgid "Nearly Done! Now check your email..." +msgstr "Beveik baigta! Dabar patikrinkite savo el. paštą..." + +#: templates/web/base/reports/index.html:21 +msgid "New <br>problems" +msgstr "Naujos <br>problemos" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:261 +msgid "New body added" +msgstr "Nauja dalis pridėta" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:379 +msgid "New category contact added" +msgstr "Naujas kategorijos kontaktas pridetas" + +#: templates/web/zurich/admin/report_edit-sdm.html:55 +#: templates/web/zurich/admin/report_edit.html:81 +msgid "New internal note:" +msgstr "New internal note:" + +#: db/alert_types.pl:18 db/alert_types.pl:22 +msgid "New local problems on FixMyStreet" +msgstr "Naujos vietinės problemos FixMyStreet" + +#: db/alert_types_eha.pl:12 +msgid "New local reports on reportemptyhomes.com" +msgstr "New local reports on reportemptyhomes.com" + +#: db/alert_types.pl:38 +msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" +msgstr "Naujos problemos {{COUNCIL}} {{WARD}} rajone FixMyStreet" + +#: db/alert_types.pl:26 db/alert_types.pl:30 +msgid "New problems near {{POSTCODE}} on FixMyStreet" +msgstr "Naujos problemos šalia {{POSTCODE}} FixMyStreet" + +#: db/alert_types.pl:10 +msgid "New problems on FixMyStreet" +msgstr "Naujos problemos FixMyStreet" + +#: db/alert_types.pl:34 +msgid "New problems to {{COUNCIL}} on FixMyStreet" +msgstr "Naujos problemos skirtos {{COUNCIL}} FixMyStreet" + +#: db/alert_types.pl:42 +msgid "New problems within {{NAME}}'s boundary on FixMyStreet" +msgstr "Naujos problemos {{NAME}} riba FixMyStreet" + +#: templates/web/zurich/admin/index-sdm.html:4 +msgid "New reports" +msgstr "Nauji pranešimai" + +#: db/alert_types_eha.pl:23 +msgid "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com" +msgstr "New reports for {{COUNCIL}} within {{WARD}} ward on reportemptyhomes.com" + +#: db/alert_types_eha.pl:5 +msgid "New reports on reportemptyhomes.com" +msgstr "New reports on reportemptyhomes.com" + +#: db/alert_types_eha.pl:16 +msgid "New reports on reportemptyhomes.com near {{POSTCODE}}" +msgstr "New reports on reportemptyhomes.com near {{POSTCODE}}" + +#: db/alert_types_eha.pl:19 +msgid "New reports to {{COUNCIL}} on reportemptyhomes.com" +msgstr "New reports to {{COUNCIL}} on reportemptyhomes.com" + +#: db/alert_types_eha.pl:27 +msgid "New reports within {{NAME}}'s boundary on reportemptyhomes.com" +msgstr "New reports within {{NAME}}'s boundary on reportemptyhomes.com" + +#: templates/web/base/admin/questionnaire.html:24 +msgid "New state" +msgstr "New state" + +#: templates/web/zurich/admin/report_edit-sdm.html:58 +msgid "New update:" +msgstr "Naujas atnaujinimas:" + +#: templates/web/base/pagination.html:13 +msgid "Next" +msgstr "Kitas" + +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 +#: templates/web/base/admin/category_edit.html:4 +#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:34 +#: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/problem_row.html:20 +#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:93 +#: templates/web/base/admin/update_edit.html:25 +#: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/questionnaire/index.html:44 +#: templates/web/base/questionnaire/index.html:83 +#: templates/web/fixmystreet/questionnaire/index.html:102 +#: templates/web/fixmystreet/questionnaire/index.html:63 +msgid "No" +msgstr "Ne" + +#: templates/web/base/admin/user-form.html:33 +msgid "No body" +msgstr "Nėra institucijos" + +#: templates/web/base/admin/stats.html:85 +msgid "No council" +msgstr "Nėra savivaldybės" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:401 +msgid "No council selected" +msgstr "Nepasirinkta savivaldybė" + +#: templates/web/base/admin/edit-league.html:17 +msgid "No edits have yet been made." +msgstr "Redagavimas dar nebuvo atliktas" + +#: templates/web/base/admin/flagged.html:25 +msgid "No flagged problems found." +msgstr "Pažymėtos problemos nerastos" + +#: templates/web/base/admin/flagged.html:58 +msgid "No flagged users found." +msgstr "Pažymėti vartotojai nerasti." + +#: templates/web/zurich/admin/report_edit-sdm.html:65 +msgid "No further updates" +msgstr "Jokių kitų atnaujinimai" + +#: templates/web/base/around/around_map_list_items.html:17 +#: templates/web/fixmystreet/around/around_map_list_items.html:8 +msgid "No problems found." +msgstr "Jokių problemų nerasta." + +#: templates/web/base/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 "Jokių problemų dar nepranešta." + +#: templates/web/base/js/translation_strings.html:38 +msgid "No result returned" +msgstr "Jokių rezultatų" + +#: templates/web/base/admin/body-form.html:60 +#: templates/web/base/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 "" +"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." + +#: templates/web/base/report/_support.html:2 +#: templates/web/base/report/_support.html:4 +msgid "No supporters" +msgstr "Jokių rėmėjų" + +#: templates/web/base/admin/report_edit.html:41 +#: templates/web/zurich/admin/report_edit-sdm.html:46 +#: templates/web/zurich/admin/report_edit.html:60 +msgid "None" +msgstr "Nė vienas" + +#: templates/web/base/admin/user-form.html:24 +#: templates/web/base/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 "" +"Normal (public) users should not be associated with any <strong>body</strong>.<br>\n" +" Authorised staff users can be associated with the body they represent.<br>\n" +" Depending on the implementation, staff users may have access to the dashboard (summary of\n" +" activity across their body), the ability to hide reports or set special report statuses." + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 +#: templates/web/base/report/update-form.html:30 +#: templates/web/base/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 "Neatsakingas" + +#: templates/web/zurich/admin/report_edit-sdm.html:18 +msgid "Not for my subdivision" +msgstr "Ne mano padaliniui" + +#: templates/web/base/admin/questionnaire.html:6 +msgid "Not reported before" +msgstr "Nebuvo pranešta anksčiau" + +#: templates/web/base/report/_main.html:62 +msgid "Not reported to council" +msgstr "Nepranešta savivaldybei" + +#: templates/web/base/admin/body.html:71 +#: templates/web/base/admin/category_edit.html:92 +#: templates/web/zurich/admin/body.html:17 +msgid "Note" +msgstr "Pastaba" + +#: templates/web/base/admin/stats.html:51 +msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" +msgstr "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" + +#: templates/web/base/admin/body.html:186 +#: templates/web/base/admin/category_edit.html:49 +#: templates/web/zurich/admin/body.html:53 +msgid "Note:" +msgstr "Pastaba:" + +#: templates/web/base/open311/index.html:73 +msgid "Note: <strong>%s</strong>" +msgstr "Pastaba: <strong>%s</strong>" + +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:10 +msgid "Now to submit your report…" +msgstr "Dabar patvirtinti jūsų report…" + +#: templates/web/base/report/new/fill_in_details_form.html:113 +msgid "Now to submit your report… do you have a FixMyStreet password?" +msgstr "Dabar patvirtinti jūsų report… ar jūs turite FixMyStreet slaptažodį?" + +#: templates/web/fixmystreet/report/update-form.html:85 +msgid "Now to submit your update…" +msgstr "Dabar patvirtinti jūsų update…" + +#: templates/web/base/report/update-form.html:86 +msgid "Now to submit your update… do you have a FixMyStreet password?" +msgstr "Dabar patvirtinti jūsų update… ar jūs turite FixMyStreet slaptažodį?" + +#: templates/web/base/js/translation_strings.html:42 +msgid "OK" +msgstr "Gerai" + +#: templates/web/base/report/display.html:28 +#: templates/web/base/report/update.html:17 +msgid "Offensive? Unsuitable? Tell us" +msgstr "Įžeidžiantis? Netinkamas? Pranešk mums" + +#: templates/web/base/reports/index.html:23 +msgid "Old / unknown <br>problems" +msgstr "Senos/ nežinomos <br>problemos" + +#: templates/web/base/admin/questionnaire.html:24 +msgid "Old state" +msgstr "Sena būklė" + +#: templates/web/base/reports/index.html:25 +msgid "Older <br>fixed" +msgstr "Senesnis <br>sutvarkyta" + +#: templates/web/base/reports/index.html:22 +msgid "Older <br>problems" +msgstr "Senesnės <br>problemos" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 +msgid "One-line summary" +msgstr "Vieno eilutės santrauka" + +#: perllib/FixMyStreet/Cobrand/Zurich.pm:138 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:49 +#: templates/web/base/admin/report_edit.html:50 +#: templates/web/base/admin/update_edit.html:28 +#: templates/web/base/dashboard/index.html:142 +#: templates/web/base/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:86 +#: templates/web/zurich/admin/report_edit.html:88 +#: templates/web/zurich/admin/update_edit.html:18 +#: templates/web/zurich/report/banner.html:11 +msgid "Open" +msgstr "Atidaryta" + +#: templates/web/base/reports/index.html:22 +msgid "Open for more than four weeks, with an update within the past eight weeks" +msgstr "" + +#: templates/web/base/my/my.html:30 +#: templates/web/fixmystreet/my/_problem-list.html:2 +msgid "Open reports" +msgstr "Atidaryti pranešimai" + +#: templates/web/base/reports/index.html:23 +msgid "Open, but not had any update in eight weeks" +msgstr "" + +#: templates/web/base/open311/index.html:70 +msgid "Open311 API for the mySociety FixMyStreet server" +msgstr "Open311 API for the mySociety FixMyStreet server" + +#: templates/web/base/open311/index.html:80 +msgid "Open311 initiative web page" +msgstr "Open311 initiative web page" + +#: templates/web/base/open311/index.html:81 +msgid "Open311 specification" +msgstr "Open311 specification" + +#: templates/web/base/alert/_list.html:58 +#: templates/web/fixmystreet/alert/_list.html:60 +msgid "Or problems reported to:" +msgstr "Arba problemos praneštos:" + +#: templates/web/base/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’re in:" +msgstr "Arba jūs galite prenumeruoti įspėjimą atsižvelgiant į jūsų rajoną arba savivaldybę:" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 +#: perllib/FixMyStreet/DB/Result/Problem.pm:597 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:393 +msgid "Other" +msgstr "Kita" + +#: templates/web/base/footer.html:27 +msgid "Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>." +msgstr "Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>." + +#: templates/web/base/admin/list_updates.html:8 +msgid "Owner" +msgstr "Savininkas" + +#: templates/web/base/errors/page_error_404_not_found.html:1 +#: templates/web/base/errors/page_error_404_not_found.html:3 +msgid "Page Not Found" +msgstr "Puslapis nerastas" + +#: templates/web/base/admin/body-form.html:31 +#: templates/web/zurich/admin/body-form.html:14 +msgid "Parent" +msgstr "Parent" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 +msgid "Partial" +msgstr "Dalinis" + +#: templates/web/fixmystreet/auth/general.html:56 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:68 +#: templates/web/fixmystreet/report/update-form.html:116 +#: templates/web/zurich/auth/general.html:32 +#: templates/web/zurich/auth/general.html:63 +msgid "Password (optional)" +msgstr "Slaptažodis (nebūtina)" + +#: templates/web/base/auth/change_password.html:25 +msgid "Password:" +msgstr "Slaptažodis:" + +#: templates/web/base/js/translation_strings.html:48 +msgid "Permalink" +msgstr "Permalink" + +#: templates/web/zurich/report/new/fill_in_details_form.html:83 +msgid "Phone number" +msgstr "Telefono numeris" + +#: templates/web/fixmystreet/report/new/form_user_loggedin.html:26 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:62 +msgid "Phone number (optional)" +msgstr "Telefono numeris (nebūtina)" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:291 +#: templates/web/base/admin/report_edit.html:81 +#: templates/web/base/report/new/fill_in_details_form.html:197 +#: templates/web/zurich/admin/report_edit-sdm.html:46 +#: templates/web/zurich/admin/report_edit.html:60 +#: templates/web/zurich/admin/stats.html:39 +msgid "Phone:" +msgstr "Telefonas:" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 +#: 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:51 +msgid "Photo" +msgstr "Nuotrauka" + +#: templates/web/base/questionnaire/index.html:71 +#: templates/web/base/report/new/fill_in_details_form.html:84 +#: templates/web/base/report/update-form.html:62 +#: templates/web/fixmystreet/questionnaire/index.html:91 +msgid "Photo:" +msgstr "Nuotrauka:" + +#: templates/web/base/alert/list.html:26 +msgid "Photos of recent nearby reports" +msgstr "Naujausios gretimų pranešimų nuotraukos" + +#: templates/web/base/js/translation_strings.html:30 +msgid "Place pin on map" +msgstr "Padėkite smeigtuką ant žemėlapio" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/dashboard/index.html:142 +#: templates/web/base/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:86 +#: templates/web/zurich/admin/report_edit.html:89 +msgid "Planned" +msgstr "Suplanuota" + +#: templates/web/fixmystreet/questionnaire/index.html:45 +msgid "Please <a class=\"tab_link\" href=\"#report\">take a look</a> at the updates that have been left." +msgstr "Prašome <a class=\"tab_link\" href=\"#report\">peržvelgti</a> pateiktus atnaujinimus." + +#: templates/web/base/report/new/notes.html:5 +msgid "Please be polite, concise and to the point." +msgstr "Prašome būti mandagūs, rašyti glaustai ir tiksliai." + +#: templates/web/base/auth/change_password.html:12 +#: templates/web/base/auth/change_password.html:17 +msgid "Please check the passwords and try again" +msgstr "Prašome patikrinti slaptažodžius ir pabandykite dar kartą" + +#: templates/web/base/auth/token.html:14 +msgid "Please check your email" +msgstr "Prašome patikrinti savo el. paštą" + +#: templates/web/base/auth/general.html:14 +#: templates/web/base/auth/general.html:8 +#: templates/web/fixmystreet/auth/general.html:10 +#: templates/web/fixmystreet/auth/general.html:16 +#: templates/web/zurich/auth/general.html:3 +#: templates/web/zurich/auth/general.html:9 +msgid "Please check your email address is correct" +msgstr "Prašome patikrinti ar jūsų el. pašto adresas teisingas " + +#: perllib/FixMyStreet/App/Controller/Admin.pm:343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:876 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 +#: perllib/FixMyStreet/DB/Result/Problem.pm:412 +#: templates/web/base/js/translation_strings.html:9 +msgid "Please choose a category" +msgstr "Prašome pasirinkti kategoriją" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:418 +msgid "Please choose a property type" +msgstr "Prašome pasirinkti nuosavybės tipą" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:370 +msgid "Please correct the errors below" +msgstr "Prašome ištaisyti klaidas " + +#: templates/web/base/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 "" +"Prašome <strong>nepranešti</strong> problemų naudojant šią anketą; žinutės išsiunčiamos\n" +"FixMyStreet komandai, ne į savivaldybę. Norėdami pranešti problemą prašome\n" +"<a href=\"/\">eiti į pagrindinį puslapį</a> ir sekti pateiktas instrukcijas." + +#: templates/web/base/report/new/notes.html:6 +msgid "Please do not be abusive — abusing your council devalues the service for all users." +msgstr "Prašome neįžeidinėti — įžeidinėjimai nuvertina paslaugą visiems vartotojams." + +#: perllib/FixMyStreet/App/Controller/Admin.pm:346 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 +#: templates/web/base/js/translation_strings.html:2 +msgid "Please enter a message" +msgstr "Prašome įvesti žinutę" + +#: templates/web/base/auth/change_password.html:12 +#: templates/web/base/auth/change_password.html:15 +#: templates/web/base/js/translation_strings.html:19 +msgid "Please enter a password" +msgstr "Prašome įvesti slaptažodį" + +#: perllib/FixMyStreet/App/Controller/Contact.pm:113 +#: perllib/FixMyStreet/DB/Result/Problem.pm:395 +#: templates/web/base/js/translation_strings.html:3 +msgid "Please enter a subject" +msgstr "Prašome įvesti temą" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin.pm:995 +#: perllib/FixMyStreet/DB/Result/User.pm:127 +#: templates/web/base/js/translation_strings.html:12 +#: templates/web/base/js/translation_strings.html:16 +msgid "Please enter a valid email" +msgstr "Prašome įvesti galiojantį el. paštą" + +#: perllib/FixMyStreet/App/Controller/Alert.pm:346 +#: perllib/FixMyStreet/App/Controller/Contact.pm:123 +msgid "Please enter a valid email address" +msgstr "Prašome įvesti galiojantį el. pašto adresą" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:398 +#: templates/web/base/js/translation_strings.html:4 +msgid "Please enter some details" +msgstr "Prašome įvesti daugiau informacijos" + +#: perllib/FixMyStreet/App/Controller/Contact.pm:112 +#: perllib/FixMyStreet/DB/Result/User.pm:124 +#: templates/web/base/auth/general.html:13 +#: templates/web/base/auth/general.html:8 +#: templates/web/base/js/translation_strings.html:11 +#: templates/web/base/js/translation_strings.html:15 +#: templates/web/fixmystreet/auth/general.html:10 +#: templates/web/fixmystreet/auth/general.html:15 +#: templates/web/zurich/auth/general.html:3 +#: templates/web/zurich/auth/general.html:8 +msgid "Please enter your email" +msgstr "Prašome įvesti savo el. paštą" + +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 +#: templates/web/zurich/report/new/fill_in_details_form.html:75 +msgid "Please enter your email address" +msgstr "Prašome įvesti savo el. pašto adresą" + +#: templates/web/base/js/translation_strings.html:25 +msgid "Please enter your first name" +msgstr "Prašome įvesti savo vardą" + +#: perllib/FixMyStreet/Cobrand/UK.pm:318 +#: templates/web/base/js/translation_strings.html:7 +msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" +msgstr "Prašome įvesti savo vardą ir pavardę, savivalldybei reikalinga jūsų informacija - jeigu pageidaujate, kad jūsų vardas nebūtu pateiktas puslapyje nužymėkite langelį apačioje" + +#: perllib/FixMyStreet/App/Controller/Contact.pm:111 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 +#: perllib/FixMyStreet/DB/Result/Problem.pm:406 +#: perllib/FixMyStreet/DB/Result/User.pm:120 +#: templates/web/base/js/translation_strings.html:6 +msgid "Please enter your name" +msgstr "Prašome įvesti savo vardą" + +#: templates/web/base/js/translation_strings.html:22 +msgid "Please enter your phone number" +msgstr "Prašome įvesti savo telefono numerį" + +#: templates/web/base/js/translation_strings.html:26 +msgid "Please enter your second name" +msgstr "Prašome įvesti savo pavardę" + +#: templates/web/base/js/translation_strings.html:24 +msgid "Please enter your title" +msgstr "Prašome įvesti savo vardą" + +#: templates/web/base/auth/sign_out.html:5 +#: templates/web/zurich/auth/sign_out.html:5 +msgid "Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a href=\"/\">front page</a>." +msgstr "Galite <a href=\"%s\">prisijungti iš naujo</a>, arba grįžti atgal į <a href=\"/\">pagrindinį puslapį</a>." + +#: templates/web/base/report/new/fill_in_details_text.html:1 +#: templates/web/base/report/new/fill_in_details_text.html:8 +msgid "Please fill in details of the problem below." +msgstr "Prašome žemiau užpildyti problemos detales." + +#: templates/web/zurich/report/new/fill_in_details_form.html:46 +msgid "Please fill in details of the problem." +msgstr "Prašome užpildyti problemos detales." + +#: templates/web/base/report/new/fill_in_details_form.html:28 +#: templates/web/fixmystreet/report/new/sidebar.html:7 +#: 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 "Prašome pateikti problemos detales žemiau esančioje anketoje ir kuo tiksliau apibūdinkite vietą." + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:251 +msgid "Please indicate whether you'd like to receive another questionnaire" +msgstr "Prašome nurodyti, ar norite gauti kitą klausimyną." + +#: templates/web/fixmystreet/report/updates-sidebar-notes.html:4 +msgid "Please note that updates are not sent to the council." +msgstr "Atkreipkite dėmesį, kad naujinimai nėra siunčiama savivaldybei." + +#: templates/web/base/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 "Atkreipkite dėmesį, kad naujinimai nėra siunčiama savivaldybei. Jeigu jūs pateiksite savo vardą jis bus viešai prieinamas. Jūsų asmeninė informacija bus naudojama tiktai pagal mūsų <a href=\"/faq#privacy\">privatumo politika</a>" + +#: templates/web/base/report/new/fill_in_details_form.html:8 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:21 +#: 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 "Atkreipkite dėmesį, kad jūsų pranešimas dar <strong>nėra išsiųstas</strong>. Pasirinkite kategorija ir pridėkite išsamesnę informacija, tada patvirtinkite." + +#: templates/web/base/report/new/notes.html:1 +#: templates/web/zurich/report/new/notes.html:1 +msgid "Please note:" +msgstr "Atkreipkite dėmėsį:" + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:254 +msgid "Please provide some explanation as to why you're reopening this report" +msgstr "Prašome pateikti priežastis, kodėl jūs naujinate šį pranešimą" + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:261 +msgid "Please provide some text as well as a photo" +msgstr "Prašome pateikti šiek tiek teksto, taip pat nuotrauką" + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:247 +msgid "Please say whether you've ever reported a problem to your council before" +msgstr "Prašome pasakyti ar esate pranešęs apie problemą savo savivaldybei anksčiau" + +#: perllib/FixMyStreet/App/Controller/Alert.pm:80 +msgid "Please select the feed you want" +msgstr "Prašome pasirinkti jūsų pageidaujama srautą" + +#: perllib/FixMyStreet/App/Controller/Alert.pm:118 +msgid "Please select the type of alert you want" +msgstr "Prašome pasirinkti pageidaujama įspėjimo tipą" + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 +msgid "Please state whether or not the problem has been fixed" +msgstr "Prašome nurodyti, ar problema buvo sutvarkyta" + +#: templates/web/base/questionnaire/index.html:26 +msgid "Please take a look at the updates that have been left." +msgstr "Prašome peržvelgti atnaujinimus, kurie buvo palikti." + +#: perllib/FixMyStreet/App/Controller/Photo.pm:177 +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 +#: perllib/FixMyStreet/App/Controller/Photo.pm:189 +msgid "Please upload a JPEG image only" +msgstr "Prašome įkelti tik JPEG formato nuotrauką" + +#: perllib/FixMyStreet/App/Controller/Contact.pm:114 +msgid "Please write a message" +msgstr "Prašome įvesti žinutę" + +#: templates/web/fixmystreet/report/update-form.html:23 +msgid "Please write your update here" +msgstr "Prašome raštyti savo naujinimą čia" + +#: templates/web/base/contact/index.html:100 +#: templates/web/base/report/update-form.html:109 +#: templates/web/base/report/update-form.html:131 +#: templates/web/base/report/update-form.html:72 +#: templates/web/fixmystreet/contact/index.html:113 +#: templates/web/fixmystreet/report/update-form.html:124 +#: templates/web/fixmystreet/report/update-form.html:71 +#: templates/web/fixmystreet/report/update-form.html:97 +msgid "Post" +msgstr "Įkelti" + +#: templates/web/base/report/updates.html:15 +msgid "Posted anonymously at %s" +msgstr "Pateikta anonimiškai %s" + +#: templates/web/base/report/updates.html:22 +msgid "Posted by %s (<strong>%s</strong>) at %s" +msgstr "" + +#: templates/web/base/report/updates.html:24 +msgid "Posted by %s at %s" +msgstr "" + +#: templates/web/base/pagination.html:7 +msgid "Previous" +msgstr "Ankstesnis" + +#: templates/web/fixmystreet/footer.html:32 +msgid "Privacy" +msgstr "Privatumas" + +#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:85 +#: templates/web/base/admin/category_edit.html:45 +#: templates/web/base/admin/report_edit.html:95 +msgid "Private" +msgstr "Privatus" + +#: templates/web/base/maps/openlayers.html:89 +msgid "Problem" +msgstr "Problema" + +#: templates/web/base/admin/timeline.html:22 +msgid "Problem %d created" +msgstr "Problema %d sukurta" + +#: templates/web/base/admin/timeline.html:24 +msgid "Problem %s confirmed" +msgstr "" + +#: templates/web/base/admin/timeline.html:26 +msgid "Problem %s sent to council %s" +msgstr "Problema %s išsiųsta savivaldybei %s" + +#: templates/web/base/admin/index.html:47 +#: templates/web/zurich/admin/index.html:9 +msgid "Problem breakdown by state" +msgstr "Problemos pasiskirstymas pagal valstybės" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:966 +msgid "Problem marked as open." +msgstr "Problema pažymėta kaip atidaryta" + +#: templates/web/base/admin/questionnaire.html:21 +msgid "Problem state change based on survey results" +msgstr "Problemos būklės pakeitimas remiantis tyrimo rezultatais" + +#: templates/web/base/admin/flagged.html:10 +msgid "Problems" +msgstr "Problemos" + +#: templates/web/base/around/_updates.html:1 +msgid "Problems in this area" +msgstr "Problemos šioje srityje" + +#: templates/web/fixmystreet/around/tabbed_lists.html:4 +#: templates/web/fixmystreet/report/display.html:43 +msgid "Problems nearby" +msgstr "Šalia esančios problemos" + +#: templates/web/fixmystreet/around/tabbed_lists.html:3 +#: templates/web/fixmystreet/report/display.html:41 +msgid "Problems on the map" +msgstr "Problemos žemėlapyje" + +#: db/alert_types.pl:14 +msgid "Problems recently reported fixed on FixMyStreet" +msgstr "Neseniai praneštos problemos FixMyStreet" + +#: templates/web/base/alert/_list.html:19 +#: templates/web/fixmystreet/alert/_list.html:21 +msgid "Problems within %.1fkm of this location" +msgstr "Problemos %.1fkm atstumu aplink šią vietovę" + +#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 +#: perllib/FixMyStreet/Cobrand/UK.pm:207 +msgid "Problems within %s" +msgstr "Problemos viduje %s" + +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 +msgid "Problems within %s ward" +msgstr "Problemos %s rajone" + +#: templates/web/base/reports/body.html:0 +#: templates/web/base/reports/body.html:24 +msgid "Problems within %s, FixMyStreet" +msgstr "Problemos %s, FixMyStreet" + +#: templates/web/base/alert/_list.html:40 +#: templates/web/fixmystreet/alert/_list.html:42 +msgid "Problems within the boundary of:" +msgstr "Problemos apibrėžtose ribose:" + +#: db/alert_types_eha.pl:8 +msgid "Properties recently reported as put back to use on reportemptyhomes.com" +msgstr "Properties recently reported as put back to use on reportemptyhomes.com" + +#: templates/web/base/admin/report_edit.html:45 +msgid "Property address:" +msgstr "Nuosavybės adresas:" + +#: templates/web/base/report/new/category.html:8 +msgid "Property type:" +msgstr "Nuosavybės tipas:" + +#: templates/web/base/report/update-form.html:3 +#: templates/web/fixmystreet/report/update-form.html:4 +msgid "Provide an update" +msgstr "Pateikti naujinimą" + +#: templates/web/fixmystreet/auth/general.html:59 +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 "Pateikti vardą ir slaptažodį yra nebūtina, tačiau pateiktus bus jums papraščiau pranešti problemas, pateikti naujinimus ir tvarkyti savo pranešimus." + +#: templates/web/base/report/new/fill_in_details_form.html:155 +#: templates/web/base/report/update-form.html:128 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 +#: templates/web/fixmystreet/report/update-form.html:119 +msgid "Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports." +msgstr "Pateikti slaptažodį yra nebūtina, tačiau pateiktus bus jums papraščiau pranešti problemas, pateikti naujinimus ir tvarkyti savo pranešimus." + +#: templates/web/zurich/admin/report_edit.html:195 +#: templates/web/zurich/admin/report_edit.html:211 +msgid "Public response:" +msgstr "Viešas atsakymas:" + +#: templates/web/zurich/admin/report_edit.html:77 +#: templates/web/zurich/admin/stats.html:38 +msgid "Publish photo" +msgstr "Paskelbti nuotrauką" + +#: templates/web/zurich/admin/report_edit.html:219 +msgid "Publish the response" +msgstr "Paskelbti atsakymą" + +#: templates/web/base/questionnaire/completed.html:1 +#: templates/web/base/questionnaire/index.html:0 +#: templates/web/base/questionnaire/index.html:14 +#: templates/web/base/questionnaire/index.html:4 +#: templates/web/fixmystreet/questionnaire/index.html:0 +#: templates/web/fixmystreet/questionnaire/index.html:15 +#: templates/web/fixmystreet/questionnaire/index.html:33 +#: templates/web/fixmystreet/questionnaire/index.html:5 +msgid "Questionnaire" +msgstr "Anketa/Klausimynas" + +#: templates/web/base/admin/timeline.html:30 +msgid "Questionnaire %d answered for problem %d, %s to %s" +msgstr "Atsakyta anketa %d skirta problemoms %d, %s to %s" + +#: templates/web/base/admin/timeline.html:28 +msgid "Questionnaire %d sent for problem %d" +msgstr "Anketa %d išsiųsta dėl problemos %d" + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +msgid "Questionnaire filled in by problem reporter" +msgstr "Questionnaire filled in by problem reporter" + +#: templates/web/base/alert/_list.html:21 +#: templates/web/base/around/display_location.html:1 +#: templates/web/base/around/display_location.html:3 +#: templates/web/base/report/display.html:50 +#: templates/web/base/reports/_rss.html:1 +#: templates/web/fixmystreet/alert/_list.html:22 +#: templates/web/fixmystreet/alert/updates.html:9 +#: templates/web/fixmystreet/report/display.html:58 +msgid "RSS feed" +msgstr "RSS srautas" + +#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 +msgid "RSS feed for %s" +msgstr "RSS srautas skirtas %s" + +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 +msgid "RSS feed for %s ward, %s" +msgstr "RSS srautas skirtas %s rajonui, %s" + +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 +#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +msgid "RSS feed of %s" +msgstr "RSS srautas %s" + +#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 +msgid "RSS feed of %s, within %s ward" +msgstr "RSS srautas %s, viduje %s rajono" + +#: templates/web/base/alert/_list.html:21 +#: templates/web/fixmystreet/alert/_list.html:22 +msgid "RSS feed of nearby problems" +msgstr "Šalia esančių problemų RSS srautas" + +#: templates/web/base/reports/_rss.html:1 +msgid "RSS feed of problems in this %s" +msgstr "" + +#: perllib/FixMyStreet/Cobrand/Default.pm:651 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 +#: perllib/FixMyStreet/Cobrand/UK.pm:214 +msgid "RSS feed of problems within %s" +msgstr "" + +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:220 +msgid "RSS feed of problems within %s ward" +msgstr "" + +#: templates/web/base/around/display_location.html:1 +#: templates/web/base/around/display_location.html:4 +msgid "RSS feed of recent local problems" +msgstr "" + +#: templates/web/base/report/display.html:50 +#: templates/web/fixmystreet/alert/updates.html:9 +#: templates/web/fixmystreet/report/display.html:58 +msgid "RSS feed of updates to this problem" +msgstr "" + +#: templates/web/base/alert/updates.html:9 +#: templates/web/base/report/display.html:41 +#: templates/web/fixmystreet/alert/updates.html:14 +#: templates/web/fixmystreet/report/display.html:60 +msgid "Receive email when updates are left on this problem." +msgstr "" + +#: templates/web/base/around/display_location.html:0 +#: templates/web/base/around/display_location.html:33 +msgid "Recent local problems, FixMyStreet" +msgstr "" + +#: templates/web/base/reports/index.html:24 +msgid "Recently <br>fixed" +msgstr "" + +#: templates/web/base/index.html:30 +#: templates/web/fixmystreet/front/recent.html:11 +msgid "Recently reported problems" +msgstr "" + +#: templates/web/zurich/report/new/notes.html:5 +msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website." +msgstr "" + +#: templates/web/base/admin/report_blocks.html:16 +msgid "Remove flag" +msgstr "" + +#: templates/web/base/admin/report_edit.html:110 +#: templates/web/base/admin/update_edit.html:62 +#: templates/web/zurich/admin/update_edit.html:35 +msgid "Remove photo (can't be undone!)" +msgstr "" + +#: templates/web/fixmystreet/header_logo.html:2 +msgid "Report" +msgstr "" + +#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 +#: 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:32 +msgid "Report abuse" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Rss.pm:295 +msgid "Report on %s" +msgstr "" + +#: templates/web/base/report/new/fill_in_details_form.html:1 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 +msgid "Report your problem" +msgstr "" + +#: templates/web/base/index.html:11 +#: templates/web/fixmystreet/around/intro.html:1 +#: templates/web/zurich/around/intro.html:1 +msgid "Report, view, or discuss local problems" +msgstr "" + +#: templates/web/base/my/my.html:82 +msgid "Reported %s" +msgstr "" + +#: templates/web/base/my/my.html:80 +msgid "Reported %s, to %s" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:580 +#: templates/web/base/contact/index.html:50 +#: templates/web/fixmystreet/contact/index.html:65 +msgid "Reported anonymously at %s" +msgstr "" + +#: templates/web/base/admin/questionnaire.html:5 +#: templates/web/base/questionnaire/index.html:53 +#: templates/web/fixmystreet/questionnaire/index.html:72 +msgid "Reported before" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: templates/web/base/contact/index.html:52 +#: templates/web/fixmystreet/contact/index.html:67 +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:576 +msgid "Reported in the %s category anonymously at %s" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:598 +msgid "Reported in the %s category by %s at %s" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +msgid "Reported via %s anonymously at %s" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 +msgid "Reported via %s by %s at %s" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 +msgid "Reported via %s in the %s category anonymously at %s" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 +msgid "Reported via %s in the %s category by %s at %s" +msgstr "" + +#: templates/web/base/reports/index.html:21 +msgid "Reported within the last four weeks" +msgstr "" + +#: templates/web/base/around/around_index.html:1 +#: templates/web/base/around/around_index.html:3 +#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/report/new/fill_in_details.html:0 +#: templates/web/base/report/new/fill_in_details.html:5 +#: templates/web/fixmystreet/around/around_index.html:2 +#: templates/web/zurich/report/new/fill_in_details_form.html:2 +msgid "Reporting a problem" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:294 +#: templates/web/zurich/header.html:60 +msgid "Reports" +msgstr "" + +#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 +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/base/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/base/admin/report_edit.html:85 +msgid "Resend report" +msgstr "" + +#: templates/web/base/js/translation_strings.html:28 +msgid "Right place?" +msgstr "" + +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:167 +#: perllib/FixMyStreet/Geocode/OSM.pm:152 +msgid "Road operator for this named road (derived from road reference number and type): %s" +msgstr "" + +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:164 +#: perllib/FixMyStreet/Geocode/OSM.pm:149 +msgid "Road operator for this named road (from OpenStreetMap): %s" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1403 +#: templates/web/base/admin/report_edit.html:106 +#: templates/web/zurich/admin/report_edit.html:73 +msgid "Rotate Left" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: templates/web/base/admin/report_edit.html:107 +#: templates/web/zurich/admin/report_edit.html:74 +msgid "Rotate Right" +msgstr "" + +#: templates/web/base/js/translation_strings.html:46 +msgid "Satellite" +msgstr "" + +#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/category_edit.html:81 +#: templates/web/zurich/admin/body.html:59 +msgid "Save changes" +msgstr "" + +#: templates/web/base/admin/reports.html:1 +#: templates/web/zurich/admin/reports.html:1 +msgid "Search Reports" +msgstr "" + +#: templates/web/base/admin/users.html:1 +msgid "Search Users" +msgstr "" + +#: templates/web/zurich/header.html:77 +msgid "Search reports" +msgstr "" + +#: templates/web/base/admin/reports.html:5 +#: templates/web/base/admin/users.html:8 +#: templates/web/zurich/admin/reports.html:5 +msgid "Search:" +msgstr "" + +#: templates/web/base/admin/reports.html:26 +msgid "Searching found no reports." +msgstr "" + +#: templates/web/base/admin/users.html:41 +msgid "Searching found no users." +msgstr "" + +#: templates/web/base/admin/body-form.html:33 +#: templates/web/zurich/admin/body-form.html:16 +msgid "Select a body" +msgstr "" + +#: templates/web/base/reports/index.html:9 +msgid "Select a particular council to see the reports sent there." +msgstr "" + +#: templates/web/base/admin/body-form.html:71 +#: templates/web/zurich/admin/body-form.html:26 +msgid "Select an area" +msgstr "" + +#: templates/web/base/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:685 +msgid "Sent to %s %s later" +msgstr "" + +#: templates/web/base/admin/report_edit.html:84 +msgid "Sent:" +msgstr "" + +#: templates/web/base/admin/report_edit.html:89 +#: templates/web/zurich/admin/stats.html:45 +msgid "Service:" +msgstr "" + +#: templates/web/fixmystreet/report/display.html:38 +msgid "Share" +msgstr "" + +#: templates/web/base/report/new/fill_in_details_form.html:192 +#: templates/web/base/report/update-form.html:157 +#: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 +#: templates/web/fixmystreet/report/update-form.html:146 +msgid "Show my name publicly" +msgstr "" + +#: templates/web/base/around/display_location.html:67 +msgid "Show old" +msgstr "" + +#: templates/web/base/around/display_location.html:58 +msgid "Show pins" +msgstr "" + +#: templates/web/base/auth/general.html:3 +#: templates/web/base/auth/general.html:49 +#: templates/web/fixmystreet/auth/general.html:4 +#: templates/web/fixmystreet/auth/general.html:43 +#: templates/web/fixmystreet/auth/general.html:64 +#: templates/web/zurich/auth/general.html:18 +#: templates/web/zurich/auth/general.html:35 +msgid "Sign in" +msgstr "" + +#: templates/web/base/auth/general.html:74 +msgid "Sign in by email" +msgstr "" + +#: templates/web/base/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/base/auth/sign_out.html:1 templates/web/base/header.html:30 +#: templates/web/zurich/auth/sign_out.html:1 +msgid "Sign out" +msgstr "" + +#: templates/web/base/header.html:29 +msgid "Signed in as %s" +msgstr "" + +#: templates/web/base/report/new/fill_in_details_text.html:1 +msgid "Some categories may require additional information." +msgstr "" + +#: templates/web/base/admin/body-form.html:149 +#: templates/web/base/admin/body-form.html:150 +msgid "" +"Some endpoints require an <strong>API key</strong> to indicate that the reports are being\n" +" sent from your FixMyStreet installation." +msgstr "" + +#: templates/web/base/alert/index.html:42 +msgid "Some photos of recent reports" +msgstr "" + +#: perllib/FixMyStreet/App/View/Email.pm:32 +#: perllib/FixMyStreet/App/View/Web.pm:43 +msgid "Some text to localize" +msgstr "" + +#: perllib/FixMyStreet/Cobrand/UK.pm:78 +msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." +msgstr "" + +#: templates/web/base/tokens/abuse.html:5 +msgid "Sorry, there has been an error confirming your problem." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:214 +#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 +#: perllib/FixMyStreet/Geocode/Google.pm:47 +#: perllib/FixMyStreet/Geocode/OSM.pm:48 +msgid "Sorry, we could not find that location." +msgstr "" + +#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: perllib/FixMyStreet/Geocode/Google.pm:44 +#: perllib/FixMyStreet/Geocode/Zurich.pm:87 +msgid "Sorry, we could not parse that location. Please try again." +msgstr "" + +#: templates/web/base/admin/stats.html:64 +msgid "Start Date:" +msgstr "" + +#: templates/web/base/admin/body.html:69 +#: templates/web/base/admin/flagged.html:18 +#: templates/web/base/admin/list_updates.html:11 +#: templates/web/base/admin/reports.html:15 +#: templates/web/fixmystreet/report/update-form.html:26 +msgid "State" +msgstr "" + +#: templates/web/base/admin/report_edit.html:47 +#: templates/web/base/admin/update_edit.html:27 +#: templates/web/base/report/update-form.html:28 +#: templates/web/zurich/admin/report_edit-sdm.html:53 +#: templates/web/zurich/admin/report_edit.html:84 +#: templates/web/zurich/admin/update_edit.html:17 +msgid "State:" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:308 +#: templates/web/base/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/base/report/updates.html:10 +msgid "Still open, via questionnaire, %s" +msgstr "" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 +msgid "Subcategory: %s" +msgstr "" + +#: templates/web/zurich/admin/index-dm.html:27 +msgid "Subdivision/Body" +msgstr "" + +#: templates/web/fixmystreet/contact/index.html:98 +msgid "Subject" +msgstr "" + +#: templates/web/base/admin/report_edit.html:19 +#: templates/web/base/contact/index.html:88 +#: templates/web/base/report/new/fill_in_details_form.html:53 +#: templates/web/zurich/admin/report_edit.html:34 +msgid "Subject:" +msgstr "" + +#: templates/web/base/questionnaire/creator_fixed.html:19 +#: templates/web/base/report/new/fill_in_details_form.html:136 +#: templates/web/base/report/new/fill_in_details_form.html:158 +#: templates/web/base/report/new/fill_in_details_form.html:96 +#: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:91 +msgid "Submit" +msgstr "" + +#: templates/web/base/admin/report_edit.html:113 +#: templates/web/base/admin/update_edit.html:65 +#: templates/web/base/admin/user-form.html:56 +#: templates/web/zurich/admin/report_edit-sdm.html:64 +#: templates/web/zurich/admin/report_edit.html:221 +#: templates/web/zurich/admin/update_edit.html:38 +msgid "Submit changes" +msgstr "" + +#: templates/web/base/questionnaire/index.html:88 +#: templates/web/fixmystreet/questionnaire/index.html:106 +msgid "Submit questionnaire" +msgstr "" + +#: perllib/FixMyStreet/Cobrand/Zurich.pm:134 +#: 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:86 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/reports.html:13 +#: templates/web/zurich/report/banner.html:9 +msgid "Submitted" +msgstr "" + +#: templates/web/base/alert/updates.html:17 +#: templates/web/base/report/display.html:46 +#: templates/web/fixmystreet/alert/updates.html:23 +#: templates/web/fixmystreet/report/display.html:65 +msgid "Subscribe" +msgstr "" + +#: templates/web/base/alert/_list.html:97 +#: templates/web/fixmystreet/alert/_list.html:92 +msgid "Subscribe me to an email alert" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1191 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:293 +#: templates/web/base/admin/bodies.html:25 +#: templates/web/base/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/base/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:1195 +msgid "Survey" +msgstr "" + +#: templates/web/base/admin/questionnaire.html:1 +msgid "Survey Results" +msgstr "" + +#: templates/web/base/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/base/admin/body.html:28 +msgid "Text only version" +msgstr "" + +#: templates/web/base/admin/update_edit.html:20 +#: templates/web/zurich/admin/update_edit.html:12 +msgid "Text:" +msgstr "" + +#: templates/web/base/tokens/confirm_problem.html:12 +msgid "Thank you for reporting this issue!" +msgstr "" + +#: templates/web/base/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/base/tokens/confirm_update.html:15 +msgid "Thank you for updating this issue!" +msgstr "" + +#: templates/web/base/contact/submit.html:6 +#: templates/web/base/questionnaire/completed.html:5 +msgid "Thank you for your feedback" +msgstr "" + +#: templates/web/fixmystreet/around/around_index.html:28 +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 :" +msgstr "" + +#: templates/web/base/questionnaire/creator_fixed.html:9 +msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Photo.pm:195 +msgid "That image doesn't appear to have uploaded correctly (%s), please try again." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Council.pm:97 +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:126 +msgid "That location does not appear to be in the UK; please try again." +msgstr "" + +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 +#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 +#: perllib/FixMyStreet/Cobrand/UK.pm:71 +msgid "That postcode was not recognised, sorry." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:712 +#, fuzzy +msgid "That problem has been marked as sent." +msgstr "Problema pažymėta kaip atidaryta" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:704 +msgid "That problem will now be resent." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report.pm:118 +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/base/admin/body.html:144 +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/base/admin/body-form.html:123 +#: templates/web/base/admin/body-form.html:124 +msgid "" +"The <strong>endpoint</strong> is the URL of the service that FixMyStreet will connect to \n" +" when sending reports to this body." +msgstr "" + +#: templates/web/base/admin/body-form.html:136 +#: templates/web/base/admin/body-form.html:137 +msgid "" +"The <strong>jurisdiction</strong> is only needed if the endpoint is serving more\n" +" than one. If the body is running its own endpoint, you can usually leave this blank." +msgstr "" + +#: templates/web/base/admin/body-form.html:94 +#: templates/web/base/admin/body-form.html:95 +msgid "" +"The <strong>send method</strong> determines how problem reports will be sent to the body.\n" +" If you leave this blank, <strong>send method defaults to email</strong>." +msgstr "" + +#: templates/web/base/open311/index.html:90 +msgid "The Open311 v2 attribute agency_responsible is used to list the administrations that received the problem report, which is not quite the way the attribute is defined in the Open311 v2 specification." +msgstr "" + +#: templates/web/base/admin/body-form.html:11 +#: templates/web/base/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/base/auth/token.html:19 templates/web/base/email_sent.html:6 +msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." +msgstr "" + +#: templates/web/base/report/new/fill_in_details_text.html:1 +#: templates/web/base/report/new/fill_in_details_text.html:3 +msgid "The council won’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:44 +msgid "The details of your problem are available from the other tab above." +msgstr "" + +#: templates/web/base/questionnaire/index.html:25 +msgid "The details of your problem are available on the right hand side of this page." +msgstr "" + +#: templates/web/base/admin/edit-league.html:3 +#: templates/web/base/admin/edit-league.html:4 +msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 +#: perllib/FixMyStreet/App/Controller/Reports.pm:78 +msgid "The error was: %s" +msgstr "" + +#: templates/web/base/open311/index.html:86 +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:159 +#: perllib/FixMyStreet/Geocode/OSM.pm:144 +msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap." +msgstr "" + +#: 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/base/admin/body-form.html:58 +msgid "The list of available areas is being provided by the MapIt service at %s." +msgstr "" + +#: templates/web/base/auth/change_password.html:12 +#: templates/web/base/auth/change_password.html:16 +msgid "The passwords do not match" +msgstr "" + +#: templates/web/base/errors/page_error_404_not_found.html:10 +#: templates/web/base/errors/page_error_404_not_found.html:12 +msgid "The requested URL '%s' was not found on this server" +msgstr "" + +#: templates/web/base/alert/_list.html:14 +#: templates/web/fixmystreet/alert/_list.html:16 +msgid "The simplest alert is our geographic one:" +msgstr "" + +#: templates/web/base/report/new/councils_extra_text.html:1 +#: templates/web/base/report/new/councils_text_some.html:10 +#: templates/web/base/report/new/fill_in_details_form.html:18 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:14 +msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." +msgstr "" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:300 +msgid "The user could not locate the problem on a map, but to see the area around the location they entered" +msgstr "" + +#: templates/web/base/admin/user-form.html:12 +#: templates/web/base/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 "" + +#: templates/web/base/reports/_problem-list.html:15 +msgid "There are no reports to show." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Reports.pm:75 +msgid "There was a problem showing the All Reports page. Please try again later." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Contact.pm:136 +#: 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:762 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 +#: templates/web/base/auth/general.html:23 +#: templates/web/fixmystreet/auth/general.html:25 +#: 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 ‘sign in by email’ 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:140 +msgid "There were problems with your report. Please see below." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:300 +msgid "There were problems with your update. Please see below." +msgstr "" + +#: templates/web/base/admin/body-form.html:112 +#: templates/web/base/admin/body-form.html:113 +msgid "" +"These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.<br>\n" +" <strong>You don't need to set them if the Send Method is email.</strong>.\n" +" For more information on Open311, see \n" +" <a href='https://www.mysociety.org/2013/01/17/open311-explained/' class='admin-offsite-link'>this article</a>.\n" +" " +msgstr "" + +#: templates/web/base/open311/index.html:77 +msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." +msgstr "" + +#: templates/web/base/admin/body.html:44 +msgid "" +"This body covers no area. This means that it has no jurisdiction over problems reported <em>at any location</em>.\n" +" Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" +" Currently, users <strong>cannot report problems to this body</strong>." +msgstr "" + +#: templates/web/base/admin/body.html:54 +msgid "This body has no contacts. This means that currently problems reported to this body <strong>will not be sent</strong>." +msgstr "" + +#: templates/web/base/admin/body-form.html:52 +#: templates/web/base/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:394 +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:397 +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:902 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:972 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/Cobrand/UK.pm:43 +msgid "This information is required" +msgstr "" + +#: templates/web/base/debug_header.html:3 +msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." +msgstr "" + +#: templates/web/base/reports/index.html:7 +msgid "This is a summary of all reports on this site." +msgstr "" + +#: templates/web/base/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/base/report/banner.html:15 +msgid "This problem has been closed" +msgstr "" + +#: templates/web/base/report/banner.html:12 +#: templates/web/base/report/update-form.html:48 +#: templates/web/fixmystreet/report/update-form.html:46 +msgid "This problem has been fixed" +msgstr "" + +#: templates/web/base/report/update-form.html:43 +#: templates/web/fixmystreet/report/update-form.html:40 +msgid "This problem has not been fixed" +msgstr "" + +#: templates/web/base/report/banner.html:19 +msgid "This problem is in progress" +msgstr "" + +#: templates/web/base/report/banner.html:9 +msgid "This problem is old and of unknown status." +msgstr "" + +#: perllib/FixMyStreet/Cobrand/Zurich.pm:131 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:132 +#: templates/web/zurich/report/_main.html:14 +msgid "This report is awaiting moderation." +msgstr "" + +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:87 +msgid "This report is currently marked as closed." +msgstr "" + +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:85 +msgid "This report is currently marked as fixed." +msgstr "" + +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:89 +msgid "This report is currently marked as open." +msgstr "" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:311 +msgid "This report was submitted anonymously" +msgstr "" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:293 +msgid "This web page also contains a photo of the problem, provided by the user." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 +#: templates/web/base/admin/timeline.html:1 +msgid "Timeline" +msgstr "" + +#: templates/web/base/admin/flagged.html:15 +#: templates/web/base/admin/reports.html:12 +msgid "Title" +msgstr "" + +#: templates/web/base/around/_report_banner.html:2 +msgid "To <strong>report a problem</strong>, click on the map at the correct location." +msgstr "" + +#: templates/web/base/alert/index.html:27 +msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" +msgstr "" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:299 +msgid "To view a map of the precise location of this issue" +msgstr "" + +#: templates/web/base/admin/index.html:55 +#: templates/web/base/admin/questionnaire.html:24 +#: templates/web/base/admin/stats.html:24 +#: templates/web/base/admin/stats.html:43 +#: templates/web/zurich/admin/stats.html:30 +msgid "Total" +msgstr "" + +#: templates/web/base/js/translation_strings.html:29 +msgid "Try again" +msgstr "" + +#: templates/web/base/contact/submit.html:14 +msgid "Try emailing us directly:" +msgstr "" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 +#: templates/web/base/report/update-form.html:30 +#: templates/web/base/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/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 +#: templates/web/base/admin/update_edit.html:28 +#: templates/web/zurich/admin/report_edit-sdm.html:45 +#: templates/web/zurich/admin/report_edit.html:58 +#: 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/base/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/base/admin/timeline.html:33 +msgid "Update %s created for problem %d; by %s" +msgstr "" + +#: templates/web/base/contact/index.html:21 +#: templates/web/fixmystreet/contact/index.html:36 +msgid "Update below added anonymously at %s" +msgstr "" + +#: templates/web/base/contact/index.html:23 +#: templates/web/fixmystreet/contact/index.html:38 +msgid "Update below added by %s at %s" +msgstr "" + +#: templates/web/base/admin/body-form.html:240 +#: templates/web/zurich/admin/body-form.html:51 +msgid "Update body" +msgstr "" + +#: templates/web/base/admin/index.html:49 +msgid "Update breakdown by state" +msgstr "" + +#: db/alert_types.pl:7 +msgid "Update by {{name}}" +msgstr "" + +#: templates/web/base/admin/update_edit.html:42 +#: templates/web/zurich/admin/update_edit.html:25 +msgid "Update changed problem state to %s" +msgstr "" + +#: templates/web/base/admin/update_edit.html:44 +msgid "Update marked problem as fixed" +msgstr "" + +#: templates/web/base/admin/update_edit.html:46 +msgid "Update reopened problem" +msgstr "" + +#: templates/web/base/admin/body.html:101 +msgid "Update statuses" +msgstr "" + +#: templates/web/base/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:1014 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:808 +#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:556 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:625 +msgid "Updated!" +msgstr "" + +#: templates/web/base/admin/list_updates.html:2 +#: templates/web/base/report/update.html:3 +#: templates/web/fixmystreet/report/update.html:5 +#: templates/web/zurich/admin/list_updates.html:24 +#: templates/web/zurich/report/updates.html:2 +msgid "Updates" +msgstr "" + +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 +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/base/report/display.html:0 +#: templates/web/base/report/display.html:5 +#: templates/web/fixmystreet/report/display.html:0 +#: templates/web/fixmystreet/report/display.html:9 +msgid "Updates to this problem, FixMyStreet" +msgstr "" + +#: templates/web/base/admin/body.html:182 +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:1357 +msgid "User flag removed" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1329 +msgid "User flagged" +msgstr "" + +#: templates/web/base/admin/users.html:5 +msgid "User search finds matches in users' names and email addresses." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:307 +#: templates/web/base/admin/flagged.html:29 +#: templates/web/zurich/header.html:69 +msgid "Users" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:374 +#: perllib/FixMyStreet/App/Controller/Admin.pm:404 +#: perllib/FixMyStreet/App/Controller/Admin.pm:421 +msgid "Values updated" +msgstr "" + +#: templates/web/base/admin/report_edit.html:18 +#: templates/web/base/admin/update_edit.html:18 +#: templates/web/zurich/admin/report_edit-sdm.html:21 +#: templates/web/zurich/admin/report_edit.html:20 +#: templates/web/zurich/admin/update_edit.html:10 +msgid "View report on site" +msgstr "" + +#: templates/web/base/reports/body.html:14 +msgid "View reports by ward" +msgstr "" + +#: templates/web/base/around/display_location.html:0 +#: templates/web/base/around/display_location.html:35 +msgid "Viewing a location" +msgstr "" + +#: templates/web/base/report/display.html:0 +#: templates/web/fixmystreet/report/display.html:0 +msgid "Viewing a problem" +msgstr "" + +#: templates/web/base/reports/body.html:16 +msgid "Wards of this council" +msgstr "" + +#: templates/web/base/alert/choose.html:6 +#: templates/web/base/around/around_index.html:16 +#: templates/web/fixmystreet/around/around_index.html:17 +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/base/auth/token.html:8 +msgid "We have not been able to confirm your account - sorry." +msgstr "" + +#: templates/web/base/auth/token.html:16 +msgid "We have sent you an email containing a link to confirm your account." +msgstr "" + +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:2 +#: templates/web/fixmystreet/report/update-form.html:77 +msgid "We never show your email" +msgstr "" + +#: templates/web/fixmystreet/report/new/form_user_loggedin.html:31 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:65 +msgid "We never show your email address or phone number." +msgstr "" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:403 +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/base/index-steps.html:31 +msgid "We send it to the council on your behalf" +msgstr "" + +#: templates/web/base/report/new/notes.html:4 +#: templates/web/zurich/report/new/notes.html:4 +msgid "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>" +msgstr "" + +#: templates/web/base/questionnaire/completed-open.html:2 +msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" +msgstr "" + +#: templates/web/base/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/base/contact/submit.html:7 +msgid "We’ll get back to you as soon as we can." +msgstr "" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 +msgid "What’s the issue, and where is it?" +msgstr "" + +#: templates/web/base/admin/category_edit.html:87 +#: templates/web/zurich/admin/body.html:18 +msgid "When edited" +msgstr "" + +#: templates/web/base/admin/problem_row.html:35 +msgid "When sent" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 +msgid "Whole block of empty flats" +msgstr "" + +#: templates/web/base/tokens/confirm_alert.html:7 +msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." +msgstr "" + +#: templates/web/base/open311/index.html:92 +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/front/footer-marketing.html:17 +msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." +msgstr "" + +#: templates/web/base/questionnaire/index.html:78 +#: templates/web/fixmystreet/questionnaire/index.html:97 +msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" +msgstr "" + +#: templates/web/base/report/new/notes.html:7 +msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." +msgstr "" + +#: templates/web/base/report/new/fill_in_details_form.html:4 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:5 +msgid "Wrong location? Just click again on the map." +msgstr "" + +#: templates/web/base/admin/stats.html:10 +msgid "Year" +msgstr "" + +#: templates/web/base/admin/bodies.html:66 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 +#: templates/web/base/admin/category_edit.html:5 +#: templates/web/base/admin/flagged.html:47 +#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:34 +#: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/problem_row.html:20 +#: templates/web/base/admin/report_edit.html:76 +#: templates/web/base/admin/report_edit.html:93 +#: templates/web/base/admin/update_edit.html:24 +#: templates/web/base/admin/users.html:31 +#: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/questionnaire/index.html:42 +#: templates/web/base/questionnaire/index.html:81 +#: templates/web/fixmystreet/questionnaire/index.html:100 +#: templates/web/fixmystreet/questionnaire/index.html:61 +msgid "Yes" +msgstr "" + +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:17 +#: templates/web/fixmystreet/report/update-form.html:91 +msgid "Yes I have a password" +msgstr "" + +#: templates/web/base/contact/index.html:39 +#: templates/web/fixmystreet/contact/index.html:54 +msgid "You are complaining that this problem report was unnecessarily moderated:" +msgstr "" + +#: templates/web/base/contact/index.html:41 +#: templates/web/fixmystreet/contact/index.html:56 +msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" +msgstr "" + +#: templates/web/base/contact/index.html:15 +#: templates/web/fixmystreet/contact/index.html:30 +msgid "You are reporting the following update for being abusive, containing personal information, or similar:" +msgstr "" + +#: templates/web/zurich/tokens/confirm_problem.html:5 +#: templates/web/zurich/tokens/confirm_problem.html:8 +msgid "You can <a href=\"%s%s\">view the problem on this site</a>." +msgstr "" + +#: templates/web/base/admin/user-form.html:48 +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:121 +msgid "You can contact technical support on <a href='mailto:%s'>%s</a>" +msgstr "" + +#: templates/web/base/admin/flagged.html:5 +msgid "" +"You can flag any report or user by editing them, and they will be listed on this page.\n" +" For example, this can useful if you want to keep an eye on a user who has posted inappropriate\n" +" reports in the past." +msgstr "" + +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 +#: templates/web/base/report/new/councils_text_some.html:21 +msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." +msgstr "" + +#: templates/web/base/admin/body-form.html:85 +msgid "You can mark a body as deleted if you do not want it to be active on the site." +msgstr "" + +#: templates/web/base/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/base/questionnaire/index.html:68 +#: templates/web/base/report/new/fill_in_details_form.html:75 +#: templates/web/fixmystreet/questionnaire/index.html:88 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 +#: templates/web/zurich/report/new/fill_in_details_form.html:58 +msgid "You have already attached a photo to this report, attaching another one will replace it." +msgstr "" + +#: templates/web/base/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/base/auth/sign_out.html:4 +#: templates/web/zurich/auth/sign_out.html:3 +msgid "You have been signed out" +msgstr "" + +#: templates/web/zurich/report/new/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/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/base/report/display.html:20 +#: templates/web/base/report/new/fill_in_details.html:37 +#: templates/web/fixmystreet/report/display.html:17 +msgid "You have successfully signed in; please check and confirm your details are accurate:" +msgstr "" + +#: templates/web/base/my/my.html:20 templates/web/fixmystreet/my/my.html:20 +msgid "You haven’t created any reports yet. <a href=\"%s\">Report a problem now.</a>" +msgstr "" + +#: templates/web/base/email_sent.html:13 +msgid "You must now click the link in the email we've just sent you." +msgstr "" + +#: templates/web/base/admin/index.html:18 +msgid "You need to <a href=\"%s\">add some bodies</a> (such as councils or departments) before any reports can be sent." +msgstr "" + +#: templates/web/base/admin/bodies.html:7 +msgid "" +"You need to add bodies (such as councils or departments) so that you can then add\n" +" the categories of problems they can handle (such as potholes or streetlights) and the\n" +" contacts (such as an email address) to which reports are sent." +msgstr "" + +#: templates/web/base/admin/report_edit.html:85 +msgid "You really want to resend?" +msgstr "" + +#: templates/web/base/my/my.html:0 templates/web/base/my/my.html:15 +#: templates/web/base/my/my.html:4 templates/web/fixmystreet/my/my.html:0 +#: templates/web/fixmystreet/my/my.html:15 +#: templates/web/fixmystreet/my/my.html:4 +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:91 +#: templates/web/fixmystreet/report/display.html:62 +#: templates/web/fixmystreet/report/display.html:64 +#: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 +#: templates/web/fixmystreet/report/update-form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:71 +msgid "Your email" +msgstr "" + +#: templates/web/fixmystreet/auth/general.html:27 +#: templates/web/fixmystreet/report/update-form.html:82 +#: templates/web/zurich/auth/general.html:30 +#: templates/web/zurich/auth/general.html:58 +msgid "Your email address" +msgstr "" + +#: templates/web/base/auth/general.html:27 +msgid "Your email address:" +msgstr "" + +#: templates/web/base/alert/_list.html:92 +#: templates/web/base/report/new/fill_in_details_form.html:106 +#: templates/web/base/report/update-form.html:81 +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:54 +#: templates/web/fixmystreet/contact/index.html:84 +#: templates/web/fixmystreet/report/new/form_user_loggedin.html:18 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 +#: templates/web/fixmystreet/report/update-form.html:142 +#: templates/web/zurich/auth/general.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:81 +msgid "Your name" +msgstr "" + +#: templates/web/base/auth/general.html:59 +#: templates/web/base/contact/index.html:73 +#: templates/web/base/report/new/fill_in_details_form.html:185 +#: templates/web/base/report/update-form.html:151 +msgid "Your name:" +msgstr "" + +#: templates/web/fixmystreet/auth/general.html:42 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:22 +#: templates/web/fixmystreet/report/update-form.html:96 +#: templates/web/zurich/auth/general.html:34 +msgid "Your password" +msgstr "" + +#: templates/web/base/auth/change_password.html:6 +msgid "Your password has been changed" +msgstr "" + +#: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 +#: templates/web/zurich/report/new/fill_in_details_form.html:87 +msgid "Your phone number" +msgstr "" + +#: templates/web/fixmystreet/questionnaire/index.html:16 +msgid "Your report" +msgstr "" + +#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:24 +msgid "Your reports" +msgstr "" + +#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:41 +msgid "Your updates" +msgstr "" + +#: templates/web/base/contact/index.html:81 +msgid "Your email:" +msgstr "" + +#: templates/web/base/admin/timeline.html:4 +msgid "by %s" +msgstr "" + +#: templates/web/base/reports/body.html:6 +#: templates/web/base/reports/body.html:7 +msgid "council" +msgstr "" + +#: templates/web/base/admin/report_edit.html:32 +#: templates/web/zurich/admin/report_edit-sdm.html:40 +#: templates/web/zurich/admin/report_edit.html:54 +msgid "didn't use map" +msgstr "" + +#: templates/web/base/alert/index.html:33 +#: templates/web/fixmystreet/around/postcode_form.html:20 +msgid "e.g. ‘%s’ or ‘%s’" +msgstr "" + +#: templates/web/base/admin/body-form.html:188 +#: templates/web/base/admin/flagged.html:51 +msgid "edit user" +msgstr "" + +#: templates/web/base/admin/index.html:34 +#: 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:235 +msgid "less than a minute" +msgstr "" + +#: templates/web/base/report/updates.html:57 +msgid "marked as a duplicate report" +msgstr "" + +#: templates/web/base/report/updates.html:47 +msgid "marked as action scheduled" +msgstr "" + +#: templates/web/base/report/updates.html:59 +msgid "marked as an internal referral" +msgstr "" + +#: templates/web/base/report/updates.html:49 +msgid "marked as closed" +msgstr "" + +#: templates/web/base/report/updates.html:28 +#: templates/web/base/report/updates.html:51 +msgid "marked as fixed" +msgstr "" + +#: templates/web/base/report/updates.html:45 +msgid "marked as in progress" +msgstr "" + +#: templates/web/base/report/updates.html:41 +msgid "marked as investigating" +msgstr "" + +#: templates/web/base/report/updates.html:55 +msgid "marked as not the council's responsibility" +msgstr "" + +#: templates/web/base/report/updates.html:43 +msgid "marked as planned" +msgstr "" + +#: templates/web/base/report/updates.html:53 +msgid "marked as unable to fix" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:130 +#: templates/web/base/admin/questionnaire.html:15 +#: templates/web/base/admin/questionnaire.html:16 +msgid "n/a" +msgstr "" + +#: templates/web/base/alert/_list.html:87 +#: templates/web/fixmystreet/alert/_list.html:85 +msgid "or" +msgstr "" + +#: templates/web/base/js/translation_strings.html:27 +msgid "or locate me automatically" +msgstr "" + +#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:30 +#: templates/web/zurich/admin/report_edit-sdm.html:27 +#: templates/web/zurich/admin/report_edit-sdm.html:29 +#: templates/web/zurich/admin/report_edit-sdm.html:36 +#: templates/web/zurich/admin/report_edit-sdm.html:38 +#: templates/web/zurich/admin/report_edit.html:27 +#: templates/web/zurich/admin/report_edit.html:29 +#: templates/web/zurich/admin/report_edit.html:38 +#: templates/web/zurich/admin/report_edit.html:40 +#: templates/web/zurich/admin/report_edit.html:50 +#: templates/web/zurich/admin/report_edit.html:52 +msgid "originally entered: “%s”" +msgstr "" + +#: templates/web/base/admin/report_edit.html:43 +msgid "other areas:" +msgstr "" + +#: templates/web/base/report/updates.html:29 +#: templates/web/base/report/updates.html:39 +msgid "reopened" +msgstr "" + +#: templates/web/fixmystreet/header.html:59 +#: templates/web/zurich/footer.html:12 +msgid "sign out" +msgstr "" + +#: templates/web/base/report/new/fill_in_details_form.html:12 +#: templates/web/base/report/new/fill_in_details_form.html:15 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 +msgid "the local council" +msgstr "" + +#: templates/web/base/report/_main.html:57 +#: 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:379 +msgid "this type of local problem" +msgstr "" + +#: perllib/Utils.pm:207 +msgid "today" +msgstr "" + +#: templates/web/base/admin/report_edit.html:32 +#: templates/web/zurich/admin/report_edit-sdm.html:40 +#: templates/web/zurich/admin/report_edit.html:54 +msgid "used map" +msgstr "" + +#: templates/web/base/admin/update_edit.html:35 +msgid "user is from same council as problem - %d" +msgstr "" + +#: templates/web/base/admin/update_edit.html:38 +msgid "user is problem owner" +msgstr "" + +#: templates/web/base/reports/body.html:0 +#: templates/web/base/reports/body.html:3 +msgid "ward" +msgstr "" + +#: templates/web/base/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:254 +#, perl-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templates/web/base/report/_support.html:6 +#, perl-format +msgid "%d supporter" +msgid_plural "%d supporters" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: perllib/Utils.pm:256 +#, perl-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templates/web/base/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:250 +#, perl-format +msgid "%d week" +msgid_plural "%d weeks" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templates/web/base/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/base/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:252 +#, perl-format +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: templates/web/base/report/new/councils_text_some.html:13 +#, 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] "" + +#~ msgid "For council(s):" +#~ msgstr "Savivaldybei(-ėms):" diff --git a/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po index ea4526ce7..61c8afd54 100644 --- a/locale/ms.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/ms.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: 2015-01-20 16:59+0000\n" -"PO-Revision-Date: 2014-11-19 18:31+0000\n" +"POT-Creation-Date: 2015-07-31 14:28+0100\n" +"PO-Revision-Date: 2015-07-10 13:32+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Malay (http://www.transifex.com/projects/p/fixmystreet/language/ms/)\n" "Language: ms\n" @@ -19,17 +19,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:618 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:386 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:392 msgid " and " msgstr " dan " -#: templates/web/base/report/new/councils_text_all.html:12 -#: templates/web/base/report/new/councils_text_all.html:19 -#: templates/web/base/report/new/councils_text_all.html:5 -#: templates/web/base/report/new/councils_text_none.html:19 -#: templates/web/base/report/new/councils_text_none.html:21 -#: templates/web/base/report/new/councils_text_some.html:20 +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_none.html:11 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " @@ -65,22 +63,26 @@ msgstr "%d kepada %d daripada %d" msgid "%s - Summary reports" msgstr "%s - Laporan Ringkasan" -#: perllib/FixMyStreet/DB/Result/Problem.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:672 msgid "%s ref: %s" msgstr "%s ruj; %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:265 perllib/FixMyStreet/Cobrand/UK.pm:277 +#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 msgid "%s ward, %s" msgstr "%s kawasan pentadbiran, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:554 +#: perllib/FixMyStreet/DB/Result/Problem.pm:559 msgid "%s, reported at %s" msgstr "%s, dilaporkan pada %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:304 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "%s, within %s ward" msgstr "%s, dalam kawasan pentadbiran %s" +#: perllib/FixMyStreet/Map/OSM.pm:42 +msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" +msgstr "" + #: templates/web/base/email_sent.html:29 msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" msgstr "(Jangan bimbang — kita akan mengantungkan alert akan sambil anda menyemak emel anda.)" @@ -94,7 +96,7 @@ msgid "(Don't worry — we'll hang on to your update while you're checking y msgstr "(Jangan bimbang — kita akan mengantungkan update akan sambil anda menyemak emel anda.)" #: templates/web/base/admin/report_blocks.html:11 -#: templates/web/base/admin/users.html:29 +#: templates/web/base/admin/users.html:31 msgid "(Email in abuse table)" msgstr "(Emel dalam jadual penyalahguna)" @@ -122,7 +124,7 @@ msgstr "(ditutup)" msgid "(fixed)" msgstr "(tetap)" -#: templates/web/base/index.html:9 +#: templates/web/base/index.html:8 templates/web/base/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)" @@ -132,8 +134,8 @@ msgstr "(seperti graffiti, fly tipping, paving slabs rosak, atau lampu jalan)" msgid "(not sent to council)" msgstr "(tidak dihantar kepada majlis)" -#: templates/web/base/report/new/fill_in_details_form.html:218 -#: templates/web/zurich/report/new/fill_in_details_form.html:94 +#: templates/web/base/report/new/fill_in_details_form.html:199 +#: templates/web/zurich/report/new/fill_in_details_form.html:77 msgid "(optional)" msgstr "(tidak diwajibkan)" @@ -146,7 +148,7 @@ msgstr "" msgid "(sent to both)" msgstr "(hantar kepada kedua-dua)" -#: templates/web/base/report/new/fill_in_details_form.html:212 +#: templates/web/base/report/new/fill_in_details_form.html:193 msgid "(we never show your email address or phone number)" msgstr "(kita tidak akan menunjukkan alamat emel atau nombor telefon anda)" @@ -154,14 +156,13 @@ msgstr "(kita tidak akan menunjukkan alamat emel atau nombor telefon anda)" 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:393 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Pilih kategori --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 -#: perllib/FixMyStreet/DB/Result/Problem.pm:399 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:630 +#: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Pilih jenis harta --" @@ -176,37 +177,7 @@ msgstr "" "Mungkin ini kenapa \"kawasan ditutupi\" adalah kosong (bawah).<br>\n" "Tambahkan <code>MAPIT_TYPES</code> ke dalam fail konfigurasi anda?" -#: templates/web/base/questionnaire/completed.html:20 -msgid "<p style=\"font-size:150%\">Thank you very much for filling in our questionnaire; glad to hear it’s been fixed.</p>" -msgstr "<p style=\"font-size:150%\">Terima kasih banyak-banyak kerana menyisikan soalan selidik kita; gembira ’s telah dibaiki.</p>" - -#: templates/web/fiksgatami/questionnaire/completed-open.html:1 -msgid "" -"<p style=\"font-size:150%\">We’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’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/base/questionnaire/completed-open.html:6 -msgid "" -"<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" -"suggestions: why not try writing to your local representatives or, if\n" -"it’s a problem that could be fixed by local people working together, why\n" -"not <a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n" -"</p>" -msgstr "" - -#: templates/web/base/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/base/around/_report_banner.html:4 +#: templates/web/base/around/_report_banner.html:3 #: templates/web/base/around/_report_banner.html:5 msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>" msgstr "" @@ -233,7 +204,7 @@ msgstr "<strong>Tidak</strong> benarkan aku log masuk dengan emel" 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/base/report/new/fill_in_details_form.html:163 +#: templates/web/base/report/new/fill_in_details_form.html:144 msgid "<strong>No</strong>, let me confirm my report by email:" msgstr "<strong>Tidak</strong>, benarkan aku mengesahkan laporanku dengan emel:" @@ -241,13 +212,8 @@ msgstr "<strong>Tidak</strong>, benarkan aku mengesahkan laporanku dengan emel:" msgid "<strong>No</strong>, let me confirm my update by email:" msgstr "<strong>Tidak</strong> Benarkan aku mengesahkan kemas kiniku dengan emel" -#: templates/web/base/tokens/confirm_problem.html:19 -#: templates/web/base/tokens/confirm_problem.html:20 -msgid "<strong>We will now send it to the council</strong>." -msgstr "" - #: templates/web/base/auth/general.html:37 -#: templates/web/base/report/new/fill_in_details_form.html:141 +#: templates/web/base/report/new/fill_in_details_form.html:122 #: templates/web/base/report/update-form.html:95 #: templates/web/fixmystreet/auth/general.html:37 #: templates/web/fixmystreet/auth/general.html:39 @@ -261,8 +227,8 @@ msgstr "<strong>Ya</strong> Aku ada kata laluan" msgid "About us" msgstr "Tentang kita" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:39 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:52 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:31 #: templates/web/fixmystreet/report/update-form.html:28 @@ -278,26 +244,26 @@ msgid "" " categories of problem) to each body." msgstr "" -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/body.html:56 msgid "Add a contact using the form below." msgstr "Tambahkan cara hubungan dengan borang dibawah" #: templates/web/base/admin/bodies.html:74 -#: templates/web/base/admin/body-form.html:233 +#: templates/web/base/admin/body-form.html:240 #: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "Tambah badan" -#: templates/web/base/admin/body.html:108 +#: templates/web/base/admin/body.html:116 #: templates/web/zurich/admin/body.html:31 msgid "Add new category" msgstr "Tambah kategori baru" -#: templates/web/base/admin/users.html:45 +#: templates/web/base/admin/users.html:47 msgid "Add user" msgstr "Tambah pengguna" -#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:70 +#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:52 msgid "Added %s" msgstr "%s telah ditambahi" @@ -324,9 +290,7 @@ msgstr "Maklumkan aku sebarang kemas kini masa depan" msgid "All Reports" msgstr "Semua Laporan" -#: templates/web/base/footer.html:11 templates/web/fiksgatami/footer.html:23 -#: templates/web/fiksgatami/nn/footer.html:23 -#: templates/web/fixmystreet/footer.html:26 +#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:26 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:19 @@ -343,19 +307,9 @@ msgstr "Semua laporan antara %s dan %s" msgid "All the information you provide here will be sent to" msgstr "Semua maklumat yang disediakan anda akan dihantar kepada" -#: templates/web/base/report/new/councils_text_all.html:12 -#: templates/web/base/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/base/report/new/councils_text_all.html:5 -#: templates/web/base/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/base/report/new/councils_text_all.html:19 -#: templates/web/base/report/new/councils_text_all.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:13 +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_all.html:4 +#: templates/web/base/report/new/fill_in_details_form.html:12 #: templates/web/base/report/new/fill_in_details_form.html:14 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 @@ -372,7 +326,7 @@ msgstr "Ada kemas kini menanda masalah ini sebagai diselesai." msgid "Anonymous" msgstr "Tanpa nama" -#: templates/web/base/admin/report_edit.html:62 +#: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:23 msgid "Anonymous:" msgstr "Tanpa Nama:" @@ -381,18 +335,18 @@ msgstr "Tanpa Nama:" msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?" msgstr "" -#: templates/web/fiksgatami/front/footer-marketing.html:14 #: templates/web/fixmystreet/front/footer-marketing.html:16 msgid "Are you a developer?" msgstr "Adakan anda developer?" #: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 msgid "Area covered" msgstr "Kawasan dilintungi" #: templates/web/base/admin/bodies.html:15 -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/body.html:60 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "" @@ -410,7 +364,7 @@ msgstr "Ditugaskan kepada badan luaran:" msgid "Assign to subdivision:" msgstr "Ditugaskan kepada bahagian bawah:" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:163 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:165 #: templates/web/zurich/report/updates.html:11 msgid "Assigned to %s" msgstr "Ditugaskan kepada %s" @@ -423,7 +377,7 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:348 +#: perllib/FixMyStreet/DB/Result/Problem.pm:373 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "Mengunggu penyederhanaan" @@ -436,8 +390,8 @@ msgstr "Balik" msgid "Ban email address" msgstr "Melarang alamat emel" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:297 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:301 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" msgstr "Badan" @@ -448,6 +402,7 @@ msgstr "Badan" msgid "Body" msgstr "Badan" +#: templates/web/base/admin/report_edit.html:34 #: templates/web/base/admin/user-form.html:32 msgid "Body:" msgstr "Badan:" @@ -460,16 +415,15 @@ msgstr "Dengan Tarikh" msgid "Can't see the map? <em>Skip this step</em>" msgstr "" -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:55 #: templates/web/base/report/new/category.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:53 +#: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 #: templates/web/zurich/admin/stats.html:50 -#: templates/web/zurich/report/new/fill_in_details_form.html:50 msgid "Category" msgstr "Kategori" @@ -477,17 +431,16 @@ msgstr "Kategori" msgid "Category fix rate for problems > 4 weeks old" msgstr "Kategori rata masalah diselesai > 4 minggu" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:138 #: templates/web/base/admin/category_edit.html:23 -#: templates/web/base/admin/report_edit.html:61 -#: templates/web/base/report/new/fill_in_details_form.html:68 +#: templates/web/base/admin/report_edit.html:74 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/report_edit-sdm.html:42 #: templates/web/zurich/admin/report_edit.html:140 msgid "Category:" msgstr "Kategori:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:377 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383 msgid "Category: %s" msgstr "Kategori: %s" @@ -498,19 +451,19 @@ msgstr "Kategori: %s" msgid "Change password" msgstr "Menukar Kata Laluan" -#: templates/web/base/admin/body.html:152 +#: templates/web/base/admin/body.html:160 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/base/admin/body.html:163 +#: templates/web/base/admin/body.html:171 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/base/admin/body.html:183 +#: templates/web/base/admin/body.html:191 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -521,7 +474,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:122 +#: templates/web/base/admin/body.html:130 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." @@ -537,16 +490,16 @@ msgstr "Klik sini atau masukkan sebagai dd/mm/yyyy" msgid "Click map to report a problem" msgstr "Klik peta untuk melaporkan masalah" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:45 -#: templates/web/base/admin/report_edit.html:47 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:58 +#: templates/web/base/admin/report_edit.html:60 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/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:95 #: templates/web/zurich/admin/report_edit.html:97 #: templates/web/zurich/admin/stats.html:31 @@ -554,11 +507,12 @@ msgstr "Klik peta untuk melaporkan masalah" msgid "Closed" msgstr "Ditutup" -#: perllib/FixMyStreet/DB/Result/Problem.pm:762 +#: perllib/FixMyStreet/DB/Result/Problem.pm:771 msgid "Closed by council" msgstr "Ditutup oleh majlis" -#: templates/web/base/my/my.html:40 templates/web/fixmystreet/my/my.html:46 +#: templates/web/base/my/my.html:40 +#: templates/web/fixmystreet/my/_problem-list.html:12 msgid "Closed reports" msgstr "Laporan ditutup" @@ -566,7 +520,7 @@ msgstr "Laporan ditutup" msgid "Closed:" msgstr "Ditutup:" -#: templates/web/base/around/tabbed_lists.html:11 +#: templates/web/base/around/tabbed_lists.html:10 #: templates/web/base/around/tabbed_lists.html:12 msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "" @@ -581,26 +535,26 @@ msgstr "Kordinat:" msgid "Cobrand" msgstr "Cobrand" -#: templates/web/base/admin/report_edit.html:75 +#: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:50 msgid "Cobrand data:" msgstr "Data Cobrand" -#: templates/web/base/admin/report_edit.html:74 +#: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:49 msgid "Cobrand:" msgstr "Cobrand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Konfigurasi" -#: templates/web/base/admin/category_edit.html:47 +#: templates/web/base/admin/category_edit.html:52 msgid "Configure Endpoint" msgstr "Mengkonfigurasi Endpoint" -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/body.html:72 msgid "Confirm" msgstr "Sah" @@ -621,10 +575,10 @@ msgstr "" msgid "Confirmation" msgstr "Pengesahan" -#: templates/web/base/admin/body.html:158 -#: templates/web/base/admin/body.html:71 -#: templates/web/base/admin/category_edit.html:32 -#: templates/web/base/admin/category_edit.html:84 +#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/category_edit.html:37 +#: templates/web/base/admin/category_edit.html:89 #: templates/web/zurich/admin/stats.html:40 msgid "Confirmed" msgstr "Disahkan" @@ -635,7 +589,7 @@ msgstr "Laporan disahkan antara %s dan %s" #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 -#: templates/web/base/admin/report_edit.html:70 +#: templates/web/base/admin/report_edit.html:83 msgid "Confirmed:" msgstr "Disahkan:" @@ -652,13 +606,12 @@ msgid "Contact Us" msgstr "Menghubungi Kita" #: templates/web/base/contact/index.html:6 -#: templates/web/base/contact/submit.html:3 #: templates/web/fixmystreet/contact/index.html:20 msgid "Contact the team" msgstr "Menghubungi pasukan" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1327 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1355 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1325 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1353 msgid "Could not find user" msgstr "Tidak dapat mencari pengguna" @@ -676,6 +629,10 @@ msgstr "Majlis" msgid "Council contacts for %s" msgstr "Hubungan Majlis untuk %s" +#: perllib/FixMyStreet/DB/Result/Problem.pm:670 +msgid "Council ref: %s" +msgstr "Rujukan majlis: %s" + #: templates/web/base/admin/stats.html:84 msgid "Council:" msgstr "Majlis:" @@ -691,7 +648,7 @@ msgstr "Kiraan" msgid "Create a report" msgstr "Laporan baru" -#: templates/web/base/admin/body.html:200 +#: templates/web/base/admin/body.html:208 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Kategori baru" @@ -703,7 +660,7 @@ msgid "Created" msgstr "Diwujudkan" #: templates/web/base/admin/list_updates.html:38 -#: templates/web/base/admin/report_edit.html:69 +#: templates/web/base/admin/report_edit.html:82 #: templates/web/base/admin/update_edit.html:51 #: templates/web/zurich/admin/report_edit-sdm.html:47 #: templates/web/zurich/admin/report_edit.html:61 @@ -720,7 +677,7 @@ msgstr "Keadaan semasa" msgid "Currently no bodies have been created." msgstr "Belum ada badan wujud pada masa kini." -#: templates/web/base/dashboard/index.html:6 +#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 msgid "Dashboard" msgstr "Papan pemuka" @@ -730,14 +687,14 @@ msgid "Dealt with by subdivision within 5 working days" msgstr "Diuruskan oleh bahagian bawah dalam 5 hari bekerja" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:169 -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:37 -#: templates/web/base/admin/category_edit.html:85 +#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:81 +#: templates/web/base/admin/category_edit.html:42 +#: templates/web/base/admin/category_edit.html:90 msgid "Deleted" msgstr "Dipadam" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:43 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -757,7 +714,7 @@ msgstr "Perincian" msgid "Details:" msgstr "Perincian:" -#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/body.html:87 msgid "Devolved" msgstr "Didelegasikan" @@ -785,8 +742,8 @@ msgstr "Tidak tahu" msgid "Don't like forms?" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:47 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:60 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:32 #: templates/web/fixmystreet/report/update-form.html:28 @@ -794,7 +751,7 @@ msgstr "" msgid "Duplicate" msgstr "Salinan" -#: templates/web/base/admin/body.html:98 +#: templates/web/base/admin/body.html:106 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" @@ -804,20 +761,20 @@ msgstr "" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 -#: templates/web/base/admin/users.html:31 +#: templates/web/base/admin/users.html:33 #: templates/web/zurich/admin/problem_row.html:42 msgid "Edit" msgstr "Menyunting" -#: templates/web/base/admin/body.html:212 +#: templates/web/base/admin/body.html:220 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "Edit perincian badah" #: templates/web/base/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:2 +#: 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:2 +#: templates/web/zurich/admin/report_edit.html:1 #: templates/web/zurich/admin/report_edit.html:5 msgid "Editing problem %d" msgstr "Sedang edit masalah %d" @@ -831,12 +788,12 @@ msgstr "Sedang mengemaskini %d" msgid "Editing user %d" msgstr "Sedang edit pengguna %d" -#: templates/web/base/admin/category_edit.html:86 +#: templates/web/base/admin/category_edit.html:91 msgid "Editor" msgstr "Editor" #: templates/web/base/admin/bodies.html:23 -#: templates/web/base/admin/category_edit.html:83 +#: templates/web/base/admin/category_edit.html:88 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 #: templates/web/fixmystreet/auth/general.html:21 @@ -847,15 +804,23 @@ msgstr "Editor" msgid "Email" msgstr "Emel" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1303 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1301 msgid "Email added to abuse list" msgstr "Emel ditambahkan kepada senarai penyalahguna" -#: templates/web/base/admin/body.html:147 +#: templates/web/base/admin/body.html:155 msgid "Email address:" msgstr "Alamat emel:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1300 +#: templates/web/base/tokens/confirm_alert.html:6 +msgid "Email alert created" +msgstr "" + +#: templates/web/base/tokens/confirm_alert.html:10 +msgid "Email alert deleted" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1298 msgid "Email already in abuse list" msgstr "Emel telah dalam senarai penyalahguna" @@ -867,8 +832,8 @@ msgstr "Emel aku masalah tempatan baru" msgid "Email me updates" msgstr "Emel aku kemas kini" -#: templates/web/base/admin/category_edit.html:26 -#: templates/web/base/admin/report_edit.html:67 +#: templates/web/base/admin/category_edit.html:31 +#: templates/web/base/admin/report_edit.html:80 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 @@ -879,32 +844,32 @@ msgstr "Emel aku kemas kini" msgid "Email:" msgstr "Emel:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:322 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 msgid "Email: %s" msgstr "Emel: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 msgid "Empty flat or maisonette" msgstr "Flat atau apartmen lama" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:631 msgid "Empty house or bungalow" msgstr "Rumah kosong atau banglo" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:622 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty office or other commercial" msgstr "Pejabat kosing atau komersial lain" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:623 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Empty pub or bar" msgstr "Pub kosong atau bar" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:624 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty public building - school, hospital, etc." msgstr "Bangunan awam kosong - sekolah, hospital, lain-lain" -#: templates/web/base/admin/body-form.html:158 -#: templates/web/base/admin/body-form.html:159 +#: templates/web/base/admin/body-form.html:162 +#: templates/web/base/admin/body-form.html:163 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" @@ -912,8 +877,8 @@ msgid "" " <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>." msgstr "" -#: templates/web/base/admin/body-form.html:215 -#: templates/web/base/admin/body-form.html:216 +#: templates/web/base/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:223 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" @@ -924,11 +889,11 @@ msgstr "" msgid "End Date:" msgstr "Tarikh Akhir:" -#: templates/web/base/admin/body-form.html:126 +#: templates/web/base/admin/body-form.html:130 msgid "Endpoint" msgstr "Endpoint" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:72 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:73 msgid "Enter a Zürich street name" msgstr "Masukkan nama jalan Zürich" @@ -941,7 +906,9 @@ msgstr "Masukkan poskod UK terdekat, atau nama jalan dan kawasan" msgid "Enter a nearby postcode, or street name and area" msgstr "Masukkan poskod terdekat, atau nama jalan dan kawasan" +#: templates/web/base/around/postcode_form.html:1 #: templates/web/base/around/postcode_form.html:2 +#: templates/web/fixmystreet/around/postcode_form.html:10 #: templates/web/fixmystreet/around/postcode_form.html:11 msgid "Enter a nearby street name and area" msgstr "Masukkan nama jalan dan kawasan terdekat" @@ -951,7 +918,7 @@ msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "" #: templates/web/base/auth/general.html:64 -#: templates/web/base/report/new/fill_in_details_form.html:170 +#: templates/web/base/report/new/fill_in_details_form.html:151 #: templates/web/base/report/update-form.html:124 msgid "Enter a new password:" msgstr "Masukkan kata laluan baru" @@ -963,7 +930,7 @@ msgstr "Masukkan kata laluan baru" msgid "Enter a password" msgstr "Masukkan kata laluan" -#: templates/web/base/index-steps.html:33 +#: templates/web/base/index-steps.html:26 msgid "Enter details of the problem" msgstr "Masukkan perincian masalah tersebut" @@ -986,17 +953,22 @@ msgstr "Contoh poskod %s" msgid "Examples:" msgstr "Contoh:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:47 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" -#: templates/web/base/admin/report_edit.html:76 +#: templates/web/base/admin/body-form.html:81 +msgid "External URL" +msgstr "" + +#: templates/web/base/admin/category_edit.html:27 +#: templates/web/base/admin/report_edit.html:92 msgid "Extra data:" msgstr "Data tambahan:" -#: templates/web/base/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/base/contact/submit.html:13 +msgid "Failed to send message" +msgstr "" #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 @@ -1008,7 +980,7 @@ msgstr "Tapis senarai laporan" msgid "First time" msgstr "Pertama kali" -#: templates/web/base/admin/body.html:40 +#: templates/web/base/admin/body.html:48 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" @@ -1039,9 +1011,9 @@ msgid "" msgstr "" #: templates/web/base/admin/index.html:55 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:41 -#: templates/web/base/admin/report_edit.html:42 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:54 +#: templates/web/base/admin/report_edit.html:55 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/update-form.html:30 @@ -1052,17 +1024,18 @@ msgstr "" msgid "Fixed" msgstr "Diselesai" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:43 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:56 msgid "Fixed - Council" msgstr "Diselesai - Majlis" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:42 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:55 msgid "Fixed - User" msgstr "Diselesai - Pengguna" -#: templates/web/base/my/my.html:35 templates/web/fixmystreet/my/my.html:41 +#: templates/web/base/my/my.html:35 +#: templates/web/fixmystreet/my/_problem-list.html:7 msgid "Fixed reports" msgstr "Laporan selesai" @@ -1070,7 +1043,7 @@ msgstr "Laporan selesai" msgid "Fixed:" msgstr "Selesai:" -#: templates/web/base/admin/body-form.html:84 +#: templates/web/base/admin/body-form.html:89 #: templates/web/zurich/admin/body-form.html:36 msgid "Flag as deleted" msgstr "Tanda sebagai dipadam" @@ -1079,7 +1052,7 @@ msgstr "Tanda sebagai dipadam" msgid "Flag user" msgstr "Tanda pengguna" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Ditanda" @@ -1088,7 +1061,7 @@ msgstr "Ditanda" msgid "Flagged reports and users" msgstr "Laporan dan pengguna ditanda" -#: templates/web/base/admin/user-form.html:45 +#: templates/web/base/admin/user-form.html:46 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page." msgstr "" @@ -1096,8 +1069,8 @@ msgstr "" msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." msgstr "" -#: templates/web/base/admin/report_edit.html:78 -#: templates/web/base/admin/user-form.html:51 +#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/user-form.html:52 msgid "Flagged:" msgstr "Ditanda:" @@ -1106,10 +1079,6 @@ msgstr "Ditanda:" 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/base/admin/report_edit.html:30 -msgid "For council(s):" -msgstr "Untuk majlis:" - #: templates/web/base/admin/body-form.html:65 msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "Untuk maklumat lanjut, lihat <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Bagaimana FixMyStreet mengguna Mapit</a>." @@ -1122,8 +1091,6 @@ msgstr "Terlupai kata laluan anda?" #: templates/web/base/faq/faq-en-gb.html:1 #: templates/web/base/static/privacy.html:1 #: templates/web/base/static/privacy.html:2 -#: templates/web/fiksgatami/faq/faq-nb.html:1 -#: templates/web/fiksgatami/nn/faq/faq-nn.html:1 msgid "Frequently Asked Questions" msgstr "Soalan lazim" @@ -1136,13 +1103,13 @@ msgstr "GeoRSS atas Google Maps" msgid "Get updates" msgstr "Dapatkan kemas kini" -#: templates/web/fixmystreet/reports/_rss.html:4 +#: templates/web/fixmystreet/reports/_rss.html:3 #: 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 +#: templates/web/fixmystreet/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "Dapatkan kemas kini masalah di %" @@ -1151,6 +1118,10 @@ msgstr "Dapatkan kemas kini masalah di %" msgid "Give me an RSS feed" msgstr "Berikan aku RSS feed" +#: templates/web/base/questionnaire/completed.html:14 +msgid "Glad to hear it’s been fixed!" +msgstr "" + #: templates/web/base/alert/index.html:34 #: templates/web/base/around/postcode_form.html:8 #: templates/web/fixmystreet/around/postcode_form.html:21 @@ -1158,7 +1129,7 @@ msgstr "Berikan aku RSS feed" msgid "Go" msgstr "Pergi" -#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:93 msgid "Going to send questionnaire?" msgstr "Teruskan dengan menghantar soalan selidik?" @@ -1180,9 +1151,7 @@ msgstr "Adakan masalah ini telah diselesai?" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "Adakan anda pernah melaporkan masalah kepada majlis, atau inikah pertama kali anda?" -#: templates/web/base/footer.html:15 templates/web/fiksgatami/footer.html:27 -#: templates/web/fiksgatami/nn/footer.html:27 -#: templates/web/fixmystreet/footer.html:30 +#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:30 #: templates/web/zurich/faq/faq-de-ch.html:1 #: templates/web/zurich/footer.html:21 #: templates/web/zurich/nav_over_content.html:8 @@ -1194,18 +1163,17 @@ msgstr "Bantuan" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "" -#: templates/web/fiksgatami/header.html:48 -#: templates/web/fixmystreet/header.html:52 +#: templates/web/fixmystreet/header.html:58 #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "Hi %s" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:50 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:63 +#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/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:86 #: templates/web/zurich/admin/report_edit.html:90 #: templates/web/zurich/admin/stats.html:32 @@ -1221,7 +1189,7 @@ msgstr "Sembunyikan lama" msgid "Hide pins" msgstr "Sembunyikan pin" -#: templates/web/base/admin/category_edit.html:79 +#: templates/web/base/admin/category_edit.html:84 msgid "History" msgstr "Sejarah" @@ -1237,19 +1205,25 @@ msgstr "Bagaimana melaporkan masalah" msgid "How to send successful reports" msgstr "Bagaimana untuk menghantar laporan berjaya" -#: perllib/FixMyStreet/App/Controller/Admin.pm:742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:740 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" +#: templates/web/base/tokens/confirm_problem.html:23 +#: templates/web/base/tokens/confirm_problem.html:27 +msgid "I just reported a problem on @fixmystreet" +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." +#: templates/web/base/tokens/confirm_update.html:19 +#: templates/web/base/tokens/confirm_update.html:23 +msgid "I just updated a problem on @fixmystreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:260 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +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:327 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 "" @@ -1271,7 +1245,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:125 +#: templates/web/base/admin/body.html:133 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." @@ -1289,7 +1263,12 @@ msgstr "Jika anda tidak, masalah anda tidak akan dipaparkan." msgid "If you do not, your update will not be posted." msgstr "Jika anda tidak, kemas kini anda tidak akan dipaparkan." -#: templates/web/base/report/new/councils_text_none.html:9 +#: templates/web/base/questionnaire/completed.html:8 +msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." +msgstr "" + +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:8 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 "" @@ -1305,34 +1284,34 @@ msgid "" "your experience of getting the problem fixed?" msgstr "" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/body.html:149 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/base/admin/body-form.html:200 -#: templates/web/base/admin/body-form.html:201 +#: templates/web/base/admin/body-form.html:207 +#: templates/web/base/admin/body-form.html:208 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable <strong>extended Open311 stauses</strong> if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/body-form.html:187 -#: templates/web/base/admin/body-form.html:188 +#: templates/web/base/admin/body-form.html:194 +#: templates/web/base/admin/body-form.html:195 msgid "" "If you've enabled Open311 update-sending above, enable <strong>suppression of alerts</strong> \n" " if you do <strong>not</strong> want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/body-form.html:173 -#: templates/web/base/admin/body-form.html:174 +#: templates/web/base/admin/body-form.html:177 +#: templates/web/base/admin/body-form.html:178 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:127 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 msgid "Illegal ID" msgstr "ID tak sah" @@ -1357,17 +1336,21 @@ msgstr "Dalam table penyalahguna?" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:38 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:144 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 #: templates/web/fixmystreet/report/banner.html:19 -#: templates/web/zurich/admin/header.html:2 +#: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 #: templates/web/zurich/admin/report_edit.html:99 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "Dijalani" +#: templates/web/base/tokens/confirm_alert.html:11 +msgid "Inbox zero, here we come!" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:160 msgid "Include reporter personal details" msgstr "Termasuk perincian peribadi pelapor" @@ -1376,7 +1359,7 @@ msgstr "Termasuk perincian peribadi pelapor" msgid "Include unconfirmed reports" msgstr "Termasuk laporan yang belum disahkan" -#: perllib/FixMyStreet/App/Controller/Open311.pm:354 +#: perllib/FixMyStreet/App/Controller/Open311.pm:359 msgid "Incorrect has_photo value \"%s\"" msgstr "Nilai has_photo \"%s\" salah" @@ -1384,29 +1367,29 @@ msgstr "Nilai has_photo \"%s\" salah" msgid "Internal notes" msgstr "Nota dalaman" -#: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:61 msgid "Internal referral" msgstr "Rujukan dalaman" -#: perllib/FixMyStreet/App/Controller/Open311.pm:339 +#: perllib/FixMyStreet/App/Controller/Open311.pm:344 msgid "Invalid agency_responsible value %s" msgstr "Nilai agency_responsible %s salah" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1114 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1112 msgid "Invalid end date" msgstr "Tarikh berakhir yang tak sah" -#: perllib/FixMyStreet/App/Controller/Open311.pm:432 +#: perllib/FixMyStreet/App/Controller/Open311.pm:437 msgid "Invalid format %s specified." msgstr "Format dinyatakan %s salah" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1110 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 msgid "Invalid start date" msgstr "Tarikh mula yang tak sah" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:37 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:50 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 #: templates/web/base/report/update-form.html:30 @@ -1420,8 +1403,12 @@ msgstr "Dalam siasatan" msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "" +#: templates/web/base/tokens/confirm_problem.html:14 +msgid "It’s on its way to the council right now." +msgstr "" + #: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:150 +#: templates/web/base/report/new/fill_in_details_form.html:131 #: templates/web/base/report/update-form.html:104 #: templates/web/fixmystreet/auth/general.html:47 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 @@ -1430,12 +1417,12 @@ msgstr "" msgid "Keep me signed in on this computer" msgstr "Teruskan log masuk aku dalam komputer ini" -#: templates/web/base/admin/body.html:62 +#: templates/web/base/admin/body.html:70 #: templates/web/zurich/admin/body.html:16 msgid "Last editor" msgstr "Editor terakhir" -#: templates/web/base/admin/report_edit.html:72 +#: templates/web/base/admin/report_edit.html:88 msgid "Last update:" msgstr "Kemas kini terakhir:" @@ -1443,43 +1430,38 @@ msgstr "Kemas kini terakhir:" msgid "Last update:" msgstr "Kemas kini terakhir:" -#: templates/web/base/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:229 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "" -#: templates/web/base/admin/body.html:17 templates/web/base/admin/body.html:19 +#: templates/web/base/admin/body.html:27 msgid "List all reported problems" msgstr "Senaraikan semua laporan masalah" -#: templates/web/base/report/new/fill_in_details_form.html:69 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:54 -#: templates/web/zurich/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/category_wrapper.html:4 msgid "Loading..." msgstr "Loading..." #: templates/web/base/alert/choose.html:1 #: templates/web/base/alert/choose.html:3 #: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3 -#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:5 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5 #: templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 -#: templates/web/base/tokens/confirm_alert.html:4 #: templates/web/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "RSS feed tempatan dan pemberitahuan emel" -#: templates/web/base/alert/list.html:13 templates/web/base/alert/list.html:14 -#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:3 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:12 +#: templates/web/base/alert/list.html:14 templates/web/base/alert/list.html:3 msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "RSS feed tempatan dan pemberitahuan emel untuk '%s'" -#: templates/web/base/footer.html:13 templates/web/fiksgatami/footer.html:25 -#: templates/web/fiksgatami/nn/footer.html:25 -#: templates/web/fixmystreet/footer.html:28 +#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:28 msgid "Local alerts" msgstr "Pemberitahuan tempatan" -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:25 msgid "Locate the problem on a map of the area" msgstr "Mengesan masalah dalam kawasan atas peta" @@ -1488,17 +1470,27 @@ msgid "MAP" msgstr "PETA" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" msgstr "" -#: perllib/FixMyStreet/Map/OSM.pm:42 -msgid "Map © <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/base/admin/report_edit.html:86 +#, fuzzy +msgid "Mark as sent" +msgstr "ditanda sebagai ditutupi" -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/user-form.html:44 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." msgstr "" +#: templates/web/base/reports/index.html:24 +msgid "Marked fixed/closed in the past eight weeks" +msgstr "" + +#: templates/web/base/reports/index.html:25 +msgid "Marked fixed/closed more than eight weeks ago" +msgstr "" + #: templates/web/fixmystreet/contact/index.html:106 msgid "Message" msgstr "Pesanan" @@ -1507,7 +1499,7 @@ msgstr "Pesanan" msgid "Message:" msgstr "Pesanan:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:440 +#: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" msgstr "Kehilangan jurisdiction_id" @@ -1537,11 +1529,11 @@ msgstr "Lebih masalah terdekat" #: templates/web/fixmystreet/report/update-form.html:138 #: 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:94 +#: templates/web/zurich/report/new/fill_in_details_form.html:77 msgid "Name" msgstr "Nama" -#: templates/web/base/admin/report_edit.html:66 +#: templates/web/base/admin/report_edit.html:79 #: templates/web/base/admin/update_edit.html:32 #: templates/web/base/admin/user-form.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:43 @@ -1550,25 +1542,25 @@ msgstr "Nama" msgid "Name:" msgstr "Nama:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:321 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:313 msgid "Name: %s" msgstr "Nama: %s" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:186 -#: perllib/FixMyStreet/Geocode/OSM.pm:164 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 +#: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:137 +#: perllib/FixMyStreet/Cobrand/UK.pm:127 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 +#: perllib/FixMyStreet/Cobrand/Default.pm:442 +#: perllib/FixMyStreet/Cobrand/Default.pm:482 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:277 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1582,11 +1574,11 @@ msgstr "Hampir Dilakukan! Sila periksa emel anda sekarang..." msgid "New <br>problems" msgstr "Masalah<br>baru" -#: perllib/FixMyStreet/App/Controller/Admin.pm:264 +#: perllib/FixMyStreet/App/Controller/Admin.pm:261 msgid "New body added" msgstr "Badan baru ditambahi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:379 msgid "New category contact added" msgstr "Kategori hubungan baru ditambahi" @@ -1659,15 +1651,15 @@ msgstr "Kemas kini baru:" msgid "Next" msgstr "Seterusnya" -#: templates/web/base/admin/body.html:72 templates/web/base/admin/body.html:74 -#: templates/web/base/admin/body.html:78 templates/web/base/admin/body.html:80 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:93 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:44 @@ -1685,7 +1677,7 @@ msgstr "Tiada badan" msgid "No council" msgstr "Tiada majlis" -#: perllib/FixMyStreet/DB/Result/Problem.pm:376 +#: perllib/FixMyStreet/DB/Result/Problem.pm:401 msgid "No council selected" msgstr "Tiada majlis dipilihi" @@ -1726,12 +1718,12 @@ msgid "" " your config file is not pointing to a live MapIt service." msgstr "" -#: templates/web/base/report/_support.html:3 +#: templates/web/base/report/_support.html:2 #: templates/web/base/report/_support.html:4 msgid "No supporters" msgstr "Tiada penyokong" -#: templates/web/base/admin/report_edit.html:30 +#: templates/web/base/admin/report_edit.html:41 #: templates/web/zurich/admin/report_edit-sdm.html:46 #: templates/web/zurich/admin/report_edit.html:60 msgid "None" @@ -1746,8 +1738,8 @@ msgid "" " activity across their body), the ability to hide reports or set special report statuses." msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:46 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -1763,12 +1755,12 @@ msgstr "Bukan untuk bahagian bawah aku" msgid "Not reported before" msgstr "Belum dilaporkan" -#: templates/web/base/report/_main.html:61 +#: templates/web/base/report/_main.html:62 msgid "Not reported to council" msgstr "Tidak dilaporkan kepada majlis" -#: templates/web/base/admin/body.html:63 -#: templates/web/base/admin/category_edit.html:87 +#: templates/web/base/admin/body.html:71 +#: templates/web/base/admin/category_edit.html:92 #: templates/web/zurich/admin/body.html:17 msgid "Note" msgstr "Nota" @@ -1777,8 +1769,8 @@ msgstr "Nota" 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/base/admin/body.html:178 -#: templates/web/base/admin/category_edit.html:44 +#: templates/web/base/admin/body.html:186 +#: templates/web/base/admin/category_edit.html:49 #: templates/web/zurich/admin/body.html:53 msgid "Note:" msgstr "ta:" @@ -1791,7 +1783,7 @@ msgstr "Nota: <strong>%s</strong>" msgid "Now to submit your report…" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:132 +#: templates/web/base/report/new/fill_in_details_form.html:113 msgid "Now to submit your report… do you have a FixMyStreet password?" msgstr "" @@ -1808,7 +1800,7 @@ msgid "OK" msgstr "OK" #: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:16 +#: templates/web/base/report/update.html:17 msgid "Offensive? Unsuitable? Tell us" msgstr "Serangan? Tidak sesuai? Beritahu kami" @@ -1830,19 +1822,19 @@ msgstr "Lebih tua<br>diselesai" msgid "Older <br>problems" msgstr "Lebih tua <br>masalah" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:37 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 msgid "One-line summary" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:137 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:36 -#: templates/web/base/admin/report_edit.html:37 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:138 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:49 +#: templates/web/base/admin/report_edit.html:50 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/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:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/report_edit.html:86 #: templates/web/zurich/admin/report_edit.html:88 @@ -1851,10 +1843,19 @@ msgstr "" msgid "Open" msgstr "Terbuka" -#: templates/web/base/my/my.html:30 templates/web/fixmystreet/my/my.html:36 +#: templates/web/base/reports/index.html:22 +msgid "Open for more than four weeks, with an update within the past eight weeks" +msgstr "" + +#: templates/web/base/my/my.html:30 +#: templates/web/fixmystreet/my/_problem-list.html:2 msgid "Open reports" msgstr "Laporan terbuka" +#: templates/web/base/reports/index.html:23 +msgid "Open, but not had any update in eight weeks" +msgstr "" + #: templates/web/base/open311/index.html:70 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "API Open311 untuk pelayan FixMyStreet mySociety" @@ -1877,15 +1878,15 @@ msgstr "Atau masalah dilaporkan kepada:" msgid "Or you can subscribe to an alert based upon what ward or council you’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:560 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 -#: perllib/FixMyStreet/DB/Result/Problem.pm:592 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:372 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 +#: perllib/FixMyStreet/DB/Result/Problem.pm:597 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:393 msgid "Other" msgstr "Lain-lain" @@ -1907,8 +1908,8 @@ msgstr "Laman Tidak Dijumpai" msgid "Parent" msgstr "Induk" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 msgid "Partial" msgstr "Separa" @@ -1928,7 +1929,7 @@ msgstr "Kata Laluan:" msgid "Permalink" msgstr "Permalink" -#: templates/web/zurich/report/new/fill_in_details_form.html:100 +#: templates/web/zurich/report/new/fill_in_details_form.html:83 msgid "Phone number" msgstr "Nombor telefon" @@ -1937,27 +1938,27 @@ msgstr "Nombor telefon" msgid "Phone number (optional)" msgstr "Nombor telefon (tidak diwajibkan)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:286 -#: templates/web/base/admin/report_edit.html:68 -#: templates/web/base/report/new/fill_in_details_form.html:216 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:291 +#: templates/web/base/admin/report_edit.html:81 +#: templates/web/base/report/new/fill_in_details_form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:46 #: templates/web/zurich/admin/report_edit.html:60 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Telefon:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:72 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 #: 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 +#: templates/web/zurich/report/new/fill_in_details_form.html:51 msgid "Photo" msgstr "Foto" #: templates/web/base/questionnaire/index.html:71 -#: templates/web/base/report/new/fill_in_details_form.html:103 +#: templates/web/base/report/new/fill_in_details_form.html:84 #: templates/web/base/report/update-form.html:62 #: templates/web/fixmystreet/questionnaire/index.html:91 msgid "Photo:" @@ -1971,11 +1972,11 @@ msgstr "Foto laporan terdekat baru-baru ini " msgid "Place pin on map" msgstr "Letakkan pin atas peta" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:38 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/zurich/admin/header.html:2 +#: 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:86 @@ -2009,20 +2010,19 @@ msgstr "Sila periksa emel anda" msgid "Please check your email address is correct" msgstr "Sila periksa sama ada alamat emel anda adalah betul" -#: perllib/FixMyStreet/App/Controller/Admin.pm:349 -#: 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:395 +#: perllib/FixMyStreet/App/Controller/Admin.pm:343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:876 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 +#: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" msgstr "Sila pilihkan kategori" -#: perllib/FixMyStreet/DB/Result/Problem.pm:401 +#: perllib/FixMyStreet/DB/Result/Problem.pm:418 msgid "Please choose a property type" msgstr "Sila pilihkan jenis bangunan" -#: perllib/FixMyStreet/App/Controller/Admin.pm:376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:370 msgid "Please correct the errors below" msgstr "" @@ -2038,8 +2038,8 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:352 -#: perllib/FixMyStreet/DB/Result/Comment.pm:133 +#: perllib/FixMyStreet/App/Controller/Admin.pm:346 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "Sila masukkan pesanan" @@ -2050,15 +2050,15 @@ msgstr "Sila masukkan pesanan" msgid "Please enter a password" msgstr "Sila masukkan kata laluan" -#: perllib/FixMyStreet/App/Controller/Contact.pm:108 -#: perllib/FixMyStreet/DB/Result/Problem.pm:370 +#: perllib/FixMyStreet/App/Controller/Contact.pm:113 +#: perllib/FixMyStreet/DB/Result/Problem.pm:395 #: templates/web/base/js/translation_strings.html:3 msgid "Please enter a subject" msgstr "Sila masukkan tajuk" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1050 -#: perllib/FixMyStreet/App/Controller/Admin.pm:351 -#: perllib/FixMyStreet/App/Controller/Admin.pm:997 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin.pm:995 #: perllib/FixMyStreet/DB/Result/User.pm:127 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 @@ -2066,16 +2066,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:118 +#: perllib/FixMyStreet/App/Controller/Contact.pm:123 msgid "Please enter a valid email address" msgstr "Sila masukkan alamat emel yang benah" -#: perllib/FixMyStreet/DB/Result/Problem.pm:373 +#: perllib/FixMyStreet/DB/Result/Problem.pm:398 #: templates/web/base/js/translation_strings.html:4 msgid "Please enter some details" msgstr "Sila masukkan perincian" -#: perllib/FixMyStreet/App/Controller/Contact.pm:107 +#: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/User.pm:124 #: templates/web/base/auth/general.html:13 #: templates/web/base/auth/general.html:8 @@ -2089,7 +2089,7 @@ msgid "Please enter your email" msgstr "Sila masukkan emel anda" #: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:75 msgid "Please enter your email address" msgstr "Sila masukkan alamat emel anda" @@ -2097,14 +2097,14 @@ msgstr "Sila masukkan alamat emel anda" msgid "Please enter your first name" msgstr "Sila masukkan nama pertama anda" -#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: perllib/FixMyStreet/Cobrand/UK.pm:318 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Sila masukkan nama penuh anda, majlis memerlukan maklumat ini - Jika anda tidak ingin nama anda dikemukakan dalam laman, untik kota dibawah" -#: perllib/FixMyStreet/App/Controller/Contact.pm:106 -#: perllib/FixMyStreet/DB/Result/Comment.pm:130 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Contact.pm:111 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 +#: perllib/FixMyStreet/DB/Result/Problem.pm:406 #: perllib/FixMyStreet/DB/Result/User.pm:120 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" @@ -2127,7 +2127,7 @@ msgstr "Sila masukkan tajuk anda" 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/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:8 msgid "Please fill in details of the problem below." msgstr "" @@ -2142,7 +2142,7 @@ msgstr "Sila isikan perincian untuk masalah tersebut" msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:251 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" @@ -2165,16 +2165,16 @@ msgstr "" msgid "Please note:" msgstr "Sila nota:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:246 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:254 msgid "Please provide some explanation as to why you're reopening this report" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:261 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 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:247 msgid "Please say whether you've ever reported a problem to your council before" msgstr "" @@ -2186,7 +2186,7 @@ msgstr "" msgid "Please select the type of alert you want" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please state whether or not the problem has been fixed" msgstr "" @@ -2194,15 +2194,13 @@ msgstr "" msgid "Please take a look at the updates that have been left." msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:176 +#: perllib/FixMyStreet/App/Controller/Photo.pm:177 +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 +#: perllib/FixMyStreet/App/Controller/Photo.pm:189 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:109 +#: perllib/FixMyStreet/App/Controller/Contact.pm:114 msgid "Please write a message" msgstr "Sila tuliskan pesanan" @@ -2241,14 +2239,14 @@ msgstr "Sebelumnya" msgid "Privacy" msgstr "" -#: templates/web/base/admin/body.html:194 -#: templates/web/base/admin/body.html:77 -#: templates/web/base/admin/category_edit.html:40 -#: templates/web/base/admin/report_edit.html:79 +#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:85 +#: templates/web/base/admin/category_edit.html:45 +#: templates/web/base/admin/report_edit.html:95 msgid "Private" msgstr "Peribadi" -#: templates/web/base/maps/openlayers.html:86 +#: templates/web/base/maps/openlayers.html:89 msgid "Problem" msgstr "Masalah" @@ -2269,7 +2267,7 @@ msgstr "Masalah %s dihantar kepada majlis %s" msgid "Problem breakdown by state" msgstr "Pecahan masalah bagi negeri" -#: perllib/FixMyStreet/App/Controller/Admin.pm:968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:966 msgid "Problem marked as open." msgstr "Masalah ditanda sebagai terbukan" @@ -2304,16 +2302,15 @@ msgstr "Masalah yang dilaporkan diselesai pada FixMyStreet baru-baru ini" msgid "Problems within %.1fkm of this location" msgstr "Masalah dalam %.1fkm dalam lokasi ini" -#: perllib/FixMyStreet/Cobrand/Default.pm:629 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:114 +#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:151 -#: perllib/FixMyStreet/Cobrand/UK.pm:217 +#: perllib/FixMyStreet/Cobrand/UK.pm:207 msgid "Problems within %s" msgstr "Masalah dalam %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:122 -#: perllib/FixMyStreet/Cobrand/UK.pm:231 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "Problems within %s ward" msgstr "Masalah dalam kawasan pentadbiran %s" @@ -2331,7 +2328,7 @@ msgstr "Masalah dalam sempadan" 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/base/admin/report_edit.html:32 +#: templates/web/base/admin/report_edit.html:45 msgid "Property address:" msgstr "Alamat bangunan" @@ -2348,7 +2345,7 @@ msgstr "Sediakan kemas kini" 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/base/report/new/fill_in_details_form.html:174 +#: templates/web/base/report/new/fill_in_details_form.html:155 #: templates/web/base/report/update-form.html:128 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 #: templates/web/fixmystreet/report/update-form.html:119 @@ -2369,7 +2366,7 @@ msgstr "Terbitkan foto" msgid "Publish the response" msgstr "Terbitkan tindak balas" -#: templates/web/base/questionnaire/completed.html:2 +#: templates/web/base/questionnaire/completed.html:1 #: templates/web/base/questionnaire/index.html:0 #: templates/web/base/questionnaire/index.html:14 #: templates/web/base/questionnaire/index.html:4 @@ -2388,11 +2385,12 @@ msgstr "Soalan selidik %d dijawab untuk masalah %s, %s kepada %s" msgid "Questionnaire %d sent for problem %d" msgstr "Soalan selidik %d dihantar untuk masalah %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 msgid "Questionnaire filled in by problem reporter" msgstr "Soalan selidik diisikan oleh pelapor masalah" #: templates/web/base/alert/_list.html:21 +#: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display.html:50 #: templates/web/base/reports/_rss.html:1 @@ -2402,11 +2400,11 @@ msgstr "Soalan selidik diisikan oleh pelapor masalah" msgid "RSS feed" msgstr "Feed RSS" -#: perllib/FixMyStreet/Cobrand/UK.pm:260 perllib/FixMyStreet/Cobrand/UK.pm:272 +#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 msgid "RSS feed for %s" msgstr "Feed RSS untuk %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "RSS feed for %s ward, %s" msgstr "Feed RSS untuk kawasan pentadbiran %s, %s" @@ -2414,15 +2412,11 @@ msgstr "Feed RSS untuk kawasan pentadbiran %s, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:167 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:175 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:185 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:193 -#: perllib/FixMyStreet/Cobrand/UK.pm:286 perllib/FixMyStreet/Cobrand/UK.pm:298 +#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 msgid "RSS feed of %s" msgstr "Feed RSS untuk %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 msgid "RSS feed of %s, within %s ward" msgstr "Feed RSS untuk %s, dalam kawasan pentadbiran %s" @@ -2435,20 +2429,19 @@ msgstr "Feed RSS untuk masalah berdekatan" 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:115 +#: perllib/FixMyStreet/Cobrand/Default.pm:651 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:150 -#: perllib/FixMyStreet/Cobrand/UK.pm:224 +#: perllib/FixMyStreet/Cobrand/UK.pm:214 msgid "RSS feed of problems within %s" msgstr "Feed RSS untuk masalah dalam %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 -#: perllib/FixMyStreet/Cobrand/UK.pm:230 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s ward" msgstr "Feed RSS untuk masalah dalam kawasan pentadbiran %s" -#: templates/web/base/around/display_location.html:3 +#: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:4 msgid "RSS feed of recent local problems" msgstr "Feed RSS untuk masalah tempatan baru-baru ini" @@ -2488,15 +2481,18 @@ msgstr "" msgid "Remove flag" msgstr "" -#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/report_edit.html:110 #: templates/web/base/admin/update_edit.html:62 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "" -#: templates/web/base/footer.html:7 templates/web/fiksgatami/footer.html:19 -#: templates/web/fiksgatami/nn/footer.html:19 -#: templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 +msgid "Report" +msgstr "" + +#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 #: templates/web/zurich/footer.html:17 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2506,11 +2502,6 @@ msgstr "" msgid "Report abuse" msgstr "" -#: templates/web/base/report_created.html:1 -#: templates/web/base/report_created.html:3 -msgid "Report created" -msgstr "" - #: perllib/FixMyStreet/App/Controller/Rss.pm:295 msgid "Report on %s" msgstr "" @@ -2534,7 +2525,7 @@ msgstr "" msgid "Reported %s, to %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:580 #: templates/web/base/contact/index.html:50 #: templates/web/fixmystreet/contact/index.html:65 msgid "Reported anonymously at %s" @@ -2546,7 +2537,7 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:598 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 #: templates/web/base/contact/index.html:52 #: templates/web/fixmystreet/contact/index.html:67 msgid "Reported by %s at %s" @@ -2556,31 +2547,35 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:571 +#: perllib/FixMyStreet/DB/Result/Problem.pm:576 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:598 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:567 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:589 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:563 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:583 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 msgid "Reported via %s in the %s category by %s at %s" msgstr "" -#: templates/web/base/around/around_index.html:2 +#: templates/web/base/reports/index.html:21 +msgid "Reported within the last four weeks" +msgstr "" + +#: templates/web/base/around/around_index.html:1 #: templates/web/base/around/around_index.html:3 #: templates/web/base/js/translation_strings.html:41 #: templates/web/base/report/new/fill_in_details.html:0 @@ -2590,14 +2585,13 @@ msgstr "" msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:294 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:409 -#: perllib/FixMyStreet/DB/Result/Problem.pm:413 +#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" @@ -2613,7 +2607,7 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:85 msgid "Resend report" msgstr "" @@ -2621,36 +2615,35 @@ msgstr "" msgid "Right place?" msgstr "" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:193 -#: perllib/FixMyStreet/Geocode/OSM.pm:171 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:167 +#: perllib/FixMyStreet/Geocode/OSM.pm:152 msgid "Road operator for this named road (derived from road reference number and type): %s" msgstr "" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:190 -#: perllib/FixMyStreet/Geocode/OSM.pm:168 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:164 +#: perllib/FixMyStreet/Geocode/OSM.pm:149 msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1394 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 -#: templates/web/base/admin/report_edit.html:90 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1403 +#: templates/web/base/admin/report_edit.html:106 #: templates/web/zurich/admin/report_edit.html:73 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1394 -#: templates/web/base/admin/report_edit.html:91 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: templates/web/base/admin/report_edit.html:107 #: templates/web/zurich/admin/report_edit.html:74 msgid "Rotate Right" msgstr "" #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:200 -#: templates/web/base/admin/category_edit.html:76 +#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/category_edit.html:81 #: templates/web/zurich/admin/body.html:59 msgid "Save changes" msgstr "" @@ -2678,7 +2671,7 @@ msgstr "" msgid "Searching found no reports." msgstr "" -#: templates/web/base/admin/users.html:39 +#: templates/web/base/admin/users.html:41 msgid "Searching found no users." msgstr "" @@ -2701,15 +2694,15 @@ msgstr "Pilihkan kawasan" 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:680 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "Sent to %s %s later" msgstr "Dihantar kepada %s %s kemudian" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:84 msgid "Sent:" msgstr "Dihantar:" -#: templates/web/base/admin/report_edit.html:73 +#: templates/web/base/admin/report_edit.html:89 #: templates/web/zurich/admin/stats.html:45 msgid "Service:" msgstr "Servis:" @@ -2718,7 +2711,7 @@ msgstr "Servis:" msgid "Share" msgstr "Kongsi" -#: templates/web/base/report/new/fill_in_details_form.html:211 +#: templates/web/base/report/new/fill_in_details_form.html:192 #: templates/web/base/report/update-form.html:157 #: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 @@ -2763,12 +2756,12 @@ msgstr "Log keluar" msgid "Signed in as %s" msgstr "Log masuk sebagai %s" -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 msgid "Some categories may require additional information." msgstr "" -#: templates/web/base/admin/body-form.html:145 -#: templates/web/base/admin/body-form.html:146 +#: templates/web/base/admin/body-form.html:149 +#: templates/web/base/admin/body-form.html:150 msgid "" "Some endpoints require an <strong>API key</strong> to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -2779,11 +2772,11 @@ msgid "Some photos of recent reports" msgstr "" #: perllib/FixMyStreet/App/View/Email.pm:32 -#: perllib/FixMyStreet/App/View/Web.pm:44 +#: perllib/FixMyStreet/App/View/Web.pm:43 msgid "Some text to localize" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:88 +#: perllib/FixMyStreet/Cobrand/UK.pm:78 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -2791,17 +2784,16 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:215 -#: perllib/FixMyStreet/Geocode.pm:26 perllib/FixMyStreet/Geocode/Bing.pm:56 -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:73 -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:93 -#: perllib/FixMyStreet/Geocode/Google.pm:72 -#: perllib/FixMyStreet/Geocode/OSM.pm:64 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:214 +#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 +#: perllib/FixMyStreet/Geocode/Google.pm:47 +#: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "" -#: perllib/FixMyStreet/Geocode/Bing.pm:51 -#: perllib/FixMyStreet/Geocode/Google.pm:67 +#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: perllib/FixMyStreet/Geocode/Google.pm:44 #: perllib/FixMyStreet/Geocode/Zurich.pm:87 msgid "Sorry, we could not parse that location. Please try again." msgstr "" @@ -2810,7 +2802,7 @@ msgstr "" msgid "Start Date:" msgstr "Tarikh bermula:" -#: templates/web/base/admin/body.html:61 +#: templates/web/base/admin/body.html:69 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 @@ -2818,7 +2810,7 @@ msgstr "Tarikh bermula:" msgid "State" msgstr "Negeri" -#: templates/web/base/admin/report_edit.html:34 +#: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 #: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:53 @@ -2827,8 +2819,8 @@ msgstr "Negeri" msgid "State:" msgstr "Negeri:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1200 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:304 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:308 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" @@ -2844,7 +2836,7 @@ msgstr "Status" msgid "Still open, via questionnaire, %s" msgstr "Masuk dibuka, melalui soalan selidik, %s" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:381 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 msgid "Subcategory: %s" msgstr "Subkategori: %s" @@ -2864,19 +2856,19 @@ msgid "Subject:" msgstr "Tajuk:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:115 -#: templates/web/base/report/new/fill_in_details_form.html:155 -#: templates/web/base/report/new/fill_in_details_form.html:177 +#: templates/web/base/report/new/fill_in_details_form.html:136 +#: templates/web/base/report/new/fill_in_details_form.html:158 +#: templates/web/base/report/new/fill_in_details_form.html:96 #: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 -#: templates/web/zurich/report/new/fill_in_details_form.html:108 +#: templates/web/zurich/report/new/fill_in_details_form.html:91 msgid "Submit" msgstr "Hantar" -#: templates/web/base/admin/report_edit.html:97 +#: templates/web/base/admin/report_edit.html:113 #: templates/web/base/admin/update_edit.html:65 -#: templates/web/base/admin/user-form.html:55 +#: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:64 #: templates/web/zurich/admin/report_edit.html:221 #: templates/web/zurich/admin/update_edit.html:38 @@ -2888,8 +2880,8 @@ msgstr "Hantar perubahan" msgid "Submit questionnaire" msgstr "Hantar soalan selidik" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:133 -#: templates/web/zurich/admin/header.html:2 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:134 +#: 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 @@ -2913,8 +2905,8 @@ msgstr "Melanggan" msgid "Subscribe me to an email alert" msgstr "Langgankan pemberitahuan emel" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1191 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:293 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 #: templates/web/zurich/admin/index-dm.html:1 @@ -2930,7 +2922,7 @@ msgstr "Ringkasan" msgid "Summary reports" msgstr "Laporan ringkasan" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 msgid "Survey" msgstr "Kajian" @@ -2944,7 +2936,7 @@ msgstr "Hasil Kajian" msgid "Text" msgstr "Teks" -#: templates/web/base/admin/body.html:21 +#: templates/web/base/admin/body.html:28 msgid "Text only version" msgstr "Versi teks sahaja" @@ -2953,49 +2945,55 @@ msgstr "Versi teks sahaja" msgid "Text:" msgstr "Teks:" -#: templates/web/base/tokens/confirm_update.html:9 -msgid "Thank you — you can <a href=\"%s\">view your updated problem</a> on the site." -msgstr "" - -#: templates/web/base/tokens/confirm_problem.html:18 -msgid "Thank you for reporting this issue" +#: templates/web/base/tokens/confirm_problem.html:12 +msgid "Thank you for reporting this issue!" msgstr "" #: templates/web/base/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/fixmystreet/around/around_index.html:28 -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 :" +#: templates/web/base/tokens/confirm_update.html:15 +msgid "Thank you for updating this issue!" +msgstr "" + +#: templates/web/base/contact/submit.html:6 +#: templates/web/base/questionnaire/completed.html:5 +msgid "Thank you for your feedback" msgstr "" -#: templates/web/base/contact/submit.html:8 -msgid "Thanks for your feedback. We'll get back to you as soon as we can!" +#: templates/web/fixmystreet/around/around_index.html:28 +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 :" msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:9 msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:190 +#: perllib/FixMyStreet/App/Controller/Photo.pm:195 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Council.pm:100 +#: perllib/FixMyStreet/App/Controller/Council.pm:97 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 +#: perllib/FixMyStreet/App/Controller/Location.pm:126 msgid "That location does not appear to be in the UK; please try again." msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:81 +#: perllib/FixMyStreet/Cobrand/UK.pm:71 msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:713 +#: perllib/FixMyStreet/App/Controller/Admin.pm:712 +#, fuzzy +msgid "That problem has been marked as sent." +msgstr "Masalah ini telah diselesai" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:704 msgid "That problem will now be resent." msgstr "" @@ -3007,28 +3005,28 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "" -#: templates/web/base/admin/body.html:136 +#: templates/web/base/admin/body.html:144 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/base/admin/body-form.html:119 -#: templates/web/base/admin/body-form.html:120 +#: templates/web/base/admin/body-form.html:123 +#: templates/web/base/admin/body-form.html:124 msgid "" "The <strong>endpoint</strong> is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." msgstr "" -#: templates/web/base/admin/body-form.html:132 -#: templates/web/base/admin/body-form.html:133 +#: templates/web/base/admin/body-form.html:136 +#: templates/web/base/admin/body-form.html:137 msgid "" "The <strong>jurisdiction</strong> is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" -#: templates/web/base/admin/body-form.html:90 -#: templates/web/base/admin/body-form.html:91 +#: templates/web/base/admin/body-form.html:94 +#: templates/web/base/admin/body-form.html:95 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>." @@ -3049,7 +3047,7 @@ msgstr "" msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." msgstr "" -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:3 msgid "The council won’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 "" @@ -3076,8 +3074,8 @@ 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:185 -#: perllib/FixMyStreet/Geocode/OSM.pm:163 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:159 +#: perllib/FixMyStreet/Geocode/OSM.pm:144 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap." msgstr "" @@ -3135,7 +3133,7 @@ msgstr "" msgid "The passwords do not match" msgstr "" -#: templates/web/base/errors/page_error_404_not_found.html:11 +#: templates/web/base/errors/page_error_404_not_found.html:10 #: templates/web/base/errors/page_error_404_not_found.html:12 msgid "The requested URL '%s' was not found on this server" msgstr "" @@ -3152,7 +3150,7 @@ msgstr "Pemberitahuan yang paling mudah adalah jenis geografi kita:" msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:295 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:300 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" @@ -3163,16 +3161,20 @@ msgid "" " Names are not necessarily unique." msgstr "" +#: templates/web/base/reports/_problem-list.html:15 +msgid "There are no reports to show." +msgstr "" + #: perllib/FixMyStreet/App/Controller/Reports.pm:75 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:131 +#: perllib/FixMyStreet/App/Controller/Contact.pm:136 #: 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/New.pm:762 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 #: templates/web/base/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:25 @@ -3188,7 +3190,7 @@ msgstr "" msgid "There was a problem with your update. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:135 +#: perllib/FixMyStreet/App/Controller/Contact.pm:140 msgid "There were problems with your report. Please see below." msgstr "" @@ -3196,8 +3198,8 @@ msgstr "" msgid "There were problems with your update. Please see below." msgstr "" -#: templates/web/base/admin/body-form.html:108 -#: templates/web/base/admin/body-form.html:109 +#: templates/web/base/admin/body-form.html:112 +#: templates/web/base/admin/body-form.html:113 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" @@ -3210,14 +3212,14 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" -#: templates/web/base/admin/body.html:36 +#: templates/web/base/admin/body.html:44 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported <em>at any location</em>.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" " Currently, users <strong>cannot report problems to this body</strong>." msgstr "" -#: templates/web/base/admin/body.html:46 +#: templates/web/base/admin/body.html:54 msgid "This body has no contacts. This means that currently problems reported to this body <strong>will not be sent</strong>." msgstr "" @@ -3228,18 +3230,18 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:388 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:394 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:391 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 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:136 -#: perllib/FixMyStreet/Cobrand/UK.pm:53 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:902 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:972 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/Cobrand/UK.pm:43 msgid "This information is required" msgstr "" @@ -3278,8 +3280,8 @@ msgstr "Masalah ini dalam kemajuan" 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 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:132 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Laporan ini menunggui sederhana." @@ -3296,15 +3298,15 @@ msgstr "Laporan ini ditanda sebagai diselesai sekarang." msgid "This report is currently marked as open." msgstr "Laporan ini ditanda sebagai terbuka sekarang." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:319 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:311 msgid "This report was submitted anonymously" msgstr "Laporan ini dikemukakan tanpa nama" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:293 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:1196 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Garis masa" @@ -3322,7 +3324,7 @@ msgstr "Untuk <strong>melaporkan masalah</strong>, klik lokasi yang betul atas p 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:294 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:299 msgid "To view a map of the precise location of this issue" msgstr "Melihat lokasi tepat atas peta bagi isu ini" @@ -3338,8 +3340,12 @@ msgstr "Jumlah" msgid "Try again" msgstr "Cuba lagi" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:46 +#: templates/web/base/contact/submit.html:14 +msgid "Try emailing us directly:" +msgstr "" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -3347,8 +3353,8 @@ msgstr "Cuba lagi" msgid "Unable to fix" msgstr "Tidak dapat diselesai" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/admin/update_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:45 #: templates/web/zurich/admin/report_edit.html:58 @@ -3390,7 +3396,7 @@ msgstr "Kemaskini di bawah ditambahkan tanpa nama pada %s" msgid "Update below added by %s at %s" msgstr "Kemaskini di bawah ditambah oleh %s pada %s" -#: templates/web/base/admin/body-form.html:233 +#: templates/web/base/admin/body-form.html:240 #: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "Kemas kini badan" @@ -3416,7 +3422,7 @@ msgstr "Kemas kini menanda masalah sebagai diselesai" msgid "Update reopened problem" msgstr "Kemas kini masalah dibuka semula" -#: templates/web/base/admin/body.html:93 +#: templates/web/base/admin/body.html:101 msgid "Update statuses" msgstr "Status kemas kini" @@ -3430,12 +3436,12 @@ msgstr "Kemas kini:" msgid "Updated" msgstr "Dikemas kinikan" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1016 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1060 -#: perllib/FixMyStreet/App/Controller/Admin.pm:810 -#: perllib/FixMyStreet/App/Controller/Admin.pm:958 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:549 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:618 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1014 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:808 +#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:556 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:625 msgid "Updated!" msgstr "Dikemas kinikan!" @@ -3447,7 +3453,7 @@ msgstr "Dikemas kinikan!" msgid "Updates" msgstr "Kemas kini" -#: perllib/FixMyStreet/DB/Result/Comment.pm:139 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -3462,7 +3468,7 @@ msgstr "Kemas kini atas {{title}}" msgid "Updates to this problem, FixMyStreet" msgstr "Kemas kini masalah ini, FixMyStreet" -#: templates/web/base/admin/body.html:174 +#: templates/web/base/admin/body.html:182 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." @@ -3471,11 +3477,11 @@ msgstr "Gunakan <strong>nota</strong> untuk melaporkan maklumat yang hanya dipap msgid "User" msgstr "Pengguna" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1357 msgid "User flag removed" msgstr "Tanda pengguna dipadam" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1331 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1329 msgid "User flagged" msgstr "Pengguna ditanda" @@ -3483,16 +3489,16 @@ msgstr "Pengguna ditanda" 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:1198 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:303 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:307 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Pengguna" -#: perllib/FixMyStreet/App/Controller/Admin.pm:380 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:430 +#: perllib/FixMyStreet/App/Controller/Admin.pm:374 +#: perllib/FixMyStreet/App/Controller/Admin.pm:404 +#: perllib/FixMyStreet/App/Controller/Admin.pm:421 msgid "Values updated" msgstr "Nilai dikemaskinikan" @@ -3546,11 +3552,11 @@ msgstr "Kita tidak akan mempaprkan emel anda" msgid "We never show your email address or phone number." msgstr "Kita tidak akan mempaparkan alamat emel atau nombor telefon anda." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:403 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/base/index-steps.html:38 +#: templates/web/base/index-steps.html:31 msgid "We send it to the council on your behalf" msgstr "Kita menghantar kepada majlis bagi pihak anda" @@ -3559,15 +3565,23 @@ msgstr "Kita menghantar kepada majlis bagi pihak anda" msgid "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>" msgstr "" +#: templates/web/base/questionnaire/completed-open.html:2 +msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" +msgstr "" + #: templates/web/base/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/fixmystreet/report/new/fill_in_details_form.html:41 +#: templates/web/base/contact/submit.html:7 +msgid "We’ll get back to you as soon as we can." +msgstr "" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 msgid "What’s the issue, and where is it?" msgstr "" -#: templates/web/base/admin/category_edit.html:82 +#: templates/web/base/admin/category_edit.html:87 #: templates/web/zurich/admin/body.html:18 msgid "When edited" msgstr "Bila diedit" @@ -3576,15 +3590,18 @@ msgstr "Bila diedit" msgid "When sent" msgstr "Bila dihantar" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Whole block of empty flats" msgstr "Seluruh blok flat kosong" +#: templates/web/base/tokens/confirm_alert.html:7 +msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." +msgstr "" + #: templates/web/base/open311/index.html:92 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/fiksgatami/front/footer-marketing.html:15 #: templates/web/fixmystreet/front/footer-marketing.html:17 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" @@ -3608,18 +3625,18 @@ msgid "Year" msgstr "Tahun" #: templates/web/base/admin/bodies.html:66 -#: templates/web/base/admin/body.html:72 templates/web/base/admin/body.html:74 -#: templates/web/base/admin/body.html:78 templates/web/base/admin/body.html:80 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:76 +#: templates/web/base/admin/report_edit.html:93 #: templates/web/base/admin/update_edit.html:24 -#: templates/web/base/admin/users.html:29 +#: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:42 #: templates/web/base/questionnaire/index.html:81 @@ -3648,14 +3665,12 @@ msgstr "" msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/tokens/confirm_problem.html:25 -#: templates/web/base/tokens/confirm_problem.html:26 -#: templates/web/zurich/tokens/confirm_problem.html:6 +#: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:8 msgid "You can <a href=\"%s%s\">view the problem on this site</a>." msgstr "" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:48 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -3670,14 +3685,14 @@ msgid "" " reports in the past." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:19 -#: templates/web/base/report/new/councils_text_none.html:20 -#: templates/web/base/report/new/councils_text_some.html:20 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." msgstr "" -#: templates/web/base/admin/body-form.html:81 +#: templates/web/base/admin/body-form.html:85 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" @@ -3690,10 +3705,10 @@ msgid "You have already answered this questionnaire. If you have a question, ple msgstr "" #: templates/web/base/questionnaire/index.html:68 -#: templates/web/base/report/new/fill_in_details_form.html:94 +#: templates/web/base/report/new/fill_in_details_form.html:75 #: templates/web/fixmystreet/questionnaire/index.html:88 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:79 -#: templates/web/zurich/report/new/fill_in_details_form.html:75 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 +#: templates/web/zurich/report/new/fill_in_details_form.html:58 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." @@ -3702,7 +3717,7 @@ msgstr "Anda telah melampirkan foto untuk laporan ini, lampiran yang lain akan m 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/base/auth/sign_out.html:3 +#: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" msgstr "Anda telah dilog keluarkan" @@ -3711,26 +3726,11 @@ msgstr "Anda telah dilog keluarkan" 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/base/tokens/confirm_alert.html:8 -msgid "You have successfully confirmed your alert." -msgstr "Anda telah berjaya memastikan pemberitahuan anda." - +#: 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 "Anda telah berjaya memastikan alamat emel anda." -#: templates/web/base/tokens/confirm_update.html:14 -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/base/tokens/confirm_alert.html:12 -msgid "You have successfully created your alert." -msgstr "Anda telah berjaya menambah pemberitahuan anda." - -#: templates/web/base/tokens/confirm_alert.html:10 -msgid "You have successfully deleted your alert." -msgstr "Anda telah berjaya memadam pemberitahuan anda." - #: templates/web/base/report/display.html:20 #: templates/web/base/report/new/fill_in_details.html:37 #: templates/web/fixmystreet/report/display.html:17 @@ -3759,7 +3759,7 @@ msgstr "" "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/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:85 msgid "You really want to resend?" msgstr "Pastikan anda menghantar lagi?" @@ -3779,7 +3779,7 @@ msgstr "Laporan Anda" #: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 #: templates/web/fixmystreet/report/update-form.html:76 -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:71 msgid "Your email" msgstr "Emel Anda" @@ -3795,7 +3795,7 @@ msgid "Your email address:" msgstr "Alamat emel anda:" #: templates/web/base/alert/_list.html:92 -#: templates/web/base/report/new/fill_in_details_form.html:125 +#: templates/web/base/report/new/fill_in_details_form.html:106 #: templates/web/base/report/update-form.html:81 msgid "Your email:" msgstr "Emel anda:" @@ -3810,13 +3810,13 @@ msgstr "Maklumat anda akan digunakan mengikuti <a href=\"/privacy\">dasar privas #: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 #: templates/web/fixmystreet/report/update-form.html:142 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:98 +#: templates/web/zurich/report/new/fill_in_details_form.html:81 msgid "Your name" msgstr "Nama anda" #: templates/web/base/auth/general.html:59 #: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:204 +#: templates/web/base/report/new/fill_in_details_form.html:185 #: templates/web/base/report/update-form.html:151 msgid "Your name:" msgstr "Nama anda:" @@ -3834,33 +3834,19 @@ msgstr "Kata laluan anda telah diubahi" #: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 -#: templates/web/zurich/report/new/fill_in_details_form.html:104 +#: templates/web/zurich/report/new/fill_in_details_form.html:87 msgid "Your phone number" msgstr "Nombor telefon anda" -#: templates/web/base/tokens/confirm_problem.html:4 -msgid "Your problem has been confirmed!" -msgstr "" - #: templates/web/fixmystreet/questionnaire/index.html:16 msgid "Your report" msgstr "Laporan anda" -#: templates/web/base/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/base/footer.html:9 templates/web/fiksgatami/footer.html:21 -#: templates/web/fiksgatami/nn/footer.html:21 -#: templates/web/fixmystreet/footer.html:24 +#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:24 msgid "Your reports" msgstr "Laporan anda" -#: templates/web/base/tokens/confirm_update.html:4 -msgid "Your update has been confirmed!" -msgstr "" - -#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:59 +#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:41 msgid "Your updates" msgstr "Kemas kini anda" @@ -3877,11 +3863,7 @@ msgstr "dari %s" msgid "council" msgstr "majlis" -#: perllib/FixMyStreet/DB/Result/Problem.pm:665 -msgid "council ref: %s" -msgstr "Rujukan majlis: %s" - -#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:32 #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:54 msgid "didn't use map" @@ -3892,6 +3874,7 @@ msgstr "tidak mengguna peta" msgid "e.g. ‘%s’ or ‘%s’" msgstr "seperti ‘%s’ atau ‘%s’" +#: templates/web/base/admin/body-form.html:188 #: templates/web/base/admin/flagged.html:51 msgid "edit user" msgstr "edit pengguna" @@ -3906,7 +3889,7 @@ msgstr "dari %d pengguna lain" msgid "last updated %s" msgstr "kemaskini yang lepas %s" -#: perllib/Utils.pm:263 +#: perllib/Utils.pm:235 msgid "less than a minute" msgstr "kurang dari seminit" @@ -3966,22 +3949,22 @@ msgstr "atau" msgid "or locate me automatically" msgstr "atau mengesan aku secara automatik" -#: templates/web/base/admin/report_edit.html:25 -#: templates/web/base/admin/report_edit.html:26 -#: templates/web/zurich/admin/report_edit-sdm.html:28 +#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:30 +#: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit-sdm.html:29 -#: templates/web/zurich/admin/report_edit-sdm.html:37 +#: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:38 -#: templates/web/zurich/admin/report_edit.html:28 +#: templates/web/zurich/admin/report_edit.html:27 #: templates/web/zurich/admin/report_edit.html:29 -#: templates/web/zurich/admin/report_edit.html:39 +#: templates/web/zurich/admin/report_edit.html:38 #: templates/web/zurich/admin/report_edit.html:40 -#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit.html:50 #: templates/web/zurich/admin/report_edit.html:52 msgid "originally entered: “%s”" msgstr "pemasukan asal: “%s”" -#: templates/web/base/admin/report_edit.html:30 +#: templates/web/base/admin/report_edit.html:43 msgid "other areas:" msgstr "kawasan lain:" @@ -3990,13 +3973,12 @@ msgstr "kawasan lain:" msgid "reopened" msgstr "dibuka semula" -#: templates/web/fiksgatami/header.html:49 -#: templates/web/fixmystreet/header.html:53 +#: templates/web/fixmystreet/header.html:59 #: templates/web/zurich/footer.html:12 msgid "sign out" msgstr "log keluar" -#: templates/web/base/report/new/fill_in_details_form.html:13 +#: templates/web/base/report/new/fill_in_details_form.html:12 #: templates/web/base/report/new/fill_in_details_form.html:15 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 @@ -4008,15 +3990,15 @@ msgstr "majlis tempatan" msgid "there is no pin shown as the user did not use the map" msgstr "pin tidak ditunjukkan sebab pengguna tidak menggunakan peta" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:373 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:379 msgid "this type of local problem" msgstr "jenis masalah tempatan ini" -#: perllib/Utils.pm:235 +#: perllib/Utils.pm:207 msgid "today" msgstr "hari ini" -#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:32 #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:54 msgid "used map" @@ -4041,7 +4023,7 @@ 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:282 +#: perllib/Utils.pm:254 #, perl-format msgid "%d hour" msgid_plural "%d hours" @@ -4053,7 +4035,7 @@ msgid "%d supporter" msgid_plural "%d supporters" msgstr[0] "%d penyokong" -#: perllib/Utils.pm:284 +#: perllib/Utils.pm:256 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -4071,7 +4053,7 @@ 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:278 +#: perllib/Utils.pm:250 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -4089,7 +4071,7 @@ 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:280 +#: perllib/Utils.pm:252 #, perl-format msgid "%d day" msgid_plural "%d days" @@ -4100,3 +4082,6 @@ msgstr[0] "%d hari" msgid "We do <strong>not</strong> yet have details for the other council that covers this location." msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location." msgstr[0] "Kita <strong>belum</strong> ada maklumat tentang majlis lain yang menutupi lokasi ini." + +#~ msgid "For council(s):" +#~ msgstr "Untuk majlis:" diff --git a/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po index 3b2e8ac08..f2ce5ce05 100644 --- a/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/my_MM.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2015-01-20 16:59+0000\n" -"PO-Revision-Date: 2014-11-19 18:30+0000\n" +"POT-Creation-Date: 2015-07-31 14:28+0100\n" +"PO-Revision-Date: 2015-07-10 13:32+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Burmese (Myanmar) (http://www.transifex.com/projects/p/fixmystreet/language/my_MM/)\n" "Language: my_MM\n" @@ -24,17 +24,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:618 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:386 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:392 msgid " and " msgstr "ႏွင့္" -#: templates/web/base/report/new/councils_text_all.html:12 -#: templates/web/base/report/new/councils_text_all.html:19 -#: templates/web/base/report/new/councils_text_all.html:5 -#: templates/web/base/report/new/councils_text_none.html:19 -#: templates/web/base/report/new/councils_text_none.html:21 -#: templates/web/base/report/new/councils_text_some.html:20 +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_none.html:11 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " @@ -70,22 +68,26 @@ msgstr "%d မွ %d ၏ %d သို႔" msgid "%s - Summary reports" msgstr "အက်ဥ္းခ်ဳပ္ အစီရင္ခံစာမ်ား" -#: perllib/FixMyStreet/DB/Result/Problem.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:672 msgid "%s ref: %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:265 perllib/FixMyStreet/Cobrand/UK.pm:277 +#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 msgid "%s ward, %s" msgstr "%sရပ္ကြက္၊ %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:554 +#: perllib/FixMyStreet/DB/Result/Problem.pm:559 msgid "%s, reported at %s" msgstr "%s သတင္းပို႔သည္မွာ %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:304 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "%s, within %s ward" msgstr "%s၊ %s ရပ္ကြက္အတြင္း" +#: perllib/FixMyStreet/Map/OSM.pm:42 +msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" +msgstr "" + #: templates/web/base/email_sent.html:29 msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" msgstr "(စိတ္မပူပါႏွင့္။ သင္ အီးေမးလ္ စစ္ေဆးေနခ်ိန္တြင္ ကၽြႏု္ပ္တို႔က သင္၏ သတိေပးခ်က္ကို ထိန္းသိမ္းထားပါမည္။)" @@ -99,7 +101,7 @@ msgid "(Don't worry — we'll hang on to your update while you're checking y msgstr "(စိတ္မပူပါႏွင့္။ သင္ အီးေမးလ္ စစ္ေဆးေနခ်ိန္တြင္ ကၽြႏု္ပ္တို႔က သင္၏ ေနာက္ဆံုး ျပဳျပင္ထားသည့္ အခ်က္အလက္ကို ထိန္းသိမ္းထားပါမည္။)" #: templates/web/base/admin/report_blocks.html:11 -#: templates/web/base/admin/users.html:29 +#: templates/web/base/admin/users.html:31 msgid "(Email in abuse table)" msgstr "(ရိုင္းစိုင္းစြာေျပာသည့္ဇယားတြင္ရွိအီးေမးလ္)" @@ -127,7 +129,7 @@ msgstr "(ပိတ္ထားသည္)" msgid "(fixed)" msgstr "(ျပင္ျပီးျပီ)" -#: templates/web/base/index.html:9 +#: templates/web/base/index.html:8 templates/web/base/index.html:9 #: templates/web/fixmystreet/around/intro.html:2 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(ဂရပ္ဖီတီ၊ စည္းကမ္းမဲ့ အမိႈ္က္စြန္႔ပစ္ျခင္း၊ လမ္းေဘးပလက္ေဖာင္းအုတ္ခဲမ်ားက်ိဳးပဲ့မႈ သို႔မဟုတ္ လမ္းမီးမလာျခင္းကဲ့သို႔)" @@ -137,8 +139,8 @@ msgstr "(ဂရပ္ဖီတီ၊ စည္းကမ္းမဲ့ အမိ msgid "(not sent to council)" msgstr "(ေကာင္စီသို႔မပို႔ပါ)" -#: templates/web/base/report/new/fill_in_details_form.html:218 -#: templates/web/zurich/report/new/fill_in_details_form.html:94 +#: templates/web/base/report/new/fill_in_details_form.html:199 +#: templates/web/zurich/report/new/fill_in_details_form.html:77 msgid "(optional)" msgstr "(ေရြးခ်ယ္ႏိုင္ခြင့္)" @@ -151,7 +153,7 @@ msgstr "" msgid "(sent to both)" msgstr "(ႏွစ္ခုလံုးသို႔ပို႔မည္)" -#: templates/web/base/report/new/fill_in_details_form.html:212 +#: templates/web/base/report/new/fill_in_details_form.html:193 msgid "(we never show your email address or phone number)" msgstr "(သင္၏အီးေမလ္လိပ္စာ သို႔မဟုတ္ ဖုန္းနံပါတ္ကိုကၽြႏ္ုပ္တို႔မွ ဘယ္ေတာ့မွမေဖာ္ျပပါ)" @@ -159,14 +161,13 @@ msgstr "(သင္၏အီးေမလ္လိပ္စာ သို႔မဟ 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:393 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- ေခါင္းစဥ္တစ္ခုေရြးပါ --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 -#: perllib/FixMyStreet/DB/Result/Problem.pm:399 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:630 +#: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- ပစၥည္းအမ်ိဳးအစားကိုေရြးပါ --" @@ -178,37 +179,7 @@ msgid "" " Maybe add some <code>MAPIT_TYPES</code> to your config file?" msgstr "" -#: templates/web/base/questionnaire/completed.html:20 -msgid "<p style=\"font-size:150%\">Thank you very much for filling in our questionnaire; glad to hear it’s been fixed.</p>" -msgstr "<p style=\"font-size:150%\">ကၽြႏ္ုပ္တို႔၏စစ္တမ္းကိုျဖည့္သည့္အတြက္ေက်းဇူးအမ်ားၾကီးတင္ပါသည္။ ’မ်ား သည္ျပင္ျပီးသြားေၾကာင္းသိရသည့္အတြက္ အမ်ားၾကီး၀မ္းသာပါသည္</p>" - -#: templates/web/fiksgatami/questionnaire/completed-open.html:1 -msgid "" -"<p style=\"font-size:150%\">We’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’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/base/questionnaire/completed-open.html:6 -msgid "" -"<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" -"suggestions: why not try writing to your local representatives or, if\n" -"it’s a problem that could be fixed by local people working together, why\n" -"not <a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n" -"</p>" -msgstr "" - -#: templates/web/base/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/base/around/_report_banner.html:4 +#: templates/web/base/around/_report_banner.html:3 #: templates/web/base/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>" @@ -235,7 +206,7 @@ msgstr "<strong>မဟုတ္ပါ</strong> အီးေမးလ္ျဖင msgid "<strong>No</strong>, I do not, let me sign in by email:" msgstr "<strong>မဟုတ္ပါ</strong>မလုပ္ပါ၊အီးေမးလ္ျဖင့္၀င္မည္-" -#: templates/web/base/report/new/fill_in_details_form.html:163 +#: templates/web/base/report/new/fill_in_details_form.html:144 msgid "<strong>No</strong>, let me confirm my report by email:" msgstr "<strong>မဟုတ္ပါ</strong>ကၽြႏ္ုပ္၏အစီရင္ခံစာကိုအီးေမးလ္ျဖင့္အတည္ျပဳမည္ -" @@ -243,13 +214,8 @@ msgstr "<strong>မဟုတ္ပါ</strong>ကၽြႏ္ုပ္၏အစ msgid "<strong>No</strong>, let me confirm my update by email:" msgstr "<strong>မဟုတ္ပါ</strong>ကၽြႏ္ုပ္၏အသစ္မြမ္းမံျခင္းကိုအီးေမလ္ျဖင့္အတည္ျပဳမည္ -" -#: templates/web/base/tokens/confirm_problem.html:19 -#: templates/web/base/tokens/confirm_problem.html:20 -msgid "<strong>We will now send it to the council</strong>." -msgstr "" - #: templates/web/base/auth/general.html:37 -#: templates/web/base/report/new/fill_in_details_form.html:141 +#: templates/web/base/report/new/fill_in_details_form.html:122 #: templates/web/base/report/update-form.html:95 #: templates/web/fixmystreet/auth/general.html:37 #: templates/web/fixmystreet/auth/general.html:39 @@ -263,8 +229,8 @@ msgstr "<strong>ဟုတ္ကဲ့</strong> ကၽြႏ္ုပ္တြင msgid "About us" msgstr "ကၽြႏ္ုပ္တို႔အေၾကာင္း" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:39 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:52 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:31 #: templates/web/fixmystreet/report/update-form.html:28 @@ -280,26 +246,26 @@ msgid "" " categories of problem) to each body." msgstr "အုပ္ခ်ဳပ္ေရး အဖြဲ႔တစ္ခုခ်င္းစီအတြက္ အဖြဲ႔တစ္ခုကို ေပါင္းထည့္ပါ။ အႀကံေပးအဖြဲ႔ သို႔မဟုတ္ ႒ာနတစ္ခုကဲ့သို႔ အဖြဲ႔ကို ျပႆနာ တင္ျပႏိုင္သည္။ သင့္အေနျဖင့္ အဖြဲ႔တစ္ခုခ်င္းစီကို (ျပႆနာထဲမွ မတူညီသည့္ ျပႆနာမ်ားအတြက္) ဆက္သြယ္ရမည့္လိပ္စာ တစ္ခု သို႔မဟုတ္ အမ်ားကို ေပါင္းထည့္ပါ။" -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/body.html:56 msgid "Add a contact using the form below." msgstr "ေအာက္ပါပံုစံကိုသံုးျပီးအဆက္အသြယ္တစ္ခုထည့္မည္" #: templates/web/base/admin/bodies.html:74 -#: templates/web/base/admin/body-form.html:233 +#: templates/web/base/admin/body-form.html:240 #: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "စာကိုယ္ထည့္မည္" -#: templates/web/base/admin/body.html:108 +#: templates/web/base/admin/body.html:116 #: templates/web/zurich/admin/body.html:31 msgid "Add new category" msgstr "ေခါင္းစဥ္အသစ္ထည့္မည္" -#: templates/web/base/admin/users.html:45 +#: templates/web/base/admin/users.html:47 msgid "Add user" msgstr "အသံုးျပဳသူထည့္မည္" -#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:70 +#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:52 msgid "Added %s" msgstr "%sကိုထည့္ျပီးျပီ" @@ -326,9 +292,7 @@ msgstr "ေနာက္ထပ္အသစ္မ်ားအတြက္လည္ msgid "All Reports" msgstr "အစီရင္ခံစာအားလံုး" -#: templates/web/base/footer.html:11 templates/web/fiksgatami/footer.html:23 -#: templates/web/fiksgatami/nn/footer.html:23 -#: templates/web/fixmystreet/footer.html:26 +#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:26 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:19 @@ -345,21 +309,9 @@ msgstr "%s ႏွင့္ %s ၾကားအစီရင္ခံစားအ msgid "All the information you provide here will be sent to" msgstr "သင္ေထာက္ပံ့ေသာအခ်က္အလက္မ်ားအားလံုးကိုပို႔မည့္ေနရာ" -#: templates/web/base/report/new/councils_text_all.html:12 -#: templates/web/base/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/base/report/new/councils_text_all.html:5 -#: templates/web/base/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/base/report/new/councils_text_all.html:19 -#: templates/web/base/report/new/councils_text_all.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:13 +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_all.html:4 +#: templates/web/base/report/new/fill_in_details_form.html:12 #: templates/web/base/report/new/fill_in_details_form.html:14 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 @@ -376,7 +328,7 @@ msgstr "ေျဖရွင္းထားသည့္ ျပႆနာကို msgid "Anonymous" msgstr "အမည္မသိ" -#: templates/web/base/admin/report_edit.html:62 +#: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:23 msgid "Anonymous:" msgstr "အမည္မသိ-" @@ -385,18 +337,18 @@ msgstr "အမည္မသိ-" msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?" msgstr "သင္သည္ <strong>developer</strong> တစ္ေယာက္လား။ FixMyStreet ကို ကူညီလိုပါသလား။" -#: templates/web/fiksgatami/front/footer-marketing.html:14 #: templates/web/fixmystreet/front/footer-marketing.html:16 msgid "Are you a developer?" msgstr "Developer လား" #: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 msgid "Area covered" msgstr "ဧရိယာလႊမ္းျခံဳ ျခင္း" #: templates/web/base/admin/bodies.html:15 -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/body.html:60 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "" @@ -414,7 +366,7 @@ msgstr "အပိုစာကိုယ္ကိုသတ္မွတ္မည္ msgid "Assign to subdivision:" msgstr "အေသးစိတ္နယ္နမိတ္သို႔သတ္မွတ္မည္-" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:163 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:165 #: templates/web/zurich/report/updates.html:11 msgid "Assigned to %s" msgstr "%s သို႔ လြဲအပ္မည္" @@ -427,7 +379,7 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "အခုေလာေလာဆယ္ အစီရင္ခံစာမ်ားကို ရွာေဖြျခင္း၊ၾကည့္ရႈျခင္းသာျပဳလုပ္ႏိုင္ေသးသည္" -#: perllib/FixMyStreet/DB/Result/Problem.pm:348 +#: perllib/FixMyStreet/DB/Result/Problem.pm:373 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "စိစစ္ျခင္းကိုေစာင့္ဆိုင္းေနတုန္း" @@ -440,8 +392,8 @@ msgstr "ေနာက္သို႔" msgid "Ban email address" msgstr "အီးေမးလ္လိပ္စာကိုပိ္တ္ပင္မည္" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:297 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:301 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" msgstr "စာကိုယ္မ်ား" @@ -452,6 +404,7 @@ msgstr "စာကိုယ္မ်ား" msgid "Body" msgstr "စာကိုယ္" +#: templates/web/base/admin/report_edit.html:34 #: templates/web/base/admin/user-form.html:32 msgid "Body:" msgstr "စာကိုယ္ -" @@ -464,16 +417,15 @@ msgstr "ေန႔စြဲအားျဖင့္" msgid "Can't see the map? <em>Skip this step</em>" msgstr "ေျမပံုကိုမျမင္ဘူးလား။ <em>ဒီအဆင့္ကိုေက်ာ္မည္</em> " -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:55 #: templates/web/base/report/new/category.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:53 +#: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 #: templates/web/zurich/admin/stats.html:50 -#: templates/web/zurich/report/new/fill_in_details_form.html:50 msgid "Category" msgstr "အမ်ိဳးအစား" @@ -481,17 +433,16 @@ msgstr "အမ်ိဳးအစား" msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:138 #: templates/web/base/admin/category_edit.html:23 -#: templates/web/base/admin/report_edit.html:61 -#: templates/web/base/report/new/fill_in_details_form.html:68 +#: templates/web/base/admin/report_edit.html:74 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/report_edit-sdm.html:42 #: templates/web/zurich/admin/report_edit.html:140 msgid "Category:" msgstr "အမ်ိဳးအစား -" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:377 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383 msgid "Category: %s" msgstr "အမ်ိဳးအစား - %s" @@ -502,19 +453,19 @@ msgstr "အမ်ိဳးအစား - %s" msgid "Change password" msgstr "စကား၀ွက္ေျပာင္းမည္" -#: templates/web/base/admin/body.html:152 +#: templates/web/base/admin/body.html:160 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/base/admin/body.html:163 +#: templates/web/base/admin/body.html:171 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/base/admin/body.html:183 +#: templates/web/base/admin/body.html:191 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -525,7 +476,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:122 +#: templates/web/base/admin/body.html:130 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." @@ -541,16 +492,16 @@ msgstr "ဒီေနရာကိုႏွိပ္ပါ သို႔ dd/mm/yyyy msgid "Click map to report a problem" msgstr "ျပႆနာတစ္ခုကိုအစီရင္ခံစာတင္ရင္ေျမပံုကိုႏွိပ္ပါ" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:45 -#: templates/web/base/admin/report_edit.html:47 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:58 +#: templates/web/base/admin/report_edit.html:60 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/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:95 #: templates/web/zurich/admin/report_edit.html:97 #: templates/web/zurich/admin/stats.html:31 @@ -558,11 +509,12 @@ msgstr "ျပႆနာတစ္ခုကိုအစီရင္ခံစာတ msgid "Closed" msgstr "ပိတ္မည္" -#: perllib/FixMyStreet/DB/Result/Problem.pm:762 +#: perllib/FixMyStreet/DB/Result/Problem.pm:771 msgid "Closed by council" msgstr "ေကာင္စီမွပိတ္ထားသည္" -#: templates/web/base/my/my.html:40 templates/web/fixmystreet/my/my.html:46 +#: templates/web/base/my/my.html:40 +#: templates/web/fixmystreet/my/_problem-list.html:12 msgid "Closed reports" msgstr "အစီရင္ခံစာကိုပိတ္မည္" @@ -570,7 +522,7 @@ msgstr "အစီရင္ခံစာကိုပိတ္မည္" msgid "Closed:" msgstr "ပိတ္မည္-" -#: templates/web/base/around/tabbed_lists.html:11 +#: templates/web/base/around/tabbed_lists.html:10 #: templates/web/base/around/tabbed_lists.html:12 msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "" @@ -585,26 +537,26 @@ msgstr "" msgid "Cobrand" msgstr "" -#: templates/web/base/admin/report_edit.html:75 +#: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:50 msgid "Cobrand data:" msgstr "" -#: templates/web/base/admin/report_edit.html:74 +#: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:49 msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "အစီအစဥ္သတ္မွတ္ျခင္း" -#: templates/web/base/admin/category_edit.html:47 +#: templates/web/base/admin/category_edit.html:52 msgid "Configure Endpoint" msgstr "" -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/body.html:72 msgid "Confirm" msgstr "အတည္ျပဳမည္" @@ -625,10 +577,10 @@ msgstr "" msgid "Confirmation" msgstr "အတည္ျပဳျခင္း" -#: templates/web/base/admin/body.html:158 -#: templates/web/base/admin/body.html:71 -#: templates/web/base/admin/category_edit.html:32 -#: templates/web/base/admin/category_edit.html:84 +#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/category_edit.html:37 +#: templates/web/base/admin/category_edit.html:89 #: templates/web/zurich/admin/stats.html:40 msgid "Confirmed" msgstr "အတည္ျပဳခဲ့သည္" @@ -639,7 +591,7 @@ msgstr "%s ႏွင့္ %s ၾကားအစီရင္ခံစာကိ #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 -#: templates/web/base/admin/report_edit.html:70 +#: templates/web/base/admin/report_edit.html:83 msgid "Confirmed:" msgstr "အတည္ျပဳခဲ့ခ်ိန္-" @@ -656,13 +608,12 @@ msgid "Contact Us" msgstr "ကၽြႏ္ုပ္တို႔ႏွင့္ဆက္သြယ္ပါ" #: templates/web/base/contact/index.html:6 -#: templates/web/base/contact/submit.html:3 #: templates/web/fixmystreet/contact/index.html:20 msgid "Contact the team" msgstr "အဖြဲ႕ႏွင့္ဆက္သြယ္ပါ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1327 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1355 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1325 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1353 msgid "Could not find user" msgstr "အသံုးျပဳသူရွာမေတြ႕ပါ" @@ -680,6 +631,10 @@ msgstr "ေကာင္စီ" msgid "Council contacts for %s" msgstr "%sအတြက္ေကာင္စီအဆက္အသြယ္" +#: perllib/FixMyStreet/DB/Result/Problem.pm:670 +msgid "Council ref: %s" +msgstr "ေကာင္စီ ရည္ညႊန္းခ်က္" + #: templates/web/base/admin/stats.html:84 msgid "Council:" msgstr "ေကာင္စီ-" @@ -695,7 +650,7 @@ msgstr "အေရအတြက္" msgid "Create a report" msgstr "အစီရင္ခံစာတစ္ခုကိုဖန္တီးမည္" -#: templates/web/base/admin/body.html:200 +#: templates/web/base/admin/body.html:208 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "အမ်ိဳးအစားဖန္တီးမည္" @@ -707,7 +662,7 @@ msgid "Created" msgstr "ဖန္တီးမည္" #: templates/web/base/admin/list_updates.html:38 -#: templates/web/base/admin/report_edit.html:69 +#: templates/web/base/admin/report_edit.html:82 #: templates/web/base/admin/update_edit.html:51 #: templates/web/zurich/admin/report_edit-sdm.html:47 #: templates/web/zurich/admin/report_edit.html:61 @@ -724,7 +679,7 @@ msgstr "ယခုအေျခအေန" msgid "Currently no bodies have been created." msgstr "ယခုေလာေလာဆယ္ စာကိုယ္ ကိုမဖန္တီးရေသးပါ" -#: templates/web/base/dashboard/index.html:6 +#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 msgid "Dashboard" msgstr "" @@ -734,14 +689,14 @@ msgid "Dealt with by subdivision within 5 working days" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:169 -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:37 -#: templates/web/base/admin/category_edit.html:85 +#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:81 +#: templates/web/base/admin/category_edit.html:42 +#: templates/web/base/admin/category_edit.html:90 msgid "Deleted" msgstr "ဖ်က္ျပီးျပီ" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:43 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -761,7 +716,7 @@ msgstr "အေသးစိတ္အခ်က္အလက္" msgid "Details:" msgstr "အေသးစိတ္အခ်က္အလက္မ်ား-" -#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/body.html:87 msgid "Devolved" msgstr "တစ္ေယာက္မွတစ္ေယာက္လက္လြဲျခင္း" @@ -789,8 +744,8 @@ msgstr "" msgid "Don't like forms?" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:47 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:60 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:32 #: templates/web/fixmystreet/report/update-form.html:28 @@ -798,7 +753,7 @@ msgstr "" msgid "Duplicate" msgstr "ႏွစ္ခုျပဳလုပ္မည္" -#: templates/web/base/admin/body.html:98 +#: templates/web/base/admin/body.html:106 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" @@ -808,20 +763,20 @@ msgstr "" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 -#: templates/web/base/admin/users.html:31 +#: templates/web/base/admin/users.html:33 #: templates/web/zurich/admin/problem_row.html:42 msgid "Edit" msgstr "ျပင္ဆင္မည္" -#: templates/web/base/admin/body.html:212 +#: templates/web/base/admin/body.html:220 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "စာကိုယ္ကိုအေသးစိတ္ျပင္မည္" #: templates/web/base/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:2 +#: 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:2 +#: templates/web/zurich/admin/report_edit.html:1 #: templates/web/zurich/admin/report_edit.html:5 msgid "Editing problem %d" msgstr "%dျပႆနာကိုျပင္ဆင္ေနသည္" @@ -835,12 +790,12 @@ msgstr "အသစ္မြမ္းမံျခင္း %dကိုျပင္ msgid "Editing user %d" msgstr "%dအသံုးျပဳသူကိုျပင္ဆင္ေနသည္" -#: templates/web/base/admin/category_edit.html:86 +#: templates/web/base/admin/category_edit.html:91 msgid "Editor" msgstr "အယ္ဒီတာ" #: templates/web/base/admin/bodies.html:23 -#: templates/web/base/admin/category_edit.html:83 +#: templates/web/base/admin/category_edit.html:88 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 #: templates/web/fixmystreet/auth/general.html:21 @@ -851,15 +806,23 @@ msgstr "အယ္ဒီတာ" msgid "Email" msgstr "အီးေမးလ္" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1303 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1301 msgid "Email added to abuse list" msgstr "အလြဲသံုးသည့္စာရင္းထဲတြင္အီးေမးလ္ထည့္ျပီး" -#: templates/web/base/admin/body.html:147 +#: templates/web/base/admin/body.html:155 msgid "Email address:" msgstr "အီးေမးလ္လိပ္စာ-" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1300 +#: templates/web/base/tokens/confirm_alert.html:6 +msgid "Email alert created" +msgstr "" + +#: templates/web/base/tokens/confirm_alert.html:10 +msgid "Email alert deleted" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1298 msgid "Email already in abuse list" msgstr "အလြဲသံုးသည့္စာရင္းထဲတြင္အီးေမးလ္ရွိျပီး" @@ -871,8 +834,8 @@ msgstr "ေဒသအတြင္းျပႆနာအသစ္မ်ားကိ msgid "Email me updates" msgstr "အသစ္မြမ္းမံမႈမ်ားကိုကၽြႏ္ုပ္ထံသို႕အီးေမးလ္ပို႔မည္" -#: templates/web/base/admin/category_edit.html:26 -#: templates/web/base/admin/report_edit.html:67 +#: templates/web/base/admin/category_edit.html:31 +#: templates/web/base/admin/report_edit.html:80 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 @@ -883,32 +846,32 @@ msgstr "အသစ္မြမ္းမံမႈမ်ားကိုကၽြႏ msgid "Email:" msgstr "အီးေမးလ္-" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:322 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 msgid "Email: %s" msgstr "အီးေမးလ္ -%s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 msgid "Empty flat or maisonette" msgstr "တိုက္ခန္းအလြတ္သို႔မဟုတ္ maisonette" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:631 msgid "Empty house or bungalow" msgstr "အိမ္အလြတ္သို႔မဟုတ္ဘန္ဂလိုအလြတ္" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:622 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty office or other commercial" msgstr "ရံုးအလြတ္သို႔မဟုတ္တျခားစီးပြားေရးအလြတ္" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:623 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Empty pub or bar" msgstr "အလြတ္အရက္ဆိုင္သို႔မဟုတ္ဘား" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:624 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty public building - school, hospital, etc." msgstr "အမ်ားျပည္သူႏွင့္ဆိုင္ေသာတိုက္အလြတ္-ေက်ာင္း၊ေဆးရံုစသည္ျဖင့္.." -#: templates/web/base/admin/body-form.html:158 -#: templates/web/base/admin/body-form.html:159 +#: templates/web/base/admin/body-form.html:162 +#: templates/web/base/admin/body-form.html:163 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" @@ -916,8 +879,8 @@ msgid "" " <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>." msgstr "" -#: templates/web/base/admin/body-form.html:215 -#: templates/web/base/admin/body-form.html:216 +#: templates/web/base/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:223 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" @@ -928,11 +891,11 @@ msgstr "" msgid "End Date:" msgstr "ျပီးသည့္ရက္-" -#: templates/web/base/admin/body-form.html:126 +#: templates/web/base/admin/body-form.html:130 msgid "Endpoint" msgstr "ျပီးဆံုးမွတ္-" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:72 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:73 msgid "Enter a Zürich street name" msgstr "လမ္းနာမည္ ျဖည့္စြက္ပါ" @@ -945,7 +908,9 @@ msgstr "ယူေကအနီးနားရွိ စာတိုက္နံ msgid "Enter a nearby postcode, or street name and area" msgstr "အနီးနားရွိ စာတိုက္နံပါတ္၊သို႔မဟုတ္လမ္းအမည္ႏွင့္ဧရိယာရိုက္ထည့္ပါ" +#: templates/web/base/around/postcode_form.html:1 #: templates/web/base/around/postcode_form.html:2 +#: templates/web/fixmystreet/around/postcode_form.html:10 #: templates/web/fixmystreet/around/postcode_form.html:11 msgid "Enter a nearby street name and area" msgstr "အနီးနားရွိလမ္းအမည္ႏွင့္ဧရိယာကိုရိုက္ထည့္ပါ" @@ -955,7 +920,7 @@ msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "" #: templates/web/base/auth/general.html:64 -#: templates/web/base/report/new/fill_in_details_form.html:170 +#: templates/web/base/report/new/fill_in_details_form.html:151 #: templates/web/base/report/update-form.html:124 msgid "Enter a new password:" msgstr "စကား၀ွက္အသစ္တစ္ခုရိုက္ထည့္ပါ-" @@ -967,7 +932,7 @@ msgstr "စကား၀ွက္အသစ္တစ္ခုရိုက္ထည msgid "Enter a password" msgstr "စကား၀ွက္ရိုက္ထည့္ပါ" -#: templates/web/base/index-steps.html:33 +#: templates/web/base/index-steps.html:26 msgid "Enter details of the problem" msgstr "ျပႆနာ၏အေသးစိတ္အခ်က္အလက္မ်ားကိုရိုက္ထည့္ပါ" @@ -990,16 +955,21 @@ msgstr "နမူနာစာတိုက္ေသတၱာနံပါတ္ %s msgid "Examples:" msgstr "နမူနာမ်ား -" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:47 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" -#: templates/web/base/admin/report_edit.html:76 +#: templates/web/base/admin/body-form.html:81 +msgid "External URL" +msgstr "" + +#: templates/web/base/admin/category_edit.html:27 +#: templates/web/base/admin/report_edit.html:92 msgid "Extra data:" msgstr "ေနာက္ထပ္အခ်က္အလက္မ်ား-" -#: templates/web/base/contact/submit.html:15 -msgid "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>." +#: templates/web/base/contact/submit.html:13 +msgid "Failed to send message" msgstr "" #: templates/web/zurich/admin/index-dm.html:33 @@ -1012,7 +982,7 @@ msgstr "အစီရင္ခံစာစာရင္းကိုစစ္ထု msgid "First time" msgstr "ပထမအၾကိမ္" -#: templates/web/base/admin/body.html:40 +#: templates/web/base/admin/body.html:48 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" @@ -1043,9 +1013,9 @@ msgid "" msgstr "" #: templates/web/base/admin/index.html:55 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:41 -#: templates/web/base/admin/report_edit.html:42 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:54 +#: templates/web/base/admin/report_edit.html:55 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/update-form.html:30 @@ -1056,17 +1026,18 @@ msgstr "" msgid "Fixed" msgstr "ျပင္ျပီးျပီ" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:43 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:56 msgid "Fixed - Council" msgstr "ျပင္ျပီးျပီ-ေကာင္စီ" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:42 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:55 msgid "Fixed - User" msgstr "ျပင္ျပီးျပီ-အသံုးျပဳသူ" -#: templates/web/base/my/my.html:35 templates/web/fixmystreet/my/my.html:41 +#: templates/web/base/my/my.html:35 +#: templates/web/fixmystreet/my/_problem-list.html:7 msgid "Fixed reports" msgstr "ျပင္ျပီးေၾကာင္းအစီရင္ခံစာ" @@ -1074,7 +1045,7 @@ msgstr "ျပင္ျပီးေၾကာင္းအစီရင္ခံစ msgid "Fixed:" msgstr "ျပင္ျပီးျပီ" -#: templates/web/base/admin/body-form.html:84 +#: templates/web/base/admin/body-form.html:89 #: templates/web/zurich/admin/body-form.html:36 msgid "Flag as deleted" msgstr "ဖ်က္ျပီးျပီဟုသတ္မွတ္မည္" @@ -1083,7 +1054,7 @@ msgstr "ဖ်က္ျပီးျပီဟုသတ္မွတ္မည္" msgid "Flag user" msgstr "သတ္မွတ္သည့္အသံုးျပဳသူ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "" @@ -1092,7 +1063,7 @@ msgstr "" msgid "Flagged reports and users" msgstr "အမွတ္အသားျပဳလုပ္ထားသည့္ အသံုးျပဳသူမ်ားကို ေဖာ္ျပျခင္း" -#: templates/web/base/admin/user-form.html:45 +#: templates/web/base/admin/user-form.html:46 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page." msgstr "" @@ -1100,8 +1071,8 @@ msgstr "" msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." msgstr "" -#: templates/web/base/admin/report_edit.html:78 -#: templates/web/base/admin/user-form.html:51 +#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/user-form.html:52 msgid "Flagged:" msgstr "အမွတ္အသားျပဳလုပ္ထားျခင္း" @@ -1110,10 +1081,6 @@ msgstr "အမွတ္အသားျပဳလုပ္ထားျခင္း msgid "Follow a ward link to view only reports within that ward." msgstr "ရပ္ကြက္ထဲမွအစီရင္ခံစာမ်ားကိုသာၾကည့္ရန္ရပ္ကြက္လင့္ခ္ကိုလိုက္ၾကည့္ပါ" -#: templates/web/base/admin/report_edit.html:30 -msgid "For council(s):" -msgstr "ေကာင္စီ(မ်ား)အတြက္ -" - #: templates/web/base/admin/body-form.html:65 msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "" @@ -1126,8 +1093,6 @@ msgstr "သင္၏စကား၀ွက္ေမ့သြားျပီလာ #: templates/web/base/faq/faq-en-gb.html:1 #: templates/web/base/static/privacy.html:1 #: templates/web/base/static/privacy.html:2 -#: templates/web/fiksgatami/faq/faq-nb.html:1 -#: templates/web/fiksgatami/nn/faq/faq-nn.html:1 msgid "Frequently Asked Questions" msgstr "မၾကာခဏေမးေသာေမးခြန္းမ်ား" @@ -1140,13 +1105,13 @@ msgstr "Google Maps ေပၚက GeoRSS" msgid "Get updates" msgstr "မြမ္းမံထားေသာအသစ္မ်ားရယူရန္" -#: templates/web/fixmystreet/reports/_rss.html:4 +#: templates/web/fixmystreet/reports/_rss.html:3 #: 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 +#: templates/web/fixmystreet/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "" @@ -1155,6 +1120,10 @@ msgstr "" msgid "Give me an RSS feed" msgstr "ကၽြႏ္ုပ္ကို RSS Feed ေပးပါ" +#: templates/web/base/questionnaire/completed.html:14 +msgid "Glad to hear it’s been fixed!" +msgstr "" + #: templates/web/base/alert/index.html:34 #: templates/web/base/around/postcode_form.html:8 #: templates/web/fixmystreet/around/postcode_form.html:21 @@ -1162,7 +1131,7 @@ msgstr "ကၽြႏ္ုပ္ကို RSS Feed ေပးပါ" msgid "Go" msgstr "သြားမည္" -#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:93 msgid "Going to send questionnaire?" msgstr "စစ္တမ္းကိုပို႔ေတာ့မွာလား။" @@ -1184,9 +1153,7 @@ msgstr "ဒီျပႆနာကိုေျဖရွင္းျပီးျပ msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "ယခင္က ေကာင္စီထံ ျပႆနာမ်ား အစီရင္ခံဖူးသလား။ သို႔မဟုတ္ ဒါက ပထမဦးဆံုး အႀကိမ္လား?" -#: templates/web/base/footer.html:15 templates/web/fiksgatami/footer.html:27 -#: templates/web/fiksgatami/nn/footer.html:27 -#: templates/web/fixmystreet/footer.html:30 +#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:30 #: templates/web/zurich/faq/faq-de-ch.html:1 #: templates/web/zurich/footer.html:21 #: templates/web/zurich/nav_over_content.html:8 @@ -1198,18 +1165,17 @@ msgstr "အကူအညီ" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "" -#: templates/web/fiksgatami/header.html:48 -#: templates/web/fixmystreet/header.html:52 +#: templates/web/fixmystreet/header.html:58 #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "မဂၤလာပါ%s" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:50 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:63 +#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/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:86 #: templates/web/zurich/admin/report_edit.html:90 #: templates/web/zurich/admin/stats.html:32 @@ -1225,7 +1191,7 @@ msgstr "အေဟာင္းေဖ်ာက္ထားေသာ" msgid "Hide pins" msgstr "" -#: templates/web/base/admin/category_edit.html:79 +#: templates/web/base/admin/category_edit.html:84 msgid "History" msgstr "ရာဇ၀င္" @@ -1241,19 +1207,25 @@ msgstr "ျပႆနာကိုဘယ္လိုအစီရင္ခံစာ msgid "How to send successful reports" msgstr "ေကာင္းမြန္ေသာအစီရင္ခံစာကိုဘယ္လိုပို႔မလဲ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:740 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" +#: templates/web/base/tokens/confirm_problem.html:23 +#: templates/web/base/tokens/confirm_problem.html:27 +msgid "I just reported a problem on @fixmystreet" 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." +#: templates/web/base/tokens/confirm_update.html:19 +#: templates/web/base/tokens/confirm_update.html:23 +msgid "I just updated a problem on @fixmystreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:260 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +msgid "I'm afraid we couldn't locate your problem in the database.\n" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 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 "" @@ -1275,7 +1247,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:125 +#: templates/web/base/admin/body.html:133 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." @@ -1293,7 +1265,12 @@ msgstr "သင္မျပဳလုပ္ပါကသင္၏ျပႆနာက msgid "If you do not, your update will not be posted." msgstr "သင္မျပဳလုပ္ပါကသင္၏မြမ္းမံမႈကိုမတင္ႏိုင္ပါ" -#: templates/web/base/report/new/councils_text_none.html:9 +#: templates/web/base/questionnaire/completed.html:8 +msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." +msgstr "" + +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:8 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 "ျပႆနာ တစ္ခုကို ဤေနရာတြင္ တင္သြင္းပါက ျပႆနာ၏ အေသးစိတ္ အခ်က္အလက္ကို အမ်ားျပည္သူ ျမင္ေတြ႕ႏိုင္သည္။ သို႔ေသာ္ ျပႆနာကို ေကာင္စီထံ အစီရင္ခံမည္ မဟုတ္ပါ။" @@ -1309,34 +1286,34 @@ msgid "" "your experience of getting the problem fixed?" msgstr "" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/body.html:149 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/base/admin/body-form.html:200 -#: templates/web/base/admin/body-form.html:201 +#: templates/web/base/admin/body-form.html:207 +#: templates/web/base/admin/body-form.html:208 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable <strong>extended Open311 stauses</strong> if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/body-form.html:187 -#: templates/web/base/admin/body-form.html:188 +#: templates/web/base/admin/body-form.html:194 +#: templates/web/base/admin/body-form.html:195 msgid "" "If you've enabled Open311 update-sending above, enable <strong>suppression of alerts</strong> \n" " if you do <strong>not</strong> want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/body-form.html:173 -#: templates/web/base/admin/body-form.html:174 +#: templates/web/base/admin/body-form.html:177 +#: templates/web/base/admin/body-form.html:178 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:127 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 msgid "Illegal ID" msgstr "တရားမ၀င္ေသာအိုင္ဒီ" @@ -1361,17 +1338,21 @@ 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:143 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:38 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:144 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 #: templates/web/fixmystreet/report/banner.html:19 -#: templates/web/zurich/admin/header.html:2 +#: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 #: templates/web/zurich/admin/report_edit.html:99 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "လုပ္ေဆာင္ေနဆဲ" +#: templates/web/base/tokens/confirm_alert.html:11 +msgid "Inbox zero, here we come!" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:160 msgid "Include reporter personal details" msgstr "" @@ -1380,7 +1361,7 @@ msgstr "" msgid "Include unconfirmed reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:354 +#: perllib/FixMyStreet/App/Controller/Open311.pm:359 msgid "Incorrect has_photo value \"%s\"" msgstr "" @@ -1388,29 +1369,29 @@ msgstr "" msgid "Internal notes" msgstr "အတြင္းမွတ္စု" -#: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:61 msgid "Internal referral" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:339 +#: perllib/FixMyStreet/App/Controller/Open311.pm:344 msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1114 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1112 msgid "Invalid end date" msgstr "ေနာက္ဆံုးေန႔မမွန္ကန္ပါ" -#: perllib/FixMyStreet/App/Controller/Open311.pm:432 +#: perllib/FixMyStreet/App/Controller/Open311.pm:437 msgid "Invalid format %s specified." msgstr "ပံုစံ %s သည္မမွန္ကန္ပါ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1110 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 msgid "Invalid start date" msgstr "စမည့္ရက္မမွန္ကန္ပါ" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:37 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:50 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 #: templates/web/base/report/update-form.html:30 @@ -1424,8 +1405,12 @@ msgstr "စံုစမ္းစစ္ေဆးေနဆဲ" msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "" +#: templates/web/base/tokens/confirm_problem.html:14 +msgid "It’s on its way to the council right now." +msgstr "" + #: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:150 +#: templates/web/base/report/new/fill_in_details_form.html:131 #: templates/web/base/report/update-form.html:104 #: templates/web/fixmystreet/auth/general.html:47 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 @@ -1434,12 +1419,12 @@ msgstr "" msgid "Keep me signed in on this computer" msgstr "ဒီကြန္ျပဴတာမွာ၀င္ေနေအာင္ျပဳလုပ္မည္" -#: templates/web/base/admin/body.html:62 +#: templates/web/base/admin/body.html:70 #: templates/web/zurich/admin/body.html:16 msgid "Last editor" msgstr "ေနာက္ဆံုးအယ္ဒီတာ" -#: templates/web/base/admin/report_edit.html:72 +#: templates/web/base/admin/report_edit.html:88 msgid "Last update:" msgstr "ေနာက္ဆံုးအသစ္မြမ္းမံျခင္း-" @@ -1447,43 +1432,38 @@ msgstr "ေနာက္ဆံုးအသစ္မြမ္းမံျခင္ msgid "Last update:" msgstr "" -#: templates/web/base/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:229 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "" -#: templates/web/base/admin/body.html:17 templates/web/base/admin/body.html:19 +#: templates/web/base/admin/body.html:27 msgid "List all reported problems" msgstr "အစီရင္ခံစာတင္ျပီးေသာျပႆနာစာရင္းအားလံုး" -#: templates/web/base/report/new/fill_in_details_form.html:69 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:54 -#: templates/web/zurich/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/category_wrapper.html:4 msgid "Loading..." msgstr "ဖြင့္ေနသည္" #: templates/web/base/alert/choose.html:1 #: templates/web/base/alert/choose.html:3 #: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3 -#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:5 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5 #: templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 -#: templates/web/base/tokens/confirm_alert.html:4 #: templates/web/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "ျပည္တြင္း RSS feed မ်ားႏွင့္ အီးေမးလ္ သတိေပးခ်က္မ်ား" -#: templates/web/base/alert/list.html:13 templates/web/base/alert/list.html:14 -#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:3 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:12 +#: templates/web/base/alert/list.html:14 templates/web/base/alert/list.html:3 msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "‘%s’ အတြက္ ျပည္တြင္း RSS feed မ်ားႏွင့္ အီးေမးလ္ သတိေပးခ်က္မ်ား" -#: templates/web/base/footer.html:13 templates/web/fiksgatami/footer.html:25 -#: templates/web/fiksgatami/nn/footer.html:25 -#: templates/web/fixmystreet/footer.html:28 +#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:28 msgid "Local alerts" msgstr "ေဒသတြင္းအသိေပးခ်က္" -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:25 msgid "Locate the problem on a map of the area" msgstr "ဧရိယာ၏ေျမပံုတစ္ခုတြင္ျပႆနာကိုေနရာသတ္မွတ္မည္" @@ -1492,17 +1472,27 @@ msgid "MAP" msgstr "ေျမပံု" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" msgstr "" -#: perllib/FixMyStreet/Map/OSM.pm:42 -msgid "Map © <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/base/admin/report_edit.html:86 +#, fuzzy +msgid "Mark as sent" +msgstr "ပိတ္ထားသည့္ အမွတ္အသား ျပဳလုပ္ထားသည္" -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/user-form.html:44 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." msgstr "" +#: templates/web/base/reports/index.html:24 +msgid "Marked fixed/closed in the past eight weeks" +msgstr "" + +#: templates/web/base/reports/index.html:25 +msgid "Marked fixed/closed more than eight weeks ago" +msgstr "" + #: templates/web/fixmystreet/contact/index.html:106 msgid "Message" msgstr "စာ" @@ -1511,7 +1501,7 @@ msgstr "စာ" msgid "Message:" msgstr "စာ-" -#: perllib/FixMyStreet/App/Controller/Open311.pm:440 +#: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" msgstr "" @@ -1541,11 +1531,11 @@ msgstr "အနီးနားရွိျပႆနာမ်ားစြာ" #: templates/web/fixmystreet/report/update-form.html:138 #: 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:94 +#: templates/web/zurich/report/new/fill_in_details_form.html:77 msgid "Name" msgstr "အမည္" -#: templates/web/base/admin/report_edit.html:66 +#: templates/web/base/admin/report_edit.html:79 #: templates/web/base/admin/update_edit.html:32 #: templates/web/base/admin/user-form.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:43 @@ -1554,25 +1544,25 @@ msgstr "အမည္" msgid "Name:" msgstr "အမည္-" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:321 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:313 msgid "Name: %s" msgstr "အမည္ - %s" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:186 -#: perllib/FixMyStreet/Geocode/OSM.pm:164 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 +#: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:137 +#: perllib/FixMyStreet/Cobrand/UK.pm:127 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 +#: perllib/FixMyStreet/Cobrand/Default.pm:442 +#: perllib/FixMyStreet/Cobrand/Default.pm:482 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:277 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1586,11 +1576,11 @@ msgstr "လုပ္ေဆာင္မႈနီးပါးျပီးပါျ msgid "New <br>problems" msgstr "အသစ္<br>ျပႆနာမ်ား" -#: perllib/FixMyStreet/App/Controller/Admin.pm:264 +#: perllib/FixMyStreet/App/Controller/Admin.pm:261 msgid "New body added" msgstr "စာကိုယ္အသစ္ထည့္ျပီးျပီ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:379 msgid "New category contact added" msgstr "ေခါင္းစဥ္အသစ္အဆက္အသြယ္ထည့္ျပီးျပီ" @@ -1663,15 +1653,15 @@ msgstr "အသစ္မြမ္းမံမႈ - " msgid "Next" msgstr "ေနာက္သို႔" -#: templates/web/base/admin/body.html:72 templates/web/base/admin/body.html:74 -#: templates/web/base/admin/body.html:78 templates/web/base/admin/body.html:80 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:93 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:44 @@ -1689,7 +1679,7 @@ msgstr "စာကိုယ္မရွိ" msgid "No council" msgstr "ေကာင္စီမရွိ" -#: perllib/FixMyStreet/DB/Result/Problem.pm:376 +#: perllib/FixMyStreet/DB/Result/Problem.pm:401 msgid "No council selected" msgstr "မည္သည့္ေကာင္စီမွမေရြးရေသးပါ" @@ -1730,12 +1720,12 @@ msgid "" " your config file is not pointing to a live MapIt service." msgstr "" -#: templates/web/base/report/_support.html:3 +#: templates/web/base/report/_support.html:2 #: templates/web/base/report/_support.html:4 msgid "No supporters" msgstr "ေထာက္ပံ့ေပးမည့္သူမရွိပါ" -#: templates/web/base/admin/report_edit.html:30 +#: templates/web/base/admin/report_edit.html:41 #: templates/web/zurich/admin/report_edit-sdm.html:46 #: templates/web/zurich/admin/report_edit.html:60 msgid "None" @@ -1750,8 +1740,8 @@ msgid "" " activity across their body), the ability to hide reports or set special report statuses." msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:46 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -1767,12 +1757,12 @@ msgstr "ကၽြႏ္ုပ္၏အေသးစိတ္နယ္နမိတ msgid "Not reported before" msgstr "ယခင္ကအစီရင္မခံရေသး" -#: templates/web/base/report/_main.html:61 +#: templates/web/base/report/_main.html:62 msgid "Not reported to council" msgstr "ေကာင္စီသို႔အစီရင္မခံရေသး" -#: templates/web/base/admin/body.html:63 -#: templates/web/base/admin/category_edit.html:87 +#: templates/web/base/admin/body.html:71 +#: templates/web/base/admin/category_edit.html:92 #: templates/web/zurich/admin/body.html:17 msgid "Note" msgstr "မွတ္စု" @@ -1781,8 +1771,8 @@ msgstr "မွတ္စု" 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/base/admin/body.html:178 -#: templates/web/base/admin/category_edit.html:44 +#: templates/web/base/admin/body.html:186 +#: templates/web/base/admin/category_edit.html:49 #: templates/web/zurich/admin/body.html:53 msgid "Note:" msgstr "မွတ္စု -" @@ -1795,7 +1785,7 @@ msgstr "မွတ္စု <strong> %s </strong>" msgid "Now to submit your report…" msgstr "ယခုသင္၏အစီရင္ခံစာကိုသြင္းႏိုင္ပါျပီ …" -#: templates/web/base/report/new/fill_in_details_form.html:132 +#: templates/web/base/report/new/fill_in_details_form.html:113 msgid "Now to submit your report… do you have a FixMyStreet password?" msgstr "" @@ -1812,7 +1802,7 @@ msgid "OK" msgstr "အိုေက" #: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:16 +#: templates/web/base/report/update.html:17 msgid "Offensive? Unsuitable? Tell us" msgstr "ထိခိုက္ေစႏိုင္ေသာ၊မသင့္ေတာ္ဘူးလား၊ ကၽြႏ္ုပ္တို႔ကိုေျပာပါ" @@ -1832,19 +1822,19 @@ msgstr "ပို၍ေဟာင္းေသာ <br> ျပင္ျပီးျ msgid "Older <br>problems" msgstr "ပို၍ေဟာင္းေသာ<br>ျပႆနာမ်ား" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:37 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 msgid "One-line summary" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:137 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:36 -#: templates/web/base/admin/report_edit.html:37 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:138 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:49 +#: templates/web/base/admin/report_edit.html:50 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/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:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/report_edit.html:86 #: templates/web/zurich/admin/report_edit.html:88 @@ -1853,10 +1843,19 @@ msgstr "" msgid "Open" msgstr "ဖြင့္မည္" -#: templates/web/base/my/my.html:30 templates/web/fixmystreet/my/my.html:36 +#: templates/web/base/reports/index.html:22 +msgid "Open for more than four weeks, with an update within the past eight weeks" +msgstr "" + +#: templates/web/base/my/my.html:30 +#: templates/web/fixmystreet/my/_problem-list.html:2 msgid "Open reports" msgstr "အစီရင္ခံစာကိုဖြင့္မည္" +#: templates/web/base/reports/index.html:23 +msgid "Open, but not had any update in eight weeks" +msgstr "" + #: templates/web/base/open311/index.html:70 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "mySociety FixMyStreet ဆာဗာအတြက္ ၃၁၁ API ကိုဖြင့္မည္" @@ -1879,15 +1878,15 @@ msgstr "သို႔မဟုတ္ ျပႆနာမ်ားကိုတင msgid "Or you can subscribe to an alert based upon what ward or council you’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:560 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 -#: perllib/FixMyStreet/DB/Result/Problem.pm:592 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:372 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 +#: perllib/FixMyStreet/DB/Result/Problem.pm:597 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:393 msgid "Other" msgstr "တျခား" @@ -1909,8 +1908,8 @@ msgstr "စာမ်က္ႏွာရွာမေတြ႕ပါ" msgid "Parent" msgstr "ပင္မ" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 msgid "Partial" msgstr "တစ္၀က္" @@ -1930,7 +1929,7 @@ msgstr "စကား၀ွက္-" msgid "Permalink" msgstr "အျမဲတမ္းလင့္ခ္" -#: templates/web/zurich/report/new/fill_in_details_form.html:100 +#: templates/web/zurich/report/new/fill_in_details_form.html:83 msgid "Phone number" msgstr "ဖုန္းနံပါတ္" @@ -1939,27 +1938,27 @@ msgstr "ဖုန္းနံပါတ္" msgid "Phone number (optional)" msgstr "ဖုန္းနံပါတ္(ထည့္ခ်င္မွထည့္ပါ)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:286 -#: templates/web/base/admin/report_edit.html:68 -#: templates/web/base/report/new/fill_in_details_form.html:216 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:291 +#: templates/web/base/admin/report_edit.html:81 +#: templates/web/base/report/new/fill_in_details_form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:46 #: templates/web/zurich/admin/report_edit.html:60 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "ဖုန္း-" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:72 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 #: 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 +#: templates/web/zurich/report/new/fill_in_details_form.html:51 msgid "Photo" msgstr "ဓာတ္ပံု" #: templates/web/base/questionnaire/index.html:71 -#: templates/web/base/report/new/fill_in_details_form.html:103 +#: templates/web/base/report/new/fill_in_details_form.html:84 #: templates/web/base/report/update-form.html:62 #: templates/web/fixmystreet/questionnaire/index.html:91 msgid "Photo:" @@ -1973,11 +1972,11 @@ msgstr "မၾကာေသးခင္ကအနီးအနားက အစီ msgid "Place pin on map" msgstr "ေျမပံုတြင္ပင္တစ္ခုထားမည္" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:38 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/zurich/admin/header.html:2 +#: 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:86 @@ -2011,20 +2010,19 @@ msgstr "သင္၏အီးေမးလ္ကိုစစ္ပါ" msgid "Please check your email address is correct" msgstr "သင္၏အီးေမးလ္လိပ္စာမွန္၊မမွန္ကိုစစ္ေဆးပါ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:349 -#: 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:395 +#: perllib/FixMyStreet/App/Controller/Admin.pm:343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:876 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 +#: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" msgstr "ေခါင္းစဥ္တစ္ခုကိုေရြးပါ" -#: perllib/FixMyStreet/DB/Result/Problem.pm:401 +#: perllib/FixMyStreet/DB/Result/Problem.pm:418 msgid "Please choose a property type" msgstr "ပစၥည္းအမ်ိဳးအစားတစ္ခုကိုေရြးပါ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:370 msgid "Please correct the errors below" msgstr "" @@ -2040,8 +2038,8 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:352 -#: perllib/FixMyStreet/DB/Result/Comment.pm:133 +#: perllib/FixMyStreet/App/Controller/Admin.pm:346 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "စာတစ္ခုရိုက္ထည့္ပါ" @@ -2052,15 +2050,15 @@ msgstr "စာတစ္ခုရိုက္ထည့္ပါ" msgid "Please enter a password" msgstr "စကား၀ွက္တစ္ခုရိုက္ထည့္ပါ" -#: perllib/FixMyStreet/App/Controller/Contact.pm:108 -#: perllib/FixMyStreet/DB/Result/Problem.pm:370 +#: perllib/FixMyStreet/App/Controller/Contact.pm:113 +#: perllib/FixMyStreet/DB/Result/Problem.pm:395 #: templates/web/base/js/translation_strings.html:3 msgid "Please enter a subject" msgstr "ေခါင္းစီးတစ္ခုရိုက္ထည့္ပါ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1050 -#: perllib/FixMyStreet/App/Controller/Admin.pm:351 -#: perllib/FixMyStreet/App/Controller/Admin.pm:997 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin.pm:995 #: perllib/FixMyStreet/DB/Result/User.pm:127 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 @@ -2068,16 +2066,16 @@ msgid "Please enter a valid email" msgstr "မွန္ကန္ေသာအီးေမးလ္တစ္ခုရိုက္ထည့္ပါ" #: perllib/FixMyStreet/App/Controller/Alert.pm:346 -#: perllib/FixMyStreet/App/Controller/Contact.pm:118 +#: perllib/FixMyStreet/App/Controller/Contact.pm:123 msgid "Please enter a valid email address" msgstr "မွန္ကန္ေသာအီးေမးလ္လိပ္စာတစ္ခုရိုက္ထည့္ပါ" -#: perllib/FixMyStreet/DB/Result/Problem.pm:373 +#: perllib/FixMyStreet/DB/Result/Problem.pm:398 #: templates/web/base/js/translation_strings.html:4 msgid "Please enter some details" msgstr "တစ္ခ်ိဳ႕အခ်က္အလက္မ်ားကိုရိုက္ထည့္ပါ" -#: perllib/FixMyStreet/App/Controller/Contact.pm:107 +#: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/User.pm:124 #: templates/web/base/auth/general.html:13 #: templates/web/base/auth/general.html:8 @@ -2091,7 +2089,7 @@ msgid "Please enter your email" msgstr "သင္၏အီးေမးလ္ကိုရိုက္ထည့္ပါ" #: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:75 msgid "Please enter your email address" msgstr "သင္၏အီးေမးလ္လိပ္စာကိုရိုက္ထည့္ပါ" @@ -2099,14 +2097,14 @@ msgstr "သင္၏အီးေမးလ္လိပ္စာကိုရို msgid "Please enter your first name" msgstr "သင္၏ပထမအမည္ကိုရိုက္ထည့္ပါ" -#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: perllib/FixMyStreet/Cobrand/UK.pm:318 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:106 -#: perllib/FixMyStreet/DB/Result/Comment.pm:130 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Contact.pm:111 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 +#: perllib/FixMyStreet/DB/Result/Problem.pm:406 #: perllib/FixMyStreet/DB/Result/User.pm:120 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" @@ -2129,7 +2127,7 @@ msgstr "သင္၏ေခါင္းစဥ္ကိုရိုက္ထည္ msgid "Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a href=\"/\">front page</a>." msgstr "ျပန္လည္ ဝင္ေရာက္ပါ သို႔မဟုတ္ အေရွ႕စာမ်က္ႏွာကို ျပန္သြားပါ။" -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:8 msgid "Please fill in details of the problem below." msgstr "" @@ -2144,7 +2142,7 @@ msgstr "" msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:251 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" @@ -2167,16 +2165,16 @@ msgstr "" msgid "Please note:" msgstr "ေက်းဇူးျပဳျပီးမွတ္သားပါ-" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:246 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:254 msgid "Please provide some explanation as to why you're reopening this report" msgstr "သင္ဘာလို႔ဒီသတင္းပို႔ခ်က္ကိုျပန္ဖြင့္ရသလဲဆိုသည့္ရွင္းလင္းခ်က္ကိုေျပာျပေပးပါ" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:261 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 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:247 msgid "Please say whether you've ever reported a problem to your council before" msgstr "သင္၏ေကာင္စီသို႔သင္ယခင္ကသတင္းပို႔ဖူးေၾကာင္းေျပာျပေပးပါ" @@ -2188,7 +2186,7 @@ msgstr "သင္လိုခ်င္ေသာ feed ကိုေရြးပါ msgid "Please select the type of alert you want" msgstr "သင္လိုခ်င္ေသာ အသိေပးခ်က္အမ်ိဳးအစားမ်ားကိုေရြးပါ" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please state whether or not the problem has been fixed" msgstr "ျပႆနာေျဖရွင္းျပီးျပီ၊မရွင္းျပီးျပီကိုေဖာ္ျပပါ" @@ -2196,15 +2194,13 @@ msgstr "ျပႆနာေျဖရွင္းျပီးျပီ၊မရွ msgid "Please take a look at the updates that have been left." msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:176 +#: perllib/FixMyStreet/App/Controller/Photo.pm:177 +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 +#: perllib/FixMyStreet/App/Controller/Photo.pm:189 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:109 +#: perllib/FixMyStreet/App/Controller/Contact.pm:114 msgid "Please write a message" msgstr "စာတစ္ေၾကာင္းေရးပါ" @@ -2243,14 +2239,14 @@ msgstr "ယခင္က" msgid "Privacy" msgstr "" -#: templates/web/base/admin/body.html:194 -#: templates/web/base/admin/body.html:77 -#: templates/web/base/admin/category_edit.html:40 -#: templates/web/base/admin/report_edit.html:79 +#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:85 +#: templates/web/base/admin/category_edit.html:45 +#: templates/web/base/admin/report_edit.html:95 msgid "Private" msgstr "ကိုယ္ပိုင္" -#: templates/web/base/maps/openlayers.html:86 +#: templates/web/base/maps/openlayers.html:89 msgid "Problem" msgstr "ျပႆနာ" @@ -2271,7 +2267,7 @@ msgstr "ေကာင္စီ %s သို႔ ျပႆနာ %s ကိုပိ msgid "Problem breakdown by state" msgstr "ျပည္နယ္မွ ျပႆနာကိုထပ္မံခြဲစိတ္လိုက္သည္" -#: perllib/FixMyStreet/App/Controller/Admin.pm:968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:966 msgid "Problem marked as open." msgstr "ျပႆနာကို ဖြင့္ထားသည္" @@ -2306,16 +2302,15 @@ msgstr "FixMyStreet ေပၚတြင္ လတ္တေလာ တင္ျပ msgid "Problems within %.1fkm of this location" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:629 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:114 +#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:151 -#: perllib/FixMyStreet/Cobrand/UK.pm:217 +#: perllib/FixMyStreet/Cobrand/UK.pm:207 msgid "Problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:122 -#: perllib/FixMyStreet/Cobrand/UK.pm:231 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "Problems within %s ward" msgstr "" @@ -2333,7 +2328,7 @@ msgstr "" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "" -#: templates/web/base/admin/report_edit.html:32 +#: templates/web/base/admin/report_edit.html:45 msgid "Property address:" msgstr "" @@ -2350,7 +2345,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 "နာမည္ႏွင့္ စကားဝွက္ကို မထည့္သြင္းခ်င္လွ်င္ ရသည္။ နံပါတ္ႏွင့္ စကားဝွက္ ထည့္သြင္းပါက ျပႆနာမ်ားကို တင္ျပျခင္း၊ update မ်ား ျပဳလုပ္ျခင္းႏွင့္ အစီရင္ခံစာမ်ား စီမံခန္႔ခြဲျခင္းတို႔ကို ပိုမိုလြယ္ကူစြာ ျပဳလုပ္ႏိုင္မည္။" -#: templates/web/base/report/new/fill_in_details_form.html:174 +#: templates/web/base/report/new/fill_in_details_form.html:155 #: templates/web/base/report/update-form.html:128 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 #: templates/web/fixmystreet/report/update-form.html:119 @@ -2371,7 +2366,7 @@ msgstr "" msgid "Publish the response" msgstr "" -#: templates/web/base/questionnaire/completed.html:2 +#: templates/web/base/questionnaire/completed.html:1 #: templates/web/base/questionnaire/index.html:0 #: templates/web/base/questionnaire/index.html:14 #: templates/web/base/questionnaire/index.html:4 @@ -2390,11 +2385,12 @@ msgstr "%d, %s ျပႆနာ အတြက္ %d မွ %s ထံ ေျဖၾ msgid "Questionnaire %d sent for problem %d" msgstr "%d ျပႆနာ အတြက္ %d ေပးပို႔သည့္ စစ္တမ္းေမးခြန္းလႊာ" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 msgid "Questionnaire filled in by problem reporter" msgstr "ျပႆနာ အစီရင္ခံသူ ျဖည့္စြက္ရမည့္ စစ္တမ္းေမးခြန္းလႊာ" #: templates/web/base/alert/_list.html:21 +#: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display.html:50 #: templates/web/base/reports/_rss.html:1 @@ -2404,11 +2400,11 @@ msgstr "ျပႆနာ အစီရင္ခံသူ ျဖည့္စြက msgid "RSS feed" msgstr "RSS feed" -#: perllib/FixMyStreet/Cobrand/UK.pm:260 perllib/FixMyStreet/Cobrand/UK.pm:272 +#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 msgid "RSS feed for %s" msgstr "%s အတြက္ RSS feed" -#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "RSS feed for %s ward, %s" msgstr "%s အုပ္ခ်ဳဳပ္ေရးဌာန %s အတြက္ RSS feed" @@ -2416,15 +2412,11 @@ msgstr "%s အုပ္ခ်ဳဳပ္ေရးဌာန %s အတြက္ R #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:167 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:175 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:185 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:193 -#: perllib/FixMyStreet/Cobrand/UK.pm:286 perllib/FixMyStreet/Cobrand/UK.pm:298 +#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 msgid "RSS feed of %s" msgstr "%s ၏ RSS feed" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 msgid "RSS feed of %s, within %s ward" msgstr "%s အုပ္ခ်ဳပ္ေရးဌာန အတြင္းရိွ %s ၏ RSS feed" @@ -2437,20 +2429,19 @@ msgstr "အနီးအနားရိွ ျပႆနာမ်ား၏ RSS fee msgid "RSS feed of problems in this %s" msgstr "ဒီ %s ရိွ ျပႆနာမ်ား၏ RSS feed" -#: perllib/FixMyStreet/Cobrand/Default.pm:630 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:115 +#: perllib/FixMyStreet/Cobrand/Default.pm:651 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:150 -#: perllib/FixMyStreet/Cobrand/UK.pm:224 +#: perllib/FixMyStreet/Cobrand/UK.pm:214 msgid "RSS feed of problems within %s" msgstr "%s အတြင္းရိွ ျပႆနာမ်ား၏ RSS feed" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 -#: perllib/FixMyStreet/Cobrand/UK.pm:230 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s ward" msgstr "%s အုပ္ခ်ဳပ္ေရးဌာန အတြင္းရိွ ျပႆနာမ်ား၏ RSS feed" -#: templates/web/base/around/display_location.html:3 +#: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:4 msgid "RSS feed of recent local problems" msgstr "လတ္တေလာ ျပည္တြင္း ျပႆနာမ်ား အတြက္ RSS feed" @@ -2490,15 +2481,18 @@ msgstr "" msgid "Remove flag" msgstr "" -#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/report_edit.html:110 #: templates/web/base/admin/update_edit.html:62 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "ဓာတ္ပံု ဖယ္ရွားရန္ (မၿပီးေျမာက္ႏိုင္ပါ)" -#: templates/web/base/footer.html:7 templates/web/fiksgatami/footer.html:19 -#: templates/web/fiksgatami/nn/footer.html:19 -#: templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 +msgid "Report" +msgstr "" + +#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 #: templates/web/zurich/footer.html:17 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2508,11 +2502,6 @@ msgstr "ျပႆနာကို အစီရင္ခံ တင္ျပရန msgid "Report abuse" msgstr "" -#: templates/web/base/report_created.html:1 -#: templates/web/base/report_created.html:3 -msgid "Report created" -msgstr "" - #: perllib/FixMyStreet/App/Controller/Rss.pm:295 msgid "Report on %s" msgstr "" @@ -2536,7 +2525,7 @@ msgstr "" msgid "Reported %s, to %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:580 #: templates/web/base/contact/index.html:50 #: templates/web/fixmystreet/contact/index.html:65 msgid "Reported anonymously at %s" @@ -2548,7 +2537,7 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:598 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 #: templates/web/base/contact/index.html:52 #: templates/web/fixmystreet/contact/index.html:67 msgid "Reported by %s at %s" @@ -2558,31 +2547,35 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:571 +#: perllib/FixMyStreet/DB/Result/Problem.pm:576 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:598 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:567 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:589 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:563 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:583 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 msgid "Reported via %s in the %s category by %s at %s" msgstr "" -#: templates/web/base/around/around_index.html:2 +#: templates/web/base/reports/index.html:21 +msgid "Reported within the last four weeks" +msgstr "" + +#: templates/web/base/around/around_index.html:1 #: templates/web/base/around/around_index.html:3 #: templates/web/base/js/translation_strings.html:41 #: templates/web/base/report/new/fill_in_details.html:0 @@ -2592,14 +2585,13 @@ msgstr "" msgid "Reporting a problem" msgstr "ျပႆနာကို အစီရင္ခံ တင္ျပျခင္း" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:294 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:409 -#: perllib/FixMyStreet/DB/Result/Problem.pm:413 +#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" @@ -2615,7 +2607,7 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:85 msgid "Resend report" msgstr "အစီရင္ခံ ျပန္လည္ေပးပို႔ရန္" @@ -2623,36 +2615,35 @@ msgstr "အစီရင္ခံ ျပန္လည္ေပးပို႔ရ msgid "Right place?" msgstr "" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:193 -#: perllib/FixMyStreet/Geocode/OSM.pm:171 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:167 +#: perllib/FixMyStreet/Geocode/OSM.pm:152 msgid "Road operator for this named road (derived from road reference number and type): %s" msgstr "" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:190 -#: perllib/FixMyStreet/Geocode/OSM.pm:168 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:164 +#: perllib/FixMyStreet/Geocode/OSM.pm:149 msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1394 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 -#: templates/web/base/admin/report_edit.html:90 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1403 +#: templates/web/base/admin/report_edit.html:106 #: templates/web/zurich/admin/report_edit.html:73 msgid "Rotate Left" msgstr "ဘယ္ဘက္ကို လွည့္ပါ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1394 -#: templates/web/base/admin/report_edit.html:91 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: templates/web/base/admin/report_edit.html:107 #: templates/web/zurich/admin/report_edit.html:74 msgid "Rotate Right" msgstr "ညာဘက္ကို လွည့္ပါ" #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:200 -#: templates/web/base/admin/category_edit.html:76 +#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/category_edit.html:81 #: templates/web/zurich/admin/body.html:59 msgid "Save changes" msgstr "ေျပာင္းလဲမႈမ်ားကို သိမ္းဆည္းရန္" @@ -2680,7 +2671,7 @@ msgstr "" msgid "Searching found no reports." msgstr "" -#: templates/web/base/admin/users.html:39 +#: templates/web/base/admin/users.html:41 msgid "Searching found no users." msgstr "" @@ -2703,15 +2694,15 @@ 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:680 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "Sent to %s %s later" msgstr "" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:84 msgid "Sent:" msgstr "" -#: templates/web/base/admin/report_edit.html:73 +#: templates/web/base/admin/report_edit.html:89 #: templates/web/zurich/admin/stats.html:45 msgid "Service:" msgstr "" @@ -2720,7 +2711,7 @@ msgstr "" msgid "Share" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:211 +#: templates/web/base/report/new/fill_in_details_form.html:192 #: templates/web/base/report/update-form.html:157 #: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 @@ -2765,12 +2756,12 @@ msgstr "" msgid "Signed in as %s" msgstr "%s အေနျဖင့္ ဝင္ထားသည္" -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 msgid "Some categories may require additional information." msgstr "" -#: templates/web/base/admin/body-form.html:145 -#: templates/web/base/admin/body-form.html:146 +#: templates/web/base/admin/body-form.html:149 +#: templates/web/base/admin/body-form.html:150 msgid "" "Some endpoints require an <strong>API key</strong> to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -2781,11 +2772,11 @@ msgid "Some photos of recent reports" msgstr "" #: perllib/FixMyStreet/App/View/Email.pm:32 -#: perllib/FixMyStreet/App/View/Web.pm:44 +#: perllib/FixMyStreet/App/View/Web.pm:43 msgid "Some text to localize" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:88 +#: perllib/FixMyStreet/Cobrand/UK.pm:78 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -2793,17 +2784,16 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:215 -#: perllib/FixMyStreet/Geocode.pm:26 perllib/FixMyStreet/Geocode/Bing.pm:56 -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:73 -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:93 -#: perllib/FixMyStreet/Geocode/Google.pm:72 -#: perllib/FixMyStreet/Geocode/OSM.pm:64 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:214 +#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 +#: perllib/FixMyStreet/Geocode/Google.pm:47 +#: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "" -#: perllib/FixMyStreet/Geocode/Bing.pm:51 -#: perllib/FixMyStreet/Geocode/Google.pm:67 +#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: perllib/FixMyStreet/Geocode/Google.pm:44 #: perllib/FixMyStreet/Geocode/Zurich.pm:87 msgid "Sorry, we could not parse that location. Please try again." msgstr "" @@ -2812,7 +2802,7 @@ msgstr "" msgid "Start Date:" msgstr "" -#: templates/web/base/admin/body.html:61 +#: templates/web/base/admin/body.html:69 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 @@ -2820,7 +2810,7 @@ msgstr "" msgid "State" msgstr "" -#: templates/web/base/admin/report_edit.html:34 +#: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 #: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:53 @@ -2829,8 +2819,8 @@ msgstr "" msgid "State:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1200 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:304 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:308 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" @@ -2846,7 +2836,7 @@ msgstr "" msgid "Still open, via questionnaire, %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:381 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 msgid "Subcategory: %s" msgstr "" @@ -2866,19 +2856,19 @@ msgid "Subject:" msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:115 -#: templates/web/base/report/new/fill_in_details_form.html:155 -#: templates/web/base/report/new/fill_in_details_form.html:177 +#: templates/web/base/report/new/fill_in_details_form.html:136 +#: templates/web/base/report/new/fill_in_details_form.html:158 +#: templates/web/base/report/new/fill_in_details_form.html:96 #: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 -#: templates/web/zurich/report/new/fill_in_details_form.html:108 +#: templates/web/zurich/report/new/fill_in_details_form.html:91 msgid "Submit" msgstr "" -#: templates/web/base/admin/report_edit.html:97 +#: templates/web/base/admin/report_edit.html:113 #: templates/web/base/admin/update_edit.html:65 -#: templates/web/base/admin/user-form.html:55 +#: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:64 #: templates/web/zurich/admin/report_edit.html:221 #: templates/web/zurich/admin/update_edit.html:38 @@ -2890,8 +2880,8 @@ msgstr "" msgid "Submit questionnaire" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:133 -#: templates/web/zurich/admin/header.html:2 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:134 +#: 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 @@ -2915,8 +2905,8 @@ msgstr "" msgid "Subscribe me to an email alert" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1191 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:293 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 #: templates/web/zurich/admin/index-dm.html:1 @@ -2932,7 +2922,7 @@ msgstr "အက်ဥ္းခ်ဳပ္" msgid "Summary reports" msgstr "အစီရင္ခံစာအက်ဥ္းခ်ဳပ္" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 msgid "Survey" msgstr "စစ္တမ္း" @@ -2946,7 +2936,7 @@ msgstr "စစ္တမ္းရလဒ္" msgid "Text" msgstr "စာ" -#: templates/web/base/admin/body.html:21 +#: templates/web/base/admin/body.html:28 msgid "Text only version" msgstr "စာဗားရွင္းသာ" @@ -2955,49 +2945,55 @@ msgstr "စာဗားရွင္းသာ" msgid "Text:" msgstr "စာ-" -#: templates/web/base/tokens/confirm_update.html:9 -msgid "Thank you — you can <a href=\"%s\">view your updated problem</a> on the site." -msgstr "ေက်းဇူးတင္ပါသည္။ ျပဳျပင္မြမ္းမံထားသည့္ သင္၏ ျပႆနာကို ဆိုက္ေပၚတြင္ ၾကည့္႐ႈႏိုင္သည္။" - -#: templates/web/base/tokens/confirm_problem.html:18 -msgid "Thank you for reporting this issue" +#: templates/web/base/tokens/confirm_problem.html:12 +msgid "Thank you for reporting this issue!" msgstr "" #: templates/web/base/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/fixmystreet/around/around_index.html:28 -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 :" +#: templates/web/base/tokens/confirm_update.html:15 +msgid "Thank you for updating this issue!" msgstr "" -#: templates/web/base/contact/submit.html:8 -msgid "Thanks for your feedback. We'll get back to you as soon as we can!" +#: templates/web/base/contact/submit.html:6 +#: templates/web/base/questionnaire/completed.html:5 +msgid "Thank you for your feedback" +msgstr "" + +#: templates/web/fixmystreet/around/around_index.html:28 +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 :" msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:9 msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "ေက်းဇူးတင္ပါသည္။ ျပင္ဆင္ၿပီး ျဖစ္ေၾကာင္း ၾကားသိရ၍ ဝမ္းသာမိပါသည္။ သင့္အေနျဖင့္ ယခင္က ေကာင္စီထံ ျပႆနာတစ္ခုကို အစီရင္ခံတင္ျပဖူးပါသလား?" -#: perllib/FixMyStreet/App/Controller/Photo.pm:190 +#: perllib/FixMyStreet/App/Controller/Photo.pm:195 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Council.pm:100 +#: perllib/FixMyStreet/App/Controller/Council.pm:97 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 +#: perllib/FixMyStreet/App/Controller/Location.pm:126 msgid "That location does not appear to be in the UK; please try again." msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:81 +#: perllib/FixMyStreet/Cobrand/UK.pm:71 msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:713 +#: perllib/FixMyStreet/App/Controller/Admin.pm:712 +#, fuzzy +msgid "That problem has been marked as sent." +msgstr "ထိုျပႆနာကိုယခုပင္ျပန္ပို႔ပါမည္" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:704 msgid "That problem will now be resent." msgstr "ထိုျပႆနာကိုယခုပင္ျပန္ပို႔ပါမည္" @@ -3009,28 +3005,28 @@ msgstr "ဒီအစီရင္ခံစာကို %s ေပၚတြင္ msgid "That report has been removed from FixMyStreet." msgstr "ကၽြႏ္ုပ္လမ္းကိုျပင္ေပးပါ မွဒီအစီရင္ခံစာကိုဖယ္ျပီးပါျပီ" -#: templates/web/base/admin/body.html:136 +#: templates/web/base/admin/body.html:144 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/base/admin/body-form.html:119 -#: templates/web/base/admin/body-form.html:120 +#: templates/web/base/admin/body-form.html:123 +#: templates/web/base/admin/body-form.html:124 msgid "" "The <strong>endpoint</strong> is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." msgstr "" -#: templates/web/base/admin/body-form.html:132 -#: templates/web/base/admin/body-form.html:133 +#: templates/web/base/admin/body-form.html:136 +#: templates/web/base/admin/body-form.html:137 msgid "" "The <strong>jurisdiction</strong> is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" -#: templates/web/base/admin/body-form.html:90 -#: templates/web/base/admin/body-form.html:91 +#: templates/web/base/admin/body-form.html:94 +#: templates/web/base/admin/body-form.html:95 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>." @@ -3051,7 +3047,7 @@ msgstr "" msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." msgstr "" -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:3 msgid "The council won’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 "" @@ -3078,8 +3074,8 @@ msgstr "ခ်ိဳ႕ယြင္းမႈမွာ - %s" msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:185 -#: perllib/FixMyStreet/Geocode/OSM.pm:163 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:159 +#: perllib/FixMyStreet/Geocode/OSM.pm:144 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap." msgstr "" @@ -3137,7 +3133,7 @@ msgstr "" msgid "The passwords do not match" msgstr "စကား၀ွက္မ်ားသည္မတူညီပါ" -#: templates/web/base/errors/page_error_404_not_found.html:11 +#: templates/web/base/errors/page_error_404_not_found.html:10 #: templates/web/base/errors/page_error_404_not_found.html:12 msgid "The requested URL '%s' was not found on this server" msgstr "သင္ေတာင္းဆိုေသာ URL %s ကိုဒီဆာဗာမွာရွာမေတြ႕ပါ" @@ -3154,7 +3150,7 @@ msgstr "" msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:295 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:300 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" @@ -3165,16 +3161,20 @@ msgid "" " Names are not necessarily unique." msgstr "" +#: templates/web/base/reports/_problem-list.html:15 +msgid "There are no reports to show." +msgstr "" + #: perllib/FixMyStreet/App/Controller/Reports.pm:75 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:131 +#: perllib/FixMyStreet/App/Controller/Contact.pm:136 #: 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/New.pm:762 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 #: templates/web/base/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:25 @@ -3190,7 +3190,7 @@ msgstr "အီးေမးလ္ သို႔မဟုတ္ စကားဝွ msgid "There was a problem with your update. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:135 +#: perllib/FixMyStreet/App/Controller/Contact.pm:140 msgid "There were problems with your report. Please see below." msgstr "" @@ -3198,8 +3198,8 @@ msgstr "" msgid "There were problems with your update. Please see below." msgstr "" -#: templates/web/base/admin/body-form.html:108 -#: templates/web/base/admin/body-form.html:109 +#: templates/web/base/admin/body-form.html:112 +#: templates/web/base/admin/body-form.html:113 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" @@ -3212,14 +3212,14 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" -#: templates/web/base/admin/body.html:36 +#: templates/web/base/admin/body.html:44 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported <em>at any location</em>.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" " Currently, users <strong>cannot report problems to this body</strong>." msgstr "" -#: templates/web/base/admin/body.html:46 +#: templates/web/base/admin/body.html:54 msgid "This body has no contacts. This means that currently problems reported to this body <strong>will not be sent</strong>." msgstr "" @@ -3230,18 +3230,18 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:388 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:394 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:391 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 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:136 -#: perllib/FixMyStreet/Cobrand/UK.pm:53 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:902 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:972 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/Cobrand/UK.pm:43 msgid "This information is required" msgstr "ဒီအခ်က္အလက္ ျဖည့္စြက္ရန္ လိုအပ္သည္" @@ -3280,8 +3280,8 @@ msgstr "ဒီျပႆနာကိုေျဖရွင္းေနဆဲျဖ msgid "This problem is old and of unknown status." msgstr "ဒီျပႆနာသည္အရမ္းၾကာျပီျဖစ္ျပီး အေျခအေနကိုမသိရပါ" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:130 #: perllib/FixMyStreet/Cobrand/Zurich.pm:131 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:132 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "ဒီအစီရင္ခံစာသည္အတည္ျပဳျခင္းကိုေစာင့္ဆိုင္းေနဆဲျဖစ္သည္" @@ -3298,15 +3298,15 @@ msgstr "ဒီျပႆနာကိုေလာေလာဆယ္ေျဖရွ msgid "This report is currently marked as open." msgstr "ဒီအစီရင္ခံစာကိုယခုေလာေလာဆယ္ဖြင့္ထားသည္" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:319 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:311 msgid "This report was submitted anonymously" msgstr "ဒီအစီရင္ခံစာကိုအမည္မသိသူမွတင္သြင္းခဲ့သည္" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:293 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "ဒီ web စာမ်က္ႏွာသည္ အသံုးျပဳသူမွရိုက္ထားေသာ ျပႆနာ၏ဓာတ္ပံုတစ္ပံုပါ၀င္သည္" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -3324,7 +3324,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:294 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:299 msgid "To view a map of the precise location of this issue" msgstr "" @@ -3340,8 +3340,12 @@ msgstr "" msgid "Try again" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:46 +#: templates/web/base/contact/submit.html:14 +msgid "Try emailing us directly:" +msgstr "" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -3349,8 +3353,8 @@ msgstr "" msgid "Unable to fix" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/admin/update_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:45 #: templates/web/zurich/admin/report_edit.html:58 @@ -3392,7 +3396,7 @@ msgstr "" msgid "Update below added by %s at %s" msgstr "" -#: templates/web/base/admin/body-form.html:233 +#: templates/web/base/admin/body-form.html:240 #: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "" @@ -3418,7 +3422,7 @@ msgstr "" msgid "Update reopened problem" msgstr "" -#: templates/web/base/admin/body.html:93 +#: templates/web/base/admin/body.html:101 msgid "Update statuses" msgstr "" @@ -3432,12 +3436,12 @@ msgstr "" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1016 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1060 -#: perllib/FixMyStreet/App/Controller/Admin.pm:810 -#: perllib/FixMyStreet/App/Controller/Admin.pm:958 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:549 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:618 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1014 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:808 +#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:556 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:625 msgid "Updated!" msgstr "" @@ -3449,7 +3453,7 @@ msgstr "" msgid "Updates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:139 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -3464,7 +3468,7 @@ msgstr "" msgid "Updates to this problem, FixMyStreet" msgstr "ဒီျပႆနာမ်ားကို FixMyStreet သို႔တင္ျပပါ။" -#: templates/web/base/admin/body.html:174 +#: templates/web/base/admin/body.html:182 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 "စီမံသူတြင္သာ ေဖာ္ျပေပးသည့္ အေသးစိတ္ကို မွတ္တမ္းတင္ရန္ မွတ္စုကို အသုံးျပဳပါ။ မွတ္စုမ်ားကို လူအမ်ားမေတြ႔ျမင္ရ သလို အဖြဲ႔ထံသို႔လည္း မေပးပို႔ႏိုင္ပါ။" @@ -3473,11 +3477,11 @@ msgstr "စီမံသူတြင္သာ ေဖာ္ျပေပးသည msgid "User" msgstr "အသံုးျပဳသူ" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1357 msgid "User flag removed" msgstr "သုံးစြဲသူ အမွတ္အသား ျပဳလုပ္ျခင္းကို ဖယ္ရွားလိုက္သည္။" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1331 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1329 msgid "User flagged" msgstr "သုုံးစြဲသူက အမွတ္အသား ျပဳလုပ္ျခင္း" @@ -3485,16 +3489,16 @@ msgstr "သုုံးစြဲသူက အမွတ္အသား ျပဳ msgid "User search finds matches in users' names and email addresses." msgstr "သုံးစြဲသူရွာေဖြမႈသည္ ၎တို႔၏ အီးေမးလိပ္စာႏွင့္ နာမည္မ်ားရွိ တူညီမႈမ်ားကို ေတြ႔ရွိႏိုင္သည္။ " -#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:303 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:307 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "အသံုးျပဳသူမ်ား" -#: perllib/FixMyStreet/App/Controller/Admin.pm:380 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:430 +#: perllib/FixMyStreet/App/Controller/Admin.pm:374 +#: perllib/FixMyStreet/App/Controller/Admin.pm:404 +#: perllib/FixMyStreet/App/Controller/Admin.pm:421 msgid "Values updated" msgstr "" @@ -3548,11 +3552,11 @@ msgstr "သင့္အီးေမးလိပ္စာကို ျပသ သ msgid "We never show your email address or phone number." msgstr "မိမိတို႔သည္ သင့္ဖုန္းနံပါတ္ သို႔မဟုတ္ အီးေမးလိပ္စာကို ျပသသြားမည္ မဟုတ္ပါ" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:403 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "မိမိတို႔သည္ %s; ၏တာဝန္ျဖစ္ေၾကာင္း သတိျပဳမိေသာ္လည္း မိမိတို႔တြင္ ၎တို႔ကို ဆက္သြယ္ရန္ အေသးစိတ္ မရွိေသးပါ။ အကယ္၍ သင့္ေတာ္သည့္ လိပ္စာရွိပါက ေက်းဇူးျပဳၿပီး ဆက္သြယ္ေပးပါ။" -#: templates/web/base/index-steps.html:38 +#: templates/web/base/index-steps.html:31 msgid "We send it to the council on your behalf" msgstr "သင္၏ကိုယ္စား ေကာင္စီထံ ကၽြန္ေတာ္တို႔ ေပးပို႔ပါမည္" @@ -3561,15 +3565,23 @@ msgstr "သင္၏ကိုယ္စား ေကာင္စီထံ ကၽ msgid "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>" msgstr "မိမိတို႔၏ privacy ေပၚလစီႏွင့္အညီ သင့္၏ တစ္ကိုယ္ရည္ အခ်က္အလက္မ်ားကို အသုံးျပဳသြားမည္ ျဖစ္ပါသည္။" +#: templates/web/base/questionnaire/completed-open.html:2 +msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" +msgstr "" + #: templates/web/base/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/fixmystreet/report/new/fill_in_details_form.html:41 +#: templates/web/base/contact/submit.html:7 +msgid "We’ll get back to you as soon as we can." +msgstr "" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 msgid "What’s the issue, and where is it?" msgstr "" -#: templates/web/base/admin/category_edit.html:82 +#: templates/web/base/admin/category_edit.html:87 #: templates/web/zurich/admin/body.html:18 msgid "When edited" msgstr "ျပင္ဆင္ခဲ့သည့္ အခ်ိန္" @@ -3578,17 +3590,20 @@ msgstr "ျပင္ဆင္ခဲ့သည့္ အခ်ိန္" msgid "When sent" msgstr "ေပးပို႔ခဲ့သည့္ အခ်ိန္" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Whole block of empty flats" msgstr "တိုက္ခန္းလြတ္မ်ား ရွိရာ ဘေလာက္" +#: templates/web/base/tokens/confirm_alert.html:7 +msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." +msgstr "" + #: templates/web/base/open311/index.html:92 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/fiksgatami/front/footer-marketing.html:15 #: templates/web/fixmystreet/front/footer-marketing.html:17 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" @@ -3612,18 +3627,18 @@ msgid "Year" msgstr "ခုႏွစ္" #: templates/web/base/admin/bodies.html:66 -#: templates/web/base/admin/body.html:72 templates/web/base/admin/body.html:74 -#: templates/web/base/admin/body.html:78 templates/web/base/admin/body.html:80 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:76 +#: templates/web/base/admin/report_edit.html:93 #: templates/web/base/admin/update_edit.html:24 -#: templates/web/base/admin/users.html:29 +#: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:42 #: templates/web/base/questionnaire/index.html:81 @@ -3652,14 +3667,12 @@ msgstr "တစ္ကိုယ္ရည္ အခ်က္အလက္မ်ာ msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "သင့္အေနျဖင့္ ေစာ္ကားခံေနရေၾကာင္း ျပန္လည္မြမ္းမံထားသည္ တို႔ကေဖာ္ျပေနၿပီး ထိုထဲတြင္ တစ္ကုိယ္ရည္ အခ်က္အလက္ သို႔မဟုတ္ တူညီသည့္ အခ်က္အလက္မ်ား ပါဝင္သည္။" -#: templates/web/base/tokens/confirm_problem.html:25 -#: templates/web/base/tokens/confirm_problem.html:26 -#: templates/web/zurich/tokens/confirm_problem.html:6 +#: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:8 msgid "You can <a href=\"%s%s\">view the problem on this site</a>." msgstr "သင့္အေနျဖင့္ ယခုဆိုက္တြင္ ျပႆနာကို ၾကည့္ရူႏိုင္သည္။" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:48 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "သင့္အေနျဖင့္ ယဥ္ေက်းမႈမရွိေသာ သုံးစြဲသူ၏ အီးေမးလ္ကို ၎တို႔ဖန္တီးထားေသာ အလိုအေလ်ာက္ ဖုံးထားေသာ(မေပးပို႔ေသာ) အစီရင္ခံစာမ်ား ျဖစ္သည့္ ယဥ္ေက်းမႈမရွိေသာ စာရင္းတြင္ ထည့္သြင္းထားႏိုင္သည္။" @@ -3674,14 +3687,14 @@ msgid "" " reports in the past." msgstr "သင့္အေနျဖင့္မည္သည့္ report ကိုမဆုိ သို႔မဟုတ္ သုံးစြဲသူကို ျပင္ဆင္လိုပါက အမွတ္အသား ျပဳလုပ္ႏိုင္ၿပီး ၎တို႔သည္ စာမ်က္ႏွာေပၚတြင္ ေဖာ္ျပခံရမည္ ျဖစ္သည္။ ဥပမာ အတိတ္တြင္ မသင့္ေလွ်ာ္သည့္ အစီရင္ခံစာမ်ား တင္သူမ်ားကို ေစာင့္ၾကည့္လိုပါက အသုံးဝင္လာမည္ ျဖစ္သည္။" -#: templates/web/base/report/new/councils_text_none.html:19 -#: templates/web/base/report/new/councils_text_none.html:20 -#: templates/web/base/report/new/councils_text_some.html:20 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 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/base/admin/body-form.html:81 +#: templates/web/base/admin/body-form.html:85 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "ဆိုက္ေပၚတြင္ ရွိေနမေစခ်င္လွ်င္ ဖ်က္ထားေသာ အဖြဲ႔ကို အမွတ္အသား ျပဳလုပ္ႏိုင္သည္။" @@ -3697,10 +3710,10 @@ msgstr "" "\n" #: templates/web/base/questionnaire/index.html:68 -#: templates/web/base/report/new/fill_in_details_form.html:94 +#: templates/web/base/report/new/fill_in_details_form.html:75 #: templates/web/fixmystreet/questionnaire/index.html:88 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:79 -#: templates/web/zurich/report/new/fill_in_details_form.html:75 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 +#: templates/web/zurich/report/new/fill_in_details_form.html:58 msgid "You have already attached a photo to this report, attaching another one will replace it." msgstr "ဒီအစီရင္ခံစာတြင္ ဓာတ္ပုံတြဲတင္ထားၿပီ ျဖစ္ၿပီး အျခားတစ္ခု တြဲတင္ျခင္းသည္ အရင္ေနရာတြင္ အစားထိုးသြားပါမည္။" @@ -3709,7 +3722,7 @@ msgstr "ဒီအစီရင္ခံစာတြင္ ဓာတ္ပုံ msgid "You have already attached a photo to this update, attaching another one will replace it." msgstr "ယခု ျပင္ဆင္မြမ္းမံမႈကို ဓာတ္ပုံျဖင့္ တြဲတင္ထားၿပီး ျဖစ္ၿပီး အျခားတစ္ခုတြဲတင္လွ်င္ အရင္ေနရာတြင္ အစားထိုးေပးသြားမည္ ျဖစ္သည္။" -#: templates/web/base/auth/sign_out.html:3 +#: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" msgstr "ထြက္ခြာၿပီး ျဖစ္သည္။" @@ -3720,26 +3733,11 @@ msgstr "" "ေျမပုံေပၚတြင္ အစိမ္းေရာင္ ပင္အပ္ ျဖင့္အမွတ္အသားျပဳထားသည့္ ေနရာတြင္ ျပႆနာကို ေတြ႔ႏိုင္သည္။ အကယ္၍ လက္ရွိတည္ေနရာမဟုတ္ပါက ေျမပုံကို\n" "ထပ္ႏွိပ္ပါ။" -#: templates/web/base/tokens/confirm_alert.html:8 -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/base/tokens/confirm_update.html:14 -msgid "You have successfully confirmed your update and you can now <a href=\"%s\">view it on the site</a>." -msgstr "သင္၏ ျပဳျပင္မြမ္းမံမႈကို ေအာင္ျမင္စြာ အတည္ျပဳၿပီး ျဖစ္သည္။ ၎ကို ဆိုက္ေပၚတြင္ ၾကည့္႐ႈႏိုင္သည္။" - -#: templates/web/base/tokens/confirm_alert.html:12 -msgid "You have successfully created your alert." -msgstr "သင္၏ သတိေပးခ်က္ကို ေအာင္ျမင္စြာ ဖန္တီးၿပီး ျဖစ္သည္" - -#: templates/web/base/tokens/confirm_alert.html:10 -msgid "You have successfully deleted your alert." -msgstr "သင္၏ သတိေပးခ်က္ကို ေအာင္ျမင္စြာ ပယ္ဖ်က္ၿပီး ျဖစ္သည္" - #: templates/web/base/report/display.html:20 #: templates/web/base/report/new/fill_in_details.html:37 #: templates/web/fixmystreet/report/display.html:17 @@ -3765,7 +3763,7 @@ msgid "" " contacts (such as an email address) to which reports are sent." msgstr "သင့္အေနျဖင့္ (ေကာင္စီမ်ားႏွင့္ ႒ာနကဲ့သို႔) အဖြဲ႔မ်ား ထည့္သြင္းႏိုင္ရန္ လိုအပ္ေသာေၾကာင့္ သင့္အေနျဖင့္ (က်င္း၊ခ်ိဳင့္မ်ား သို႔မဟုတ္ လမ္းမီးတိုင္ကဲ့သုိ႔) ကိုင္တြယ္ႏိုင္သည့္ ျပႆနာမ်ားကို ထည့္သြင္းႏိုင္သလို (အီးေမးလ္ လိပ္စာ ကဲ့သို႔) အဆက္အသြယ္မ်ားျဖင့္ အစီအရင္ခံစာမ်ားကို ေပးပို႔ႏိုင္သည္။" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:85 msgid "You really want to resend?" msgstr "သင္ အမွန္တကယ္ ျပန္လည္ ေပးပို႔ခ်င္ပါသလား?" @@ -3785,7 +3783,7 @@ msgstr "သင္၏ အစီရင္ခံစာမ်ား" #: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 #: templates/web/fixmystreet/report/update-form.html:76 -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:71 msgid "Your email" msgstr "သင္၏ အီးေမးလ္" @@ -3801,7 +3799,7 @@ msgid "Your email address:" msgstr "သင္၏ အီးေမးလ္လိပ္စာ" #: templates/web/base/alert/_list.html:92 -#: templates/web/base/report/new/fill_in_details_form.html:125 +#: templates/web/base/report/new/fill_in_details_form.html:106 #: templates/web/base/report/update-form.html:81 msgid "Your email:" msgstr "သင္၏ အီးေမးလ္" @@ -3816,13 +3814,13 @@ msgstr "သင့္၏အခ်က္အလက္မ်ားကို ကၽ #: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 #: templates/web/fixmystreet/report/update-form.html:142 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:98 +#: templates/web/zurich/report/new/fill_in_details_form.html:81 msgid "Your name" msgstr "သင့္အမည္" #: templates/web/base/auth/general.html:59 #: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:204 +#: templates/web/base/report/new/fill_in_details_form.html:185 #: templates/web/base/report/update-form.html:151 msgid "Your name:" msgstr "သင့္အမည္" @@ -3840,33 +3838,19 @@ msgstr "သင္၏ စကားဝွက္ကို ေျပာင္းလ #: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 -#: templates/web/zurich/report/new/fill_in_details_form.html:104 +#: templates/web/zurich/report/new/fill_in_details_form.html:87 msgid "Your phone number" msgstr "သင္၏ ဖုန္းနံပါတ္" -#: templates/web/base/tokens/confirm_problem.html:4 -msgid "Your problem has been confirmed!" -msgstr "" - #: templates/web/fixmystreet/questionnaire/index.html:16 msgid "Your report" msgstr "သင္၏ အစီရင္ခံစာ" -#: templates/web/base/report_created.html:6 -msgid "Your report has been created and will shortly be sent." -msgstr "သင္၏ အစီရင္ခံစာကို ဖန္တီးၿပီးပါၿပီ။ မၾကာခင္ ေပးပို႔ပါမည္။" - -#: templates/web/base/footer.html:9 templates/web/fiksgatami/footer.html:21 -#: templates/web/fiksgatami/nn/footer.html:21 -#: templates/web/fixmystreet/footer.html:24 +#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:24 msgid "Your reports" msgstr "သင္၏ အစီရင္ခံစာမ်ား" -#: templates/web/base/tokens/confirm_update.html:4 -msgid "Your update has been confirmed!" -msgstr "" - -#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:59 +#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:41 msgid "Your updates" msgstr "သင္၏ မြမ္းမံျပင္ဆင္ထားမႈမ်ား" @@ -3883,11 +3867,7 @@ msgstr "%s မွ" msgid "council" msgstr "ေကာင္စီ" -#: perllib/FixMyStreet/DB/Result/Problem.pm:665 -msgid "council ref: %s" -msgstr "ေကာင္စီ ရည္ညႊန္းခ်က္" - -#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:32 #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:54 msgid "didn't use map" @@ -3898,6 +3878,7 @@ msgstr "ေျမပံု မသံုးခဲ့ပါ" msgid "e.g. ‘%s’ or ‘%s’" msgstr "ဥပမာ ‘%s’ သို႔မဟုတ္ ‘%s’" +#: templates/web/base/admin/body-form.html:188 #: templates/web/base/admin/flagged.html:51 msgid "edit user" msgstr "သုံးစြဲသူအား ျပင္ဆင္ျခင္း" @@ -3912,7 +3893,7 @@ msgstr "%d မွ မတူညီေသာ သုံးစြဲသူမ်ာ msgid "last updated %s" msgstr "ေနာက္ဆုံး ျပဳျပင္မြမ္းမံမႈမ်ား" -#: perllib/Utils.pm:263 +#: perllib/Utils.pm:235 msgid "less than a minute" msgstr "တစ္မိနစ္ခန္႔သာ" @@ -3972,22 +3953,22 @@ msgstr "သို႔မဟုတ္" msgid "or locate me automatically" msgstr "သို႔မဟုတ္ အလိုအေလ်ာက္ လမ္းညႊန္ပါ" -#: templates/web/base/admin/report_edit.html:25 -#: templates/web/base/admin/report_edit.html:26 -#: templates/web/zurich/admin/report_edit-sdm.html:28 +#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:30 +#: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit-sdm.html:29 -#: templates/web/zurich/admin/report_edit-sdm.html:37 +#: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:38 -#: templates/web/zurich/admin/report_edit.html:28 +#: templates/web/zurich/admin/report_edit.html:27 #: templates/web/zurich/admin/report_edit.html:29 -#: templates/web/zurich/admin/report_edit.html:39 +#: templates/web/zurich/admin/report_edit.html:38 #: templates/web/zurich/admin/report_edit.html:40 -#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit.html:50 #: templates/web/zurich/admin/report_edit.html:52 msgid "originally entered: “%s”" msgstr "နဂိုဝင္ေရာက္ထားမႈ: “%s”" -#: templates/web/base/admin/report_edit.html:30 +#: templates/web/base/admin/report_edit.html:43 msgid "other areas:" msgstr "အျခား ဧရိယာမ်ား" @@ -3996,13 +3977,12 @@ msgstr "အျခား ဧရိယာမ်ား" msgid "reopened" msgstr "ျပန္ဖြင့္ပါ" -#: templates/web/fiksgatami/header.html:49 -#: templates/web/fixmystreet/header.html:53 +#: templates/web/fixmystreet/header.html:59 #: templates/web/zurich/footer.html:12 msgid "sign out" msgstr "ထြက္ရန္" -#: templates/web/base/report/new/fill_in_details_form.html:13 +#: templates/web/base/report/new/fill_in_details_form.html:12 #: templates/web/base/report/new/fill_in_details_form.html:15 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 @@ -4014,15 +3994,15 @@ msgstr "ျပည္တြင္းေကာင္စီ" msgid "there is no pin shown as the user did not use the map" msgstr "အသုံးျပဳသူ မသုံးသည့္ ေျမပုံကို ပင္အပ္ျဖင့္ မေဖာ္ျပထားပါ" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:373 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:379 msgid "this type of local problem" msgstr "ေဒသတြင္း ျပႆနာသာျဖစ္သည္။" -#: perllib/Utils.pm:235 +#: perllib/Utils.pm:207 msgid "today" msgstr "ယေန႔" -#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:32 #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:54 msgid "used map" @@ -4047,7 +4027,7 @@ msgid "<big>%s</big> report recently" msgid_plural "<big>%s</big> reports recently" msgstr[0] "<big>%s</big> လတ္တေလာ တင္ျပထားေသာ အစီရင္ခံစာမ်ား" -#: perllib/Utils.pm:282 +#: perllib/Utils.pm:254 #, perl-format msgid "%d hour" msgid_plural "%d hours" @@ -4059,7 +4039,7 @@ msgid "%d supporter" msgid_plural "%d supporters" msgstr[0] "%d ေထာက္ပံ့ေပးသူမ်ား" -#: perllib/Utils.pm:284 +#: perllib/Utils.pm:256 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -4077,7 +4057,7 @@ 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:278 +#: perllib/Utils.pm:250 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -4095,7 +4075,7 @@ 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:280 +#: perllib/Utils.pm:252 #, perl-format msgid "%d day" msgid_plural "%d days" @@ -4106,3 +4086,6 @@ msgstr[0] "%d ရက္မ်ား" msgid "We do <strong>not</strong> yet have details for the other council that covers this location." msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location." msgstr[0] "ကၽြႏု္ပ္တို႔တြင္ ဒီတည္ေနရာႏွင့္ ပတ္သက္သည့္ အျခားေကာင္အတြက္ အေသးစိတ္မရွိေသးပါ။" + +#~ msgid "For council(s):" +#~ msgstr "ေကာင္စီ(မ်ား)အတြက္ -" diff --git a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index c7785e6ee..19533c6e7 100644 --- a/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/nb_NO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -5,16 +5,17 @@ # # Translators: # Guttorm Flatabø <post@guttormflatabo.com>, 2013 +# oeyrvin <oeyrvin@hagan.no>, 2015 # Ørjan Vøllestad <orjanv@gmail.com>, 2014 -# pere <pere-transifex@hungry.com>, 2012 -# pere <pere-transifex@hungry.com>, 2014-2015 +# pere <pere-transifex@hungry.com>, 2012,2015 +# pere <pere-transifex@hungry.com>, 2015 # Petter Reinholdtsen <pere@hungry.com>, 2011 msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2015-01-20 16:59+0000\n" -"PO-Revision-Date: 2015-01-11 10:06+0000\n" +"POT-Creation-Date: 2015-07-31 14:28+0100\n" +"PO-Revision-Date: 2015-07-24 06:19+0000\n" "Last-Translator: pere <pere-transifex@hungry.com>\n" "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/fixmystreet/language/nb_NO/)\n" "Language: nb_NO\n" @@ -23,17 +24,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:618 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:386 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:392 msgid " and " msgstr " og " -#: templates/web/base/report/new/councils_text_all.html:12 -#: templates/web/base/report/new/councils_text_all.html:19 -#: templates/web/base/report/new/councils_text_all.html:5 -#: templates/web/base/report/new/councils_text_none.html:19 -#: templates/web/base/report/new/councils_text_none.html:21 -#: templates/web/base/report/new/councils_text_some.html:20 +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_none.html:11 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " @@ -69,22 +68,26 @@ msgstr "%d til %d av %d" msgid "%s - Summary reports" msgstr "%s - oppsummeringsrapporter" -#: perllib/FixMyStreet/DB/Result/Problem.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:672 msgid "%s ref: %s" msgstr "%s ref: %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:265 perllib/FixMyStreet/Cobrand/UK.pm:277 +#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 msgid "%s ward, %s" msgstr "%s bydel, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:554 +#: perllib/FixMyStreet/DB/Result/Problem.pm:559 msgid "%s, reported at %s" msgstr "%s, rapportert %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:304 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "%s, within %s ward" msgstr "%s, innefor bydel %s" +#: perllib/FixMyStreet/Map/OSM.pm:42 +msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" +msgstr "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> -bidragsytere" + #: templates/web/base/email_sent.html:29 msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" msgstr "(Ta det med ro; vi tar vare på varselet ditt mens du sjekker e-posten din.)" @@ -98,7 +101,7 @@ msgid "(Don't worry — we'll hang on to your update while you're checking y msgstr "(Ta det med ro — vi tar vare på oppdateringen din mens du sjekker e-posten din.)" #: templates/web/base/admin/report_blocks.html:11 -#: templates/web/base/admin/users.html:29 +#: templates/web/base/admin/users.html:31 msgid "(Email in abuse table)" msgstr "(Epost i misbrukstabellen)" @@ -126,7 +129,7 @@ msgstr "(lukket)" msgid "(fixed)" msgstr "(løst)" -#: templates/web/base/index.html:9 +#: templates/web/base/index.html:8 templates/web/base/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)" @@ -136,8 +139,8 @@ msgstr "(som tagging, søppel, hull i veien, eller ødelagte gatelys)" msgid "(not sent to council)" msgstr "(ikke rapportert til administrasjonen)" -#: templates/web/base/report/new/fill_in_details_form.html:218 -#: templates/web/zurich/report/new/fill_in_details_form.html:94 +#: templates/web/base/report/new/fill_in_details_form.html:199 +#: templates/web/zurich/report/new/fill_in_details_form.html:77 msgid "(optional)" msgstr "(valgfritt)" @@ -150,7 +153,7 @@ msgstr "(offentlig)" msgid "(sent to both)" msgstr "(sendt til begge)" -#: templates/web/base/report/new/fill_in_details_form.html:212 +#: templates/web/base/report/new/fill_in_details_form.html:193 msgid "(we never show your email address or phone number)" msgstr "(vi viser aldri din e-postadresse eller telefonnummer)" @@ -158,14 +161,13 @@ 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:635 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:662 -#: perllib/FixMyStreet/DB/Result/Problem.pm:393 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Velg en kategori --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 -#: perllib/FixMyStreet/DB/Result/Problem.pm:399 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:630 +#: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Velg en eiendomsstype --" @@ -177,47 +179,7 @@ msgid "" " Maybe add some <code>MAPIT_TYPES</code> to your config file?" msgstr "<code>MAPIT_URL</code> er satt (<code>%s</code>) men ingen <code>MAPIT_TYPES</code>.<br>Dette er antagelig hvorfor \"dekket område\" er tom (under).<br>Kanskje du skal legge til noen <code>MAPIT_TYPES</code> i konfigurasjonsfilen?" -#: templates/web/base/questionnaire/completed.html:20 -msgid "<p style=\"font-size:150%\">Thank you very much for filling in our questionnaire; glad to hear it’s been fixed.</p>" -msgstr "<p style=\"font-size:150%\">Tusen takk for at du fylte ut vårt spørreskjema. Vi er glad for å høre at ditt problem er blitt fikset.</p>" - -#: templates/web/fiksgatami/questionnaire/completed-open.html:1 -msgid "" -"<p style=\"font-size:150%\">We’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’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%\">Det var trist å høre dette. Vi har to forslag: hva med å forsøke\n" -"<a href=\"http://www.norge.no/styresmakter/\">å skrive direkte til dine \n" -"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/base/questionnaire/completed-open.html:6 -msgid "" -"<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" -"suggestions: why not try writing to your local representatives or, if\n" -"it’s a problem that could be fixed by local people working together, why\n" -"not <a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n" -"</p>" -msgstr "" -"<p style=\"font-size:150%%\">Det var trist å høre dette. Vi har to forslag: hva med å forsøke\n" -"å skrive direkte til dine representanter, 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/base/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>Tusen takk for at du fylte ut vårt spørreskjema. Hvis du\n" -"får mer informasjon om status for ditt problem, vær så snill å kom tilbake hit til\n" -"nettstedet og legg igjen en oppdatering.</p>" - -#: templates/web/base/around/_report_banner.html:4 +#: templates/web/base/around/_report_banner.html:3 #: templates/web/base/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>" @@ -244,7 +206,7 @@ msgstr "<strong>Nei</strong>, la meg logge inn med e-post:" msgid "<strong>No</strong>, I do not, let me sign in by email:" msgstr "<strong>Nei</strong>, det gjør jeg ikke. La meg logge inn med e-post:" -#: templates/web/base/report/new/fill_in_details_form.html:163 +#: templates/web/base/report/new/fill_in_details_form.html:144 msgid "<strong>No</strong>, let me confirm my report by email:" msgstr "<strong>Nei</strong>, la meg bekrefte min rapport med e-post:" @@ -252,13 +214,8 @@ msgstr "<strong>Nei</strong>, la meg bekrefte min rapport med e-post:" msgid "<strong>No</strong>, let me confirm my update by email:" msgstr "<strong>Nei</strong>, la meg bekrefte min oppdatering med e-post:" -#: templates/web/base/tokens/confirm_problem.html:19 -#: templates/web/base/tokens/confirm_problem.html:20 -msgid "<strong>We will now send it to the council</strong>." -msgstr "<strong>Nå vil vi sende det til administrasjonen</strong>." - #: templates/web/base/auth/general.html:37 -#: templates/web/base/report/new/fill_in_details_form.html:141 +#: templates/web/base/report/new/fill_in_details_form.html:122 #: templates/web/base/report/update-form.html:95 #: templates/web/fixmystreet/auth/general.html:37 #: templates/web/fixmystreet/auth/general.html:39 @@ -272,8 +229,8 @@ msgstr "<strong>Ja</strong>, jeg har et passord" msgid "About us" msgstr "Om oss" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:39 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:52 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:31 #: templates/web/fixmystreet/report/update-form.html:28 @@ -287,28 +244,28 @@ 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 "" +msgstr "Legg til en <strong>administrasjon</strong> for hver administrativ instans, for eksempel en kommune eller et departement, der problemrapporter kan sendes. Du kan legge til en eller flere kontaktpunkt (for ulike problemkategorier) for hver administrasjon." -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/body.html:56 msgid "Add a contact using the form below." msgstr "Legg til en kontakt ved å bruke formen under." #: templates/web/base/admin/bodies.html:74 -#: templates/web/base/admin/body-form.html:233 +#: templates/web/base/admin/body-form.html:240 #: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "Legg til administrasjon" -#: templates/web/base/admin/body.html:108 +#: templates/web/base/admin/body.html:116 #: templates/web/zurich/admin/body.html:31 msgid "Add new category" msgstr "Legg til ny kategori" -#: templates/web/base/admin/users.html:45 +#: templates/web/base/admin/users.html:47 msgid "Add user" msgstr "Legg til bruker" -#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:70 +#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:52 msgid "Added %s" msgstr "La til %s" @@ -335,9 +292,7 @@ msgstr "Send meg varsel ved fremtidige oppdateringer" msgid "All Reports" msgstr "Alle rapporter" -#: templates/web/base/footer.html:11 templates/web/fiksgatami/footer.html:23 -#: templates/web/fiksgatami/nn/footer.html:23 -#: templates/web/fixmystreet/footer.html:26 +#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:26 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:19 @@ -354,19 +309,9 @@ 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/base/report/new/councils_text_all.html:12 -#: templates/web/base/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/base/report/new/councils_text_all.html:5 -#: templates/web/base/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/base/report/new/councils_text_all.html:19 -#: templates/web/base/report/new/councils_text_all.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:13 +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_all.html:4 +#: templates/web/base/report/new/fill_in_details_form.html:12 #: templates/web/base/report/new/fill_in_details_form.html:14 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 @@ -383,7 +328,7 @@ msgstr "En oppdatering markerte dette problemet som fikset." msgid "Anonymous" msgstr "Anonym" -#: templates/web/base/admin/report_edit.html:62 +#: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:23 msgid "Anonymous:" msgstr "Anonym:" @@ -392,20 +337,20 @@ 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/fiksgatami/front/footer-marketing.html:14 #: templates/web/fixmystreet/front/footer-marketing.html:16 msgid "Are you a developer?" msgstr "Er du en utvikler?" #: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 msgid "Area covered" msgstr "Dekket område" #: templates/web/base/admin/bodies.html:15 -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/body.html:60 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." -msgstr "" +msgstr "Da reproduksjonsstedet og %s ikke stemmer, vil meldingen som er laget her, bli sendt til problemrapportøren, og ikke til kontakten som er gitt for meldingformålet." #: templates/web/zurich/admin/report_edit.html:141 #: templates/web/zurich/admin/stats.html:36 @@ -421,7 +366,7 @@ msgstr "Tildel til ekstern administrasjon:" msgid "Assign to subdivision:" msgstr "Tildelt underavdeling:" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:163 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:165 #: templates/web/zurich/report/updates.html:11 msgid "Assigned to %s" msgstr "Tildelt %s" @@ -434,7 +379,7 @@ msgstr "På det meste blir %d forespørsler returnert i hver spørring. De retu msgid "At the moment only searching for and looking at reports work." msgstr "For øyeblikket er det kun søk etter og å se på rapporter som fungerer." -#: perllib/FixMyStreet/DB/Result/Problem.pm:348 +#: perllib/FixMyStreet/DB/Result/Problem.pm:373 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "Avventer moderasjon" @@ -447,8 +392,8 @@ msgstr "Tilbake" msgid "Ban email address" msgstr "Bannlys epostadresse" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:297 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:301 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" msgstr "Administrasjoner" @@ -459,6 +404,7 @@ msgstr "Administrasjoner" msgid "Body" msgstr "Administrasjon" +#: templates/web/base/admin/report_edit.html:34 #: templates/web/base/admin/user-form.html:32 msgid "Body:" msgstr "Administrasjon:" @@ -471,16 +417,15 @@ msgstr "På dato" msgid "Can't see the map? <em>Skip this step</em>" msgstr "Hvis du ikke kan se kartet, <em>hopp over dette steget</em>." -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:55 #: templates/web/base/report/new/category.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:53 +#: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 #: templates/web/zurich/admin/stats.html:50 -#: templates/web/zurich/report/new/fill_in_details_form.html:50 msgid "Category" msgstr "Kategori" @@ -488,17 +433,16 @@ msgstr "Kategori" msgid "Category fix rate for problems > 4 weeks old" msgstr "Løsningsrate fordelt på kategori for problemer > 4 uker gamle" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:138 #: templates/web/base/admin/category_edit.html:23 -#: templates/web/base/admin/report_edit.html:61 -#: templates/web/base/report/new/fill_in_details_form.html:68 +#: templates/web/base/admin/report_edit.html:74 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/report_edit-sdm.html:42 #: templates/web/zurich/admin/report_edit.html:140 msgid "Category:" msgstr "Kategori:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:377 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383 msgid "Category: %s" msgstr "Kategori: %s" @@ -509,7 +453,7 @@ msgstr "Kategori: %s" msgid "Change password" msgstr "Bytt passord" -#: templates/web/base/admin/body.html:152 +#: templates/web/base/admin/body.html:160 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." @@ -517,7 +461,7 @@ msgstr "" "Marker <strong>bekreftet</strong> for å indikere at dette kontaktpunktet har blitt bekreftet som korrekt.\n" "Hvis du ikke er sikker på opprinnelsen eller gyldigheten til kontaktpunktet, ikke marker feltet." -#: templates/web/base/admin/body.html:163 +#: templates/web/base/admin/body.html:171 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." @@ -525,7 +469,7 @@ msgstr "" "Marker <strong>slettet</strong> for å ikke lenger bruke kategorien\n" "Den vil ikke lenger dukke opp som en tilgjengelig kategori i nedtrekksmenyen på rapporter-et-problem-siden." -#: templates/web/base/admin/body.html:183 +#: templates/web/base/admin/body.html:191 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -535,8 +479,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 "" +"Sjekk <strong>private</strong> hvis meldinger i denne gruppen<strong> ikke skal vises på nettsidene</strong>.\n" +" <br> \n" +"Normalt er ikke kategorier interne <br> \n" +"Dette passer når du ønsker å tillate brukere å sende inn melding til administrasjonen, men ikke vil vise\n" +"den utad. I UK, har de brukt dette for oppgaver som å be om en ekstra papirkurv på et bestemt sted." -#: templates/web/base/admin/body.html:122 +#: templates/web/base/admin/body.html:130 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." @@ -552,16 +501,16 @@ msgstr "Klikk her eller tast inn dato på formater dd/mm/åååå" msgid "Click map to report a problem" msgstr "Klikk i kartet for å rapportere et problem" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:45 -#: templates/web/base/admin/report_edit.html:47 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:58 +#: templates/web/base/admin/report_edit.html:60 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/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:95 #: templates/web/zurich/admin/report_edit.html:97 #: templates/web/zurich/admin/stats.html:31 @@ -569,11 +518,12 @@ msgstr "Klikk i kartet for å rapportere et problem" msgid "Closed" msgstr "Lukket" -#: perllib/FixMyStreet/DB/Result/Problem.pm:762 +#: perllib/FixMyStreet/DB/Result/Problem.pm:771 msgid "Closed by council" msgstr "(ikke rapportert til administrasjonen)" -#: templates/web/base/my/my.html:40 templates/web/fixmystreet/my/my.html:46 +#: templates/web/base/my/my.html:40 +#: templates/web/fixmystreet/my/_problem-list.html:12 msgid "Closed reports" msgstr "Fiksede rapporter" @@ -581,7 +531,7 @@ msgstr "Fiksede rapporter" msgid "Closed:" msgstr "Lukket:" -#: templates/web/base/around/tabbed_lists.html:11 +#: templates/web/base/around/tabbed_lists.html:10 #: templates/web/base/around/tabbed_lists.html:12 msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "De nærmeste problemene <small>(innenfor %skm)</small>" @@ -596,26 +546,26 @@ msgstr "Koordinater:" msgid "Cobrand" msgstr "Merkevaresamarbeid" -#: templates/web/base/admin/report_edit.html:75 +#: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:50 msgid "Cobrand data:" msgstr "Merkevaresamarbeidsdata:" -#: templates/web/base/admin/report_edit.html:74 +#: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:49 msgid "Cobrand:" msgstr "Merkevaresamarbeid:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Oppsett" -#: templates/web/base/admin/category_edit.html:47 +#: templates/web/base/admin/category_edit.html:52 msgid "Configure Endpoint" msgstr "Sett opp endepunkt" -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/body.html:72 msgid "Confirm" msgstr "Bekreft" @@ -636,10 +586,10 @@ msgstr "Bekreft via epost under, og oppgi et nytt passord der. Når du har bekre msgid "Confirmation" msgstr "Bekreftelse" -#: templates/web/base/admin/body.html:158 -#: templates/web/base/admin/body.html:71 -#: templates/web/base/admin/category_edit.html:32 -#: templates/web/base/admin/category_edit.html:84 +#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/category_edit.html:37 +#: templates/web/base/admin/category_edit.html:89 #: templates/web/zurich/admin/stats.html:40 msgid "Confirmed" msgstr "Bekreftet" @@ -650,7 +600,7 @@ msgstr "Bekreftede rapporter mellom %s og %s" #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 -#: templates/web/base/admin/report_edit.html:70 +#: templates/web/base/admin/report_edit.html:83 msgid "Confirmed:" msgstr "Bekreftet:" @@ -667,13 +617,12 @@ msgid "Contact Us" msgstr "Kontakt oss" #: templates/web/base/contact/index.html:6 -#: templates/web/base/contact/submit.html:3 #: templates/web/fixmystreet/contact/index.html:20 msgid "Contact the team" msgstr "Kontakt prosjektgruppen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1327 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1355 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1325 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1353 msgid "Could not find user" msgstr "Kunne ikke finne bruker" @@ -691,6 +640,10 @@ msgstr "Administrasjon" msgid "Council contacts for %s" msgstr "Administrasjonskontakter for %s" +#: perllib/FixMyStreet/DB/Result/Problem.pm:670 +msgid "Council ref: %s" +msgstr "administrasjonsreferanse: %s" + #: templates/web/base/admin/stats.html:84 msgid "Council:" msgstr "Administrasjon:" @@ -706,7 +659,7 @@ msgstr "Antall" msgid "Create a report" msgstr "Lag en rapport" -#: templates/web/base/admin/body.html:200 +#: templates/web/base/admin/body.html:208 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Lag kategori" @@ -718,7 +671,7 @@ msgid "Created" msgstr "Opprettet" #: templates/web/base/admin/list_updates.html:38 -#: templates/web/base/admin/report_edit.html:69 +#: templates/web/base/admin/report_edit.html:82 #: templates/web/base/admin/update_edit.html:51 #: templates/web/zurich/admin/report_edit-sdm.html:47 #: templates/web/zurich/admin/report_edit.html:61 @@ -733,9 +686,9 @@ msgstr "Gjeldende tilstand" #: templates/web/base/admin/bodies.html:5 #: templates/web/base/admin/index.html:16 msgid "Currently no bodies have been created." -msgstr "" +msgstr "I øyeblikket er ikke laget noen instanser." -#: templates/web/base/dashboard/index.html:6 +#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 msgid "Dashboard" msgstr "Oversikt" @@ -745,14 +698,14 @@ msgid "Dealt with by subdivision within 5 working days" msgstr "Behandlet av underavdeling innen 5 arbeidsdager" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:169 -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:37 -#: templates/web/base/admin/category_edit.html:85 +#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:81 +#: templates/web/base/admin/category_edit.html:42 +#: templates/web/base/admin/category_edit.html:90 msgid "Deleted" msgstr "Slettet" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:43 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -772,7 +725,7 @@ msgstr "Detaljer" msgid "Details:" msgstr "Detaljer:" -#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/body.html:87 msgid "Devolved" msgstr "Delegert" @@ -800,8 +753,8 @@ msgstr "Vet ikke" msgid "Don't like forms?" msgstr "Liker ikke skjemaer?" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:47 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:60 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:32 #: templates/web/fixmystreet/report/update-form.html:28 @@ -809,30 +762,33 @@ msgstr "Liker ikke skjemaer?" msgid "Duplicate" msgstr "Duplikat" -#: templates/web/base/admin/body.html:98 +#: templates/web/base/admin/body.html:106 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 "" +"Hver kontakt i administrasjonen har en kategori som vises utad. \n" +"Ulike kategorier kan ha same kontakt</strong> (e-postadresse).\n" +"Dette betyr at du kan legge til mange grupper/kategorier selv om du bare har <strong>en<strong> kontakt for administrasjonen." #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 -#: templates/web/base/admin/users.html:31 +#: templates/web/base/admin/users.html:33 #: templates/web/zurich/admin/problem_row.html:42 msgid "Edit" msgstr "Rediger" -#: templates/web/base/admin/body.html:212 +#: templates/web/base/admin/body.html:220 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "Rediger detaljer for administrasjon" #: templates/web/base/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:2 +#: 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:2 +#: templates/web/zurich/admin/report_edit.html:1 #: templates/web/zurich/admin/report_edit.html:5 msgid "Editing problem %d" msgstr "Rediger problem %d" @@ -846,12 +802,12 @@ msgstr "Redigerer oppdatering %d" msgid "Editing user %d" msgstr "Redigerer bruker %d" -#: templates/web/base/admin/category_edit.html:86 +#: templates/web/base/admin/category_edit.html:91 msgid "Editor" msgstr "Oppdatert av" #: templates/web/base/admin/bodies.html:23 -#: templates/web/base/admin/category_edit.html:83 +#: templates/web/base/admin/category_edit.html:88 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 #: templates/web/fixmystreet/auth/general.html:21 @@ -862,15 +818,23 @@ msgstr "Oppdatert av" msgid "Email" msgstr "E-post" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1303 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1301 msgid "Email added to abuse list" msgstr "Epost lagt til misbruksliste" -#: templates/web/base/admin/body.html:147 +#: templates/web/base/admin/body.html:155 msgid "Email address:" msgstr "E-postadresse:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1300 +#: templates/web/base/tokens/confirm_alert.html:6 +msgid "Email alert created" +msgstr "Epostvarsel laget" + +#: templates/web/base/tokens/confirm_alert.html:10 +msgid "Email alert deleted" +msgstr "Epostvarsel slettet" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1298 msgid "Email already in abuse list" msgstr "Epost allerede i misbrukslisten" @@ -882,8 +846,8 @@ msgstr "Send meg e-post om lokale problemer" msgid "Email me updates" msgstr "Send meg oppdateringer" -#: templates/web/base/admin/category_edit.html:26 -#: templates/web/base/admin/report_edit.html:67 +#: templates/web/base/admin/category_edit.html:31 +#: templates/web/base/admin/report_edit.html:80 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 @@ -894,56 +858,62 @@ msgstr "Send meg oppdateringer" msgid "Email:" msgstr "E-post:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:322 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 msgid "Email: %s" msgstr "E-post: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 msgid "Empty flat or maisonette" msgstr "Tom leilighet" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:631 msgid "Empty house or bungalow" msgstr "Tomt hus eller bungalow" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:622 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty office or other commercial" msgstr "Tomt kontor eller forretningsbygg" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:623 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Empty pub or bar" msgstr "Tom pub eller bar" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:624 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty public building - school, hospital, etc." msgstr "Tom offentlig bygning - skole, sykehos, etc." -#: templates/web/base/admin/body-form.html:158 -#: templates/web/base/admin/body-form.html:159 +#: templates/web/base/admin/body-form.html:162 +#: templates/web/base/admin/body-form.html:163 msgid "" "Enable <strong>Open311 update-sending</strong> if the endpoint will send and receive\n" " updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" " For more information, see \n" " <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>." msgstr "" +"Bruk <strong>Open311 update-sending</strong> hvis målet er å sende og motta\n" +"oppdateringer til eksisterende rapporter. Hvis du ikke er sikker, skjer det nok ikke S la den forbli uavkrysset. For mer informasjon, se\n" +"<a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>denne artikkelen</a>." -#: templates/web/base/admin/body-form.html:215 -#: templates/web/base/admin/body-form.html:216 +#: templates/web/base/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:223 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 "" +"Bruk <strong>can be devolved</strong> settingen hvis en eller flere kontakter ha\n" +"et ulikt leveringspunkt (og sendemetode) fra administrasjonenen. For eksempel, hvis noen meldingstyper enten må \n" +" e-postes, mens andre kan sendes med Open311." #: templates/web/base/admin/stats.html:70 msgid "End Date:" msgstr "Slutt-dato:" -#: templates/web/base/admin/body-form.html:126 +#: templates/web/base/admin/body-form.html:130 msgid "Endpoint" msgstr "Endepunkt" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:72 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:73 msgid "Enter a Zürich street name" msgstr "Skriv inn et veinavn i Zürich" @@ -956,17 +926,19 @@ msgstr "Skriv inn et britisk postnummer i nærheten, eller veinavn og sted" msgid "Enter a nearby postcode, or street name and area" msgstr "Skriv inn postnummer i nærheten, eller veinavn og sted" +#: templates/web/base/around/postcode_form.html:1 #: templates/web/base/around/postcode_form.html:2 +#: templates/web/fixmystreet/around/postcode_form.html:10 #: templates/web/fixmystreet/around/postcode_form.html:11 msgid "Enter a nearby street name and area" msgstr "Skriv inn et veinavn og sted" #: perllib/FixMyStreet/Cobrand/ZeroTB.pm:7 msgid "Enter a nearby street name and area, postal code or district in Delhi" -msgstr "" +msgstr "Velg et nærliggende gatenavn og område, postnummer eller distrikt i Delhi" #: templates/web/base/auth/general.html:64 -#: templates/web/base/report/new/fill_in_details_form.html:170 +#: templates/web/base/report/new/fill_in_details_form.html:151 #: templates/web/base/report/update-form.html:124 msgid "Enter a new password:" msgstr "Skriv inn et nytt passord:" @@ -978,7 +950,7 @@ msgstr "Skriv inn et nytt passord:" msgid "Enter a password" msgstr "Skriv inn et nytt passord" -#: templates/web/base/index-steps.html:33 +#: templates/web/base/index-steps.html:26 msgid "Enter details of the problem" msgstr "Legg inn detaljer om problemet" @@ -1001,17 +973,22 @@ msgstr "Eksempel-postnummer %s" msgid "Examples:" msgstr "Eksempler:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:47 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "Forklar hva som er galt, nøyaktig hvor det er og hvor lenge det har vært galt..." -#: templates/web/base/admin/report_edit.html:76 +#: templates/web/base/admin/body-form.html:81 +msgid "External URL" +msgstr "" + +#: templates/web/base/admin/category_edit.html:27 +#: templates/web/base/admin/report_edit.html:92 msgid "Extra data:" msgstr "Ekstra data:" -#: templates/web/base/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>." +#: templates/web/base/contact/submit.html:13 +msgid "Failed to send message" +msgstr "Klarte ikke sende melding" #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 @@ -1023,9 +1000,9 @@ msgstr "Filtrer rapportliste" msgid "First time" msgstr "Første gang" -#: templates/web/base/admin/body.html:40 +#: templates/web/base/admin/body.html:48 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." -msgstr "" +msgstr "Fiks dette ved å velge en <strong>area covered</strong> i <em> Edit body details</em>-skjemaet nedenfor." #: templates/web/base/header.html:24 msgid "FixMyStreet" @@ -1056,9 +1033,9 @@ msgid "" msgstr "FiksGataMi sender forskjellige kategorier problemer til forskjellige administrasjoner, problemer som gjelder flere administrasjoner blir sendt til alle de det gjelder." #: templates/web/base/admin/index.html:55 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:41 -#: templates/web/base/admin/report_edit.html:42 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:54 +#: templates/web/base/admin/report_edit.html:55 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/update-form.html:30 @@ -1069,17 +1046,18 @@ msgstr "FiksGataMi sender forskjellige kategorier problemer til forskjellige adm msgid "Fixed" msgstr "Løst" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:43 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:56 msgid "Fixed - Council" msgstr "Løst - Administrasjon" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:42 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:55 msgid "Fixed - User" msgstr "Løst - Bruker" -#: templates/web/base/my/my.html:35 templates/web/fixmystreet/my/my.html:41 +#: templates/web/base/my/my.html:35 +#: templates/web/fixmystreet/my/_problem-list.html:7 msgid "Fixed reports" msgstr "Fiksede rapporter" @@ -1087,7 +1065,7 @@ msgstr "Fiksede rapporter" msgid "Fixed:" msgstr "Løst:" -#: templates/web/base/admin/body-form.html:84 +#: templates/web/base/admin/body-form.html:89 #: templates/web/zurich/admin/body-form.html:36 msgid "Flag as deleted" msgstr "Merk som slettet" @@ -1096,7 +1074,7 @@ msgstr "Merk som slettet" msgid "Flag user" msgstr "Flag bruker" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Flagget:" @@ -1105,7 +1083,7 @@ msgstr "Flagget:" msgid "Flagged reports and users" msgstr "Flaggede rapporter og brukere" -#: templates/web/base/admin/user-form.html:45 +#: templates/web/base/admin/user-form.html:46 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page." msgstr "Flaggede brukere er listet opp på <a href='%s'>flaggede</a>-siden." @@ -1113,8 +1091,8 @@ msgstr "Flaggede brukere er listet opp på <a href='%s'>flaggede</a>-siden." msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." msgstr "Flaggede brukere er ikke begrenset på noe måte. Dette er bare en liste med brukere som har blitt markert for å gi dem oppmerksomhet." -#: templates/web/base/admin/report_edit.html:78 -#: templates/web/base/admin/user-form.html:51 +#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/user-form.html:52 msgid "Flagged:" msgstr "Flagget:" @@ -1123,10 +1101,6 @@ msgstr "Flagget:" msgid "Follow a ward link to view only reports within that ward." msgstr "Følg en bydelslenke for å kun se rapporter innenfor den bydelen." -#: templates/web/base/admin/report_edit.html:30 -msgid "For council(s):" -msgstr "For administrasjon(ene):" - #: templates/web/base/admin/body-form.html:65 msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "For mer informasjon, se <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>Hvordan FixMyStreet bruker Mapit</a>." @@ -1139,8 +1113,6 @@ msgstr "Glemt passordet ditt?" #: templates/web/base/faq/faq-en-gb.html:1 #: templates/web/base/static/privacy.html:1 #: templates/web/base/static/privacy.html:2 -#: templates/web/fiksgatami/faq/faq-nb.html:1 -#: templates/web/fiksgatami/nn/faq/faq-nn.html:1 msgid "Frequently Asked Questions" msgstr "Ofte spurte spørsmål" @@ -1153,13 +1125,13 @@ msgstr "GeoRSS på Google Maps" msgid "Get updates" msgstr "Få oppdateringer" -#: templates/web/fixmystreet/reports/_rss.html:4 +#: templates/web/fixmystreet/reports/_rss.html:3 #: 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:4 +#: templates/web/fixmystreet/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "Få oppdateringer for problemer i denne %s" @@ -1168,6 +1140,10 @@ msgstr "Få oppdateringer for problemer i denne %s" msgid "Give me an RSS feed" msgstr "Gi meg en RSS-strøm" +#: templates/web/base/questionnaire/completed.html:14 +msgid "Glad to hear it’s been fixed!" +msgstr "Glad for å høre at det er i orden!" + #: templates/web/base/alert/index.html:34 #: templates/web/base/around/postcode_form.html:8 #: templates/web/fixmystreet/around/postcode_form.html:21 @@ -1175,7 +1151,7 @@ msgstr "Gi meg en RSS-strøm" msgid "Go" msgstr "Søk" -#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:93 msgid "Going to send questionnaire?" msgstr "Skal det sendes spørreskjema?" @@ -1197,9 +1173,7 @@ msgstr "Har dette problemet blitt løst?" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "Har du rapportert et problem til en administrasjon før, eller er dette første gangen?" -#: templates/web/base/footer.html:15 templates/web/fiksgatami/footer.html:27 -#: templates/web/fiksgatami/nn/footer.html:27 -#: templates/web/fixmystreet/footer.html:30 +#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:30 #: templates/web/zurich/faq/faq-de-ch.html:1 #: templates/web/zurich/footer.html:21 #: templates/web/zurich/nav_over_content.html:8 @@ -1211,18 +1185,17 @@ msgstr "Hjelp" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "Her er de forskjellige typene lokale problemvarsler for ‘%s’." -#: templates/web/fiksgatami/header.html:48 -#: templates/web/fixmystreet/header.html:52 +#: templates/web/fixmystreet/header.html:58 #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "Hei, %s" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:50 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:63 +#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/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:86 #: templates/web/zurich/admin/report_edit.html:90 #: templates/web/zurich/admin/stats.html:32 @@ -1238,7 +1211,7 @@ msgstr "Skjul gamle" msgid "Hide pins" msgstr "Skjul nåler" -#: templates/web/base/admin/category_edit.html:79 +#: templates/web/base/admin/category_edit.html:84 msgid "History" msgstr "Historie" @@ -1254,19 +1227,25 @@ msgstr "Hvordan rapportere et problem" msgid "How to send successful reports" msgstr "Hvordan sende inn rapporter som løses" -#: perllib/FixMyStreet/App/Controller/Admin.pm:742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:740 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Jeg er redd du ikke kan bekrefte ubekreftede rapporter." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:89 +#: templates/web/base/tokens/confirm_problem.html:23 +#: templates/web/base/tokens/confirm_problem.html:27 +msgid "I just reported a problem on @fixmystreet" +msgstr "Jeg rapporterte akkurat et problem på @fiksgatami" + +#: templates/web/base/tokens/confirm_update.html:19 +#: templates/web/base/tokens/confirm_update.html:23 +msgid "I just updated a problem on @fixmystreet" +msgstr "Jeg oppdaterte akkurat et problem på @fiksgatami" + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Jeg er redd vi ikke klarte å finne ditt problem i databasen.\n" -#: 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 "Jeg er redd vi ikke kunne verifisere den referansen, da det er for lenge siden rapporten ble laget." - -#: perllib/FixMyStreet/App/Controller/Tokens.pm:260 +#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 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" @@ -1286,13 +1265,13 @@ msgstr "ID" 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 "" +msgstr "Identifiser en <strong>parent</strong> hvis instansen selv er en del av en annen administrasjon." -#: templates/web/base/admin/body.html:125 +#: templates/web/base/admin/body.html:133 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 "" +msgstr "Hvis to eller flere instanser er lokalisert på samme sted, kombinerer FiksGataMi identiske kategorier i en enkelt oppføring menyen. Kontroller at du bruker samme kategorinavn for instansene, hvis det det er ønskelig." #: templates/web/base/email_sent.html:19 msgid "If you do not, your alert will not be activated." @@ -1306,7 +1285,12 @@ 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/base/report/new/councils_text_none.html:9 +#: templates/web/base/questionnaire/completed.html:8 +msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." +msgstr "Hvis du får mer informasjon om status for problemet ditt, vær så snill å kom tilbake til nettstedet og legg igjen en oppdatering." + +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:8 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." @@ -1325,34 +1309,41 @@ msgstr "" "(denne blir ikke sendt til administrasjonen). Du kan for eksempel\n" "dele din erfaring med hvordan ditt problem ble løst." -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/body.html:149 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "Hvis du bruker <strong>en sendemetode som ikke er e-post</strong>, skriv inn tjeneste-ID (Open311) eller ekvivalent identifikator her." -#: templates/web/base/admin/body-form.html:200 -#: templates/web/base/admin/body-form.html:201 +#: templates/web/base/admin/body-form.html:207 +#: templates/web/base/admin/body-form.html:208 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 "" +"Hvis du har aktivert Open311 update-sending ovenfor, vil Open311 vanligvis bare godta OPEN eller CLOSED status i\n" +"sine oppdateringer. Aktiver <strong>extended Open311 stauses</strong> hvis du vil tillate ekstra tilstander.\n" +"Sjekk at cobrand støtter denne funksjonen før du slår den på." -#: templates/web/base/admin/body-form.html:187 -#: templates/web/base/admin/body-form.html:188 +#: templates/web/base/admin/body-form.html:194 +#: templates/web/base/admin/body-form.html:195 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 "" +"Hvis du har aktiviert Open311 update-sending ovenfor, aktiver <strong>suppression of alerts</strong>,\n" +"hvis du <strong>ikke</strong> ønsker å varsle denne brukeren hver gang disse oppdateringene blir laget." -#: templates/web/base/admin/body-form.html:173 -#: templates/web/base/admin/body-form.html:174 +#: templates/web/base/admin/body-form.html:177 +#: templates/web/base/admin/body-form.html:178 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 "" +"Hvis du har aktivert Open311 update-sending ovenfor, må du identifisere hvilke FiksGataMi <strong>bruker</ strong> som blir kreditert for oppdateringer \n" +"når de blir vist på nettstedet. Vis ID (nummer) for denne brukeren." -#: perllib/FixMyStreet/App/Controller/Contact.pm:127 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 msgid "Illegal ID" msgstr "Ugyldig ID" @@ -1377,17 +1368,21 @@ msgstr "I misbrukstabell?" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "I tillegg er følgende attributter som ikke er del av Open311 v2-spesifikasjonen returnert: agency_sent_datetime, title (også returnert som del av description), interface_used, comment_count, requestor_name (kun tilstede hvis innsender tillot at navnet kunne vises på dette nettstedet)." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:38 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:144 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 #: templates/web/fixmystreet/report/banner.html:19 -#: templates/web/zurich/admin/header.html:2 +#: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 #: templates/web/zurich/admin/report_edit.html:99 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "Under arbeid" +#: templates/web/base/tokens/confirm_alert.html:11 +msgid "Inbox zero, here we come!" +msgstr "Tom innboks, her kommer vi!" + #: templates/web/zurich/admin/report_edit.html:160 msgid "Include reporter personal details" msgstr "Inkluder rapporørens personlige detaljer" @@ -1396,7 +1391,7 @@ msgstr "Inkluder rapporørens personlige detaljer" msgid "Include unconfirmed reports" msgstr "Inkluder ubekreftede problemer" -#: perllib/FixMyStreet/App/Controller/Open311.pm:354 +#: perllib/FixMyStreet/App/Controller/Open311.pm:359 msgid "Incorrect has_photo value \"%s\"" msgstr "Feil has_photo-verdi \"%s\"" @@ -1404,29 +1399,29 @@ msgstr "Feil has_photo-verdi \"%s\"" msgid "Internal notes" msgstr "Interne notater" -#: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:61 msgid "Internal referral" msgstr "Interne referanser" -#: perllib/FixMyStreet/App/Controller/Open311.pm:339 +#: perllib/FixMyStreet/App/Controller/Open311.pm:344 msgid "Invalid agency_responsible value %s" msgstr "Ugyldig agency_responsible-verdi %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1114 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1112 msgid "Invalid end date" msgstr "Ugyldig slutt-dato" -#: perllib/FixMyStreet/App/Controller/Open311.pm:432 +#: perllib/FixMyStreet/App/Controller/Open311.pm:437 msgid "Invalid format %s specified." msgstr "Ugyldig format %s oppgitt." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1110 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 msgid "Invalid start date" msgstr "Ugyldig startdato" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:37 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:50 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 #: templates/web/base/report/update-form.html:30 @@ -1440,8 +1435,12 @@ msgstr "Undersøkes" msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "Det er ofte raskest å <a href=\"%s\">sjekke FAQ-en vår</a> og se om svaret er der." +#: templates/web/base/tokens/confirm_problem.html:14 +msgid "It’s on its way to the council right now." +msgstr "Den er på tur mot myndigheten akkurat nå." + #: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:150 +#: templates/web/base/report/new/fill_in_details_form.html:131 #: templates/web/base/report/update-form.html:104 #: templates/web/fixmystreet/auth/general.html:47 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 @@ -1450,12 +1449,12 @@ msgstr "Det er ofte raskest å <a href=\"%s\">sjekke FAQ-en vår</a> og se om sv msgid "Keep me signed in on this computer" msgstr "Husk min innlogging på denne datamaskinen" -#: templates/web/base/admin/body.html:62 +#: templates/web/base/admin/body.html:70 #: templates/web/zurich/admin/body.html:16 msgid "Last editor" msgstr "Sist redigert av" -#: templates/web/base/admin/report_edit.html:72 +#: templates/web/base/admin/report_edit.html:88 msgid "Last update:" msgstr "Siste oppdatering:" @@ -1463,43 +1462,38 @@ msgstr "Siste oppdatering:" msgid "Last update:" msgstr "Siste oppdatering:" -#: templates/web/base/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:229 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "La denne være blank hvis alle rapporter til denne administrasjonen skal sendes ved hjelp av samme sende-metode (dvs. \"%s\")." -#: templates/web/base/admin/body.html:17 templates/web/base/admin/body.html:19 +#: templates/web/base/admin/body.html:27 msgid "List all reported problems" msgstr "List alle rapporterte problemer" -#: templates/web/base/report/new/fill_in_details_form.html:69 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:54 -#: templates/web/zurich/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/category_wrapper.html:4 msgid "Loading..." msgstr "Laster..." #: templates/web/base/alert/choose.html:1 #: templates/web/base/alert/choose.html:3 #: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3 -#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:5 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5 #: templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 -#: templates/web/base/tokens/confirm_alert.html:4 #: templates/web/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "Lokal RSS-strøm og e-postvarsel" -#: templates/web/base/alert/list.html:13 templates/web/base/alert/list.html:14 -#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:3 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:12 +#: templates/web/base/alert/list.html:14 templates/web/base/alert/list.html:3 msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Lokal RSS-strøm og e-postvarsel for ‘%s’" -#: templates/web/base/footer.html:13 templates/web/fiksgatami/footer.html:25 -#: templates/web/fiksgatami/nn/footer.html:25 -#: templates/web/fixmystreet/footer.html:28 +#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:28 msgid "Local alerts" msgstr "Lokale varsler" -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:25 msgid "Locate the problem on a map of the area" msgstr "Lokaliser problemet på kartet over området" @@ -1508,15 +1502,25 @@ msgid "MAP" msgstr "KART" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" -msgstr "" +msgstr "Kart" -#: perllib/FixMyStreet/Map/OSM.pm:42 -msgid "Map © <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 "Kart © <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> og bidragsytere, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA</a>" +#: templates/web/base/admin/report_edit.html:86 +#, fuzzy +msgid "Mark as sent" +msgstr "markert som lukket" -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/user-form.html:44 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." +msgstr "Merk brukere hvis adferd du ønsker å ha en sjekk på som <strong>flagget</strong>." + +#: templates/web/base/reports/index.html:24 +msgid "Marked fixed/closed in the past eight weeks" +msgstr "" + +#: templates/web/base/reports/index.html:25 +msgid "Marked fixed/closed more than eight weeks ago" msgstr "" #: templates/web/fixmystreet/contact/index.html:106 @@ -1527,7 +1531,7 @@ msgstr "Melding" msgid "Message:" msgstr "Melding:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:440 +#: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" msgstr "Mangler jurisdiction_id" @@ -1557,11 +1561,11 @@ msgstr "Flere problemer i nærheten" #: templates/web/fixmystreet/report/update-form.html:138 #: 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:94 +#: templates/web/zurich/report/new/fill_in_details_form.html:77 msgid "Name" msgstr "Navn" -#: templates/web/base/admin/report_edit.html:66 +#: templates/web/base/admin/report_edit.html:79 #: templates/web/base/admin/update_edit.html:32 #: templates/web/base/admin/user-form.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:43 @@ -1570,25 +1574,25 @@ msgstr "Navn" msgid "Name:" msgstr "Navn:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:321 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:313 msgid "Name: %s" msgstr "Navn: %s" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:186 -#: perllib/FixMyStreet/Geocode/OSM.pm:164 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 +#: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "Nærmeste navngitte vei til nålen plassert på kartet (automatisk generert ved hjelp av OpenStreetMap): %s%s" -#: perllib/FixMyStreet/Cobrand/UK.pm:137 +#: perllib/FixMyStreet/Cobrand/UK.pm:127 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:421 -#: perllib/FixMyStreet/Cobrand/Default.pm:461 +#: perllib/FixMyStreet/Cobrand/Default.pm:442 +#: perllib/FixMyStreet/Cobrand/Default.pm:482 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:288 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:277 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1604,11 +1608,11 @@ msgstr "Nesten ferdig! Nå må du sjekke e-posten din..." msgid "New <br>problems" msgstr "Nye <br>problemer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:264 +#: perllib/FixMyStreet/App/Controller/Admin.pm:261 msgid "New body added" msgstr "Ny administrasjon lagt til" -#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:379 msgid "New category contact added" msgstr "Ny kategorikontakt lagt til" @@ -1681,15 +1685,15 @@ msgstr "Ny oppdatering:" msgid "Next" msgstr "Neste" -#: templates/web/base/admin/body.html:72 templates/web/base/admin/body.html:74 -#: templates/web/base/admin/body.html:78 templates/web/base/admin/body.html:80 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:93 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:44 @@ -1707,7 +1711,7 @@ msgstr "Ingen administrasjon" msgid "No council" msgstr "Ingen administrasjon" -#: perllib/FixMyStreet/DB/Result/Problem.pm:376 +#: perllib/FixMyStreet/DB/Result/Problem.pm:401 msgid "No council selected" msgstr "Ingen administrasjon er valgt" @@ -1747,13 +1751,16 @@ 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 "" +"Ingen spesifikke områder er tilgjengelig for øyeblikket, fordi \n" +"<code>MAPIT_URL</code> i din \n" +"config-fil ikke peker til en live MapIt-tjeneste." -#: templates/web/base/report/_support.html:3 +#: templates/web/base/report/_support.html:2 #: templates/web/base/report/_support.html:4 msgid "No supporters" msgstr "Ingen støttespillere" -#: templates/web/base/admin/report_edit.html:30 +#: templates/web/base/admin/report_edit.html:41 #: templates/web/zurich/admin/report_edit-sdm.html:46 #: templates/web/zurich/admin/report_edit.html:60 msgid "None" @@ -1767,9 +1774,13 @@ msgid "" " Depending on the implementation, staff users may have access to the dashboard (summary of\n" " activity across their body), the ability to hide reports or set special report statuses." msgstr "" +"Vanlige (offentlige) brukere bør ikke være forbundet med noen <strong>instans</ strong>. <br>\n" +"Autoriserte brukere i staben kan være forbundet med den instansen de representerer. <br>\n" +"Avhengig av implementeringen, kan ansatte brukere har tilgang til dashbordet (sammendrag av \n" +"aktivitet for hele instansen), mulighet å skjule meldinger eller sette status for spesialrapporter." -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:46 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -1785,12 +1796,12 @@ msgstr "Ikke for min underavdeling" msgid "Not reported before" msgstr "Ikke rapportert tidligere" -#: templates/web/base/report/_main.html:61 +#: templates/web/base/report/_main.html:62 msgid "Not reported to council" msgstr "Ikke rapportert til administrasjonen" -#: templates/web/base/admin/body.html:63 -#: templates/web/base/admin/category_edit.html:87 +#: templates/web/base/admin/body.html:71 +#: templates/web/base/admin/category_edit.html:92 #: templates/web/zurich/admin/body.html:17 msgid "Note" msgstr "Merk" @@ -1799,8 +1810,8 @@ msgstr "Merk" 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 "Merk at når vi tar med ubekreftede rapporter så brukes datoen rapporten var opprettet, hvilket ikke trenger være den samme måneden som rapporten var bekreftet, så tallene kan hoppe litt opp og ned." -#: templates/web/base/admin/body.html:178 -#: templates/web/base/admin/category_edit.html:44 +#: templates/web/base/admin/body.html:186 +#: templates/web/base/admin/category_edit.html:49 #: templates/web/zurich/admin/body.html:53 msgid "Note:" msgstr "Merk:" @@ -1813,7 +1824,7 @@ msgstr "Note: <strong>%d</strong>" msgid "Now to submit your report…" msgstr "På tide å sende din rapport…" -#: templates/web/base/report/new/fill_in_details_form.html:132 +#: templates/web/base/report/new/fill_in_details_form.html:113 msgid "Now to submit your report… do you have a FixMyStreet password?" msgstr "På tide å sende din rapport… har du et FiksGataMi-passord?" @@ -1830,7 +1841,7 @@ msgid "OK" msgstr "OK" #: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:16 +#: templates/web/base/report/update.html:17 msgid "Offensive? Unsuitable? Tell us" msgstr "Støtende? Upassende? Gi oss beskjed" @@ -1850,19 +1861,19 @@ msgstr "Eldre <br>løste" msgid "Older <br>problems" msgstr "Eldre <br>problemer" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:37 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 msgid "One-line summary" msgstr "Enlinjers oppsummering" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:137 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:36 -#: templates/web/base/admin/report_edit.html:37 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:138 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:49 +#: templates/web/base/admin/report_edit.html:50 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/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:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/report_edit.html:86 #: templates/web/zurich/admin/report_edit.html:88 @@ -1871,10 +1882,19 @@ msgstr "Enlinjers oppsummering" msgid "Open" msgstr "Åpen" -#: templates/web/base/my/my.html:30 templates/web/fixmystreet/my/my.html:36 +#: templates/web/base/reports/index.html:22 +msgid "Open for more than four weeks, with an update within the past eight weeks" +msgstr "" + +#: templates/web/base/my/my.html:30 +#: templates/web/fixmystreet/my/_problem-list.html:2 msgid "Open reports" msgstr "Åpne rapporter" +#: templates/web/base/reports/index.html:23 +msgid "Open, but not had any update in eight weeks" +msgstr "" + #: templates/web/base/open311/index.html:70 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "Open311-API for mySocietys FiksGataMi-tjener" @@ -1897,15 +1917,15 @@ msgstr "Eller problemer meldt til:" msgid "Or you can subscribe to an alert based upon what ward or council you’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:1057 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:662 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:663 -#: perllib/FixMyStreet/DB/Result/Problem.pm:560 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 -#: perllib/FixMyStreet/DB/Result/Problem.pm:592 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:372 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 +#: perllib/FixMyStreet/DB/Result/Problem.pm:597 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:393 msgid "Other" msgstr "Annet" @@ -1927,8 +1947,8 @@ msgstr "Fant ikke siden" msgid "Parent" msgstr "Forelder" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 msgid "Partial" msgstr "Delvis" @@ -1946,9 +1966,9 @@ msgstr "Passord:" #: templates/web/base/js/translation_strings.html:48 msgid "Permalink" -msgstr "" +msgstr "Permalink" -#: templates/web/zurich/report/new/fill_in_details_form.html:100 +#: templates/web/zurich/report/new/fill_in_details_form.html:83 msgid "Phone number" msgstr "Telefonnummer" @@ -1957,27 +1977,27 @@ msgstr "Telefonnummer" msgid "Phone number (optional)" msgstr "Telefonnummer (valgfritt)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:286 -#: templates/web/base/admin/report_edit.html:68 -#: templates/web/base/report/new/fill_in_details_form.html:216 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:291 +#: templates/web/base/admin/report_edit.html:81 +#: templates/web/base/report/new/fill_in_details_form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:46 #: templates/web/zurich/admin/report_edit.html:60 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Telefon:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:72 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 #: 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 +#: templates/web/zurich/report/new/fill_in_details_form.html:51 msgid "Photo" msgstr "Bilde" #: templates/web/base/questionnaire/index.html:71 -#: templates/web/base/report/new/fill_in_details_form.html:103 +#: templates/web/base/report/new/fill_in_details_form.html:84 #: templates/web/base/report/update-form.html:62 #: templates/web/fixmystreet/questionnaire/index.html:91 msgid "Photo:" @@ -1991,11 +2011,11 @@ msgstr "Bilder av nye problemer i nærheten" msgid "Place pin on map" msgstr "Plasser tegnestiften på kartet" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:38 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/zurich/admin/header.html:2 +#: 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:86 @@ -2029,22 +2049,21 @@ msgstr "Vennligst sjekk e-posten du oppgav" msgid "Please check your email address is correct" msgstr "Vennligst sjekk at du har skrevet en gyldig e-postadresse" -#: perllib/FixMyStreet/App/Controller/Admin.pm:349 -#: 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:395 +#: perllib/FixMyStreet/App/Controller/Admin.pm:343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:876 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 +#: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" msgstr "Velg en kategori" -#: perllib/FixMyStreet/DB/Result/Problem.pm:401 +#: perllib/FixMyStreet/DB/Result/Problem.pm:418 msgid "Please choose a property type" msgstr "Velg en type egenskap" -#: perllib/FixMyStreet/App/Controller/Admin.pm:376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:370 msgid "Please correct the errors below" -msgstr "" +msgstr "Husk å rette opp feilene nedenfor." #: templates/web/base/contact/blurb.html:2 #: templates/web/fixmystreet/contact/blurb.html:12 @@ -2061,8 +2080,8 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "Ikke vær ufin — å kjefte på din administrasjon skader verdien av tjenesten for alle brukerne." -#: perllib/FixMyStreet/App/Controller/Admin.pm:352 -#: perllib/FixMyStreet/DB/Result/Comment.pm:133 +#: perllib/FixMyStreet/App/Controller/Admin.pm:346 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "Vennligst legg til en melding" @@ -2073,15 +2092,15 @@ msgstr "Vennligst legg til en melding" msgid "Please enter a password" msgstr "Skriv inn et passord" -#: perllib/FixMyStreet/App/Controller/Contact.pm:108 -#: perllib/FixMyStreet/DB/Result/Problem.pm:370 +#: perllib/FixMyStreet/App/Controller/Contact.pm:113 +#: perllib/FixMyStreet/DB/Result/Problem.pm:395 #: templates/web/base/js/translation_strings.html:3 msgid "Please enter a subject" msgstr "Vennligst legg inn et emne" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1050 -#: perllib/FixMyStreet/App/Controller/Admin.pm:351 -#: perllib/FixMyStreet/App/Controller/Admin.pm:997 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin.pm:995 #: perllib/FixMyStreet/DB/Result/User.pm:127 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 @@ -2089,16 +2108,16 @@ msgid "Please enter a valid email" msgstr "Legg til en gyldig e-post" #: perllib/FixMyStreet/App/Controller/Alert.pm:346 -#: perllib/FixMyStreet/App/Controller/Contact.pm:118 +#: perllib/FixMyStreet/App/Controller/Contact.pm:123 msgid "Please enter a valid email address" msgstr "Legg inn din e-post" -#: perllib/FixMyStreet/DB/Result/Problem.pm:373 +#: perllib/FixMyStreet/DB/Result/Problem.pm:398 #: templates/web/base/js/translation_strings.html:4 msgid "Please enter some details" msgstr "Legg inn opplysninger om problemet" -#: perllib/FixMyStreet/App/Controller/Contact.pm:107 +#: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/User.pm:124 #: templates/web/base/auth/general.html:13 #: templates/web/base/auth/general.html:8 @@ -2112,7 +2131,7 @@ msgid "Please enter your email" msgstr "Legg inn din e-post" #: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:75 msgid "Please enter your email address" msgstr "Vennligst tast inn din e-postadresse" @@ -2120,14 +2139,14 @@ msgstr "Vennligst tast inn din e-postadresse" msgid "Please enter your first name" msgstr "Vennligst tast inn ditt fornavn" -#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: perllib/FixMyStreet/Cobrand/UK.pm:318 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Vennligst legg inn ditt fulle navn, administrasjoner som mottar ditt problem trenger dette - hvis du ikke ønsker at ditt navn skal vises, fjern haken under" -#: perllib/FixMyStreet/App/Controller/Contact.pm:106 -#: perllib/FixMyStreet/DB/Result/Comment.pm:130 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Contact.pm:111 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 +#: perllib/FixMyStreet/DB/Result/Problem.pm:406 #: perllib/FixMyStreet/DB/Result/User.pm:120 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" @@ -2135,7 +2154,7 @@ msgstr "Legg inn ditt navn" #: templates/web/base/js/translation_strings.html:22 msgid "Please enter your phone number" -msgstr "" +msgstr "Legg inn ditt telefonnummer." #: templates/web/base/js/translation_strings.html:26 msgid "Please enter your second name" @@ -2150,7 +2169,7 @@ msgstr "Vennligst legg inn din tittel" msgid "Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a href=\"/\">front page</a>." msgstr "Du kan også <a href=\"%s\">logge inn igjen</a> eller gå tilbake til <a href=\"/\">framsiden</a>." -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:8 msgid "Please fill in details of the problem below." msgstr "Vennligst fyll ut detaljer om problemet under" @@ -2167,7 +2186,7 @@ msgstr "" "Vennligst fyll inn skjemaet under med detaljene om problemet,\n" "og beskriv plasseringen så nøyaktig som mulig i boksen for detaljer." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:251 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Vennligst indiker om du ønsker å motta et nytt spørreskjema" @@ -2190,16 +2209,16 @@ msgstr "Merk at din rapport <strong>ennå ikke er sendt</strong. Velg en katego msgid "Please note:" msgstr "Vennligst merk deg:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:246 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:254 msgid "Please provide some explanation as to why you're reopening this report" msgstr "Vennligst bidra med en forklaring for hvorfor du gjenåpner denne problemrapporten" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:261 msgid "Please provide some text as well as a photo" msgstr "Vennligst bidra med litt tekst i tilegg til et bilde" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:247 msgid "Please say whether you've ever reported a problem to your council before" msgstr "Vennligst opplys om du har rapportert et problem til din administrasjon tidligere" @@ -2211,7 +2230,7 @@ msgstr "Velg den kilden du ønsker" msgid "Please select the type of alert you want" msgstr "Vennligst velg hvilken type varsel du ønsker" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please state whether or not the problem has been fixed" msgstr "Vennligs oppgi om dette problemet er blitt fikset eller ikke" @@ -2219,15 +2238,13 @@ msgstr "Vennligs oppgi om dette problemet er blitt fikset eller ikke" msgid "Please take a look at the updates that have been left." msgstr "Vennligst se over oppdateringene som har blitt lagt inn." -#: perllib/FixMyStreet/App/Controller/Photo.pm:176 +#: perllib/FixMyStreet/App/Controller/Photo.pm:177 +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 +#: perllib/FixMyStreet/App/Controller/Photo.pm:189 msgid "Please upload a JPEG image only" msgstr "Vennligst last opp kun JPEG-bilder" -#: perllib/FixMyStreet/App/Controller/Photo.pm:183 -msgid "Please upload a JPEG image only\n" -msgstr "Vennligst last opp kun JPEG eller JPG-bilder\n" - -#: perllib/FixMyStreet/App/Controller/Contact.pm:109 +#: perllib/FixMyStreet/App/Controller/Contact.pm:114 msgid "Please write a message" msgstr "Skriv inn en melding" @@ -2264,16 +2281,16 @@ msgstr "Forrige" #: templates/web/fixmystreet/footer.html:32 msgid "Privacy" -msgstr "" +msgstr "Personvern" -#: templates/web/base/admin/body.html:194 -#: templates/web/base/admin/body.html:77 -#: templates/web/base/admin/category_edit.html:40 -#: templates/web/base/admin/report_edit.html:79 +#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:85 +#: templates/web/base/admin/category_edit.html:45 +#: templates/web/base/admin/report_edit.html:95 msgid "Private" msgstr "Privat" -#: templates/web/base/maps/openlayers.html:86 +#: templates/web/base/maps/openlayers.html:89 msgid "Problem" msgstr "Problem" @@ -2294,7 +2311,7 @@ msgstr "Problem %s sendt til administrasjon %s" msgid "Problem breakdown by state" msgstr "Tilstandsfordeling av problemer" -#: perllib/FixMyStreet/App/Controller/Admin.pm:968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:966 msgid "Problem marked as open." msgstr "Problem markert som åpent." @@ -2329,16 +2346,15 @@ 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:629 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:114 +#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:151 -#: perllib/FixMyStreet/Cobrand/UK.pm:217 +#: perllib/FixMyStreet/Cobrand/UK.pm:207 msgid "Problems within %s" msgstr "Problemer innenfor %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:122 -#: perllib/FixMyStreet/Cobrand/UK.pm:231 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "Problems within %s ward" msgstr "Problemer innenfor %s bydel" @@ -2356,7 +2372,7 @@ msgstr "Problemer innenfor grensene av:" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "Eiendommer nylig rapportert som gått tilbake i bruk på reportemptyhomes.com" -#: templates/web/base/admin/report_edit.html:32 +#: templates/web/base/admin/report_edit.html:45 msgid "Property address:" msgstr "Eiendomsadresse:" @@ -2373,7 +2389,7 @@ 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 "Det er valgfritt å oppgi navn og passord, men hvis du gjør det kan du enklere rapportere problemer, legge igjen oppdateringer og håndtere rapportene dine." -#: templates/web/base/report/new/fill_in_details_form.html:174 +#: templates/web/base/report/new/fill_in_details_form.html:155 #: templates/web/base/report/update-form.html:128 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 #: templates/web/fixmystreet/report/update-form.html:119 @@ -2394,7 +2410,7 @@ msgstr "Publiser bilde" msgid "Publish the response" msgstr "Publiser svar" -#: templates/web/base/questionnaire/completed.html:2 +#: templates/web/base/questionnaire/completed.html:1 #: templates/web/base/questionnaire/index.html:0 #: templates/web/base/questionnaire/index.html:14 #: templates/web/base/questionnaire/index.html:4 @@ -2413,11 +2429,12 @@ msgstr "Spørreskjema %d fylt inn for problem %d, %s til %s" msgid "Questionnaire %d sent for problem %d" msgstr "Spørreskjema %d sendt for problem %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 msgid "Questionnaire filled in by problem reporter" msgstr "Spørreskjema fylt inn av feilrapportøren" #: templates/web/base/alert/_list.html:21 +#: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display.html:50 #: templates/web/base/reports/_rss.html:1 @@ -2427,11 +2444,11 @@ msgstr "Spørreskjema fylt inn av feilrapportøren" msgid "RSS feed" msgstr "RSS-strøm" -#: perllib/FixMyStreet/Cobrand/UK.pm:260 perllib/FixMyStreet/Cobrand/UK.pm:272 +#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 msgid "RSS feed for %s" msgstr "RSS-strøm for %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "RSS feed for %s ward, %s" msgstr "RSS-strøm for %s bydel, %s" @@ -2439,15 +2456,11 @@ msgstr "RSS-strøm for %s bydel, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:167 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:175 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:185 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:193 -#: perllib/FixMyStreet/Cobrand/UK.pm:286 perllib/FixMyStreet/Cobrand/UK.pm:298 +#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 msgid "RSS feed of %s" msgstr "RSS-strøm fra %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 msgid "RSS feed of %s, within %s ward" msgstr "RSS-strøm av %s, innenfor %s bydel" @@ -2460,20 +2473,19 @@ 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:630 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:115 +#: perllib/FixMyStreet/Cobrand/Default.pm:651 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:150 -#: perllib/FixMyStreet/Cobrand/UK.pm:224 +#: perllib/FixMyStreet/Cobrand/UK.pm:214 msgid "RSS feed of problems within %s" msgstr "RSS-strøm for problemer innenfor %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 -#: perllib/FixMyStreet/Cobrand/UK.pm:230 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s ward" msgstr "RSS-strøm for problemer innenfor %s bydel" -#: templates/web/base/around/display_location.html:3 +#: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:4 msgid "RSS feed of recent local problems" msgstr "RSS-strøm med nylige lokale problemer" @@ -2513,15 +2525,18 @@ msgstr "Husk at FiksGataMi primert er laget for å rapportere fysiske problemer msgid "Remove flag" msgstr "Fjern flagg" -#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/report_edit.html:110 #: templates/web/base/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!)" -#: templates/web/base/footer.html:7 templates/web/fiksgatami/footer.html:19 -#: templates/web/fiksgatami/nn/footer.html:19 -#: templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 +msgid "Report" +msgstr "Rapport" + +#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 #: templates/web/zurich/footer.html:17 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2531,11 +2546,6 @@ msgstr "Rapporter et problem" msgid "Report abuse" msgstr "Rapporter misbruk" -#: templates/web/base/report_created.html:1 -#: templates/web/base/report_created.html:3 -msgid "Report created" -msgstr "Rapport opprettet" - #: perllib/FixMyStreet/App/Controller/Rss.pm:295 msgid "Report on %s" msgstr "Rapport på %s" @@ -2559,7 +2569,7 @@ msgstr "Rapportert %s" msgid "Reported %s, to %s" msgstr "Rapportert %s, til %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:580 #: templates/web/base/contact/index.html:50 #: templates/web/fixmystreet/contact/index.html:65 msgid "Reported anonymously at %s" @@ -2571,7 +2581,7 @@ msgstr "Rapportert anonymt %s" msgid "Reported before" msgstr "Rapportert tidligere" -#: perllib/FixMyStreet/DB/Result/Problem.pm:598 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 #: templates/web/base/contact/index.html:52 #: templates/web/fixmystreet/contact/index.html:67 msgid "Reported by %s at %s" @@ -2581,31 +2591,36 @@ msgstr "Publisert av %s %s" msgid "Reported in the %s category" msgstr "Rapportert i kategorien %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:571 +#: perllib/FixMyStreet/DB/Result/Problem.pm:576 msgid "Reported in the %s category anonymously at %s" msgstr "Rapportert i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:598 msgid "Reported in the %s category by %s at %s" msgstr "Rapportert i kategorien %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:567 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 msgid "Reported via %s anonymously at %s" msgstr "Publisert av %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:589 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 msgid "Reported via %s by %s at %s" msgstr "Rapporter av %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:563 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 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:583 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 msgid "Reported via %s in the %s category by %s at %s" msgstr "Rapportert av %s i kategorien %s av %s %s" -#: templates/web/base/around/around_index.html:2 +#: templates/web/base/reports/index.html:21 +#, fuzzy +msgid "Reported within the last four weeks" +msgstr "Rapportert i kategorien %s" + +#: templates/web/base/around/around_index.html:1 #: templates/web/base/around/around_index.html:3 #: templates/web/base/js/translation_strings.html:41 #: templates/web/base/report/new/fill_in_details.html:0 @@ -2615,16 +2630,15 @@ msgstr "Rapportert av %s i kategorien %s av %s %s" msgid "Reporting a problem" msgstr "Legger til et problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:294 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "Rapporter" -#: perllib/FixMyStreet/DB/Result/Problem.pm:409 -#: perllib/FixMyStreet/DB/Result/Problem.pm:413 +#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 msgid "Reports are limited to %s characters in length. Please shorten your report" -msgstr "" +msgstr "Rapportene begrenses til %s tegn. Rapporten må forkortes." #: templates/web/zurich/admin/index-sdm.html:7 msgid "Reports awaiting approval" @@ -2638,7 +2652,7 @@ msgstr "Problemer i og rundt kartet" msgid "Reports published" msgstr "Publiserte rapporter" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:85 msgid "Resend report" msgstr "Send rapport på nytt" @@ -2646,36 +2660,35 @@ msgstr "Send rapport på nytt" msgid "Right place?" msgstr "Riktig sted?" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:193 -#: perllib/FixMyStreet/Geocode/OSM.pm:171 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:167 +#: perllib/FixMyStreet/Geocode/OSM.pm:152 msgid "Road operator for this named road (derived from road reference number and type): %s" msgstr "Veioperatør for denne navngitte veien (utledet fra veiens referansenummer og type) %s" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:190 -#: perllib/FixMyStreet/Geocode/OSM.pm:168 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:164 +#: perllib/FixMyStreet/Geocode/OSM.pm:149 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:1394 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 -#: templates/web/base/admin/report_edit.html:90 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1403 +#: templates/web/base/admin/report_edit.html:106 #: templates/web/zurich/admin/report_edit.html:73 msgid "Rotate Left" msgstr "Roter til venstre" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1394 -#: templates/web/base/admin/report_edit.html:91 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: templates/web/base/admin/report_edit.html:107 #: templates/web/zurich/admin/report_edit.html:74 msgid "Rotate Right" msgstr "Roter til høyre" #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" -msgstr "" +msgstr "Satelitt" -#: templates/web/base/admin/body.html:200 -#: templates/web/base/admin/category_edit.html:76 +#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/category_edit.html:81 #: templates/web/zurich/admin/body.html:59 msgid "Save changes" msgstr "Lagre endringer" @@ -2703,7 +2716,7 @@ msgstr "Søk:" msgid "Searching found no reports." msgstr "Søket fant ingen rapporter." -#: templates/web/base/admin/users.html:39 +#: templates/web/base/admin/users.html:41 msgid "Searching found no users." msgstr "Søket fant ingen brukere." @@ -2726,15 +2739,15 @@ 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:680 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "Sent to %s %s later" msgstr "Sendt til %s %s senere" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:84 msgid "Sent:" msgstr "Sendt:" -#: templates/web/base/admin/report_edit.html:73 +#: templates/web/base/admin/report_edit.html:89 #: templates/web/zurich/admin/stats.html:45 msgid "Service:" msgstr "Tjeneste:" @@ -2743,7 +2756,7 @@ msgstr "Tjeneste:" msgid "Share" msgstr "Dele" -#: templates/web/base/report/new/fill_in_details_form.html:211 +#: templates/web/base/report/new/fill_in_details_form.html:192 #: templates/web/base/report/update-form.html:157 #: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 @@ -2788,27 +2801,30 @@ msgstr "Logg ut" msgid "Signed in as %s" msgstr "Logget inn som %s" -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 msgid "Some categories may require additional information." msgstr "Noen kategorier krever kanskje mer informasjon" -#: templates/web/base/admin/body-form.html:145 -#: templates/web/base/admin/body-form.html:146 +#: templates/web/base/admin/body-form.html:149 +#: templates/web/base/admin/body-form.html:150 msgid "" "Some endpoints require an <strong>API key</strong> to indicate that the reports are being\n" " sent from your FixMyStreet installation." msgstr "" +"Noen leveringspunkter krever en <strong>API-nøkkel\n" +"</strong> for å indikere at rapportene blir sendt\n" +"fra din FiksGataMi installasjon." #: templates/web/base/alert/index.html:42 msgid "Some photos of recent reports" msgstr "Noen bilder av nylig meldte problemer" #: perllib/FixMyStreet/App/View/Email.pm:32 -#: perllib/FixMyStreet/App/View/Web.pm:44 +#: perllib/FixMyStreet/App/View/Web.pm:43 msgid "Some text to localize" msgstr "Noe tekst å oversette" -#: perllib/FixMyStreet/Cobrand/UK.pm:88 +#: perllib/FixMyStreet/Cobrand/UK.pm:78 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "Beklager det ser ut til å være et \"Crown dependency\"-postnummer, som vi ikke dekker." @@ -2816,17 +2832,16 @@ msgstr "Beklager det ser ut til å være et \"Crown dependency\"-postnummer, som msgid "Sorry, there has been an error confirming your problem." msgstr "Beklager, men det oppsto et problem når vi forsøkte å bekrefte problemrapporten din" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:215 -#: perllib/FixMyStreet/Geocode.pm:26 perllib/FixMyStreet/Geocode/Bing.pm:56 -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:73 -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:93 -#: perllib/FixMyStreet/Geocode/Google.pm:72 -#: perllib/FixMyStreet/Geocode/OSM.pm:64 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:214 +#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 +#: perllib/FixMyStreet/Geocode/Google.pm:47 +#: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "Beklager, vi kunne ikke finne det stedet." -#: perllib/FixMyStreet/Geocode/Bing.pm:51 -#: perllib/FixMyStreet/Geocode/Google.pm:67 +#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: perllib/FixMyStreet/Geocode/Google.pm:44 #: perllib/FixMyStreet/Geocode/Zurich.pm:87 msgid "Sorry, we could not parse that location. Please try again." msgstr "Beklager, vi kunne ikke tolke den posisjonen. Vennligst prøv på nytt." @@ -2835,7 +2850,7 @@ msgstr "Beklager, vi kunne ikke tolke den posisjonen. Vennligst prøv på nytt. msgid "Start Date:" msgstr "Start-dato:" -#: templates/web/base/admin/body.html:61 +#: templates/web/base/admin/body.html:69 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 @@ -2843,7 +2858,7 @@ msgstr "Start-dato:" msgid "State" msgstr "Tilstand" -#: templates/web/base/admin/report_edit.html:34 +#: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 #: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:53 @@ -2852,8 +2867,8 @@ msgstr "Tilstand" msgid "State:" msgstr "Tilstand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1200 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:304 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:308 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" @@ -2869,7 +2884,7 @@ msgstr "Status" msgid "Still open, via questionnaire, %s" msgstr "Fortsatt åpen via spørreskjema, %s" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:381 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 msgid "Subcategory: %s" msgstr "Underkategori: %s" @@ -2889,19 +2904,19 @@ msgid "Subject:" msgstr "Emne:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:115 -#: templates/web/base/report/new/fill_in_details_form.html:155 -#: templates/web/base/report/new/fill_in_details_form.html:177 +#: templates/web/base/report/new/fill_in_details_form.html:136 +#: templates/web/base/report/new/fill_in_details_form.html:158 +#: templates/web/base/report/new/fill_in_details_form.html:96 #: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 -#: templates/web/zurich/report/new/fill_in_details_form.html:108 +#: templates/web/zurich/report/new/fill_in_details_form.html:91 msgid "Submit" msgstr "Send inn" -#: templates/web/base/admin/report_edit.html:97 +#: templates/web/base/admin/report_edit.html:113 #: templates/web/base/admin/update_edit.html:65 -#: templates/web/base/admin/user-form.html:55 +#: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:64 #: templates/web/zurich/admin/report_edit.html:221 #: templates/web/zurich/admin/update_edit.html:38 @@ -2913,8 +2928,8 @@ msgstr "Send inn endringer" msgid "Submit questionnaire" msgstr "Send inn spørreskjema" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:133 -#: templates/web/zurich/admin/header.html:2 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:134 +#: 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 @@ -2938,8 +2953,8 @@ msgstr "Abonner" msgid "Subscribe me to an email alert" msgstr "Jeg ønsker å abonnere på e-postvarsel" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1191 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:293 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 #: templates/web/zurich/admin/index-dm.html:1 @@ -2955,7 +2970,7 @@ msgstr "Oppsummering" msgid "Summary reports" msgstr "Oppsummeringsrapporter" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 msgid "Survey" msgstr "Spørreundersøkelse" @@ -2969,7 +2984,7 @@ msgstr "Resultater fra spørreundersøkelsen" msgid "Text" msgstr "Tekst" -#: templates/web/base/admin/body.html:21 +#: templates/web/base/admin/body.html:28 msgid "Text only version" msgstr "Tekst-versjon" @@ -2978,49 +2993,55 @@ msgstr "Tekst-versjon" msgid "Text:" msgstr "Tekst:" -#: templates/web/base/tokens/confirm_update.html:9 -msgid "Thank you — you can <a href=\"%s\">view your updated problem</a> on the site." -msgstr "Tusen takk — du kan <a href=\"%s\">se på ditt oppdaterte problem</a> her hos oss." - -#: templates/web/base/tokens/confirm_problem.html:18 -msgid "Thank you for reporting this issue" -msgstr "Takk for at du rapporterte dette" +#: templates/web/base/tokens/confirm_problem.html:12 +msgid "Thank you for reporting this issue!" +msgstr "Takk for at du rapporterte dette problemet!" #: templates/web/base/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 "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/base/tokens/confirm_update.html:15 +msgid "Thank you for updating this issue!" +msgstr "Takk for at du oppdaterte dette problemet!" + +#: templates/web/base/contact/submit.html:6 +#: templates/web/base/questionnaire/completed.html:5 +msgid "Thank you for your feedback" +msgstr "Takk for din tilbakemelding" + #: templates/web/fixmystreet/around/around_index.html:28 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 :" msgstr "Takk for at du lastet opp ditt bilde. Vi må nå plassere ditt problem, så vær så snill å skriv inn navnet på en vei eller et postnummer i området i boksen ovenfor :" -#: templates/web/base/contact/submit.html:8 -msgid "Thanks for your feedback. We'll get back to you as soon as we can!" -msgstr "Takk for ditt innspill. Vi gir deg en tilbakemelding så raskt vi kan" - #: templates/web/base/questionnaire/creator_fixed.html:9 msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "Takk, glad for å høre at problemet er fikset! Vi vil gjerne spørre deg om du har rapportert et problem til en administrasjon tidligere?" -#: perllib/FixMyStreet/App/Controller/Photo.pm:190 +#: perllib/FixMyStreet/App/Controller/Photo.pm:195 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:100 +#: perllib/FixMyStreet/App/Controller/Council.pm:97 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:124 +#: perllib/FixMyStreet/App/Controller/Location.pm:126 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:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:81 +#: perllib/FixMyStreet/Cobrand/UK.pm:71 msgid "That postcode was not recognised, sorry." msgstr "Det postnummeret ble ikke gjenkjent, beklager." -#: perllib/FixMyStreet/App/Controller/Admin.pm:713 +#: perllib/FixMyStreet/App/Controller/Admin.pm:712 +#, fuzzy +msgid "That problem has been marked as sent." +msgstr "Det problemet vil nå bli sendt på nytt." + +#: perllib/FixMyStreet/App/Controller/Admin.pm:704 msgid "That problem will now be resent." msgstr "Det problemet vil nå bli sendt på nytt." @@ -3032,32 +3053,40 @@ msgstr "Dene rapporten kan ikke vises på %s." msgid "That report has been removed from FixMyStreet." msgstr "Den rapporten har blitt fjernet fra FiksGataMi." -#: templates/web/base/admin/body.html:136 +#: templates/web/base/admin/body.html:144 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 "" +"Meldinger om denne kategorien blir sendt til <strong>E-postadressen</strong>.\n" +"For denne administrasjonen kan også andre kategorier ha samme e-postadresse." -#: templates/web/base/admin/body-form.html:119 -#: templates/web/base/admin/body-form.html:120 +#: templates/web/base/admin/body-form.html:123 +#: templates/web/base/admin/body-form.html:124 msgid "" "The <strong>endpoint</strong> is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." msgstr "" +"<strong>Leveringspunktet</strong> er nettadressen til den tjenesten FiksGataMi vil koble seg til\n" +"for meldinger til denne instansen." -#: templates/web/base/admin/body-form.html:132 -#: templates/web/base/admin/body-form.html:133 +#: templates/web/base/admin/body-form.html:136 +#: templates/web/base/admin/body-form.html:137 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 "" +"<Strong>Jurisdiksjon</strong> er bare nødvendig om leveringspunktet betjener mer \n" +"enn en. Hvis administrasjonen har i gang sitt eget leveringspunkt, kan du vanligvis la dette stå tomt." -#: templates/web/base/admin/body-form.html:90 -#: templates/web/base/admin/body-form.html:91 +#: templates/web/base/admin/body-form.html:94 +#: templates/web/base/admin/body-form.html:95 msgid "" "The <strong>send method</strong> determines how problem reports will be sent to the body.\n" " If you leave this blank, <strong>send method defaults to email</strong>." msgstr "" +"<Strong>Sendemetoden</strong> bestemmer hvordan problemmeldinger blir sendt til administrasjonen.\n" +"Hvis du lar dette stå tomt, <strong>sender metodestandarden til e-post</strong>." #: templates/web/base/open311/index.html:90 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." @@ -3069,12 +3098,14 @@ msgid "" "The body's <strong>name</strong> identifies the body (for example, <em>Borsetshire District Council</em>)\n" " and may be displayed publically." msgstr "" +"Administrasjonens <strong>navn</strong> identifiserer instansen (for eksempel, <em>Borsetshire District Council</em>)\n" +"og kan bli vist utad." #: templates/web/base/auth/token.html:19 templates/web/base/email_sent.html:6 msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." msgstr "Bekreftelsese-posten <strong>kan</strong> bruke noen minutter før den kommer frem — så vær tålmodig." -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:3 msgid "The council won’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 "" @@ -3094,7 +3125,7 @@ msgstr "Detaljene om ditt problem er tilgjengelig på høyre kant av denne siden #: templates/web/base/admin/edit-league.html:3 #: templates/web/base/admin/edit-league.html:4 msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." -msgstr "" +msgstr "The diligency prize league tabellen viser redaktørenes aktivitet, (hvem som har redigert flest)." #: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 #: perllib/FixMyStreet/App/Controller/Reports.pm:78 @@ -3105,8 +3136,8 @@ 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:185 -#: perllib/FixMyStreet/Geocode/OSM.pm:163 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:159 +#: perllib/FixMyStreet/Geocode/OSM.pm:144 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap." msgstr "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." @@ -3164,7 +3195,7 @@ msgstr "Listen over tilgjengelige områder kommer fra MapIt-tjenesten på %s." msgid "The passwords do not match" msgstr "Passordene er ikke like" -#: templates/web/base/errors/page_error_404_not_found.html:11 +#: templates/web/base/errors/page_error_404_not_found.html:10 #: templates/web/base/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" @@ -3181,7 +3212,7 @@ msgstr "Den enkleste meldingen er vår geografiske:" msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "Oppsummeringen og beskrivelsen vil også offentliggjøres (se våre <a href=\"/privacy\">personvernregler</a>)." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:295 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:300 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" @@ -3194,16 +3225,20 @@ msgstr "" "Brukerens <strong>navn</strong> vises offentlig på rapporter som ikke er markert med <em>anonym</em>.\n" "Navn er ikke nødvendigvis unike." +#: templates/web/base/reports/_problem-list.html:15 +msgid "There are no reports to show." +msgstr "Det er ingen rapporter å vise." + #: perllib/FixMyStreet/App/Controller/Reports.pm:75 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:131 +#: perllib/FixMyStreet/App/Controller/Contact.pm:136 #: 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:755 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:762 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 #: templates/web/base/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:25 @@ -3219,7 +3254,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:135 +#: perllib/FixMyStreet/App/Controller/Contact.pm:140 msgid "There were problems with your report. Please see below." msgstr "Det var problemer med din rapport. Vennligst se under." @@ -3227,8 +3262,8 @@ msgstr "Det var problemer med din rapport. Vennligst se under." msgid "There were problems with your update. Please see below." msgstr "Det var problemer med din oppdatering. Vennligst se under." -#: templates/web/base/admin/body-form.html:108 -#: templates/web/base/admin/body-form.html:109 +#: templates/web/base/admin/body-form.html:112 +#: templates/web/base/admin/body-form.html:113 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" @@ -3236,21 +3271,28 @@ msgid "" " <a href='https://www.mysociety.org/2013/01/17/open311-explained/' class='admin-offsite-link'>this article</a>.\n" " " msgstr "" +"Disse innstillingene er for instanser som bruker Open311 (eller annen back-end integrasjon) for å motta problemrapporter. <br>\n" +"<strong>Du trenger ikke å sette dem hvis Send Method er e-post. </strong>\n" +"For mer informasjon om Open311, se\n" +"<a href='https://www.mysociety.org/2013/01/17/open311-explained/' class='admin-offsite-link'>denne artikkelen</a>." #: templates/web/base/open311/index.html:77 msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Denne API-implementasjonen er under arbeid og ennå ikke stabil. Den vil endre seg uten advarsel i fremtiden." -#: templates/web/base/admin/body.html:36 +#: templates/web/base/admin/body.html:44 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 "" +"Denne administrasjonen dekker ikke noe område. Dette betyr at instansen ikke har jurisdiksjon over rapporterte problemer<em> på noe sted </ em> .\n" +"Følgelig vil ingen av kategoriene vises i rullegardinkategori-menyen når brukere rapporterer problemer.\n" +"For tiden <strong>kan ikke brukerne rapportere problemer til denne administrasjonen</strong>." -#: templates/web/base/admin/body.html:46 +#: templates/web/base/admin/body.html:54 msgid "This body has no contacts. This means that currently problems reported to this body <strong>will not be sent</strong>." -msgstr "" +msgstr "Denne instansen har ingen kontakter. Det betyr at i dag vil rapporterte problemer til denne instansen <strong>ikke bli sendt</strong>." #: templates/web/base/admin/body-form.html:52 #: templates/web/base/admin/body-form.html:53 @@ -3258,19 +3300,21 @@ 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 "" +"Denne instansen får bare rapporter for problemer som er lokalisert i <strong>area covered</strong>.\n" +"En instans vil ikke få noen meldinger om det ikke dekker minst ett område." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:388 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:394 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:391 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 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:898 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:136 -#: perllib/FixMyStreet/Cobrand/UK.pm:53 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:902 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:972 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/Cobrand/UK.pm:43 msgid "This information is required" msgstr "Denne informasjonen er påkrevd" @@ -3309,8 +3353,8 @@ 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:130 #: perllib/FixMyStreet/Cobrand/Zurich.pm:131 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:132 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Denne rapporten avventer moderasjon" @@ -3327,15 +3371,15 @@ msgstr "Denne rapporten er for tiden markert som fikset." msgid "This report is currently marked as open." msgstr "Denne rapporten er for tiden markert som åpen." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:319 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:311 msgid "This report was submitted anonymously" msgstr "Denne rapporten ble rapportert anonymt" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:293 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:1196 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" @@ -3353,7 +3397,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:294 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:299 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." @@ -3369,8 +3413,12 @@ msgstr "Totalt" msgid "Try again" msgstr "Prøv igjen" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:46 +#: templates/web/base/contact/submit.html:14 +msgid "Try emailing us directly:" +msgstr "Forsøk å sende epost direkte til oss:" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -3378,8 +3426,8 @@ msgstr "Prøv igjen" msgid "Unable to fix" msgstr "Kan ikke fikses" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/admin/update_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:45 #: templates/web/zurich/admin/report_edit.html:58 @@ -3421,7 +3469,7 @@ msgstr "Oppdateringen under lagt inn anonymt %s" msgid "Update below added by %s at %s" msgstr "Oppdateringen under lagt til av %s %s" -#: templates/web/base/admin/body-form.html:233 +#: templates/web/base/admin/body-form.html:240 #: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "Oppdater administrasjon" @@ -3447,7 +3495,7 @@ msgstr "En oppdatering markerte dette problemet som fikset." msgid "Update reopened problem" msgstr "En oppdatering gjennåpnet problemet" -#: templates/web/base/admin/body.html:93 +#: templates/web/base/admin/body.html:101 msgid "Update statuses" msgstr "Oppdater tilstanden" @@ -3461,12 +3509,12 @@ msgstr "Oppdatering:" msgid "Updated" msgstr "Oppdatert" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1016 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1060 -#: perllib/FixMyStreet/App/Controller/Admin.pm:810 -#: perllib/FixMyStreet/App/Controller/Admin.pm:958 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:549 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:618 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1014 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:808 +#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:556 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:625 msgid "Updated!" msgstr "Oppdatert!" @@ -3478,7 +3526,7 @@ msgstr "Oppdatert!" msgid "Updates" msgstr "Oppdateringer" -#: perllib/FixMyStreet/DB/Result/Comment.pm:139 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "Oppdateringer er begrenset til %s tegn i lengde. Vennligst skriv en kortere tekst." @@ -3493,7 +3541,7 @@ msgstr "Oppdateringer av {{title}}" msgid "Updates to this problem, FixMyStreet" msgstr "Oppdateringer til dette problemet, FiksGataMi" -#: templates/web/base/admin/body.html:174 +#: templates/web/base/admin/body.html:182 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 "Bruk <strong>notatet</strong> for å notere detaljer som skal vises frem i admin-grensesnittet. Notater vises ikke offentlig og blir ikke sendt til myndigheten." @@ -3502,11 +3550,11 @@ msgstr "Bruk <strong>notatet</strong> for å notere detaljer som skal vises frem msgid "User" msgstr "Bruker" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1357 msgid "User flag removed" msgstr "Brukerflagg fjernet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1331 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1329 msgid "User flagged" msgstr "Bruker flagget" @@ -3514,16 +3562,16 @@ msgstr "Bruker flagget" msgid "User search finds matches in users' names and email addresses." msgstr "Brukersøk leter etter treff gjennom brukernavn og epostadresser. " -#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:303 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:307 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Brukere" -#: perllib/FixMyStreet/App/Controller/Admin.pm:380 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:430 +#: perllib/FixMyStreet/App/Controller/Admin.pm:374 +#: perllib/FixMyStreet/App/Controller/Admin.pm:404 +#: perllib/FixMyStreet/App/Controller/Admin.pm:421 msgid "Values updated" msgstr "Verdier oppdatert" @@ -3577,11 +3625,11 @@ msgstr "Vi viser aldri din e-postadresse" 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:397 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:403 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." -#: templates/web/base/index-steps.html:38 +#: templates/web/base/index-steps.html:31 msgid "We send it to the council on your behalf" msgstr "Vi sender til administrasjon på dine vegne" @@ -3590,15 +3638,23 @@ msgstr "Vi sender til administrasjon på dine vegne" 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>" +#: templates/web/base/questionnaire/completed-open.html:2 +msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" +msgstr "Det gjør oss triste å høre at problemet ikke er løst. Hva med å forsøke å skrive til dine lokale representanter?" + #: templates/web/base/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 "Vi ønsker å få din tilbakemelding om hva du mener om denne tjenesten. Bare fyll ut skjemaet, eller send en e-post <a href='mailto:%s'>%s</a>:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:41 +#: templates/web/base/contact/submit.html:7 +msgid "We’ll get back to you as soon as we can." +msgstr "Vi tar kontakt med deg så snart vi kan." + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 msgid "What’s the issue, and where is it?" msgstr "Hva er problemet og hvor skjer det?" -#: templates/web/base/admin/category_edit.html:82 +#: templates/web/base/admin/category_edit.html:87 #: templates/web/zurich/admin/body.html:18 msgid "When edited" msgstr "Når redigert" @@ -3607,15 +3663,18 @@ msgstr "Når redigert" msgid "When sent" msgstr "Når sendt" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Whole block of empty flats" msgstr "Hel blokk med tomme leiligheter" +#: templates/web/base/tokens/confirm_alert.html:7 +msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." +msgstr "Hvorfor stoppe der? <a href=\"/alert\">Sett opp flere varsler</a> gratis." + #: templates/web/base/open311/index.html:92 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/fiksgatami/front/footer-marketing.html:15 #: templates/web/fixmystreet/front/footer-marketing.html:17 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "Kunne du tenke deg å bidra til FiksGataMi? Kildekoden vår er fri programvare og <a href=\"http://fixmystreet.org\">tilgjengelig via fixmystreet.org</a>." @@ -3639,18 +3698,18 @@ msgid "Year" msgstr "År" #: templates/web/base/admin/bodies.html:66 -#: templates/web/base/admin/body.html:72 templates/web/base/admin/body.html:74 -#: templates/web/base/admin/body.html:78 templates/web/base/admin/body.html:80 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:76 +#: templates/web/base/admin/report_edit.html:93 #: templates/web/base/admin/update_edit.html:24 -#: templates/web/base/admin/users.html:29 +#: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:42 #: templates/web/base/questionnaire/index.html:81 @@ -3679,14 +3738,12 @@ msgstr "Du rapporterer at følgende problem er støtende, inneholder personlig i 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/base/tokens/confirm_problem.html:25 -#: templates/web/base/tokens/confirm_problem.html:26 -#: templates/web/zurich/tokens/confirm_problem.html:6 +#: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:8 msgid "You can <a href=\"%s%s\">view the problem on this site</a>." msgstr "Du kan <a href=\"%s%s\">lese om problemet på denne siden</a>." -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:48 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "Du kan legge en misbrukers epostadresse til misbrukslista, hvilket automatisk skjuler (og aldri sender) rapporter vedkommende oppretter." @@ -3700,15 +3757,17 @@ msgid "" " For example, this can useful if you want to keep an eye on a user who has posted inappropriate\n" " reports in the past." msgstr "" +"Du kan flagge alle meldinger eller brukere ved å redigere dem, og de blir ført opp på denne siden.\n" +"For eksempel kan dette være nyttig hvis du ønsker å holde et øye med en bruker som tidligere har lagt ut uegnede meldinger. " -#: templates/web/base/report/new/councils_text_none.html:19 -#: templates/web/base/report/new/councils_text_none.html:20 -#: templates/web/base/report/new/councils_text_some.html:20 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 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>." -#: templates/web/base/admin/body-form.html:81 +#: templates/web/base/admin/body-form.html:85 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "Du kan markere en administrasjon som slettet hvis du ikke vil at den skal være aktiv på dette nettstedet." @@ -3721,10 +3780,10 @@ msgid "You have already answered this questionnaire. If you have a question, ple msgstr "Du har allerede besvart dette spørreskjemaet. Hvis du har spørsmål, vennligst <a href='%s'>ta kontakt</a>, eller <a href='%s'>se på ditt problem</a>.\n" #: templates/web/base/questionnaire/index.html:68 -#: templates/web/base/report/new/fill_in_details_form.html:94 +#: templates/web/base/report/new/fill_in_details_form.html:75 #: templates/web/fixmystreet/questionnaire/index.html:88 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:79 -#: templates/web/zurich/report/new/fill_in_details_form.html:75 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 +#: templates/web/zurich/report/new/fill_in_details_form.html:58 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." @@ -3733,7 +3792,7 @@ msgstr "Du har allerede lagt ved et bilde til dette problemet. Å legge ved et a 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/base/auth/sign_out.html:3 +#: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" msgstr "Du er allerede logget ut" @@ -3742,26 +3801,11 @@ msgstr "Du er allerede logget ut" 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 "Du har plassert problemet ved punktet i kartet som er markert med en grønn nål. Hvis dette ikke er korrekt plassering kan du klikke i kartet på nytt." -#: templates/web/base/tokens/confirm_alert.html:8 -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/base/tokens/confirm_update.html:14 -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>." - -#: templates/web/base/tokens/confirm_alert.html:12 -msgid "You have successfully created your alert." -msgstr "Du har lykkes med å opprette ditt varsel." - -#: templates/web/base/tokens/confirm_alert.html:10 -msgid "You have successfully deleted your alert." -msgstr "Sletting av ditt varsel var vellykket." - #: templates/web/base/report/display.html:20 #: templates/web/base/report/new/fill_in_details.html:37 #: templates/web/fixmystreet/report/display.html:17 @@ -3778,7 +3822,7 @@ msgstr "Du må nå åpne lenken i e-posten vi akkurat sendte deg." #: templates/web/base/admin/index.html:18 msgid "You need to <a href=\"%s\">add some bodies</a> (such as councils or departments) before any reports can be sent." -msgstr "" +msgstr "Du må <a href=\"%s\">add some bodies</a> (som kommuner eller avdelinger) før rapporten kan bli sendt. " #: templates/web/base/admin/bodies.html:7 msgid "" @@ -3786,8 +3830,10 @@ msgid "" " the categories of problems they can handle (such as potholes or streetlights) and the\n" " contacts (such as an email address) to which reports are sent." msgstr "" +"Du må legge til instanser (for eksempel kommuner eller avdelinger), slik at du deretter kan legge til \n" +"grupper av problemer de kan håndtere (som hull i gater og veier, eller gatelys) og kontakter (som en e-postadresse) som meldinger kan sendes til." -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:85 msgid "You really want to resend?" msgstr "Ønsker du virkelig å sende på nytt?" @@ -3807,7 +3853,7 @@ msgstr "Dine rapporter" #: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 #: templates/web/fixmystreet/report/update-form.html:76 -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:71 msgid "Your email" msgstr "Din e-post" @@ -3823,7 +3869,7 @@ msgid "Your email address:" msgstr "Din e-postadresse:" #: templates/web/base/alert/_list.html:92 -#: templates/web/base/report/new/fill_in_details_form.html:125 +#: templates/web/base/report/new/fill_in_details_form.html:106 #: templates/web/base/report/update-form.html:81 msgid "Your email:" msgstr "Din e-post" @@ -3838,13 +3884,13 @@ msgstr "Vi vil kun bruke personlig informasjon om deg i henhold til våre <a hre #: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 #: templates/web/fixmystreet/report/update-form.html:142 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:98 +#: templates/web/zurich/report/new/fill_in_details_form.html:81 msgid "Your name" msgstr "Ditt navn" #: templates/web/base/auth/general.html:59 #: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:204 +#: templates/web/base/report/new/fill_in_details_form.html:185 #: templates/web/base/report/update-form.html:151 msgid "Your name:" msgstr "Ditt navn:" @@ -3862,33 +3908,19 @@ msgstr "Ditt passord har blitt endret" #: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 -#: templates/web/zurich/report/new/fill_in_details_form.html:104 +#: templates/web/zurich/report/new/fill_in_details_form.html:87 msgid "Your phone number" msgstr "Ditt telefonnummer" -#: templates/web/base/tokens/confirm_problem.html:4 -msgid "Your problem has been confirmed!" -msgstr "Ditt problem er bekreftet!" - #: templates/web/fixmystreet/questionnaire/index.html:16 msgid "Your report" msgstr "Dine rapporter" -#: templates/web/base/report_created.html:6 -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/base/footer.html:9 templates/web/fiksgatami/footer.html:21 -#: templates/web/fiksgatami/nn/footer.html:21 -#: templates/web/fixmystreet/footer.html:24 +#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:24 msgid "Your reports" msgstr "Dine oppdateringer" -#: templates/web/base/tokens/confirm_update.html:4 -msgid "Your update has been confirmed!" -msgstr "Din oppdatering er bekreftet!" - -#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:59 +#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:41 msgid "Your updates" msgstr "Dine oppdateringer" @@ -3905,11 +3937,7 @@ msgstr "av %s" msgid "council" msgstr "administrasjon" -#: perllib/FixMyStreet/DB/Result/Problem.pm:665 -msgid "council ref: %s" -msgstr "administrasjonsreferanse: %s" - -#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:32 #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:54 msgid "didn't use map" @@ -3920,6 +3948,7 @@ msgstr "brukte ikke kart" msgid "e.g. ‘%s’ or ‘%s’" msgstr "for eksempel «%s» eller «%s»" +#: templates/web/base/admin/body-form.html:188 #: templates/web/base/admin/flagged.html:51 msgid "edit user" msgstr "rediger bruker" @@ -3934,7 +3963,7 @@ msgstr "fra %d forskjellige brukere" msgid "last updated %s" msgstr "sist oppdatert %s" -#: perllib/Utils.pm:263 +#: perllib/Utils.pm:235 msgid "less than a minute" msgstr "mindre enn et minutt" @@ -3948,7 +3977,7 @@ msgstr "markert som planlagt" #: templates/web/base/report/updates.html:59 msgid "marked as an internal referral" -msgstr "" +msgstr "markert som en intern henvisning" #: templates/web/base/report/updates.html:49 msgid "marked as closed" @@ -3994,22 +4023,22 @@ msgstr "eller" msgid "or locate me automatically" msgstr "eller finn min posisjon automatisk" -#: templates/web/base/admin/report_edit.html:25 -#: templates/web/base/admin/report_edit.html:26 -#: templates/web/zurich/admin/report_edit-sdm.html:28 +#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:30 +#: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit-sdm.html:29 -#: templates/web/zurich/admin/report_edit-sdm.html:37 +#: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:38 -#: templates/web/zurich/admin/report_edit.html:28 +#: templates/web/zurich/admin/report_edit.html:27 #: templates/web/zurich/admin/report_edit.html:29 -#: templates/web/zurich/admin/report_edit.html:39 +#: templates/web/zurich/admin/report_edit.html:38 #: templates/web/zurich/admin/report_edit.html:40 -#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit.html:50 #: templates/web/zurich/admin/report_edit.html:52 msgid "originally entered: “%s”" msgstr "opprinnelig lagt inn: “%s”" -#: templates/web/base/admin/report_edit.html:30 +#: templates/web/base/admin/report_edit.html:43 msgid "other areas:" msgstr "andre områder:" @@ -4018,13 +4047,12 @@ msgstr "andre områder:" msgid "reopened" msgstr "åpnet på nytt" -#: templates/web/fiksgatami/header.html:49 -#: templates/web/fixmystreet/header.html:53 +#: templates/web/fixmystreet/header.html:59 #: templates/web/zurich/footer.html:12 msgid "sign out" msgstr "logg ut" -#: templates/web/base/report/new/fill_in_details_form.html:13 +#: templates/web/base/report/new/fill_in_details_form.html:12 #: templates/web/base/report/new/fill_in_details_form.html:15 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 @@ -4036,15 +4064,15 @@ 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:373 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:379 msgid "this type of local problem" msgstr "denne type lokalt problem" -#: perllib/Utils.pm:235 +#: perllib/Utils.pm:207 msgid "today" msgstr "idag" -#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:32 #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:54 msgid "used map" @@ -4070,7 +4098,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:254 #, perl-format msgid "%d hour" msgid_plural "%d hours" @@ -4084,7 +4112,7 @@ msgid_plural "%d supporters" msgstr[0] "%d støttespiller" msgstr[1] "%d støttespillere" -#: perllib/Utils.pm:284 +#: perllib/Utils.pm:256 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -4105,7 +4133,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:250 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -4126,7 +4154,7 @@ 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:280 +#: perllib/Utils.pm:252 #, perl-format msgid "%d day" msgid_plural "%d days" @@ -4140,10 +4168,5 @@ 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." -#~ msgid "Configuration updated - contacts will be generated automatically later" -#~ msgstr "Oppsett oppdatert - kontakter vil bli generert automatisk senere" - -#~ msgid "The subject and details of the problem will be public, plus your name if you give us permission." -#~ msgstr "" -#~ "Tittelen og detaljene for problemet vil bli offentlig, pluss navnet ditt\n" -#~ "hvis du gir oss tillatelse til det." +#~ msgid "For council(s):" +#~ msgstr "For administrasjon(ene):" diff --git a/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nl_NL.UTF-8/LC_MESSAGES/FixMyStreet.po index e04b797d3..50ba74fd9 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: 2015-01-20 16:59+0000\n" -"PO-Revision-Date: 2014-11-19 18:30+0000\n" +"POT-Creation-Date: 2015-07-31 14:28+0100\n" +"PO-Revision-Date: 2015-07-10 13:31+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,17 +19,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:618 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:386 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:392 msgid " and " msgstr "en" -#: templates/web/base/report/new/councils_text_all.html:12 -#: templates/web/base/report/new/councils_text_all.html:19 -#: templates/web/base/report/new/councils_text_all.html:5 -#: templates/web/base/report/new/councils_text_none.html:19 -#: templates/web/base/report/new/councils_text_none.html:21 -#: templates/web/base/report/new/councils_text_some.html:20 +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_none.html:11 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " @@ -65,22 +63,26 @@ msgstr "" msgid "%s - Summary reports" msgstr "%s - Overzichtsverslagen" -#: perllib/FixMyStreet/DB/Result/Problem.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:672 msgid "%s ref: %s" msgstr "%s ref: %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:265 perllib/FixMyStreet/Cobrand/UK.pm:277 +#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 msgid "%s ward, %s" msgstr "%s district, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:554 +#: perllib/FixMyStreet/DB/Result/Problem.pm:559 msgid "%s, reported at %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:304 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "%s, within %s ward" msgstr "%s, in %s district" +#: perllib/FixMyStreet/Map/OSM.pm:42 +msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" +msgstr "" + #: templates/web/base/email_sent.html:29 msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" msgstr "" @@ -94,7 +96,7 @@ msgid "(Don't worry — we'll hang on to your update while you're checking y msgstr "" #: templates/web/base/admin/report_blocks.html:11 -#: templates/web/base/admin/users.html:29 +#: templates/web/base/admin/users.html:31 msgid "(Email in abuse table)" msgstr "(Email in misbruiktabel)" @@ -122,7 +124,7 @@ msgstr "(gesloten)" msgid "(fixed)" msgstr "(opgelost)" -#: templates/web/base/index.html:9 +#: templates/web/base/index.html:8 templates/web/base/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) " @@ -132,8 +134,8 @@ msgstr "(zoals graffiti, zwerfafval, losliggende tegels of straatverlichting) " msgid "(not sent to council)" msgstr "(niet verstuurd naar de gemeente)" -#: templates/web/base/report/new/fill_in_details_form.html:218 -#: templates/web/zurich/report/new/fill_in_details_form.html:94 +#: templates/web/base/report/new/fill_in_details_form.html:199 +#: templates/web/zurich/report/new/fill_in_details_form.html:77 msgid "(optional)" msgstr "(optioneel)" @@ -146,7 +148,7 @@ msgstr "" msgid "(sent to both)" msgstr "(verstuurd naar beide)" -#: templates/web/base/report/new/fill_in_details_form.html:212 +#: templates/web/base/report/new/fill_in_details_form.html:193 msgid "(we never show your email address or phone number)" msgstr "(we zullen je telefoonnummer of e-mailadres niet tonen)" @@ -154,14 +156,13 @@ 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:635 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:662 -#: perllib/FixMyStreet/DB/Result/Problem.pm:393 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Kies een categorie --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 -#: perllib/FixMyStreet/DB/Result/Problem.pm:399 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:630 +#: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Kies een woning type --" @@ -173,37 +174,7 @@ msgid "" " Maybe add some <code>MAPIT_TYPES</code> to your config file?" msgstr "" -#: templates/web/base/questionnaire/completed.html:20 -msgid "<p style=\"font-size:150%\">Thank you very much for filling in our questionnaire; glad to hear it’s been fixed.</p>" -msgstr "<p style=\"font-size:150%\">Bedankt voor het invullen van de vragenlijst. Het is goed om te horen dat het is opgelost.</p>" - -#: templates/web/fiksgatami/questionnaire/completed-open.html:1 -msgid "" -"<p style=\"font-size:150%\">We’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’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%\">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/base/questionnaire/completed-open.html:6 -msgid "" -"<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" -"suggestions: why not try writing to your local representatives or, if\n" -"it’s a problem that could be fixed by local people working together, why\n" -"not <a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n" -"</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/base/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>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/base/around/_report_banner.html:4 +#: templates/web/base/around/_report_banner.html:3 #: templates/web/base/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>" @@ -230,7 +201,7 @@ msgstr "<strong>Nee</strong> Laat me inloggen per e-mail" msgid "<strong>No</strong>, I do not, let me sign in by email:" msgstr "<strong>Nee</strong>, die heb ik niet, laat me inloggen per e-mail:" -#: templates/web/base/report/new/fill_in_details_form.html:163 +#: templates/web/base/report/new/fill_in_details_form.html:144 msgid "<strong>No</strong>, let me confirm my report by email:" msgstr "<strong>Nee</strong> Laat me mijn melding per e-mail bevestigen" @@ -238,13 +209,8 @@ msgstr "<strong>Nee</strong> Laat me mijn melding per e-mail bevestigen" msgid "<strong>No</strong>, let me confirm my update by email:" msgstr "<strong>Nee</strong> Laat me mijn update per e-mail bevestigen" -#: templates/web/base/tokens/confirm_problem.html:19 -#: templates/web/base/tokens/confirm_problem.html:20 -msgid "<strong>We will now send it to the council</strong>." -msgstr "" - #: templates/web/base/auth/general.html:37 -#: templates/web/base/report/new/fill_in_details_form.html:141 +#: templates/web/base/report/new/fill_in_details_form.html:122 #: templates/web/base/report/update-form.html:95 #: templates/web/fixmystreet/auth/general.html:37 #: templates/web/fixmystreet/auth/general.html:39 @@ -258,8 +224,8 @@ msgstr "<strong>Ja</strong, ik heb een wachtwoord" msgid "About us" msgstr "Over ons" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:39 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:52 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:31 #: templates/web/fixmystreet/report/update-form.html:28 @@ -275,26 +241,26 @@ msgid "" " categories of problem) to each body." msgstr "" -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/body.html:56 msgid "Add a contact using the form below." msgstr "" #: templates/web/base/admin/bodies.html:74 -#: templates/web/base/admin/body-form.html:233 +#: templates/web/base/admin/body-form.html:240 #: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "" -#: templates/web/base/admin/body.html:108 +#: templates/web/base/admin/body.html:116 #: templates/web/zurich/admin/body.html:31 msgid "Add new category" msgstr "Voeg een nieuwe categorie toe" -#: templates/web/base/admin/users.html:45 +#: templates/web/base/admin/users.html:47 msgid "Add user" msgstr "" -#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:70 +#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:52 msgid "Added %s" msgstr "%s toegevoegd" @@ -321,9 +287,7 @@ msgstr "Meld het me als er updates zijn" msgid "All Reports" msgstr "Alle meldingen" -#: templates/web/base/footer.html:11 templates/web/fiksgatami/footer.html:23 -#: templates/web/fiksgatami/nn/footer.html:23 -#: templates/web/fixmystreet/footer.html:26 +#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:26 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:19 @@ -340,19 +304,9 @@ 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/base/report/new/councils_text_all.html:12 -#: templates/web/base/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/base/report/new/councils_text_all.html:5 -#: templates/web/base/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/base/report/new/councils_text_all.html:19 -#: templates/web/base/report/new/councils_text_all.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:13 +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_all.html:4 +#: templates/web/base/report/new/fill_in_details_form.html:12 #: templates/web/base/report/new/fill_in_details_form.html:14 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 @@ -369,7 +323,7 @@ msgstr "Een update heeft dit probleem als opgelost gemarkeerd." msgid "Anonymous" msgstr "Anoniem" -#: templates/web/base/admin/report_edit.html:62 +#: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:23 msgid "Anonymous:" msgstr "Anoniem:" @@ -378,18 +332,18 @@ 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/fiksgatami/front/footer-marketing.html:14 #: templates/web/fixmystreet/front/footer-marketing.html:16 msgid "Are you a developer?" msgstr "Ben je een ontwikkelaar?" #: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 msgid "Area covered" msgstr "" #: templates/web/base/admin/bodies.html:15 -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/body.html:60 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "" @@ -407,7 +361,7 @@ msgstr "" msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:163 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:165 #: templates/web/zurich/report/updates.html:11 msgid "Assigned to %s" msgstr "" @@ -420,7 +374,7 @@ msgstr "Ten hoogste %d aanvragen worden per query teruggegeven. The teruggegeven msgid "At the moment only searching for and looking at reports work." msgstr "Op dit moment kan je alleen zoeken naar meldingen en deze bekijken." -#: perllib/FixMyStreet/DB/Result/Problem.pm:348 +#: perllib/FixMyStreet/DB/Result/Problem.pm:373 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "" @@ -433,8 +387,8 @@ msgstr "" msgid "Ban email address" msgstr "Verban e-mailadres" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:297 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:301 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" msgstr "" @@ -445,6 +399,7 @@ msgstr "" msgid "Body" msgstr "" +#: templates/web/base/admin/report_edit.html:34 #: templates/web/base/admin/user-form.html:32 msgid "Body:" msgstr "" @@ -457,16 +412,15 @@ msgstr "Op datum" msgid "Can't see the map? <em>Skip this step</em>" msgstr "Kan je de kaart niet zien? <em>Sla deze stap over</em>" -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:55 #: templates/web/base/report/new/category.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:53 +#: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 #: templates/web/zurich/admin/stats.html:50 -#: templates/web/zurich/report/new/fill_in_details_form.html:50 msgid "Category" msgstr "Categorie" @@ -474,17 +428,16 @@ msgstr "Categorie" msgid "Category fix rate for problems > 4 weeks old" msgstr "Doorloopsnelheid voor problemen in categorie >4 weken oud" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:138 #: templates/web/base/admin/category_edit.html:23 -#: templates/web/base/admin/report_edit.html:61 -#: templates/web/base/report/new/fill_in_details_form.html:68 +#: templates/web/base/admin/report_edit.html:74 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/report_edit-sdm.html:42 #: templates/web/zurich/admin/report_edit.html:140 msgid "Category:" msgstr "Categorie:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:377 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383 msgid "Category: %s" msgstr "Categorie: %s" @@ -495,19 +448,19 @@ msgstr "Categorie: %s" msgid "Change password" msgstr "Verander Wachtwoord" -#: templates/web/base/admin/body.html:152 +#: templates/web/base/admin/body.html:160 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/base/admin/body.html:163 +#: templates/web/base/admin/body.html:171 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/base/admin/body.html:183 +#: templates/web/base/admin/body.html:191 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -518,7 +471,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:122 +#: templates/web/base/admin/body.html:130 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." @@ -534,16 +487,16 @@ msgstr "" msgid "Click map to report a problem" msgstr "Klik op de kaart om een probleem te melden" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:45 -#: templates/web/base/admin/report_edit.html:47 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:58 +#: templates/web/base/admin/report_edit.html:60 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/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:95 #: templates/web/zurich/admin/report_edit.html:97 #: templates/web/zurich/admin/stats.html:31 @@ -551,11 +504,12 @@ msgstr "Klik op de kaart om een probleem te melden" msgid "Closed" msgstr "Gesloten" -#: perllib/FixMyStreet/DB/Result/Problem.pm:762 +#: perllib/FixMyStreet/DB/Result/Problem.pm:771 msgid "Closed by council" msgstr "Gesloten door gemeente" -#: templates/web/base/my/my.html:40 templates/web/fixmystreet/my/my.html:46 +#: templates/web/base/my/my.html:40 +#: templates/web/fixmystreet/my/_problem-list.html:12 msgid "Closed reports" msgstr "Gesloten meldingen" @@ -563,7 +517,7 @@ msgstr "Gesloten meldingen" msgid "Closed:" msgstr "Gesloten:" -#: templates/web/base/around/tabbed_lists.html:11 +#: templates/web/base/around/tabbed_lists.html:10 #: templates/web/base/around/tabbed_lists.html:12 msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "Dichtstbijzijnde problemen <small>(binnen %skm)</small>" @@ -578,26 +532,26 @@ msgstr "Coördinaten:" msgid "Cobrand" msgstr "Cobrand" -#: templates/web/base/admin/report_edit.html:75 +#: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:50 msgid "Cobrand data:" msgstr "Cobrand data:" -#: templates/web/base/admin/report_edit.html:74 +#: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:49 msgid "Cobrand:" msgstr "Cobrand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" -#: templates/web/base/admin/category_edit.html:47 +#: templates/web/base/admin/category_edit.html:52 msgid "Configure Endpoint" msgstr "Configureer eindpunt" -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/body.html:72 msgid "Confirm" msgstr "Bevestig" @@ -618,10 +572,10 @@ msgstr "Bevestig door e-mail beneden en kies een wachtwoord. Als je bevestigd wo msgid "Confirmation" msgstr "Bevestiging" -#: templates/web/base/admin/body.html:158 -#: templates/web/base/admin/body.html:71 -#: templates/web/base/admin/category_edit.html:32 -#: templates/web/base/admin/category_edit.html:84 +#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/category_edit.html:37 +#: templates/web/base/admin/category_edit.html:89 #: templates/web/zurich/admin/stats.html:40 msgid "Confirmed" msgstr "Bevestigd" @@ -632,7 +586,7 @@ msgstr "" #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 -#: templates/web/base/admin/report_edit.html:70 +#: templates/web/base/admin/report_edit.html:83 msgid "Confirmed:" msgstr "Bevestigd:" @@ -649,13 +603,12 @@ msgid "Contact Us" msgstr "Contacteer ons" #: templates/web/base/contact/index.html:6 -#: templates/web/base/contact/submit.html:3 #: templates/web/fixmystreet/contact/index.html:20 msgid "Contact the team" msgstr "Neem contact op met het team" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1327 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1355 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1325 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1353 msgid "Could not find user" msgstr "Kan de gebruiker niet vinden" @@ -673,6 +626,10 @@ msgstr "Gemeente" msgid "Council contacts for %s" msgstr "Gemeente contactpersongen voor %s" +#: perllib/FixMyStreet/DB/Result/Problem.pm:670 +msgid "Council ref: %s" +msgstr "gemeente ref.: %s" + #: templates/web/base/admin/stats.html:84 msgid "Council:" msgstr "Gemeente:" @@ -688,7 +645,7 @@ msgstr "Aantal" msgid "Create a report" msgstr "Maak een melding" -#: templates/web/base/admin/body.html:200 +#: templates/web/base/admin/body.html:208 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Maak een categorie" @@ -700,7 +657,7 @@ msgid "Created" msgstr "Aangemaakt" #: templates/web/base/admin/list_updates.html:38 -#: templates/web/base/admin/report_edit.html:69 +#: templates/web/base/admin/report_edit.html:82 #: templates/web/base/admin/update_edit.html:51 #: templates/web/zurich/admin/report_edit-sdm.html:47 #: templates/web/zurich/admin/report_edit.html:61 @@ -717,7 +674,7 @@ msgstr "Huidige status" msgid "Currently no bodies have been created." msgstr "" -#: templates/web/base/dashboard/index.html:6 +#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 msgid "Dashboard" msgstr "Dashboard" @@ -727,14 +684,14 @@ msgid "Dealt with by subdivision within 5 working days" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:169 -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:37 -#: templates/web/base/admin/category_edit.html:85 +#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:81 +#: templates/web/base/admin/category_edit.html:42 +#: templates/web/base/admin/category_edit.html:90 msgid "Deleted" msgstr "Verwijderd" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:43 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -754,7 +711,7 @@ msgstr "Details" msgid "Details:" msgstr "Details:" -#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/body.html:87 msgid "Devolved" msgstr "Overgedragen" @@ -782,8 +739,8 @@ msgstr "Geen idee" msgid "Don't like forms?" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:47 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:60 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:32 #: templates/web/fixmystreet/report/update-form.html:28 @@ -791,7 +748,7 @@ msgstr "" msgid "Duplicate" msgstr "" -#: templates/web/base/admin/body.html:98 +#: templates/web/base/admin/body.html:106 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" @@ -801,20 +758,20 @@ msgstr "" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 -#: templates/web/base/admin/users.html:31 +#: templates/web/base/admin/users.html:33 #: templates/web/zurich/admin/problem_row.html:42 msgid "Edit" msgstr "Bewerk" -#: templates/web/base/admin/body.html:212 +#: templates/web/base/admin/body.html:220 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "" #: templates/web/base/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:2 +#: 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:2 +#: templates/web/zurich/admin/report_edit.html:1 #: templates/web/zurich/admin/report_edit.html:5 msgid "Editing problem %d" msgstr "Bewerk melding %d" @@ -828,12 +785,12 @@ msgstr "Bewerk update %d" msgid "Editing user %d" msgstr "Bewerk gebruiker %d" -#: templates/web/base/admin/category_edit.html:86 +#: templates/web/base/admin/category_edit.html:91 msgid "Editor" msgstr "Redacteur" #: templates/web/base/admin/bodies.html:23 -#: templates/web/base/admin/category_edit.html:83 +#: templates/web/base/admin/category_edit.html:88 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 #: templates/web/fixmystreet/auth/general.html:21 @@ -844,15 +801,23 @@ msgstr "Redacteur" msgid "Email" msgstr "Email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1303 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1301 msgid "Email added to abuse list" msgstr "Email toegevoegd aan zwarte lijst" -#: templates/web/base/admin/body.html:147 +#: templates/web/base/admin/body.html:155 msgid "Email address:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1300 +#: templates/web/base/tokens/confirm_alert.html:6 +msgid "Email alert created" +msgstr "" + +#: templates/web/base/tokens/confirm_alert.html:10 +msgid "Email alert deleted" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1298 msgid "Email already in abuse list" msgstr "Email staat al op zwarte lijst" @@ -864,8 +829,8 @@ msgstr "Email me nieuwe lokale meldingen" msgid "Email me updates" msgstr "Email me updates" -#: templates/web/base/admin/category_edit.html:26 -#: templates/web/base/admin/report_edit.html:67 +#: templates/web/base/admin/category_edit.html:31 +#: templates/web/base/admin/report_edit.html:80 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 @@ -876,32 +841,32 @@ msgstr "Email me updates" msgid "Email:" msgstr "Email:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:322 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 msgid "Email: %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 msgid "Empty flat or maisonette" msgstr "Lege flat of maisonette" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:631 msgid "Empty house or bungalow" msgstr "Leeg huis of bungalow" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:622 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty office or other commercial" msgstr "Leeg kantoor of ander commercieel" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:623 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Empty pub or bar" msgstr "Lege kroeg of bar" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:624 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty public building - school, hospital, etc." msgstr "Leeg publiek gebouw - school, ziekenhuis etc." -#: templates/web/base/admin/body-form.html:158 -#: templates/web/base/admin/body-form.html:159 +#: templates/web/base/admin/body-form.html:162 +#: templates/web/base/admin/body-form.html:163 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" @@ -909,8 +874,8 @@ msgid "" " <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>." msgstr "" -#: templates/web/base/admin/body-form.html:215 -#: templates/web/base/admin/body-form.html:216 +#: templates/web/base/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:223 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" @@ -921,11 +886,11 @@ msgstr "" msgid "End Date:" msgstr "" -#: templates/web/base/admin/body-form.html:126 +#: templates/web/base/admin/body-form.html:130 msgid "Endpoint" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:72 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:73 msgid "Enter a Zürich street name" msgstr "" @@ -938,7 +903,9 @@ msgstr "Vul een dichtstbijzijnde UK postcode, of straatnaam en plaats in" msgid "Enter a nearby postcode, or street name and area" msgstr "Geef dichtstbijzijnde postcode, of straatnaam en plaats" +#: templates/web/base/around/postcode_form.html:1 #: templates/web/base/around/postcode_form.html:2 +#: templates/web/fixmystreet/around/postcode_form.html:10 #: templates/web/fixmystreet/around/postcode_form.html:11 msgid "Enter a nearby street name and area" msgstr "Geef dichtstbijzijnde straatnaam en plaats" @@ -948,7 +915,7 @@ msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "" #: templates/web/base/auth/general.html:64 -#: templates/web/base/report/new/fill_in_details_form.html:170 +#: templates/web/base/report/new/fill_in_details_form.html:151 #: templates/web/base/report/update-form.html:124 msgid "Enter a new password:" msgstr "Geef nieuw wachtwoord:" @@ -960,7 +927,7 @@ msgstr "Geef nieuw wachtwoord:" msgid "Enter a password" msgstr "Geef wachtwoord " -#: templates/web/base/index-steps.html:33 +#: templates/web/base/index-steps.html:26 msgid "Enter details of the problem" msgstr "Geef details van het probleem" @@ -983,17 +950,22 @@ msgstr "Voorbeeld van postcode %s" msgid "Examples:" msgstr "Voorbeelden:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:47 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" -#: templates/web/base/admin/report_edit.html:76 +#: templates/web/base/admin/body-form.html:81 +msgid "External URL" +msgstr "" + +#: templates/web/base/admin/category_edit.html:27 +#: templates/web/base/admin/report_edit.html:92 msgid "Extra data:" msgstr "Extra info:" -#: templates/web/base/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>." +#: templates/web/base/contact/submit.html:13 +msgid "Failed to send message" +msgstr "" #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 @@ -1005,7 +977,7 @@ msgstr "" msgid "First time" msgstr "Eerste keer" -#: templates/web/base/admin/body.html:40 +#: templates/web/base/admin/body.html:48 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" @@ -1036,9 +1008,9 @@ msgid "" 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/base/admin/index.html:55 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:41 -#: templates/web/base/admin/report_edit.html:42 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:54 +#: templates/web/base/admin/report_edit.html:55 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/update-form.html:30 @@ -1049,17 +1021,18 @@ msgstr "FixMyStreet heeft diverse categorieën per gemeente voor problemen daaro msgid "Fixed" msgstr "Opgelost" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:43 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:56 msgid "Fixed - Council" msgstr "Opgelost - Gemeente" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:42 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:55 msgid "Fixed - User" msgstr "Opgelost - Gebruiker" -#: templates/web/base/my/my.html:35 templates/web/fixmystreet/my/my.html:41 +#: templates/web/base/my/my.html:35 +#: templates/web/fixmystreet/my/_problem-list.html:7 msgid "Fixed reports" msgstr "Opgeloste meldingen" @@ -1067,7 +1040,7 @@ msgstr "Opgeloste meldingen" msgid "Fixed:" msgstr "Opgelost:" -#: templates/web/base/admin/body-form.html:84 +#: templates/web/base/admin/body-form.html:89 #: templates/web/zurich/admin/body-form.html:36 msgid "Flag as deleted" msgstr "" @@ -1076,7 +1049,7 @@ msgstr "" msgid "Flag user" msgstr "Gemarkeerde gebruikr" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Gemarkeerd" @@ -1085,7 +1058,7 @@ msgstr "Gemarkeerd" msgid "Flagged reports and users" msgstr "" -#: templates/web/base/admin/user-form.html:45 +#: templates/web/base/admin/user-form.html:46 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page." msgstr "" @@ -1093,8 +1066,8 @@ msgstr "" msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." msgstr "" -#: templates/web/base/admin/report_edit.html:78 -#: templates/web/base/admin/user-form.html:51 +#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/user-form.html:52 msgid "Flagged:" msgstr "Gemarkeerd:" @@ -1103,10 +1076,6 @@ msgstr "Gemarkeerd:" msgid "Follow a ward link to view only reports within that ward." msgstr "Klik op de link voor een wijk om alleen problemen in die wijk te bekijken." -#: templates/web/base/admin/report_edit.html:30 -msgid "For council(s):" -msgstr "For gemeente(s):" - #: templates/web/base/admin/body-form.html:65 msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "" @@ -1119,8 +1088,6 @@ msgstr "Wachtwoord vergeten?" #: templates/web/base/faq/faq-en-gb.html:1 #: templates/web/base/static/privacy.html:1 #: templates/web/base/static/privacy.html:2 -#: templates/web/fiksgatami/faq/faq-nb.html:1 -#: templates/web/fiksgatami/nn/faq/faq-nn.html:1 msgid "Frequently Asked Questions" msgstr "Veelgestelde Vragen" @@ -1133,13 +1100,13 @@ msgstr "GeoRSS op Google Maps" msgid "Get updates" msgstr "Updates ontvangen" -#: templates/web/fixmystreet/reports/_rss.html:4 +#: templates/web/fixmystreet/reports/_rss.html:3 #: 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:4 +#: templates/web/fixmystreet/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "Updates in deze %s ontvangen" @@ -1148,6 +1115,10 @@ msgstr "Updates in deze %s ontvangen" msgid "Give me an RSS feed" msgstr "Geef me een RSS feed" +#: templates/web/base/questionnaire/completed.html:14 +msgid "Glad to hear it’s been fixed!" +msgstr "" + #: templates/web/base/alert/index.html:34 #: templates/web/base/around/postcode_form.html:8 #: templates/web/fixmystreet/around/postcode_form.html:21 @@ -1155,7 +1126,7 @@ msgstr "Geef me een RSS feed" msgid "Go" msgstr "Gaan" -#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:93 msgid "Going to send questionnaire?" msgstr "Vragenlijst versturen?" @@ -1177,9 +1148,7 @@ msgstr "Is dit probleem opgelost?" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "Heb je al eens eerder een probleem aan de gemeente gemeld, of is dit jouw eerste keer?" -#: templates/web/base/footer.html:15 templates/web/fiksgatami/footer.html:27 -#: templates/web/fiksgatami/nn/footer.html:27 -#: templates/web/fixmystreet/footer.html:30 +#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:30 #: templates/web/zurich/faq/faq-de-ch.html:1 #: templates/web/zurich/footer.html:21 #: templates/web/zurich/nav_over_content.html:8 @@ -1191,18 +1160,17 @@ msgstr "Help" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "Hier zijn de soorten meldingen van lokale problemen voor '%s'." -#: templates/web/fiksgatami/header.html:48 -#: templates/web/fixmystreet/header.html:52 +#: templates/web/fixmystreet/header.html:58 #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "Hoi %s" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:50 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:63 +#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/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:86 #: templates/web/zurich/admin/report_edit.html:90 #: templates/web/zurich/admin/stats.html:32 @@ -1218,7 +1186,7 @@ msgstr "Verberg oud" msgid "Hide pins" msgstr "Verberg spelden" -#: templates/web/base/admin/category_edit.html:79 +#: templates/web/base/admin/category_edit.html:84 msgid "History" msgstr "Geschiedenis" @@ -1234,19 +1202,25 @@ msgstr "Hoe een melding maken" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:740 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Ik ben bang dat je geen ongeverifieerde meldingen kunt bevestigen." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:89 +#: templates/web/base/tokens/confirm_problem.html:23 +#: templates/web/base/tokens/confirm_problem.html:27 +msgid "I just reported a problem on @fixmystreet" +msgstr "" + +#: templates/web/base/tokens/confirm_update.html:19 +#: templates/web/base/tokens/confirm_update.html:23 +msgid "I just updated a problem on @fixmystreet" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Ik ben bang dat we je melding niet kunnen vinden in onze database.\n" -#: 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 "Ik ben bang dat we je token niet kunnen valideren omdat de melding te oud is." - -#: perllib/FixMyStreet/App/Controller/Tokens.pm:260 +#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 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" @@ -1268,7 +1242,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:125 +#: templates/web/base/admin/body.html:133 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." @@ -1286,7 +1260,12 @@ msgstr "" msgid "If you do not, your update will not be posted." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:9 +#: templates/web/base/questionnaire/completed.html:8 +msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." +msgstr "" + +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:8 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." @@ -1302,34 +1281,34 @@ msgid "" "your experience of getting the problem fixed?" msgstr "Als je een publieke update over dit probleem wil maken vul ht dan hier in. Deze wordt niet neer de gemeente gestuurd. Bijvoorbeeld hoe was jouw ervaring met het oplossen van dit probleem?" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/body.html:149 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/base/admin/body-form.html:200 -#: templates/web/base/admin/body-form.html:201 +#: templates/web/base/admin/body-form.html:207 +#: templates/web/base/admin/body-form.html:208 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable <strong>extended Open311 stauses</strong> if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/body-form.html:187 -#: templates/web/base/admin/body-form.html:188 +#: templates/web/base/admin/body-form.html:194 +#: templates/web/base/admin/body-form.html:195 msgid "" "If you've enabled Open311 update-sending above, enable <strong>suppression of alerts</strong> \n" " if you do <strong>not</strong> want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/body-form.html:173 -#: templates/web/base/admin/body-form.html:174 +#: templates/web/base/admin/body-form.html:177 +#: templates/web/base/admin/body-form.html:178 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:127 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 msgid "Illegal ID" msgstr "Illegaal ID" @@ -1354,17 +1333,21 @@ msgstr "" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "Daarnaast worden de volgende attributen, die niet onderdeel zijn van de Open311 v2 specificatie meegestuurd: agency_sent_datetime, title (ook meegestuurd als onderdeel van de description), interface_used, comment_count, requestor_name (alleen aanwezig als deze getoond mag worden op de site)." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:38 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:144 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 #: templates/web/fixmystreet/report/banner.html:19 -#: templates/web/zurich/admin/header.html:2 +#: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 #: templates/web/zurich/admin/report_edit.html:99 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "In Behandeling" +#: templates/web/base/tokens/confirm_alert.html:11 +msgid "Inbox zero, here we come!" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:160 msgid "Include reporter personal details" msgstr "" @@ -1373,7 +1356,7 @@ msgstr "" msgid "Include unconfirmed reports" msgstr "Ongeverifiëerde meldingen meesturen" -#: perllib/FixMyStreet/App/Controller/Open311.pm:354 +#: perllib/FixMyStreet/App/Controller/Open311.pm:359 msgid "Incorrect has_photo value \"%s\"" msgstr "Ongeldige has_photo waarde \"%s\"" @@ -1381,29 +1364,29 @@ msgstr "Ongeldige has_photo waarde \"%s\"" msgid "Internal notes" msgstr "" -#: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:61 msgid "Internal referral" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:339 +#: perllib/FixMyStreet/App/Controller/Open311.pm:344 msgid "Invalid agency_responsible value %s" msgstr "Ongeldige agency_responsible waarde %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1114 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1112 msgid "Invalid end date" msgstr "Ongeldige einddatum" -#: perllib/FixMyStreet/App/Controller/Open311.pm:432 +#: perllib/FixMyStreet/App/Controller/Open311.pm:437 msgid "Invalid format %s specified." msgstr "Ongeldig formaat %s gespecifieerd" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1110 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 msgid "Invalid start date" msgstr "Ongeldige startdatum" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:37 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:50 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 #: templates/web/base/report/update-form.html:30 @@ -1417,8 +1400,12 @@ msgstr "Onderzoeken" msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "" +#: templates/web/base/tokens/confirm_problem.html:14 +msgid "It’s on its way to the council right now." +msgstr "" + #: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:150 +#: templates/web/base/report/new/fill_in_details_form.html:131 #: templates/web/base/report/update-form.html:104 #: templates/web/fixmystreet/auth/general.html:47 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 @@ -1427,12 +1414,12 @@ msgstr "" msgid "Keep me signed in on this computer" msgstr "Hou me ingelogd op deze computer" -#: templates/web/base/admin/body.html:62 +#: templates/web/base/admin/body.html:70 #: templates/web/zurich/admin/body.html:16 msgid "Last editor" msgstr "Laatste bewerker" -#: templates/web/base/admin/report_edit.html:72 +#: templates/web/base/admin/report_edit.html:88 msgid "Last update:" msgstr "Laatste update:" @@ -1440,43 +1427,38 @@ msgstr "Laatste update:" msgid "Last update:" msgstr "Laatste update:" -#: templates/web/base/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:229 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "" -#: templates/web/base/admin/body.html:17 templates/web/base/admin/body.html:19 +#: templates/web/base/admin/body.html:27 msgid "List all reported problems" msgstr "Toon alle meldingen" -#: templates/web/base/report/new/fill_in_details_form.html:69 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:54 -#: templates/web/zurich/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/category_wrapper.html:4 msgid "Loading..." msgstr "Laden..." #: templates/web/base/alert/choose.html:1 #: templates/web/base/alert/choose.html:3 #: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3 -#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:5 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5 #: templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 -#: templates/web/base/tokens/confirm_alert.html:4 #: templates/web/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "Lokale RSS feeds en e-mail meldingen" -#: templates/web/base/alert/list.html:13 templates/web/base/alert/list.html:14 -#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:3 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:12 +#: templates/web/base/alert/list.html:14 templates/web/base/alert/list.html:3 msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Lokale RSS feeds en e-mail meldingen voor '%s'" -#: templates/web/base/footer.html:13 templates/web/fiksgatami/footer.html:25 -#: templates/web/fiksgatami/nn/footer.html:25 -#: templates/web/fixmystreet/footer.html:28 +#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:28 msgid "Local alerts" msgstr "Lokale melding" -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:25 msgid "Locate the problem on a map of the area" msgstr "Vind het probleem op de kaart van de omgeving" @@ -1485,17 +1467,26 @@ msgid "MAP" msgstr "" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" msgstr "" -#: perllib/FixMyStreet/Map/OSM.pm:42 -msgid "Map © <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 "Kaart © <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> en bijdragers, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA</a>" +#: templates/web/base/admin/report_edit.html:86 +msgid "Mark as sent" +msgstr "" -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/user-form.html:44 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." msgstr "" +#: templates/web/base/reports/index.html:24 +msgid "Marked fixed/closed in the past eight weeks" +msgstr "" + +#: templates/web/base/reports/index.html:25 +msgid "Marked fixed/closed more than eight weeks ago" +msgstr "" + #: templates/web/fixmystreet/contact/index.html:106 msgid "Message" msgstr "Bericht" @@ -1504,7 +1495,7 @@ msgstr "Bericht" msgid "Message:" msgstr "Bericht:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:440 +#: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" msgstr "Vermiste jurisdiction_id" @@ -1534,11 +1525,11 @@ msgstr "Meer problemen dichtbij" #: templates/web/fixmystreet/report/update-form.html:138 #: 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:94 +#: templates/web/zurich/report/new/fill_in_details_form.html:77 msgid "Name" msgstr "Naam" -#: templates/web/base/admin/report_edit.html:66 +#: templates/web/base/admin/report_edit.html:79 #: templates/web/base/admin/update_edit.html:32 #: templates/web/base/admin/user-form.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:43 @@ -1547,25 +1538,25 @@ msgstr "Naam" msgid "Name:" msgstr "Naam:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:321 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:313 msgid "Name: %s" msgstr "" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:186 -#: perllib/FixMyStreet/Geocode/OSM.pm:164 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 +#: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "Dichtstbijzijnde straat met naam voor lokatie op de kaart (automatisch gegenereerd via OpenStreetMap): %s%s" -#: perllib/FixMyStreet/Cobrand/UK.pm:137 +#: perllib/FixMyStreet/Cobrand/UK.pm:127 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:421 -#: perllib/FixMyStreet/Cobrand/Default.pm:461 +#: perllib/FixMyStreet/Cobrand/Default.pm:442 +#: perllib/FixMyStreet/Cobrand/Default.pm:482 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:288 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:277 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1581,11 +1572,11 @@ msgstr "Bijna klaar! Kijk nu in je e-mail..." msgid "New <br>problems" msgstr "Nieuw <br>problemen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:264 +#: perllib/FixMyStreet/App/Controller/Admin.pm:261 msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:379 msgid "New category contact added" msgstr "Nieuw contactpersonen voor categorie toegevoegd" @@ -1658,15 +1649,15 @@ msgstr "" msgid "Next" msgstr "" -#: templates/web/base/admin/body.html:72 templates/web/base/admin/body.html:74 -#: templates/web/base/admin/body.html:78 templates/web/base/admin/body.html:80 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:93 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:44 @@ -1684,7 +1675,7 @@ msgstr "" msgid "No council" msgstr "Geen gemeente" -#: perllib/FixMyStreet/DB/Result/Problem.pm:376 +#: perllib/FixMyStreet/DB/Result/Problem.pm:401 msgid "No council selected" msgstr "Geen gemeente geselecteerd" @@ -1725,12 +1716,12 @@ msgid "" " your config file is not pointing to a live MapIt service." msgstr "" -#: templates/web/base/report/_support.html:3 +#: templates/web/base/report/_support.html:2 #: templates/web/base/report/_support.html:4 msgid "No supporters" msgstr "Geen medestanders" -#: templates/web/base/admin/report_edit.html:30 +#: templates/web/base/admin/report_edit.html:41 #: templates/web/zurich/admin/report_edit-sdm.html:46 #: templates/web/zurich/admin/report_edit.html:60 msgid "None" @@ -1745,8 +1736,8 @@ msgid "" " activity across their body), the ability to hide reports or set special report statuses." msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:46 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -1762,12 +1753,12 @@ msgstr "" msgid "Not reported before" msgstr "Nog niet gemeld" -#: templates/web/base/report/_main.html:61 +#: templates/web/base/report/_main.html:62 msgid "Not reported to council" msgstr "Niet gemeld bij de gemeente" -#: templates/web/base/admin/body.html:63 -#: templates/web/base/admin/category_edit.html:87 +#: templates/web/base/admin/body.html:71 +#: templates/web/base/admin/category_edit.html:92 #: templates/web/zurich/admin/body.html:17 msgid "Note" msgstr "Opmerking" @@ -1776,8 +1767,8 @@ msgstr "Opmerking" 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 "Let op dat als je onbevestigde meldingen meeneemt we de datum gebruiken waarop de melding is gemaakt, dit kan afwijken van de maand waarin de melding is bevestigd dus dan kunnen de cijfers afwijken." -#: templates/web/base/admin/body.html:178 -#: templates/web/base/admin/category_edit.html:44 +#: templates/web/base/admin/body.html:186 +#: templates/web/base/admin/category_edit.html:49 #: templates/web/zurich/admin/body.html:53 msgid "Note:" msgstr "Opmerking:" @@ -1790,7 +1781,7 @@ msgstr "Opmerking: <strong>%s</strong>" msgid "Now to submit your report…" msgstr "Nu om je melding te verzend…" -#: templates/web/base/report/new/fill_in_details_form.html:132 +#: templates/web/base/report/new/fill_in_details_form.html:113 msgid "Now to submit your report… do you have a FixMyStreet password?" msgstr "Nu om je melding te verzend… heb je een FixMyStreet wachtwoord?" @@ -1807,7 +1798,7 @@ msgid "OK" msgstr "" #: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:16 +#: templates/web/base/report/update.html:17 msgid "Offensive? Unsuitable? Tell us" msgstr "Beledigend? Ongeschikt? Meld het ons" @@ -1827,19 +1818,19 @@ msgstr "Ouder<br>opgelost" msgid "Older <br>problems" msgstr "Oudere<br>problemen" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:37 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 msgid "One-line summary" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:137 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:36 -#: templates/web/base/admin/report_edit.html:37 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:138 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:49 +#: templates/web/base/admin/report_edit.html:50 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/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:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/report_edit.html:86 #: templates/web/zurich/admin/report_edit.html:88 @@ -1848,10 +1839,19 @@ msgstr "" msgid "Open" msgstr "Open" -#: templates/web/base/my/my.html:30 templates/web/fixmystreet/my/my.html:36 +#: templates/web/base/reports/index.html:22 +msgid "Open for more than four weeks, with an update within the past eight weeks" +msgstr "" + +#: templates/web/base/my/my.html:30 +#: templates/web/fixmystreet/my/_problem-list.html:2 msgid "Open reports" msgstr "Open meldingen" +#: templates/web/base/reports/index.html:23 +msgid "Open, but not had any update in eight weeks" +msgstr "" + #: templates/web/base/open311/index.html:70 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "Open311 API voor de mySociety FixMyStreet server" @@ -1874,15 +1874,15 @@ msgstr "Of problemen gemeld aan:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Of je kan je abonneren op een melding gebaseerd op welke gemeente je woont:" -#: 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:560 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 -#: perllib/FixMyStreet/DB/Result/Problem.pm:592 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:372 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 +#: perllib/FixMyStreet/DB/Result/Problem.pm:597 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:393 msgid "Other" msgstr "Anders" @@ -1904,8 +1904,8 @@ msgstr "Pagina Niet Gevonden" msgid "Parent" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 msgid "Partial" msgstr "Gedeeltelijk" @@ -1925,7 +1925,7 @@ msgstr "Wachtwoord:" msgid "Permalink" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:100 +#: templates/web/zurich/report/new/fill_in_details_form.html:83 msgid "Phone number" msgstr "" @@ -1934,27 +1934,27 @@ msgstr "" msgid "Phone number (optional)" msgstr "Telefoonnummer (optioneel)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:286 -#: templates/web/base/admin/report_edit.html:68 -#: templates/web/base/report/new/fill_in_details_form.html:216 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:291 +#: templates/web/base/admin/report_edit.html:81 +#: templates/web/base/report/new/fill_in_details_form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:46 #: templates/web/zurich/admin/report_edit.html:60 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Telefoonnummer:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:72 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 #: 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 +#: templates/web/zurich/report/new/fill_in_details_form.html:51 msgid "Photo" msgstr "Foto" #: templates/web/base/questionnaire/index.html:71 -#: templates/web/base/report/new/fill_in_details_form.html:103 +#: templates/web/base/report/new/fill_in_details_form.html:84 #: templates/web/base/report/update-form.html:62 #: templates/web/fixmystreet/questionnaire/index.html:91 msgid "Photo:" @@ -1968,11 +1968,11 @@ msgstr "Foto's van recente meldingen dichtbij" msgid "Place pin on map" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:38 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/zurich/admin/header.html:2 +#: 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:86 @@ -2006,20 +2006,19 @@ msgstr "Controleer je e-mail" msgid "Please check your email address is correct" msgstr "Controleer of je e-mailadres klopt" -#: perllib/FixMyStreet/App/Controller/Admin.pm:349 -#: 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:395 +#: perllib/FixMyStreet/App/Controller/Admin.pm:343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:876 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 +#: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" msgstr "Kies een categorie" -#: perllib/FixMyStreet/DB/Result/Problem.pm:401 +#: perllib/FixMyStreet/DB/Result/Problem.pm:418 msgid "Please choose a property type" msgstr "Kies een pand type" -#: perllib/FixMyStreet/App/Controller/Admin.pm:376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:370 msgid "Please correct the errors below" msgstr "" @@ -2035,8 +2034,8 @@ msgstr "Maak alsjeblieft <strong>geen</strong> meldingen van problemen via dit f msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:352 -#: perllib/FixMyStreet/DB/Result/Comment.pm:133 +#: perllib/FixMyStreet/App/Controller/Admin.pm:346 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "Geef bericht in" @@ -2047,15 +2046,15 @@ msgstr "Geef bericht in" msgid "Please enter a password" msgstr "Geef wachtwoord" -#: perllib/FixMyStreet/App/Controller/Contact.pm:108 -#: perllib/FixMyStreet/DB/Result/Problem.pm:370 +#: perllib/FixMyStreet/App/Controller/Contact.pm:113 +#: perllib/FixMyStreet/DB/Result/Problem.pm:395 #: templates/web/base/js/translation_strings.html:3 msgid "Please enter a subject" msgstr "Geef onderwerp" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1050 -#: perllib/FixMyStreet/App/Controller/Admin.pm:351 -#: perllib/FixMyStreet/App/Controller/Admin.pm:997 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin.pm:995 #: perllib/FixMyStreet/DB/Result/User.pm:127 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 @@ -2063,16 +2062,16 @@ msgid "Please enter a valid email" msgstr "Geef een geldig e-mailadres" #: perllib/FixMyStreet/App/Controller/Alert.pm:346 -#: perllib/FixMyStreet/App/Controller/Contact.pm:118 +#: perllib/FixMyStreet/App/Controller/Contact.pm:123 msgid "Please enter a valid email address" msgstr "Geef een geldig e-mailadres" -#: perllib/FixMyStreet/DB/Result/Problem.pm:373 +#: perllib/FixMyStreet/DB/Result/Problem.pm:398 #: templates/web/base/js/translation_strings.html:4 msgid "Please enter some details" msgstr "Geef details" -#: perllib/FixMyStreet/App/Controller/Contact.pm:107 +#: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/User.pm:124 #: templates/web/base/auth/general.html:13 #: templates/web/base/auth/general.html:8 @@ -2086,7 +2085,7 @@ msgid "Please enter your email" msgstr "Geef een geldig e-mailadres" #: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:75 msgid "Please enter your email address" msgstr "Geef een geldig e-mailadres" @@ -2094,14 +2093,14 @@ msgstr "Geef een geldig e-mailadres" msgid "Please enter your first name" msgstr "Geef je voornaam" -#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: perllib/FixMyStreet/Cobrand/UK.pm:318 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Geef je volledige naam, gemeentes hebben deze informatie nodig. Mocht je niet willen dat je naam op de site getoond wordt, haal dan de vink beneden weg." -#: perllib/FixMyStreet/App/Controller/Contact.pm:106 -#: perllib/FixMyStreet/DB/Result/Comment.pm:130 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Contact.pm:111 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 +#: perllib/FixMyStreet/DB/Result/Problem.pm:406 #: perllib/FixMyStreet/DB/Result/User.pm:120 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" @@ -2124,7 +2123,7 @@ msgstr "Geef je titel" msgid "Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a href=\"/\">front page</a>." msgstr "" -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/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." @@ -2139,7 +2138,7 @@ msgstr "Vul de details van het probleem in." msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "Vul zoveel mogelijk details in het veld beneden in. Vermeld ook de locatie zo precies mogelijk." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:251 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Geef aan of je een vragenlijst wilt ontvangen" @@ -2162,16 +2161,16 @@ msgstr "Let op dat je melding <strong>nog niet is verzonden</strong>. Kies een c msgid "Please note:" msgstr "Let op:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:246 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:254 msgid "Please provide some explanation as to why you're reopening this report" msgstr "Geef een reden op waarom je deze melding heropent" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:261 msgid "Please provide some text as well as a photo" msgstr "Vermeld wat tekst en een foto" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:247 msgid "Please say whether you've ever reported a problem to your council before" msgstr "Geef aan of je het probleem al eerder hebt doorgegeven aan de gemeente" @@ -2183,7 +2182,7 @@ msgstr "Kies de feed die je wilt" msgid "Please select the type of alert you want" msgstr "Kies de melding die je wilt" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please state whether or not the problem has been fixed" msgstr "Geef aan of het probleem is verholpen" @@ -2191,15 +2190,13 @@ msgstr "Geef aan of het probleem is verholpen" msgid "Please take a look at the updates that have been left." msgstr "Kijk eens naar de updates die zijn achter gelaten." -#: perllib/FixMyStreet/App/Controller/Photo.pm:176 +#: perllib/FixMyStreet/App/Controller/Photo.pm:177 +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 +#: perllib/FixMyStreet/App/Controller/Photo.pm:189 msgid "Please upload a JPEG image only" msgstr "Je kan alleen een JPEG foto insturen" -#: perllib/FixMyStreet/App/Controller/Photo.pm:183 -msgid "Please upload a JPEG image only\n" -msgstr "Upload alleen JPEG foto's\n" - -#: perllib/FixMyStreet/App/Controller/Contact.pm:109 +#: perllib/FixMyStreet/App/Controller/Contact.pm:114 msgid "Please write a message" msgstr "Schrijf een bericht" @@ -2238,14 +2235,14 @@ msgstr "" msgid "Privacy" msgstr "" -#: templates/web/base/admin/body.html:194 -#: templates/web/base/admin/body.html:77 -#: templates/web/base/admin/category_edit.html:40 -#: templates/web/base/admin/report_edit.html:79 +#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:85 +#: templates/web/base/admin/category_edit.html:45 +#: templates/web/base/admin/report_edit.html:95 msgid "Private" msgstr "Privé" -#: templates/web/base/maps/openlayers.html:86 +#: templates/web/base/maps/openlayers.html:89 msgid "Problem" msgstr "Probleem" @@ -2266,7 +2263,7 @@ msgstr "Probleem %s verzonden naar gemeente %s" msgid "Problem breakdown by state" msgstr "Probleem verdeeld per status" -#: perllib/FixMyStreet/App/Controller/Admin.pm:968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:966 msgid "Problem marked as open." msgstr "Probleem gemarkeerd als open" @@ -2301,16 +2298,15 @@ 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:629 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:114 +#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:151 -#: perllib/FixMyStreet/Cobrand/UK.pm:217 +#: perllib/FixMyStreet/Cobrand/UK.pm:207 msgid "Problems within %s" msgstr "Problemen binnen %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:122 -#: perllib/FixMyStreet/Cobrand/UK.pm:231 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "Problems within %s ward" msgstr "Problemen binnen wijk %s" @@ -2328,7 +2324,7 @@ msgstr "Problemen binnen de grenzen van:" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "Recent gemelde hergebruikte panden op reportemptyhomes.com" -#: templates/web/base/admin/report_edit.html:32 +#: templates/web/base/admin/report_edit.html:45 msgid "Property address:" msgstr "" @@ -2345,7 +2341,7 @@ 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/base/report/new/fill_in_details_form.html:174 +#: templates/web/base/report/new/fill_in_details_form.html:155 #: templates/web/base/report/update-form.html:128 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 #: templates/web/fixmystreet/report/update-form.html:119 @@ -2366,7 +2362,7 @@ msgstr "" msgid "Publish the response" msgstr "" -#: templates/web/base/questionnaire/completed.html:2 +#: templates/web/base/questionnaire/completed.html:1 #: templates/web/base/questionnaire/index.html:0 #: templates/web/base/questionnaire/index.html:14 #: templates/web/base/questionnaire/index.html:4 @@ -2385,11 +2381,12 @@ msgstr "Vragenlijst %d beantwoord voor probleem %d, %s tot %s" msgid "Questionnaire %d sent for problem %d" msgstr "Vragenlijst %d verzonden voor probleem %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 msgid "Questionnaire filled in by problem reporter" msgstr "Vragenlijst ingevuld door melder" #: templates/web/base/alert/_list.html:21 +#: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display.html:50 #: templates/web/base/reports/_rss.html:1 @@ -2399,11 +2396,11 @@ msgstr "Vragenlijst ingevuld door melder" msgid "RSS feed" msgstr "RSS feed" -#: perllib/FixMyStreet/Cobrand/UK.pm:260 perllib/FixMyStreet/Cobrand/UK.pm:272 +#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 msgid "RSS feed for %s" msgstr "RSS feed voor %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "RSS feed for %s ward, %s" msgstr "RSS feed voor wijk %s, %s" @@ -2411,15 +2408,11 @@ msgstr "RSS feed voor wijk %s, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:167 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:175 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:185 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:193 -#: perllib/FixMyStreet/Cobrand/UK.pm:286 perllib/FixMyStreet/Cobrand/UK.pm:298 +#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 msgid "RSS feed of %s" msgstr "RSS feed van %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 msgid "RSS feed of %s, within %s ward" msgstr "RSS feed van %s, binnen wijk %s" @@ -2432,20 +2425,19 @@ 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:630 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:115 +#: perllib/FixMyStreet/Cobrand/Default.pm:651 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:150 -#: perllib/FixMyStreet/Cobrand/UK.pm:224 +#: perllib/FixMyStreet/Cobrand/UK.pm:214 msgid "RSS feed of problems within %s" msgstr "RSS feed van problemen binnen %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 -#: perllib/FixMyStreet/Cobrand/UK.pm:230 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s ward" msgstr "RSS feed van problemen in wijk %s" -#: templates/web/base/around/display_location.html:3 +#: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:4 msgid "RSS feed of recent local problems" msgstr "RSS feed van recente lokale problemen" @@ -2485,15 +2477,18 @@ msgstr "Onthoud dat FixMyStreet zich richt op het melden van fysieke problemen d msgid "Remove flag" msgstr "Verwijder markering" -#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/report_edit.html:110 #: templates/web/base/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!)" -#: templates/web/base/footer.html:7 templates/web/fiksgatami/footer.html:19 -#: templates/web/fiksgatami/nn/footer.html:19 -#: templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 +msgid "Report" +msgstr "" + +#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 #: templates/web/zurich/footer.html:17 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2503,11 +2498,6 @@ msgstr "Meld een probleem" msgid "Report abuse" msgstr "Meld misbruik" -#: templates/web/base/report_created.html:1 -#: templates/web/base/report_created.html:3 -msgid "Report created" -msgstr "" - #: perllib/FixMyStreet/App/Controller/Rss.pm:295 msgid "Report on %s" msgstr "Meld op %s" @@ -2531,7 +2521,7 @@ msgstr "Gemeld %s" msgid "Reported %s, to %s" msgstr "Gemeld %s aan %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:580 #: templates/web/base/contact/index.html:50 #: templates/web/fixmystreet/contact/index.html:65 msgid "Reported anonymously at %s" @@ -2543,7 +2533,7 @@ msgstr "Anoniem gemeld bij %s" msgid "Reported before" msgstr "Eerder gemeld" -#: perllib/FixMyStreet/DB/Result/Problem.pm:598 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 #: templates/web/base/contact/index.html:52 #: templates/web/fixmystreet/contact/index.html:67 msgid "Reported by %s at %s" @@ -2553,31 +2543,35 @@ msgstr "Gemeld door %s bij %s" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:571 +#: perllib/FixMyStreet/DB/Result/Problem.pm:576 msgid "Reported in the %s category anonymously at %s" msgstr "Anoniem gemeld in de categorie %s bij %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:598 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:567 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 msgid "Reported via %s anonymously at %s" msgstr "Anoniem door %s gemeld bij %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:589 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 msgid "Reported via %s by %s at %s" msgstr "Gemeld door %s door %s bij %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:563 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 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:583 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 msgid "Reported via %s in the %s category by %s at %s" msgstr "Gemeld door %s in de categorie %s door %s bij %s" -#: templates/web/base/around/around_index.html:2 +#: templates/web/base/reports/index.html:21 +msgid "Reported within the last four weeks" +msgstr "" + +#: templates/web/base/around/around_index.html:1 #: templates/web/base/around/around_index.html:3 #: templates/web/base/js/translation_strings.html:41 #: templates/web/base/report/new/fill_in_details.html:0 @@ -2587,14 +2581,13 @@ msgstr "Gemeld door %s in de categorie %s door %s bij %s" msgid "Reporting a problem" msgstr "Meld een probleem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:294 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:409 -#: perllib/FixMyStreet/DB/Result/Problem.pm:413 +#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" @@ -2610,7 +2603,7 @@ msgstr "Melding op en nabij de kaart" msgid "Reports published" msgstr "" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:85 msgid "Resend report" msgstr "Herstuur melding" @@ -2618,36 +2611,35 @@ msgstr "Herstuur melding" msgid "Right place?" msgstr "" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:193 -#: perllib/FixMyStreet/Geocode/OSM.pm:171 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:167 +#: perllib/FixMyStreet/Geocode/OSM.pm:152 msgid "Road operator for this named road (derived from road reference number and type): %s" msgstr "Wegbeheerder voor deze straat (afgeleid van wegnummer en type): %s" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:190 -#: perllib/FixMyStreet/Geocode/OSM.pm:168 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:164 +#: perllib/FixMyStreet/Geocode/OSM.pm:149 msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Wegbeheerder voor deze straat (uit OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1394 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 -#: templates/web/base/admin/report_edit.html:90 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1403 +#: templates/web/base/admin/report_edit.html:106 #: templates/web/zurich/admin/report_edit.html:73 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1394 -#: templates/web/base/admin/report_edit.html:91 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: templates/web/base/admin/report_edit.html:107 #: templates/web/zurich/admin/report_edit.html:74 msgid "Rotate Right" msgstr "" #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:200 -#: templates/web/base/admin/category_edit.html:76 +#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/category_edit.html:81 #: templates/web/zurich/admin/body.html:59 msgid "Save changes" msgstr "Wijzigingen opslaan" @@ -2675,7 +2667,7 @@ msgstr "Zoek:" msgid "Searching found no reports." msgstr "" -#: templates/web/base/admin/users.html:39 +#: templates/web/base/admin/users.html:41 msgid "Searching found no users." msgstr "" @@ -2698,15 +2690,15 @@ 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:680 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "Sent to %s %s later" msgstr "Verzonden aan %s %s later" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:84 msgid "Sent:" msgstr "Verzonden:" -#: templates/web/base/admin/report_edit.html:73 +#: templates/web/base/admin/report_edit.html:89 #: templates/web/zurich/admin/stats.html:45 msgid "Service:" msgstr "Service:" @@ -2715,7 +2707,7 @@ msgstr "Service:" msgid "Share" msgstr "Deel" -#: templates/web/base/report/new/fill_in_details_form.html:211 +#: templates/web/base/report/new/fill_in_details_form.html:192 #: templates/web/base/report/update-form.html:157 #: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 @@ -2760,12 +2752,12 @@ msgstr "Uitloggen" msgid "Signed in as %s" msgstr "Ingelogd als %s" -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 msgid "Some categories may require additional information." msgstr "Sommige categorieën hebben extra informatie nodig." -#: templates/web/base/admin/body-form.html:145 -#: templates/web/base/admin/body-form.html:146 +#: templates/web/base/admin/body-form.html:149 +#: templates/web/base/admin/body-form.html:150 msgid "" "Some endpoints require an <strong>API key</strong> to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -2776,11 +2768,11 @@ msgid "Some photos of recent reports" msgstr "" #: perllib/FixMyStreet/App/View/Email.pm:32 -#: perllib/FixMyStreet/App/View/Web.pm:44 +#: perllib/FixMyStreet/App/View/Web.pm:43 msgid "Some text to localize" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:88 +#: perllib/FixMyStreet/Cobrand/UK.pm:78 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -2788,17 +2780,16 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:215 -#: perllib/FixMyStreet/Geocode.pm:26 perllib/FixMyStreet/Geocode/Bing.pm:56 -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:73 -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:93 -#: perllib/FixMyStreet/Geocode/Google.pm:72 -#: perllib/FixMyStreet/Geocode/OSM.pm:64 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:214 +#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 +#: perllib/FixMyStreet/Geocode/Google.pm:47 +#: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "" -#: perllib/FixMyStreet/Geocode/Bing.pm:51 -#: perllib/FixMyStreet/Geocode/Google.pm:67 +#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: perllib/FixMyStreet/Geocode/Google.pm:44 #: perllib/FixMyStreet/Geocode/Zurich.pm:87 msgid "Sorry, we could not parse that location. Please try again." msgstr "" @@ -2807,7 +2798,7 @@ msgstr "" msgid "Start Date:" msgstr "" -#: templates/web/base/admin/body.html:61 +#: templates/web/base/admin/body.html:69 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 @@ -2815,7 +2806,7 @@ msgstr "" msgid "State" msgstr "" -#: templates/web/base/admin/report_edit.html:34 +#: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 #: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:53 @@ -2824,8 +2815,8 @@ msgstr "" msgid "State:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1200 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:304 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:308 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" @@ -2841,7 +2832,7 @@ msgstr "" msgid "Still open, via questionnaire, %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:381 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 msgid "Subcategory: %s" msgstr "" @@ -2861,19 +2852,19 @@ msgid "Subject:" msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:115 -#: templates/web/base/report/new/fill_in_details_form.html:155 -#: templates/web/base/report/new/fill_in_details_form.html:177 +#: templates/web/base/report/new/fill_in_details_form.html:136 +#: templates/web/base/report/new/fill_in_details_form.html:158 +#: templates/web/base/report/new/fill_in_details_form.html:96 #: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 -#: templates/web/zurich/report/new/fill_in_details_form.html:108 +#: templates/web/zurich/report/new/fill_in_details_form.html:91 msgid "Submit" msgstr "" -#: templates/web/base/admin/report_edit.html:97 +#: templates/web/base/admin/report_edit.html:113 #: templates/web/base/admin/update_edit.html:65 -#: templates/web/base/admin/user-form.html:55 +#: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:64 #: templates/web/zurich/admin/report_edit.html:221 #: templates/web/zurich/admin/update_edit.html:38 @@ -2885,8 +2876,8 @@ msgstr "" msgid "Submit questionnaire" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:133 -#: templates/web/zurich/admin/header.html:2 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:134 +#: 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 @@ -2910,8 +2901,8 @@ msgstr "" msgid "Subscribe me to an email alert" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1191 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:293 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 #: templates/web/zurich/admin/index-dm.html:1 @@ -2927,7 +2918,7 @@ msgstr "" msgid "Summary reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 msgid "Survey" msgstr "" @@ -2941,7 +2932,7 @@ msgstr "" msgid "Text" msgstr "" -#: templates/web/base/admin/body.html:21 +#: templates/web/base/admin/body.html:28 msgid "Text only version" msgstr "" @@ -2950,49 +2941,55 @@ msgstr "" msgid "Text:" msgstr "" -#: templates/web/base/tokens/confirm_update.html:9 -msgid "Thank you — you can <a href=\"%s\">view your updated problem</a> on the site." -msgstr "" - -#: templates/web/base/tokens/confirm_problem.html:18 -msgid "Thank you for reporting this issue" +#: templates/web/base/tokens/confirm_problem.html:12 +msgid "Thank you for reporting this issue!" msgstr "" #: templates/web/base/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/fixmystreet/around/around_index.html:28 -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 :" +#: templates/web/base/tokens/confirm_update.html:15 +msgid "Thank you for updating this issue!" msgstr "" -#: templates/web/base/contact/submit.html:8 -msgid "Thanks for your feedback. We'll get back to you as soon as we can!" +#: templates/web/base/contact/submit.html:6 +#: templates/web/base/questionnaire/completed.html:5 +msgid "Thank you for your feedback" +msgstr "" + +#: templates/web/fixmystreet/around/around_index.html:28 +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 :" msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:9 msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:190 +#: perllib/FixMyStreet/App/Controller/Photo.pm:195 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Council.pm:100 +#: perllib/FixMyStreet/App/Controller/Council.pm:97 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 +#: perllib/FixMyStreet/App/Controller/Location.pm:126 msgid "That location does not appear to be in the UK; please try again." msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:81 +#: perllib/FixMyStreet/Cobrand/UK.pm:71 msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:713 +#: perllib/FixMyStreet/App/Controller/Admin.pm:712 +#, fuzzy +msgid "That problem has been marked as sent." +msgstr "Dit probleem is opgelost" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:704 msgid "That problem will now be resent." msgstr "" @@ -3004,28 +3001,28 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "" -#: templates/web/base/admin/body.html:136 +#: templates/web/base/admin/body.html:144 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/base/admin/body-form.html:119 -#: templates/web/base/admin/body-form.html:120 +#: templates/web/base/admin/body-form.html:123 +#: templates/web/base/admin/body-form.html:124 msgid "" "The <strong>endpoint</strong> is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." msgstr "" -#: templates/web/base/admin/body-form.html:132 -#: templates/web/base/admin/body-form.html:133 +#: templates/web/base/admin/body-form.html:136 +#: templates/web/base/admin/body-form.html:137 msgid "" "The <strong>jurisdiction</strong> is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" -#: templates/web/base/admin/body-form.html:90 -#: templates/web/base/admin/body-form.html:91 +#: templates/web/base/admin/body-form.html:94 +#: templates/web/base/admin/body-form.html:95 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>." @@ -3046,7 +3043,7 @@ msgstr "" msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." msgstr "" -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:3 msgid "The council won’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 "" @@ -3073,8 +3070,8 @@ 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:185 -#: perllib/FixMyStreet/Geocode/OSM.pm:163 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:159 +#: perllib/FixMyStreet/Geocode/OSM.pm:144 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap." msgstr "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." @@ -3132,7 +3129,7 @@ msgstr "" msgid "The passwords do not match" msgstr "Wachtwoorden komen niet overeen" -#: templates/web/base/errors/page_error_404_not_found.html:11 +#: templates/web/base/errors/page_error_404_not_found.html:10 #: templates/web/base/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" @@ -3149,7 +3146,7 @@ msgstr "De simpelste melding is onze geografische:" msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:295 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:300 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" @@ -3160,16 +3157,20 @@ msgid "" " Names are not necessarily unique." msgstr "" +#: templates/web/base/reports/_problem-list.html:15 +msgid "There are no reports to show." +msgstr "" + #: perllib/FixMyStreet/App/Controller/Reports.pm:75 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:131 +#: perllib/FixMyStreet/App/Controller/Contact.pm:136 #: 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:755 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:762 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 #: templates/web/base/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:25 @@ -3185,7 +3186,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:135 +#: perllib/FixMyStreet/App/Controller/Contact.pm:140 msgid "There were problems with your report. Please see below." msgstr "Er was een probleem met je melding. Zie beneden." @@ -3193,8 +3194,8 @@ msgstr "Er was een probleem met je melding. Zie beneden." msgid "There were problems with your update. Please see below." msgstr "Er was een probleem met je update. Zie beneden." -#: templates/web/base/admin/body-form.html:108 -#: templates/web/base/admin/body-form.html:109 +#: templates/web/base/admin/body-form.html:112 +#: templates/web/base/admin/body-form.html:113 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" @@ -3207,14 +3208,14 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Deze API implementatie is een werk in uitvoering en nog niet stabiel. Het kan zonder waarschuwing wijzigen in de toekomst." -#: templates/web/base/admin/body.html:36 +#: templates/web/base/admin/body.html:44 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported <em>at any location</em>.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" " Currently, users <strong>cannot report problems to this body</strong>." msgstr "" -#: templates/web/base/admin/body.html:46 +#: templates/web/base/admin/body.html:54 msgid "This body has no contacts. This means that currently problems reported to this body <strong>will not be sent</strong>." msgstr "" @@ -3225,18 +3226,18 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:388 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:394 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:391 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 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:898 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:136 -#: perllib/FixMyStreet/Cobrand/UK.pm:53 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:902 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:972 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/Cobrand/UK.pm:43 msgid "This information is required" msgstr "Deze informatie is verplicht" @@ -3275,8 +3276,8 @@ 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:130 #: perllib/FixMyStreet/Cobrand/Zurich.pm:131 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:132 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -3293,15 +3294,15 @@ msgstr "Deze melding is momenteel gemarkeerd als opgelost." msgid "This report is currently marked as open." msgstr "Deze melding is momenteel gemarkeerd als openstaand." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:319 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:311 msgid "This report was submitted anonymously" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:293 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:1196 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Tijdslijn" @@ -3319,7 +3320,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:294 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:299 msgid "To view a map of the precise location of this issue" msgstr "" @@ -3335,8 +3336,12 @@ msgstr "" msgid "Try again" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:46 +#: templates/web/base/contact/submit.html:14 +msgid "Try emailing us directly:" +msgstr "" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -3344,8 +3349,8 @@ msgstr "" msgid "Unable to fix" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/admin/update_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:45 #: templates/web/zurich/admin/report_edit.html:58 @@ -3387,7 +3392,7 @@ msgstr "" msgid "Update below added by %s at %s" msgstr "" -#: templates/web/base/admin/body-form.html:233 +#: templates/web/base/admin/body-form.html:240 #: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "" @@ -3413,7 +3418,7 @@ msgstr "" msgid "Update reopened problem" msgstr "" -#: templates/web/base/admin/body.html:93 +#: templates/web/base/admin/body.html:101 msgid "Update statuses" msgstr "" @@ -3427,12 +3432,12 @@ msgstr "" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1016 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1060 -#: perllib/FixMyStreet/App/Controller/Admin.pm:810 -#: perllib/FixMyStreet/App/Controller/Admin.pm:958 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:549 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:618 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1014 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:808 +#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:556 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:625 msgid "Updated!" msgstr "" @@ -3444,7 +3449,7 @@ msgstr "" msgid "Updates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:139 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -3459,7 +3464,7 @@ msgstr "" msgid "Updates to this problem, FixMyStreet" msgstr "" -#: templates/web/base/admin/body.html:174 +#: templates/web/base/admin/body.html:182 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 "" @@ -3468,11 +3473,11 @@ msgstr "" msgid "User" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1357 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1331 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1329 msgid "User flagged" msgstr "" @@ -3480,16 +3485,16 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:303 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:307 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:380 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:430 +#: perllib/FixMyStreet/App/Controller/Admin.pm:374 +#: perllib/FixMyStreet/App/Controller/Admin.pm:404 +#: perllib/FixMyStreet/App/Controller/Admin.pm:421 msgid "Values updated" msgstr "" @@ -3543,11 +3548,11 @@ msgstr "" msgid "We never show your email address or phone number." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:403 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/base/index-steps.html:38 +#: templates/web/base/index-steps.html:31 msgid "We send it to the council on your behalf" msgstr "" @@ -3556,15 +3561,23 @@ msgstr "" msgid "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>" msgstr "" +#: templates/web/base/questionnaire/completed-open.html:2 +msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" +msgstr "" + #: templates/web/base/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/fixmystreet/report/new/fill_in_details_form.html:41 +#: templates/web/base/contact/submit.html:7 +msgid "We’ll get back to you as soon as we can." +msgstr "" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 msgid "What’s the issue, and where is it?" msgstr "" -#: templates/web/base/admin/category_edit.html:82 +#: templates/web/base/admin/category_edit.html:87 #: templates/web/zurich/admin/body.html:18 msgid "When edited" msgstr "" @@ -3573,15 +3586,18 @@ msgstr "" msgid "When sent" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Whole block of empty flats" msgstr "" +#: templates/web/base/tokens/confirm_alert.html:7 +msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." +msgstr "" + #: templates/web/base/open311/index.html:92 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/fiksgatami/front/footer-marketing.html:15 #: templates/web/fixmystreet/front/footer-marketing.html:17 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" @@ -3605,18 +3621,18 @@ msgid "Year" msgstr "Jaar" #: templates/web/base/admin/bodies.html:66 -#: templates/web/base/admin/body.html:72 templates/web/base/admin/body.html:74 -#: templates/web/base/admin/body.html:78 templates/web/base/admin/body.html:80 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:76 +#: templates/web/base/admin/report_edit.html:93 #: templates/web/base/admin/update_edit.html:24 -#: templates/web/base/admin/users.html:29 +#: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:42 #: templates/web/base/questionnaire/index.html:81 @@ -3645,14 +3661,12 @@ msgstr "Je meld het volgende probleem als beledigend, persoonlijke informatie be 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/base/tokens/confirm_problem.html:25 -#: templates/web/base/tokens/confirm_problem.html:26 -#: templates/web/zurich/tokens/confirm_problem.html:6 +#: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:8 msgid "You can <a href=\"%s%s\">view the problem on this site</a>." msgstr "" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:48 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -3667,14 +3681,14 @@ msgid "" " reports in the past." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:19 -#: templates/web/base/report/new/councils_text_none.html:20 -#: templates/web/base/report/new/councils_text_some.html:20 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 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>." -#: templates/web/base/admin/body-form.html:81 +#: templates/web/base/admin/body-form.html:85 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" @@ -3687,10 +3701,10 @@ msgid "You have already answered this questionnaire. If you have a question, ple msgstr "Je hebt deze vragenlijst al ingevuld. Als je vragen hebt kan je <a href='%s'>contact opnemen</a> of <a href='%s'>je probleem bekijken</a>.\n" #: templates/web/base/questionnaire/index.html:68 -#: templates/web/base/report/new/fill_in_details_form.html:94 +#: templates/web/base/report/new/fill_in_details_form.html:75 #: templates/web/fixmystreet/questionnaire/index.html:88 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:79 -#: templates/web/zurich/report/new/fill_in_details_form.html:75 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 +#: templates/web/zurich/report/new/fill_in_details_form.html:58 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." @@ -3699,7 +3713,7 @@ msgstr "Je hebt al een foto toegevoegd aan deze melding, als je nog een foto toe 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/base/auth/sign_out.html:3 +#: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" msgstr "Je bent uitgelogd" @@ -3708,26 +3722,11 @@ msgstr "Je bent uitgelogd" 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 "Je hebt een probleem aangewezen op de plek gemarkeerd met een groene speld op de kaart. Als dit niet klopt kan je nogmaals op de kaart klikken." -#: templates/web/base/tokens/confirm_alert.html:8 -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/base/tokens/confirm_update.html:14 -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>." - -#: templates/web/base/tokens/confirm_alert.html:12 -msgid "You have successfully created your alert." -msgstr "Je hebt je melding gemaakt." - -#: templates/web/base/tokens/confirm_alert.html:10 -msgid "You have successfully deleted your alert." -msgstr "Je hebt je melding verwijdert." - #: templates/web/base/report/display.html:20 #: templates/web/base/report/new/fill_in_details.html:37 #: templates/web/fixmystreet/report/display.html:17 @@ -3753,7 +3752,7 @@ msgid "" " contacts (such as an email address) to which reports are sent." msgstr "" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:85 msgid "You really want to resend?" msgstr "Weet je zeker dat je dit opnieuw wilt versturen?" @@ -3773,7 +3772,7 @@ msgstr "Jouw meldingen" #: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 #: templates/web/fixmystreet/report/update-form.html:76 -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:71 msgid "Your email" msgstr "Jouw e-mail" @@ -3789,7 +3788,7 @@ msgid "Your email address:" msgstr "Jouw e-mailadres:" #: templates/web/base/alert/_list.html:92 -#: templates/web/base/report/new/fill_in_details_form.html:125 +#: templates/web/base/report/new/fill_in_details_form.html:106 #: templates/web/base/report/update-form.html:81 msgid "Your email:" msgstr "Jouw e-mail:" @@ -3804,13 +3803,13 @@ msgstr "Je informatie wordt alleen gebruikt zoals vermeld in onze <a href=\"/pri #: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 #: templates/web/fixmystreet/report/update-form.html:142 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:98 +#: templates/web/zurich/report/new/fill_in_details_form.html:81 msgid "Your name" msgstr "Jouw naam" #: templates/web/base/auth/general.html:59 #: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:204 +#: templates/web/base/report/new/fill_in_details_form.html:185 #: templates/web/base/report/update-form.html:151 msgid "Your name:" msgstr "Jouw naam:" @@ -3828,33 +3827,19 @@ msgstr "Je wachtwoord is gewijzigd" #: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 -#: templates/web/zurich/report/new/fill_in_details_form.html:104 +#: templates/web/zurich/report/new/fill_in_details_form.html:87 msgid "Your phone number" msgstr "Je telefoonnummer" -#: templates/web/base/tokens/confirm_problem.html:4 -msgid "Your problem has been confirmed!" -msgstr "" - #: templates/web/fixmystreet/questionnaire/index.html:16 msgid "Your report" msgstr "Jouw melding" -#: templates/web/base/report_created.html:6 -msgid "Your report has been created and will shortly be sent." -msgstr "" - -#: templates/web/base/footer.html:9 templates/web/fiksgatami/footer.html:21 -#: templates/web/fiksgatami/nn/footer.html:21 -#: templates/web/fixmystreet/footer.html:24 +#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:24 msgid "Your reports" msgstr "Jouw meldingen" -#: templates/web/base/tokens/confirm_update.html:4 -msgid "Your update has been confirmed!" -msgstr "" - -#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:59 +#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:41 msgid "Your updates" msgstr "Jouw updates" @@ -3871,11 +3856,7 @@ msgstr "door %s" msgid "council" msgstr "gemeente" -#: perllib/FixMyStreet/DB/Result/Problem.pm:665 -msgid "council ref: %s" -msgstr "gemeente ref.: %s" - -#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:32 #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:54 msgid "didn't use map" @@ -3886,6 +3867,7 @@ msgstr "kaart niet gebruikt" msgid "e.g. ‘%s’ or ‘%s’" msgstr "bv. '%s' of '%s'" +#: templates/web/base/admin/body-form.html:188 #: templates/web/base/admin/flagged.html:51 msgid "edit user" msgstr "" @@ -3900,7 +3882,7 @@ msgstr "door %d verschillende gebruikers" msgid "last updated %s" msgstr "" -#: perllib/Utils.pm:263 +#: perllib/Utils.pm:235 msgid "less than a minute" msgstr "minder dan een minuut" @@ -3960,22 +3942,22 @@ msgstr "of" msgid "or locate me automatically" msgstr "" -#: templates/web/base/admin/report_edit.html:25 -#: templates/web/base/admin/report_edit.html:26 -#: templates/web/zurich/admin/report_edit-sdm.html:28 +#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:30 +#: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit-sdm.html:29 -#: templates/web/zurich/admin/report_edit-sdm.html:37 +#: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:38 -#: templates/web/zurich/admin/report_edit.html:28 +#: templates/web/zurich/admin/report_edit.html:27 #: templates/web/zurich/admin/report_edit.html:29 -#: templates/web/zurich/admin/report_edit.html:39 +#: templates/web/zurich/admin/report_edit.html:38 #: templates/web/zurich/admin/report_edit.html:40 -#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit.html:50 #: templates/web/zurich/admin/report_edit.html:52 msgid "originally entered: “%s”" msgstr "" -#: templates/web/base/admin/report_edit.html:30 +#: templates/web/base/admin/report_edit.html:43 msgid "other areas:" msgstr "" @@ -3984,13 +3966,12 @@ msgstr "" msgid "reopened" msgstr "" -#: templates/web/fiksgatami/header.html:49 -#: templates/web/fixmystreet/header.html:53 +#: templates/web/fixmystreet/header.html:59 #: templates/web/zurich/footer.html:12 msgid "sign out" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:13 +#: templates/web/base/report/new/fill_in_details_form.html:12 #: templates/web/base/report/new/fill_in_details_form.html:15 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 @@ -4002,15 +3983,15 @@ msgstr "" msgid "there is no pin shown as the user did not use the map" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:373 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:379 msgid "this type of local problem" msgstr "" -#: perllib/Utils.pm:235 +#: perllib/Utils.pm:207 msgid "today" msgstr "" -#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:32 #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:54 msgid "used map" @@ -4036,7 +4017,7 @@ msgid_plural "<big>%s</big> reports recently" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:282 +#: perllib/Utils.pm:254 #, perl-format msgid "%d hour" msgid_plural "%d hours" @@ -4050,7 +4031,7 @@ msgid_plural "%d supporters" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:284 +#: perllib/Utils.pm:256 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -4071,7 +4052,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:250 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -4092,7 +4073,7 @@ msgid_plural "<big>%s</big> fixed in past month" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:280 +#: perllib/Utils.pm:252 #, perl-format msgid "%d day" msgid_plural "%d days" @@ -4106,8 +4087,5 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "" msgstr[1] "" -#~ msgid "Configuration updated - contacts will be generated automatically later" -#~ msgstr "Configuratie bijgewerkt - contactpersonen worden later gegenereerd" - -#~ 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." +#~ msgid "For council(s):" +#~ msgstr "For gemeente(s):" diff --git a/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/nn_NO.UTF-8/LC_MESSAGES/FixMyStreet.po index b2ef8a94b..585cb859a 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: 2015-01-20 16:59+0000\n" -"PO-Revision-Date: 2014-11-19 18:30+0000\n" +"POT-Creation-Date: 2015-07-31 14:28+0100\n" +"PO-Revision-Date: 2015-07-10 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,17 +21,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:618 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:386 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:392 msgid " and " msgstr " og " -#: templates/web/base/report/new/councils_text_all.html:12 -#: templates/web/base/report/new/councils_text_all.html:19 -#: templates/web/base/report/new/councils_text_all.html:5 -#: templates/web/base/report/new/councils_text_none.html:19 -#: templates/web/base/report/new/councils_text_none.html:21 -#: templates/web/base/report/new/councils_text_some.html:20 +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_none.html:11 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " @@ -67,22 +65,26 @@ msgstr "" msgid "%s - Summary reports" msgstr "%s – oppsummeringsrapportar" -#: perllib/FixMyStreet/DB/Result/Problem.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:672 msgid "%s ref: %s" msgstr "%s ref: %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:265 perllib/FixMyStreet/Cobrand/UK.pm:277 +#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 msgid "%s ward, %s" msgstr "%s bydel, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:554 +#: perllib/FixMyStreet/DB/Result/Problem.pm:559 msgid "%s, reported at %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:304 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "%s, within %s ward" msgstr "%s, innanfor bydelen %s" +#: perllib/FixMyStreet/Map/OSM.pm:42 +msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" +msgstr "" + #: templates/web/base/email_sent.html:29 msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" msgstr "" @@ -96,7 +98,7 @@ msgid "(Don't worry — we'll hang on to your update while you're checking y msgstr "" #: templates/web/base/admin/report_blocks.html:11 -#: templates/web/base/admin/users.html:29 +#: templates/web/base/admin/users.html:31 msgid "(Email in abuse table)" msgstr "(Epost i misbruktabellen)" @@ -124,7 +126,7 @@ msgstr "(lukka)" msgid "(fixed)" msgstr "(løyst)" -#: templates/web/base/index.html:9 +#: templates/web/base/index.html:8 templates/web/base/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)" @@ -134,8 +136,8 @@ msgstr "(som tagging, søppel, hol i vegen, eller øydelagte gatelys)" msgid "(not sent to council)" msgstr "(ikkje rapportert til administrasjonen)" -#: templates/web/base/report/new/fill_in_details_form.html:218 -#: templates/web/zurich/report/new/fill_in_details_form.html:94 +#: templates/web/base/report/new/fill_in_details_form.html:199 +#: templates/web/zurich/report/new/fill_in_details_form.html:77 msgid "(optional)" msgstr "(valfritt)" @@ -148,7 +150,7 @@ msgstr "" msgid "(sent to both)" msgstr "(sendt til begge)" -#: templates/web/base/report/new/fill_in_details_form.html:212 +#: templates/web/base/report/new/fill_in_details_form.html:193 msgid "(we never show your email address or phone number)" msgstr "(vi viser aldri e-postadressa di eller telefonnummeret ditt)" @@ -156,14 +158,13 @@ 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:635 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:662 -#: perllib/FixMyStreet/DB/Result/Problem.pm:393 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Vel ein kategori --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 -#: perllib/FixMyStreet/DB/Result/Problem.pm:399 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:630 +#: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Vel ein eigedomstype --" @@ -175,40 +176,7 @@ msgid "" " Maybe add some <code>MAPIT_TYPES</code> to your config file?" msgstr "" -#: templates/web/base/questionnaire/completed.html:20 -msgid "<p style=\"font-size:150%\">Thank you very much for filling in our questionnaire; glad to hear it’s been fixed.</p>" -msgstr "<p style=\"font-size:150%\">Tusen takk for at du fylte ut spørjeskjemaet vårt. Vi er glade for å høyra at problemet ditt er løyst.</p>" - -#: templates/web/fiksgatami/questionnaire/completed-open.html:1 -msgid "" -"<p style=\"font-size:150%\">We’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’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/base/questionnaire/completed-open.html:6 -msgid "" -"<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" -"suggestions: why not try writing to your local representatives or, if\n" -"it’s a problem that could be fixed by local people working together, why\n" -"not <a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n" -"</p>" -msgstr "" - -#: templates/web/base/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>Tusen takk for at du fylte ut spørjeskjemaet vårt. Viss du får meir\n" -"informasjon om status for problemet ditt, ver så snill og kom tilbake\n" -"til nettstaden og legg igjen ei oppdatering.</p>" - -#: templates/web/base/around/_report_banner.html:4 +#: templates/web/base/around/_report_banner.html:3 #: templates/web/base/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>" @@ -235,7 +203,7 @@ msgstr "" msgid "<strong>No</strong>, I do not, let me sign in by email:" msgstr "<strong>Nei</strong>, det gjer eg ikkje. La meg logga inn med e-post:" -#: templates/web/base/report/new/fill_in_details_form.html:163 +#: templates/web/base/report/new/fill_in_details_form.html:144 msgid "<strong>No</strong>, let me confirm my report by email:" msgstr "<strong>Nei</strong>, la meg stadfesta rapporten min med e-post:" @@ -243,13 +211,8 @@ msgstr "<strong>Nei</strong>, la meg stadfesta rapporten min med e-post:" msgid "<strong>No</strong>, let me confirm my update by email:" msgstr "<strong>Nei</strong>, la meg stadfesta oppdateringa mi med e-post:" -#: templates/web/base/tokens/confirm_problem.html:19 -#: templates/web/base/tokens/confirm_problem.html:20 -msgid "<strong>We will now send it to the council</strong>." -msgstr "" - #: templates/web/base/auth/general.html:37 -#: templates/web/base/report/new/fill_in_details_form.html:141 +#: templates/web/base/report/new/fill_in_details_form.html:122 #: templates/web/base/report/update-form.html:95 #: templates/web/fixmystreet/auth/general.html:37 #: templates/web/fixmystreet/auth/general.html:39 @@ -263,8 +226,8 @@ msgstr "<strong>Ja</strong>, eg har eit passord" msgid "About us" msgstr "Om oss" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:39 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:52 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:31 #: templates/web/fixmystreet/report/update-form.html:28 @@ -280,26 +243,26 @@ msgid "" " categories of problem) to each body." msgstr "" -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/body.html:56 msgid "Add a contact using the form below." msgstr "" #: templates/web/base/admin/bodies.html:74 -#: templates/web/base/admin/body-form.html:233 +#: templates/web/base/admin/body-form.html:240 #: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "" -#: templates/web/base/admin/body.html:108 +#: templates/web/base/admin/body.html:116 #: templates/web/zurich/admin/body.html:31 msgid "Add new category" msgstr "Legg til ny kategori" -#: templates/web/base/admin/users.html:45 +#: templates/web/base/admin/users.html:47 msgid "Add user" msgstr "" -#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:70 +#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:52 msgid "Added %s" msgstr "La til %s" @@ -326,9 +289,7 @@ msgstr "Send meg varsel ved framtidige oppdateringar" msgid "All Reports" msgstr "" -#: templates/web/base/footer.html:11 templates/web/fiksgatami/footer.html:23 -#: templates/web/fiksgatami/nn/footer.html:23 -#: templates/web/fixmystreet/footer.html:26 +#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:26 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:19 @@ -345,19 +306,9 @@ 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/base/report/new/councils_text_all.html:12 -#: templates/web/base/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/base/report/new/councils_text_all.html:5 -#: templates/web/base/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/base/report/new/councils_text_all.html:19 -#: templates/web/base/report/new/councils_text_all.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:13 +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_all.html:4 +#: templates/web/base/report/new/fill_in_details_form.html:12 #: templates/web/base/report/new/fill_in_details_form.html:14 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 @@ -374,7 +325,7 @@ msgstr "Ei oppdatering markerte dette problemet som løyst." msgid "Anonymous" msgstr "Anonym" -#: templates/web/base/admin/report_edit.html:62 +#: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:23 msgid "Anonymous:" msgstr "Anonym:" @@ -383,18 +334,18 @@ msgstr "Anonym:" msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?" msgstr "" -#: templates/web/fiksgatami/front/footer-marketing.html:14 #: templates/web/fixmystreet/front/footer-marketing.html:16 msgid "Are you a developer?" msgstr "" #: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 msgid "Area covered" msgstr "" #: templates/web/base/admin/bodies.html:15 -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/body.html:60 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "" @@ -412,7 +363,7 @@ msgstr "" msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:163 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:165 #: templates/web/zurich/report/updates.html:11 msgid "Assigned to %s" msgstr "" @@ -425,7 +376,7 @@ msgstr "På det meste vert %d førespurnader returnert i kvar spørring. Dei ret msgid "At the moment only searching for and looking at reports work." msgstr "For augneblunken går det berre an å søkja etter og å sjå på rapportar." -#: perllib/FixMyStreet/DB/Result/Problem.pm:348 +#: perllib/FixMyStreet/DB/Result/Problem.pm:373 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "" @@ -438,8 +389,8 @@ msgstr "" msgid "Ban email address" msgstr "Bannlys e-postadresse" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:297 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:301 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" msgstr "" @@ -450,6 +401,7 @@ msgstr "" msgid "Body" msgstr "" +#: templates/web/base/admin/report_edit.html:34 #: templates/web/base/admin/user-form.html:32 msgid "Body:" msgstr "" @@ -462,16 +414,15 @@ msgstr "På dato" msgid "Can't see the map? <em>Skip this step</em>" msgstr "" -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:55 #: templates/web/base/report/new/category.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:53 +#: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 #: templates/web/zurich/admin/stats.html:50 -#: templates/web/zurich/report/new/fill_in_details_form.html:50 msgid "Category" msgstr "Kategori" @@ -479,17 +430,16 @@ msgstr "Kategori" msgid "Category fix rate for problems > 4 weeks old" msgstr "Løysingsrate fordelt på kategori for problem > 4 veker gamle" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:138 #: templates/web/base/admin/category_edit.html:23 -#: templates/web/base/admin/report_edit.html:61 -#: templates/web/base/report/new/fill_in_details_form.html:68 +#: templates/web/base/admin/report_edit.html:74 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/report_edit-sdm.html:42 #: templates/web/zurich/admin/report_edit.html:140 msgid "Category:" msgstr "Kategori:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:377 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383 msgid "Category: %s" msgstr "Kategori: %s" @@ -500,19 +450,19 @@ msgstr "Kategori: %s" msgid "Change password" msgstr "Byt passord" -#: templates/web/base/admin/body.html:152 +#: templates/web/base/admin/body.html:160 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/base/admin/body.html:163 +#: templates/web/base/admin/body.html:171 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/base/admin/body.html:183 +#: templates/web/base/admin/body.html:191 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -523,7 +473,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:122 +#: templates/web/base/admin/body.html:130 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." @@ -539,16 +489,16 @@ msgstr "" msgid "Click map to report a problem" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:45 -#: templates/web/base/admin/report_edit.html:47 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:58 +#: templates/web/base/admin/report_edit.html:60 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/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:95 #: templates/web/zurich/admin/report_edit.html:97 #: templates/web/zurich/admin/stats.html:31 @@ -556,11 +506,12 @@ msgstr "" msgid "Closed" msgstr "Lukka" -#: perllib/FixMyStreet/DB/Result/Problem.pm:762 +#: perllib/FixMyStreet/DB/Result/Problem.pm:771 msgid "Closed by council" msgstr "(ikkje rapportert til administrasjonen)" -#: templates/web/base/my/my.html:40 templates/web/fixmystreet/my/my.html:46 +#: templates/web/base/my/my.html:40 +#: templates/web/fixmystreet/my/_problem-list.html:12 msgid "Closed reports" msgstr "Lukka rapportar" @@ -568,7 +519,7 @@ msgstr "Lukka rapportar" msgid "Closed:" msgstr "Lukka:" -#: templates/web/base/around/tabbed_lists.html:11 +#: templates/web/base/around/tabbed_lists.html:10 #: templates/web/base/around/tabbed_lists.html:12 msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "Dei næraste problema <small>(innanfor %skm)</small>" @@ -583,26 +534,26 @@ msgstr "Koordinatar:" msgid "Cobrand" msgstr "Merkevaresamarbeid" -#: templates/web/base/admin/report_edit.html:75 +#: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:50 msgid "Cobrand data:" msgstr "Data om merkevaresamarbeid:" -#: templates/web/base/admin/report_edit.html:74 +#: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:49 msgid "Cobrand:" msgstr "Merkevaresamarbeid:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" -#: templates/web/base/admin/category_edit.html:47 +#: templates/web/base/admin/category_edit.html:52 msgid "Configure Endpoint" msgstr "" -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/body.html:72 msgid "Confirm" msgstr "Stadfest" @@ -623,10 +574,10 @@ msgstr "" msgid "Confirmation" msgstr "Stadfesting" -#: templates/web/base/admin/body.html:158 -#: templates/web/base/admin/body.html:71 -#: templates/web/base/admin/category_edit.html:32 -#: templates/web/base/admin/category_edit.html:84 +#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/category_edit.html:37 +#: templates/web/base/admin/category_edit.html:89 #: templates/web/zurich/admin/stats.html:40 msgid "Confirmed" msgstr "Stadfesta" @@ -637,7 +588,7 @@ msgstr "" #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 -#: templates/web/base/admin/report_edit.html:70 +#: templates/web/base/admin/report_edit.html:83 msgid "Confirmed:" msgstr "Stadfesta:" @@ -654,13 +605,12 @@ msgid "Contact Us" msgstr "Kontakt oss" #: templates/web/base/contact/index.html:6 -#: templates/web/base/contact/submit.html:3 #: templates/web/fixmystreet/contact/index.html:20 msgid "Contact the team" msgstr "Kontakt prosjektgruppa" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1327 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1355 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1325 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1353 msgid "Could not find user" msgstr "Kunne ikkje finna brukaren" @@ -678,6 +628,10 @@ msgstr "Administrasjon" msgid "Council contacts for %s" msgstr "Administrasjonskontaktar for %s" +#: perllib/FixMyStreet/DB/Result/Problem.pm:670 +msgid "Council ref: %s" +msgstr "" + #: templates/web/base/admin/stats.html:84 msgid "Council:" msgstr "Administrasjon:" @@ -693,7 +647,7 @@ msgstr "Mengd" msgid "Create a report" msgstr "Lag ein rapport" -#: templates/web/base/admin/body.html:200 +#: templates/web/base/admin/body.html:208 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Lag kategori" @@ -705,7 +659,7 @@ msgid "Created" msgstr "Oppretta" #: templates/web/base/admin/list_updates.html:38 -#: templates/web/base/admin/report_edit.html:69 +#: templates/web/base/admin/report_edit.html:82 #: templates/web/base/admin/update_edit.html:51 #: templates/web/zurich/admin/report_edit-sdm.html:47 #: templates/web/zurich/admin/report_edit.html:61 @@ -722,7 +676,7 @@ msgstr "Gjeldande tilstand" msgid "Currently no bodies have been created." msgstr "" -#: templates/web/base/dashboard/index.html:6 +#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 msgid "Dashboard" msgstr "" @@ -732,14 +686,14 @@ msgid "Dealt with by subdivision within 5 working days" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:169 -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:37 -#: templates/web/base/admin/category_edit.html:85 +#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:81 +#: templates/web/base/admin/category_edit.html:42 +#: templates/web/base/admin/category_edit.html:90 msgid "Deleted" msgstr "Sletta" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:43 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -759,7 +713,7 @@ msgstr "" msgid "Details:" msgstr "Detaljar:" -#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/body.html:87 msgid "Devolved" msgstr "" @@ -787,8 +741,8 @@ msgstr "Veit ikkje" msgid "Don't like forms?" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:47 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:60 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:32 #: templates/web/fixmystreet/report/update-form.html:28 @@ -796,7 +750,7 @@ msgstr "" msgid "Duplicate" msgstr "" -#: templates/web/base/admin/body.html:98 +#: templates/web/base/admin/body.html:106 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" @@ -806,20 +760,20 @@ msgstr "" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 -#: templates/web/base/admin/users.html:31 +#: templates/web/base/admin/users.html:33 #: templates/web/zurich/admin/problem_row.html:42 msgid "Edit" msgstr "Rediger" -#: templates/web/base/admin/body.html:212 +#: templates/web/base/admin/body.html:220 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "" #: templates/web/base/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:2 +#: 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:2 +#: templates/web/zurich/admin/report_edit.html:1 #: templates/web/zurich/admin/report_edit.html:5 msgid "Editing problem %d" msgstr "Rediger problem %d" @@ -833,12 +787,12 @@ msgstr "Redigerer oppdatering %d" msgid "Editing user %d" msgstr "Redigerer brukar %d" -#: templates/web/base/admin/category_edit.html:86 +#: templates/web/base/admin/category_edit.html:91 msgid "Editor" msgstr "Oppdatert av" #: templates/web/base/admin/bodies.html:23 -#: templates/web/base/admin/category_edit.html:83 +#: templates/web/base/admin/category_edit.html:88 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 #: templates/web/fixmystreet/auth/general.html:21 @@ -849,15 +803,23 @@ msgstr "Oppdatert av" msgid "Email" msgstr "E-post" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1303 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1301 msgid "Email added to abuse list" msgstr "E-post lagd til misbrukliste" -#: templates/web/base/admin/body.html:147 +#: templates/web/base/admin/body.html:155 msgid "Email address:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1300 +#: templates/web/base/tokens/confirm_alert.html:6 +msgid "Email alert created" +msgstr "" + +#: templates/web/base/tokens/confirm_alert.html:10 +msgid "Email alert deleted" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1298 msgid "Email already in abuse list" msgstr "E-post allereie i misbruklista" @@ -869,8 +831,8 @@ msgstr "Send meg e-post om lokale problem" msgid "Email me updates" msgstr "Send meg oppdateringar" -#: templates/web/base/admin/category_edit.html:26 -#: templates/web/base/admin/report_edit.html:67 +#: templates/web/base/admin/category_edit.html:31 +#: templates/web/base/admin/report_edit.html:80 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 @@ -881,32 +843,32 @@ msgstr "Send meg oppdateringar" msgid "Email:" msgstr "E-post:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:322 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 msgid "Email: %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 msgid "Empty flat or maisonette" msgstr "Tom leilegheit" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:631 msgid "Empty house or bungalow" msgstr "Tomt hus eller bungalow" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:622 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty office or other commercial" msgstr "Tomt kontor eller forretningsbygg" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:623 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Empty pub or bar" msgstr "Tom pub eller bar" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:624 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty public building - school, hospital, etc." msgstr "Tom offentleg bygning – skule, sjukehus, osb." -#: templates/web/base/admin/body-form.html:158 -#: templates/web/base/admin/body-form.html:159 +#: templates/web/base/admin/body-form.html:162 +#: templates/web/base/admin/body-form.html:163 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" @@ -914,8 +876,8 @@ msgid "" " <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>." msgstr "" -#: templates/web/base/admin/body-form.html:215 -#: templates/web/base/admin/body-form.html:216 +#: templates/web/base/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:223 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" @@ -926,11 +888,11 @@ msgstr "" msgid "End Date:" msgstr "" -#: templates/web/base/admin/body-form.html:126 +#: templates/web/base/admin/body-form.html:130 msgid "Endpoint" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:72 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:73 msgid "Enter a Zürich street name" msgstr "" @@ -943,7 +905,9 @@ msgstr "" msgid "Enter a nearby postcode, or street name and area" msgstr "Skriv inn postnummer i nærleiken, eller vegnamn og stad" +#: templates/web/base/around/postcode_form.html:1 #: templates/web/base/around/postcode_form.html:2 +#: templates/web/fixmystreet/around/postcode_form.html:10 #: templates/web/fixmystreet/around/postcode_form.html:11 msgid "Enter a nearby street name and area" msgstr "" @@ -953,7 +917,7 @@ msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "" #: templates/web/base/auth/general.html:64 -#: templates/web/base/report/new/fill_in_details_form.html:170 +#: templates/web/base/report/new/fill_in_details_form.html:151 #: templates/web/base/report/update-form.html:124 msgid "Enter a new password:" msgstr "Skriv inn eit nytt passord:" @@ -965,7 +929,7 @@ msgstr "Skriv inn eit nytt passord:" msgid "Enter a password" msgstr "Enter a password" -#: templates/web/base/index-steps.html:33 +#: templates/web/base/index-steps.html:26 msgid "Enter details of the problem" msgstr "Legg inn detaljar om problemet" @@ -988,17 +952,22 @@ msgstr "Postnummerdøme %s" msgid "Examples:" msgstr "Døme:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:47 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" -#: templates/web/base/admin/report_edit.html:76 +#: templates/web/base/admin/body-form.html:81 +msgid "External URL" +msgstr "" + +#: templates/web/base/admin/category_edit.html:27 +#: templates/web/base/admin/report_edit.html:92 msgid "Extra data:" msgstr "" -#: templates/web/base/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>." +#: templates/web/base/contact/submit.html:13 +msgid "Failed to send message" +msgstr "" #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 @@ -1010,7 +979,7 @@ msgstr "" msgid "First time" msgstr "Første gong" -#: templates/web/base/admin/body.html:40 +#: templates/web/base/admin/body.html:48 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" @@ -1043,9 +1012,9 @@ msgid "" msgstr "FiksGataMi sender ulike kategoriar problem til ulike administrasjonar, problem som gjeld fleire administrasjonar vert send til alle dei det gjeld." #: templates/web/base/admin/index.html:55 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:41 -#: templates/web/base/admin/report_edit.html:42 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:54 +#: templates/web/base/admin/report_edit.html:55 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/update-form.html:30 @@ -1056,17 +1025,18 @@ msgstr "FiksGataMi sender ulike kategoriar problem til ulike administrasjonar, p msgid "Fixed" msgstr "Løyst" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:43 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:56 msgid "Fixed - Council" msgstr "Løyst – Administrasjon" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:42 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:55 msgid "Fixed - User" msgstr "Løyst – Brukar" -#: templates/web/base/my/my.html:35 templates/web/fixmystreet/my/my.html:41 +#: templates/web/base/my/my.html:35 +#: templates/web/fixmystreet/my/_problem-list.html:7 msgid "Fixed reports" msgstr "Løyste rapportar" @@ -1074,7 +1044,7 @@ msgstr "Løyste rapportar" msgid "Fixed:" msgstr "Løyst:" -#: templates/web/base/admin/body-form.html:84 +#: templates/web/base/admin/body-form.html:89 #: templates/web/zurich/admin/body-form.html:36 msgid "Flag as deleted" msgstr "" @@ -1083,7 +1053,7 @@ msgstr "" msgid "Flag user" msgstr "Flagg brukar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Flagga:" @@ -1092,7 +1062,7 @@ msgstr "Flagga:" msgid "Flagged reports and users" msgstr "" -#: templates/web/base/admin/user-form.html:45 +#: templates/web/base/admin/user-form.html:46 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page." msgstr "" @@ -1100,8 +1070,8 @@ msgstr "" msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." msgstr "" -#: templates/web/base/admin/report_edit.html:78 -#: templates/web/base/admin/user-form.html:51 +#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/user-form.html:52 msgid "Flagged:" msgstr "Flagga:" @@ -1110,10 +1080,6 @@ msgstr "Flagga:" msgid "Follow a ward link to view only reports within that ward." msgstr "Følg ei bydellenkje for å berre sjå rapportar innanfor den bydelen." -#: templates/web/base/admin/report_edit.html:30 -msgid "For council(s):" -msgstr "For administrasjon(ane):" - #: templates/web/base/admin/body-form.html:65 msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "" @@ -1126,8 +1092,6 @@ msgstr "" #: templates/web/base/faq/faq-en-gb.html:1 #: templates/web/base/static/privacy.html:1 #: templates/web/base/static/privacy.html:2 -#: templates/web/fiksgatami/faq/faq-nb.html:1 -#: templates/web/fiksgatami/nn/faq/faq-nn.html:1 msgid "Frequently Asked Questions" msgstr "Ofte spurde spurnader" @@ -1140,13 +1104,13 @@ msgstr "GeoRSS på Google Maps" msgid "Get updates" msgstr "" -#: templates/web/fixmystreet/reports/_rss.html:4 +#: templates/web/fixmystreet/reports/_rss.html:3 #: 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 +#: templates/web/fixmystreet/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "" @@ -1155,6 +1119,10 @@ msgstr "" msgid "Give me an RSS feed" msgstr "Gje meg ein RSS-straum" +#: templates/web/base/questionnaire/completed.html:14 +msgid "Glad to hear it’s been fixed!" +msgstr "" + #: templates/web/base/alert/index.html:34 #: templates/web/base/around/postcode_form.html:8 #: templates/web/fixmystreet/around/postcode_form.html:21 @@ -1162,7 +1130,7 @@ msgstr "Gje meg ein RSS-straum" msgid "Go" msgstr "Hald fram" -#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:93 msgid "Going to send questionnaire?" msgstr "Skal spørjeskjemaet sendast?" @@ -1184,9 +1152,7 @@ msgstr "Har dette problemet vorte løyst?" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "Har du rapportert eit problem til ein administrasjon før, eller er dette første gongen?" -#: templates/web/base/footer.html:15 templates/web/fiksgatami/footer.html:27 -#: templates/web/fiksgatami/nn/footer.html:27 -#: templates/web/fixmystreet/footer.html:30 +#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:30 #: templates/web/zurich/faq/faq-de-ch.html:1 #: templates/web/zurich/footer.html:21 #: templates/web/zurich/nav_over_content.html:8 @@ -1198,18 +1164,17 @@ msgstr "Hjelp" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "Her er dei ulike typane lokale problemvarsel for «%s»." -#: templates/web/fiksgatami/header.html:48 -#: templates/web/fixmystreet/header.html:52 +#: templates/web/fixmystreet/header.html:58 #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:50 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:63 +#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/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:86 #: templates/web/zurich/admin/report_edit.html:90 #: templates/web/zurich/admin/stats.html:32 @@ -1225,7 +1190,7 @@ msgstr "" msgid "Hide pins" msgstr "Skjul nåler" -#: templates/web/base/admin/category_edit.html:79 +#: templates/web/base/admin/category_edit.html:84 msgid "History" msgstr "Historie" @@ -1241,19 +1206,25 @@ msgstr "Korleis rapportera eit problem" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:740 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Eg er redd du ikkje kan stadfesta ustadfesta rapportar." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:89 +#: templates/web/base/tokens/confirm_problem.html:23 +#: templates/web/base/tokens/confirm_problem.html:27 +msgid "I just reported a problem on @fixmystreet" +msgstr "" + +#: templates/web/base/tokens/confirm_update.html:19 +#: templates/web/base/tokens/confirm_update.html:23 +msgid "I just updated a problem on @fixmystreet" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Eg er redd vi ikkje klarte å finna problemet ditt i databasen.\n" -#: 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 "Eg er redd vi ikkje kunne verifisera den referansen, då det er for lenge sidan rapporten vart laga." - -#: perllib/FixMyStreet/App/Controller/Tokens.pm:260 +#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 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" @@ -1275,7 +1246,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:125 +#: templates/web/base/admin/body.html:133 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." @@ -1293,7 +1264,12 @@ msgstr "" msgid "If you do not, your update will not be posted." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:9 +#: templates/web/base/questionnaire/completed.html:8 +msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." +msgstr "" + +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:8 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." @@ -1312,34 +1288,34 @@ msgstr "" "(denne vert ikkje send til administrasjonen). Du kan til dømes\n" "dela røynsla di med korleis problemet ditt vart løyst." -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/body.html:149 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/base/admin/body-form.html:200 -#: templates/web/base/admin/body-form.html:201 +#: templates/web/base/admin/body-form.html:207 +#: templates/web/base/admin/body-form.html:208 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable <strong>extended Open311 stauses</strong> if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/body-form.html:187 -#: templates/web/base/admin/body-form.html:188 +#: templates/web/base/admin/body-form.html:194 +#: templates/web/base/admin/body-form.html:195 msgid "" "If you've enabled Open311 update-sending above, enable <strong>suppression of alerts</strong> \n" " if you do <strong>not</strong> want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/body-form.html:173 -#: templates/web/base/admin/body-form.html:174 +#: templates/web/base/admin/body-form.html:177 +#: templates/web/base/admin/body-form.html:178 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:127 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 msgid "Illegal ID" msgstr "Ugyldig ID" @@ -1364,17 +1340,21 @@ msgstr "" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "I tillegg er følgjande attributt som ikkje er del av Open311 v2-spesifikasjonen returnert: agency_sent_datetime, title (òg returnert som del av description), interface_used, comment_count, requestor_name (berre tilstades viss innsendar tillét at namnet kunne visast på denne nettstaden)." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:38 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:144 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 #: templates/web/fixmystreet/report/banner.html:19 -#: templates/web/zurich/admin/header.html:2 +#: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 #: templates/web/zurich/admin/report_edit.html:99 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "" +#: templates/web/base/tokens/confirm_alert.html:11 +msgid "Inbox zero, here we come!" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:160 msgid "Include reporter personal details" msgstr "" @@ -1383,7 +1363,7 @@ msgstr "" msgid "Include unconfirmed reports" msgstr "Inkluder ikkje-stadfesta problem" -#: perllib/FixMyStreet/App/Controller/Open311.pm:354 +#: perllib/FixMyStreet/App/Controller/Open311.pm:359 msgid "Incorrect has_photo value \"%s\"" msgstr "Feil has_photo-verdi «%s»" @@ -1391,29 +1371,29 @@ msgstr "Feil has_photo-verdi «%s»" msgid "Internal notes" msgstr "" -#: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:61 msgid "Internal referral" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:339 +#: perllib/FixMyStreet/App/Controller/Open311.pm:344 msgid "Invalid agency_responsible value %s" msgstr "Ugyldig agency_responsible-verdi %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1114 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1112 msgid "Invalid end date" msgstr "Ugyldig slutt-dato" -#: perllib/FixMyStreet/App/Controller/Open311.pm:432 +#: perllib/FixMyStreet/App/Controller/Open311.pm:437 msgid "Invalid format %s specified." msgstr "Ugyldig format %s oppgjeve." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1110 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 msgid "Invalid start date" msgstr "Ugyldig startdato" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:37 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:50 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 #: templates/web/base/report/update-form.html:30 @@ -1427,8 +1407,12 @@ msgstr "Undersøkjer" msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "" +#: templates/web/base/tokens/confirm_problem.html:14 +msgid "It’s on its way to the council right now." +msgstr "" + #: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:150 +#: templates/web/base/report/new/fill_in_details_form.html:131 #: templates/web/base/report/update-form.html:104 #: templates/web/fixmystreet/auth/general.html:47 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 @@ -1437,12 +1421,12 @@ msgstr "" msgid "Keep me signed in on this computer" msgstr "Hugs mi innlogging på denne datamaskina" -#: templates/web/base/admin/body.html:62 +#: templates/web/base/admin/body.html:70 #: templates/web/zurich/admin/body.html:16 msgid "Last editor" msgstr "Sist redigert av" -#: templates/web/base/admin/report_edit.html:72 +#: templates/web/base/admin/report_edit.html:88 msgid "Last update:" msgstr "Siste oppdatering:" @@ -1450,43 +1434,38 @@ msgstr "Siste oppdatering:" msgid "Last update:" msgstr "Siste oppdatering:" -#: templates/web/base/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:229 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "" -#: templates/web/base/admin/body.html:17 templates/web/base/admin/body.html:19 +#: templates/web/base/admin/body.html:27 msgid "List all reported problems" msgstr "Vis alle rapporterte problem" -#: templates/web/base/report/new/fill_in_details_form.html:69 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:54 -#: templates/web/zurich/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/category_wrapper.html:4 msgid "Loading..." msgstr "Lastar …" #: templates/web/base/alert/choose.html:1 #: templates/web/base/alert/choose.html:3 #: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3 -#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:5 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5 #: templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 -#: templates/web/base/tokens/confirm_alert.html:4 #: templates/web/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "Lokal RSS-straum og e-postvarsel" -#: templates/web/base/alert/list.html:13 templates/web/base/alert/list.html:14 -#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:3 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:12 +#: templates/web/base/alert/list.html:14 templates/web/base/alert/list.html:3 msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Lokal RSS-straum og e-postvarsel for «%s»" -#: templates/web/base/footer.html:13 templates/web/fiksgatami/footer.html:25 -#: templates/web/fiksgatami/nn/footer.html:25 -#: templates/web/fixmystreet/footer.html:28 +#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:28 msgid "Local alerts" msgstr "Lokale varsel" -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:25 msgid "Locate the problem on a map of the area" msgstr "Lokaliser problemet på kartet over området" @@ -1495,17 +1474,26 @@ msgid "MAP" msgstr "" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" msgstr "" -#: perllib/FixMyStreet/Map/OSM.pm:42 -msgid "Map © <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 "Kart © <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> og bidragsytarar, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA</a>" +#: templates/web/base/admin/report_edit.html:86 +msgid "Mark as sent" +msgstr "" -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/user-form.html:44 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." msgstr "" +#: templates/web/base/reports/index.html:24 +msgid "Marked fixed/closed in the past eight weeks" +msgstr "" + +#: templates/web/base/reports/index.html:25 +msgid "Marked fixed/closed more than eight weeks ago" +msgstr "" + #: templates/web/fixmystreet/contact/index.html:106 msgid "Message" msgstr "" @@ -1514,7 +1502,7 @@ msgstr "" msgid "Message:" msgstr "Melding:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:440 +#: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" msgstr "Manglar jurisdiction_id" @@ -1544,11 +1532,11 @@ msgstr "Fleire problem i nærleiken" #: templates/web/fixmystreet/report/update-form.html:138 #: 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:94 +#: templates/web/zurich/report/new/fill_in_details_form.html:77 msgid "Name" msgstr "Namn" -#: templates/web/base/admin/report_edit.html:66 +#: templates/web/base/admin/report_edit.html:79 #: templates/web/base/admin/update_edit.html:32 #: templates/web/base/admin/user-form.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:43 @@ -1557,25 +1545,25 @@ msgstr "Namn" msgid "Name:" msgstr "Namn:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:321 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:313 msgid "Name: %s" msgstr "" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:186 -#: perllib/FixMyStreet/Geocode/OSM.pm:164 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 +#: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "Næraste namngjevne veg til nålen plassert på kartet (automatisk generert ved hjelp av OpenStreetMap): %s%s" -#: perllib/FixMyStreet/Cobrand/UK.pm:137 +#: perllib/FixMyStreet/Cobrand/UK.pm:127 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:421 -#: perllib/FixMyStreet/Cobrand/Default.pm:461 +#: perllib/FixMyStreet/Cobrand/Default.pm:442 +#: perllib/FixMyStreet/Cobrand/Default.pm:482 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:288 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:277 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1589,11 +1577,11 @@ msgstr "Nesten ferdig! No må du sjekka e-posten din …" msgid "New <br>problems" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:264 +#: perllib/FixMyStreet/App/Controller/Admin.pm:261 msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:379 msgid "New category contact added" msgstr "Ny kategorikontakt lagt til" @@ -1666,15 +1654,15 @@ msgstr "" msgid "Next" msgstr "" -#: templates/web/base/admin/body.html:72 templates/web/base/admin/body.html:74 -#: templates/web/base/admin/body.html:78 templates/web/base/admin/body.html:80 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:93 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:44 @@ -1692,7 +1680,7 @@ msgstr "" msgid "No council" msgstr "Ingen administrasjon" -#: perllib/FixMyStreet/DB/Result/Problem.pm:376 +#: perllib/FixMyStreet/DB/Result/Problem.pm:401 msgid "No council selected" msgstr "Ingen administrasjon er vald" @@ -1733,12 +1721,12 @@ msgid "" " your config file is not pointing to a live MapIt service." msgstr "" -#: templates/web/base/report/_support.html:3 +#: templates/web/base/report/_support.html:2 #: templates/web/base/report/_support.html:4 msgid "No supporters" msgstr "" -#: templates/web/base/admin/report_edit.html:30 +#: templates/web/base/admin/report_edit.html:41 #: templates/web/zurich/admin/report_edit-sdm.html:46 #: templates/web/zurich/admin/report_edit.html:60 msgid "None" @@ -1753,8 +1741,8 @@ msgid "" " activity across their body), the ability to hide reports or set special report statuses." msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:46 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -1770,12 +1758,12 @@ msgstr "" msgid "Not reported before" msgstr "Ikkje rapportert tidlegare" -#: templates/web/base/report/_main.html:61 +#: templates/web/base/report/_main.html:62 msgid "Not reported to council" msgstr "Ikkje rapportert til administrasjonen" -#: templates/web/base/admin/body.html:63 -#: templates/web/base/admin/category_edit.html:87 +#: templates/web/base/admin/body.html:71 +#: templates/web/base/admin/category_edit.html:92 #: templates/web/zurich/admin/body.html:17 msgid "Note" msgstr "Merk" @@ -1784,8 +1772,8 @@ msgstr "Merk" 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 "Merk at når vi tek med ustadfesta rapportar, så brukar vi datoen rapporten var oppretta. Det treng vera den same månaden som rapporten var stadfesta, så tala kan hoppa litt opp og ned." -#: templates/web/base/admin/body.html:178 -#: templates/web/base/admin/category_edit.html:44 +#: templates/web/base/admin/body.html:186 +#: templates/web/base/admin/category_edit.html:49 #: templates/web/zurich/admin/body.html:53 msgid "Note:" msgstr "Merk:" @@ -1798,7 +1786,7 @@ msgstr "Merk: <strong>%s</strong>" msgid "Now to submit your report…" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:132 +#: templates/web/base/report/new/fill_in_details_form.html:113 msgid "Now to submit your report… do you have a FixMyStreet password?" msgstr "På tide å senda rapporten din, har du eit FiksGataMi-passord?" @@ -1815,7 +1803,7 @@ msgid "OK" msgstr "" #: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:16 +#: templates/web/base/report/update.html:17 msgid "Offensive? Unsuitable? Tell us" msgstr "Støytande? Upassende? Sei frå" @@ -1835,19 +1823,19 @@ msgstr "" msgid "Older <br>problems" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:37 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 msgid "One-line summary" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:137 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:36 -#: templates/web/base/admin/report_edit.html:37 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:138 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:49 +#: templates/web/base/admin/report_edit.html:50 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/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:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/report_edit.html:86 #: templates/web/zurich/admin/report_edit.html:88 @@ -1856,10 +1844,19 @@ msgstr "" msgid "Open" msgstr "Opne" -#: templates/web/base/my/my.html:30 templates/web/fixmystreet/my/my.html:36 +#: templates/web/base/reports/index.html:22 +msgid "Open for more than four weeks, with an update within the past eight weeks" +msgstr "" + +#: templates/web/base/my/my.html:30 +#: templates/web/fixmystreet/my/_problem-list.html:2 msgid "Open reports" msgstr "Opne rapportar" +#: templates/web/base/reports/index.html:23 +msgid "Open, but not had any update in eight weeks" +msgstr "" + #: templates/web/base/open311/index.html:70 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "Open311-API for mySocietys FiksGataMi-tenar" @@ -1882,15 +1879,15 @@ msgstr "Eller problem meldt til:" msgid "Or you can subscribe to an alert based upon what ward or council you’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:1057 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:662 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:663 -#: perllib/FixMyStreet/DB/Result/Problem.pm:560 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 -#: perllib/FixMyStreet/DB/Result/Problem.pm:592 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:372 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 +#: perllib/FixMyStreet/DB/Result/Problem.pm:597 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:393 msgid "Other" msgstr "Anna" @@ -1912,8 +1909,8 @@ msgstr "Fann ikkje sida" msgid "Parent" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 msgid "Partial" msgstr "Delvis" @@ -1933,7 +1930,7 @@ msgstr "Passord:" msgid "Permalink" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:100 +#: templates/web/zurich/report/new/fill_in_details_form.html:83 msgid "Phone number" msgstr "" @@ -1942,27 +1939,27 @@ msgstr "" msgid "Phone number (optional)" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:286 -#: templates/web/base/admin/report_edit.html:68 -#: templates/web/base/report/new/fill_in_details_form.html:216 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:291 +#: templates/web/base/admin/report_edit.html:81 +#: templates/web/base/report/new/fill_in_details_form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:46 #: templates/web/zurich/admin/report_edit.html:60 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Telefon:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:72 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 #: 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 +#: templates/web/zurich/report/new/fill_in_details_form.html:51 msgid "Photo" msgstr "" #: templates/web/base/questionnaire/index.html:71 -#: templates/web/base/report/new/fill_in_details_form.html:103 +#: templates/web/base/report/new/fill_in_details_form.html:84 #: templates/web/base/report/update-form.html:62 #: templates/web/fixmystreet/questionnaire/index.html:91 msgid "Photo:" @@ -1976,11 +1973,11 @@ msgstr "Bilete av nye problem i nærleiken" msgid "Place pin on map" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:38 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/zurich/admin/header.html:2 +#: 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:86 @@ -2014,20 +2011,19 @@ msgstr "Ver venleg og sjekk e-posten du oppgav" msgid "Please check your email address is correct" msgstr "Ver venleg og sjekk at du har skrive ei gyldig e-postadresse" -#: perllib/FixMyStreet/App/Controller/Admin.pm:349 -#: 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:395 +#: perllib/FixMyStreet/App/Controller/Admin.pm:343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:876 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 +#: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" msgstr "Vel ein kategori" -#: perllib/FixMyStreet/DB/Result/Problem.pm:401 +#: perllib/FixMyStreet/DB/Result/Problem.pm:418 msgid "Please choose a property type" msgstr "Vel ein type eigenskap" -#: perllib/FixMyStreet/App/Controller/Admin.pm:376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:370 msgid "Please correct the errors below" msgstr "" @@ -2043,8 +2039,8 @@ msgstr "Ver venleg og <strong>ikkje</strong> rapporter feil gjennom denne sida; msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:352 -#: perllib/FixMyStreet/DB/Result/Comment.pm:133 +#: perllib/FixMyStreet/App/Controller/Admin.pm:346 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "Ver venleg og skriv ei melding" @@ -2055,15 +2051,15 @@ msgstr "Ver venleg og skriv ei melding" msgid "Please enter a password" msgstr "Skriv inn eit passord" -#: perllib/FixMyStreet/App/Controller/Contact.pm:108 -#: perllib/FixMyStreet/DB/Result/Problem.pm:370 +#: perllib/FixMyStreet/App/Controller/Contact.pm:113 +#: perllib/FixMyStreet/DB/Result/Problem.pm:395 #: templates/web/base/js/translation_strings.html:3 msgid "Please enter a subject" msgstr "Ver venleg og legg inn eit emne" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1050 -#: perllib/FixMyStreet/App/Controller/Admin.pm:351 -#: perllib/FixMyStreet/App/Controller/Admin.pm:997 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin.pm:995 #: perllib/FixMyStreet/DB/Result/User.pm:127 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 @@ -2071,16 +2067,16 @@ msgid "Please enter a valid email" msgstr "Ver venleg og legg til ein gyldig e-post" #: perllib/FixMyStreet/App/Controller/Alert.pm:346 -#: perllib/FixMyStreet/App/Controller/Contact.pm:118 +#: perllib/FixMyStreet/App/Controller/Contact.pm:123 msgid "Please enter a valid email address" msgstr "Ver venleg og legg inn e-postadressa di" -#: perllib/FixMyStreet/DB/Result/Problem.pm:373 +#: perllib/FixMyStreet/DB/Result/Problem.pm:398 #: templates/web/base/js/translation_strings.html:4 msgid "Please enter some details" msgstr "Ver venleg og legg inn opplysningar om problemet" -#: perllib/FixMyStreet/App/Controller/Contact.pm:107 +#: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/User.pm:124 #: templates/web/base/auth/general.html:13 #: templates/web/base/auth/general.html:8 @@ -2094,7 +2090,7 @@ msgid "Please enter your email" msgstr "Ver venleg og legg inn e-posten din" #: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:75 msgid "Please enter your email address" msgstr "" @@ -2102,14 +2098,14 @@ msgstr "" msgid "Please enter your first name" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: perllib/FixMyStreet/Cobrand/UK.pm:318 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:106 -#: perllib/FixMyStreet/DB/Result/Comment.pm:130 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Contact.pm:111 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 +#: perllib/FixMyStreet/DB/Result/Problem.pm:406 #: perllib/FixMyStreet/DB/Result/User.pm:120 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" @@ -2132,7 +2128,7 @@ msgstr "" msgid "Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a href=\"/\">front page</a>." msgstr "" -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/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." @@ -2149,7 +2145,7 @@ msgstr "" "Ver venleg og fyll inn skjemaet under med detaljane om problemet,\n" "og skildra plasseringa så nøyaktig som mogleg i boksen for detaljar." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:251 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Ver venleg og indiker om du ynskjer å motta eit nytt spørjeskjema" @@ -2175,16 +2171,16 @@ msgstr "Merk at rapporten din <strong>enno ikkje er send</strong. Vel ein kateg msgid "Please note:" msgstr "Merk:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:246 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:254 msgid "Please provide some explanation as to why you're reopening this report" msgstr "Ver venleg og bidra med ei forklaring på kvifor du gjenopnar denne problemrapporten" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:261 msgid "Please provide some text as well as a photo" msgstr "Ver venleg og bidra med litt tekst i tillegg til eit bilete" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:247 msgid "Please say whether you've ever reported a problem to your council before" msgstr "Ver venleg og opplys om du har rapportert eit problem til administrasjonen din tidlegare" @@ -2196,7 +2192,7 @@ msgstr "Vel den kjelda du ynskjer" msgid "Please select the type of alert you want" msgstr "Ver venleg og vel kva for ein type varsel du ynskjer" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please state whether or not the problem has been fixed" msgstr "Ver venleg og oppgje om dette problemet har vorte fiksa eller ikkje" @@ -2204,15 +2200,13 @@ msgstr "Ver venleg og oppgje om dette problemet har vorte fiksa eller ikkje" msgid "Please take a look at the updates that have been left." msgstr "Ver venleg og sjå over oppdateringane som er lagt inn." -#: perllib/FixMyStreet/App/Controller/Photo.pm:176 +#: perllib/FixMyStreet/App/Controller/Photo.pm:177 +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 +#: perllib/FixMyStreet/App/Controller/Photo.pm:189 msgid "Please upload a JPEG image only" msgstr "Ver venleg og berre last opp JPEG-bilete" -#: perllib/FixMyStreet/App/Controller/Photo.pm:183 -msgid "Please upload a JPEG image only\n" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Contact.pm:109 +#: perllib/FixMyStreet/App/Controller/Contact.pm:114 msgid "Please write a message" msgstr "Skriv inn ei melding" @@ -2251,14 +2245,14 @@ msgstr "" msgid "Privacy" msgstr "" -#: templates/web/base/admin/body.html:194 -#: templates/web/base/admin/body.html:77 -#: templates/web/base/admin/category_edit.html:40 -#: templates/web/base/admin/report_edit.html:79 +#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:85 +#: templates/web/base/admin/category_edit.html:45 +#: templates/web/base/admin/report_edit.html:95 msgid "Private" msgstr "" -#: templates/web/base/maps/openlayers.html:86 +#: templates/web/base/maps/openlayers.html:89 msgid "Problem" msgstr "Problem" @@ -2279,7 +2273,7 @@ msgstr "Problem %s sendt til administrasjon %s" msgid "Problem breakdown by state" msgstr "Tilstandsfordeling av problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:966 msgid "Problem marked as open." msgstr "Problem markert som ope." @@ -2314,16 +2308,15 @@ 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:629 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:114 +#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:151 -#: perllib/FixMyStreet/Cobrand/UK.pm:217 +#: perllib/FixMyStreet/Cobrand/UK.pm:207 msgid "Problems within %s" msgstr "Problem innanfor %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:122 -#: perllib/FixMyStreet/Cobrand/UK.pm:231 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "Problems within %s ward" msgstr "Problem innanfor %s bydel" @@ -2341,7 +2334,7 @@ msgstr "Problem innanfor grensene av:" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "Eigedomar nyleg rapportert som tilbake i bruk på reportemptyhomes.com" -#: templates/web/base/admin/report_edit.html:32 +#: templates/web/base/admin/report_edit.html:45 msgid "Property address:" msgstr "" @@ -2358,7 +2351,7 @@ 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/base/report/new/fill_in_details_form.html:174 +#: templates/web/base/report/new/fill_in_details_form.html:155 #: templates/web/base/report/update-form.html:128 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 #: templates/web/fixmystreet/report/update-form.html:119 @@ -2379,7 +2372,7 @@ msgstr "" msgid "Publish the response" msgstr "" -#: templates/web/base/questionnaire/completed.html:2 +#: templates/web/base/questionnaire/completed.html:1 #: templates/web/base/questionnaire/index.html:0 #: templates/web/base/questionnaire/index.html:14 #: templates/web/base/questionnaire/index.html:4 @@ -2398,11 +2391,12 @@ msgstr "Spørjeskjema %d fylt inn for problem %d, %s til %s" msgid "Questionnaire %d sent for problem %d" msgstr "Spørjeskjema %d sendt for problem %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 msgid "Questionnaire filled in by problem reporter" msgstr "Spørjeskjema fylt inn av feilrapportøren" #: templates/web/base/alert/_list.html:21 +#: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display.html:50 #: templates/web/base/reports/_rss.html:1 @@ -2412,11 +2406,11 @@ msgstr "Spørjeskjema fylt inn av feilrapportøren" msgid "RSS feed" msgstr "RSS-straum" -#: perllib/FixMyStreet/Cobrand/UK.pm:260 perllib/FixMyStreet/Cobrand/UK.pm:272 +#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 msgid "RSS feed for %s" msgstr "RSS-straum for %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "RSS feed for %s ward, %s" msgstr "RSS-straum for %s bydel, %s" @@ -2424,15 +2418,11 @@ msgstr "RSS-straum for %s bydel, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:167 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:175 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:185 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:193 -#: perllib/FixMyStreet/Cobrand/UK.pm:286 perllib/FixMyStreet/Cobrand/UK.pm:298 +#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 msgid "RSS feed of %s" msgstr "RSS-straum frå %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 msgid "RSS feed of %s, within %s ward" msgstr "RSS-straum av %s, innanfor %s bydel" @@ -2445,20 +2435,19 @@ 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:630 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:115 +#: perllib/FixMyStreet/Cobrand/Default.pm:651 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:150 -#: perllib/FixMyStreet/Cobrand/UK.pm:224 +#: perllib/FixMyStreet/Cobrand/UK.pm:214 msgid "RSS feed of problems within %s" msgstr "RSS-straum for problem innanfor %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 -#: perllib/FixMyStreet/Cobrand/UK.pm:230 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s ward" msgstr "RSS-straum for problem innanfor %s bydel" -#: templates/web/base/around/display_location.html:3 +#: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:4 msgid "RSS feed of recent local problems" msgstr "RSS-straum med nye lokale problem" @@ -2498,15 +2487,18 @@ msgstr "Hugs at FiksGataMi primert er laga for å rapportera fysiske problem som msgid "Remove flag" msgstr "Fjern flagg" -#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/report_edit.html:110 #: templates/web/base/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!)" -#: templates/web/base/footer.html:7 templates/web/fiksgatami/footer.html:19 -#: templates/web/fiksgatami/nn/footer.html:19 -#: templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 +msgid "Report" +msgstr "" + +#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 #: templates/web/zurich/footer.html:17 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2516,11 +2508,6 @@ msgstr "Rapporter eit problem" msgid "Report abuse" msgstr "" -#: templates/web/base/report_created.html:1 -#: templates/web/base/report_created.html:3 -msgid "Report created" -msgstr "" - #: perllib/FixMyStreet/App/Controller/Rss.pm:295 msgid "Report on %s" msgstr "Rapport på %s" @@ -2544,7 +2531,7 @@ msgstr "Rapportert %s" msgid "Reported %s, to %s" msgstr "Rapportert %s, til %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:580 #: templates/web/base/contact/index.html:50 #: templates/web/fixmystreet/contact/index.html:65 msgid "Reported anonymously at %s" @@ -2556,7 +2543,7 @@ msgstr "Rapportert anonymt %s" msgid "Reported before" msgstr "Rapportert tidlegare" -#: perllib/FixMyStreet/DB/Result/Problem.pm:598 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 #: templates/web/base/contact/index.html:52 #: templates/web/fixmystreet/contact/index.html:67 msgid "Reported by %s at %s" @@ -2566,31 +2553,35 @@ msgstr "Publisert av %s %s" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:571 +#: perllib/FixMyStreet/DB/Result/Problem.pm:576 msgid "Reported in the %s category anonymously at %s" msgstr "Rapportert i kategorien %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:598 msgid "Reported in the %s category by %s at %s" msgstr "Rapportert i kategorien %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:567 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 msgid "Reported via %s anonymously at %s" msgstr "Publisert av %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:589 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 msgid "Reported via %s by %s at %s" msgstr "Rapportert av %s av %s %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:563 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 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:583 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 msgid "Reported via %s in the %s category by %s at %s" msgstr "Rapportert av %s i kategorien %s av %s %s" -#: templates/web/base/around/around_index.html:2 +#: templates/web/base/reports/index.html:21 +msgid "Reported within the last four weeks" +msgstr "" + +#: templates/web/base/around/around_index.html:1 #: templates/web/base/around/around_index.html:3 #: templates/web/base/js/translation_strings.html:41 #: templates/web/base/report/new/fill_in_details.html:0 @@ -2600,14 +2591,13 @@ msgstr "Rapportert av %s i kategorien %s av %s %s" msgid "Reporting a problem" msgstr "Legger til eit problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:294 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:409 -#: perllib/FixMyStreet/DB/Result/Problem.pm:413 +#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" @@ -2623,7 +2613,7 @@ msgstr "Problem i og rundt kartet" msgid "Reports published" msgstr "" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:85 msgid "Resend report" msgstr "Send rapport på nytt" @@ -2631,36 +2621,35 @@ msgstr "Send rapport på nytt" msgid "Right place?" msgstr "" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:193 -#: perllib/FixMyStreet/Geocode/OSM.pm:171 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:167 +#: perllib/FixMyStreet/Geocode/OSM.pm:152 msgid "Road operator for this named road (derived from road reference number and type): %s" msgstr "Vegoperatør for denne namngjevne vegen (utleia frå vegreferansenummer og type): %s" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:190 -#: perllib/FixMyStreet/Geocode/OSM.pm:168 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:164 +#: perllib/FixMyStreet/Geocode/OSM.pm:149 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:1394 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 -#: templates/web/base/admin/report_edit.html:90 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1403 +#: templates/web/base/admin/report_edit.html:106 #: templates/web/zurich/admin/report_edit.html:73 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1394 -#: templates/web/base/admin/report_edit.html:91 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: templates/web/base/admin/report_edit.html:107 #: templates/web/zurich/admin/report_edit.html:74 msgid "Rotate Right" msgstr "" #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:200 -#: templates/web/base/admin/category_edit.html:76 +#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/category_edit.html:81 #: templates/web/zurich/admin/body.html:59 msgid "Save changes" msgstr "Lagra endringar" @@ -2688,7 +2677,7 @@ msgstr "Søk:" msgid "Searching found no reports." msgstr "" -#: templates/web/base/admin/users.html:39 +#: templates/web/base/admin/users.html:41 msgid "Searching found no users." msgstr "" @@ -2711,15 +2700,15 @@ 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:680 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "Sent to %s %s later" msgstr "Sendt til %s %s seinare" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:84 msgid "Sent:" msgstr "Sendt:" -#: templates/web/base/admin/report_edit.html:73 +#: templates/web/base/admin/report_edit.html:89 #: templates/web/zurich/admin/stats.html:45 msgid "Service:" msgstr "Teneste:" @@ -2728,7 +2717,7 @@ msgstr "Teneste:" msgid "Share" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:211 +#: templates/web/base/report/new/fill_in_details_form.html:192 #: templates/web/base/report/update-form.html:157 #: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 @@ -2773,12 +2762,12 @@ msgstr "Logg ut" msgid "Signed in as %s" msgstr "Logga inn som %s" -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 msgid "Some categories may require additional information." msgstr "Somme kategoriar krev kanskje meir informasjon" -#: templates/web/base/admin/body-form.html:145 -#: templates/web/base/admin/body-form.html:146 +#: templates/web/base/admin/body-form.html:149 +#: templates/web/base/admin/body-form.html:150 msgid "" "Some endpoints require an <strong>API key</strong> to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -2789,11 +2778,11 @@ msgid "Some photos of recent reports" msgstr "Nokre bilete av nyleg melde problem" #: perllib/FixMyStreet/App/View/Email.pm:32 -#: perllib/FixMyStreet/App/View/Web.pm:44 +#: perllib/FixMyStreet/App/View/Web.pm:43 msgid "Some text to localize" msgstr "Noko tekst å omsetja" -#: perllib/FixMyStreet/Cobrand/UK.pm:88 +#: perllib/FixMyStreet/Cobrand/UK.pm:78 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "Orsak, det ser ut til å vera eit «Crown dependency»-postnummer, som vi ikkje dekkjer." @@ -2801,17 +2790,16 @@ msgstr "Orsak, det ser ut til å vera eit «Crown dependency»-postnummer, som v msgid "Sorry, there has been an error confirming your problem." msgstr "Orsak, men det oppstod eit problem når vi freista å stadfesta problemrapporten din" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:215 -#: perllib/FixMyStreet/Geocode.pm:26 perllib/FixMyStreet/Geocode/Bing.pm:56 -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:73 -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:93 -#: perllib/FixMyStreet/Geocode/Google.pm:72 -#: perllib/FixMyStreet/Geocode/OSM.pm:64 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:214 +#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 +#: perllib/FixMyStreet/Geocode/Google.pm:47 +#: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "Orsak, vi kunne ikkje finna den staden." -#: perllib/FixMyStreet/Geocode/Bing.pm:51 -#: perllib/FixMyStreet/Geocode/Google.pm:67 +#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: perllib/FixMyStreet/Geocode/Google.pm:44 #: perllib/FixMyStreet/Geocode/Zurich.pm:87 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." @@ -2820,7 +2808,7 @@ msgstr "Orsak, vi kunne ikkje tolka den posisjonen. Ver venleg og prøv på nytt msgid "Start Date:" msgstr "" -#: templates/web/base/admin/body.html:61 +#: templates/web/base/admin/body.html:69 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 @@ -2828,7 +2816,7 @@ msgstr "" msgid "State" msgstr "Tilstand" -#: templates/web/base/admin/report_edit.html:34 +#: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 #: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:53 @@ -2837,8 +2825,8 @@ msgstr "Tilstand" msgid "State:" msgstr "Tilstand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1200 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:304 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:308 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" @@ -2854,7 +2842,7 @@ msgstr "" msgid "Still open, via questionnaire, %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:381 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 msgid "Subcategory: %s" msgstr "" @@ -2874,19 +2862,19 @@ msgid "Subject:" msgstr "Emne:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:115 -#: templates/web/base/report/new/fill_in_details_form.html:155 -#: templates/web/base/report/new/fill_in_details_form.html:177 +#: templates/web/base/report/new/fill_in_details_form.html:136 +#: templates/web/base/report/new/fill_in_details_form.html:158 +#: templates/web/base/report/new/fill_in_details_form.html:96 #: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 -#: templates/web/zurich/report/new/fill_in_details_form.html:108 +#: templates/web/zurich/report/new/fill_in_details_form.html:91 msgid "Submit" msgstr "Send inn" -#: templates/web/base/admin/report_edit.html:97 +#: templates/web/base/admin/report_edit.html:113 #: templates/web/base/admin/update_edit.html:65 -#: templates/web/base/admin/user-form.html:55 +#: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:64 #: templates/web/zurich/admin/report_edit.html:221 #: templates/web/zurich/admin/update_edit.html:38 @@ -2898,8 +2886,8 @@ msgstr "Send inn endringar" msgid "Submit questionnaire" msgstr "Send inn spørjeskjema" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:133 -#: templates/web/zurich/admin/header.html:2 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:134 +#: 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 @@ -2923,8 +2911,8 @@ msgstr "Abonner" msgid "Subscribe me to an email alert" msgstr "Eg ynskjer å abonnera på e-postvarsel" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1191 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:293 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 #: templates/web/zurich/admin/index-dm.html:1 @@ -2940,7 +2928,7 @@ msgstr "Oppsummering" msgid "Summary reports" msgstr "Oppsummeringsrapportar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 msgid "Survey" msgstr "" @@ -2954,7 +2942,7 @@ msgstr "Resultat frå spørjeundersøkinga" msgid "Text" msgstr "Tekst" -#: templates/web/base/admin/body.html:21 +#: templates/web/base/admin/body.html:28 msgid "Text only version" msgstr "Tekst-utgåve" @@ -2963,12 +2951,8 @@ msgstr "Tekst-utgåve" msgid "Text:" msgstr "Tekst:" -#: templates/web/base/tokens/confirm_update.html:9 -msgid "Thank you — you can <a href=\"%s\">view your updated problem</a> on the site." -msgstr "Tusen takk — du kan <a href=\"%s\">sjå på det oppdaterte problemet ditt</a> her hos oss." - -#: templates/web/base/tokens/confirm_problem.html:18 -msgid "Thank you for reporting this issue" +#: templates/web/base/tokens/confirm_problem.html:12 +msgid "Thank you for reporting this issue!" msgstr "" #: templates/web/base/tokens/error.html:7 @@ -2978,37 +2962,47 @@ 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/base/tokens/confirm_update.html:15 +msgid "Thank you for updating this issue!" +msgstr "" + +#: templates/web/base/contact/submit.html:6 +#: templates/web/base/questionnaire/completed.html:5 +msgid "Thank you for your feedback" +msgstr "" + #: templates/web/fixmystreet/around/around_index.html:28 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 :" msgstr "" -#: templates/web/base/contact/submit.html:8 -msgid "Thanks for your feedback. We'll get back to you as soon as we can!" -msgstr "Takk for innspillet ditt. Vi gjev deg ei tilbakemelding så snart vi kan." - #: templates/web/base/questionnaire/creator_fixed.html:9 msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "Takk, glad for å høyra at problemet er løyst! Vi vil gjerne spørja deg om du har rapportert eit problem til ein administrasjon tidlegare?" -#: perllib/FixMyStreet/App/Controller/Photo.pm:190 +#: perllib/FixMyStreet/App/Controller/Photo.pm:195 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:100 +#: perllib/FixMyStreet/App/Controller/Council.pm:97 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 +#: perllib/FixMyStreet/App/Controller/Location.pm:126 msgid "That location does not appear to be in the UK; please try again." msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:81 +#: perllib/FixMyStreet/Cobrand/UK.pm:71 msgid "That postcode was not recognised, sorry." msgstr "Det postnummeret vart ikkje gjenkjent, orsak." -#: perllib/FixMyStreet/App/Controller/Admin.pm:713 +#: perllib/FixMyStreet/App/Controller/Admin.pm:712 +#, fuzzy +msgid "That problem has been marked as sent." +msgstr "Det problemet vil no sendast på nytt." + +#: perllib/FixMyStreet/App/Controller/Admin.pm:704 msgid "That problem will now be resent." msgstr "Det problemet vil no sendast på nytt." @@ -3020,28 +3014,28 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "Den rapporten har vorte fjerna frå FiksGataMi." -#: templates/web/base/admin/body.html:136 +#: templates/web/base/admin/body.html:144 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/base/admin/body-form.html:119 -#: templates/web/base/admin/body-form.html:120 +#: templates/web/base/admin/body-form.html:123 +#: templates/web/base/admin/body-form.html:124 msgid "" "The <strong>endpoint</strong> is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." msgstr "" -#: templates/web/base/admin/body-form.html:132 -#: templates/web/base/admin/body-form.html:133 +#: templates/web/base/admin/body-form.html:136 +#: templates/web/base/admin/body-form.html:137 msgid "" "The <strong>jurisdiction</strong> is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" -#: templates/web/base/admin/body-form.html:90 -#: templates/web/base/admin/body-form.html:91 +#: templates/web/base/admin/body-form.html:94 +#: templates/web/base/admin/body-form.html:95 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>." @@ -3062,7 +3056,7 @@ msgstr "" msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." msgstr "Stadfestingse-posten <strong>kan</strong> bruka nokre minutt før han kjem fram — så ver tålmodig." -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:3 msgid "The council won’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 "" @@ -3089,8 +3083,8 @@ 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:185 -#: perllib/FixMyStreet/Geocode/OSM.pm:163 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:159 +#: perllib/FixMyStreet/Geocode/OSM.pm:144 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap." msgstr "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." @@ -3148,7 +3142,7 @@ msgstr "" msgid "The passwords do not match" msgstr "Passorda er ikkje like" -#: templates/web/base/errors/page_error_404_not_found.html:11 +#: templates/web/base/errors/page_error_404_not_found.html:10 #: templates/web/base/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" @@ -3165,7 +3159,7 @@ msgstr "Den enklaste meldinga er den geografiske:" msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:295 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:300 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" @@ -3176,16 +3170,20 @@ msgid "" " Names are not necessarily unique." msgstr "" +#: templates/web/base/reports/_problem-list.html:15 +msgid "There are no reports to show." +msgstr "" + #: perllib/FixMyStreet/App/Controller/Reports.pm:75 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:131 +#: perllib/FixMyStreet/App/Controller/Contact.pm:136 #: 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/New.pm:762 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 #: templates/web/base/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:25 @@ -3201,7 +3199,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:135 +#: perllib/FixMyStreet/App/Controller/Contact.pm:140 msgid "There were problems with your report. Please see below." msgstr "Det var problem med rapporten din. Ver venleg og sjå under." @@ -3209,8 +3207,8 @@ msgstr "Det var problem med rapporten din. Ver venleg og sjå under." msgid "There were problems with your update. Please see below." msgstr "Det var problem med oppdateringa di. Ver venleg og sjå under." -#: templates/web/base/admin/body-form.html:108 -#: templates/web/base/admin/body-form.html:109 +#: templates/web/base/admin/body-form.html:112 +#: templates/web/base/admin/body-form.html:113 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" @@ -3223,14 +3221,14 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Denne API-implementasjonen er under arbeid og ikkje enno stabil. Han vil endra seg utan åtvaring i framtida." -#: templates/web/base/admin/body.html:36 +#: templates/web/base/admin/body.html:44 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported <em>at any location</em>.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" " Currently, users <strong>cannot report problems to this body</strong>." msgstr "" -#: templates/web/base/admin/body.html:46 +#: templates/web/base/admin/body.html:54 msgid "This body has no contacts. This means that currently problems reported to this body <strong>will not be sent</strong>." msgstr "" @@ -3241,18 +3239,18 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:388 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:394 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:391 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 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:898 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:136 -#: perllib/FixMyStreet/Cobrand/UK.pm:53 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:902 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:972 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/Cobrand/UK.pm:43 msgid "This information is required" msgstr "Denne informasjonen er påkravd" @@ -3291,8 +3289,8 @@ 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:130 #: perllib/FixMyStreet/Cobrand/Zurich.pm:131 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:132 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -3309,15 +3307,15 @@ msgstr "Denne rapporten er for tida markert som fiksa." msgid "This report is currently marked as open." msgstr "Denne rapporten er for tida markert som open." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:319 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:311 msgid "This report was submitted anonymously" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:293 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:1196 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" @@ -3335,7 +3333,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:294 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:299 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" @@ -3351,8 +3349,12 @@ msgstr "Totalt" msgid "Try again" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:46 +#: templates/web/base/contact/submit.html:14 +msgid "Try emailing us directly:" +msgstr "" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -3360,8 +3362,8 @@ msgstr "" msgid "Unable to fix" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/admin/update_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:45 #: templates/web/zurich/admin/report_edit.html:58 @@ -3403,7 +3405,7 @@ msgstr "Oppdateringa under vart lagt inn anonymt %s" msgid "Update below added by %s at %s" msgstr "Oppdateringa under vart lagt til av %s %s" -#: templates/web/base/admin/body-form.html:233 +#: templates/web/base/admin/body-form.html:240 #: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "" @@ -3429,7 +3431,7 @@ msgstr "Ei oppdatering markerte dette problemet som fiksa." msgid "Update reopened problem" msgstr "Ei oppdatering gjenopna problemet" -#: templates/web/base/admin/body.html:93 +#: templates/web/base/admin/body.html:101 msgid "Update statuses" msgstr "Oppdater tilstanden" @@ -3443,12 +3445,12 @@ msgstr "Oppdatering:" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1016 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1060 -#: perllib/FixMyStreet/App/Controller/Admin.pm:810 -#: perllib/FixMyStreet/App/Controller/Admin.pm:958 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:549 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:618 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1014 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:808 +#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:556 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:625 msgid "Updated!" msgstr "Oppdatert!" @@ -3460,7 +3462,7 @@ msgstr "Oppdatert!" msgid "Updates" msgstr "Oppdateringar" -#: perllib/FixMyStreet/DB/Result/Comment.pm:139 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -3475,7 +3477,7 @@ msgstr "Oppdateringar av {{title}}" msgid "Updates to this problem, FixMyStreet" msgstr "Oppdateringar til dette problemet, FiksGataMi" -#: templates/web/base/admin/body.html:174 +#: templates/web/base/admin/body.html:182 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 "" @@ -3484,11 +3486,11 @@ msgstr "" msgid "User" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1357 msgid "User flag removed" msgstr "Brukarflagg fjerna" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1331 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1329 msgid "User flagged" msgstr "Brukar flagga" @@ -3496,16 +3498,16 @@ msgstr "Brukar flagga" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:303 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:307 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Brukarar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:380 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:430 +#: perllib/FixMyStreet/App/Controller/Admin.pm:374 +#: perllib/FixMyStreet/App/Controller/Admin.pm:404 +#: perllib/FixMyStreet/App/Controller/Admin.pm:421 msgid "Values updated" msgstr "Verdi oppdatert" @@ -3559,11 +3561,11 @@ msgstr "" msgid "We never show your email address or phone number." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:403 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." -#: templates/web/base/index-steps.html:38 +#: templates/web/base/index-steps.html:31 msgid "We send it to the council on your behalf" msgstr "Vi sender til administrasjon på dine vegner" @@ -3572,15 +3574,23 @@ msgstr "Vi sender til administrasjon på dine vegner" msgid "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>" msgstr "" +#: templates/web/base/questionnaire/completed-open.html:2 +msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" +msgstr "" + #: templates/web/base/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 "Vi ynskjer å få tilbakemelding frå deg om kva du meiner om denne tenesta. Berre fyll ut skjemaet, eller send ein e-post <a href='mailto:%s'>%s</a>:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:41 +#: templates/web/base/contact/submit.html:7 +msgid "We’ll get back to you as soon as we can." +msgstr "" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 msgid "What’s the issue, and where is it?" msgstr "" -#: templates/web/base/admin/category_edit.html:82 +#: templates/web/base/admin/category_edit.html:87 #: templates/web/zurich/admin/body.html:18 msgid "When edited" msgstr "Når redigert" @@ -3589,15 +3599,18 @@ msgstr "Når redigert" msgid "When sent" msgstr "Når sendt" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Whole block of empty flats" msgstr "Heil blokk med tomme leilegheiter" +#: templates/web/base/tokens/confirm_alert.html:7 +msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." +msgstr "" + #: templates/web/base/open311/index.html:92 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/fiksgatami/front/footer-marketing.html:15 #: templates/web/fixmystreet/front/footer-marketing.html:17 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" @@ -3621,18 +3634,18 @@ msgid "Year" msgstr "År" #: templates/web/base/admin/bodies.html:66 -#: templates/web/base/admin/body.html:72 templates/web/base/admin/body.html:74 -#: templates/web/base/admin/body.html:78 templates/web/base/admin/body.html:80 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:76 +#: templates/web/base/admin/report_edit.html:93 #: templates/web/base/admin/update_edit.html:24 -#: templates/web/base/admin/users.html:29 +#: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:42 #: templates/web/base/questionnaire/index.html:81 @@ -3661,14 +3674,12 @@ msgstr "Du rapporterer at følgjande problem er støytande, inneheld personleg i 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/base/tokens/confirm_problem.html:25 -#: templates/web/base/tokens/confirm_problem.html:26 -#: templates/web/zurich/tokens/confirm_problem.html:6 +#: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:8 msgid "You can <a href=\"%s%s\">view the problem on this site</a>." msgstr "" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:48 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -3683,14 +3694,14 @@ msgid "" " reports in the past." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:19 -#: templates/web/base/report/new/councils_text_none.html:20 -#: templates/web/base/report/new/councils_text_some.html:20 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 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>." -#: templates/web/base/admin/body-form.html:81 +#: templates/web/base/admin/body-form.html:85 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" @@ -3703,10 +3714,10 @@ msgid "You have already answered this questionnaire. If you have a question, ple msgstr "Du har allereie svart på dette spørjeskjemaet. Viss du har spurnader, ver venleg og <a href='%s'>ta kontakt</a>, eller <a href='%s'>sjå på problemet ditt</a>.\n" #: templates/web/base/questionnaire/index.html:68 -#: templates/web/base/report/new/fill_in_details_form.html:94 +#: templates/web/base/report/new/fill_in_details_form.html:75 #: templates/web/fixmystreet/questionnaire/index.html:88 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:79 -#: templates/web/zurich/report/new/fill_in_details_form.html:75 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 +#: templates/web/zurich/report/new/fill_in_details_form.html:58 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." @@ -3715,7 +3726,7 @@ msgstr "Du har allereie lagt ved eit bilete til dette problemet. Å leggja ved e 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/base/auth/sign_out.html:3 +#: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" msgstr "Du er allereie logga ut" @@ -3724,26 +3735,11 @@ msgstr "Du er allereie logga ut" 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/base/tokens/confirm_alert.html:8 -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/base/tokens/confirm_update.html:14 -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>." - -#: templates/web/base/tokens/confirm_alert.html:12 -msgid "You have successfully created your alert." -msgstr "Du har oppretta varselet ditt." - -#: templates/web/base/tokens/confirm_alert.html:10 -msgid "You have successfully deleted your alert." -msgstr "Sletting av varselet ditt var vellukka." - #: templates/web/base/report/display.html:20 #: templates/web/base/report/new/fill_in_details.html:37 #: templates/web/fixmystreet/report/display.html:17 @@ -3769,7 +3765,7 @@ msgid "" " contacts (such as an email address) to which reports are sent." msgstr "" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:85 msgid "You really want to resend?" msgstr "Ynskjer du verkeleg å senda på nytt?" @@ -3789,7 +3785,7 @@ msgstr "Rapportane dine" #: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 #: templates/web/fixmystreet/report/update-form.html:76 -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:71 msgid "Your email" msgstr "" @@ -3805,7 +3801,7 @@ msgid "Your email address:" msgstr "e-postadressa di:" #: templates/web/base/alert/_list.html:92 -#: templates/web/base/report/new/fill_in_details_form.html:125 +#: templates/web/base/report/new/fill_in_details_form.html:106 #: templates/web/base/report/update-form.html:81 msgid "Your email:" msgstr "E-posten din" @@ -3820,13 +3816,13 @@ msgstr "" #: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 #: templates/web/fixmystreet/report/update-form.html:142 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:98 +#: templates/web/zurich/report/new/fill_in_details_form.html:81 msgid "Your name" msgstr "" #: templates/web/base/auth/general.html:59 #: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:204 +#: templates/web/base/report/new/fill_in_details_form.html:185 #: templates/web/base/report/update-form.html:151 msgid "Your name:" msgstr "Namnet ditt:" @@ -3844,33 +3840,19 @@ msgstr "Passordet ditt har vorte endra" #: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 -#: templates/web/zurich/report/new/fill_in_details_form.html:104 +#: templates/web/zurich/report/new/fill_in_details_form.html:87 msgid "Your phone number" msgstr "" -#: templates/web/base/tokens/confirm_problem.html:4 -msgid "Your problem has been confirmed!" -msgstr "" - #: templates/web/fixmystreet/questionnaire/index.html:16 msgid "Your report" msgstr "" -#: templates/web/base/report_created.html:6 -msgid "Your report has been created and will shortly be sent." -msgstr "" - -#: templates/web/base/footer.html:9 templates/web/fiksgatami/footer.html:21 -#: templates/web/fiksgatami/nn/footer.html:21 -#: templates/web/fixmystreet/footer.html:24 +#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:24 msgid "Your reports" msgstr "Oppdateringane dine" -#: templates/web/base/tokens/confirm_update.html:4 -msgid "Your update has been confirmed!" -msgstr "" - -#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:59 +#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:41 msgid "Your updates" msgstr "Oppdateringane dine" @@ -3887,11 +3869,7 @@ msgstr "av %s" msgid "council" msgstr "administrasjon" -#: perllib/FixMyStreet/DB/Result/Problem.pm:665 -msgid "council ref: %s" -msgstr "" - -#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:32 #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:54 msgid "didn't use map" @@ -3902,6 +3880,7 @@ msgstr "brukte ikkje kart" msgid "e.g. ‘%s’ or ‘%s’" msgstr "" +#: templates/web/base/admin/body-form.html:188 #: templates/web/base/admin/flagged.html:51 msgid "edit user" msgstr "" @@ -3916,7 +3895,7 @@ msgstr "frå %d ulike brukarar" msgid "last updated %s" msgstr "" -#: perllib/Utils.pm:263 +#: perllib/Utils.pm:235 msgid "less than a minute" msgstr "mindre enn eitt minutt" @@ -3976,22 +3955,22 @@ msgstr "eller" msgid "or locate me automatically" msgstr "" -#: templates/web/base/admin/report_edit.html:25 -#: templates/web/base/admin/report_edit.html:26 -#: templates/web/zurich/admin/report_edit-sdm.html:28 +#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:30 +#: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit-sdm.html:29 -#: templates/web/zurich/admin/report_edit-sdm.html:37 +#: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:38 -#: templates/web/zurich/admin/report_edit.html:28 +#: templates/web/zurich/admin/report_edit.html:27 #: templates/web/zurich/admin/report_edit.html:29 -#: templates/web/zurich/admin/report_edit.html:39 +#: templates/web/zurich/admin/report_edit.html:38 #: templates/web/zurich/admin/report_edit.html:40 -#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit.html:50 #: templates/web/zurich/admin/report_edit.html:52 msgid "originally entered: “%s”" msgstr "" -#: templates/web/base/admin/report_edit.html:30 +#: templates/web/base/admin/report_edit.html:43 msgid "other areas:" msgstr "andre område:" @@ -4000,13 +3979,12 @@ msgstr "andre område:" msgid "reopened" msgstr "opna på nytt" -#: templates/web/fiksgatami/header.html:49 -#: templates/web/fixmystreet/header.html:53 +#: templates/web/fixmystreet/header.html:59 #: templates/web/zurich/footer.html:12 msgid "sign out" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:13 +#: templates/web/base/report/new/fill_in_details_form.html:12 #: templates/web/base/report/new/fill_in_details_form.html:15 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 @@ -4018,15 +3996,15 @@ 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:373 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:379 msgid "this type of local problem" msgstr "denne typen lokalt problem" -#: perllib/Utils.pm:235 +#: perllib/Utils.pm:207 msgid "today" msgstr "i dag" -#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:32 #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:54 msgid "used map" @@ -4052,7 +4030,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:254 #, perl-format msgid "%d hour" msgid_plural "%d hours" @@ -4066,7 +4044,7 @@ msgid_plural "%d supporters" msgstr[0] "" msgstr[1] "" -#: perllib/Utils.pm:284 +#: perllib/Utils.pm:256 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -4087,7 +4065,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:250 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -4108,7 +4086,7 @@ 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" -#: perllib/Utils.pm:280 +#: perllib/Utils.pm:252 #, perl-format msgid "%d day" msgid_plural "%d days" @@ -4122,10 +4100,5 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "Vi har enno <strong>ikkje</strong> detaljane for den andre administrasjonen som dekkjer denne staden." msgstr[1] "Vi har enno <strong>ikkje</strong> detaljane for dei andre administrasjonane som dekkjer denne staden." -#~ msgid "Configuration updated - contacts will be generated automatically later" -#~ msgstr "Oppsett oppdatert - kontaktar vil genererast automatisk seinare" - -#~ msgid "The subject and details of the problem will be public, plus your name if you give us permission." -#~ msgstr "" -#~ "Tittelen og detaljane for problemet vil verta offentlege, pluss namnet ditt\n" -#~ "viss du gjev oss lov til det." +#~ msgid "For council(s):" +#~ msgstr "For administrasjon(ane):" diff --git a/locale/pt_CV.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/pt_CV.UTF-8/LC_MESSAGES/FixMyStreet.po index 71e8a656b..4e9b4a573 100644 --- a/locale/pt_CV.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/pt_CV.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2015-01-20 16:59+0000\n" +"POT-Creation-Date: 2015-07-10 10:09+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" @@ -20,17 +20,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:618 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:386 +#: perllib/FixMyStreet/DB/Result/Problem.pm:643 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:392 msgid " and " msgstr "e" -#: templates/web/base/report/new/councils_text_all.html:12 -#: templates/web/base/report/new/councils_text_all.html:19 -#: templates/web/base/report/new/councils_text_all.html:5 -#: templates/web/base/report/new/councils_text_none.html:19 -#: templates/web/base/report/new/councils_text_none.html:21 -#: templates/web/base/report/new/councils_text_some.html:20 +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_none.html:11 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " @@ -66,22 +64,27 @@ msgstr "%d de %d de %d" msgid "%s - Summary reports" msgstr "%s - relatrios resumidos" -#: perllib/FixMyStreet/DB/Result/Problem.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:692 msgid "%s ref: %s" msgstr "%s ref: %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:265 perllib/FixMyStreet/Cobrand/UK.pm:277 +#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 msgid "%s ward, %s" msgstr "%s ala, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:554 +#: perllib/FixMyStreet/DB/Result/Problem.pm:579 msgid "%s, reported at %s" msgstr "%s, reportou em %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:304 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "%s, within %s ward" msgstr "%s, %s dentro da ala" +#: perllib/FixMyStreet/Map/OSM.pm:42 +#, fuzzy +msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" +msgstr "Mapa © <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\"> OpenStreetMap </a> e colaboradores, <a href = \"http://creativecommons.org/licenses/by- sa/2.0 / \"> CC-BY-SA </a>" + #: templates/web/base/email_sent.html:29 msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" msgstr "" @@ -127,7 +130,7 @@ msgstr "(fechado)" msgid "(fixed)" msgstr "(Fixo)" -#: templates/web/base/index.html:9 +#: templates/web/base/index.html:8 templates/web/base/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)" @@ -160,14 +163,13 @@ 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:635 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:662 -#: perllib/FixMyStreet/DB/Result/Problem.pm:393 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:651 +#: perllib/FixMyStreet/DB/Result/Problem.pm:418 msgid "-- Pick a category --" msgstr "-- Escolha uma categoria --" #: perllib/FixMyStreet/App/Controller/Report/New.pm:618 -#: perllib/FixMyStreet/DB/Result/Problem.pm:399 +#: perllib/FixMyStreet/DB/Result/Problem.pm:424 msgid "-- Pick a property type --" msgstr "-- Escolha um tipo de categoria --" @@ -179,53 +181,7 @@ msgid "" " Maybe add some <code>MAPIT_TYPES</code> to your config file?" msgstr "" -#: templates/web/base/questionnaire/completed.html:20 -msgid "<p style=\"font-size:150%\">Thank you very much for filling in our questionnaire; glad to hear it’s been fixed.</p>" -msgstr "" -"<p style=\\\"font-size:150%\\\"> Muito obrigado pelo preenchimento de nosso \"\n" -"\"Questionário;. Gratos por saber que foi corrigido </p>\"" - -#: templates/web/fiksgatami/questionnaire/completed-open.html:1 -msgid "" -"<p style=\"font-size:150%\">We’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’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%\\\"> Lamentamos ouvir isso. Temos dois \\ n\"\n" -"\"Sugestão: por que não tentar <a href=\\\"http://www.norge.no/styresmakter/\\\"> escrita \\ n\"\n" -"\"Direto para o seu conselheiro (s) </a> ou, se É um problema que pode ser \\ n\"\n" -"\"Fixado por pessoas locais que trabalham juntos, por que não \\ n\"\n" -"\"<a Href=\\\"http://www.pledgebank.com/new\\\"> fazer e divulgar um compromisso </a> \\ N\"\n" -"\"</P>\"" - -#: templates/web/base/questionnaire/completed-open.html:6 -msgid "" -"<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" -"suggestions: why not try writing to your local representatives or, if\n" -"it’s a problem that could be fixed by local people working together, why\n" -"not <a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n" -"</p>" -msgstr "" -"<p style=\"font-size:150%\"> Lamentamos ouvir isso. Temos duas ⏎\n" -"sugestão: por que não tentar escrever para seu representante local ou, se for ⏎\n" -"um problema que pode ser corrigido por pessoas locais que trabalham juntos, por que não ⏎\n" -"<a href=\"http://www.pledgebank.com/new\"> fazer e divulgar um compromisso </a> ⏎\n" -"</P>" - -#: templates/web/base/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> Muito obrigado para preencher o nosso questionário, se você ⏎\n" -"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/base/around/_report_banner.html:4 +#: templates/web/base/around/_report_banner.html:3 #: templates/web/base/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>" @@ -260,12 +216,6 @@ msgstr "<strong>No</strong>, let me confirm my report by email:" msgid "<strong>No</strong>, let me confirm my update by email:" msgstr "<strong> Não </strong>, deixe-me confirmar a minha atualização por e-mail:" -#: templates/web/base/tokens/confirm_problem.html:19 -#: templates/web/base/tokens/confirm_problem.html:20 -#, fuzzy -msgid "<strong>We will now send it to the council</strong>." -msgstr " e <strong>agora vamos enviá-lo ao Conselho</strong>" - #: templates/web/base/auth/general.html:37 #: templates/web/base/report/new/fill_in_details_form.html:141 #: templates/web/base/report/update-form.html:95 @@ -317,7 +267,7 @@ msgstr "Adicionar nova categoria" msgid "Add user" msgstr "Adicionar user" -#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:70 +#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:52 msgid "Added %s" msgstr "Adicionado %s" @@ -344,9 +294,7 @@ msgstr "Avise-me de atualizações futuras" msgid "All Reports" msgstr "Todos os Relatórios" -#: templates/web/base/footer.html:11 templates/web/fiksgatami/footer.html:23 -#: templates/web/fiksgatami/nn/footer.html:23 -#: templates/web/fixmystreet/footer.html:26 +#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:26 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:19 @@ -363,19 +311,9 @@ 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/base/report/new/councils_text_all.html:12 -#: templates/web/base/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/base/report/new/councils_text_all.html:5 -#: templates/web/base/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/base/report/new/councils_text_all.html:19 -#: templates/web/base/report/new/councils_text_all.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:13 +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_all.html:4 +#: templates/web/base/report/new/fill_in_details_form.html:12 #: templates/web/base/report/new/fill_in_details_form.html:14 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 @@ -401,7 +339,6 @@ 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/fiksgatami/front/footer-marketing.html:14 #: templates/web/fixmystreet/front/footer-marketing.html:16 msgid "Are you a developer?" msgstr "Você é um desenvolvedor?" @@ -430,7 +367,7 @@ msgstr "Atribuir ao órgão externo:" msgid "Assign to subdivision:" msgstr "Atribuir a subdivisão:" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:163 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:165 #: templates/web/zurich/report/updates.html:11 msgid "Assigned to %s" msgstr "Designado para %s" @@ -443,7 +380,7 @@ msgstr "No máximo %d pedidos são retornados em cada consulta. Os pedidos retor msgid "At the moment only searching for and looking at reports work." msgstr "Neste momento, apenas procurando e olhando para os relatórios de trabalho." -#: perllib/FixMyStreet/DB/Result/Problem.pm:348 +#: perllib/FixMyStreet/DB/Result/Problem.pm:373 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "Aguardando moderação" @@ -456,8 +393,8 @@ msgstr "Voltar" msgid "Ban email address" msgstr "Ban endereço de e-mail" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:297 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1191 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:301 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" msgstr "Corpos" @@ -507,7 +444,7 @@ msgstr "Categoria para cada correção taxa para problemas> 4 semanas, um mes" msgid "Category:" msgstr "Categoria:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:377 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383 msgid "Category: %s" msgstr "Categoria: %s" @@ -557,16 +494,16 @@ msgstr "" msgid "Click map to report a problem" msgstr "Click no mapa para reportar um porblema " -#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 #: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/report_edit.html:45 #: templates/web/base/admin/report_edit.html:47 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/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:95 #: templates/web/zurich/admin/report_edit.html:97 #: templates/web/zurich/admin/stats.html:31 @@ -574,11 +511,12 @@ msgstr "Click no mapa para reportar um porblema " msgid "Closed" msgstr "Fechado" -#: perllib/FixMyStreet/DB/Result/Problem.pm:762 +#: perllib/FixMyStreet/DB/Result/Problem.pm:791 msgid "Closed by council" msgstr "Fechado pelo Conselho" -#: templates/web/base/my/my.html:40 templates/web/fixmystreet/my/my.html:46 +#: templates/web/base/my/my.html:40 +#: templates/web/fixmystreet/my/_problem-list.html:12 msgid "Closed reports" msgstr "Reports Fechados" @@ -586,7 +524,7 @@ msgstr "Reports Fechados" msgid "Closed:" msgstr "Fechado" -#: templates/web/base/around/tabbed_lists.html:11 +#: templates/web/base/around/tabbed_lists.html:10 #: templates/web/base/around/tabbed_lists.html:12 msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "Problemas mais proximos <small> (within %skm) </small>" @@ -611,7 +549,7 @@ msgstr "Cobrand data:" msgid "Cobrand:" msgstr "Cobrand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" @@ -672,13 +610,12 @@ msgid "Contact Us" msgstr "Fale connosco" #: templates/web/base/contact/index.html:6 -#: templates/web/base/contact/submit.html:3 #: templates/web/fixmystreet/contact/index.html:20 msgid "Contact the team" msgstr "Fale com a equipe" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1327 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1355 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1324 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1352 msgid "Could not find user" msgstr "Não foi possível encontrar usuário" @@ -696,6 +633,10 @@ msgstr "Conselho" msgid "Council contacts for %s" msgstr "Contatos do Conselho para %s" +#: perllib/FixMyStreet/DB/Result/Problem.pm:690 +msgid "Council ref: %s" +msgstr "conselho ref:%s" + #: templates/web/base/admin/stats.html:84 msgid "Council:" msgstr "Conselho:" @@ -740,7 +681,7 @@ msgstr "Estado actual" msgid "Currently no bodies have been created." msgstr "" -#: templates/web/base/dashboard/index.html:6 +#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 msgid "Dashboard" msgstr "Painel de instrumentos" @@ -835,9 +776,9 @@ msgid "Edit body details" msgstr "Editar os detalhes do corpo" #: templates/web/base/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:2 +#: 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:2 +#: templates/web/zurich/admin/report_edit.html:1 #: templates/web/zurich/admin/report_edit.html:5 msgid "Editing problem %d" msgstr "Editando problema %d" @@ -867,7 +808,7 @@ msgstr "Editar" msgid "Email" msgstr "Email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1303 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1300 msgid "Email added to abuse list" msgstr "Email adicionado a lista de abusos" @@ -875,7 +816,17 @@ msgstr "Email adicionado a lista de abusos" msgid "Email address:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1300 +#: templates/web/base/tokens/confirm_alert.html:6 +#, fuzzy +msgid "Email alert created" +msgstr "Relatorio criado" + +#: templates/web/base/tokens/confirm_alert.html:10 +#, fuzzy +msgid "Email alert deleted" +msgstr "Envie-me atualizações" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1297 msgid "Email already in abuse list" msgstr "E-mail já está na lista abusos" @@ -899,7 +850,7 @@ msgstr "Envie-me atualizações" msgid "Email:" msgstr "Email:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:322 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 msgid "Email: %s" msgstr "Email: %s" @@ -948,7 +899,7 @@ msgstr "" msgid "Endpoint" msgstr "Endpoint" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:72 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:73 msgid "Enter a Zürich street name" msgstr "Digite um nome de uma rua de Mindelo" @@ -961,7 +912,9 @@ msgstr "Inserir um código postal de Mindelo nas proximidades da area, zona, rua 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/base/around/postcode_form.html:1 #: templates/web/base/around/postcode_form.html:2 +#: templates/web/fixmystreet/around/postcode_form.html:10 #: templates/web/fixmystreet/around/postcode_form.html:11 msgid "Enter a nearby street name and area" msgstr "Digite um nome de rua nas proximidades e área" @@ -1015,9 +968,9 @@ msgstr "" msgid "Extra data:" msgstr "Dados adicionais:" -#: templates/web/base/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>." +#: templates/web/base/contact/submit.html:13 +msgid "Failed to send message" +msgstr "" #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 @@ -1092,7 +1045,8 @@ msgstr "Corrigido - Conselho" msgid "Fixed - User" msgstr "Corrigido - Usuario" -#: templates/web/base/my/my.html:35 templates/web/fixmystreet/my/my.html:41 +#: templates/web/base/my/my.html:35 +#: templates/web/fixmystreet/my/_problem-list.html:7 msgid "Fixed reports" msgstr "Reports Corrigidos" @@ -1109,7 +1063,7 @@ msgstr "" msgid "Flag user" msgstr "Bandeira - Usuario" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Marcado" @@ -1152,8 +1106,6 @@ msgstr "Esqueceu sua senha?" #: templates/web/base/faq/faq-en-gb.html:1 #: templates/web/base/static/privacy.html:1 #: templates/web/base/static/privacy.html:2 -#: templates/web/fiksgatami/faq/faq-nb.html:1 -#: templates/web/fiksgatami/nn/faq/faq-nn.html:1 msgid "Frequently Asked Questions" msgstr "Perguntas mais frequentes" @@ -1166,13 +1118,13 @@ msgstr "GeoRSS no Google Maps" msgid "Get updates" msgstr "Receba as atualizações" -#: templates/web/fixmystreet/reports/_rss.html:4 +#: templates/web/fixmystreet/reports/_rss.html:3 #: 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:4 +#: templates/web/fixmystreet/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "Receba as atualizações de problemas neste %s" @@ -1181,6 +1133,10 @@ msgstr "Receba as atualizações de problemas neste %s" msgid "Give me an RSS feed" msgstr "Dê-me um feed RSS" +#: templates/web/base/questionnaire/completed.html:14 +msgid "Glad to hear it’s been fixed!" +msgstr "" + #: templates/web/base/alert/index.html:34 #: templates/web/base/around/postcode_form.html:8 #: templates/web/fixmystreet/around/postcode_form.html:21 @@ -1210,9 +1166,7 @@ msgstr "Este problema já foi fixado, relatado?" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "Alguma vez voce ja relatou algum problema ao Conselho, ou é a sua primeira vez?" -#: templates/web/base/footer.html:15 templates/web/fiksgatami/footer.html:27 -#: templates/web/fiksgatami/nn/footer.html:27 -#: templates/web/fixmystreet/footer.html:30 +#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:30 #: templates/web/zurich/faq/faq-de-ch.html:1 #: templates/web/zurich/footer.html:21 #: templates/web/zurich/nav_over_content.html:8 @@ -1224,7 +1178,6 @@ msgstr "Ajuda" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "Aqui estão os tipos de alertas de problemas locais para relatar fixed; %s';." -#: templates/web/fiksgatami/header.html:48 #: templates/web/fixmystreet/header.html:52 #: templates/web/zurich/footer.html:11 msgid "Hi %s" @@ -1234,8 +1187,8 @@ msgstr "Oi %s" #: templates/web/base/admin/report_edit.html:50 #: templates/web/base/admin/report_edit.html:51 #: templates/web/base/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:86 #: templates/web/zurich/admin/report_edit.html:90 #: templates/web/zurich/admin/stats.html:32 @@ -1267,19 +1220,27 @@ msgstr "Como reportar um problema" msgid "How to send successful reports" msgstr "Como enviar relatorios com sucesso" -#: perllib/FixMyStreet/App/Controller/Admin.pm:742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:739 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Tenho receio de nao puder confirmar os seus relatorios" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:89 +#: templates/web/base/tokens/confirm_problem.html:23 +#: templates/web/base/tokens/confirm_problem.html:27 +#, fuzzy +msgid "I just reported a problem on @fixmystreet" +msgstr "Novos problemas locais FixMyStreetMindelo" + +#: templates/web/base/tokens/confirm_update.html:19 +#: templates/web/base/tokens/confirm_update.html:23 +#, fuzzy +msgid "I just updated a problem on @fixmystreet" +msgstr "Novos problemas locais FixMyStreetMindelo" + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Receio que não foi possível localizar o seu problema no banco de dados.\n" -#: 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 "Receio que não pôde validar esse token, como o relatório foi feito há muito tempo." - -#: perllib/FixMyStreet/App/Controller/Tokens.pm:260 +#: perllib/FixMyStreet/App/Controller/Tokens.pm:300 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" @@ -1319,7 +1280,16 @@ 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/base/report/new/councils_text_none.html:9 +#: templates/web/base/questionnaire/completed.html:8 +#, fuzzy +msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." +msgstr "" +"<p> Muito obrigado para preencher o nosso questionário, se você ⏎\n" +"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/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:8 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 você enviar um problema sobre qualquer assunto e detalhes, será\"\n" @@ -1371,7 +1341,7 @@ msgid "" " when they are shown on the site. Enter the ID (number) of that user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:127 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 msgid "Illegal ID" msgstr "ID ilegal" @@ -1396,17 +1366,21 @@ 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 "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:143 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:144 #: templates/web/base/admin/report_edit.html:35 #: templates/web/base/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:1 #: templates/web/zurich/admin/header.html:8 #: templates/web/zurich/admin/report_edit.html:99 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "Em andamento" +#: templates/web/base/tokens/confirm_alert.html:11 +msgid "Inbox zero, here we come!" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:160 msgid "Include reporter personal details" msgstr "Incluir reports detalhes perssoais" @@ -1415,7 +1389,7 @@ msgstr "Incluir reports detalhes perssoais" msgid "Include unconfirmed reports" msgstr "Incluir dados nao confirmados" -#: perllib/FixMyStreet/App/Controller/Open311.pm:354 +#: perllib/FixMyStreet/App/Controller/Open311.pm:359 msgid "Incorrect has_photo value \"%s\"" msgstr "Foto_has valor incorreto \"%s\"" @@ -1428,19 +1402,19 @@ msgstr "" msgid "Internal referral" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:339 +#: perllib/FixMyStreet/App/Controller/Open311.pm:344 msgid "Invalid agency_responsible value %s" msgstr "Agencia_responsavel valor %s inválido" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1114 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1111 msgid "Invalid end date" msgstr "Invalido data final" -#: perllib/FixMyStreet/App/Controller/Open311.pm:432 +#: perllib/FixMyStreet/App/Controller/Open311.pm:437 msgid "Invalid format %s specified." msgstr "Formato inválido%s especificado." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1110 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1107 msgid "Invalid start date" msgstr "Data de inicio invalida" @@ -1459,6 +1433,10 @@ msgstr "Investigando" msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "" +#: templates/web/base/tokens/confirm_problem.html:14 +msgid "It’s on its way to the council right now." +msgstr "" + #: templates/web/base/auth/general.html:44 #: templates/web/base/report/new/fill_in_details_form.html:150 #: templates/web/base/report/update-form.html:104 @@ -1499,22 +1477,19 @@ msgstr "Carregando ..." #: templates/web/base/alert/choose.html:1 #: templates/web/base/alert/choose.html:3 #: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3 -#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:5 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5 #: templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 -#: templates/web/base/tokens/confirm_alert.html:4 #: templates/web/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "RSS feeds e alertas de e-mail locais" -#: templates/web/base/alert/list.html:13 templates/web/base/alert/list.html:14 -#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:3 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:12 +#: templates/web/base/alert/list.html:14 templates/web/base/alert/list.html:3 msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "RSS feeds e alertas de e-mail locais para '%s'" -#: templates/web/base/footer.html:13 templates/web/fiksgatami/footer.html:25 -#: templates/web/fiksgatami/nn/footer.html:25 -#: templates/web/fixmystreet/footer.html:28 +#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:28 msgid "Local alerts" msgstr "Alertas locais" @@ -1530,10 +1505,6 @@ msgstr "Mapa" msgid "Map" msgstr "" -#: perllib/FixMyStreet/Map/OSM.pm:42 -msgid "Map © <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 "Mapa © <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\"> OpenStreetMap </a> e colaboradores, <a href = \"http://creativecommons.org/licenses/by- sa/2.0 / \"> CC-BY-SA </a>" - #: templates/web/base/admin/user-form.html:43 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." msgstr "" @@ -1546,7 +1517,7 @@ msgstr "Menssagem" msgid "Message:" msgstr "Menssagem" -#: perllib/FixMyStreet/App/Controller/Open311.pm:440 +#: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" msgstr "Falta informaçao jurisdiction_id" @@ -1589,25 +1560,25 @@ msgstr "Nome" msgid "Name:" msgstr "Nome:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:321 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:313 msgid "Name: %s" msgstr "Nome: %s" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:186 -#: perllib/FixMyStreet/Geocode/OSM.pm:164 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 +#: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "Nomeado rodoviário mais próximo ao pino colocado no mapa (gerado automaticamente usando OpenStreetMap): %s%s" -#: perllib/FixMyStreet/Cobrand/UK.pm:137 +#: perllib/FixMyStreet/Cobrand/UK.pm:127 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:421 -#: perllib/FixMyStreet/Cobrand/Default.pm:461 +#: perllib/FixMyStreet/Cobrand/Default.pm:442 +#: perllib/FixMyStreet/Cobrand/Default.pm:482 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:288 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:279 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1628,7 +1599,7 @@ msgstr "Novos <br>problemas" msgid "New body added" msgstr "Novo corpo adicionado" -#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:382 msgid "New category contact added" msgstr "Novo contato de categoria adicionado" @@ -1727,7 +1698,7 @@ msgstr "Nenhum corpo" msgid "No council" msgstr "Sem conselho" -#: perllib/FixMyStreet/DB/Result/Problem.pm:376 +#: perllib/FixMyStreet/DB/Result/Problem.pm:401 msgid "No council selected" msgstr "Nenhum Conselho selecionado" @@ -1768,7 +1739,7 @@ msgid "" " your config file is not pointing to a live MapIt service." msgstr "" -#: templates/web/base/report/_support.html:3 +#: templates/web/base/report/_support.html:2 #: templates/web/base/report/_support.html:4 msgid "No supporters" msgstr "Não apoiantes" @@ -1805,7 +1776,7 @@ msgstr "Nao pertence ao meu sector" msgid "Not reported before" msgstr "Nao reportado antes" -#: templates/web/base/report/_main.html:61 +#: templates/web/base/report/_main.html:62 msgid "Not reported to council" msgstr "Nao reportado ao conselho" @@ -1850,7 +1821,7 @@ msgid "OK" msgstr "OK" #: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:16 +#: templates/web/base/report/update.html:17 msgid "Offensive? Unsuitable? Tell us" msgstr "Ofensivo? Inadequado? Informem-nos" @@ -1874,7 +1845,7 @@ msgstr "Mais antigo <br>problemas" msgid "One-line summary" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:137 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:138 #: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/report_edit.html:36 #: templates/web/base/admin/report_edit.html:37 @@ -1882,7 +1853,7 @@ msgstr "" #: templates/web/base/dashboard/index.html:142 #: templates/web/base/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:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/report_edit.html:86 #: templates/web/zurich/admin/report_edit.html:88 @@ -1891,7 +1862,8 @@ msgstr "" msgid "Open" msgstr "Aberto" -#: templates/web/base/my/my.html:30 templates/web/fixmystreet/my/my.html:36 +#: templates/web/base/my/my.html:30 +#: templates/web/fixmystreet/my/_problem-list.html:2 msgid "Open reports" msgstr "Relatorios abertos" @@ -1917,15 +1889,15 @@ msgstr "Ou os problemas relatados para:" msgid "Or you can subscribe to an alert based upon what ward or council you’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:1057 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:662 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:663 -#: perllib/FixMyStreet/DB/Result/Problem.pm:560 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 -#: perllib/FixMyStreet/DB/Result/Problem.pm:592 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:372 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1041 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:651 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:652 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 +#: perllib/FixMyStreet/DB/Result/Problem.pm:595 +#: perllib/FixMyStreet/DB/Result/Problem.pm:605 +#: perllib/FixMyStreet/DB/Result/Problem.pm:617 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:393 msgid "Other" msgstr "Outro" @@ -1977,7 +1949,7 @@ msgstr "" msgid "Phone number (optional)" msgstr "Telefone (opcional)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:286 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:291 #: templates/web/base/admin/report_edit.html:68 #: templates/web/base/report/new/fill_in_details_form.html:216 #: templates/web/zurich/admin/report_edit-sdm.html:46 @@ -2015,7 +1987,7 @@ msgstr "Coloque a fix pin no mapa" #: templates/web/base/admin/report_edit.html:38 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/zurich/admin/header.html:2 +#: 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:86 @@ -2049,20 +2021,19 @@ msgstr "Favor verificar seu email" msgid "Please check your email address is correct" msgstr "Favor verificar se seu email esta correcto" -#: perllib/FixMyStreet/App/Controller/Admin.pm:349 -#: 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:395 +#: perllib/FixMyStreet/App/Controller/Admin.pm:346 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:861 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:905 +#: perllib/FixMyStreet/DB/Result/Problem.pm:420 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" msgstr "Escolher uma categoria" -#: perllib/FixMyStreet/DB/Result/Problem.pm:401 +#: perllib/FixMyStreet/DB/Result/Problem.pm:426 msgid "Please choose a property type" msgstr "Por favor, escolha um tipo de imóvel" -#: perllib/FixMyStreet/App/Controller/Admin.pm:376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:373 #, fuzzy msgid "Please correct the errors below" msgstr "Por favor, selecione o feed que deseja" @@ -2085,8 +2056,8 @@ msgstr "" "a Equipe POR Trás FixMyStreet, Nao hum Conselho. Pará relatar hum Problema, ⏎\n" "<a href=\"/\"> ir par a Página Inicial </a> e como SIGA INSTRUÇÕES." -#: perllib/FixMyStreet/App/Controller/Admin.pm:352 -#: perllib/FixMyStreet/DB/Result/Comment.pm:133 +#: perllib/FixMyStreet/App/Controller/Admin.pm:349 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "Por favor insira uma mensagem" @@ -2097,15 +2068,15 @@ msgstr "Por favor insira uma mensagem" msgid "Please enter a password" msgstr "Por favor insira uma password" -#: perllib/FixMyStreet/App/Controller/Contact.pm:108 -#: perllib/FixMyStreet/DB/Result/Problem.pm:370 +#: perllib/FixMyStreet/App/Controller/Contact.pm:113 +#: perllib/FixMyStreet/DB/Result/Problem.pm:395 #: templates/web/base/js/translation_strings.html:3 msgid "Please enter a subject" msgstr "Por favor insira um assunto" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1050 -#: perllib/FixMyStreet/App/Controller/Admin.pm:351 -#: perllib/FixMyStreet/App/Controller/Admin.pm:997 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1047 +#: perllib/FixMyStreet/App/Controller/Admin.pm:348 +#: perllib/FixMyStreet/App/Controller/Admin.pm:994 #: perllib/FixMyStreet/DB/Result/User.pm:127 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 @@ -2113,16 +2084,16 @@ msgid "Please enter a valid email" msgstr "Por favor insira um email valido" #: perllib/FixMyStreet/App/Controller/Alert.pm:346 -#: perllib/FixMyStreet/App/Controller/Contact.pm:118 +#: perllib/FixMyStreet/App/Controller/Contact.pm:123 msgid "Please enter a valid email address" msgstr "Por favor insira um endereço de e-mail válido" -#: perllib/FixMyStreet/DB/Result/Problem.pm:373 +#: perllib/FixMyStreet/DB/Result/Problem.pm:398 #: templates/web/base/js/translation_strings.html:4 msgid "Please enter some details" msgstr "Por favor, insira alguns detalhes" -#: perllib/FixMyStreet/App/Controller/Contact.pm:107 +#: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/User.pm:124 #: templates/web/base/auth/general.html:13 #: templates/web/base/auth/general.html:8 @@ -2144,14 +2115,14 @@ msgstr "Por favor, insira o seu endereço de email" msgid "Please enter your first name" msgstr "Digite seu primeiro nome" -#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: perllib/FixMyStreet/DB/Result/Problem.pm:413 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Por favor, insira o seu nome completo, os conselhos precisam desta informação - se você não quiser que seu nome seja mostrado no site, desmarque a caixa abaixo" -#: perllib/FixMyStreet/App/Controller/Contact.pm:106 -#: perllib/FixMyStreet/DB/Result/Comment.pm:130 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Contact.pm:111 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 +#: perllib/FixMyStreet/DB/Result/Problem.pm:406 #: perllib/FixMyStreet/DB/Result/User.pm:120 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" @@ -2174,7 +2145,7 @@ msgstr "Por favor, insira o seu título" msgid "Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a href=\"/\">front page</a>." msgstr "Por favor, sinta-se livre para <a href=\\\"%s\\\"> se inscrever de novo </a>, ou voltar para a <a href=\\\"/\\\">página inicial</a>" -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/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." @@ -2189,7 +2160,7 @@ msgstr "Por favor, preencha os detalhes do problema." msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "Por favor, preencha o formulário abaixo com detalhes do problema e descrever a localização mais precisa possível na caixa de detalhes." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:251 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Por favor, indique se você gostaria de receber um outro questionário" @@ -2212,16 +2183,16 @@ msgstr "Por favor, note o relatório ainda não foi enviado <strong> </strong>. msgid "Please note:" msgstr "Favor notar:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:246 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:254 msgid "Please provide some explanation as to why you're reopening this report" msgstr "Favor fornecer uma explicação de por que você está reabrindo este relatório" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:261 msgid "Please provide some text as well as a photo" msgstr "Por favor, forneça algum texto, bem como uma foto" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:247 msgid "Please say whether you've ever reported a problem to your council before" msgstr "Por favor, diga se você já relatou um problema para o seu conselho antes" @@ -2233,7 +2204,7 @@ msgstr "Por favor, selecione o feed que deseja" msgid "Please select the type of alert you want" msgstr "Selecione o tipo de alerta que deseja" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please state whether or not the problem has been fixed" msgstr "Por favor, indique se o problema foi corrigido" @@ -2241,15 +2212,13 @@ msgstr "Por favor, indique se o problema foi corrigido" msgid "Please take a look at the updates that have been left." msgstr "Por favor, dê uma olhada nas atualizações que foram deixadas." -#: perllib/FixMyStreet/App/Controller/Photo.pm:176 +#: perllib/FixMyStreet/App/Controller/Photo.pm:177 +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 +#: perllib/FixMyStreet/App/Controller/Photo.pm:189 msgid "Please upload a JPEG image only" msgstr "Faça upload somente de uma imagem em JPEG " -#: perllib/FixMyStreet/App/Controller/Photo.pm:183 -msgid "Please upload a JPEG image only\n" -msgstr "Faça upload de uma imagem JPEG \n" - -#: perllib/FixMyStreet/App/Controller/Contact.pm:109 +#: perllib/FixMyStreet/App/Controller/Contact.pm:114 msgid "Please write a message" msgstr "Por favor, escreva uma mensagem" @@ -2296,7 +2265,7 @@ msgstr "Privado" msgid "Private" msgstr "Privado" -#: templates/web/base/maps/openlayers.html:86 +#: templates/web/base/maps/openlayers.html:89 msgid "Problem" msgstr "Problema" @@ -2317,7 +2286,7 @@ msgstr "Problema %s enviado ao conselho %s" msgid "Problem breakdown by state" msgstr "Colapso problema por estado" -#: perllib/FixMyStreet/App/Controller/Admin.pm:968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:965 msgid "Problem marked as open." msgstr "Problema marcado como aberto." @@ -2352,16 +2321,15 @@ 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:629 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:114 +#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:151 -#: perllib/FixMyStreet/Cobrand/UK.pm:217 +#: perllib/FixMyStreet/Cobrand/UK.pm:207 msgid "Problems within %s" msgstr "Problemas dentro de %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:122 -#: perllib/FixMyStreet/Cobrand/UK.pm:231 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "Problems within %s ward" msgstr "Problemas dentro de %s ala" @@ -2417,7 +2385,7 @@ msgstr "Publicar foto" msgid "Publish the response" msgstr "Publicar a resposta" -#: templates/web/base/questionnaire/completed.html:2 +#: templates/web/base/questionnaire/completed.html:1 #: templates/web/base/questionnaire/index.html:0 #: templates/web/base/questionnaire/index.html:14 #: templates/web/base/questionnaire/index.html:4 @@ -2436,11 +2404,12 @@ msgstr "Questionário %d respondeu para o problema de %d, %s para %s" msgid "Questionnaire %d sent for problem %d" msgstr "Questionário %d enviou para o problema de %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 msgid "Questionnaire filled in by problem reporter" msgstr "Questionário preenchido por problema repórter" #: templates/web/base/alert/_list.html:21 +#: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display.html:50 #: templates/web/base/reports/_rss.html:1 @@ -2450,11 +2419,11 @@ msgstr "Questionário preenchido por problema repórter" msgid "RSS feed" msgstr "RSS feed" -#: perllib/FixMyStreet/Cobrand/UK.pm:260 perllib/FixMyStreet/Cobrand/UK.pm:272 +#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 msgid "RSS feed for %s" msgstr "RSS feed para %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "RSS feed for %s ward, %s" msgstr "RSS feed for %s ala,%s" @@ -2462,15 +2431,11 @@ msgstr "RSS feed for %s ala,%s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:167 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:175 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:185 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:193 -#: perllib/FixMyStreet/Cobrand/UK.pm:286 perllib/FixMyStreet/Cobrand/UK.pm:298 +#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 msgid "RSS feed of %s" msgstr "RSS feed de %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 msgid "RSS feed of %s, within %s ward" msgstr "RSS feed de %s, %s problemas pendentes" @@ -2483,20 +2448,19 @@ 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:630 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:115 +#: perllib/FixMyStreet/Cobrand/Default.pm:651 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:150 -#: perllib/FixMyStreet/Cobrand/UK.pm:224 +#: perllib/FixMyStreet/Cobrand/UK.pm:214 msgid "RSS feed of problems within %s" msgstr "RSS feed dos Problemas Nesta %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 -#: perllib/FixMyStreet/Cobrand/UK.pm:230 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s ward" msgstr "RSS feed dos problemas dentro de %s ala" -#: templates/web/base/around/display_location.html:3 +#: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:4 msgid "RSS feed of recent local problems" msgstr "RSS feed dos problemas locais recentes" @@ -2542,9 +2506,13 @@ msgstr "Remover bandeira" msgid "Remove photo (can't be undone!)" msgstr "Remover foto (não pode ser desfeita!)" -#: templates/web/base/footer.html:7 templates/web/fiksgatami/footer.html:19 -#: templates/web/fiksgatami/nn/footer.html:19 -#: templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 +#, fuzzy +msgid "Report" +msgstr "Relatórios" + +#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 #: templates/web/zurich/footer.html:17 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2554,11 +2522,6 @@ msgstr "Comunicar um problema" msgid "Report abuse" msgstr "Denunciar um abuso" -#: templates/web/base/report_created.html:1 -#: templates/web/base/report_created.html:3 -msgid "Report created" -msgstr "Relatorio criado" - #: perllib/FixMyStreet/App/Controller/Rss.pm:295 msgid "Report on %s" msgstr "Relatório sobre %s" @@ -2583,7 +2546,7 @@ msgstr "Relatado %s" msgid "Reported %s, to %s" msgstr "Reportados %s, para %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:600 #: templates/web/base/contact/index.html:50 #: templates/web/fixmystreet/contact/index.html:65 msgid "Reported anonymously at %s" @@ -2595,7 +2558,7 @@ msgstr "Relatado anonimamente em %s" msgid "Reported before" msgstr "Relatado antes" -#: perllib/FixMyStreet/DB/Result/Problem.pm:598 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 #: templates/web/base/contact/index.html:52 #: templates/web/fixmystreet/contact/index.html:67 msgid "Reported by %s at %s" @@ -2605,31 +2568,31 @@ msgstr "Relatado por %s em %s" msgid "Reported in the %s category" msgstr "Relatado na categoria %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:571 +#: perllib/FixMyStreet/DB/Result/Problem.pm:596 msgid "Reported in the %s category anonymously at %s" msgstr "Relatado na categoria %s anonimamente em %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:618 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:567 +#: perllib/FixMyStreet/DB/Result/Problem.pm:592 msgid "Reported via %s anonymously at %s" msgstr "Relatado por %s anonimamente em %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:589 +#: perllib/FixMyStreet/DB/Result/Problem.pm:614 msgid "Reported via %s by %s at %s" msgstr "Relatado por %s por%s em %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:563 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 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:583 +#: perllib/FixMyStreet/DB/Result/Problem.pm:608 msgid "Reported via %s in the %s category by %s at %s" msgstr "Relatado por %s na categoria %s por %s em %s" -#: templates/web/base/around/around_index.html:2 +#: templates/web/base/around/around_index.html:1 #: templates/web/base/around/around_index.html:3 #: templates/web/base/js/translation_strings.html:41 #: templates/web/base/report/new/fill_in_details.html:0 @@ -2639,14 +2602,14 @@ msgstr "Relatado por %s na categoria %s por %s em %s" msgid "Reporting a problem" msgstr "Relatando um problema" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:294 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "Relatórios" -#: perllib/FixMyStreet/DB/Result/Problem.pm:409 -#: perllib/FixMyStreet/DB/Result/Problem.pm:413 +#: perllib/FixMyStreet/DB/Result/Problem.pm:434 +#: perllib/FixMyStreet/DB/Result/Problem.pm:438 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" @@ -2670,24 +2633,24 @@ msgstr "Reenviar relatório" msgid "Right place?" msgstr "Lugar certo?" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:193 -#: perllib/FixMyStreet/Geocode/OSM.pm:171 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:167 +#: perllib/FixMyStreet/Geocode/OSM.pm:152 msgid "Road operator for this named road (derived from road reference number and type): %s" msgstr "Operador de estrada por esta estrada chamada (derivado do número de referência estrada e tipo): %s" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:190 -#: perllib/FixMyStreet/Geocode/OSM.pm:168 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:164 +#: perllib/FixMyStreet/Geocode/OSM.pm:149 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:1394 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1391 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1402 #: templates/web/base/admin/report_edit.html:90 #: templates/web/zurich/admin/report_edit.html:73 msgid "Rotate Left" msgstr "Girar para a esquerda" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1394 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1391 #: templates/web/base/admin/report_edit.html:91 #: templates/web/zurich/admin/report_edit.html:74 msgid "Rotate Right" @@ -2751,7 +2714,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:680 +#: perllib/FixMyStreet/DB/Result/Problem.pm:705 msgid "Sent to %s %s later" msgstr "Enviado para %s %s mais tarde" @@ -2813,7 +2776,7 @@ msgstr "Sair " msgid "Signed in as %s" msgstr "Entrou como %s" -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 msgid "Some categories may require additional information." msgstr "Algumas categorias podem solicitar informações adicionais." @@ -2829,11 +2792,11 @@ msgid "Some photos of recent reports" msgstr "Fotos de reports recentes" #: perllib/FixMyStreet/App/View/Email.pm:32 -#: perllib/FixMyStreet/App/View/Web.pm:44 +#: perllib/FixMyStreet/App/View/Web.pm:43 msgid "Some text to localize" msgstr "Algum informaçao para localizar" -#: perllib/FixMyStreet/Cobrand/UK.pm:88 +#: perllib/FixMyStreet/Cobrand/UK.pm:78 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "Desculpe, codigo postal nao coincide. Area nao comprrendida." @@ -2841,17 +2804,16 @@ msgstr "Desculpe, codigo postal nao coincide. Area nao comprrendida." msgid "Sorry, there has been an error confirming your problem." msgstr "Desculpe, houve um erro ao confirmar o seu problema." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:215 -#: perllib/FixMyStreet/Geocode.pm:26 perllib/FixMyStreet/Geocode/Bing.pm:56 -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:73 -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:93 -#: perllib/FixMyStreet/Geocode/Google.pm:72 -#: perllib/FixMyStreet/Geocode/OSM.pm:64 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:214 +#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 +#: perllib/FixMyStreet/Geocode/Google.pm:47 +#: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "Desculpe, não conseguimos encontrar esse local." -#: perllib/FixMyStreet/Geocode/Bing.pm:51 -#: perllib/FixMyStreet/Geocode/Google.pm:67 +#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: perllib/FixMyStreet/Geocode/Google.pm:44 #: perllib/FixMyStreet/Geocode/Zurich.pm:87 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." @@ -2877,8 +2839,8 @@ msgstr "Estado" msgid "State:" msgstr "Estado" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1200 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:304 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:308 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" @@ -2894,7 +2856,7 @@ msgstr "Status" msgid "Still open, via questionnaire, %s" msgstr "Ainda em aberto, via questionário, %s" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:381 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 msgid "Subcategory: %s" msgstr "Subcategoria: %s" @@ -2938,8 +2900,8 @@ msgstr "Submeter alteraçoes" msgid "Submit questionnaire" msgstr "Submeter questionario" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:133 -#: templates/web/zurich/admin/header.html:2 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:134 +#: 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 @@ -2963,8 +2925,8 @@ msgstr "Subscrever" msgid "Subscribe me to an email alert" msgstr "Subcrever um alerta de e-mail" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1190 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:293 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 #: templates/web/zurich/admin/index-dm.html:1 @@ -2980,7 +2942,7 @@ msgstr "Resumo" msgid "Summary reports" msgstr "Resumo reports" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 msgid "Survey" msgstr "Teste" @@ -3003,49 +2965,50 @@ msgstr "Somente versao texto" msgid "Text:" msgstr "Texto:" -#: templates/web/base/tokens/confirm_update.html:9 -msgid "Thank you — 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/base/tokens/confirm_problem.html:18 -msgid "Thank you for reporting this issue" +#: templates/web/base/tokens/confirm_problem.html:12 +msgid "Thank you for reporting this issue!" msgstr "" #: templates/web/base/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 "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/base/tokens/confirm_update.html:15 +msgid "Thank you for updating this issue!" +msgstr "" + +#: templates/web/base/contact/submit.html:6 +#: templates/web/base/questionnaire/completed.html:5 +msgid "Thank you for your feedback" +msgstr "" + #: templates/web/fixmystreet/around/around_index.html:28 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 :" msgstr "Obrigado por upload de sua foto. Precisamos agora de localizar o seu problema, então digite um nome de rua nas proximidades ou código postal na caixa acima:" -#: templates/web/base/contact/submit.html:8 -msgid "Thanks for your feedback. We'll get back to you as soon as we can!" -msgstr "Obrigado pelo seu feedback. Nós vamos responder o mais rapidamente possível!" - #: templates/web/base/questionnaire/creator_fixed.html:9 msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "Obrigado, gratos em ouvir que o problema foi corrigido! Podemos apenas perguntar se você já relatou um problema para um conselho antes?" -#: perllib/FixMyStreet/App/Controller/Photo.pm:190 +#: perllib/FixMyStreet/App/Controller/Photo.pm:195 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:100 +#: perllib/FixMyStreet/App/Controller/Council.pm:97 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:124 +#: perllib/FixMyStreet/App/Controller/Location.pm:126 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:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:81 +#: perllib/FixMyStreet/Cobrand/UK.pm:71 msgid "That postcode was not recognised, sorry." msgstr "Esse código postal não foi reconhecido, me desculpe.Tente novamente." -#: perllib/FixMyStreet/App/Controller/Admin.pm:713 +#: perllib/FixMyStreet/App/Controller/Admin.pm:710 msgid "That problem will now be resent." msgstr "Esse problema agora será reenviado e reportado ao conselho." @@ -3099,7 +3062,7 @@ msgstr "" msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <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/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:3 msgid "The council won’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." @@ -3126,8 +3089,8 @@ 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:185 -#: perllib/FixMyStreet/Geocode/OSM.pm:163 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:159 +#: perllib/FixMyStreet/Geocode/OSM.pm:144 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap." msgstr "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." @@ -3185,7 +3148,7 @@ msgstr "" msgid "The passwords do not match" msgstr "As senhas não são iguais" -#: templates/web/base/errors/page_error_404_not_found.html:11 +#: templates/web/base/errors/page_error_404_not_found.html:10 #: templates/web/base/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" @@ -3203,7 +3166,7 @@ msgstr "O alerta mais simples é o nosso único ponto localizaçao geográfica:" msgid "The summary and description will also be made public (see 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>" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:295 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:300 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" @@ -3214,16 +3177,20 @@ msgid "" " Names are not necessarily unique." msgstr "" +#: templates/web/base/reports/_problem-list.html:15 +msgid "There are no reports to show." +msgstr "" + #: perllib/FixMyStreet/App/Controller/Reports.pm:75 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:131 +#: perllib/FixMyStreet/App/Controller/Contact.pm:136 #: 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:755 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:747 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 #: templates/web/base/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:25 @@ -3239,7 +3206,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:135 +#: perllib/FixMyStreet/App/Controller/Contact.pm:140 msgid "There were problems with your report. Please see below." msgstr "Houve problemas com o seu relatório. Por favor, veja abaixo." @@ -3279,18 +3246,18 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:388 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:394 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:391 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 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:898 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:136 -#: perllib/FixMyStreet/Cobrand/UK.pm:53 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:882 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:952 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/Cobrand/UK.pm:43 msgid "This information is required" msgstr "Esta informação é necessária" @@ -3330,8 +3297,8 @@ 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:130 #: perllib/FixMyStreet/Cobrand/Zurich.pm:131 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:132 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Este relatório está aguardando moderação." @@ -3348,15 +3315,15 @@ msgstr "Este relatório está marcado como fixo." msgid "This report is currently marked as open." msgstr "Este relatório está marcado como aberto." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:319 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:311 msgid "This report was submitted anonymously" msgstr "Este relatório foi enviado anonimamente" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:293 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:1196 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Timeline" @@ -3374,7 +3341,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:294 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:299 msgid "To view a map of the precise location of this issue" msgstr "Para ver no mapa a localização exata desse problema" @@ -3390,6 +3357,10 @@ msgstr "Total" msgid "Try again" msgstr "Tente novamente" +#: templates/web/base/contact/submit.html:14 +msgid "Try emailing us directly:" +msgstr "" + #: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/report_edit.html:46 #: templates/web/base/report/update-form.html:30 @@ -3482,12 +3453,12 @@ msgstr "Actualizar:" msgid "Updated" msgstr "Atualizado" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1016 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1060 -#: perllib/FixMyStreet/App/Controller/Admin.pm:810 -#: perllib/FixMyStreet/App/Controller/Admin.pm:958 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:549 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:618 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1013 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1057 +#: perllib/FixMyStreet/App/Controller/Admin.pm:807 +#: perllib/FixMyStreet/App/Controller/Admin.pm:955 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:556 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:625 msgid "Updated!" msgstr "Actualizado!" @@ -3499,7 +3470,7 @@ msgstr "Actualizado!" msgid "Updates" msgstr "Actualizaçoes" -#: perllib/FixMyStreet/DB/Result/Comment.pm:139 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 #, 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" @@ -3524,11 +3495,11 @@ msgstr "" msgid "User" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1356 msgid "User flag removed" msgstr "Bandeira usuário removida" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1331 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1328 msgid "User flagged" msgstr "Usuário sinalizado" @@ -3536,16 +3507,16 @@ msgstr "Usuário sinalizado" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:303 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:307 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Usuários" -#: perllib/FixMyStreet/App/Controller/Admin.pm:380 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:430 +#: perllib/FixMyStreet/App/Controller/Admin.pm:377 +#: perllib/FixMyStreet/App/Controller/Admin.pm:407 +#: perllib/FixMyStreet/App/Controller/Admin.pm:427 msgid "Values updated" msgstr "Valores atualizados" @@ -3599,7 +3570,7 @@ msgstr "Nós nunca divulgaremos o seu e-mail" msgid "We never show your email address or phone number." msgstr "Nós nunca divulgaremos o seu endereço de e-mail ou número de telefone." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:403 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." @@ -3612,10 +3583,19 @@ msgstr "Nós enviá-lo para o conselho em seu nome" 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>" +#: templates/web/base/questionnaire/completed-open.html:2 +msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" +msgstr "" + #: templates/web/base/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 "Adoraríamos ouvir o que você pensa sobre este site. Basta preencher o formulário, ou envie um e-mail para <a href='mailto:%s'>%s</a>:" +#: templates/web/base/contact/submit.html:7 +#, fuzzy +msgid "We’ll get back to you as soon as we can." +msgstr "Obrigado pelo seu feedback. Nós vamos responder o mais rapidamente possível!" + #: templates/web/fixmystreet/report/new/fill_in_details_form.html:41 msgid "What’s the issue, and where is it?" msgstr "" @@ -3633,11 +3613,14 @@ msgstr "Quando enviar" msgid "Whole block of empty flats" msgstr "Bloco inteiro de apartamentos vazios" +#: templates/web/base/tokens/confirm_alert.html:7 +msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." +msgstr "" + #: templates/web/base/open311/index.html:92 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/fiksgatami/front/footer-marketing.html:15 #: templates/web/fixmystreet/front/footer-marketing.html:17 #, fuzzy msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." @@ -3702,9 +3685,7 @@ msgstr "Você está reportando o seguinte relatório de problema por ser abusiva 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/base/tokens/confirm_problem.html:25 -#: templates/web/base/tokens/confirm_problem.html:26 -#: templates/web/zurich/tokens/confirm_problem.html:6 +#: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:8 msgid "You can <a href=\"%s%s\">view the problem on this site</a>." msgstr "Você pode <a href=\"%s%s\"> ver o problema neste site </a>." @@ -3724,9 +3705,9 @@ msgid "" " reports in the past." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:19 -#: templates/web/base/report/new/councils_text_none.html:20 -#: templates/web/base/report/new/councils_text_some.html:20 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 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>." @@ -3756,7 +3737,7 @@ msgstr "Você já anexou uma foto com este relatório, anexando outro irá subst 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/base/auth/sign_out.html:3 +#: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" msgstr "Voce foi logado fora" @@ -3765,26 +3746,11 @@ msgstr "Voce foi logado fora" msgid "You have located the problem at the point marked with a green pin on the map. If this is not the correct location, simply click on the map again. " msgstr "Você localizou o problema no ponto marcado com um pino verde no mapa. Se este não é o local correto, basta clicar no mapa novamente." -#: templates/web/base/tokens/confirm_alert.html:8 -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/base/tokens/confirm_update.html:14 -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>." - -#: templates/web/base/tokens/confirm_alert.html:12 -msgid "You have successfully created your alert." -msgstr "Você criou com sucesso o seu alerta." - -#: templates/web/base/tokens/confirm_alert.html:10 -msgid "You have successfully deleted your alert." -msgstr "Você removeu com sucesso o seu alerta." - #: templates/web/base/report/display.html:20 #: templates/web/base/report/new/fill_in_details.html:37 #: templates/web/fixmystreet/report/display.html:17 @@ -3889,31 +3855,15 @@ msgstr "Sua password foi alterada" msgid "Your phone number" msgstr "Telefone " -#: templates/web/base/tokens/confirm_problem.html:4 -#, fuzzy -msgid "Your problem has been confirmed!" -msgstr "Este problema foi resolvido" - #: templates/web/fixmystreet/questionnaire/index.html:16 msgid "Your report" msgstr "Seu relatório" -#: templates/web/base/report_created.html:6 -msgid "Your report has been created and will shortly be sent." -msgstr "Seu relatório foi criado e será enviado em breve." - -#: templates/web/base/footer.html:9 templates/web/fiksgatami/footer.html:21 -#: templates/web/fiksgatami/nn/footer.html:21 -#: templates/web/fixmystreet/footer.html:24 +#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:24 msgid "Your reports" msgstr "Seus relatórios" -#: templates/web/base/tokens/confirm_update.html:4 -#, fuzzy -msgid "Your update has been confirmed!" -msgstr "Sua password foi alterada" - -#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:59 +#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:41 msgid "Your updates" msgstr "Suas atualizações" @@ -3930,10 +3880,6 @@ msgstr "por %s" msgid "council" msgstr "conselho" -#: perllib/FixMyStreet/DB/Result/Problem.pm:665 -msgid "council ref: %s" -msgstr "conselho ref:%s" - #: templates/web/base/admin/report_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:54 @@ -3959,7 +3905,7 @@ msgstr "e %d usuários diferentes" msgid "last updated %s" msgstr "Última atualizada %s" -#: perllib/Utils.pm:263 +#: perllib/Utils.pm:235 msgid "less than a minute" msgstr "menos de um minuto" @@ -4019,17 +3965,17 @@ msgstr "ou" msgid "or locate me automatically" msgstr "ou localizár-me automaticamente" -#: templates/web/base/admin/report_edit.html:25 +#: templates/web/base/admin/report_edit.html:24 #: templates/web/base/admin/report_edit.html:26 -#: templates/web/zurich/admin/report_edit-sdm.html:28 +#: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit-sdm.html:29 -#: templates/web/zurich/admin/report_edit-sdm.html:37 +#: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:38 -#: templates/web/zurich/admin/report_edit.html:28 +#: templates/web/zurich/admin/report_edit.html:27 #: templates/web/zurich/admin/report_edit.html:29 -#: templates/web/zurich/admin/report_edit.html:39 +#: templates/web/zurich/admin/report_edit.html:38 #: templates/web/zurich/admin/report_edit.html:40 -#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit.html:50 #: templates/web/zurich/admin/report_edit.html:52 msgid "originally entered: “%s”" msgstr "originalmente introduzido: \"%s\"" @@ -4043,13 +3989,12 @@ msgstr "outras áreas:" msgid "reopened" msgstr "reaberto" -#: templates/web/fiksgatami/header.html:49 #: templates/web/fixmystreet/header.html:53 #: templates/web/zurich/footer.html:12 msgid "sign out" msgstr "sair" -#: templates/web/base/report/new/fill_in_details_form.html:13 +#: templates/web/base/report/new/fill_in_details_form.html:12 #: templates/web/base/report/new/fill_in_details_form.html:15 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 @@ -4061,11 +4006,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:373 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:379 msgid "this type of local problem" msgstr "este tipo de problema local" -#: perllib/Utils.pm:235 +#: perllib/Utils.pm:207 msgid "today" msgstr "hoje" @@ -4095,7 +4040,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:254 #, perl-format msgid "%d hour" msgid_plural "%d hours" @@ -4109,7 +4054,7 @@ msgid_plural "%d supporters" msgstr[0] "%d suppoter" msgstr[1] "%d supporters" -#: perllib/Utils.pm:284 +#: perllib/Utils.pm:256 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -4130,7 +4075,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:250 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -4151,7 +4096,7 @@ 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:280 +#: perllib/Utils.pm:252 #, perl-format msgid "%d day" msgid_plural "%d days" @@ -4165,6 +4110,84 @@ 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." +#~ 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>." + +#~ 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." + +#~ 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." + +#~ msgid "<p style=\"font-size:150%\">Thank you very much for filling in our questionnaire; glad to hear it’s been fixed.</p>" +#~ msgstr "" +#~ "<p style=\\\"font-size:150%\\\"> Muito obrigado pelo preenchimento de nosso \"\n" +#~ "\"Questionário;. Gratos por saber que foi corrigido </p>\"" + +#~ msgid "" +#~ "<p style=\"font-size:150%\">We’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’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%\\\"> Lamentamos ouvir isso. Temos dois \\ n\"\n" +#~ "\"Sugestão: por que não tentar <a href=\\\"http://www.norge.no/styresmakter/\\\"> escrita \\ n\"\n" +#~ "\"Direto para o seu conselheiro (s) </a> ou, se É um problema que pode ser \\ n\"\n" +#~ "\"Fixado por pessoas locais que trabalham juntos, por que não \\ n\"\n" +#~ "\"<a Href=\\\"http://www.pledgebank.com/new\\\"> fazer e divulgar um compromisso </a> \\ N\"\n" +#~ "\"</P>\"" + +#~ msgid "" +#~ "<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" +#~ "suggestions: why not try writing to your local representatives or, if\n" +#~ "it’s a problem that could be fixed by local people working together, why\n" +#~ "not <a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n" +#~ "</p>" +#~ msgstr "" +#~ "<p style=\"font-size:150%\"> Lamentamos ouvir isso. Temos duas ⏎\n" +#~ "sugestão: por que não tentar escrever para seu representante local ou, se for ⏎\n" +#~ "um problema que pode ser corrigido por pessoas locais que trabalham juntos, por que não ⏎\n" +#~ "<a href=\"http://www.pledgebank.com/new\"> fazer e divulgar um compromisso </a> ⏎\n" +#~ "</P>" + +#, fuzzy +#~ msgid "<strong>We will now send it to the council</strong>." +#~ msgstr " e <strong>agora vamos enviá-lo ao Conselho</strong>" + +#~ 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>." + +#~ msgid "Please upload a JPEG image only\n" +#~ msgstr "Faça upload de uma imagem JPEG \n" + +#~ msgid "Thank you — 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." + +#~ msgid "You have successfully confirmed your alert." +#~ msgstr "Você confirmou com sucesso o seu alerta." + +#~ 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>." + +#~ msgid "You have successfully created your alert." +#~ msgstr "Você criou com sucesso o seu alerta." + +#~ msgid "You have successfully deleted your alert." +#~ msgstr "Você removeu com sucesso o seu alerta." + +#, fuzzy +#~ msgid "Your problem has been confirmed!" +#~ msgstr "Este problema foi resolvido" + +#~ msgid "Your report has been created and will shortly be sent." +#~ msgstr "Seu relatório foi criado e será enviado em breve." + +#, fuzzy +#~ msgid "Your update has been confirmed!" +#~ msgstr "Sua password foi alterada" + #~ msgid "Configuration updated - contacts will be generated automatically later" #~ msgstr "Configuração atualizada - contactos gerados automaticamente" diff --git a/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po index 33f0f3ee5..439649e68 100644 --- a/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/ro_RO.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -4,15 +4,18 @@ # Matthew Somerville <matthew@mysociety.org>, 2011-06-03. # # Translators: +# daniel andriev <andriev_daniel@yahoo.com>, 2015 # fldrog <florin.botis@gmail.com>, 2014 +# raduplamadeala <radu@plamadeala.eu>, 2015 +# raduplamadeala <radu@plamadeala.eu>, 2015 # Radu <radu.bilei@gmail.com>, 2014 # test test <nistorbog@gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2015-01-20 16:59+0000\n" -"PO-Revision-Date: 2014-11-19 18:30+0000\n" +"POT-Creation-Date: 2015-07-31 14:28+0100\n" +"PO-Revision-Date: 2015-07-10 13:29+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Romanian (Romania) (http://www.transifex.com/projects/p/fixmystreet/language/ro_RO/)\n" "Language: ro_RO\n" @@ -21,17 +24,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:618 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:386 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:392 msgid " and " -msgstr "și" - -#: templates/web/base/report/new/councils_text_all.html:12 -#: templates/web/base/report/new/councils_text_all.html:19 -#: templates/web/base/report/new/councils_text_all.html:5 -#: templates/web/base/report/new/councils_text_none.html:19 -#: templates/web/base/report/new/councils_text_none.html:21 -#: templates/web/base/report/new/councils_text_some.html:20 +msgstr "şi" + +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_none.html:11 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " @@ -56,7 +57,7 @@ msgstr "%d actualizări" #: templates/web/base/admin/index.html:37 msgid "%d questionnaires sent – %d answered (%s%%)" -msgstr "" +msgstr "%d chestionare trimise – %d completate (%s%%)" #: templates/web/base/pagination.html:10 msgid "%d to %d of %d" @@ -65,24 +66,28 @@ msgstr "%d - %d din %d" #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:23 msgid "%s - Summary reports" -msgstr "" +msgstr "%s - rapoarte de sinteză" -#: perllib/FixMyStreet/DB/Result/Problem.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:672 msgid "%s ref: %s" -msgstr "" +msgstr "%s ref: %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:265 perllib/FixMyStreet/Cobrand/UK.pm:277 +#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 msgid "%s ward, %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:554 +#: perllib/FixMyStreet/DB/Result/Problem.pm:559 msgid "%s, reported at %s" msgstr "%s, raportat la %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:304 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "%s, within %s ward" msgstr "" +#: perllib/FixMyStreet/Map/OSM.pm:42 +msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" +msgstr "" + #: templates/web/base/email_sent.html:29 msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" msgstr "(Nu-ți fă griji — îți vom păstra alerta până îți verifici email-ul.)" @@ -96,7 +101,7 @@ msgid "(Don't worry — we'll hang on to your update while you're checking y msgstr "(Nu-ți fă griji — îți vom păstra actualizarea până îți verifici email-ul.)" #: templates/web/base/admin/report_blocks.html:11 -#: templates/web/base/admin/users.html:29 +#: templates/web/base/admin/users.html:31 msgid "(Email in abuse table)" msgstr "" @@ -124,31 +129,31 @@ msgstr "(închis)" msgid "(fixed)" msgstr "(rezolvat)" -#: templates/web/base/index.html:9 +#: templates/web/base/index.html:8 templates/web/base/index.html:9 #: templates/web/fixmystreet/around/intro.html:2 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" -msgstr "" +msgstr "(cum ar fi graffiti, gunoaie depozitate ilegal, pavaj spart sau iluminat stradal)" #: templates/web/base/reports/_list-entry.html:4 #: templates/web/fixmystreet/report/_item.html:21 msgid "(not sent to council)" msgstr "(netrimis)" -#: templates/web/base/report/new/fill_in_details_form.html:218 -#: templates/web/zurich/report/new/fill_in_details_form.html:94 +#: templates/web/base/report/new/fill_in_details_form.html:199 +#: templates/web/zurich/report/new/fill_in_details_form.html:77 msgid "(optional)" msgstr "(opțional)" #: templates/web/fixmystreet/report/public_label.html:1 msgid "(public)" -msgstr "" +msgstr "(public)" #: templates/web/base/reports/_list-entry.html:2 #: templates/web/fixmystreet/report/_item.html:20 msgid "(sent to both)" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:212 +#: templates/web/base/report/new/fill_in_details_form.html:193 msgid "(we never show your email address or phone number)" msgstr "(nu afișăm niciodată adresa ta de email sau numărul de telefon)" @@ -156,14 +161,13 @@ msgstr "(nu afișăm niciodată adresa ta de email sau numărul de telefon)" 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:393 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Alege o categorie --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 -#: perllib/FixMyStreet/DB/Result/Problem.pm:399 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:630 +#: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Alege un tip de proprietate --" @@ -175,37 +179,7 @@ msgid "" " Maybe add some <code>MAPIT_TYPES</code> to your config file?" msgstr "" -#: templates/web/base/questionnaire/completed.html:20 -msgid "<p style=\"font-size:150%\">Thank you very much for filling in our questionnaire; glad to hear it’s been fixed.</p>" -msgstr "" - -#: templates/web/fiksgatami/questionnaire/completed-open.html:1 -msgid "" -"<p style=\"font-size:150%\">We’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’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/base/questionnaire/completed-open.html:6 -msgid "" -"<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" -"suggestions: why not try writing to your local representatives or, if\n" -"it’s a problem that could be fixed by local people working together, why\n" -"not <a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n" -"</p>" -msgstr "" - -#: templates/web/base/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/base/around/_report_banner.html:4 +#: templates/web/base/around/_report_banner.html:3 #: templates/web/base/around/_report_banner.html:5 msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>" msgstr "" @@ -232,7 +206,7 @@ msgstr "" msgid "<strong>No</strong>, I do not, let me sign in by email:" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:163 +#: templates/web/base/report/new/fill_in_details_form.html:144 msgid "<strong>No</strong>, let me confirm my report by email:" msgstr "" @@ -240,13 +214,8 @@ msgstr "" msgid "<strong>No</strong>, let me confirm my update by email:" msgstr "" -#: templates/web/base/tokens/confirm_problem.html:19 -#: templates/web/base/tokens/confirm_problem.html:20 -msgid "<strong>We will now send it to the council</strong>." -msgstr "" - #: templates/web/base/auth/general.html:37 -#: templates/web/base/report/new/fill_in_details_form.html:141 +#: templates/web/base/report/new/fill_in_details_form.html:122 #: templates/web/base/report/update-form.html:95 #: templates/web/fixmystreet/auth/general.html:37 #: templates/web/fixmystreet/auth/general.html:39 @@ -260,8 +229,8 @@ msgstr "" msgid "About us" msgstr "Despre noi" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:39 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:52 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:31 #: templates/web/fixmystreet/report/update-form.html:28 @@ -277,26 +246,26 @@ msgid "" " categories of problem) to each body." msgstr "" -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/body.html:56 msgid "Add a contact using the form below." msgstr "" #: templates/web/base/admin/bodies.html:74 -#: templates/web/base/admin/body-form.html:233 +#: templates/web/base/admin/body-form.html:240 #: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "" -#: templates/web/base/admin/body.html:108 +#: templates/web/base/admin/body.html:116 #: templates/web/zurich/admin/body.html:31 msgid "Add new category" msgstr "Adaugă o categorie nouă" -#: templates/web/base/admin/users.html:45 +#: templates/web/base/admin/users.html:47 msgid "Add user" msgstr "Adaugă utilizator" -#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:70 +#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:52 msgid "Added %s" msgstr "" @@ -323,9 +292,7 @@ msgstr "" msgid "All Reports" msgstr "" -#: templates/web/base/footer.html:11 templates/web/fiksgatami/footer.html:23 -#: templates/web/fiksgatami/nn/footer.html:23 -#: templates/web/fixmystreet/footer.html:26 +#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:26 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:19 @@ -342,19 +309,9 @@ msgstr "" msgid "All the information you provide here will be sent to" msgstr "" -#: templates/web/base/report/new/councils_text_all.html:12 -#: templates/web/base/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/base/report/new/councils_text_all.html:5 -#: templates/web/base/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/base/report/new/councils_text_all.html:19 -#: templates/web/base/report/new/councils_text_all.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:13 +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_all.html:4 +#: templates/web/base/report/new/fill_in_details_form.html:12 #: templates/web/base/report/new/fill_in_details_form.html:14 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 @@ -371,7 +328,7 @@ msgstr "" msgid "Anonymous" msgstr "" -#: templates/web/base/admin/report_edit.html:62 +#: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:23 msgid "Anonymous:" msgstr "" @@ -380,18 +337,18 @@ msgstr "" msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?" msgstr "" -#: templates/web/fiksgatami/front/footer-marketing.html:14 #: templates/web/fixmystreet/front/footer-marketing.html:16 msgid "Are you a developer?" msgstr "" #: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 msgid "Area covered" msgstr "" #: templates/web/base/admin/bodies.html:15 -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/body.html:60 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "" @@ -409,7 +366,7 @@ msgstr "" msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:163 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:165 #: templates/web/zurich/report/updates.html:11 msgid "Assigned to %s" msgstr "" @@ -422,7 +379,7 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:348 +#: perllib/FixMyStreet/DB/Result/Problem.pm:373 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "" @@ -435,8 +392,8 @@ msgstr "" msgid "Ban email address" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:297 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:301 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" msgstr "" @@ -447,6 +404,7 @@ msgstr "" msgid "Body" msgstr "" +#: templates/web/base/admin/report_edit.html:34 #: templates/web/base/admin/user-form.html:32 msgid "Body:" msgstr "" @@ -459,16 +417,15 @@ msgstr "" msgid "Can't see the map? <em>Skip this step</em>" msgstr "" -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:55 #: templates/web/base/report/new/category.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:53 +#: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 #: templates/web/zurich/admin/stats.html:50 -#: templates/web/zurich/report/new/fill_in_details_form.html:50 msgid "Category" msgstr "" @@ -476,17 +433,16 @@ msgstr "" msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:138 #: templates/web/base/admin/category_edit.html:23 -#: templates/web/base/admin/report_edit.html:61 -#: templates/web/base/report/new/fill_in_details_form.html:68 +#: templates/web/base/admin/report_edit.html:74 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/report_edit-sdm.html:42 #: templates/web/zurich/admin/report_edit.html:140 msgid "Category:" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:377 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383 msgid "Category: %s" msgstr "" @@ -497,19 +453,19 @@ msgstr "" msgid "Change password" msgstr "" -#: templates/web/base/admin/body.html:152 +#: templates/web/base/admin/body.html:160 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/base/admin/body.html:163 +#: templates/web/base/admin/body.html:171 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/base/admin/body.html:183 +#: templates/web/base/admin/body.html:191 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -520,7 +476,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:122 +#: templates/web/base/admin/body.html:130 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." @@ -536,16 +492,16 @@ msgstr "" msgid "Click map to report a problem" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:45 -#: templates/web/base/admin/report_edit.html:47 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:58 +#: templates/web/base/admin/report_edit.html:60 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/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:95 #: templates/web/zurich/admin/report_edit.html:97 #: templates/web/zurich/admin/stats.html:31 @@ -553,11 +509,12 @@ msgstr "" msgid "Closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:762 +#: perllib/FixMyStreet/DB/Result/Problem.pm:771 msgid "Closed by council" msgstr "" -#: templates/web/base/my/my.html:40 templates/web/fixmystreet/my/my.html:46 +#: templates/web/base/my/my.html:40 +#: templates/web/fixmystreet/my/_problem-list.html:12 msgid "Closed reports" msgstr "" @@ -565,7 +522,7 @@ msgstr "" msgid "Closed:" msgstr "" -#: templates/web/base/around/tabbed_lists.html:11 +#: templates/web/base/around/tabbed_lists.html:10 #: templates/web/base/around/tabbed_lists.html:12 msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "" @@ -580,26 +537,26 @@ msgstr "" msgid "Cobrand" msgstr "" -#: templates/web/base/admin/report_edit.html:75 +#: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:50 msgid "Cobrand data:" msgstr "" -#: templates/web/base/admin/report_edit.html:74 +#: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:49 msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" -#: templates/web/base/admin/category_edit.html:47 +#: templates/web/base/admin/category_edit.html:52 msgid "Configure Endpoint" msgstr "" -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/body.html:72 msgid "Confirm" msgstr "" @@ -620,10 +577,10 @@ msgstr "" msgid "Confirmation" msgstr "" -#: templates/web/base/admin/body.html:158 -#: templates/web/base/admin/body.html:71 -#: templates/web/base/admin/category_edit.html:32 -#: templates/web/base/admin/category_edit.html:84 +#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/category_edit.html:37 +#: templates/web/base/admin/category_edit.html:89 #: templates/web/zurich/admin/stats.html:40 msgid "Confirmed" msgstr "" @@ -634,7 +591,7 @@ msgstr "" #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 -#: templates/web/base/admin/report_edit.html:70 +#: templates/web/base/admin/report_edit.html:83 msgid "Confirmed:" msgstr "" @@ -651,13 +608,12 @@ msgid "Contact Us" msgstr "" #: templates/web/base/contact/index.html:6 -#: templates/web/base/contact/submit.html:3 #: templates/web/fixmystreet/contact/index.html:20 msgid "Contact the team" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1327 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1355 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1325 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1353 msgid "Could not find user" msgstr "" @@ -675,6 +631,10 @@ msgstr "" msgid "Council contacts for %s" msgstr "" +#: perllib/FixMyStreet/DB/Result/Problem.pm:670 +msgid "Council ref: %s" +msgstr "" + #: templates/web/base/admin/stats.html:84 msgid "Council:" msgstr "" @@ -690,7 +650,7 @@ msgstr "" msgid "Create a report" msgstr "" -#: templates/web/base/admin/body.html:200 +#: templates/web/base/admin/body.html:208 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "" @@ -702,7 +662,7 @@ msgid "Created" msgstr "" #: templates/web/base/admin/list_updates.html:38 -#: templates/web/base/admin/report_edit.html:69 +#: templates/web/base/admin/report_edit.html:82 #: templates/web/base/admin/update_edit.html:51 #: templates/web/zurich/admin/report_edit-sdm.html:47 #: templates/web/zurich/admin/report_edit.html:61 @@ -719,7 +679,7 @@ msgstr "" msgid "Currently no bodies have been created." msgstr "" -#: templates/web/base/dashboard/index.html:6 +#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 msgid "Dashboard" msgstr "" @@ -729,14 +689,14 @@ msgid "Dealt with by subdivision within 5 working days" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:169 -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:37 -#: templates/web/base/admin/category_edit.html:85 +#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:81 +#: templates/web/base/admin/category_edit.html:42 +#: templates/web/base/admin/category_edit.html:90 msgid "Deleted" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:43 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -756,7 +716,7 @@ msgstr "" msgid "Details:" msgstr "" -#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/body.html:87 msgid "Devolved" msgstr "" @@ -784,8 +744,8 @@ msgstr "" msgid "Don't like forms?" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:47 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:60 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:32 #: templates/web/fixmystreet/report/update-form.html:28 @@ -793,7 +753,7 @@ msgstr "" msgid "Duplicate" msgstr "" -#: templates/web/base/admin/body.html:98 +#: templates/web/base/admin/body.html:106 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" @@ -803,20 +763,20 @@ msgstr "" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 -#: templates/web/base/admin/users.html:31 +#: templates/web/base/admin/users.html:33 #: templates/web/zurich/admin/problem_row.html:42 msgid "Edit" msgstr "" -#: templates/web/base/admin/body.html:212 +#: templates/web/base/admin/body.html:220 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "" #: templates/web/base/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:2 +#: 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:2 +#: templates/web/zurich/admin/report_edit.html:1 #: templates/web/zurich/admin/report_edit.html:5 msgid "Editing problem %d" msgstr "" @@ -830,12 +790,12 @@ msgstr "" msgid "Editing user %d" msgstr "" -#: templates/web/base/admin/category_edit.html:86 +#: templates/web/base/admin/category_edit.html:91 msgid "Editor" msgstr "" #: templates/web/base/admin/bodies.html:23 -#: templates/web/base/admin/category_edit.html:83 +#: templates/web/base/admin/category_edit.html:88 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 #: templates/web/fixmystreet/auth/general.html:21 @@ -846,15 +806,23 @@ msgstr "" msgid "Email" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1303 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1301 msgid "Email added to abuse list" msgstr "" -#: templates/web/base/admin/body.html:147 +#: templates/web/base/admin/body.html:155 msgid "Email address:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1300 +#: templates/web/base/tokens/confirm_alert.html:6 +msgid "Email alert created" +msgstr "" + +#: templates/web/base/tokens/confirm_alert.html:10 +msgid "Email alert deleted" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1298 msgid "Email already in abuse list" msgstr "" @@ -866,8 +834,8 @@ msgstr "" msgid "Email me updates" msgstr "" -#: templates/web/base/admin/category_edit.html:26 -#: templates/web/base/admin/report_edit.html:67 +#: templates/web/base/admin/category_edit.html:31 +#: templates/web/base/admin/report_edit.html:80 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 @@ -878,32 +846,32 @@ msgstr "" msgid "Email:" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:322 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 msgid "Email: %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 msgid "Empty flat or maisonette" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:631 msgid "Empty house or bungalow" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:622 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty office or other commercial" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:623 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Empty pub or bar" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:624 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty public building - school, hospital, etc." msgstr "" -#: templates/web/base/admin/body-form.html:158 -#: templates/web/base/admin/body-form.html:159 +#: templates/web/base/admin/body-form.html:162 +#: templates/web/base/admin/body-form.html:163 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" @@ -911,8 +879,8 @@ msgid "" " <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>." msgstr "" -#: templates/web/base/admin/body-form.html:215 -#: templates/web/base/admin/body-form.html:216 +#: templates/web/base/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:223 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" @@ -923,11 +891,11 @@ msgstr "" msgid "End Date:" msgstr "" -#: templates/web/base/admin/body-form.html:126 +#: templates/web/base/admin/body-form.html:130 msgid "Endpoint" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:72 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:73 msgid "Enter a Zürich street name" msgstr "" @@ -940,7 +908,9 @@ msgstr "" msgid "Enter a nearby postcode, or street name and area" msgstr "" +#: templates/web/base/around/postcode_form.html:1 #: templates/web/base/around/postcode_form.html:2 +#: templates/web/fixmystreet/around/postcode_form.html:10 #: templates/web/fixmystreet/around/postcode_form.html:11 msgid "Enter a nearby street name and area" msgstr "" @@ -950,7 +920,7 @@ msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "" #: templates/web/base/auth/general.html:64 -#: templates/web/base/report/new/fill_in_details_form.html:170 +#: templates/web/base/report/new/fill_in_details_form.html:151 #: templates/web/base/report/update-form.html:124 msgid "Enter a new password:" msgstr "" @@ -962,7 +932,7 @@ msgstr "" msgid "Enter a password" msgstr "" -#: templates/web/base/index-steps.html:33 +#: templates/web/base/index-steps.html:26 msgid "Enter details of the problem" msgstr "" @@ -985,16 +955,21 @@ msgstr "" msgid "Examples:" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:47 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" -#: templates/web/base/admin/report_edit.html:76 +#: templates/web/base/admin/body-form.html:81 +msgid "External URL" +msgstr "" + +#: templates/web/base/admin/category_edit.html:27 +#: templates/web/base/admin/report_edit.html:92 msgid "Extra data:" msgstr "" -#: templates/web/base/contact/submit.html:15 -msgid "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>." +#: templates/web/base/contact/submit.html:13 +msgid "Failed to send message" msgstr "" #: templates/web/zurich/admin/index-dm.html:33 @@ -1007,7 +982,7 @@ msgstr "" msgid "First time" msgstr "" -#: templates/web/base/admin/body.html:40 +#: templates/web/base/admin/body.html:48 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" @@ -1038,9 +1013,9 @@ msgid "" msgstr "" #: templates/web/base/admin/index.html:55 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:41 -#: templates/web/base/admin/report_edit.html:42 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:54 +#: templates/web/base/admin/report_edit.html:55 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/update-form.html:30 @@ -1051,17 +1026,18 @@ msgstr "" msgid "Fixed" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:43 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:56 msgid "Fixed - Council" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:42 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:55 msgid "Fixed - User" msgstr "" -#: templates/web/base/my/my.html:35 templates/web/fixmystreet/my/my.html:41 +#: templates/web/base/my/my.html:35 +#: templates/web/fixmystreet/my/_problem-list.html:7 msgid "Fixed reports" msgstr "" @@ -1069,7 +1045,7 @@ msgstr "" msgid "Fixed:" msgstr "" -#: templates/web/base/admin/body-form.html:84 +#: templates/web/base/admin/body-form.html:89 #: templates/web/zurich/admin/body-form.html:36 msgid "Flag as deleted" msgstr "" @@ -1078,7 +1054,7 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "" @@ -1087,7 +1063,7 @@ msgstr "" msgid "Flagged reports and users" msgstr "" -#: templates/web/base/admin/user-form.html:45 +#: templates/web/base/admin/user-form.html:46 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page." msgstr "" @@ -1095,8 +1071,8 @@ msgstr "" msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." msgstr "" -#: templates/web/base/admin/report_edit.html:78 -#: templates/web/base/admin/user-form.html:51 +#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/user-form.html:52 msgid "Flagged:" msgstr "" @@ -1105,10 +1081,6 @@ msgstr "" msgid "Follow a ward link to view only reports within that ward." msgstr "" -#: templates/web/base/admin/report_edit.html:30 -msgid "For council(s):" -msgstr "" - #: templates/web/base/admin/body-form.html:65 msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "" @@ -1121,8 +1093,6 @@ msgstr "" #: templates/web/base/faq/faq-en-gb.html:1 #: templates/web/base/static/privacy.html:1 #: templates/web/base/static/privacy.html:2 -#: templates/web/fiksgatami/faq/faq-nb.html:1 -#: templates/web/fiksgatami/nn/faq/faq-nn.html:1 msgid "Frequently Asked Questions" msgstr "" @@ -1135,13 +1105,13 @@ msgstr "" msgid "Get updates" msgstr "" -#: templates/web/fixmystreet/reports/_rss.html:4 +#: templates/web/fixmystreet/reports/_rss.html:3 #: 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 +#: templates/web/fixmystreet/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "" @@ -1150,6 +1120,10 @@ msgstr "" msgid "Give me an RSS feed" msgstr "" +#: templates/web/base/questionnaire/completed.html:14 +msgid "Glad to hear it’s been fixed!" +msgstr "" + #: templates/web/base/alert/index.html:34 #: templates/web/base/around/postcode_form.html:8 #: templates/web/fixmystreet/around/postcode_form.html:21 @@ -1157,7 +1131,7 @@ msgstr "" msgid "Go" msgstr "" -#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:93 msgid "Going to send questionnaire?" msgstr "" @@ -1179,9 +1153,7 @@ msgstr "" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "" -#: templates/web/base/footer.html:15 templates/web/fiksgatami/footer.html:27 -#: templates/web/fiksgatami/nn/footer.html:27 -#: templates/web/fixmystreet/footer.html:30 +#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:30 #: templates/web/zurich/faq/faq-de-ch.html:1 #: templates/web/zurich/footer.html:21 #: templates/web/zurich/nav_over_content.html:8 @@ -1193,18 +1165,17 @@ msgstr "" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "" -#: templates/web/fiksgatami/header.html:48 -#: templates/web/fixmystreet/header.html:52 +#: templates/web/fixmystreet/header.html:58 #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:50 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:63 +#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/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:86 #: templates/web/zurich/admin/report_edit.html:90 #: templates/web/zurich/admin/stats.html:32 @@ -1220,7 +1191,7 @@ msgstr "" msgid "Hide pins" msgstr "" -#: templates/web/base/admin/category_edit.html:79 +#: templates/web/base/admin/category_edit.html:84 msgid "History" msgstr "" @@ -1236,19 +1207,25 @@ msgstr "" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:740 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" +#: templates/web/base/tokens/confirm_problem.html:23 +#: templates/web/base/tokens/confirm_problem.html:27 +msgid "I just reported a problem on @fixmystreet" 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." +#: templates/web/base/tokens/confirm_update.html:19 +#: templates/web/base/tokens/confirm_update.html:23 +msgid "I just updated a problem on @fixmystreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:260 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +msgid "I'm afraid we couldn't locate your problem in the database.\n" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 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 "" @@ -1270,7 +1247,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:125 +#: templates/web/base/admin/body.html:133 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." @@ -1288,7 +1265,12 @@ msgstr "" msgid "If you do not, your update will not be posted." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:9 +#: templates/web/base/questionnaire/completed.html:8 +msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." +msgstr "" + +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:8 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 "" @@ -1304,34 +1286,34 @@ msgid "" "your experience of getting the problem fixed?" msgstr "" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/body.html:149 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/base/admin/body-form.html:200 -#: templates/web/base/admin/body-form.html:201 +#: templates/web/base/admin/body-form.html:207 +#: templates/web/base/admin/body-form.html:208 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable <strong>extended Open311 stauses</strong> if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/body-form.html:187 -#: templates/web/base/admin/body-form.html:188 +#: templates/web/base/admin/body-form.html:194 +#: templates/web/base/admin/body-form.html:195 msgid "" "If you've enabled Open311 update-sending above, enable <strong>suppression of alerts</strong> \n" " if you do <strong>not</strong> want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/body-form.html:173 -#: templates/web/base/admin/body-form.html:174 +#: templates/web/base/admin/body-form.html:177 +#: templates/web/base/admin/body-form.html:178 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:127 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 msgid "Illegal ID" msgstr "" @@ -1356,17 +1338,21 @@ 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:143 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:38 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:144 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 #: templates/web/fixmystreet/report/banner.html:19 -#: templates/web/zurich/admin/header.html:2 +#: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 #: templates/web/zurich/admin/report_edit.html:99 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "" +#: templates/web/base/tokens/confirm_alert.html:11 +msgid "Inbox zero, here we come!" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:160 msgid "Include reporter personal details" msgstr "" @@ -1375,7 +1361,7 @@ msgstr "" msgid "Include unconfirmed reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:354 +#: perllib/FixMyStreet/App/Controller/Open311.pm:359 msgid "Incorrect has_photo value \"%s\"" msgstr "" @@ -1383,29 +1369,29 @@ msgstr "" msgid "Internal notes" msgstr "" -#: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:61 msgid "Internal referral" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:339 +#: perllib/FixMyStreet/App/Controller/Open311.pm:344 msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1114 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1112 msgid "Invalid end date" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:432 +#: perllib/FixMyStreet/App/Controller/Open311.pm:437 msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1110 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 msgid "Invalid start date" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:37 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:50 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 #: templates/web/base/report/update-form.html:30 @@ -1419,8 +1405,12 @@ msgstr "" msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "" +#: templates/web/base/tokens/confirm_problem.html:14 +msgid "It’s on its way to the council right now." +msgstr "" + #: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:150 +#: templates/web/base/report/new/fill_in_details_form.html:131 #: templates/web/base/report/update-form.html:104 #: templates/web/fixmystreet/auth/general.html:47 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 @@ -1429,12 +1419,12 @@ msgstr "" msgid "Keep me signed in on this computer" msgstr "" -#: templates/web/base/admin/body.html:62 +#: templates/web/base/admin/body.html:70 #: templates/web/zurich/admin/body.html:16 msgid "Last editor" msgstr "" -#: templates/web/base/admin/report_edit.html:72 +#: templates/web/base/admin/report_edit.html:88 msgid "Last update:" msgstr "" @@ -1442,43 +1432,38 @@ msgstr "" msgid "Last update:" msgstr "" -#: templates/web/base/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:229 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "" -#: templates/web/base/admin/body.html:17 templates/web/base/admin/body.html:19 +#: templates/web/base/admin/body.html:27 msgid "List all reported problems" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:69 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:54 -#: templates/web/zurich/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/category_wrapper.html:4 msgid "Loading..." msgstr "" #: templates/web/base/alert/choose.html:1 #: templates/web/base/alert/choose.html:3 #: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3 -#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:5 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5 #: templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 -#: templates/web/base/tokens/confirm_alert.html:4 #: templates/web/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "" -#: templates/web/base/alert/list.html:13 templates/web/base/alert/list.html:14 -#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:3 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:12 +#: templates/web/base/alert/list.html:14 templates/web/base/alert/list.html:3 msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "" -#: templates/web/base/footer.html:13 templates/web/fiksgatami/footer.html:25 -#: templates/web/fiksgatami/nn/footer.html:25 -#: templates/web/fixmystreet/footer.html:28 +#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:28 msgid "Local alerts" msgstr "" -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:25 msgid "Locate the problem on a map of the area" msgstr "" @@ -1487,17 +1472,27 @@ msgid "MAP" msgstr "" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" msgstr "" -#: perllib/FixMyStreet/Map/OSM.pm:42 -msgid "Map © <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/base/admin/report_edit.html:86 +#, fuzzy +msgid "Mark as sent" +msgstr "marcat ca închis" -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/user-form.html:44 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." msgstr "" +#: templates/web/base/reports/index.html:24 +msgid "Marked fixed/closed in the past eight weeks" +msgstr "" + +#: templates/web/base/reports/index.html:25 +msgid "Marked fixed/closed more than eight weeks ago" +msgstr "" + #: templates/web/fixmystreet/contact/index.html:106 msgid "Message" msgstr "" @@ -1506,7 +1501,7 @@ msgstr "" msgid "Message:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:440 +#: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" msgstr "" @@ -1536,11 +1531,11 @@ msgstr "" #: templates/web/fixmystreet/report/update-form.html:138 #: 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:94 +#: templates/web/zurich/report/new/fill_in_details_form.html:77 msgid "Name" msgstr "" -#: templates/web/base/admin/report_edit.html:66 +#: templates/web/base/admin/report_edit.html:79 #: templates/web/base/admin/update_edit.html:32 #: templates/web/base/admin/user-form.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:43 @@ -1549,25 +1544,25 @@ msgstr "" msgid "Name:" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:321 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:313 msgid "Name: %s" msgstr "" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:186 -#: perllib/FixMyStreet/Geocode/OSM.pm:164 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 +#: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:137 +#: perllib/FixMyStreet/Cobrand/UK.pm:127 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 +#: perllib/FixMyStreet/Cobrand/Default.pm:442 +#: perllib/FixMyStreet/Cobrand/Default.pm:482 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:277 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1581,11 +1576,11 @@ msgstr "" msgid "New <br>problems" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:264 +#: perllib/FixMyStreet/App/Controller/Admin.pm:261 msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:379 msgid "New category contact added" msgstr "" @@ -1658,15 +1653,15 @@ msgstr "" msgid "Next" msgstr "" -#: templates/web/base/admin/body.html:72 templates/web/base/admin/body.html:74 -#: templates/web/base/admin/body.html:78 templates/web/base/admin/body.html:80 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:93 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:44 @@ -1684,7 +1679,7 @@ msgstr "" msgid "No council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:376 +#: perllib/FixMyStreet/DB/Result/Problem.pm:401 msgid "No council selected" msgstr "" @@ -1725,12 +1720,12 @@ msgid "" " your config file is not pointing to a live MapIt service." msgstr "" -#: templates/web/base/report/_support.html:3 +#: templates/web/base/report/_support.html:2 #: templates/web/base/report/_support.html:4 msgid "No supporters" msgstr "" -#: templates/web/base/admin/report_edit.html:30 +#: templates/web/base/admin/report_edit.html:41 #: templates/web/zurich/admin/report_edit-sdm.html:46 #: templates/web/zurich/admin/report_edit.html:60 msgid "None" @@ -1745,8 +1740,8 @@ msgid "" " activity across their body), the ability to hide reports or set special report statuses." msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:46 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -1762,12 +1757,12 @@ msgstr "" msgid "Not reported before" msgstr "" -#: templates/web/base/report/_main.html:61 +#: templates/web/base/report/_main.html:62 msgid "Not reported to council" msgstr "" -#: templates/web/base/admin/body.html:63 -#: templates/web/base/admin/category_edit.html:87 +#: templates/web/base/admin/body.html:71 +#: templates/web/base/admin/category_edit.html:92 #: templates/web/zurich/admin/body.html:17 msgid "Note" msgstr "" @@ -1776,8 +1771,8 @@ msgstr "" 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/base/admin/body.html:178 -#: templates/web/base/admin/category_edit.html:44 +#: templates/web/base/admin/body.html:186 +#: templates/web/base/admin/category_edit.html:49 #: templates/web/zurich/admin/body.html:53 msgid "Note:" msgstr "" @@ -1790,7 +1785,7 @@ msgstr "" msgid "Now to submit your report…" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:132 +#: templates/web/base/report/new/fill_in_details_form.html:113 msgid "Now to submit your report… do you have a FixMyStreet password?" msgstr "" @@ -1807,7 +1802,7 @@ msgid "OK" msgstr "" #: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:16 +#: templates/web/base/report/update.html:17 msgid "Offensive? Unsuitable? Tell us" msgstr "" @@ -1827,19 +1822,19 @@ msgstr "" msgid "Older <br>problems" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:37 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 msgid "One-line summary" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:137 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:36 -#: templates/web/base/admin/report_edit.html:37 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:138 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:49 +#: templates/web/base/admin/report_edit.html:50 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/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:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/report_edit.html:86 #: templates/web/zurich/admin/report_edit.html:88 @@ -1848,10 +1843,19 @@ msgstr "" msgid "Open" msgstr "" -#: templates/web/base/my/my.html:30 templates/web/fixmystreet/my/my.html:36 +#: templates/web/base/reports/index.html:22 +msgid "Open for more than four weeks, with an update within the past eight weeks" +msgstr "" + +#: templates/web/base/my/my.html:30 +#: templates/web/fixmystreet/my/_problem-list.html:2 msgid "Open reports" msgstr "" +#: templates/web/base/reports/index.html:23 +msgid "Open, but not had any update in eight weeks" +msgstr "" + #: templates/web/base/open311/index.html:70 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "" @@ -1874,15 +1878,15 @@ msgstr "" msgid "Or you can subscribe to an alert based upon what ward or council you’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:560 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 -#: perllib/FixMyStreet/DB/Result/Problem.pm:592 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:372 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 +#: perllib/FixMyStreet/DB/Result/Problem.pm:597 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:393 msgid "Other" msgstr "" @@ -1904,8 +1908,8 @@ msgstr "" msgid "Parent" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 msgid "Partial" msgstr "" @@ -1925,7 +1929,7 @@ msgstr "" msgid "Permalink" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:100 +#: templates/web/zurich/report/new/fill_in_details_form.html:83 msgid "Phone number" msgstr "" @@ -1934,27 +1938,27 @@ msgstr "" msgid "Phone number (optional)" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:286 -#: templates/web/base/admin/report_edit.html:68 -#: templates/web/base/report/new/fill_in_details_form.html:216 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:291 +#: templates/web/base/admin/report_edit.html:81 +#: templates/web/base/report/new/fill_in_details_form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:46 #: templates/web/zurich/admin/report_edit.html:60 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:72 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 #: 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 +#: templates/web/zurich/report/new/fill_in_details_form.html:51 msgid "Photo" msgstr "" #: templates/web/base/questionnaire/index.html:71 -#: templates/web/base/report/new/fill_in_details_form.html:103 +#: templates/web/base/report/new/fill_in_details_form.html:84 #: templates/web/base/report/update-form.html:62 #: templates/web/fixmystreet/questionnaire/index.html:91 msgid "Photo:" @@ -1968,11 +1972,11 @@ msgstr "" msgid "Place pin on map" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:38 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/zurich/admin/header.html:2 +#: 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:86 @@ -2006,20 +2010,19 @@ msgstr "" msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:349 -#: 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:395 +#: perllib/FixMyStreet/App/Controller/Admin.pm:343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:876 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 +#: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:401 +#: perllib/FixMyStreet/DB/Result/Problem.pm:418 msgid "Please choose a property type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:370 msgid "Please correct the errors below" msgstr "" @@ -2035,8 +2038,8 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:352 -#: perllib/FixMyStreet/DB/Result/Comment.pm:133 +#: perllib/FixMyStreet/App/Controller/Admin.pm:346 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "" @@ -2047,15 +2050,15 @@ msgstr "" msgid "Please enter a password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:108 -#: perllib/FixMyStreet/DB/Result/Problem.pm:370 +#: perllib/FixMyStreet/App/Controller/Contact.pm:113 +#: perllib/FixMyStreet/DB/Result/Problem.pm:395 #: templates/web/base/js/translation_strings.html:3 msgid "Please enter a subject" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1050 -#: perllib/FixMyStreet/App/Controller/Admin.pm:351 -#: perllib/FixMyStreet/App/Controller/Admin.pm:997 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin.pm:995 #: perllib/FixMyStreet/DB/Result/User.pm:127 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 @@ -2063,16 +2066,16 @@ msgid "Please enter a valid email" msgstr "" #: perllib/FixMyStreet/App/Controller/Alert.pm:346 -#: perllib/FixMyStreet/App/Controller/Contact.pm:118 +#: perllib/FixMyStreet/App/Controller/Contact.pm:123 msgid "Please enter a valid email address" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:373 +#: perllib/FixMyStreet/DB/Result/Problem.pm:398 #: templates/web/base/js/translation_strings.html:4 msgid "Please enter some details" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:107 +#: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/User.pm:124 #: templates/web/base/auth/general.html:13 #: templates/web/base/auth/general.html:8 @@ -2086,7 +2089,7 @@ msgid "Please enter your email" msgstr "" #: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:75 msgid "Please enter your email address" msgstr "" @@ -2094,14 +2097,14 @@ msgstr "" msgid "Please enter your first name" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: perllib/FixMyStreet/Cobrand/UK.pm:318 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:106 -#: perllib/FixMyStreet/DB/Result/Comment.pm:130 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Contact.pm:111 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 +#: perllib/FixMyStreet/DB/Result/Problem.pm:406 #: perllib/FixMyStreet/DB/Result/User.pm:120 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" @@ -2124,7 +2127,7 @@ msgstr "" msgid "Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a href=\"/\">front page</a>." msgstr "" -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:8 msgid "Please fill in details of the problem below." msgstr "" @@ -2139,7 +2142,7 @@ msgstr "" msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:251 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" @@ -2162,16 +2165,16 @@ msgstr "" msgid "Please note:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:246 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:254 msgid "Please provide some explanation as to why you're reopening this report" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:261 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 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:247 msgid "Please say whether you've ever reported a problem to your council before" msgstr "" @@ -2183,7 +2186,7 @@ msgstr "" msgid "Please select the type of alert you want" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please state whether or not the problem has been fixed" msgstr "" @@ -2191,15 +2194,13 @@ msgstr "" msgid "Please take a look at the updates that have been left." msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:176 +#: perllib/FixMyStreet/App/Controller/Photo.pm:177 +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 +#: perllib/FixMyStreet/App/Controller/Photo.pm:189 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:109 +#: perllib/FixMyStreet/App/Controller/Contact.pm:114 msgid "Please write a message" msgstr "" @@ -2238,14 +2239,14 @@ msgstr "" msgid "Privacy" msgstr "" -#: templates/web/base/admin/body.html:194 -#: templates/web/base/admin/body.html:77 -#: templates/web/base/admin/category_edit.html:40 -#: templates/web/base/admin/report_edit.html:79 +#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:85 +#: templates/web/base/admin/category_edit.html:45 +#: templates/web/base/admin/report_edit.html:95 msgid "Private" msgstr "" -#: templates/web/base/maps/openlayers.html:86 +#: templates/web/base/maps/openlayers.html:89 msgid "Problem" msgstr "" @@ -2266,7 +2267,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:966 msgid "Problem marked as open." msgstr "" @@ -2301,16 +2302,15 @@ msgstr "" msgid "Problems within %.1fkm of this location" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:629 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:114 +#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:151 -#: perllib/FixMyStreet/Cobrand/UK.pm:217 +#: perllib/FixMyStreet/Cobrand/UK.pm:207 msgid "Problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:122 -#: perllib/FixMyStreet/Cobrand/UK.pm:231 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "Problems within %s ward" msgstr "" @@ -2328,7 +2328,7 @@ msgstr "" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "" -#: templates/web/base/admin/report_edit.html:32 +#: templates/web/base/admin/report_edit.html:45 msgid "Property address:" msgstr "" @@ -2345,7 +2345,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/base/report/new/fill_in_details_form.html:174 +#: templates/web/base/report/new/fill_in_details_form.html:155 #: templates/web/base/report/update-form.html:128 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 #: templates/web/fixmystreet/report/update-form.html:119 @@ -2366,7 +2366,7 @@ msgstr "" msgid "Publish the response" msgstr "" -#: templates/web/base/questionnaire/completed.html:2 +#: templates/web/base/questionnaire/completed.html:1 #: templates/web/base/questionnaire/index.html:0 #: templates/web/base/questionnaire/index.html:14 #: templates/web/base/questionnaire/index.html:4 @@ -2385,11 +2385,12 @@ msgstr "" msgid "Questionnaire %d sent for problem %d" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 msgid "Questionnaire filled in by problem reporter" msgstr "" #: templates/web/base/alert/_list.html:21 +#: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display.html:50 #: templates/web/base/reports/_rss.html:1 @@ -2399,11 +2400,11 @@ msgstr "" msgid "RSS feed" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:260 perllib/FixMyStreet/Cobrand/UK.pm:272 +#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 msgid "RSS feed for %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "RSS feed for %s ward, %s" msgstr "" @@ -2411,15 +2412,11 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:167 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:175 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:185 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:193 -#: perllib/FixMyStreet/Cobrand/UK.pm:286 perllib/FixMyStreet/Cobrand/UK.pm:298 +#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 msgid "RSS feed of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 msgid "RSS feed of %s, within %s ward" msgstr "" @@ -2432,20 +2429,19 @@ msgstr "" msgid "RSS feed of problems in this %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:630 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:115 +#: perllib/FixMyStreet/Cobrand/Default.pm:651 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:150 -#: perllib/FixMyStreet/Cobrand/UK.pm:224 +#: perllib/FixMyStreet/Cobrand/UK.pm:214 msgid "RSS feed of problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 -#: perllib/FixMyStreet/Cobrand/UK.pm:230 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s ward" msgstr "" -#: templates/web/base/around/display_location.html:3 +#: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:4 msgid "RSS feed of recent local problems" msgstr "" @@ -2485,15 +2481,18 @@ msgstr "" msgid "Remove flag" msgstr "" -#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/report_edit.html:110 #: templates/web/base/admin/update_edit.html:62 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "" -#: templates/web/base/footer.html:7 templates/web/fiksgatami/footer.html:19 -#: templates/web/fiksgatami/nn/footer.html:19 -#: templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 +msgid "Report" +msgstr "" + +#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 #: templates/web/zurich/footer.html:17 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2503,11 +2502,6 @@ msgstr "" msgid "Report abuse" msgstr "" -#: templates/web/base/report_created.html:1 -#: templates/web/base/report_created.html:3 -msgid "Report created" -msgstr "" - #: perllib/FixMyStreet/App/Controller/Rss.pm:295 msgid "Report on %s" msgstr "" @@ -2531,7 +2525,7 @@ msgstr "" msgid "Reported %s, to %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:580 #: templates/web/base/contact/index.html:50 #: templates/web/fixmystreet/contact/index.html:65 msgid "Reported anonymously at %s" @@ -2543,7 +2537,7 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:598 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 #: templates/web/base/contact/index.html:52 #: templates/web/fixmystreet/contact/index.html:67 msgid "Reported by %s at %s" @@ -2553,31 +2547,35 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:571 +#: perllib/FixMyStreet/DB/Result/Problem.pm:576 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:598 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:567 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:589 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:563 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:583 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 msgid "Reported via %s in the %s category by %s at %s" msgstr "" -#: templates/web/base/around/around_index.html:2 +#: templates/web/base/reports/index.html:21 +msgid "Reported within the last four weeks" +msgstr "" + +#: templates/web/base/around/around_index.html:1 #: templates/web/base/around/around_index.html:3 #: templates/web/base/js/translation_strings.html:41 #: templates/web/base/report/new/fill_in_details.html:0 @@ -2587,14 +2585,13 @@ msgstr "" msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:294 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:409 -#: perllib/FixMyStreet/DB/Result/Problem.pm:413 +#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" @@ -2610,7 +2607,7 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:85 msgid "Resend report" msgstr "" @@ -2618,36 +2615,35 @@ msgstr "" msgid "Right place?" msgstr "" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:193 -#: perllib/FixMyStreet/Geocode/OSM.pm:171 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:167 +#: perllib/FixMyStreet/Geocode/OSM.pm:152 msgid "Road operator for this named road (derived from road reference number and type): %s" msgstr "" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:190 -#: perllib/FixMyStreet/Geocode/OSM.pm:168 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:164 +#: perllib/FixMyStreet/Geocode/OSM.pm:149 msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1394 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 -#: templates/web/base/admin/report_edit.html:90 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1403 +#: templates/web/base/admin/report_edit.html:106 #: templates/web/zurich/admin/report_edit.html:73 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1394 -#: templates/web/base/admin/report_edit.html:91 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: templates/web/base/admin/report_edit.html:107 #: templates/web/zurich/admin/report_edit.html:74 msgid "Rotate Right" msgstr "" #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:200 -#: templates/web/base/admin/category_edit.html:76 +#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/category_edit.html:81 #: templates/web/zurich/admin/body.html:59 msgid "Save changes" msgstr "" @@ -2675,7 +2671,7 @@ msgstr "" msgid "Searching found no reports." msgstr "" -#: templates/web/base/admin/users.html:39 +#: templates/web/base/admin/users.html:41 msgid "Searching found no users." msgstr "" @@ -2698,15 +2694,15 @@ 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:680 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "Sent to %s %s later" msgstr "" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:84 msgid "Sent:" msgstr "" -#: templates/web/base/admin/report_edit.html:73 +#: templates/web/base/admin/report_edit.html:89 #: templates/web/zurich/admin/stats.html:45 msgid "Service:" msgstr "" @@ -2715,7 +2711,7 @@ msgstr "" msgid "Share" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:211 +#: templates/web/base/report/new/fill_in_details_form.html:192 #: templates/web/base/report/update-form.html:157 #: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 @@ -2760,12 +2756,12 @@ msgstr "" msgid "Signed in as %s" msgstr "" -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 msgid "Some categories may require additional information." msgstr "" -#: templates/web/base/admin/body-form.html:145 -#: templates/web/base/admin/body-form.html:146 +#: templates/web/base/admin/body-form.html:149 +#: templates/web/base/admin/body-form.html:150 msgid "" "Some endpoints require an <strong>API key</strong> to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -2776,11 +2772,11 @@ msgid "Some photos of recent reports" msgstr "" #: perllib/FixMyStreet/App/View/Email.pm:32 -#: perllib/FixMyStreet/App/View/Web.pm:44 +#: perllib/FixMyStreet/App/View/Web.pm:43 msgid "Some text to localize" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:88 +#: perllib/FixMyStreet/Cobrand/UK.pm:78 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -2788,17 +2784,16 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:215 -#: perllib/FixMyStreet/Geocode.pm:26 perllib/FixMyStreet/Geocode/Bing.pm:56 -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:73 -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:93 -#: perllib/FixMyStreet/Geocode/Google.pm:72 -#: perllib/FixMyStreet/Geocode/OSM.pm:64 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:214 +#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 +#: perllib/FixMyStreet/Geocode/Google.pm:47 +#: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "" -#: perllib/FixMyStreet/Geocode/Bing.pm:51 -#: perllib/FixMyStreet/Geocode/Google.pm:67 +#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: perllib/FixMyStreet/Geocode/Google.pm:44 #: perllib/FixMyStreet/Geocode/Zurich.pm:87 msgid "Sorry, we could not parse that location. Please try again." msgstr "" @@ -2807,7 +2802,7 @@ msgstr "" msgid "Start Date:" msgstr "" -#: templates/web/base/admin/body.html:61 +#: templates/web/base/admin/body.html:69 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 @@ -2815,7 +2810,7 @@ msgstr "" msgid "State" msgstr "" -#: templates/web/base/admin/report_edit.html:34 +#: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 #: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:53 @@ -2824,8 +2819,8 @@ msgstr "" msgid "State:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1200 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:304 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:308 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" @@ -2841,7 +2836,7 @@ msgstr "" msgid "Still open, via questionnaire, %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:381 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 msgid "Subcategory: %s" msgstr "" @@ -2861,19 +2856,19 @@ msgid "Subject:" msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:115 -#: templates/web/base/report/new/fill_in_details_form.html:155 -#: templates/web/base/report/new/fill_in_details_form.html:177 +#: templates/web/base/report/new/fill_in_details_form.html:136 +#: templates/web/base/report/new/fill_in_details_form.html:158 +#: templates/web/base/report/new/fill_in_details_form.html:96 #: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 -#: templates/web/zurich/report/new/fill_in_details_form.html:108 +#: templates/web/zurich/report/new/fill_in_details_form.html:91 msgid "Submit" msgstr "" -#: templates/web/base/admin/report_edit.html:97 +#: templates/web/base/admin/report_edit.html:113 #: templates/web/base/admin/update_edit.html:65 -#: templates/web/base/admin/user-form.html:55 +#: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:64 #: templates/web/zurich/admin/report_edit.html:221 #: templates/web/zurich/admin/update_edit.html:38 @@ -2885,8 +2880,8 @@ msgstr "" msgid "Submit questionnaire" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:133 -#: templates/web/zurich/admin/header.html:2 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:134 +#: 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 @@ -2910,8 +2905,8 @@ msgstr "" msgid "Subscribe me to an email alert" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1191 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:293 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 #: templates/web/zurich/admin/index-dm.html:1 @@ -2927,7 +2922,7 @@ msgstr "" msgid "Summary reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 msgid "Survey" msgstr "" @@ -2941,7 +2936,7 @@ msgstr "" msgid "Text" msgstr "" -#: templates/web/base/admin/body.html:21 +#: templates/web/base/admin/body.html:28 msgid "Text only version" msgstr "" @@ -2950,49 +2945,54 @@ msgstr "" msgid "Text:" msgstr "" -#: templates/web/base/tokens/confirm_update.html:9 -msgid "Thank you — you can <a href=\"%s\">view your updated problem</a> on the site." -msgstr "" - -#: templates/web/base/tokens/confirm_problem.html:18 -msgid "Thank you for reporting this issue" +#: templates/web/base/tokens/confirm_problem.html:12 +msgid "Thank you for reporting this issue!" msgstr "" #: templates/web/base/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/fixmystreet/around/around_index.html:28 -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 :" +#: templates/web/base/tokens/confirm_update.html:15 +msgid "Thank you for updating this issue!" msgstr "" -#: templates/web/base/contact/submit.html:8 -msgid "Thanks for your feedback. We'll get back to you as soon as we can!" +#: templates/web/base/contact/submit.html:6 +#: templates/web/base/questionnaire/completed.html:5 +msgid "Thank you for your feedback" +msgstr "" + +#: templates/web/fixmystreet/around/around_index.html:28 +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 :" msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:9 msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:190 +#: perllib/FixMyStreet/App/Controller/Photo.pm:195 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Council.pm:100 +#: perllib/FixMyStreet/App/Controller/Council.pm:97 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 +#: perllib/FixMyStreet/App/Controller/Location.pm:126 msgid "That location does not appear to be in the UK; please try again." msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:81 +#: perllib/FixMyStreet/Cobrand/UK.pm:71 msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:713 +#: perllib/FixMyStreet/App/Controller/Admin.pm:712 +msgid "That problem has been marked as sent." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:704 msgid "That problem will now be resent." msgstr "" @@ -3004,28 +3004,28 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "" -#: templates/web/base/admin/body.html:136 +#: templates/web/base/admin/body.html:144 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/base/admin/body-form.html:119 -#: templates/web/base/admin/body-form.html:120 +#: templates/web/base/admin/body-form.html:123 +#: templates/web/base/admin/body-form.html:124 msgid "" "The <strong>endpoint</strong> is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." msgstr "" -#: templates/web/base/admin/body-form.html:132 -#: templates/web/base/admin/body-form.html:133 +#: templates/web/base/admin/body-form.html:136 +#: templates/web/base/admin/body-form.html:137 msgid "" "The <strong>jurisdiction</strong> is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" -#: templates/web/base/admin/body-form.html:90 -#: templates/web/base/admin/body-form.html:91 +#: templates/web/base/admin/body-form.html:94 +#: templates/web/base/admin/body-form.html:95 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>." @@ -3046,7 +3046,7 @@ msgstr "" msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." msgstr "" -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:3 msgid "The council won’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 "" @@ -3073,8 +3073,8 @@ 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:185 -#: perllib/FixMyStreet/Geocode/OSM.pm:163 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:159 +#: perllib/FixMyStreet/Geocode/OSM.pm:144 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap." msgstr "" @@ -3132,7 +3132,7 @@ msgstr "" msgid "The passwords do not match" msgstr "" -#: templates/web/base/errors/page_error_404_not_found.html:11 +#: templates/web/base/errors/page_error_404_not_found.html:10 #: templates/web/base/errors/page_error_404_not_found.html:12 msgid "The requested URL '%s' was not found on this server" msgstr "" @@ -3149,7 +3149,7 @@ msgstr "" msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:295 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:300 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" @@ -3160,16 +3160,20 @@ msgid "" " Names are not necessarily unique." msgstr "" +#: templates/web/base/reports/_problem-list.html:15 +msgid "There are no reports to show." +msgstr "" + #: perllib/FixMyStreet/App/Controller/Reports.pm:75 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:131 +#: perllib/FixMyStreet/App/Controller/Contact.pm:136 #: 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/New.pm:762 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 #: templates/web/base/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:25 @@ -3185,7 +3189,7 @@ msgstr "" msgid "There was a problem with your update. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:135 +#: perllib/FixMyStreet/App/Controller/Contact.pm:140 msgid "There were problems with your report. Please see below." msgstr "" @@ -3193,8 +3197,8 @@ msgstr "" msgid "There were problems with your update. Please see below." msgstr "" -#: templates/web/base/admin/body-form.html:108 -#: templates/web/base/admin/body-form.html:109 +#: templates/web/base/admin/body-form.html:112 +#: templates/web/base/admin/body-form.html:113 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" @@ -3207,14 +3211,14 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" -#: templates/web/base/admin/body.html:36 +#: templates/web/base/admin/body.html:44 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported <em>at any location</em>.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" " Currently, users <strong>cannot report problems to this body</strong>." msgstr "" -#: templates/web/base/admin/body.html:46 +#: templates/web/base/admin/body.html:54 msgid "This body has no contacts. This means that currently problems reported to this body <strong>will not be sent</strong>." msgstr "" @@ -3225,18 +3229,18 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:388 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:394 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:391 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 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:136 -#: perllib/FixMyStreet/Cobrand/UK.pm:53 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:902 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:972 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/Cobrand/UK.pm:43 msgid "This information is required" msgstr "" @@ -3275,8 +3279,8 @@ msgstr "" msgid "This problem is old and of unknown status." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:130 #: perllib/FixMyStreet/Cobrand/Zurich.pm:131 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:132 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -3293,15 +3297,15 @@ msgstr "" msgid "This report is currently marked as open." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:319 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:311 msgid "This report was submitted anonymously" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:293 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -3319,7 +3323,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:294 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:299 msgid "To view a map of the precise location of this issue" msgstr "" @@ -3335,8 +3339,12 @@ msgstr "" msgid "Try again" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:46 +#: templates/web/base/contact/submit.html:14 +msgid "Try emailing us directly:" +msgstr "" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -3344,8 +3352,8 @@ msgstr "" msgid "Unable to fix" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/admin/update_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:45 #: templates/web/zurich/admin/report_edit.html:58 @@ -3387,7 +3395,7 @@ msgstr "" msgid "Update below added by %s at %s" msgstr "" -#: templates/web/base/admin/body-form.html:233 +#: templates/web/base/admin/body-form.html:240 #: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "" @@ -3413,7 +3421,7 @@ msgstr "" msgid "Update reopened problem" msgstr "" -#: templates/web/base/admin/body.html:93 +#: templates/web/base/admin/body.html:101 msgid "Update statuses" msgstr "" @@ -3427,12 +3435,12 @@ msgstr "" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1016 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1060 -#: perllib/FixMyStreet/App/Controller/Admin.pm:810 -#: perllib/FixMyStreet/App/Controller/Admin.pm:958 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:549 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:618 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1014 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:808 +#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:556 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:625 msgid "Updated!" msgstr "" @@ -3444,7 +3452,7 @@ msgstr "" msgid "Updates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:139 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -3459,7 +3467,7 @@ msgstr "" msgid "Updates to this problem, FixMyStreet" msgstr "" -#: templates/web/base/admin/body.html:174 +#: templates/web/base/admin/body.html:182 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 "" @@ -3468,11 +3476,11 @@ msgstr "" msgid "User" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1357 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1331 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1329 msgid "User flagged" msgstr "" @@ -3480,16 +3488,16 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:303 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:307 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:380 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:430 +#: perllib/FixMyStreet/App/Controller/Admin.pm:374 +#: perllib/FixMyStreet/App/Controller/Admin.pm:404 +#: perllib/FixMyStreet/App/Controller/Admin.pm:421 msgid "Values updated" msgstr "" @@ -3543,11 +3551,11 @@ msgstr "" msgid "We never show your email address or phone number." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:403 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/base/index-steps.html:38 +#: templates/web/base/index-steps.html:31 msgid "We send it to the council on your behalf" msgstr "" @@ -3556,15 +3564,23 @@ msgstr "" msgid "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>" msgstr "" +#: templates/web/base/questionnaire/completed-open.html:2 +msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" +msgstr "" + #: templates/web/base/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/fixmystreet/report/new/fill_in_details_form.html:41 +#: templates/web/base/contact/submit.html:7 +msgid "We’ll get back to you as soon as we can." +msgstr "" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 msgid "What’s the issue, and where is it?" msgstr "" -#: templates/web/base/admin/category_edit.html:82 +#: templates/web/base/admin/category_edit.html:87 #: templates/web/zurich/admin/body.html:18 msgid "When edited" msgstr "" @@ -3573,15 +3589,18 @@ msgstr "" msgid "When sent" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Whole block of empty flats" msgstr "" +#: templates/web/base/tokens/confirm_alert.html:7 +msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." +msgstr "" + #: templates/web/base/open311/index.html:92 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/fiksgatami/front/footer-marketing.html:15 #: templates/web/fixmystreet/front/footer-marketing.html:17 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" @@ -3605,18 +3624,18 @@ msgid "Year" msgstr "" #: templates/web/base/admin/bodies.html:66 -#: templates/web/base/admin/body.html:72 templates/web/base/admin/body.html:74 -#: templates/web/base/admin/body.html:78 templates/web/base/admin/body.html:80 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:76 +#: templates/web/base/admin/report_edit.html:93 #: templates/web/base/admin/update_edit.html:24 -#: templates/web/base/admin/users.html:29 +#: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:42 #: templates/web/base/questionnaire/index.html:81 @@ -3645,14 +3664,12 @@ msgstr "" msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/tokens/confirm_problem.html:25 -#: templates/web/base/tokens/confirm_problem.html:26 -#: templates/web/zurich/tokens/confirm_problem.html:6 +#: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:8 msgid "You can <a href=\"%s%s\">view the problem on this site</a>." msgstr "" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:48 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -3667,14 +3684,14 @@ msgid "" " reports in the past." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:19 -#: templates/web/base/report/new/councils_text_none.html:20 -#: templates/web/base/report/new/councils_text_some.html:20 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." msgstr "" -#: templates/web/base/admin/body-form.html:81 +#: templates/web/base/admin/body-form.html:85 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" @@ -3687,10 +3704,10 @@ msgid "You have already answered this questionnaire. If you have a question, ple msgstr "" #: templates/web/base/questionnaire/index.html:68 -#: templates/web/base/report/new/fill_in_details_form.html:94 +#: templates/web/base/report/new/fill_in_details_form.html:75 #: templates/web/fixmystreet/questionnaire/index.html:88 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:79 -#: templates/web/zurich/report/new/fill_in_details_form.html:75 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 +#: templates/web/zurich/report/new/fill_in_details_form.html:58 msgid "You have already attached a photo to this report, attaching another one will replace it." msgstr "" @@ -3699,7 +3716,7 @@ msgstr "" msgid "You have already attached a photo to this update, attaching another one will replace it." msgstr "" -#: templates/web/base/auth/sign_out.html:3 +#: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" msgstr "" @@ -3708,26 +3725,11 @@ msgstr "" 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/base/tokens/confirm_alert.html:8 -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/base/tokens/confirm_update.html:14 -msgid "You have successfully confirmed your update and you can now <a href=\"%s\">view it on the site</a>." -msgstr "" - -#: templates/web/base/tokens/confirm_alert.html:12 -msgid "You have successfully created your alert." -msgstr "" - -#: templates/web/base/tokens/confirm_alert.html:10 -msgid "You have successfully deleted your alert." -msgstr "" - #: templates/web/base/report/display.html:20 #: templates/web/base/report/new/fill_in_details.html:37 #: templates/web/fixmystreet/report/display.html:17 @@ -3751,18 +3753,18 @@ 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 "" +msgstr "Trebuie să adăugaţi entităţi (cum ar fi consilii sau departamente) astfel încât să puteţi adăuga apoi categoriile de probleme de care acestea se pot ocupa (cum ar fi gropile sau iluminatul sau iluminatul stradal) şi persoanele de contact (cum ar fi o adresă de e-mail) la care se trimit rapoartele." -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:85 msgid "You really want to resend?" -msgstr "" +msgstr "Chiar doriţi să retrimiteţi?" #: templates/web/base/my/my.html:0 templates/web/base/my/my.html:15 #: templates/web/base/my/my.html:4 templates/web/fixmystreet/my/my.html:0 #: templates/web/fixmystreet/my/my.html:15 #: templates/web/fixmystreet/my/my.html:4 msgid "Your Reports" -msgstr "" +msgstr "Rapoartele dvs." #: templates/web/fixmystreet/alert/_list.html:89 #: templates/web/fixmystreet/alert/updates.html:19 @@ -3773,7 +3775,7 @@ msgstr "" #: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 #: templates/web/fixmystreet/report/update-form.html:76 -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:71 msgid "Your email" msgstr "" @@ -3789,7 +3791,7 @@ msgid "Your email address:" msgstr "" #: templates/web/base/alert/_list.html:92 -#: templates/web/base/report/new/fill_in_details_form.html:125 +#: templates/web/base/report/new/fill_in_details_form.html:106 #: templates/web/base/report/update-form.html:81 msgid "Your email:" msgstr "" @@ -3804,13 +3806,13 @@ msgstr "" #: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 #: templates/web/fixmystreet/report/update-form.html:142 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:98 +#: templates/web/zurich/report/new/fill_in_details_form.html:81 msgid "Your name" msgstr "" #: templates/web/base/auth/general.html:59 #: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:204 +#: templates/web/base/report/new/fill_in_details_form.html:185 #: templates/web/base/report/update-form.html:151 msgid "Your name:" msgstr "" @@ -3828,33 +3830,19 @@ msgstr "" #: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 -#: templates/web/zurich/report/new/fill_in_details_form.html:104 +#: templates/web/zurich/report/new/fill_in_details_form.html:87 msgid "Your phone number" msgstr "" -#: templates/web/base/tokens/confirm_problem.html:4 -msgid "Your problem has been confirmed!" -msgstr "" - #: templates/web/fixmystreet/questionnaire/index.html:16 msgid "Your report" msgstr "" -#: templates/web/base/report_created.html:6 -msgid "Your report has been created and will shortly be sent." -msgstr "" - -#: templates/web/base/footer.html:9 templates/web/fiksgatami/footer.html:21 -#: templates/web/fiksgatami/nn/footer.html:21 -#: templates/web/fixmystreet/footer.html:24 +#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:24 msgid "Your reports" msgstr "" -#: templates/web/base/tokens/confirm_update.html:4 -msgid "Your update has been confirmed!" -msgstr "" - -#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:59 +#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:41 msgid "Your updates" msgstr "" @@ -3871,11 +3859,7 @@ msgstr "" msgid "council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:665 -msgid "council ref: %s" -msgstr "" - -#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:32 #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:54 msgid "didn't use map" @@ -3886,6 +3870,7 @@ msgstr "" msgid "e.g. ‘%s’ or ‘%s’" msgstr "" +#: templates/web/base/admin/body-form.html:188 #: templates/web/base/admin/flagged.html:51 msgid "edit user" msgstr "" @@ -3900,82 +3885,82 @@ msgstr "" msgid "last updated %s" msgstr "" -#: perllib/Utils.pm:263 +#: perllib/Utils.pm:235 msgid "less than a minute" -msgstr "" +msgstr "mai puţin de un minut" #: templates/web/base/report/updates.html:57 msgid "marked as a duplicate report" -msgstr "" +msgstr "marcat ca raport duplicat" #: templates/web/base/report/updates.html:47 msgid "marked as action scheduled" -msgstr "" +msgstr "marcat ca acţiune planificată" #: templates/web/base/report/updates.html:59 msgid "marked as an internal referral" -msgstr "" +msgstr "marcat ca trimitere internă" #: templates/web/base/report/updates.html:49 msgid "marked as closed" -msgstr "" +msgstr "marcat ca închis" #: templates/web/base/report/updates.html:28 #: templates/web/base/report/updates.html:51 msgid "marked as fixed" -msgstr "" +msgstr "marcat ca rezolvat" #: templates/web/base/report/updates.html:45 msgid "marked as in progress" -msgstr "" +msgstr "marcat ca fiind în curs de desfăşurare" #: templates/web/base/report/updates.html:41 msgid "marked as investigating" -msgstr "" +msgstr "marcat ca fiind în curs de cercetare" #: templates/web/base/report/updates.html:55 msgid "marked as not the council's responsibility" -msgstr "" +msgstr "marcat ca nefiind responsabilitatea consiliului" #: templates/web/base/report/updates.html:43 msgid "marked as planned" -msgstr "" +msgstr "marcat ca planificat" #: templates/web/base/report/updates.html:53 msgid "marked as unable to fix" -msgstr "" +msgstr "marcat ca imposibil de rezolvat" #: perllib/FixMyStreet/App/Controller/Admin.pm:130 #: templates/web/base/admin/questionnaire.html:15 #: templates/web/base/admin/questionnaire.html:16 msgid "n/a" -msgstr "" +msgstr "indisponibil" #: templates/web/base/alert/_list.html:87 #: templates/web/fixmystreet/alert/_list.html:85 msgid "or" -msgstr "" +msgstr "sau" #: templates/web/base/js/translation_strings.html:27 msgid "or locate me automatically" -msgstr "" +msgstr "sau găseşte-mă în mod automat" -#: templates/web/base/admin/report_edit.html:25 -#: templates/web/base/admin/report_edit.html:26 -#: templates/web/zurich/admin/report_edit-sdm.html:28 +#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:30 +#: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit-sdm.html:29 -#: templates/web/zurich/admin/report_edit-sdm.html:37 +#: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:38 -#: templates/web/zurich/admin/report_edit.html:28 +#: templates/web/zurich/admin/report_edit.html:27 #: templates/web/zurich/admin/report_edit.html:29 -#: templates/web/zurich/admin/report_edit.html:39 +#: templates/web/zurich/admin/report_edit.html:38 #: templates/web/zurich/admin/report_edit.html:40 -#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit.html:50 #: templates/web/zurich/admin/report_edit.html:52 msgid "originally entered: “%s”" msgstr "" -#: templates/web/base/admin/report_edit.html:30 +#: templates/web/base/admin/report_edit.html:43 msgid "other areas:" msgstr "" @@ -3984,13 +3969,12 @@ msgstr "" msgid "reopened" msgstr "" -#: templates/web/fiksgatami/header.html:49 -#: templates/web/fixmystreet/header.html:53 +#: templates/web/fixmystreet/header.html:59 #: templates/web/zurich/footer.html:12 msgid "sign out" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:13 +#: templates/web/base/report/new/fill_in_details_form.html:12 #: templates/web/base/report/new/fill_in_details_form.html:15 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 @@ -4002,15 +3986,15 @@ msgstr "" msgid "there is no pin shown as the user did not use the map" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:373 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:379 msgid "this type of local problem" msgstr "" -#: perllib/Utils.pm:235 +#: perllib/Utils.pm:207 msgid "today" msgstr "" -#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:32 #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:54 msgid "used map" @@ -4037,7 +4021,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: perllib/Utils.pm:282 +#: perllib/Utils.pm:254 #, perl-format msgid "%d hour" msgid_plural "%d hours" @@ -4053,7 +4037,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: perllib/Utils.pm:284 +#: perllib/Utils.pm:256 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -4077,7 +4061,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: perllib/Utils.pm:278 +#: perllib/Utils.pm:250 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -4101,7 +4085,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: perllib/Utils.pm:280 +#: perllib/Utils.pm:252 #, perl-format msgid "%d day" msgid_plural "%d days" diff --git a/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po index be6036ffe..1436d13b5 100644 --- a/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/ru.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -9,27 +9,25 @@ msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2015-01-20 16:59+0000\n" -"PO-Revision-Date: 2015-01-20 16:45+0000\n" -"Last-Translator: Илья Владимирович Кучаев <kuchaev.iv@gmail.com>\n" +"POT-Creation-Date: 2015-07-31 14:28+0100\n" +"PO-Revision-Date: 2015-07-10 13:29+0000\n" +"Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Russian (http://www.transifex.com/projects/p/fixmystreet/language/ru/)\n" "Language: ru\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%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:618 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:386 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:392 msgid " and " msgstr "и" -#: templates/web/base/report/new/councils_text_all.html:12 -#: templates/web/base/report/new/councils_text_all.html:19 -#: templates/web/base/report/new/councils_text_all.html:5 -#: templates/web/base/report/new/councils_text_none.html:19 -#: templates/web/base/report/new/councils_text_none.html:21 -#: templates/web/base/report/new/councils_text_some.html:20 +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_none.html:11 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " @@ -58,29 +56,33 @@ msgstr "" #: templates/web/base/pagination.html:10 msgid "%d to %d of %d" -msgstr "" +msgstr "%d по %d из %d" #: templates/web/base/reports/body.html:0 #: templates/web/base/reports/body.html:23 msgid "%s - Summary reports" -msgstr "" +msgstr "%s - Итоговые отчеты" -#: perllib/FixMyStreet/DB/Result/Problem.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:672 msgid "%s ref: %s" -msgstr "" +msgstr "%s ref: %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:265 perllib/FixMyStreet/Cobrand/UK.pm:277 +#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 msgid "%s ward, %s" -msgstr "" +msgstr "%s район, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:554 +#: perllib/FixMyStreet/DB/Result/Problem.pm:559 msgid "%s, reported at %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:304 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "%s, within %s ward" msgstr "" +#: perllib/FixMyStreet/Map/OSM.pm:42 +msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" +msgstr "" + #: templates/web/base/email_sent.html:29 msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" msgstr "" @@ -94,7 +96,7 @@ msgid "(Don't worry — we'll hang on to your update while you're checking y msgstr "" #: templates/web/base/admin/report_blocks.html:11 -#: templates/web/base/admin/users.html:29 +#: templates/web/base/admin/users.html:31 msgid "(Email in abuse table)" msgstr "" @@ -122,7 +124,7 @@ msgstr "" msgid "(fixed)" msgstr "" -#: templates/web/base/index.html:9 +#: templates/web/base/index.html:8 templates/web/base/index.html:9 #: templates/web/fixmystreet/around/intro.html:2 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "" @@ -132,8 +134,8 @@ msgstr "" msgid "(not sent to council)" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:218 -#: templates/web/zurich/report/new/fill_in_details_form.html:94 +#: templates/web/base/report/new/fill_in_details_form.html:199 +#: templates/web/zurich/report/new/fill_in_details_form.html:77 msgid "(optional)" msgstr "" @@ -146,7 +148,7 @@ msgstr "" msgid "(sent to both)" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:212 +#: templates/web/base/report/new/fill_in_details_form.html:193 msgid "(we never show your email address or phone number)" msgstr "" @@ -154,14 +156,13 @@ msgstr "" 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:393 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 -#: perllib/FixMyStreet/DB/Result/Problem.pm:399 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:630 +#: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "" @@ -173,37 +174,7 @@ msgid "" " Maybe add some <code>MAPIT_TYPES</code> to your config file?" msgstr "" -#: templates/web/base/questionnaire/completed.html:20 -msgid "<p style=\"font-size:150%\">Thank you very much for filling in our questionnaire; glad to hear it’s been fixed.</p>" -msgstr "" - -#: templates/web/fiksgatami/questionnaire/completed-open.html:1 -msgid "" -"<p style=\"font-size:150%\">We’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’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/base/questionnaire/completed-open.html:6 -msgid "" -"<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" -"suggestions: why not try writing to your local representatives or, if\n" -"it’s a problem that could be fixed by local people working together, why\n" -"not <a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n" -"</p>" -msgstr "" - -#: templates/web/base/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/base/around/_report_banner.html:4 +#: templates/web/base/around/_report_banner.html:3 #: templates/web/base/around/_report_banner.html:5 msgid "<small>If you cannot see the map, <a href='%s' rel='nofollow'>skip this step</a>.</small>" msgstr "" @@ -230,7 +201,7 @@ msgstr "" msgid "<strong>No</strong>, I do not, let me sign in by email:" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:163 +#: templates/web/base/report/new/fill_in_details_form.html:144 msgid "<strong>No</strong>, let me confirm my report by email:" msgstr "" @@ -238,13 +209,8 @@ msgstr "" msgid "<strong>No</strong>, let me confirm my update by email:" msgstr "" -#: templates/web/base/tokens/confirm_problem.html:19 -#: templates/web/base/tokens/confirm_problem.html:20 -msgid "<strong>We will now send it to the council</strong>." -msgstr "" - #: templates/web/base/auth/general.html:37 -#: templates/web/base/report/new/fill_in_details_form.html:141 +#: templates/web/base/report/new/fill_in_details_form.html:122 #: templates/web/base/report/update-form.html:95 #: templates/web/fixmystreet/auth/general.html:37 #: templates/web/fixmystreet/auth/general.html:39 @@ -258,8 +224,8 @@ msgstr "" msgid "About us" msgstr "О нас" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:39 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:52 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:31 #: templates/web/fixmystreet/report/update-form.html:28 @@ -275,26 +241,26 @@ msgid "" " categories of problem) to each body." msgstr "" -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/body.html:56 msgid "Add a contact using the form below." msgstr "Добавить контакт с помощью формы." #: templates/web/base/admin/bodies.html:74 -#: templates/web/base/admin/body-form.html:233 +#: templates/web/base/admin/body-form.html:240 #: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "" -#: templates/web/base/admin/body.html:108 +#: templates/web/base/admin/body.html:116 #: templates/web/zurich/admin/body.html:31 msgid "Add new category" msgstr "Добавить категорию" -#: templates/web/base/admin/users.html:45 +#: templates/web/base/admin/users.html:47 msgid "Add user" msgstr "Добавить пользователя" -#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:70 +#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:52 msgid "Added %s" msgstr "" @@ -321,9 +287,7 @@ msgstr "" msgid "All Reports" msgstr "Все Отчеты" -#: templates/web/base/footer.html:11 templates/web/fiksgatami/footer.html:23 -#: templates/web/fiksgatami/nn/footer.html:23 -#: templates/web/fixmystreet/footer.html:26 +#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:26 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:19 @@ -340,19 +304,9 @@ msgstr "Все отчеты с %s по %s" msgid "All the information you provide here will be sent to" msgstr "" -#: templates/web/base/report/new/councils_text_all.html:12 -#: templates/web/base/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/base/report/new/councils_text_all.html:5 -#: templates/web/base/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/base/report/new/councils_text_all.html:19 -#: templates/web/base/report/new/councils_text_all.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:13 +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_all.html:4 +#: templates/web/base/report/new/fill_in_details_form.html:12 #: templates/web/base/report/new/fill_in_details_form.html:14 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 @@ -369,7 +323,7 @@ msgstr "" msgid "Anonymous" msgstr "" -#: templates/web/base/admin/report_edit.html:62 +#: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:23 msgid "Anonymous:" msgstr "" @@ -378,18 +332,18 @@ msgstr "" msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?" msgstr "" -#: templates/web/fiksgatami/front/footer-marketing.html:14 #: templates/web/fixmystreet/front/footer-marketing.html:16 msgid "Are you a developer?" msgstr "" #: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 msgid "Area covered" msgstr "" #: templates/web/base/admin/bodies.html:15 -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/body.html:60 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "" @@ -407,7 +361,7 @@ msgstr "" msgid "Assign to subdivision:" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:163 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:165 #: templates/web/zurich/report/updates.html:11 msgid "Assigned to %s" msgstr "" @@ -420,7 +374,7 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:348 +#: perllib/FixMyStreet/DB/Result/Problem.pm:373 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "" @@ -433,8 +387,8 @@ msgstr "" msgid "Ban email address" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:297 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:301 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" msgstr "" @@ -445,6 +399,7 @@ msgstr "" msgid "Body" msgstr "" +#: templates/web/base/admin/report_edit.html:34 #: templates/web/base/admin/user-form.html:32 msgid "Body:" msgstr "" @@ -457,16 +412,15 @@ msgstr "" msgid "Can't see the map? <em>Skip this step</em>" msgstr "" -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:55 #: templates/web/base/report/new/category.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:53 +#: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 #: templates/web/zurich/admin/stats.html:50 -#: templates/web/zurich/report/new/fill_in_details_form.html:50 msgid "Category" msgstr "" @@ -474,17 +428,16 @@ msgstr "" msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:138 #: templates/web/base/admin/category_edit.html:23 -#: templates/web/base/admin/report_edit.html:61 -#: templates/web/base/report/new/fill_in_details_form.html:68 +#: templates/web/base/admin/report_edit.html:74 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/report_edit-sdm.html:42 #: templates/web/zurich/admin/report_edit.html:140 msgid "Category:" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:377 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383 msgid "Category: %s" msgstr "" @@ -495,19 +448,19 @@ msgstr "" msgid "Change password" msgstr "" -#: templates/web/base/admin/body.html:152 +#: templates/web/base/admin/body.html:160 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/base/admin/body.html:163 +#: templates/web/base/admin/body.html:171 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/base/admin/body.html:183 +#: templates/web/base/admin/body.html:191 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -518,7 +471,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:122 +#: templates/web/base/admin/body.html:130 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." @@ -534,16 +487,16 @@ msgstr "" msgid "Click map to report a problem" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:45 -#: templates/web/base/admin/report_edit.html:47 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:58 +#: templates/web/base/admin/report_edit.html:60 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/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:95 #: templates/web/zurich/admin/report_edit.html:97 #: templates/web/zurich/admin/stats.html:31 @@ -551,11 +504,12 @@ msgstr "" msgid "Closed" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:762 +#: perllib/FixMyStreet/DB/Result/Problem.pm:771 msgid "Closed by council" msgstr "" -#: templates/web/base/my/my.html:40 templates/web/fixmystreet/my/my.html:46 +#: templates/web/base/my/my.html:40 +#: templates/web/fixmystreet/my/_problem-list.html:12 msgid "Closed reports" msgstr "" @@ -563,7 +517,7 @@ msgstr "" msgid "Closed:" msgstr "" -#: templates/web/base/around/tabbed_lists.html:11 +#: templates/web/base/around/tabbed_lists.html:10 #: templates/web/base/around/tabbed_lists.html:12 msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "" @@ -578,26 +532,26 @@ msgstr "" msgid "Cobrand" msgstr "" -#: templates/web/base/admin/report_edit.html:75 +#: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:50 msgid "Cobrand data:" msgstr "" -#: templates/web/base/admin/report_edit.html:74 +#: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:49 msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" -#: templates/web/base/admin/category_edit.html:47 +#: templates/web/base/admin/category_edit.html:52 msgid "Configure Endpoint" msgstr "" -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/body.html:72 msgid "Confirm" msgstr "" @@ -618,10 +572,10 @@ msgstr "" msgid "Confirmation" msgstr "" -#: templates/web/base/admin/body.html:158 -#: templates/web/base/admin/body.html:71 -#: templates/web/base/admin/category_edit.html:32 -#: templates/web/base/admin/category_edit.html:84 +#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/category_edit.html:37 +#: templates/web/base/admin/category_edit.html:89 #: templates/web/zurich/admin/stats.html:40 msgid "Confirmed" msgstr "" @@ -632,7 +586,7 @@ msgstr "" #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 -#: templates/web/base/admin/report_edit.html:70 +#: templates/web/base/admin/report_edit.html:83 msgid "Confirmed:" msgstr "" @@ -649,13 +603,12 @@ msgid "Contact Us" msgstr "" #: templates/web/base/contact/index.html:6 -#: templates/web/base/contact/submit.html:3 #: templates/web/fixmystreet/contact/index.html:20 msgid "Contact the team" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1327 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1355 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1325 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1353 msgid "Could not find user" msgstr "" @@ -673,6 +626,10 @@ msgstr "" msgid "Council contacts for %s" msgstr "" +#: perllib/FixMyStreet/DB/Result/Problem.pm:670 +msgid "Council ref: %s" +msgstr "" + #: templates/web/base/admin/stats.html:84 msgid "Council:" msgstr "" @@ -688,7 +645,7 @@ msgstr "" msgid "Create a report" msgstr "" -#: templates/web/base/admin/body.html:200 +#: templates/web/base/admin/body.html:208 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "" @@ -700,7 +657,7 @@ msgid "Created" msgstr "" #: templates/web/base/admin/list_updates.html:38 -#: templates/web/base/admin/report_edit.html:69 +#: templates/web/base/admin/report_edit.html:82 #: templates/web/base/admin/update_edit.html:51 #: templates/web/zurich/admin/report_edit-sdm.html:47 #: templates/web/zurich/admin/report_edit.html:61 @@ -717,7 +674,7 @@ msgstr "" msgid "Currently no bodies have been created." msgstr "" -#: templates/web/base/dashboard/index.html:6 +#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 msgid "Dashboard" msgstr "" @@ -727,14 +684,14 @@ msgid "Dealt with by subdivision within 5 working days" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:169 -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:37 -#: templates/web/base/admin/category_edit.html:85 +#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:81 +#: templates/web/base/admin/category_edit.html:42 +#: templates/web/base/admin/category_edit.html:90 msgid "Deleted" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:43 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -754,7 +711,7 @@ msgstr "" msgid "Details:" msgstr "" -#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/body.html:87 msgid "Devolved" msgstr "" @@ -782,8 +739,8 @@ msgstr "" msgid "Don't like forms?" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:47 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:60 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:32 #: templates/web/fixmystreet/report/update-form.html:28 @@ -791,7 +748,7 @@ msgstr "" msgid "Duplicate" msgstr "" -#: templates/web/base/admin/body.html:98 +#: templates/web/base/admin/body.html:106 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" @@ -801,20 +758,20 @@ msgstr "" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 -#: templates/web/base/admin/users.html:31 +#: templates/web/base/admin/users.html:33 #: templates/web/zurich/admin/problem_row.html:42 msgid "Edit" msgstr "" -#: templates/web/base/admin/body.html:212 +#: templates/web/base/admin/body.html:220 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "" #: templates/web/base/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:2 +#: 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:2 +#: templates/web/zurich/admin/report_edit.html:1 #: templates/web/zurich/admin/report_edit.html:5 msgid "Editing problem %d" msgstr "" @@ -828,12 +785,12 @@ msgstr "" msgid "Editing user %d" msgstr "" -#: templates/web/base/admin/category_edit.html:86 +#: templates/web/base/admin/category_edit.html:91 msgid "Editor" msgstr "" #: templates/web/base/admin/bodies.html:23 -#: templates/web/base/admin/category_edit.html:83 +#: templates/web/base/admin/category_edit.html:88 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 #: templates/web/fixmystreet/auth/general.html:21 @@ -844,15 +801,23 @@ msgstr "" msgid "Email" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1303 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1301 msgid "Email added to abuse list" msgstr "" -#: templates/web/base/admin/body.html:147 +#: templates/web/base/admin/body.html:155 msgid "Email address:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1300 +#: templates/web/base/tokens/confirm_alert.html:6 +msgid "Email alert created" +msgstr "" + +#: templates/web/base/tokens/confirm_alert.html:10 +msgid "Email alert deleted" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1298 msgid "Email already in abuse list" msgstr "" @@ -864,8 +829,8 @@ msgstr "" msgid "Email me updates" msgstr "" -#: templates/web/base/admin/category_edit.html:26 -#: templates/web/base/admin/report_edit.html:67 +#: templates/web/base/admin/category_edit.html:31 +#: templates/web/base/admin/report_edit.html:80 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 @@ -876,32 +841,32 @@ msgstr "" msgid "Email:" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:322 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 msgid "Email: %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 msgid "Empty flat or maisonette" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:631 msgid "Empty house or bungalow" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:622 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty office or other commercial" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:623 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Empty pub or bar" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:624 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty public building - school, hospital, etc." msgstr "" -#: templates/web/base/admin/body-form.html:158 -#: templates/web/base/admin/body-form.html:159 +#: templates/web/base/admin/body-form.html:162 +#: templates/web/base/admin/body-form.html:163 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" @@ -909,8 +874,8 @@ msgid "" " <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>." msgstr "" -#: templates/web/base/admin/body-form.html:215 -#: templates/web/base/admin/body-form.html:216 +#: templates/web/base/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:223 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" @@ -921,11 +886,11 @@ msgstr "" msgid "End Date:" msgstr "" -#: templates/web/base/admin/body-form.html:126 +#: templates/web/base/admin/body-form.html:130 msgid "Endpoint" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:72 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:73 msgid "Enter a Zürich street name" msgstr "" @@ -938,7 +903,9 @@ msgstr "" msgid "Enter a nearby postcode, or street name and area" msgstr "" +#: templates/web/base/around/postcode_form.html:1 #: templates/web/base/around/postcode_form.html:2 +#: templates/web/fixmystreet/around/postcode_form.html:10 #: templates/web/fixmystreet/around/postcode_form.html:11 msgid "Enter a nearby street name and area" msgstr "" @@ -948,7 +915,7 @@ msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "" #: templates/web/base/auth/general.html:64 -#: templates/web/base/report/new/fill_in_details_form.html:170 +#: templates/web/base/report/new/fill_in_details_form.html:151 #: templates/web/base/report/update-form.html:124 msgid "Enter a new password:" msgstr "" @@ -960,7 +927,7 @@ msgstr "" msgid "Enter a password" msgstr "" -#: templates/web/base/index-steps.html:33 +#: templates/web/base/index-steps.html:26 msgid "Enter details of the problem" msgstr "" @@ -983,16 +950,21 @@ msgstr "" msgid "Examples:" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:47 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" -#: templates/web/base/admin/report_edit.html:76 +#: templates/web/base/admin/body-form.html:81 +msgid "External URL" +msgstr "" + +#: templates/web/base/admin/category_edit.html:27 +#: templates/web/base/admin/report_edit.html:92 msgid "Extra data:" msgstr "" -#: templates/web/base/contact/submit.html:15 -msgid "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>." +#: templates/web/base/contact/submit.html:13 +msgid "Failed to send message" msgstr "" #: templates/web/zurich/admin/index-dm.html:33 @@ -1005,7 +977,7 @@ msgstr "" msgid "First time" msgstr "" -#: templates/web/base/admin/body.html:40 +#: templates/web/base/admin/body.html:48 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" @@ -1036,9 +1008,9 @@ msgid "" msgstr "" #: templates/web/base/admin/index.html:55 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:41 -#: templates/web/base/admin/report_edit.html:42 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:54 +#: templates/web/base/admin/report_edit.html:55 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/update-form.html:30 @@ -1049,17 +1021,18 @@ msgstr "" msgid "Fixed" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:43 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:56 msgid "Fixed - Council" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:42 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:55 msgid "Fixed - User" msgstr "" -#: templates/web/base/my/my.html:35 templates/web/fixmystreet/my/my.html:41 +#: templates/web/base/my/my.html:35 +#: templates/web/fixmystreet/my/_problem-list.html:7 msgid "Fixed reports" msgstr "" @@ -1067,7 +1040,7 @@ msgstr "" msgid "Fixed:" msgstr "" -#: templates/web/base/admin/body-form.html:84 +#: templates/web/base/admin/body-form.html:89 #: templates/web/zurich/admin/body-form.html:36 msgid "Flag as deleted" msgstr "" @@ -1076,7 +1049,7 @@ msgstr "" msgid "Flag user" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "" @@ -1085,7 +1058,7 @@ msgstr "" msgid "Flagged reports and users" msgstr "" -#: templates/web/base/admin/user-form.html:45 +#: templates/web/base/admin/user-form.html:46 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page." msgstr "" @@ -1093,8 +1066,8 @@ msgstr "" msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." msgstr "" -#: templates/web/base/admin/report_edit.html:78 -#: templates/web/base/admin/user-form.html:51 +#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/user-form.html:52 msgid "Flagged:" msgstr "" @@ -1103,10 +1076,6 @@ msgstr "" msgid "Follow a ward link to view only reports within that ward." msgstr "" -#: templates/web/base/admin/report_edit.html:30 -msgid "For council(s):" -msgstr "" - #: templates/web/base/admin/body-form.html:65 msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "" @@ -1119,8 +1088,6 @@ msgstr "" #: templates/web/base/faq/faq-en-gb.html:1 #: templates/web/base/static/privacy.html:1 #: templates/web/base/static/privacy.html:2 -#: templates/web/fiksgatami/faq/faq-nb.html:1 -#: templates/web/fiksgatami/nn/faq/faq-nn.html:1 msgid "Frequently Asked Questions" msgstr "" @@ -1133,13 +1100,13 @@ msgstr "" msgid "Get updates" msgstr "" -#: templates/web/fixmystreet/reports/_rss.html:4 +#: templates/web/fixmystreet/reports/_rss.html:3 #: 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 +#: templates/web/fixmystreet/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "" @@ -1148,6 +1115,10 @@ msgstr "" msgid "Give me an RSS feed" msgstr "" +#: templates/web/base/questionnaire/completed.html:14 +msgid "Glad to hear it’s been fixed!" +msgstr "" + #: templates/web/base/alert/index.html:34 #: templates/web/base/around/postcode_form.html:8 #: templates/web/fixmystreet/around/postcode_form.html:21 @@ -1155,7 +1126,7 @@ msgstr "" msgid "Go" msgstr "" -#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:93 msgid "Going to send questionnaire?" msgstr "" @@ -1177,9 +1148,7 @@ msgstr "" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "" -#: templates/web/base/footer.html:15 templates/web/fiksgatami/footer.html:27 -#: templates/web/fiksgatami/nn/footer.html:27 -#: templates/web/fixmystreet/footer.html:30 +#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:30 #: templates/web/zurich/faq/faq-de-ch.html:1 #: templates/web/zurich/footer.html:21 #: templates/web/zurich/nav_over_content.html:8 @@ -1191,18 +1160,17 @@ msgstr "" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "" -#: templates/web/fiksgatami/header.html:48 -#: templates/web/fixmystreet/header.html:52 +#: templates/web/fixmystreet/header.html:58 #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:50 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:63 +#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/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:86 #: templates/web/zurich/admin/report_edit.html:90 #: templates/web/zurich/admin/stats.html:32 @@ -1218,7 +1186,7 @@ msgstr "" msgid "Hide pins" msgstr "" -#: templates/web/base/admin/category_edit.html:79 +#: templates/web/base/admin/category_edit.html:84 msgid "History" msgstr "" @@ -1234,19 +1202,25 @@ msgstr "" msgid "How to send successful reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:740 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" +#: templates/web/base/tokens/confirm_problem.html:23 +#: templates/web/base/tokens/confirm_problem.html:27 +msgid "I just reported a problem on @fixmystreet" 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." +#: templates/web/base/tokens/confirm_update.html:19 +#: templates/web/base/tokens/confirm_update.html:23 +msgid "I just updated a problem on @fixmystreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:260 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +msgid "I'm afraid we couldn't locate your problem in the database.\n" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 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 "" @@ -1268,7 +1242,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:125 +#: templates/web/base/admin/body.html:133 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." @@ -1286,7 +1260,12 @@ msgstr "" msgid "If you do not, your update will not be posted." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:9 +#: templates/web/base/questionnaire/completed.html:8 +msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." +msgstr "" + +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:8 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 "" @@ -1302,34 +1281,34 @@ msgid "" "your experience of getting the problem fixed?" msgstr "" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/body.html:149 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/base/admin/body-form.html:200 -#: templates/web/base/admin/body-form.html:201 +#: templates/web/base/admin/body-form.html:207 +#: templates/web/base/admin/body-form.html:208 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable <strong>extended Open311 stauses</strong> if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/body-form.html:187 -#: templates/web/base/admin/body-form.html:188 +#: templates/web/base/admin/body-form.html:194 +#: templates/web/base/admin/body-form.html:195 msgid "" "If you've enabled Open311 update-sending above, enable <strong>suppression of alerts</strong> \n" " if you do <strong>not</strong> want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/body-form.html:173 -#: templates/web/base/admin/body-form.html:174 +#: templates/web/base/admin/body-form.html:177 +#: templates/web/base/admin/body-form.html:178 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:127 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 msgid "Illegal ID" msgstr "" @@ -1354,17 +1333,21 @@ 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:143 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:38 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:144 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 #: templates/web/fixmystreet/report/banner.html:19 -#: templates/web/zurich/admin/header.html:2 +#: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 #: templates/web/zurich/admin/report_edit.html:99 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "" +#: templates/web/base/tokens/confirm_alert.html:11 +msgid "Inbox zero, here we come!" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:160 msgid "Include reporter personal details" msgstr "" @@ -1373,7 +1356,7 @@ msgstr "" msgid "Include unconfirmed reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:354 +#: perllib/FixMyStreet/App/Controller/Open311.pm:359 msgid "Incorrect has_photo value \"%s\"" msgstr "" @@ -1381,29 +1364,29 @@ msgstr "" msgid "Internal notes" msgstr "" -#: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:61 msgid "Internal referral" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:339 +#: perllib/FixMyStreet/App/Controller/Open311.pm:344 msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1114 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1112 msgid "Invalid end date" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:432 +#: perllib/FixMyStreet/App/Controller/Open311.pm:437 msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1110 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 msgid "Invalid start date" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:37 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:50 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 #: templates/web/base/report/update-form.html:30 @@ -1417,8 +1400,12 @@ msgstr "" msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "" +#: templates/web/base/tokens/confirm_problem.html:14 +msgid "It’s on its way to the council right now." +msgstr "" + #: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:150 +#: templates/web/base/report/new/fill_in_details_form.html:131 #: templates/web/base/report/update-form.html:104 #: templates/web/fixmystreet/auth/general.html:47 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 @@ -1427,12 +1414,12 @@ msgstr "" msgid "Keep me signed in on this computer" msgstr "" -#: templates/web/base/admin/body.html:62 +#: templates/web/base/admin/body.html:70 #: templates/web/zurich/admin/body.html:16 msgid "Last editor" msgstr "" -#: templates/web/base/admin/report_edit.html:72 +#: templates/web/base/admin/report_edit.html:88 msgid "Last update:" msgstr "" @@ -1440,43 +1427,38 @@ msgstr "" msgid "Last update:" msgstr "" -#: templates/web/base/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:229 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "" -#: templates/web/base/admin/body.html:17 templates/web/base/admin/body.html:19 +#: templates/web/base/admin/body.html:27 msgid "List all reported problems" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:69 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:54 -#: templates/web/zurich/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/category_wrapper.html:4 msgid "Loading..." msgstr "" #: templates/web/base/alert/choose.html:1 #: templates/web/base/alert/choose.html:3 #: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3 -#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:5 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5 #: templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 -#: templates/web/base/tokens/confirm_alert.html:4 #: templates/web/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "" -#: templates/web/base/alert/list.html:13 templates/web/base/alert/list.html:14 -#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:3 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:12 +#: templates/web/base/alert/list.html:14 templates/web/base/alert/list.html:3 msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "" -#: templates/web/base/footer.html:13 templates/web/fiksgatami/footer.html:25 -#: templates/web/fiksgatami/nn/footer.html:25 -#: templates/web/fixmystreet/footer.html:28 +#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:28 msgid "Local alerts" msgstr "" -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:25 msgid "Locate the problem on a map of the area" msgstr "" @@ -1485,17 +1467,26 @@ msgid "MAP" msgstr "" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" msgstr "" -#: perllib/FixMyStreet/Map/OSM.pm:42 -msgid "Map © <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>" +#: templates/web/base/admin/report_edit.html:86 +msgid "Mark as sent" msgstr "" -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/user-form.html:44 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." msgstr "" +#: templates/web/base/reports/index.html:24 +msgid "Marked fixed/closed in the past eight weeks" +msgstr "" + +#: templates/web/base/reports/index.html:25 +msgid "Marked fixed/closed more than eight weeks ago" +msgstr "" + #: templates/web/fixmystreet/contact/index.html:106 msgid "Message" msgstr "" @@ -1504,7 +1495,7 @@ msgstr "" msgid "Message:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Open311.pm:440 +#: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" msgstr "" @@ -1534,11 +1525,11 @@ msgstr "" #: templates/web/fixmystreet/report/update-form.html:138 #: 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:94 +#: templates/web/zurich/report/new/fill_in_details_form.html:77 msgid "Name" msgstr "" -#: templates/web/base/admin/report_edit.html:66 +#: templates/web/base/admin/report_edit.html:79 #: templates/web/base/admin/update_edit.html:32 #: templates/web/base/admin/user-form.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:43 @@ -1547,25 +1538,25 @@ msgstr "" msgid "Name:" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:321 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:313 msgid "Name: %s" msgstr "" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:186 -#: perllib/FixMyStreet/Geocode/OSM.pm:164 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 +#: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:137 +#: perllib/FixMyStreet/Cobrand/UK.pm:127 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 +#: perllib/FixMyStreet/Cobrand/Default.pm:442 +#: perllib/FixMyStreet/Cobrand/Default.pm:482 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:277 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1579,11 +1570,11 @@ msgstr "" msgid "New <br>problems" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:264 +#: perllib/FixMyStreet/App/Controller/Admin.pm:261 msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:379 msgid "New category contact added" msgstr "" @@ -1656,15 +1647,15 @@ msgstr "" msgid "Next" msgstr "" -#: templates/web/base/admin/body.html:72 templates/web/base/admin/body.html:74 -#: templates/web/base/admin/body.html:78 templates/web/base/admin/body.html:80 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:93 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:44 @@ -1682,7 +1673,7 @@ msgstr "" msgid "No council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:376 +#: perllib/FixMyStreet/DB/Result/Problem.pm:401 msgid "No council selected" msgstr "" @@ -1723,12 +1714,12 @@ msgid "" " your config file is not pointing to a live MapIt service." msgstr "" -#: templates/web/base/report/_support.html:3 +#: templates/web/base/report/_support.html:2 #: templates/web/base/report/_support.html:4 msgid "No supporters" msgstr "" -#: templates/web/base/admin/report_edit.html:30 +#: templates/web/base/admin/report_edit.html:41 #: templates/web/zurich/admin/report_edit-sdm.html:46 #: templates/web/zurich/admin/report_edit.html:60 msgid "None" @@ -1743,8 +1734,8 @@ msgid "" " activity across their body), the ability to hide reports or set special report statuses." msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:46 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -1760,12 +1751,12 @@ msgstr "" msgid "Not reported before" msgstr "" -#: templates/web/base/report/_main.html:61 +#: templates/web/base/report/_main.html:62 msgid "Not reported to council" msgstr "" -#: templates/web/base/admin/body.html:63 -#: templates/web/base/admin/category_edit.html:87 +#: templates/web/base/admin/body.html:71 +#: templates/web/base/admin/category_edit.html:92 #: templates/web/zurich/admin/body.html:17 msgid "Note" msgstr "" @@ -1774,8 +1765,8 @@ msgstr "" 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/base/admin/body.html:178 -#: templates/web/base/admin/category_edit.html:44 +#: templates/web/base/admin/body.html:186 +#: templates/web/base/admin/category_edit.html:49 #: templates/web/zurich/admin/body.html:53 msgid "Note:" msgstr "" @@ -1788,7 +1779,7 @@ msgstr "" msgid "Now to submit your report…" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:132 +#: templates/web/base/report/new/fill_in_details_form.html:113 msgid "Now to submit your report… do you have a FixMyStreet password?" msgstr "" @@ -1805,7 +1796,7 @@ msgid "OK" msgstr "" #: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:16 +#: templates/web/base/report/update.html:17 msgid "Offensive? Unsuitable? Tell us" msgstr "" @@ -1825,19 +1816,19 @@ msgstr "" msgid "Older <br>problems" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:37 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 msgid "One-line summary" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:137 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:36 -#: templates/web/base/admin/report_edit.html:37 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:138 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:49 +#: templates/web/base/admin/report_edit.html:50 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/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:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/report_edit.html:86 #: templates/web/zurich/admin/report_edit.html:88 @@ -1846,10 +1837,19 @@ msgstr "" msgid "Open" msgstr "" -#: templates/web/base/my/my.html:30 templates/web/fixmystreet/my/my.html:36 +#: templates/web/base/reports/index.html:22 +msgid "Open for more than four weeks, with an update within the past eight weeks" +msgstr "" + +#: templates/web/base/my/my.html:30 +#: templates/web/fixmystreet/my/_problem-list.html:2 msgid "Open reports" msgstr "" +#: templates/web/base/reports/index.html:23 +msgid "Open, but not had any update in eight weeks" +msgstr "" + #: templates/web/base/open311/index.html:70 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "" @@ -1872,15 +1872,15 @@ msgstr "" msgid "Or you can subscribe to an alert based upon what ward or council you’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:560 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 -#: perllib/FixMyStreet/DB/Result/Problem.pm:592 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:372 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 +#: perllib/FixMyStreet/DB/Result/Problem.pm:597 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:393 msgid "Other" msgstr "" @@ -1902,8 +1902,8 @@ msgstr "" msgid "Parent" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 msgid "Partial" msgstr "" @@ -1923,7 +1923,7 @@ msgstr "" msgid "Permalink" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:100 +#: templates/web/zurich/report/new/fill_in_details_form.html:83 msgid "Phone number" msgstr "" @@ -1932,27 +1932,27 @@ msgstr "" msgid "Phone number (optional)" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:286 -#: templates/web/base/admin/report_edit.html:68 -#: templates/web/base/report/new/fill_in_details_form.html:216 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:291 +#: templates/web/base/admin/report_edit.html:81 +#: templates/web/base/report/new/fill_in_details_form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:46 #: templates/web/zurich/admin/report_edit.html:60 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:72 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 #: 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 +#: templates/web/zurich/report/new/fill_in_details_form.html:51 msgid "Photo" msgstr "" #: templates/web/base/questionnaire/index.html:71 -#: templates/web/base/report/new/fill_in_details_form.html:103 +#: templates/web/base/report/new/fill_in_details_form.html:84 #: templates/web/base/report/update-form.html:62 #: templates/web/fixmystreet/questionnaire/index.html:91 msgid "Photo:" @@ -1966,11 +1966,11 @@ msgstr "" msgid "Place pin on map" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:38 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/zurich/admin/header.html:2 +#: 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:86 @@ -2004,20 +2004,19 @@ msgstr "" msgid "Please check your email address is correct" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:349 -#: 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:395 +#: perllib/FixMyStreet/App/Controller/Admin.pm:343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:876 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 +#: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:401 +#: perllib/FixMyStreet/DB/Result/Problem.pm:418 msgid "Please choose a property type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:370 msgid "Please correct the errors below" msgstr "" @@ -2033,8 +2032,8 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:352 -#: perllib/FixMyStreet/DB/Result/Comment.pm:133 +#: perllib/FixMyStreet/App/Controller/Admin.pm:346 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "" @@ -2045,15 +2044,15 @@ msgstr "" msgid "Please enter a password" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:108 -#: perllib/FixMyStreet/DB/Result/Problem.pm:370 +#: perllib/FixMyStreet/App/Controller/Contact.pm:113 +#: perllib/FixMyStreet/DB/Result/Problem.pm:395 #: templates/web/base/js/translation_strings.html:3 msgid "Please enter a subject" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1050 -#: perllib/FixMyStreet/App/Controller/Admin.pm:351 -#: perllib/FixMyStreet/App/Controller/Admin.pm:997 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin.pm:995 #: perllib/FixMyStreet/DB/Result/User.pm:127 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 @@ -2061,16 +2060,16 @@ msgid "Please enter a valid email" msgstr "" #: perllib/FixMyStreet/App/Controller/Alert.pm:346 -#: perllib/FixMyStreet/App/Controller/Contact.pm:118 +#: perllib/FixMyStreet/App/Controller/Contact.pm:123 msgid "Please enter a valid email address" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:373 +#: perllib/FixMyStreet/DB/Result/Problem.pm:398 #: templates/web/base/js/translation_strings.html:4 msgid "Please enter some details" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:107 +#: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/User.pm:124 #: templates/web/base/auth/general.html:13 #: templates/web/base/auth/general.html:8 @@ -2084,7 +2083,7 @@ msgid "Please enter your email" msgstr "" #: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:75 msgid "Please enter your email address" msgstr "" @@ -2092,14 +2091,14 @@ msgstr "" msgid "Please enter your first name" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: perllib/FixMyStreet/Cobrand/UK.pm:318 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:106 -#: perllib/FixMyStreet/DB/Result/Comment.pm:130 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Contact.pm:111 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 +#: perllib/FixMyStreet/DB/Result/Problem.pm:406 #: perllib/FixMyStreet/DB/Result/User.pm:120 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" @@ -2122,7 +2121,7 @@ msgstr "" msgid "Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a href=\"/\">front page</a>." msgstr "" -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:8 msgid "Please fill in details of the problem below." msgstr "" @@ -2137,7 +2136,7 @@ msgstr "" msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:251 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" @@ -2160,16 +2159,16 @@ msgstr "" msgid "Please note:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:246 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:254 msgid "Please provide some explanation as to why you're reopening this report" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:261 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 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:247 msgid "Please say whether you've ever reported a problem to your council before" msgstr "" @@ -2181,7 +2180,7 @@ msgstr "" msgid "Please select the type of alert you want" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please state whether or not the problem has been fixed" msgstr "" @@ -2189,15 +2188,13 @@ msgstr "" msgid "Please take a look at the updates that have been left." msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:176 +#: perllib/FixMyStreet/App/Controller/Photo.pm:177 +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 +#: perllib/FixMyStreet/App/Controller/Photo.pm:189 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:109 +#: perllib/FixMyStreet/App/Controller/Contact.pm:114 msgid "Please write a message" msgstr "" @@ -2236,14 +2233,14 @@ msgstr "" msgid "Privacy" msgstr "" -#: templates/web/base/admin/body.html:194 -#: templates/web/base/admin/body.html:77 -#: templates/web/base/admin/category_edit.html:40 -#: templates/web/base/admin/report_edit.html:79 +#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:85 +#: templates/web/base/admin/category_edit.html:45 +#: templates/web/base/admin/report_edit.html:95 msgid "Private" msgstr "" -#: templates/web/base/maps/openlayers.html:86 +#: templates/web/base/maps/openlayers.html:89 msgid "Problem" msgstr "" @@ -2264,7 +2261,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:966 msgid "Problem marked as open." msgstr "" @@ -2299,16 +2296,15 @@ msgstr "" msgid "Problems within %.1fkm of this location" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:629 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:114 +#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:151 -#: perllib/FixMyStreet/Cobrand/UK.pm:217 +#: perllib/FixMyStreet/Cobrand/UK.pm:207 msgid "Problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:122 -#: perllib/FixMyStreet/Cobrand/UK.pm:231 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "Problems within %s ward" msgstr "" @@ -2326,7 +2322,7 @@ msgstr "" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "" -#: templates/web/base/admin/report_edit.html:32 +#: templates/web/base/admin/report_edit.html:45 msgid "Property address:" msgstr "" @@ -2343,7 +2339,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/base/report/new/fill_in_details_form.html:174 +#: templates/web/base/report/new/fill_in_details_form.html:155 #: templates/web/base/report/update-form.html:128 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 #: templates/web/fixmystreet/report/update-form.html:119 @@ -2364,7 +2360,7 @@ msgstr "" msgid "Publish the response" msgstr "" -#: templates/web/base/questionnaire/completed.html:2 +#: templates/web/base/questionnaire/completed.html:1 #: templates/web/base/questionnaire/index.html:0 #: templates/web/base/questionnaire/index.html:14 #: templates/web/base/questionnaire/index.html:4 @@ -2383,11 +2379,12 @@ msgstr "" msgid "Questionnaire %d sent for problem %d" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 msgid "Questionnaire filled in by problem reporter" msgstr "" #: templates/web/base/alert/_list.html:21 +#: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display.html:50 #: templates/web/base/reports/_rss.html:1 @@ -2397,11 +2394,11 @@ msgstr "" msgid "RSS feed" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:260 perllib/FixMyStreet/Cobrand/UK.pm:272 +#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 msgid "RSS feed for %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "RSS feed for %s ward, %s" msgstr "" @@ -2409,15 +2406,11 @@ msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:167 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:175 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:185 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:193 -#: perllib/FixMyStreet/Cobrand/UK.pm:286 perllib/FixMyStreet/Cobrand/UK.pm:298 +#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 msgid "RSS feed of %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 msgid "RSS feed of %s, within %s ward" msgstr "" @@ -2430,20 +2423,19 @@ msgstr "" msgid "RSS feed of problems in this %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:630 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:115 +#: perllib/FixMyStreet/Cobrand/Default.pm:651 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:150 -#: perllib/FixMyStreet/Cobrand/UK.pm:224 +#: perllib/FixMyStreet/Cobrand/UK.pm:214 msgid "RSS feed of problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 -#: perllib/FixMyStreet/Cobrand/UK.pm:230 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s ward" msgstr "" -#: templates/web/base/around/display_location.html:3 +#: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:4 msgid "RSS feed of recent local problems" msgstr "" @@ -2483,15 +2475,18 @@ msgstr "" msgid "Remove flag" msgstr "" -#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/report_edit.html:110 #: templates/web/base/admin/update_edit.html:62 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "" -#: templates/web/base/footer.html:7 templates/web/fiksgatami/footer.html:19 -#: templates/web/fiksgatami/nn/footer.html:19 -#: templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 +msgid "Report" +msgstr "" + +#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 #: templates/web/zurich/footer.html:17 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2501,11 +2496,6 @@ msgstr "" msgid "Report abuse" msgstr "" -#: templates/web/base/report_created.html:1 -#: templates/web/base/report_created.html:3 -msgid "Report created" -msgstr "" - #: perllib/FixMyStreet/App/Controller/Rss.pm:295 msgid "Report on %s" msgstr "" @@ -2519,7 +2509,7 @@ msgstr "" #: templates/web/fixmystreet/around/intro.html:1 #: templates/web/zurich/around/intro.html:1 msgid "Report, view, or discuss local problems" -msgstr "" +msgstr "Городские проблемы. Сообщайте, просматривайте, обсуждайте." #: templates/web/base/my/my.html:82 msgid "Reported %s" @@ -2529,7 +2519,7 @@ msgstr "" msgid "Reported %s, to %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:580 #: templates/web/base/contact/index.html:50 #: templates/web/fixmystreet/contact/index.html:65 msgid "Reported anonymously at %s" @@ -2541,7 +2531,7 @@ msgstr "" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:598 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 #: templates/web/base/contact/index.html:52 #: templates/web/fixmystreet/contact/index.html:67 msgid "Reported by %s at %s" @@ -2551,31 +2541,35 @@ msgstr "" msgid "Reported in the %s category" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:571 +#: perllib/FixMyStreet/DB/Result/Problem.pm:576 msgid "Reported in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:598 msgid "Reported in the %s category by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:567 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 msgid "Reported via %s anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:589 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 msgid "Reported via %s by %s at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:563 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 msgid "Reported via %s in the %s category anonymously at %s" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:583 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 msgid "Reported via %s in the %s category by %s at %s" msgstr "" -#: templates/web/base/around/around_index.html:2 +#: templates/web/base/reports/index.html:21 +msgid "Reported within the last four weeks" +msgstr "" + +#: templates/web/base/around/around_index.html:1 #: templates/web/base/around/around_index.html:3 #: templates/web/base/js/translation_strings.html:41 #: templates/web/base/report/new/fill_in_details.html:0 @@ -2585,14 +2579,13 @@ msgstr "" msgid "Reporting a problem" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:294 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:409 -#: perllib/FixMyStreet/DB/Result/Problem.pm:413 +#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "" @@ -2608,7 +2601,7 @@ msgstr "" msgid "Reports published" msgstr "" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:85 msgid "Resend report" msgstr "" @@ -2616,36 +2609,35 @@ msgstr "" msgid "Right place?" msgstr "" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:193 -#: perllib/FixMyStreet/Geocode/OSM.pm:171 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:167 +#: perllib/FixMyStreet/Geocode/OSM.pm:152 msgid "Road operator for this named road (derived from road reference number and type): %s" msgstr "" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:190 -#: perllib/FixMyStreet/Geocode/OSM.pm:168 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:164 +#: perllib/FixMyStreet/Geocode/OSM.pm:149 msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1394 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 -#: templates/web/base/admin/report_edit.html:90 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1403 +#: templates/web/base/admin/report_edit.html:106 #: templates/web/zurich/admin/report_edit.html:73 msgid "Rotate Left" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1394 -#: templates/web/base/admin/report_edit.html:91 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: templates/web/base/admin/report_edit.html:107 #: templates/web/zurich/admin/report_edit.html:74 msgid "Rotate Right" msgstr "" #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:200 -#: templates/web/base/admin/category_edit.html:76 +#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/category_edit.html:81 #: templates/web/zurich/admin/body.html:59 msgid "Save changes" msgstr "" @@ -2673,7 +2665,7 @@ msgstr "" msgid "Searching found no reports." msgstr "" -#: templates/web/base/admin/users.html:39 +#: templates/web/base/admin/users.html:41 msgid "Searching found no users." msgstr "" @@ -2696,15 +2688,15 @@ 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:680 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "Sent to %s %s later" msgstr "" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:84 msgid "Sent:" msgstr "" -#: templates/web/base/admin/report_edit.html:73 +#: templates/web/base/admin/report_edit.html:89 #: templates/web/zurich/admin/stats.html:45 msgid "Service:" msgstr "" @@ -2713,7 +2705,7 @@ msgstr "" msgid "Share" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:211 +#: templates/web/base/report/new/fill_in_details_form.html:192 #: templates/web/base/report/update-form.html:157 #: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 @@ -2758,12 +2750,12 @@ msgstr "" msgid "Signed in as %s" msgstr "" -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 msgid "Some categories may require additional information." msgstr "" -#: templates/web/base/admin/body-form.html:145 -#: templates/web/base/admin/body-form.html:146 +#: templates/web/base/admin/body-form.html:149 +#: templates/web/base/admin/body-form.html:150 msgid "" "Some endpoints require an <strong>API key</strong> to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -2774,11 +2766,11 @@ msgid "Some photos of recent reports" msgstr "" #: perllib/FixMyStreet/App/View/Email.pm:32 -#: perllib/FixMyStreet/App/View/Web.pm:44 +#: perllib/FixMyStreet/App/View/Web.pm:43 msgid "Some text to localize" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:88 +#: perllib/FixMyStreet/Cobrand/UK.pm:78 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -2786,17 +2778,16 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:215 -#: perllib/FixMyStreet/Geocode.pm:26 perllib/FixMyStreet/Geocode/Bing.pm:56 -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:73 -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:93 -#: perllib/FixMyStreet/Geocode/Google.pm:72 -#: perllib/FixMyStreet/Geocode/OSM.pm:64 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:214 +#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 +#: perllib/FixMyStreet/Geocode/Google.pm:47 +#: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "" -#: perllib/FixMyStreet/Geocode/Bing.pm:51 -#: perllib/FixMyStreet/Geocode/Google.pm:67 +#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: perllib/FixMyStreet/Geocode/Google.pm:44 #: perllib/FixMyStreet/Geocode/Zurich.pm:87 msgid "Sorry, we could not parse that location. Please try again." msgstr "" @@ -2805,7 +2796,7 @@ msgstr "" msgid "Start Date:" msgstr "" -#: templates/web/base/admin/body.html:61 +#: templates/web/base/admin/body.html:69 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 @@ -2813,7 +2804,7 @@ msgstr "" msgid "State" msgstr "" -#: templates/web/base/admin/report_edit.html:34 +#: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 #: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:53 @@ -2822,8 +2813,8 @@ msgstr "" msgid "State:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1200 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:304 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:308 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" @@ -2839,7 +2830,7 @@ msgstr "" msgid "Still open, via questionnaire, %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:381 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 msgid "Subcategory: %s" msgstr "" @@ -2859,19 +2850,19 @@ msgid "Subject:" msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:115 -#: templates/web/base/report/new/fill_in_details_form.html:155 -#: templates/web/base/report/new/fill_in_details_form.html:177 +#: templates/web/base/report/new/fill_in_details_form.html:136 +#: templates/web/base/report/new/fill_in_details_form.html:158 +#: templates/web/base/report/new/fill_in_details_form.html:96 #: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 -#: templates/web/zurich/report/new/fill_in_details_form.html:108 +#: templates/web/zurich/report/new/fill_in_details_form.html:91 msgid "Submit" msgstr "" -#: templates/web/base/admin/report_edit.html:97 +#: templates/web/base/admin/report_edit.html:113 #: templates/web/base/admin/update_edit.html:65 -#: templates/web/base/admin/user-form.html:55 +#: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:64 #: templates/web/zurich/admin/report_edit.html:221 #: templates/web/zurich/admin/update_edit.html:38 @@ -2883,8 +2874,8 @@ msgstr "" msgid "Submit questionnaire" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:133 -#: templates/web/zurich/admin/header.html:2 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:134 +#: 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 @@ -2908,8 +2899,8 @@ msgstr "" msgid "Subscribe me to an email alert" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1191 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:293 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 #: templates/web/zurich/admin/index-dm.html:1 @@ -2925,7 +2916,7 @@ msgstr "" msgid "Summary reports" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 msgid "Survey" msgstr "" @@ -2939,7 +2930,7 @@ msgstr "" msgid "Text" msgstr "" -#: templates/web/base/admin/body.html:21 +#: templates/web/base/admin/body.html:28 msgid "Text only version" msgstr "" @@ -2948,49 +2939,54 @@ msgstr "" msgid "Text:" msgstr "" -#: templates/web/base/tokens/confirm_update.html:9 -msgid "Thank you — you can <a href=\"%s\">view your updated problem</a> on the site." -msgstr "" - -#: templates/web/base/tokens/confirm_problem.html:18 -msgid "Thank you for reporting this issue" +#: templates/web/base/tokens/confirm_problem.html:12 +msgid "Thank you for reporting this issue!" msgstr "" #: templates/web/base/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/fixmystreet/around/around_index.html:28 -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 :" +#: templates/web/base/tokens/confirm_update.html:15 +msgid "Thank you for updating this issue!" msgstr "" -#: templates/web/base/contact/submit.html:8 -msgid "Thanks for your feedback. We'll get back to you as soon as we can!" +#: templates/web/base/contact/submit.html:6 +#: templates/web/base/questionnaire/completed.html:5 +msgid "Thank you for your feedback" +msgstr "" + +#: templates/web/fixmystreet/around/around_index.html:28 +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 :" msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:9 msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:190 +#: perllib/FixMyStreet/App/Controller/Photo.pm:195 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Council.pm:100 +#: perllib/FixMyStreet/App/Controller/Council.pm:97 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 +#: perllib/FixMyStreet/App/Controller/Location.pm:126 msgid "That location does not appear to be in the UK; please try again." msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:81 +#: perllib/FixMyStreet/Cobrand/UK.pm:71 msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:713 +#: perllib/FixMyStreet/App/Controller/Admin.pm:712 +msgid "That problem has been marked as sent." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:704 msgid "That problem will now be resent." msgstr "" @@ -3002,28 +2998,28 @@ msgstr "" msgid "That report has been removed from FixMyStreet." msgstr "" -#: templates/web/base/admin/body.html:136 +#: templates/web/base/admin/body.html:144 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/base/admin/body-form.html:119 -#: templates/web/base/admin/body-form.html:120 +#: templates/web/base/admin/body-form.html:123 +#: templates/web/base/admin/body-form.html:124 msgid "" "The <strong>endpoint</strong> is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." msgstr "" -#: templates/web/base/admin/body-form.html:132 -#: templates/web/base/admin/body-form.html:133 +#: templates/web/base/admin/body-form.html:136 +#: templates/web/base/admin/body-form.html:137 msgid "" "The <strong>jurisdiction</strong> is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" -#: templates/web/base/admin/body-form.html:90 -#: templates/web/base/admin/body-form.html:91 +#: templates/web/base/admin/body-form.html:94 +#: templates/web/base/admin/body-form.html:95 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>." @@ -3044,7 +3040,7 @@ msgstr "" msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." msgstr "" -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:3 msgid "The council won’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 "" @@ -3071,8 +3067,8 @@ 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:185 -#: perllib/FixMyStreet/Geocode/OSM.pm:163 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:159 +#: perllib/FixMyStreet/Geocode/OSM.pm:144 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap." msgstr "" @@ -3130,7 +3126,7 @@ msgstr "" msgid "The passwords do not match" msgstr "" -#: templates/web/base/errors/page_error_404_not_found.html:11 +#: templates/web/base/errors/page_error_404_not_found.html:10 #: templates/web/base/errors/page_error_404_not_found.html:12 msgid "The requested URL '%s' was not found on this server" msgstr "" @@ -3147,7 +3143,7 @@ msgstr "" msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:295 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:300 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" @@ -3158,16 +3154,20 @@ msgid "" " Names are not necessarily unique." msgstr "" +#: templates/web/base/reports/_problem-list.html:15 +msgid "There are no reports to show." +msgstr "" + #: perllib/FixMyStreet/App/Controller/Reports.pm:75 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:131 +#: perllib/FixMyStreet/App/Controller/Contact.pm:136 #: 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/New.pm:762 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 #: templates/web/base/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:25 @@ -3183,7 +3183,7 @@ msgstr "" msgid "There was a problem with your update. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:135 +#: perllib/FixMyStreet/App/Controller/Contact.pm:140 msgid "There were problems with your report. Please see below." msgstr "" @@ -3191,8 +3191,8 @@ msgstr "" msgid "There were problems with your update. Please see below." msgstr "" -#: templates/web/base/admin/body-form.html:108 -#: templates/web/base/admin/body-form.html:109 +#: templates/web/base/admin/body-form.html:112 +#: templates/web/base/admin/body-form.html:113 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" @@ -3205,14 +3205,14 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" -#: templates/web/base/admin/body.html:36 +#: templates/web/base/admin/body.html:44 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported <em>at any location</em>.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" " Currently, users <strong>cannot report problems to this body</strong>." msgstr "" -#: templates/web/base/admin/body.html:46 +#: templates/web/base/admin/body.html:54 msgid "This body has no contacts. This means that currently problems reported to this body <strong>will not be sent</strong>." msgstr "" @@ -3223,18 +3223,18 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:388 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:394 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:391 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 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:136 -#: perllib/FixMyStreet/Cobrand/UK.pm:53 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:902 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:972 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/Cobrand/UK.pm:43 msgid "This information is required" msgstr "" @@ -3273,8 +3273,8 @@ msgstr "" msgid "This problem is old and of unknown status." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:130 #: perllib/FixMyStreet/Cobrand/Zurich.pm:131 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:132 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -3291,15 +3291,15 @@ msgstr "" msgid "This report is currently marked as open." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:319 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:311 msgid "This report was submitted anonymously" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:293 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "" @@ -3317,7 +3317,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:294 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:299 msgid "To view a map of the precise location of this issue" msgstr "" @@ -3333,8 +3333,12 @@ msgstr "" msgid "Try again" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:46 +#: templates/web/base/contact/submit.html:14 +msgid "Try emailing us directly:" +msgstr "" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -3342,8 +3346,8 @@ msgstr "" msgid "Unable to fix" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/admin/update_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:45 #: templates/web/zurich/admin/report_edit.html:58 @@ -3385,7 +3389,7 @@ msgstr "" msgid "Update below added by %s at %s" msgstr "" -#: templates/web/base/admin/body-form.html:233 +#: templates/web/base/admin/body-form.html:240 #: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "" @@ -3411,7 +3415,7 @@ msgstr "" msgid "Update reopened problem" msgstr "" -#: templates/web/base/admin/body.html:93 +#: templates/web/base/admin/body.html:101 msgid "Update statuses" msgstr "" @@ -3425,12 +3429,12 @@ msgstr "" msgid "Updated" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1016 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1060 -#: perllib/FixMyStreet/App/Controller/Admin.pm:810 -#: perllib/FixMyStreet/App/Controller/Admin.pm:958 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:549 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:618 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1014 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:808 +#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:556 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:625 msgid "Updated!" msgstr "" @@ -3442,7 +3446,7 @@ msgstr "" msgid "Updates" msgstr "" -#: perllib/FixMyStreet/DB/Result/Comment.pm:139 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -3457,7 +3461,7 @@ msgstr "" msgid "Updates to this problem, FixMyStreet" msgstr "" -#: templates/web/base/admin/body.html:174 +#: templates/web/base/admin/body.html:182 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 "" @@ -3466,11 +3470,11 @@ msgstr "" msgid "User" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1357 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1331 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1329 msgid "User flagged" msgstr "" @@ -3478,16 +3482,16 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:303 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:307 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:380 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:430 +#: perllib/FixMyStreet/App/Controller/Admin.pm:374 +#: perllib/FixMyStreet/App/Controller/Admin.pm:404 +#: perllib/FixMyStreet/App/Controller/Admin.pm:421 msgid "Values updated" msgstr "" @@ -3541,11 +3545,11 @@ msgstr "" msgid "We never show your email address or phone number." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:403 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/base/index-steps.html:38 +#: templates/web/base/index-steps.html:31 msgid "We send it to the council on your behalf" msgstr "" @@ -3554,15 +3558,23 @@ msgstr "" msgid "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>" msgstr "" +#: templates/web/base/questionnaire/completed-open.html:2 +msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" +msgstr "" + #: templates/web/base/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/fixmystreet/report/new/fill_in_details_form.html:41 +#: templates/web/base/contact/submit.html:7 +msgid "We’ll get back to you as soon as we can." +msgstr "" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 msgid "What’s the issue, and where is it?" msgstr "" -#: templates/web/base/admin/category_edit.html:82 +#: templates/web/base/admin/category_edit.html:87 #: templates/web/zurich/admin/body.html:18 msgid "When edited" msgstr "" @@ -3571,15 +3583,18 @@ msgstr "" msgid "When sent" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Whole block of empty flats" msgstr "" +#: templates/web/base/tokens/confirm_alert.html:7 +msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." +msgstr "" + #: templates/web/base/open311/index.html:92 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/fiksgatami/front/footer-marketing.html:15 #: templates/web/fixmystreet/front/footer-marketing.html:17 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" @@ -3603,18 +3618,18 @@ msgid "Year" msgstr "" #: templates/web/base/admin/bodies.html:66 -#: templates/web/base/admin/body.html:72 templates/web/base/admin/body.html:74 -#: templates/web/base/admin/body.html:78 templates/web/base/admin/body.html:80 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:76 +#: templates/web/base/admin/report_edit.html:93 #: templates/web/base/admin/update_edit.html:24 -#: templates/web/base/admin/users.html:29 +#: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:42 #: templates/web/base/questionnaire/index.html:81 @@ -3643,14 +3658,12 @@ msgstr "" msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/tokens/confirm_problem.html:25 -#: templates/web/base/tokens/confirm_problem.html:26 -#: templates/web/zurich/tokens/confirm_problem.html:6 +#: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:8 msgid "You can <a href=\"%s%s\">view the problem on this site</a>." msgstr "" -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:48 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -3665,14 +3678,14 @@ msgid "" " reports in the past." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:19 -#: templates/web/base/report/new/councils_text_none.html:20 -#: templates/web/base/report/new/councils_text_some.html:20 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." msgstr "" -#: templates/web/base/admin/body-form.html:81 +#: templates/web/base/admin/body-form.html:85 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" @@ -3685,10 +3698,10 @@ msgid "You have already answered this questionnaire. If you have a question, ple msgstr "" #: templates/web/base/questionnaire/index.html:68 -#: templates/web/base/report/new/fill_in_details_form.html:94 +#: templates/web/base/report/new/fill_in_details_form.html:75 #: templates/web/fixmystreet/questionnaire/index.html:88 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:79 -#: templates/web/zurich/report/new/fill_in_details_form.html:75 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 +#: templates/web/zurich/report/new/fill_in_details_form.html:58 msgid "You have already attached a photo to this report, attaching another one will replace it." msgstr "" @@ -3697,7 +3710,7 @@ msgstr "" msgid "You have already attached a photo to this update, attaching another one will replace it." msgstr "" -#: templates/web/base/auth/sign_out.html:3 +#: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" msgstr "" @@ -3706,26 +3719,11 @@ msgstr "" 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/base/tokens/confirm_alert.html:8 -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/base/tokens/confirm_update.html:14 -msgid "You have successfully confirmed your update and you can now <a href=\"%s\">view it on the site</a>." -msgstr "" - -#: templates/web/base/tokens/confirm_alert.html:12 -msgid "You have successfully created your alert." -msgstr "" - -#: templates/web/base/tokens/confirm_alert.html:10 -msgid "You have successfully deleted your alert." -msgstr "" - #: templates/web/base/report/display.html:20 #: templates/web/base/report/new/fill_in_details.html:37 #: templates/web/fixmystreet/report/display.html:17 @@ -3751,7 +3749,7 @@ msgid "" " contacts (such as an email address) to which reports are sent." msgstr "" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:85 msgid "You really want to resend?" msgstr "" @@ -3771,7 +3769,7 @@ msgstr "" #: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 #: templates/web/fixmystreet/report/update-form.html:76 -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:71 msgid "Your email" msgstr "" @@ -3787,7 +3785,7 @@ msgid "Your email address:" msgstr "" #: templates/web/base/alert/_list.html:92 -#: templates/web/base/report/new/fill_in_details_form.html:125 +#: templates/web/base/report/new/fill_in_details_form.html:106 #: templates/web/base/report/update-form.html:81 msgid "Your email:" msgstr "" @@ -3802,13 +3800,13 @@ msgstr "" #: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 #: templates/web/fixmystreet/report/update-form.html:142 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:98 +#: templates/web/zurich/report/new/fill_in_details_form.html:81 msgid "Your name" msgstr "" #: templates/web/base/auth/general.html:59 #: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:204 +#: templates/web/base/report/new/fill_in_details_form.html:185 #: templates/web/base/report/update-form.html:151 msgid "Your name:" msgstr "" @@ -3826,33 +3824,19 @@ msgstr "" #: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 -#: templates/web/zurich/report/new/fill_in_details_form.html:104 +#: templates/web/zurich/report/new/fill_in_details_form.html:87 msgid "Your phone number" msgstr "" -#: templates/web/base/tokens/confirm_problem.html:4 -msgid "Your problem has been confirmed!" -msgstr "" - #: templates/web/fixmystreet/questionnaire/index.html:16 msgid "Your report" msgstr "" -#: templates/web/base/report_created.html:6 -msgid "Your report has been created and will shortly be sent." -msgstr "" - -#: templates/web/base/footer.html:9 templates/web/fiksgatami/footer.html:21 -#: templates/web/fiksgatami/nn/footer.html:21 -#: templates/web/fixmystreet/footer.html:24 +#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:24 msgid "Your reports" msgstr "" -#: templates/web/base/tokens/confirm_update.html:4 -msgid "Your update has been confirmed!" -msgstr "" - -#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:59 +#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:41 msgid "Your updates" msgstr "" @@ -3869,11 +3853,7 @@ msgstr "" msgid "council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:665 -msgid "council ref: %s" -msgstr "" - -#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:32 #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:54 msgid "didn't use map" @@ -3884,6 +3864,7 @@ msgstr "" msgid "e.g. ‘%s’ or ‘%s’" msgstr "" +#: templates/web/base/admin/body-form.html:188 #: templates/web/base/admin/flagged.html:51 msgid "edit user" msgstr "" @@ -3898,7 +3879,7 @@ msgstr "" msgid "last updated %s" msgstr "" -#: perllib/Utils.pm:263 +#: perllib/Utils.pm:235 msgid "less than a minute" msgstr "" @@ -3958,22 +3939,22 @@ msgstr "" msgid "or locate me automatically" msgstr "" -#: templates/web/base/admin/report_edit.html:25 -#: templates/web/base/admin/report_edit.html:26 -#: templates/web/zurich/admin/report_edit-sdm.html:28 +#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:30 +#: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit-sdm.html:29 -#: templates/web/zurich/admin/report_edit-sdm.html:37 +#: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:38 -#: templates/web/zurich/admin/report_edit.html:28 +#: templates/web/zurich/admin/report_edit.html:27 #: templates/web/zurich/admin/report_edit.html:29 -#: templates/web/zurich/admin/report_edit.html:39 +#: templates/web/zurich/admin/report_edit.html:38 #: templates/web/zurich/admin/report_edit.html:40 -#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit.html:50 #: templates/web/zurich/admin/report_edit.html:52 msgid "originally entered: “%s”" msgstr "" -#: templates/web/base/admin/report_edit.html:30 +#: templates/web/base/admin/report_edit.html:43 msgid "other areas:" msgstr "" @@ -3982,13 +3963,12 @@ msgstr "" msgid "reopened" msgstr "" -#: templates/web/fiksgatami/header.html:49 -#: templates/web/fixmystreet/header.html:53 +#: templates/web/fixmystreet/header.html:59 #: templates/web/zurich/footer.html:12 msgid "sign out" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:13 +#: templates/web/base/report/new/fill_in_details_form.html:12 #: templates/web/base/report/new/fill_in_details_form.html:15 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 @@ -4000,15 +3980,15 @@ msgstr "" msgid "there is no pin shown as the user did not use the map" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:373 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:379 msgid "this type of local problem" msgstr "" -#: perllib/Utils.pm:235 +#: perllib/Utils.pm:207 msgid "today" msgstr "" -#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:32 #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:54 msgid "used map" @@ -4034,14 +4014,16 @@ msgid_plural "<big>%s</big> reports recently" msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" -#: perllib/Utils.pm:282 +#: perllib/Utils.pm:254 #, perl-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" #: templates/web/base/report/_support.html:6 #, perl-format @@ -4050,14 +4032,16 @@ msgid_plural "%d supporters" msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" -#: perllib/Utils.pm:284 +#: perllib/Utils.pm:256 #, perl-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" #: templates/web/base/front/stats.html:29 #, perl-format @@ -4066,6 +4050,7 @@ msgid_plural "<big>%s</big> updates on reports" msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" #: templates/web/emptyhomes/report/new/councils_text_none.html:3 #, perl-format @@ -4074,14 +4059,16 @@ msgid_plural "We do not yet have details for the councils that cover this locati msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" -#: perllib/Utils.pm:278 +#: perllib/Utils.pm:250 #, perl-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d неделя" msgstr[1] "%d недели" msgstr[2] "%d недель" +msgstr[3] "%d недель" #: templates/web/base/front/stats.html:12 #, perl-format @@ -4090,6 +4077,7 @@ msgid_plural "<big>%s</big> reports in past week" msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" #: templates/web/base/front/stats.html:23 #, perl-format @@ -4098,14 +4086,16 @@ msgid_plural "<big>%s</big> fixed in past month" msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" -#: perllib/Utils.pm:280 +#: perllib/Utils.pm:252 #, perl-format msgid "%d day" msgid_plural "%d days" msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" #: templates/web/base/report/new/councils_text_some.html:13 #, perl-format @@ -4114,3 +4104,4 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "" msgstr[1] "" msgstr[2] "" +msgstr[3] "" diff --git a/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po index 49f7decb5..4c3f3a46c 100644 --- a/locale/sq.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/sq.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: 2015-01-20 16:59+0000\n" -"PO-Revision-Date: 2014-11-19 18:30+0000\n" +"POT-Creation-Date: 2015-07-31 14:28+0100\n" +"PO-Revision-Date: 2015-07-10 13:29+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Albanian (http://www.transifex.com/projects/p/fixmystreet/language/sq/)\n" "Language: sq\n" @@ -19,17 +19,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:618 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:386 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:392 msgid " and " msgstr "dhe" -#: templates/web/base/report/new/councils_text_all.html:12 -#: templates/web/base/report/new/councils_text_all.html:19 -#: templates/web/base/report/new/councils_text_all.html:5 -#: templates/web/base/report/new/councils_text_none.html:19 -#: templates/web/base/report/new/councils_text_none.html:21 -#: templates/web/base/report/new/councils_text_some.html:20 +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_none.html:11 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " @@ -65,22 +63,26 @@ msgstr "%d në%d të%d" msgid "%s - Summary reports" msgstr "%s - Raportet përmbledhëse" -#: perllib/FixMyStreet/DB/Result/Problem.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:672 msgid "%s ref: %s" msgstr "%s ref: %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:265 perllib/FixMyStreet/Cobrand/UK.pm:277 +#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 msgid "%s ward, %s" msgstr "%s lagje, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:554 +#: perllib/FixMyStreet/DB/Result/Problem.pm:559 msgid "%s, reported at %s" msgstr "%s, raportuar në %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:304 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "%s, within %s ward" msgstr "%s, brenda lagjes %s" +#: perllib/FixMyStreet/Map/OSM.pm:42 +msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" +msgstr "" + #: templates/web/base/email_sent.html:29 msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" msgstr "" @@ -94,7 +96,7 @@ msgid "(Don't worry — we'll hang on to your update while you're checking y msgstr "" #: templates/web/base/admin/report_blocks.html:11 -#: templates/web/base/admin/users.html:29 +#: templates/web/base/admin/users.html:31 msgid "(Email in abuse table)" msgstr "(Email-i në tabelen abuzimi)" @@ -122,7 +124,7 @@ msgstr "(i mbyllur)" msgid "(fixed)" msgstr "(i rregulluar)" -#: templates/web/base/index.html:9 +#: templates/web/base/index.html:8 templates/web/base/index.html:9 #: templates/web/fixmystreet/around/intro.html:2 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "" @@ -132,8 +134,8 @@ msgstr "" msgid "(not sent to council)" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:218 -#: templates/web/zurich/report/new/fill_in_details_form.html:94 +#: templates/web/base/report/new/fill_in_details_form.html:199 +#: templates/web/zurich/report/new/fill_in_details_form.html:77 msgid "(optional)" msgstr "(opsionale)" @@ -146,7 +148,7 @@ msgstr "" msgid "(sent to both)" msgstr "(dërguar te të dy)" -#: templates/web/base/report/new/fill_in_details_form.html:212 +#: templates/web/base/report/new/fill_in_details_form.html:193 msgid "(we never show your email address or phone number)" msgstr "(ne asnjëherë nuk do tëshfaqim email adresen ose numrin tuaj të telefonit)" @@ -154,14 +156,13 @@ msgstr "(ne asnjëherë nuk do tëshfaqim email adresen ose numrin tuaj të tele msgid "(we never show your email)" msgstr "(ne asnjëherë nuk do të shfaqim email-in tuaj)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:662 -#: perllib/FixMyStreet/DB/Result/Problem.pm:393 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Zgjedh në kategori --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 -#: perllib/FixMyStreet/DB/Result/Problem.pm:399 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:630 +#: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Zgjedh nje lloj te karakteristikes --" @@ -176,37 +177,7 @@ msgstr "" " Kjo eshte ndoshta arsyeja pse \"zona e mbuluar\" eshte e zbrazet (me poshte).<br>\n" " Ndoshta shtoni disa <code>MAPIT_TYPES</code> ne skedarin tuaj te konfigurimit?" -#: templates/web/base/questionnaire/completed.html:20 -msgid "<p style=\"font-size:150%\">Thank you very much for filling in our questionnaire; glad to hear it’s been fixed.</p>" -msgstr "<p style=\"font-size:150%\">Ju falenderojme shume per plotesimin e pyetesorit tone; jemi te kenaqur qe degjojme se eshte rregulluar ajo.</p>" - -#: templates/web/fiksgatami/questionnaire/completed-open.html:1 -msgid "" -"<p style=\"font-size:150%\">We’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’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/base/questionnaire/completed-open.html:6 -msgid "" -"<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" -"suggestions: why not try writing to your local representatives or, if\n" -"it’s a problem that could be fixed by local people working together, why\n" -"not <a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n" -"</p>" -msgstr "" - -#: templates/web/base/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/base/around/_report_banner.html:4 +#: templates/web/base/around/_report_banner.html:3 #: templates/web/base/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>Nëse ju nuk mund ta shihni hartën , <a href='%s' rel='nofollow'>kaloni këtë hap</a>.</small>" @@ -233,7 +204,7 @@ msgstr "<strong>Jo</strong> më lejo të kyqem me email" msgid "<strong>No</strong>, I do not, let me sign in by email:" msgstr "<strong>Jo</strong>, nuk mund ta bej, me lejo te kyqem me email:" -#: templates/web/base/report/new/fill_in_details_form.html:163 +#: templates/web/base/report/new/fill_in_details_form.html:144 msgid "<strong>No</strong>, let me confirm my report by email:" msgstr "<strong>Jo</strong>, me lejoni te konfirmoj raportin tim me email:" @@ -241,13 +212,8 @@ msgstr "<strong>Jo</strong>, me lejoni te konfirmoj raportin tim me email:" msgid "<strong>No</strong>, let me confirm my update by email:" msgstr "<strong>Jo</strong>, me lejo te konfirmoj perditesimin tim me email:" -#: templates/web/base/tokens/confirm_problem.html:19 -#: templates/web/base/tokens/confirm_problem.html:20 -msgid "<strong>We will now send it to the council</strong>." -msgstr "" - #: templates/web/base/auth/general.html:37 -#: templates/web/base/report/new/fill_in_details_form.html:141 +#: templates/web/base/report/new/fill_in_details_form.html:122 #: templates/web/base/report/update-form.html:95 #: templates/web/fixmystreet/auth/general.html:37 #: templates/web/fixmystreet/auth/general.html:39 @@ -261,8 +227,8 @@ msgstr "<strong>Po</strong> Unë kam një fjalëkalim" msgid "About us" msgstr "Rreth nesh" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:39 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:52 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:31 #: templates/web/fixmystreet/report/update-form.html:28 @@ -278,26 +244,26 @@ msgid "" " categories of problem) to each body." msgstr "" -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/body.html:56 msgid "Add a contact using the form below." msgstr "Shto nje kontakt duke perdorur formularin e meposhtem." #: templates/web/base/admin/bodies.html:74 -#: templates/web/base/admin/body-form.html:233 +#: templates/web/base/admin/body-form.html:240 #: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "" -#: templates/web/base/admin/body.html:108 +#: templates/web/base/admin/body.html:116 #: templates/web/zurich/admin/body.html:31 msgid "Add new category" msgstr "Shto një kategori të re" -#: templates/web/base/admin/users.html:45 +#: templates/web/base/admin/users.html:47 msgid "Add user" msgstr "Shto përdorues" -#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:70 +#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:52 msgid "Added %s" msgstr "Shtoi %s" @@ -324,9 +290,7 @@ msgstr "Me paralajmero per perditesime ne te ardhmen" msgid "All Reports" msgstr "Te gjitha Raportimet" -#: templates/web/base/footer.html:11 templates/web/fiksgatami/footer.html:23 -#: templates/web/fiksgatami/nn/footer.html:23 -#: templates/web/fixmystreet/footer.html:26 +#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:26 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:19 @@ -343,19 +307,9 @@ msgstr "Te gjitha raportimet ne mes te %s dhe %s" msgid "All the information you provide here will be sent to" msgstr "Te gjitha informacionet e ofruara nga ju do te dergohen te" -#: templates/web/base/report/new/councils_text_all.html:12 -#: templates/web/base/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 "Te gjitha informacionet e ofruara ketu do te dergohen te <strong>%s</strong>. ose <strong>Sherbimit Rrugor</strong>." - -#: templates/web/base/report/new/councils_text_all.html:5 -#: templates/web/base/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/base/report/new/councils_text_all.html:19 -#: templates/web/base/report/new/councils_text_all.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:13 +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_all.html:4 +#: templates/web/base/report/new/fill_in_details_form.html:12 #: templates/web/base/report/new/fill_in_details_form.html:14 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 @@ -372,7 +326,7 @@ msgstr "Nje perditesim e ka perditesuar kete problem si te zgjidhur." msgid "Anonymous" msgstr "Anonim" -#: templates/web/base/admin/report_edit.html:62 +#: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:23 msgid "Anonymous:" msgstr "Anonim:" @@ -381,18 +335,18 @@ msgstr "Anonim:" msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?" msgstr "A jeni nje <strong>zhvillues</strong>? A deshironi te kontriboni per FixMyStreet?" -#: templates/web/fiksgatami/front/footer-marketing.html:14 #: templates/web/fixmystreet/front/footer-marketing.html:16 msgid "Are you a developer?" msgstr "A jeni nje zhvillues?" #: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 msgid "Area covered" msgstr "Hapesire e mbuluar" #: templates/web/base/admin/bodies.html:15 -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/body.html:60 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "" @@ -410,7 +364,7 @@ msgstr "" msgid "Assign to subdivision:" msgstr "Cakto per nenndarje:" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:163 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:165 #: templates/web/zurich/report/updates.html:11 msgid "Assigned to %s" msgstr "Caktuar per %s" @@ -423,7 +377,7 @@ msgstr "" msgid "At the moment only searching for and looking at reports work." msgstr "Per momentin funksionon vetem kerkimi dhe shikimi i raportimeve." -#: perllib/FixMyStreet/DB/Result/Problem.pm:348 +#: perllib/FixMyStreet/DB/Result/Problem.pm:373 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "" @@ -436,8 +390,8 @@ msgstr "Prapa" msgid "Ban email address" msgstr "bllokoemail adresen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:297 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:301 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" msgstr "" @@ -448,6 +402,7 @@ msgstr "" msgid "Body" msgstr "" +#: templates/web/base/admin/report_edit.html:34 #: templates/web/base/admin/user-form.html:32 msgid "Body:" msgstr "" @@ -460,16 +415,15 @@ msgstr "Nga Data" msgid "Can't see the map? <em>Skip this step</em>" msgstr "Nuk mund te shihni harten? <em>Kaloni kete hap</em>" -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:55 #: templates/web/base/report/new/category.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:53 +#: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 #: templates/web/zurich/admin/stats.html:50 -#: templates/web/zurich/report/new/fill_in_details_form.html:50 msgid "Category" msgstr "Kategoria" @@ -477,17 +431,16 @@ msgstr "Kategoria" msgid "Category fix rate for problems > 4 weeks old" msgstr "" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:138 #: templates/web/base/admin/category_edit.html:23 -#: templates/web/base/admin/report_edit.html:61 -#: templates/web/base/report/new/fill_in_details_form.html:68 +#: templates/web/base/admin/report_edit.html:74 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/report_edit-sdm.html:42 #: templates/web/zurich/admin/report_edit.html:140 msgid "Category:" msgstr "Kategoria:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:377 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383 msgid "Category: %s" msgstr "Kategoria: %s" @@ -498,19 +451,19 @@ msgstr "Kategoria: %s" msgid "Change password" msgstr "Nderro fjalekalimin" -#: templates/web/base/admin/body.html:152 +#: templates/web/base/admin/body.html:160 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/base/admin/body.html:163 +#: templates/web/base/admin/body.html:171 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/base/admin/body.html:183 +#: templates/web/base/admin/body.html:191 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -521,7 +474,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:122 +#: templates/web/base/admin/body.html:130 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." @@ -537,16 +490,16 @@ msgstr "Kliko ketu ose shkruaj si dd/mm/yyyy" msgid "Click map to report a problem" msgstr "Kliko ne harte per te raportuar nje problem" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:45 -#: templates/web/base/admin/report_edit.html:47 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:58 +#: templates/web/base/admin/report_edit.html:60 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/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:95 #: templates/web/zurich/admin/report_edit.html:97 #: templates/web/zurich/admin/stats.html:31 @@ -554,11 +507,12 @@ msgstr "Kliko ne harte per te raportuar nje problem" msgid "Closed" msgstr "Mbyllur" -#: perllib/FixMyStreet/DB/Result/Problem.pm:762 +#: perllib/FixMyStreet/DB/Result/Problem.pm:771 msgid "Closed by council" msgstr "" -#: templates/web/base/my/my.html:40 templates/web/fixmystreet/my/my.html:46 +#: templates/web/base/my/my.html:40 +#: templates/web/fixmystreet/my/_problem-list.html:12 msgid "Closed reports" msgstr "Raportime te mbyllura" @@ -566,7 +520,7 @@ msgstr "Raportime te mbyllura" msgid "Closed:" msgstr "Mbyllur:" -#: templates/web/base/around/tabbed_lists.html:11 +#: templates/web/base/around/tabbed_lists.html:10 #: templates/web/base/around/tabbed_lists.html:12 msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "" @@ -581,26 +535,26 @@ msgstr "" msgid "Cobrand" msgstr "" -#: templates/web/base/admin/report_edit.html:75 +#: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:50 msgid "Cobrand data:" msgstr "" -#: templates/web/base/admin/report_edit.html:74 +#: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:49 msgid "Cobrand:" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "" -#: templates/web/base/admin/category_edit.html:47 +#: templates/web/base/admin/category_edit.html:52 msgid "Configure Endpoint" msgstr "" -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/body.html:72 msgid "Confirm" msgstr "Konfirmo" @@ -621,10 +575,10 @@ msgstr "" msgid "Confirmation" msgstr "Konfirmimi" -#: templates/web/base/admin/body.html:158 -#: templates/web/base/admin/body.html:71 -#: templates/web/base/admin/category_edit.html:32 -#: templates/web/base/admin/category_edit.html:84 +#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/category_edit.html:37 +#: templates/web/base/admin/category_edit.html:89 #: templates/web/zurich/admin/stats.html:40 msgid "Confirmed" msgstr "E konfirmuar" @@ -635,7 +589,7 @@ msgstr "Raportet e konfirmuara ne mes te %s dhe %s" #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 -#: templates/web/base/admin/report_edit.html:70 +#: templates/web/base/admin/report_edit.html:83 msgid "Confirmed:" msgstr "E konfirmuar:" @@ -652,13 +606,12 @@ msgid "Contact Us" msgstr "Na Kontaktoni" #: templates/web/base/contact/index.html:6 -#: templates/web/base/contact/submit.html:3 #: templates/web/fixmystreet/contact/index.html:20 msgid "Contact the team" msgstr "Kontakto ekipin" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1327 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1355 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1325 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1353 msgid "Could not find user" msgstr "Nuk mund te gjeni perdoruesin" @@ -676,6 +629,10 @@ msgstr "" msgid "Council contacts for %s" msgstr "" +#: perllib/FixMyStreet/DB/Result/Problem.pm:670 +msgid "Council ref: %s" +msgstr "" + #: templates/web/base/admin/stats.html:84 msgid "Council:" msgstr "" @@ -691,7 +648,7 @@ msgstr "" msgid "Create a report" msgstr "Krijo nje raport" -#: templates/web/base/admin/body.html:200 +#: templates/web/base/admin/body.html:208 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Krijo kategorine" @@ -703,7 +660,7 @@ msgid "Created" msgstr "U krijua" #: templates/web/base/admin/list_updates.html:38 -#: templates/web/base/admin/report_edit.html:69 +#: templates/web/base/admin/report_edit.html:82 #: templates/web/base/admin/update_edit.html:51 #: templates/web/zurich/admin/report_edit-sdm.html:47 #: templates/web/zurich/admin/report_edit.html:61 @@ -720,7 +677,7 @@ msgstr "Gjendja aktuale" msgid "Currently no bodies have been created." msgstr "Aktualisht asnje grup nuk eshte krijuar." -#: templates/web/base/dashboard/index.html:6 +#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 msgid "Dashboard" msgstr "" @@ -730,14 +687,14 @@ msgid "Dealt with by subdivision within 5 working days" msgstr "" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:169 -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:37 -#: templates/web/base/admin/category_edit.html:85 +#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:81 +#: templates/web/base/admin/category_edit.html:42 +#: templates/web/base/admin/category_edit.html:90 msgid "Deleted" msgstr "" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:43 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -757,7 +714,7 @@ msgstr "Detaje" msgid "Details:" msgstr "Detaje:" -#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/body.html:87 msgid "Devolved" msgstr "Transferuar" @@ -785,8 +742,8 @@ msgstr "Nuk e di" msgid "Don't like forms?" msgstr "Nuk i'u pelqen kjo forme?" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:47 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:60 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:32 #: templates/web/fixmystreet/report/update-form.html:28 @@ -794,7 +751,7 @@ msgstr "Nuk i'u pelqen kjo forme?" msgid "Duplicate" msgstr "Dyfisho" -#: templates/web/base/admin/body.html:98 +#: templates/web/base/admin/body.html:106 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" @@ -804,20 +761,20 @@ msgstr "" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 -#: templates/web/base/admin/users.html:31 +#: templates/web/base/admin/users.html:33 #: templates/web/zurich/admin/problem_row.html:42 msgid "Edit" msgstr "" -#: templates/web/base/admin/body.html:212 +#: templates/web/base/admin/body.html:220 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "" #: templates/web/base/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:2 +#: 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:2 +#: templates/web/zurich/admin/report_edit.html:1 #: templates/web/zurich/admin/report_edit.html:5 msgid "Editing problem %d" msgstr "" @@ -831,12 +788,12 @@ msgstr "" msgid "Editing user %d" msgstr "" -#: templates/web/base/admin/category_edit.html:86 +#: templates/web/base/admin/category_edit.html:91 msgid "Editor" msgstr "Editor" #: templates/web/base/admin/bodies.html:23 -#: templates/web/base/admin/category_edit.html:83 +#: templates/web/base/admin/category_edit.html:88 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 #: templates/web/fixmystreet/auth/general.html:21 @@ -847,15 +804,23 @@ msgstr "Editor" msgid "Email" msgstr "Email" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1303 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1301 msgid "Email added to abuse list" msgstr "Emaili u shtua te lista e abuzimeve" -#: templates/web/base/admin/body.html:147 +#: templates/web/base/admin/body.html:155 msgid "Email address:" msgstr "Email adresa:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1300 +#: templates/web/base/tokens/confirm_alert.html:6 +msgid "Email alert created" +msgstr "" + +#: templates/web/base/tokens/confirm_alert.html:10 +msgid "Email alert deleted" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1298 msgid "Email already in abuse list" msgstr "" @@ -867,8 +832,8 @@ msgstr "Me dergo email per problemet e reja lokale" msgid "Email me updates" msgstr "" -#: templates/web/base/admin/category_edit.html:26 -#: templates/web/base/admin/report_edit.html:67 +#: templates/web/base/admin/category_edit.html:31 +#: templates/web/base/admin/report_edit.html:80 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 @@ -879,32 +844,32 @@ msgstr "" msgid "Email:" msgstr "Email:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:322 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 msgid "Email: %s" msgstr "Email: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 msgid "Empty flat or maisonette" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:631 msgid "Empty house or bungalow" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:622 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty office or other commercial" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:623 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Empty pub or bar" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:624 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty public building - school, hospital, etc." msgstr "" -#: templates/web/base/admin/body-form.html:158 -#: templates/web/base/admin/body-form.html:159 +#: templates/web/base/admin/body-form.html:162 +#: templates/web/base/admin/body-form.html:163 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" @@ -912,8 +877,8 @@ msgid "" " <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>." msgstr "" -#: templates/web/base/admin/body-form.html:215 -#: templates/web/base/admin/body-form.html:216 +#: templates/web/base/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:223 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" @@ -924,11 +889,11 @@ msgstr "" msgid "End Date:" msgstr "Data e fundit:" -#: templates/web/base/admin/body-form.html:126 +#: templates/web/base/admin/body-form.html:130 msgid "Endpoint" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:72 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:73 msgid "Enter a Zürich street name" msgstr "" @@ -941,7 +906,9 @@ msgstr "" msgid "Enter a nearby postcode, or street name and area" msgstr "" +#: templates/web/base/around/postcode_form.html:1 #: templates/web/base/around/postcode_form.html:2 +#: templates/web/fixmystreet/around/postcode_form.html:10 #: templates/web/fixmystreet/around/postcode_form.html:11 msgid "Enter a nearby street name and area" msgstr "" @@ -951,7 +918,7 @@ msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "" #: templates/web/base/auth/general.html:64 -#: templates/web/base/report/new/fill_in_details_form.html:170 +#: templates/web/base/report/new/fill_in_details_form.html:151 #: templates/web/base/report/update-form.html:124 msgid "Enter a new password:" msgstr "Shkruaj fjalekalimin e ri:" @@ -963,7 +930,7 @@ msgstr "Shkruaj fjalekalimin e ri:" msgid "Enter a password" msgstr "Shkruaj fjalekalimin" -#: templates/web/base/index-steps.html:33 +#: templates/web/base/index-steps.html:26 msgid "Enter details of the problem" msgstr "Pershkruaje problemin" @@ -986,17 +953,22 @@ msgstr "Shembull i kodit postar %s" msgid "Examples:" msgstr "Shembuj:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:47 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" -#: templates/web/base/admin/report_edit.html:76 +#: templates/web/base/admin/body-form.html:81 +msgid "External URL" +msgstr "" + +#: templates/web/base/admin/category_edit.html:27 +#: templates/web/base/admin/report_edit.html:92 msgid "Extra data:" msgstr "Te dhena shtese:" -#: templates/web/base/contact/submit.html:15 -msgid "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>." -msgstr "Dergimi i mesazhit deshtoi. Ju lutem provoni perseri, ose <a href=\"mailto:%s\">na dergoni me email</a>." +#: templates/web/base/contact/submit.html:13 +msgid "Failed to send message" +msgstr "" #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 @@ -1008,7 +980,7 @@ msgstr "Filtro listen e raporteve" msgid "First time" msgstr "Emri" -#: templates/web/base/admin/body.html:40 +#: templates/web/base/admin/body.html:48 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "" @@ -1039,9 +1011,9 @@ msgid "" msgstr "" #: templates/web/base/admin/index.html:55 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:41 -#: templates/web/base/admin/report_edit.html:42 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:54 +#: templates/web/base/admin/report_edit.html:55 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/update-form.html:30 @@ -1052,17 +1024,18 @@ msgstr "" msgid "Fixed" msgstr "E rregulluar" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:43 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:56 msgid "Fixed - Council" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:42 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:55 msgid "Fixed - User" msgstr "E rregulluar - Perdoruesi" -#: templates/web/base/my/my.html:35 templates/web/fixmystreet/my/my.html:41 +#: templates/web/base/my/my.html:35 +#: templates/web/fixmystreet/my/_problem-list.html:7 msgid "Fixed reports" msgstr "Raportet e perfunduara" @@ -1070,7 +1043,7 @@ msgstr "Raportet e perfunduara" msgid "Fixed:" msgstr "E rregulluar:" -#: templates/web/base/admin/body-form.html:84 +#: templates/web/base/admin/body-form.html:89 #: templates/web/zurich/admin/body-form.html:36 msgid "Flag as deleted" msgstr "" @@ -1079,7 +1052,7 @@ msgstr "" msgid "Flag user" msgstr "Flamuri i perdoruesit" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "" @@ -1088,7 +1061,7 @@ msgstr "" msgid "Flagged reports and users" msgstr "" -#: templates/web/base/admin/user-form.html:45 +#: templates/web/base/admin/user-form.html:46 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page." msgstr "" @@ -1096,8 +1069,8 @@ msgstr "" msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." msgstr "" -#: templates/web/base/admin/report_edit.html:78 -#: templates/web/base/admin/user-form.html:51 +#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/user-form.html:52 msgid "Flagged:" msgstr "" @@ -1106,10 +1079,6 @@ msgstr "" msgid "Follow a ward link to view only reports within that ward." msgstr "" -#: templates/web/base/admin/report_edit.html:30 -msgid "For council(s):" -msgstr "" - #: templates/web/base/admin/body-form.html:65 msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "" @@ -1122,8 +1091,6 @@ msgstr "Keni harruar fjalekalimin tuaj?" #: templates/web/base/faq/faq-en-gb.html:1 #: templates/web/base/static/privacy.html:1 #: templates/web/base/static/privacy.html:2 -#: templates/web/fiksgatami/faq/faq-nb.html:1 -#: templates/web/fiksgatami/nn/faq/faq-nn.html:1 msgid "Frequently Asked Questions" msgstr "Pyetjet me te shpeshta" @@ -1136,13 +1103,13 @@ msgstr "GeoRSS ne Google Maps" msgid "Get updates" msgstr "Merr perditesimet" -#: templates/web/fixmystreet/reports/_rss.html:4 +#: templates/web/fixmystreet/reports/_rss.html:3 #: templates/web/fixmystreet/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "Merr perditesimet per %s problemet" #: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:4 +#: templates/web/fixmystreet/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "Merr perditesimet e problemeve ne kete %s" @@ -1151,6 +1118,10 @@ msgstr "Merr perditesimet e problemeve ne kete %s" msgid "Give me an RSS feed" msgstr "Me jep mua nje RSS feed" +#: templates/web/base/questionnaire/completed.html:14 +msgid "Glad to hear it’s been fixed!" +msgstr "" + #: templates/web/base/alert/index.html:34 #: templates/web/base/around/postcode_form.html:8 #: templates/web/fixmystreet/around/postcode_form.html:21 @@ -1158,7 +1129,7 @@ msgstr "Me jep mua nje RSS feed" msgid "Go" msgstr "Vazhdo" -#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:93 msgid "Going to send questionnaire?" msgstr "" @@ -1180,9 +1151,7 @@ msgstr "A ka qene i rregulluar ky problem?" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "" -#: templates/web/base/footer.html:15 templates/web/fiksgatami/footer.html:27 -#: templates/web/fiksgatami/nn/footer.html:27 -#: templates/web/fixmystreet/footer.html:30 +#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:30 #: templates/web/zurich/faq/faq-de-ch.html:1 #: templates/web/zurich/footer.html:21 #: templates/web/zurich/nav_over_content.html:8 @@ -1194,18 +1163,17 @@ msgstr "Ndihme" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "Ketu jane llojet e raportimeve te problemeve lokale per ‘%s’." -#: templates/web/fiksgatami/header.html:48 -#: templates/web/fixmystreet/header.html:52 +#: templates/web/fixmystreet/header.html:58 #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "Pershendetje %s" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:50 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:63 +#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/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:86 #: templates/web/zurich/admin/report_edit.html:90 #: templates/web/zurich/admin/stats.html:32 @@ -1221,7 +1189,7 @@ msgstr "Fshih te vjetratt" msgid "Hide pins" msgstr "Fshih shenjen" -#: templates/web/base/admin/category_edit.html:79 +#: templates/web/base/admin/category_edit.html:84 msgid "History" msgstr "Historia" @@ -1237,19 +1205,25 @@ msgstr "Si te raportoj nje problem" msgid "How to send successful reports" msgstr "Si te dergoj nje raport ne menyre te sukseshme" -#: perllib/FixMyStreet/App/Controller/Admin.pm:742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:740 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Une kam frike se ju nuk mund te konfirmoni raportet e pakonfirmuara" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:89 -msgid "I'm afraid we couldn't locate your problem in the database.\n" -msgstr "Une jam i frikesuar se ne nuk mund te lokalizojme problemin tuaj e databaze.\n" +#: templates/web/base/tokens/confirm_problem.html:23 +#: templates/web/base/tokens/confirm_problem.html:27 +msgid "I just reported a problem on @fixmystreet" +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." +#: templates/web/base/tokens/confirm_update.html:19 +#: templates/web/base/tokens/confirm_update.html:23 +msgid "I just updated a problem on @fixmystreet" msgstr "" -#: perllib/FixMyStreet/App/Controller/Tokens.pm:260 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +msgid "I'm afraid we couldn't locate your problem in the database.\n" +msgstr "Une jam i frikesuar se ne nuk mund te lokalizojme problemin tuaj e databaze.\n" + +#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 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 "" @@ -1271,7 +1245,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "" -#: templates/web/base/admin/body.html:125 +#: templates/web/base/admin/body.html:133 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." @@ -1289,7 +1263,12 @@ msgstr "" msgid "If you do not, your update will not be posted." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:9 +#: templates/web/base/questionnaire/completed.html:8 +msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." +msgstr "" + +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:8 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 "" @@ -1305,34 +1284,34 @@ msgid "" "your experience of getting the problem fixed?" msgstr "" -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/body.html:149 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/base/admin/body-form.html:200 -#: templates/web/base/admin/body-form.html:201 +#: templates/web/base/admin/body-form.html:207 +#: templates/web/base/admin/body-form.html:208 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable <strong>extended Open311 stauses</strong> if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/body-form.html:187 -#: templates/web/base/admin/body-form.html:188 +#: templates/web/base/admin/body-form.html:194 +#: templates/web/base/admin/body-form.html:195 msgid "" "If you've enabled Open311 update-sending above, enable <strong>suppression of alerts</strong> \n" " if you do <strong>not</strong> want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/body-form.html:173 -#: templates/web/base/admin/body-form.html:174 +#: templates/web/base/admin/body-form.html:177 +#: templates/web/base/admin/body-form.html:178 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:127 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 msgid "Illegal ID" msgstr "ID ilegale" @@ -1357,17 +1336,21 @@ msgstr "Ne tabelen e abuzimeve?" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:38 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:144 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 #: templates/web/fixmystreet/report/banner.html:19 -#: templates/web/zurich/admin/header.html:2 +#: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 #: templates/web/zurich/admin/report_edit.html:99 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "Ne vazhdim" +#: templates/web/base/tokens/confirm_alert.html:11 +msgid "Inbox zero, here we come!" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:160 msgid "Include reporter personal details" msgstr "Perfshire te dhenat personale te raportuesit" @@ -1376,7 +1359,7 @@ msgstr "Perfshire te dhenat personale te raportuesit" msgid "Include unconfirmed reports" msgstr "Perfshire raportimet e pakonfirmuara" -#: perllib/FixMyStreet/App/Controller/Open311.pm:354 +#: perllib/FixMyStreet/App/Controller/Open311.pm:359 msgid "Incorrect has_photo value \"%s\"" msgstr "" @@ -1384,29 +1367,29 @@ msgstr "" msgid "Internal notes" msgstr "Shenim i brendshem" -#: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:61 msgid "Internal referral" msgstr "Rekomandim i brendshem" -#: perllib/FixMyStreet/App/Controller/Open311.pm:339 +#: perllib/FixMyStreet/App/Controller/Open311.pm:344 msgid "Invalid agency_responsible value %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1114 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1112 msgid "Invalid end date" msgstr "Data e fundit jovalide" -#: perllib/FixMyStreet/App/Controller/Open311.pm:432 +#: perllib/FixMyStreet/App/Controller/Open311.pm:437 msgid "Invalid format %s specified." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1110 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 msgid "Invalid start date" msgstr "Data e fillimit jovalide" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:37 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:50 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 #: templates/web/base/report/update-form.html:30 @@ -1420,8 +1403,12 @@ msgstr "Shqyrtuar" msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "" +#: templates/web/base/tokens/confirm_problem.html:14 +msgid "It’s on its way to the council right now." +msgstr "" + #: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:150 +#: templates/web/base/report/new/fill_in_details_form.html:131 #: templates/web/base/report/update-form.html:104 #: templates/web/fixmystreet/auth/general.html:47 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 @@ -1430,12 +1417,12 @@ msgstr "" msgid "Keep me signed in on this computer" msgstr "Me mbaj te kyqur ne kete kompjuter" -#: templates/web/base/admin/body.html:62 +#: templates/web/base/admin/body.html:70 #: templates/web/zurich/admin/body.html:16 msgid "Last editor" msgstr "" -#: templates/web/base/admin/report_edit.html:72 +#: templates/web/base/admin/report_edit.html:88 msgid "Last update:" msgstr "Perditesimi i fundit:" @@ -1443,43 +1430,38 @@ msgstr "Perditesimi i fundit:" msgid "Last update:" msgstr "Perditesimi fundit:" -#: templates/web/base/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:229 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "" -#: templates/web/base/admin/body.html:17 templates/web/base/admin/body.html:19 +#: templates/web/base/admin/body.html:27 msgid "List all reported problems" msgstr "Listo te gjitha problemet e raportuar" -#: templates/web/base/report/new/fill_in_details_form.html:69 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:54 -#: templates/web/zurich/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/category_wrapper.html:4 msgid "Loading..." msgstr "Duke ngarkuar..." #: templates/web/base/alert/choose.html:1 #: templates/web/base/alert/choose.html:3 #: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3 -#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:5 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5 #: templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 -#: templates/web/base/tokens/confirm_alert.html:4 #: templates/web/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "" -#: templates/web/base/alert/list.html:13 templates/web/base/alert/list.html:14 -#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:3 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:12 +#: templates/web/base/alert/list.html:14 templates/web/base/alert/list.html:3 msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "" -#: templates/web/base/footer.html:13 templates/web/fiksgatami/footer.html:25 -#: templates/web/fiksgatami/nn/footer.html:25 -#: templates/web/fixmystreet/footer.html:28 +#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:28 msgid "Local alerts" msgstr "" -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:25 msgid "Locate the problem on a map of the area" msgstr "Lokalizo problemin ne harte ne vendin e caktuar" @@ -1488,17 +1470,27 @@ msgid "MAP" msgstr "HARTA" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" msgstr "" -#: perllib/FixMyStreet/Map/OSM.pm:42 -msgid "Map © <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 "Harta © <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> dhe kontribuesit, <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">CC-BY-SA</a>" +#: templates/web/base/admin/report_edit.html:86 +#, fuzzy +msgid "Mark as sent" +msgstr "shenuar si i mbyllur" -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/user-form.html:44 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." msgstr "" +#: templates/web/base/reports/index.html:24 +msgid "Marked fixed/closed in the past eight weeks" +msgstr "" + +#: templates/web/base/reports/index.html:25 +msgid "Marked fixed/closed more than eight weeks ago" +msgstr "" + #: templates/web/fixmystreet/contact/index.html:106 msgid "Message" msgstr "Mesazh" @@ -1507,7 +1499,7 @@ msgstr "Mesazh" msgid "Message:" msgstr "Mesazh:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:440 +#: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" msgstr "" @@ -1537,11 +1529,11 @@ msgstr "Me shume probleme ketu afer" #: templates/web/fixmystreet/report/update-form.html:138 #: 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:94 +#: templates/web/zurich/report/new/fill_in_details_form.html:77 msgid "Name" msgstr "Emri" -#: templates/web/base/admin/report_edit.html:66 +#: templates/web/base/admin/report_edit.html:79 #: templates/web/base/admin/update_edit.html:32 #: templates/web/base/admin/user-form.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:43 @@ -1550,25 +1542,25 @@ msgstr "Emri" msgid "Name:" msgstr "Emri:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:321 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:313 msgid "Name: %s" msgstr "Emri: %s" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:186 -#: perllib/FixMyStreet/Geocode/OSM.pm:164 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 +#: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:137 +#: perllib/FixMyStreet/Cobrand/UK.pm:127 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 +#: perllib/FixMyStreet/Cobrand/Default.pm:442 +#: perllib/FixMyStreet/Cobrand/Default.pm:482 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:277 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1582,11 +1574,11 @@ msgstr "" msgid "New <br>problems" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:264 +#: perllib/FixMyStreet/App/Controller/Admin.pm:261 msgid "New body added" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:379 msgid "New category contact added" msgstr "" @@ -1659,15 +1651,15 @@ msgstr "Perditesim i ri:" msgid "Next" msgstr "Tjetra" -#: templates/web/base/admin/body.html:72 templates/web/base/admin/body.html:74 -#: templates/web/base/admin/body.html:78 templates/web/base/admin/body.html:80 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:93 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:44 @@ -1685,7 +1677,7 @@ msgstr "" msgid "No council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:376 +#: perllib/FixMyStreet/DB/Result/Problem.pm:401 msgid "No council selected" msgstr "" @@ -1726,12 +1718,12 @@ msgid "" " your config file is not pointing to a live MapIt service." msgstr "" -#: templates/web/base/report/_support.html:3 +#: templates/web/base/report/_support.html:2 #: templates/web/base/report/_support.html:4 msgid "No supporters" msgstr "Asnje perkrahes" -#: templates/web/base/admin/report_edit.html:30 +#: templates/web/base/admin/report_edit.html:41 #: templates/web/zurich/admin/report_edit-sdm.html:46 #: templates/web/zurich/admin/report_edit.html:60 msgid "None" @@ -1746,8 +1738,8 @@ msgid "" " activity across their body), the ability to hide reports or set special report statuses." msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:46 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -1763,12 +1755,12 @@ msgstr "Jo per nenndarjet e mia" msgid "Not reported before" msgstr "Nuk eshte raportuar me pare" -#: templates/web/base/report/_main.html:61 +#: templates/web/base/report/_main.html:62 msgid "Not reported to council" msgstr "" -#: templates/web/base/admin/body.html:63 -#: templates/web/base/admin/category_edit.html:87 +#: templates/web/base/admin/body.html:71 +#: templates/web/base/admin/category_edit.html:92 #: templates/web/zurich/admin/body.html:17 msgid "Note" msgstr "Shenim" @@ -1777,8 +1769,8 @@ msgstr "Shenim" 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/base/admin/body.html:178 -#: templates/web/base/admin/category_edit.html:44 +#: templates/web/base/admin/body.html:186 +#: templates/web/base/admin/category_edit.html:49 #: templates/web/zurich/admin/body.html:53 msgid "Note:" msgstr "Shenim:" @@ -1791,7 +1783,7 @@ msgstr "Shenim: <strong>%s</strong>" msgid "Now to submit your report…" msgstr "" -#: templates/web/base/report/new/fill_in_details_form.html:132 +#: templates/web/base/report/new/fill_in_details_form.html:113 msgid "Now to submit your report… do you have a FixMyStreet password?" msgstr "" @@ -1808,7 +1800,7 @@ msgid "OK" msgstr "Ne rregull" #: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:16 +#: templates/web/base/report/update.html:17 msgid "Offensive? Unsuitable? Tell us" msgstr "" @@ -1828,19 +1820,19 @@ msgstr "E vjeter <br>e kryer" msgid "Older <br>problems" msgstr "Probleme <br> te vjetra" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:37 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 msgid "One-line summary" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:137 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:36 -#: templates/web/base/admin/report_edit.html:37 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:138 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:49 +#: templates/web/base/admin/report_edit.html:50 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/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:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/report_edit.html:86 #: templates/web/zurich/admin/report_edit.html:88 @@ -1849,10 +1841,19 @@ msgstr "" msgid "Open" msgstr "Hapur" -#: templates/web/base/my/my.html:30 templates/web/fixmystreet/my/my.html:36 +#: templates/web/base/reports/index.html:22 +msgid "Open for more than four weeks, with an update within the past eight weeks" +msgstr "" + +#: templates/web/base/my/my.html:30 +#: templates/web/fixmystreet/my/_problem-list.html:2 msgid "Open reports" msgstr "Raporte te hapura" +#: templates/web/base/reports/index.html:23 +msgid "Open, but not had any update in eight weeks" +msgstr "" + #: templates/web/base/open311/index.html:70 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "" @@ -1875,15 +1876,15 @@ msgstr "Ose raportoni problemet n:" msgid "Or you can subscribe to an alert based upon what ward or council you’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:560 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 -#: perllib/FixMyStreet/DB/Result/Problem.pm:592 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:372 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 +#: perllib/FixMyStreet/DB/Result/Problem.pm:597 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:393 msgid "Other" msgstr "Tjera" @@ -1905,8 +1906,8 @@ msgstr "Faqja nuk u gjet" msgid "Parent" msgstr "Burim" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 msgid "Partial" msgstr "I pjesshem" @@ -1926,7 +1927,7 @@ msgstr "Fjalekalimi:" msgid "Permalink" msgstr "" -#: templates/web/zurich/report/new/fill_in_details_form.html:100 +#: templates/web/zurich/report/new/fill_in_details_form.html:83 msgid "Phone number" msgstr "Numri i telefonit" @@ -1935,27 +1936,27 @@ msgstr "Numri i telefonit" msgid "Phone number (optional)" msgstr "Numri i telefonit (opsionale)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:286 -#: templates/web/base/admin/report_edit.html:68 -#: templates/web/base/report/new/fill_in_details_form.html:216 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:291 +#: templates/web/base/admin/report_edit.html:81 +#: templates/web/base/report/new/fill_in_details_form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:46 #: templates/web/zurich/admin/report_edit.html:60 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Telefoni:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:72 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 #: 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 +#: templates/web/zurich/report/new/fill_in_details_form.html:51 msgid "Photo" msgstr "Fotografia" #: templates/web/base/questionnaire/index.html:71 -#: templates/web/base/report/new/fill_in_details_form.html:103 +#: templates/web/base/report/new/fill_in_details_form.html:84 #: templates/web/base/report/update-form.html:62 #: templates/web/fixmystreet/questionnaire/index.html:91 msgid "Photo:" @@ -1969,11 +1970,11 @@ msgstr "Fotografite e raporteve te fundit" msgid "Place pin on map" msgstr "Vendose shenjen ne harte" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:38 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/zurich/admin/header.html:2 +#: 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:86 @@ -2007,20 +2008,19 @@ msgstr "Ju lutem kontrolloni email-in tuaj" msgid "Please check your email address is correct" msgstr "Ju lutem kontrolloni email adresen tuaj nese eshte e sakte" -#: perllib/FixMyStreet/App/Controller/Admin.pm:349 -#: 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:395 +#: perllib/FixMyStreet/App/Controller/Admin.pm:343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:876 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 +#: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" msgstr "Ju lutem zgjedhni kategorine" -#: perllib/FixMyStreet/DB/Result/Problem.pm:401 +#: perllib/FixMyStreet/DB/Result/Problem.pm:418 msgid "Please choose a property type" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:370 msgid "Please correct the errors below" msgstr "" @@ -2036,8 +2036,8 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:352 -#: perllib/FixMyStreet/DB/Result/Comment.pm:133 +#: perllib/FixMyStreet/App/Controller/Admin.pm:346 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "Ju lutem shkruaj nje mesazh" @@ -2048,15 +2048,15 @@ msgstr "Ju lutem shkruaj nje mesazh" msgid "Please enter a password" msgstr "Ju lutem shkruaj fjalekalimin" -#: perllib/FixMyStreet/App/Controller/Contact.pm:108 -#: perllib/FixMyStreet/DB/Result/Problem.pm:370 +#: perllib/FixMyStreet/App/Controller/Contact.pm:113 +#: perllib/FixMyStreet/DB/Result/Problem.pm:395 #: templates/web/base/js/translation_strings.html:3 msgid "Please enter a subject" msgstr "Ju lutem shkruaj subjektin" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1050 -#: perllib/FixMyStreet/App/Controller/Admin.pm:351 -#: perllib/FixMyStreet/App/Controller/Admin.pm:997 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin.pm:995 #: perllib/FixMyStreet/DB/Result/User.pm:127 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 @@ -2064,16 +2064,16 @@ msgid "Please enter a valid email" msgstr "Ju lutem shkruaj nje email valid" #: perllib/FixMyStreet/App/Controller/Alert.pm:346 -#: perllib/FixMyStreet/App/Controller/Contact.pm:118 +#: perllib/FixMyStreet/App/Controller/Contact.pm:123 msgid "Please enter a valid email address" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:373 +#: perllib/FixMyStreet/DB/Result/Problem.pm:398 #: templates/web/base/js/translation_strings.html:4 msgid "Please enter some details" msgstr "Ju lutem shkruaj disa te dhena" -#: perllib/FixMyStreet/App/Controller/Contact.pm:107 +#: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/User.pm:124 #: templates/web/base/auth/general.html:13 #: templates/web/base/auth/general.html:8 @@ -2087,7 +2087,7 @@ msgid "Please enter your email" msgstr "Ju lutem shkruani email-in tuaj" #: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:75 msgid "Please enter your email address" msgstr "Ju lutem shkruani email adresen tuaj" @@ -2095,14 +2095,14 @@ msgstr "Ju lutem shkruani email adresen tuaj" msgid "Please enter your first name" msgstr "Ju lutem shkruani emrin tuaj" -#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: perllib/FixMyStreet/Cobrand/UK.pm:318 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:106 -#: perllib/FixMyStreet/DB/Result/Comment.pm:130 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Contact.pm:111 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 +#: perllib/FixMyStreet/DB/Result/Problem.pm:406 #: perllib/FixMyStreet/DB/Result/User.pm:120 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" @@ -2125,7 +2125,7 @@ msgstr "Ju lutem shkruani titullin tuaj" msgid "Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a href=\"/\">front page</a>." msgstr "Ju lutem ndihuni te lire per tu <a href=\"%s\">kyqur perseri</a>, ose kthehuni prapa ne <a href=\"/\">kryefaqe</a>." -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:8 msgid "Please fill in details of the problem below." msgstr "Ju lutem pershkruani ne hollesi problemin me poshte." @@ -2140,7 +2140,7 @@ msgstr "" msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:251 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "" @@ -2163,16 +2163,16 @@ msgstr "" msgid "Please note:" msgstr "Ju lutem vini re:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:246 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:254 msgid "Please provide some explanation as to why you're reopening this report" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:261 msgid "Please provide some text as well as a photo" msgstr "Ju lutem ofroni nje pershkrim si dhe nje fotografi" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:247 msgid "Please say whether you've ever reported a problem to your council before" msgstr "" @@ -2184,7 +2184,7 @@ msgstr "Ju lutem zgjedhni furnizuesin qe deshironi" msgid "Please select the type of alert you want" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please state whether or not the problem has been fixed" msgstr "" @@ -2192,15 +2192,13 @@ msgstr "" msgid "Please take a look at the updates that have been left." msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:176 +#: perllib/FixMyStreet/App/Controller/Photo.pm:177 +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 +#: perllib/FixMyStreet/App/Controller/Photo.pm:189 msgid "Please upload a JPEG image only" msgstr "Ju lutem ngarkoni vetem fotografi te formatit JPEG" -#: perllib/FixMyStreet/App/Controller/Photo.pm:183 -msgid "Please upload a JPEG image only\n" -msgstr "" - -#: perllib/FixMyStreet/App/Controller/Contact.pm:109 +#: perllib/FixMyStreet/App/Controller/Contact.pm:114 msgid "Please write a message" msgstr "Ju lutem shkruani nje mesazh" @@ -2239,14 +2237,14 @@ msgstr "Paraprak" msgid "Privacy" msgstr "" -#: templates/web/base/admin/body.html:194 -#: templates/web/base/admin/body.html:77 -#: templates/web/base/admin/category_edit.html:40 -#: templates/web/base/admin/report_edit.html:79 +#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:85 +#: templates/web/base/admin/category_edit.html:45 +#: templates/web/base/admin/report_edit.html:95 msgid "Private" msgstr "Privat" -#: templates/web/base/maps/openlayers.html:86 +#: templates/web/base/maps/openlayers.html:89 msgid "Problem" msgstr "Problem" @@ -2267,7 +2265,7 @@ msgstr "" msgid "Problem breakdown by state" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:966 msgid "Problem marked as open." msgstr "Problemi eshte shenuar si i hapur." @@ -2302,16 +2300,15 @@ msgstr "Problemet e raportuara se fundi ne FixMyStreet" msgid "Problems within %.1fkm of this location" msgstr "Problemet brenda %.1fkm te ketij lokacioni" -#: perllib/FixMyStreet/Cobrand/Default.pm:629 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:114 +#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:151 -#: perllib/FixMyStreet/Cobrand/UK.pm:217 +#: perllib/FixMyStreet/Cobrand/UK.pm:207 msgid "Problems within %s" msgstr "Problemet brenda %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:122 -#: perllib/FixMyStreet/Cobrand/UK.pm:231 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "Problems within %s ward" msgstr "Problemet brenda lagjes %s" @@ -2329,7 +2326,7 @@ msgstr "Problemet brenda kufijve te:" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "" -#: templates/web/base/admin/report_edit.html:32 +#: templates/web/base/admin/report_edit.html:45 msgid "Property address:" msgstr "Adresa e prones:" @@ -2346,7 +2343,7 @@ msgstr "Ofro nje perditesim" 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/base/report/new/fill_in_details_form.html:174 +#: templates/web/base/report/new/fill_in_details_form.html:155 #: templates/web/base/report/update-form.html:128 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 #: templates/web/fixmystreet/report/update-form.html:119 @@ -2367,7 +2364,7 @@ msgstr "Publiko fotografine" msgid "Publish the response" msgstr "Publiko pergjigjen" -#: templates/web/base/questionnaire/completed.html:2 +#: templates/web/base/questionnaire/completed.html:1 #: templates/web/base/questionnaire/index.html:0 #: templates/web/base/questionnaire/index.html:14 #: templates/web/base/questionnaire/index.html:4 @@ -2386,11 +2383,12 @@ msgstr "" msgid "Questionnaire %d sent for problem %d" msgstr "" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 msgid "Questionnaire filled in by problem reporter" msgstr "" #: templates/web/base/alert/_list.html:21 +#: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display.html:50 #: templates/web/base/reports/_rss.html:1 @@ -2400,11 +2398,11 @@ msgstr "" msgid "RSS feed" msgstr "RSS feed" -#: perllib/FixMyStreet/Cobrand/UK.pm:260 perllib/FixMyStreet/Cobrand/UK.pm:272 +#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 msgid "RSS feed for %s" msgstr "RSS feed per %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "RSS feed for %s ward, %s" msgstr "RSS feed per lagjen %s , %s" @@ -2412,15 +2410,11 @@ msgstr "RSS feed per lagjen %s , %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:167 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:175 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:185 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:193 -#: perllib/FixMyStreet/Cobrand/UK.pm:286 perllib/FixMyStreet/Cobrand/UK.pm:298 +#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 msgid "RSS feed of %s" msgstr "RSS feed i %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 msgid "RSS feed of %s, within %s ward" msgstr "RSS feed i %s, brenda lagjes %s" @@ -2433,20 +2427,19 @@ msgstr "RSS feed i problemeve ne afersi" msgid "RSS feed of problems in this %s" msgstr "RSS feed i problemeve ne kete %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:630 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:115 +#: perllib/FixMyStreet/Cobrand/Default.pm:651 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:150 -#: perllib/FixMyStreet/Cobrand/UK.pm:224 +#: perllib/FixMyStreet/Cobrand/UK.pm:214 msgid "RSS feed of problems within %s" msgstr "RSS feed i problemeve brenda %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 -#: perllib/FixMyStreet/Cobrand/UK.pm:230 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s ward" msgstr "RSS feed i problemeve brenda lagjes %s " -#: templates/web/base/around/display_location.html:3 +#: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:4 msgid "RSS feed of recent local problems" msgstr "RSS feed nga problemet e fundit lokale" @@ -2486,15 +2479,18 @@ msgstr "" msgid "Remove flag" msgstr "Largo flamurin" -#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/report_edit.html:110 #: templates/web/base/admin/update_edit.html:62 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Largo fotografine (nuk mund te kthehet!)" -#: templates/web/base/footer.html:7 templates/web/fiksgatami/footer.html:19 -#: templates/web/fiksgatami/nn/footer.html:19 -#: templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 +msgid "Report" +msgstr "" + +#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 #: templates/web/zurich/footer.html:17 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2504,11 +2500,6 @@ msgstr "Raporto nje problem" msgid "Report abuse" msgstr "Raporto abuzimin" -#: templates/web/base/report_created.html:1 -#: templates/web/base/report_created.html:3 -msgid "Report created" -msgstr "Raporti u krijua" - #: perllib/FixMyStreet/App/Controller/Rss.pm:295 msgid "Report on %s" msgstr "Raporto ne %s" @@ -2532,7 +2523,7 @@ msgstr "Raportuar %s" msgid "Reported %s, to %s" msgstr "Raportuar %s, te %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:580 #: templates/web/base/contact/index.html:50 #: templates/web/fixmystreet/contact/index.html:65 msgid "Reported anonymously at %s" @@ -2544,7 +2535,7 @@ msgstr "Raportuar ne menyre anonime te %s" msgid "Reported before" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:598 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 #: templates/web/base/contact/index.html:52 #: templates/web/fixmystreet/contact/index.html:67 msgid "Reported by %s at %s" @@ -2554,31 +2545,36 @@ msgstr "Raportuar nga %s ne %s" msgid "Reported in the %s category" msgstr "Raportuar ne kategorine %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:571 +#: perllib/FixMyStreet/DB/Result/Problem.pm:576 msgid "Reported in the %s category anonymously at %s" msgstr "Raportuar ne kategorine %s ne menyre anonime ne %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:598 msgid "Reported in the %s category by %s at %s" msgstr "Raportuar ne kategorine %s nga %s ne %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:567 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 msgid "Reported via %s anonymously at %s" msgstr "Raportuar nepermjet %s ne menyre anonime ne %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:589 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 msgid "Reported via %s by %s at %s" msgstr "Raportuar nepermjet %s nga %s ne %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:563 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Raportuar nepermjet %s ne kategorine %s ne menyre anonime ne %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:583 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 msgid "Reported via %s in the %s category by %s at %s" msgstr "Raportuar nepermjet %s ne kategorine %s ne %s" -#: templates/web/base/around/around_index.html:2 +#: templates/web/base/reports/index.html:21 +#, fuzzy +msgid "Reported within the last four weeks" +msgstr "Raportuar ne kategorine %s" + +#: templates/web/base/around/around_index.html:1 #: templates/web/base/around/around_index.html:3 #: templates/web/base/js/translation_strings.html:41 #: templates/web/base/report/new/fill_in_details.html:0 @@ -2588,14 +2584,13 @@ msgstr "Raportuar nepermjet %s ne kategorine %s ne %s" msgid "Reporting a problem" msgstr "Raportimi i nje problemi" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:294 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "Raportimet" -#: perllib/FixMyStreet/DB/Result/Problem.pm:409 -#: perllib/FixMyStreet/DB/Result/Problem.pm:413 +#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "Raportimet jane te kufizuara ne gjatesine %s karaktere. Ju lutem shkurtoje raportin tuaj" @@ -2611,7 +2606,7 @@ msgstr "Raportimet ne dhe perrreth hartes" msgid "Reports published" msgstr "Raporti u publikua" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:85 msgid "Resend report" msgstr "Ridergo raportin" @@ -2619,36 +2614,35 @@ msgstr "Ridergo raportin" msgid "Right place?" msgstr "Vendi i duhur?" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:193 -#: perllib/FixMyStreet/Geocode/OSM.pm:171 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:167 +#: perllib/FixMyStreet/Geocode/OSM.pm:152 msgid "Road operator for this named road (derived from road reference number and type): %s" msgstr "" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:190 -#: perllib/FixMyStreet/Geocode/OSM.pm:168 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:164 +#: perllib/FixMyStreet/Geocode/OSM.pm:149 msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1394 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 -#: templates/web/base/admin/report_edit.html:90 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1403 +#: templates/web/base/admin/report_edit.html:106 #: templates/web/zurich/admin/report_edit.html:73 msgid "Rotate Left" msgstr "Rrotullo Majtas" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1394 -#: templates/web/base/admin/report_edit.html:91 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: templates/web/base/admin/report_edit.html:107 #: templates/web/zurich/admin/report_edit.html:74 msgid "Rotate Right" msgstr "Rrotullo Djathtas" #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:200 -#: templates/web/base/admin/category_edit.html:76 +#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/category_edit.html:81 #: templates/web/zurich/admin/body.html:59 msgid "Save changes" msgstr "Ruaj ndryshimet" @@ -2676,7 +2670,7 @@ msgstr "Kerko:" msgid "Searching found no reports." msgstr "Gjate kerkimit nuk eshte gjetur asnje raport." -#: templates/web/base/admin/users.html:39 +#: templates/web/base/admin/users.html:41 msgid "Searching found no users." msgstr "Gjate kerkimit nuk eshte gjetur asnje perdorues." @@ -2699,15 +2693,15 @@ msgstr "Zgjedh nje zone" 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:680 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "Sent to %s %s later" msgstr "" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:84 msgid "Sent:" msgstr "Dergo:" -#: templates/web/base/admin/report_edit.html:73 +#: templates/web/base/admin/report_edit.html:89 #: templates/web/zurich/admin/stats.html:45 msgid "Service:" msgstr "Sherbim:" @@ -2716,7 +2710,7 @@ msgstr "Sherbim:" msgid "Share" msgstr "Shperndaj" -#: templates/web/base/report/new/fill_in_details_form.html:211 +#: templates/web/base/report/new/fill_in_details_form.html:192 #: templates/web/base/report/update-form.html:157 #: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 @@ -2761,12 +2755,12 @@ msgstr "Shkyqu" msgid "Signed in as %s" msgstr "Kyqur si %s" -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 msgid "Some categories may require additional information." msgstr "Disa kategori mund te kerkojne informacione shtese." -#: templates/web/base/admin/body-form.html:145 -#: templates/web/base/admin/body-form.html:146 +#: templates/web/base/admin/body-form.html:149 +#: templates/web/base/admin/body-form.html:150 msgid "" "Some endpoints require an <strong>API key</strong> to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -2777,11 +2771,11 @@ msgid "Some photos of recent reports" msgstr "" #: perllib/FixMyStreet/App/View/Email.pm:32 -#: perllib/FixMyStreet/App/View/Web.pm:44 +#: perllib/FixMyStreet/App/View/Web.pm:43 msgid "Some text to localize" msgstr "" -#: perllib/FixMyStreet/Cobrand/UK.pm:88 +#: perllib/FixMyStreet/Cobrand/UK.pm:78 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -2789,17 +2783,16 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:215 -#: perllib/FixMyStreet/Geocode.pm:26 perllib/FixMyStreet/Geocode/Bing.pm:56 -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:73 -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:93 -#: perllib/FixMyStreet/Geocode/Google.pm:72 -#: perllib/FixMyStreet/Geocode/OSM.pm:64 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:214 +#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 +#: perllib/FixMyStreet/Geocode/Google.pm:47 +#: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "Na vjen keq, ne nuk mund te gjejme kete lokacion." -#: perllib/FixMyStreet/Geocode/Bing.pm:51 -#: perllib/FixMyStreet/Geocode/Google.pm:67 +#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: perllib/FixMyStreet/Geocode/Google.pm:44 #: perllib/FixMyStreet/Geocode/Zurich.pm:87 msgid "Sorry, we could not parse that location. Please try again." msgstr "Na vjen keq, ne nuk mund te kuptojme kete lokacion. Ju lutem provoni perseri." @@ -2808,7 +2801,7 @@ msgstr "Na vjen keq, ne nuk mund te kuptojme kete lokacion. Ju lutem provoni per msgid "Start Date:" msgstr "Data e Fillimit:" -#: templates/web/base/admin/body.html:61 +#: templates/web/base/admin/body.html:69 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 @@ -2816,7 +2809,7 @@ msgstr "Data e Fillimit:" msgid "State" msgstr "Gjendje" -#: templates/web/base/admin/report_edit.html:34 +#: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 #: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:53 @@ -2825,8 +2818,8 @@ msgstr "Gjendje" msgid "State:" msgstr "Gjendje:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1200 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:304 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:308 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" @@ -2842,7 +2835,7 @@ msgstr "Statusi" msgid "Still open, via questionnaire, %s" msgstr "Akoma hapur, nepermjet pyetesorit, %s" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:381 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 msgid "Subcategory: %s" msgstr "Nenkategoria: %s" @@ -2862,19 +2855,19 @@ msgid "Subject:" msgstr "Tema:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:115 -#: templates/web/base/report/new/fill_in_details_form.html:155 -#: templates/web/base/report/new/fill_in_details_form.html:177 +#: templates/web/base/report/new/fill_in_details_form.html:136 +#: templates/web/base/report/new/fill_in_details_form.html:158 +#: templates/web/base/report/new/fill_in_details_form.html:96 #: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 -#: templates/web/zurich/report/new/fill_in_details_form.html:108 +#: templates/web/zurich/report/new/fill_in_details_form.html:91 msgid "Submit" msgstr "Paraqit" -#: templates/web/base/admin/report_edit.html:97 +#: templates/web/base/admin/report_edit.html:113 #: templates/web/base/admin/update_edit.html:65 -#: templates/web/base/admin/user-form.html:55 +#: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:64 #: templates/web/zurich/admin/report_edit.html:221 #: templates/web/zurich/admin/update_edit.html:38 @@ -2886,8 +2879,8 @@ msgstr "Paraqit ndryshimet" msgid "Submit questionnaire" msgstr "Paraqit pyetesorin" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:133 -#: templates/web/zurich/admin/header.html:2 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:134 +#: 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 @@ -2911,8 +2904,8 @@ msgstr "Abonohu" msgid "Subscribe me to an email alert" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1191 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:293 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 #: templates/web/zurich/admin/index-dm.html:1 @@ -2928,7 +2921,7 @@ msgstr "Permbledhje" msgid "Summary reports" msgstr "Raportet përmbledhëse" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 msgid "Survey" msgstr "Studim" @@ -2942,7 +2935,7 @@ msgstr "Rezultatet e Studimit" msgid "Text" msgstr "Tekst" -#: templates/web/base/admin/body.html:21 +#: templates/web/base/admin/body.html:28 msgid "Text only version" msgstr "Vetem versioni i me tekst" @@ -2951,49 +2944,55 @@ msgstr "Vetem versioni i me tekst" msgid "Text:" msgstr "Tekst:" -#: templates/web/base/tokens/confirm_update.html:9 -msgid "Thank you — you can <a href=\"%s\">view your updated problem</a> on the site." -msgstr "" - -#: templates/web/base/tokens/confirm_problem.html:18 -msgid "Thank you for reporting this issue" +#: templates/web/base/tokens/confirm_problem.html:12 +msgid "Thank you for reporting this issue!" msgstr "" #: templates/web/base/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/fixmystreet/around/around_index.html:28 -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 :" +#: templates/web/base/tokens/confirm_update.html:15 +msgid "Thank you for updating this issue!" msgstr "" -#: templates/web/base/contact/submit.html:8 -msgid "Thanks for your feedback. We'll get back to you as soon as we can!" +#: templates/web/base/contact/submit.html:6 +#: templates/web/base/questionnaire/completed.html:5 +msgid "Thank you for your feedback" +msgstr "" + +#: templates/web/fixmystreet/around/around_index.html:28 +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 :" msgstr "" #: templates/web/base/questionnaire/creator_fixed.html:9 msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "" -#: perllib/FixMyStreet/App/Controller/Photo.pm:190 +#: perllib/FixMyStreet/App/Controller/Photo.pm:195 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Council.pm:100 +#: perllib/FixMyStreet/App/Controller/Council.pm:97 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 +#: perllib/FixMyStreet/App/Controller/Location.pm:126 msgid "That location does not appear to be in the UK; please try again." msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:81 +#: perllib/FixMyStreet/Cobrand/UK.pm:71 msgid "That postcode was not recognised, sorry." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:713 +#: perllib/FixMyStreet/App/Controller/Admin.pm:712 +#, fuzzy +msgid "That problem has been marked as sent." +msgstr "Ky problem ka qene i rregulluar" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:704 msgid "That problem will now be resent." msgstr "" @@ -3005,28 +3004,28 @@ msgstr "Raporti nuk mund te shihet ne %s." msgid "That report has been removed from FixMyStreet." msgstr "" -#: templates/web/base/admin/body.html:136 +#: templates/web/base/admin/body.html:144 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/base/admin/body-form.html:119 -#: templates/web/base/admin/body-form.html:120 +#: templates/web/base/admin/body-form.html:123 +#: templates/web/base/admin/body-form.html:124 msgid "" "The <strong>endpoint</strong> is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." msgstr "" -#: templates/web/base/admin/body-form.html:132 -#: templates/web/base/admin/body-form.html:133 +#: templates/web/base/admin/body-form.html:136 +#: templates/web/base/admin/body-form.html:137 msgid "" "The <strong>jurisdiction</strong> is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" -#: templates/web/base/admin/body-form.html:90 -#: templates/web/base/admin/body-form.html:91 +#: templates/web/base/admin/body-form.html:94 +#: templates/web/base/admin/body-form.html:95 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>." @@ -3047,7 +3046,7 @@ msgstr "" msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." msgstr "" -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:3 msgid "The council won’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 "" @@ -3074,8 +3073,8 @@ msgstr "Gabimi ishte: %s" msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:185 -#: perllib/FixMyStreet/Geocode/OSM.pm:163 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:159 +#: perllib/FixMyStreet/Geocode/OSM.pm:144 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap." msgstr "" @@ -3133,7 +3132,7 @@ msgstr "" msgid "The passwords do not match" msgstr "Fjalekalimet nuk perputhen" -#: templates/web/base/errors/page_error_404_not_found.html:11 +#: templates/web/base/errors/page_error_404_not_found.html:10 #: templates/web/base/errors/page_error_404_not_found.html:12 msgid "The requested URL '%s' was not found on this server" msgstr "URL e kerkuar '%s' nuk u gjet ne kete server" @@ -3150,7 +3149,7 @@ msgstr "" msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:295 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:300 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "" @@ -3161,16 +3160,20 @@ msgid "" " Names are not necessarily unique." msgstr "" +#: templates/web/base/reports/_problem-list.html:15 +msgid "There are no reports to show." +msgstr "" + #: perllib/FixMyStreet/App/Controller/Reports.pm:75 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:131 +#: perllib/FixMyStreet/App/Controller/Contact.pm:136 #: 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/New.pm:762 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 #: templates/web/base/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:25 @@ -3186,7 +3189,7 @@ msgstr "" msgid "There was a problem with your update. Please try again." msgstr "" -#: perllib/FixMyStreet/App/Controller/Contact.pm:135 +#: perllib/FixMyStreet/App/Controller/Contact.pm:140 msgid "There were problems with your report. Please see below." msgstr "" @@ -3194,8 +3197,8 @@ msgstr "" msgid "There were problems with your update. Please see below." msgstr "" -#: templates/web/base/admin/body-form.html:108 -#: templates/web/base/admin/body-form.html:109 +#: templates/web/base/admin/body-form.html:112 +#: templates/web/base/admin/body-form.html:113 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" @@ -3208,14 +3211,14 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" -#: templates/web/base/admin/body.html:36 +#: templates/web/base/admin/body.html:44 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported <em>at any location</em>.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" " Currently, users <strong>cannot report problems to this body</strong>." msgstr "" -#: templates/web/base/admin/body.html:46 +#: templates/web/base/admin/body.html:54 msgid "This body has no contacts. This means that currently problems reported to this body <strong>will not be sent</strong>." msgstr "" @@ -3226,18 +3229,18 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:388 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:394 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:391 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 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:136 -#: perllib/FixMyStreet/Cobrand/UK.pm:53 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:902 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:972 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/Cobrand/UK.pm:43 msgid "This information is required" msgstr "" @@ -3276,8 +3279,8 @@ msgstr "Ky problem eshte ne progres" msgid "This problem is old and of unknown status." msgstr "Ky problem eshte i vjeter dhe me status te panjohur." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:130 #: perllib/FixMyStreet/Cobrand/Zurich.pm:131 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:132 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "" @@ -3294,15 +3297,15 @@ msgstr "Ky raport eshte shenuar si i rregulluar." msgid "This report is currently marked as open." msgstr "Ky problem eshte i shenuar si i hapur." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:319 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:311 msgid "This report was submitted anonymously" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:293 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Kohezgjatja" @@ -3320,7 +3323,7 @@ msgstr "Per te <strong>raportuar nje problem</strong>, kliko ne harte ne lokaci 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:294 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:299 msgid "To view a map of the precise location of this issue" msgstr "" @@ -3336,8 +3339,12 @@ msgstr "Total" msgid "Try again" msgstr "Provo perseri" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:46 +#: templates/web/base/contact/submit.html:14 +msgid "Try emailing us directly:" +msgstr "" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -3345,8 +3352,8 @@ msgstr "Provo perseri" msgid "Unable to fix" msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/admin/update_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:45 #: templates/web/zurich/admin/report_edit.html:58 @@ -3388,7 +3395,7 @@ msgstr "" msgid "Update below added by %s at %s" msgstr "" -#: templates/web/base/admin/body-form.html:233 +#: templates/web/base/admin/body-form.html:240 #: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "" @@ -3414,7 +3421,7 @@ msgstr "Perditesimi shenon problemin si te rregulluar" msgid "Update reopened problem" msgstr "" -#: templates/web/base/admin/body.html:93 +#: templates/web/base/admin/body.html:101 msgid "Update statuses" msgstr "" @@ -3428,12 +3435,12 @@ msgstr "Perditesim:" msgid "Updated" msgstr "Perditesuar" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1016 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1060 -#: perllib/FixMyStreet/App/Controller/Admin.pm:810 -#: perllib/FixMyStreet/App/Controller/Admin.pm:958 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:549 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:618 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1014 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:808 +#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:556 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:625 msgid "Updated!" msgstr "Perditesuar!" @@ -3445,7 +3452,7 @@ msgstr "Perditesuar!" msgid "Updates" msgstr "Perditesime" -#: perllib/FixMyStreet/DB/Result/Comment.pm:139 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "" @@ -3460,7 +3467,7 @@ msgstr "Perditesimet ne {{title}}" msgid "Updates to this problem, FixMyStreet" msgstr "" -#: templates/web/base/admin/body.html:174 +#: templates/web/base/admin/body.html:182 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 "" @@ -3469,11 +3476,11 @@ msgstr "" msgid "User" msgstr "Perdorues" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1357 msgid "User flag removed" msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1331 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1329 msgid "User flagged" msgstr "" @@ -3481,16 +3488,16 @@ msgstr "" msgid "User search finds matches in users' names and email addresses." msgstr "" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:303 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:307 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Perdoruesit" -#: perllib/FixMyStreet/App/Controller/Admin.pm:380 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:430 +#: perllib/FixMyStreet/App/Controller/Admin.pm:374 +#: perllib/FixMyStreet/App/Controller/Admin.pm:404 +#: perllib/FixMyStreet/App/Controller/Admin.pm:421 msgid "Values updated" msgstr "Vlerat e perditesuara" @@ -3544,11 +3551,11 @@ msgstr "ne asnjëherë nuk do të shfaqim email-in tuaj" msgid "We never show your email address or phone number." msgstr "Ne asnjëherë nuk do tëshfaqim email adresen ose numrin tuaj të telefonit." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:403 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/base/index-steps.html:38 +#: templates/web/base/index-steps.html:31 msgid "We send it to the council on your behalf" msgstr "" @@ -3557,15 +3564,23 @@ msgstr "" msgid "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>" msgstr "" +#: templates/web/base/questionnaire/completed-open.html:2 +msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" +msgstr "" + #: templates/web/base/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/fixmystreet/report/new/fill_in_details_form.html:41 +#: templates/web/base/contact/submit.html:7 +msgid "We’ll get back to you as soon as we can." +msgstr "" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 msgid "What’s the issue, and where is it?" msgstr "" -#: templates/web/base/admin/category_edit.html:82 +#: templates/web/base/admin/category_edit.html:87 #: templates/web/zurich/admin/body.html:18 msgid "When edited" msgstr "Kur redaktohet" @@ -3574,15 +3589,18 @@ msgstr "Kur redaktohet" msgid "When sent" msgstr "" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Whole block of empty flats" msgstr "" +#: templates/web/base/tokens/confirm_alert.html:7 +msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." +msgstr "" + #: templates/web/base/open311/index.html:92 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/fiksgatami/front/footer-marketing.html:15 #: templates/web/fixmystreet/front/footer-marketing.html:17 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" @@ -3606,18 +3624,18 @@ msgid "Year" msgstr "Viti" #: templates/web/base/admin/bodies.html:66 -#: templates/web/base/admin/body.html:72 templates/web/base/admin/body.html:74 -#: templates/web/base/admin/body.html:78 templates/web/base/admin/body.html:80 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:76 +#: templates/web/base/admin/report_edit.html:93 #: templates/web/base/admin/update_edit.html:24 -#: templates/web/base/admin/users.html:29 +#: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:42 #: templates/web/base/questionnaire/index.html:81 @@ -3646,14 +3664,12 @@ msgstr "" msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "" -#: templates/web/base/tokens/confirm_problem.html:25 -#: templates/web/base/tokens/confirm_problem.html:26 -#: templates/web/zurich/tokens/confirm_problem.html:6 +#: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:8 msgid "You can <a href=\"%s%s\">view the problem on this site</a>." msgstr "Ju mund <a href=\"%s%s\">te shihni problemin ne kete faqe</a>." -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:48 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "" @@ -3668,14 +3684,14 @@ msgid "" " reports in the past." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:19 -#: templates/web/base/report/new/councils_text_none.html:20 -#: templates/web/base/report/new/councils_text_some.html:20 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." msgstr "" -#: templates/web/base/admin/body-form.html:81 +#: templates/web/base/admin/body-form.html:85 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" @@ -3688,10 +3704,10 @@ msgid "You have already answered this questionnaire. If you have a question, ple msgstr "" #: templates/web/base/questionnaire/index.html:68 -#: templates/web/base/report/new/fill_in_details_form.html:94 +#: templates/web/base/report/new/fill_in_details_form.html:75 #: templates/web/fixmystreet/questionnaire/index.html:88 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:79 -#: templates/web/zurich/report/new/fill_in_details_form.html:75 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 +#: templates/web/zurich/report/new/fill_in_details_form.html:58 msgid "You have already attached a photo to this report, attaching another one will replace it." msgstr "" @@ -3700,7 +3716,7 @@ msgstr "" msgid "You have already attached a photo to this update, attaching another one will replace it." msgstr "" -#: templates/web/base/auth/sign_out.html:3 +#: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" msgstr "Ju keni qene te shkyqur" @@ -3709,26 +3725,11 @@ msgstr "Ju keni qene te shkyqur" 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/base/tokens/confirm_alert.html:8 -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/base/tokens/confirm_update.html:14 -msgid "You have successfully confirmed your update and you can now <a href=\"%s\">view it on the site</a>." -msgstr "" - -#: templates/web/base/tokens/confirm_alert.html:12 -msgid "You have successfully created your alert." -msgstr "" - -#: templates/web/base/tokens/confirm_alert.html:10 -msgid "You have successfully deleted your alert." -msgstr "" - #: templates/web/base/report/display.html:20 #: templates/web/base/report/new/fill_in_details.html:37 #: templates/web/fixmystreet/report/display.html:17 @@ -3754,7 +3755,7 @@ msgid "" " contacts (such as an email address) to which reports are sent." msgstr "" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:85 msgid "You really want to resend?" msgstr "Ju vertete deshironi ta ridergoni?" @@ -3774,7 +3775,7 @@ msgstr "Raportet tuaja" #: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 #: templates/web/fixmystreet/report/update-form.html:76 -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:71 msgid "Your email" msgstr "Email-i juaj" @@ -3790,7 +3791,7 @@ msgid "Your email address:" msgstr "Email adresa juaj:" #: templates/web/base/alert/_list.html:92 -#: templates/web/base/report/new/fill_in_details_form.html:125 +#: templates/web/base/report/new/fill_in_details_form.html:106 #: templates/web/base/report/update-form.html:81 msgid "Your email:" msgstr "Email-i juaj:" @@ -3805,13 +3806,13 @@ msgstr "" #: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 #: templates/web/fixmystreet/report/update-form.html:142 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:98 +#: templates/web/zurich/report/new/fill_in_details_form.html:81 msgid "Your name" msgstr "Emri juaj" #: templates/web/base/auth/general.html:59 #: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:204 +#: templates/web/base/report/new/fill_in_details_form.html:185 #: templates/web/base/report/update-form.html:151 msgid "Your name:" msgstr "Emri juaj:" @@ -3829,33 +3830,19 @@ msgstr "Fjalekalimi juaj eshte ndryshuar" #: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 -#: templates/web/zurich/report/new/fill_in_details_form.html:104 +#: templates/web/zurich/report/new/fill_in_details_form.html:87 msgid "Your phone number" msgstr "Numri juaj i telefonit" -#: templates/web/base/tokens/confirm_problem.html:4 -msgid "Your problem has been confirmed!" -msgstr "" - #: templates/web/fixmystreet/questionnaire/index.html:16 msgid "Your report" msgstr "Raporti juaj" -#: templates/web/base/report_created.html:6 -msgid "Your report has been created and will shortly be sent." -msgstr "" - -#: templates/web/base/footer.html:9 templates/web/fiksgatami/footer.html:21 -#: templates/web/fiksgatami/nn/footer.html:21 -#: templates/web/fixmystreet/footer.html:24 +#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:24 msgid "Your reports" msgstr "Raportet tuaja" -#: templates/web/base/tokens/confirm_update.html:4 -msgid "Your update has been confirmed!" -msgstr "" - -#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:59 +#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:41 msgid "Your updates" msgstr "Perditesimet tuaja" @@ -3872,11 +3859,7 @@ msgstr "nga %s" msgid "council" msgstr "" -#: perllib/FixMyStreet/DB/Result/Problem.pm:665 -msgid "council ref: %s" -msgstr "" - -#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:32 #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:54 msgid "didn't use map" @@ -3887,6 +3870,7 @@ msgstr "nuk e perdorni harten" msgid "e.g. ‘%s’ or ‘%s’" msgstr "p.sh. ‘%s’ ose ‘%s’" +#: templates/web/base/admin/body-form.html:188 #: templates/web/base/admin/flagged.html:51 msgid "edit user" msgstr "" @@ -3901,7 +3885,7 @@ msgstr "nga %d perdorues te ndry" msgid "last updated %s" msgstr "Perditesimi i fundit %s" -#: perllib/Utils.pm:263 +#: perllib/Utils.pm:235 msgid "less than a minute" msgstr "më pak se një minutë" @@ -3961,22 +3945,22 @@ msgstr "ose" msgid "or locate me automatically" msgstr "ose me gjeje ne menyre automatike" -#: templates/web/base/admin/report_edit.html:25 -#: templates/web/base/admin/report_edit.html:26 -#: templates/web/zurich/admin/report_edit-sdm.html:28 +#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:30 +#: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit-sdm.html:29 -#: templates/web/zurich/admin/report_edit-sdm.html:37 +#: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:38 -#: templates/web/zurich/admin/report_edit.html:28 +#: templates/web/zurich/admin/report_edit.html:27 #: templates/web/zurich/admin/report_edit.html:29 -#: templates/web/zurich/admin/report_edit.html:39 +#: templates/web/zurich/admin/report_edit.html:38 #: templates/web/zurich/admin/report_edit.html:40 -#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit.html:50 #: templates/web/zurich/admin/report_edit.html:52 msgid "originally entered: “%s”" msgstr "" -#: templates/web/base/admin/report_edit.html:30 +#: templates/web/base/admin/report_edit.html:43 msgid "other areas:" msgstr "zona tjera:" @@ -3985,13 +3969,12 @@ msgstr "zona tjera:" msgid "reopened" msgstr "rihapur" -#: templates/web/fiksgatami/header.html:49 -#: templates/web/fixmystreet/header.html:53 +#: templates/web/fixmystreet/header.html:59 #: templates/web/zurich/footer.html:12 msgid "sign out" msgstr "shkyqur" -#: templates/web/base/report/new/fill_in_details_form.html:13 +#: templates/web/base/report/new/fill_in_details_form.html:12 #: templates/web/base/report/new/fill_in_details_form.html:15 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 @@ -4003,15 +3986,15 @@ msgstr "" msgid "there is no pin shown as the user did not use the map" msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:373 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:379 msgid "this type of local problem" msgstr "ky lloj i problemit lokal" -#: perllib/Utils.pm:235 +#: perllib/Utils.pm:207 msgid "today" msgstr "sot" -#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:32 #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:54 msgid "used map" @@ -4037,7 +4020,7 @@ msgid_plural "<big>%s</big> reports recently" msgstr[0] "<big>%s</big> raporti i fundit" msgstr[1] "<big>%s</big> raportet e fundit" -#: perllib/Utils.pm:282 +#: perllib/Utils.pm:254 #, perl-format msgid "%d hour" msgid_plural "%d hours" @@ -4051,7 +4034,7 @@ msgid_plural "%d supporters" msgstr[0] "%d perkrahes" msgstr[1] "%d perkrahes" -#: perllib/Utils.pm:284 +#: perllib/Utils.pm:256 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -4072,7 +4055,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:250 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -4093,7 +4076,7 @@ msgid_plural "<big>%s</big> fixed in past month" msgstr[0] "<big>%s</big> e rregulluar ne muajin e kaluar" msgstr[1] "<big>%s</big> e rregulluar ne muajin e kaluar" -#: perllib/Utils.pm:280 +#: perllib/Utils.pm:252 #, perl-format msgid "%d day" msgid_plural "%d days" diff --git a/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po index 6fb005d86..6eaee177f 100644 --- a/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/sv_SE.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -6,14 +6,14 @@ # Translators: # Joel Hansen <johaswe@gmail.com>, 2012 # Jonas Öberg <jonas@morus.se>, 2012 -# Jon Kristensen <info@jonkri.com>, 2014 -# Rikard Fröberg <rikard@morus.se>, 2014 +# Jon Kristensen <info@jonkri.com>, 2014-2015 +# Rikard Fröberg <rikard@morus.se>, 2014-2015 msgid "" msgstr "" "Project-Id-Version: fixmystreet\n" "Report-Msgid-Bugs-To: matthew@mysociety.org\n" -"POT-Creation-Date: 2015-01-20 16:59+0000\n" -"PO-Revision-Date: 2014-12-16 08:53+0000\n" +"POT-Creation-Date: 2015-07-31 14:28+0100\n" +"PO-Revision-Date: 2015-07-12 13:28+0000\n" "Last-Translator: Jon Kristensen <info@jonkri.com>\n" "Language-Team: Swedish (Sweden) (http://www.transifex.com/projects/p/fixmystreet/language/sv_SE/)\n" "Language: sv_SE\n" @@ -22,17 +22,15 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: perllib/FixMyStreet/DB/Result/Problem.pm:618 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:386 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:392 msgid " and " msgstr "eller" -#: templates/web/base/report/new/councils_text_all.html:12 -#: templates/web/base/report/new/councils_text_all.html:19 -#: templates/web/base/report/new/councils_text_all.html:5 -#: templates/web/base/report/new/councils_text_none.html:19 -#: templates/web/base/report/new/councils_text_none.html:21 -#: templates/web/base/report/new/councils_text_some.html:20 +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_none.html:11 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " @@ -68,22 +66,26 @@ msgstr "%d till %d av %d" msgid "%s - Summary reports" msgstr "%s - Sammanställningsrapporter" -#: perllib/FixMyStreet/DB/Result/Problem.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:672 msgid "%s ref: %s" msgstr "%s ref: %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:265 perllib/FixMyStreet/Cobrand/UK.pm:277 +#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 msgid "%s ward, %s" msgstr "Administrativa området %s, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:554 +#: perllib/FixMyStreet/DB/Result/Problem.pm:559 msgid "%s, reported at %s" msgstr "%s, rapporterad %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:304 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "%s, within %s ward" msgstr "%s inom det administrativa området %s" +#: perllib/FixMyStreet/Map/OSM.pm:42 +msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" +msgstr "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" + #: templates/web/base/email_sent.html:29 msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" msgstr "(Vi behåller din bevakning medan du kontrollerar din e-post)" @@ -97,7 +99,7 @@ msgid "(Don't worry — we'll hang on to your update while you're checking y msgstr "(Vi behåller din uppdatering medan du kontrollerar din e-post.)" #: templates/web/base/admin/report_blocks.html:11 -#: templates/web/base/admin/users.html:29 +#: templates/web/base/admin/users.html:31 msgid "(Email in abuse table)" msgstr "(Epost i missbrukstabellen)" @@ -125,7 +127,7 @@ msgstr "(stängd)" msgid "(fixed)" msgstr "(fixad)" -#: templates/web/base/index.html:9 +#: templates/web/base/index.html:8 templates/web/base/index.html:9 #: templates/web/fixmystreet/around/intro.html:2 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(ex.v. graffiti, skräp, trasiga gatustenar eller belysning)" @@ -135,8 +137,8 @@ msgstr "(ex.v. graffiti, skräp, trasiga gatustenar eller belysning)" msgid "(not sent to council)" msgstr "(ej skickat till kommunen)" -#: templates/web/base/report/new/fill_in_details_form.html:218 -#: templates/web/zurich/report/new/fill_in_details_form.html:94 +#: templates/web/base/report/new/fill_in_details_form.html:199 +#: templates/web/zurich/report/new/fill_in_details_form.html:77 msgid "(optional)" msgstr "(valfritt)" @@ -149,7 +151,7 @@ msgstr "(offentlig)" msgid "(sent to both)" msgstr "(skickat till båda)" -#: templates/web/base/report/new/fill_in_details_form.html:212 +#: templates/web/base/report/new/fill_in_details_form.html:193 msgid "(we never show your email address or phone number)" msgstr "(vi visar aldrig din epostadress eller telefonnummer)" @@ -157,14 +159,13 @@ msgstr "(vi visar aldrig din epostadress eller telefonnummer)" msgid "(we never show your email)" msgstr "(vi visar aldrig din epostadress)" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:662 -#: perllib/FixMyStreet/DB/Result/Problem.pm:393 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Välj en katagori --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 -#: perllib/FixMyStreet/DB/Result/Problem.pm:399 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:630 +#: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Välj en fastighetstyp --" @@ -179,37 +180,7 @@ msgstr "" " Detta är förmodligen anledningen till att \"område som täcks (area covered)\" är tomt nedan.<br>\n" " Vill du lägga till några <code>MAPIT_TYPES</code> i konfigruationsfilen?" -#: templates/web/base/questionnaire/completed.html:20 -msgid "<p style=\"font-size:150%\">Thank you very much for filling in our questionnaire; glad to hear it’s been fixed.</p>" -msgstr "<p style=\"font-size:150%\">Tack för att du fyllt i frågeformuläret! Vi är glada över att höra att problemet har lösts.</p>" - -#: templates/web/fiksgatami/questionnaire/completed-open.html:1 -msgid "" -"<p style=\"font-size:150%\">We’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’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%\">Tråkigt att problemet inte åtgärdats. Du kan prova att skriva direkt till din kommun för att uppmana dem att åtgärda problemet.</p>" - -#: templates/web/base/questionnaire/completed-open.html:6 -msgid "" -"<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" -"suggestions: why not try writing to your local representatives or, if\n" -"it’s a problem that could be fixed by local people working together, why\n" -"not <a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n" -"</p>" -msgstr "<p style=\"font-size:150%\">Tråkigt att problemet inte åtgärdats. Du kan prova att skriva direkt till din kommun för att uppmana dem att åtgärda problemet.</p>" - -#: templates/web/base/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>Tack för att du fyllt i vår enkät. Om du får ytterligare information om statusen på ditt problem är vi tacksamma om du återkommer och lämnar en uppdatering.</p>" - -#: templates/web/base/around/_report_banner.html:4 +#: templates/web/base/around/_report_banner.html:3 #: templates/web/base/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>Om du inte kan se kartan kan du <a herf='%s' rel='nofollow'>hoppa över det här steget</a>.</small>" @@ -236,7 +207,7 @@ msgstr "<strong>Nej</strong> Låt mig logga in med min epostadress" msgid "<strong>No</strong>, I do not, let me sign in by email:" msgstr "<strong>Nej</strong>, det vill jag inte, låt mig logga in med min epostadress:" -#: templates/web/base/report/new/fill_in_details_form.html:163 +#: templates/web/base/report/new/fill_in_details_form.html:144 msgid "<strong>No</strong>, let me confirm my report by email:" msgstr "<strong>Nej<strong>, låt mig bekräfta min rapport via epost:" @@ -244,13 +215,8 @@ msgstr "<strong>Nej<strong>, låt mig bekräfta min rapport via epost:" msgid "<strong>No</strong>, let me confirm my update by email:" msgstr "<strong>Nej</strong>, låt mig bekräfta min uppdatering via epost:" -#: templates/web/base/tokens/confirm_problem.html:19 -#: templates/web/base/tokens/confirm_problem.html:20 -msgid "<strong>We will now send it to the council</strong>." -msgstr "<strong>Vi kommer nu att skicka det till kommunen</strong>." - #: templates/web/base/auth/general.html:37 -#: templates/web/base/report/new/fill_in_details_form.html:141 +#: templates/web/base/report/new/fill_in_details_form.html:122 #: templates/web/base/report/update-form.html:95 #: templates/web/fixmystreet/auth/general.html:37 #: templates/web/fixmystreet/auth/general.html:39 @@ -264,8 +230,8 @@ msgstr "<strong>Ja</strong>, jag har ett lösenord" msgid "About us" msgstr "Om oss" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:39 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:52 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:31 #: templates/web/fixmystreet/report/update-form.html:28 @@ -281,26 +247,26 @@ msgid "" " categories of problem) to each body." msgstr "Lägg till en <strong>förvaltning</strong> för varje administrativ förvaltning (som kommuner) till vilka problemrapporter kan skickas. Du kan lägga till en eller flera kontakter (för olika kategorier av problem) för varje förvaltning." -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/body.html:56 msgid "Add a contact using the form below." msgstr "Lägg till en kontakt medelst formuläret nedan." #: templates/web/base/admin/bodies.html:74 -#: templates/web/base/admin/body-form.html:233 +#: templates/web/base/admin/body-form.html:240 #: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "Lägg till förvaltning" -#: templates/web/base/admin/body.html:108 +#: templates/web/base/admin/body.html:116 #: templates/web/zurich/admin/body.html:31 msgid "Add new category" msgstr "Ny kategori" -#: templates/web/base/admin/users.html:45 +#: templates/web/base/admin/users.html:47 msgid "Add user" msgstr "Lägg till användare" -#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:70 +#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:52 msgid "Added %s" msgstr "Lades till %s" @@ -327,9 +293,7 @@ msgstr "Varsko mig om framtida uppdateringar" msgid "All Reports" msgstr "Alla rapporter" -#: templates/web/base/footer.html:11 templates/web/fiksgatami/footer.html:23 -#: templates/web/fiksgatami/nn/footer.html:23 -#: templates/web/fixmystreet/footer.html:26 +#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:26 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:19 @@ -346,19 +310,9 @@ msgstr "Alla rapporter mellan %s och %s" msgid "All the information you provide here will be sent to" msgstr "All information du anger här kommer att skickas till" -#: templates/web/base/report/new/councils_text_all.html:12 -#: templates/web/base/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 information du anger här kommer att skickas till ansvariga i <strong>%s</strong> eller <strong>Trafikverket</strong>." - -#: templates/web/base/report/new/councils_text_all.html:5 -#: templates/web/base/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 information du anger här kommer att skickas till ansvariga i <strong>%s</strong> eller annan relevant kommunal verksamhet." - -#: templates/web/base/report/new/councils_text_all.html:19 -#: templates/web/base/report/new/councils_text_all.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:13 +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_all.html:4 +#: templates/web/base/report/new/fill_in_details_form.html:12 #: templates/web/base/report/new/fill_in_details_form.html:14 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 @@ -375,7 +329,7 @@ msgstr "En uppdatering markerade det här problemet som löst." msgid "Anonymous" msgstr "Anonym" -#: templates/web/base/admin/report_edit.html:62 +#: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:23 msgid "Anonymous:" msgstr "Anonym:" @@ -384,20 +338,20 @@ msgstr "Anonym:" msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?" msgstr "Är du en <strong>utvecklare</strong>? Skulle du vilja bidra till FixaMinGata?" -#: templates/web/fiksgatami/front/footer-marketing.html:14 #: templates/web/fixmystreet/front/footer-marketing.html:16 msgid "Are you a developer?" msgstr "Är du en utvecklare?" #: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 msgid "Area covered" msgstr "Område som täcks" #: templates/web/base/admin/bodies.html:15 -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/body.html:60 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." -msgstr "" +msgstr "Eftersom detta är en testsajt och %s är falskt kommer rapporter gjorda här att rapporteras till problemrapportören istället för kontakten angiven i problemkategorin" #: templates/web/zurich/admin/report_edit.html:141 #: templates/web/zurich/admin/stats.html:36 @@ -413,7 +367,7 @@ msgstr "Tilldela extern förvaltning:" msgid "Assign to subdivision:" msgstr "Tilldela underavdelning:" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:163 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:165 #: templates/web/zurich/report/updates.html:11 msgid "Assigned to %s" msgstr "Tilldelad %s" @@ -426,7 +380,7 @@ msgstr "Som mest returneras %d svar i varje förfrågan. De returnerade svaren msgid "At the moment only searching for and looking at reports work." msgstr "För tillfället fungerar det endast att söka för eller leta efter rapporter." -#: perllib/FixMyStreet/DB/Result/Problem.pm:348 +#: perllib/FixMyStreet/DB/Result/Problem.pm:373 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "Väntar på att granskas" @@ -439,8 +393,8 @@ msgstr "Tillbaka" msgid "Ban email address" msgstr "Förbjud epostadress" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:297 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:301 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" msgstr "Förvaltningar" @@ -451,6 +405,7 @@ msgstr "Förvaltningar" msgid "Body" msgstr "Förvaltning" +#: templates/web/base/admin/report_edit.html:34 #: templates/web/base/admin/user-form.html:32 msgid "Body:" msgstr "Förvaltning:" @@ -463,16 +418,15 @@ msgstr "Efter datum" msgid "Can't see the map? <em>Skip this step</em>" msgstr "Kan du inte se kartan? <em>Hoppa över det här steget</em>" -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:55 #: templates/web/base/report/new/category.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:53 +#: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 #: templates/web/zurich/admin/stats.html:50 -#: templates/web/zurich/report/new/fill_in_details_form.html:50 msgid "Category" msgstr "Kategori" @@ -480,17 +434,16 @@ msgstr "Kategori" msgid "Category fix rate for problems > 4 weeks old" msgstr "Kategorins lösningsnivå för problem över 4 veckor gamla" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:138 #: templates/web/base/admin/category_edit.html:23 -#: templates/web/base/admin/report_edit.html:61 -#: templates/web/base/report/new/fill_in_details_form.html:68 +#: templates/web/base/admin/report_edit.html:74 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/report_edit-sdm.html:42 #: templates/web/zurich/admin/report_edit.html:140 msgid "Category:" msgstr "Kategori:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:377 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383 msgid "Category: %s" msgstr "Kategori: %s" @@ -501,7 +454,7 @@ msgstr "Kategori: %s" msgid "Change password" msgstr "Ändra lösenord" -#: templates/web/base/admin/body.html:152 +#: templates/web/base/admin/body.html:160 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." @@ -509,13 +462,13 @@ msgstr "" "Markera <strong>bekräftad</strong> för att visa att denna kontakt har verifierats.\n" "Om du inte är säker på ursprung eller giltighet för denna kontakt, lämna detta omarkerat." -#: templates/web/base/admin/body.html:163 +#: templates/web/base/admin/body.html:171 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 "Markera <strong>raderad</strong> för att ta bort denna kategori från att användas. Den kommer inte dyka upp som en valbar kategori i rullgardinslistan på sidan där användare rapporterar ett problem." -#: templates/web/base/admin/body.html:183 +#: templates/web/base/admin/body.html:191 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -526,7 +479,7 @@ msgid "" " at a specific address." msgstr "Kryssa i <strong>privat</strong> om rapporter i den här kategorin <strong>aldrig skall visas på sajten</strong>.<br>Kategorier är vanligtvis inte privata.<br>Detta är lämpligt för rapporter som du vill tillåta att användare rapporterar till förvaltningen, men där det inte finns något allmänt intresse av att visa rapporten. Det kan exempelvis vara en kategori som används för att sätta ut en extra papperskorg på en specifik adress." -#: templates/web/base/admin/body.html:122 +#: templates/web/base/admin/body.html:130 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." @@ -542,16 +495,16 @@ msgstr "Klicka här eller ange som dd/mm/yyyy" msgid "Click map to report a problem" msgstr "Klicka på kartan för att rapportera ett problem" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:45 -#: templates/web/base/admin/report_edit.html:47 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:58 +#: templates/web/base/admin/report_edit.html:60 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/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:95 #: templates/web/zurich/admin/report_edit.html:97 #: templates/web/zurich/admin/stats.html:31 @@ -559,11 +512,12 @@ msgstr "Klicka på kartan för att rapportera ett problem" msgid "Closed" msgstr "Stängd" -#: perllib/FixMyStreet/DB/Result/Problem.pm:762 +#: perllib/FixMyStreet/DB/Result/Problem.pm:771 msgid "Closed by council" msgstr "Stängd av kommunen" -#: templates/web/base/my/my.html:40 templates/web/fixmystreet/my/my.html:46 +#: templates/web/base/my/my.html:40 +#: templates/web/fixmystreet/my/_problem-list.html:12 msgid "Closed reports" msgstr "Stängda rapporter" @@ -571,7 +525,7 @@ msgstr "Stängda rapporter" msgid "Closed:" msgstr "Stängd:" -#: templates/web/base/around/tabbed_lists.html:11 +#: templates/web/base/around/tabbed_lists.html:10 #: templates/web/base/around/tabbed_lists.html:12 msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "Närmaste närliggande problem <small>(inom %s km)</small>" @@ -586,26 +540,26 @@ msgstr "Koordinater:" msgid "Cobrand" msgstr "Cobrand" -#: templates/web/base/admin/report_edit.html:75 +#: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:50 msgid "Cobrand data:" msgstr "Cobrand data:" -#: templates/web/base/admin/report_edit.html:74 +#: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:49 msgid "Cobrand:" msgstr "Cobrand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Konfiguration" -#: templates/web/base/admin/category_edit.html:47 +#: templates/web/base/admin/category_edit.html:52 msgid "Configure Endpoint" msgstr "Konfigurera slutpunkt" -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/body.html:72 msgid "Confirm" msgstr "Bekfräfta" @@ -626,10 +580,10 @@ msgstr "Bekräfta via epost nedan genom att ange ett nytt lösenord. När du bek msgid "Confirmation" msgstr "Bekräftelse" -#: templates/web/base/admin/body.html:158 -#: templates/web/base/admin/body.html:71 -#: templates/web/base/admin/category_edit.html:32 -#: templates/web/base/admin/category_edit.html:84 +#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/category_edit.html:37 +#: templates/web/base/admin/category_edit.html:89 #: templates/web/zurich/admin/stats.html:40 msgid "Confirmed" msgstr "Bekräftat" @@ -640,7 +594,7 @@ msgstr "Bekräftade rapporter mellan %s och %s" #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 -#: templates/web/base/admin/report_edit.html:70 +#: templates/web/base/admin/report_edit.html:83 msgid "Confirmed:" msgstr "Bekräftat:" @@ -657,13 +611,12 @@ msgid "Contact Us" msgstr "Kontakta oss" #: templates/web/base/contact/index.html:6 -#: templates/web/base/contact/submit.html:3 #: templates/web/fixmystreet/contact/index.html:20 msgid "Contact the team" msgstr "Kontakta teamet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1327 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1355 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1325 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1353 msgid "Could not find user" msgstr "Kan inte hitta användaren" @@ -681,6 +634,10 @@ msgstr "Kommun" msgid "Council contacts for %s" msgstr "Kommunkontakter för %s" +#: perllib/FixMyStreet/DB/Result/Problem.pm:670 +msgid "Council ref: %s" +msgstr "kommunens referens: %s" + #: templates/web/base/admin/stats.html:84 msgid "Council:" msgstr "Kommun:" @@ -696,7 +653,7 @@ msgstr "Antal" msgid "Create a report" msgstr "Skapa en rapport" -#: templates/web/base/admin/body.html:200 +#: templates/web/base/admin/body.html:208 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Skapa en kategori" @@ -708,7 +665,7 @@ msgid "Created" msgstr "Skapad" #: templates/web/base/admin/list_updates.html:38 -#: templates/web/base/admin/report_edit.html:69 +#: templates/web/base/admin/report_edit.html:82 #: templates/web/base/admin/update_edit.html:51 #: templates/web/zurich/admin/report_edit-sdm.html:47 #: templates/web/zurich/admin/report_edit.html:61 @@ -725,7 +682,7 @@ msgstr "Nuvarande status" msgid "Currently no bodies have been created." msgstr "Inga förvaltningar har skapats ännu." -#: templates/web/base/dashboard/index.html:6 +#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 msgid "Dashboard" msgstr "Skrivbord" @@ -735,14 +692,14 @@ msgid "Dealt with by subdivision within 5 working days" msgstr "Hanterat av underavdelning inom 5 arbetsdagar" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:169 -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:37 -#: templates/web/base/admin/category_edit.html:85 +#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:81 +#: templates/web/base/admin/category_edit.html:42 +#: templates/web/base/admin/category_edit.html:90 msgid "Deleted" msgstr "Borttagen" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:43 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -762,7 +719,7 @@ msgstr "Detaljer" msgid "Details:" msgstr "Detaljer:" -#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/body.html:87 msgid "Devolved" msgstr "Delegerat" @@ -790,8 +747,8 @@ msgstr "Vet ej" msgid "Don't like forms?" msgstr "Gillar du inte formulär?" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:47 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:60 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:32 #: templates/web/fixmystreet/report/update-form.html:28 @@ -799,7 +756,7 @@ msgstr "Gillar du inte formulär?" msgid "Duplicate" msgstr "Finns redan" -#: templates/web/base/admin/body.html:98 +#: templates/web/base/admin/body.html:106 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" @@ -809,20 +766,20 @@ msgstr "Varje förvaltningskontakt har en kategori, och denna visas för allmän #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 -#: templates/web/base/admin/users.html:31 +#: templates/web/base/admin/users.html:33 #: templates/web/zurich/admin/problem_row.html:42 msgid "Edit" msgstr "Ändra" -#: templates/web/base/admin/body.html:212 +#: templates/web/base/admin/body.html:220 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "Ändra förvaltningsdetaljer" #: templates/web/base/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:2 +#: 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:2 +#: templates/web/zurich/admin/report_edit.html:1 #: templates/web/zurich/admin/report_edit.html:5 msgid "Editing problem %d" msgstr "Ändrar problem %d" @@ -836,12 +793,12 @@ msgstr "Ändrar uppdatering %d" msgid "Editing user %d" msgstr "Ändrar användare %d" -#: templates/web/base/admin/category_edit.html:86 +#: templates/web/base/admin/category_edit.html:91 msgid "Editor" msgstr "Redaktör" #: templates/web/base/admin/bodies.html:23 -#: templates/web/base/admin/category_edit.html:83 +#: templates/web/base/admin/category_edit.html:88 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 #: templates/web/fixmystreet/auth/general.html:21 @@ -852,15 +809,23 @@ msgstr "Redaktör" msgid "Email" msgstr "Epost" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1303 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1301 msgid "Email added to abuse list" msgstr "Epostadressen tillagd till missbrukslistan" -#: templates/web/base/admin/body.html:147 +#: templates/web/base/admin/body.html:155 msgid "Email address:" msgstr "E-postadress:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1300 +#: templates/web/base/tokens/confirm_alert.html:6 +msgid "Email alert created" +msgstr "E-postnotifikation skapad" + +#: templates/web/base/tokens/confirm_alert.html:10 +msgid "Email alert deleted" +msgstr "E-postnotifikation borttagen" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1298 msgid "Email already in abuse list" msgstr "Epostadressen finns redan i missbrukslistan" @@ -872,8 +837,8 @@ msgstr "Eposta mig nya problem lokalt" msgid "Email me updates" msgstr "Eposta mig uppdateringar" -#: templates/web/base/admin/category_edit.html:26 -#: templates/web/base/admin/report_edit.html:67 +#: templates/web/base/admin/category_edit.html:31 +#: templates/web/base/admin/report_edit.html:80 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 @@ -884,32 +849,32 @@ msgstr "Eposta mig uppdateringar" msgid "Email:" msgstr "Epost:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:322 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 msgid "Email: %s" msgstr "E-post: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 msgid "Empty flat or maisonette" msgstr "Tom lägenhet" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:631 msgid "Empty house or bungalow" msgstr "Tomt hus" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:622 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty office or other commercial" msgstr "Tomt kontor eller annan kommersiell lokal" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:623 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Empty pub or bar" msgstr "Tom pub eller bar" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:624 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty public building - school, hospital, etc." msgstr "Tom publik byggnad - skola, sjukhus, etc." -#: templates/web/base/admin/body-form.html:158 -#: templates/web/base/admin/body-form.html:159 +#: templates/web/base/admin/body-form.html:162 +#: templates/web/base/admin/body-form.html:163 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" @@ -920,8 +885,8 @@ msgstr "" "uppdateringar av befintliga rapporter. Om du är osäker (den kan förmodligen inte göra detta) så lämna detta tomt.\n" "För mer information, se <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>denna artikel</a>." -#: templates/web/base/admin/body-form.html:215 -#: templates/web/base/admin/body-form.html:216 +#: templates/web/base/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:223 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" @@ -932,11 +897,11 @@ msgstr "Aktivera <strong>Kan överlåtas</strong>-inställningen om en eller fle msgid "End Date:" msgstr "Slutdatum:" -#: templates/web/base/admin/body-form.html:126 +#: templates/web/base/admin/body-form.html:130 msgid "Endpoint" msgstr "Ändpunkt" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:72 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:73 msgid "Enter a Zürich street name" msgstr "Skriv in ett Zürich-gatunamn" @@ -949,7 +914,9 @@ msgstr "Ange ett postnummer eller gatunamn och ort" msgid "Enter a nearby postcode, or street name and area" msgstr "Ange ett postnummer eller gatunamn och ort" +#: templates/web/base/around/postcode_form.html:1 #: templates/web/base/around/postcode_form.html:2 +#: templates/web/fixmystreet/around/postcode_form.html:10 #: templates/web/fixmystreet/around/postcode_form.html:11 msgid "Enter a nearby street name and area" msgstr "Ange ett närligande gatunamn och ort" @@ -959,7 +926,7 @@ msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "Ange ett närligande gatunamn och ort, postnummer och distrikt i Delhi" #: templates/web/base/auth/general.html:64 -#: templates/web/base/report/new/fill_in_details_form.html:170 +#: templates/web/base/report/new/fill_in_details_form.html:151 #: templates/web/base/report/update-form.html:124 msgid "Enter a new password:" msgstr "Ange ett nytt lösenord:" @@ -971,7 +938,7 @@ msgstr "Ange ett nytt lösenord:" msgid "Enter a password" msgstr "Ange ett lösenord" -#: templates/web/base/index-steps.html:33 +#: templates/web/base/index-steps.html:26 msgid "Enter details of the problem" msgstr "Skriv in information om problemet" @@ -994,17 +961,22 @@ msgstr "Exempelpostnummer %s" msgid "Examples:" msgstr "Exempel:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:47 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "Beskriv vad problemet är, exakt var det är, och hur länge det har varit där..." -#: templates/web/base/admin/report_edit.html:76 +#: templates/web/base/admin/body-form.html:81 +msgid "External URL" +msgstr "" + +#: templates/web/base/admin/category_edit.html:27 +#: templates/web/base/admin/report_edit.html:92 msgid "Extra data:" msgstr "Extra data:" -#: templates/web/base/contact/submit.html:15 -msgid "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>." -msgstr "Misslyckades med att skicka meddelandet. Var vänlig försök igen eller <a href=\"mailto:%s\">eposta oss</a>." +#: templates/web/base/contact/submit.html:13 +msgid "Failed to send message" +msgstr "Misslyckades med att skicka meddelande" #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 @@ -1016,7 +988,7 @@ msgstr "Filtrera rapportlista" msgid "First time" msgstr "Första gången" -#: templates/web/base/admin/body.html:40 +#: templates/web/base/admin/body.html:48 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "Lös detta genom att välja ett <strong>lämpligt område</strong> i <em>Ändra förvaltningsdetaljer</em> i formuläret nedan." @@ -1047,9 +1019,9 @@ msgid "" msgstr "FixaMinGata skickar olika kategorier av rapporter till olika enheter inom en kommun eller län. Problem som rapporteras inom en viss kommun dyker därför inte nödvändigtvis upp i listan över rapporter till den kommunen. Exempelvis kan en rapport om en väg skickas till Vägverket snarare än kommunen. Rapporten dyker då inte upp i listan över rapporter till kommunen, men dyker upp om man söker alla rapporter inom ett visst avstånd." #: templates/web/base/admin/index.html:55 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:41 -#: templates/web/base/admin/report_edit.html:42 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:54 +#: templates/web/base/admin/report_edit.html:55 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/update-form.html:30 @@ -1060,17 +1032,18 @@ msgstr "FixaMinGata skickar olika kategorier av rapporter till olika enheter ino msgid "Fixed" msgstr "Löst" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:43 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:56 msgid "Fixed - Council" msgstr "Löst - Kommun" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:42 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:55 msgid "Fixed - User" msgstr "Löst - Användare" -#: templates/web/base/my/my.html:35 templates/web/fixmystreet/my/my.html:41 +#: templates/web/base/my/my.html:35 +#: templates/web/fixmystreet/my/_problem-list.html:7 msgid "Fixed reports" msgstr "Lösta rapporer" @@ -1078,7 +1051,7 @@ msgstr "Lösta rapporer" msgid "Fixed:" msgstr "Löst:" -#: templates/web/base/admin/body-form.html:84 +#: templates/web/base/admin/body-form.html:89 #: templates/web/zurich/admin/body-form.html:36 msgid "Flag as deleted" msgstr "Flagga som borttagen" @@ -1087,7 +1060,7 @@ msgstr "Flagga som borttagen" msgid "Flag user" msgstr "Flagga användare" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Flaggat" @@ -1096,7 +1069,7 @@ msgstr "Flaggat" msgid "Flagged reports and users" msgstr "Flaggade rapporter och användare" -#: templates/web/base/admin/user-form.html:45 +#: templates/web/base/admin/user-form.html:46 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page." msgstr "Flaggade användare är listade på <a href='%s'>flaggningssidan</a>." @@ -1104,8 +1077,8 @@ msgstr "Flaggade användare är listade på <a href='%s'>flaggningssidan</a>." msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." msgstr "Flaggade användare är inte begränsade på något sätt. Detta är bara en lista på användare som har markerats för uppmärksamhet." -#: templates/web/base/admin/report_edit.html:78 -#: templates/web/base/admin/user-form.html:51 +#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/user-form.html:52 msgid "Flagged:" msgstr "Flaggat:" @@ -1114,10 +1087,6 @@ msgstr "Flaggat:" msgid "Follow a ward link to view only reports within that ward." msgstr "Följ en länk till ett område för att se rapporter endast inom det området." -#: templates/web/base/admin/report_edit.html:30 -msgid "For council(s):" -msgstr "För kommuner:" - #: templates/web/base/admin/body-form.html:65 msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "För mer information, se <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." @@ -1130,8 +1099,6 @@ msgstr "Glömt ditt lösenord?" #: templates/web/base/faq/faq-en-gb.html:1 #: templates/web/base/static/privacy.html:1 #: templates/web/base/static/privacy.html:2 -#: templates/web/fiksgatami/faq/faq-nb.html:1 -#: templates/web/fiksgatami/nn/faq/faq-nn.html:1 msgid "Frequently Asked Questions" msgstr "Vanliga frågor" @@ -1144,13 +1111,13 @@ msgstr "GeoRSS på Google Maps" msgid "Get updates" msgstr "Få uppdateringar" -#: templates/web/fixmystreet/reports/_rss.html:4 +#: templates/web/fixmystreet/reports/_rss.html:3 #: templates/web/fixmystreet/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "Få uppdateringar av %s problem" #: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:4 +#: templates/web/fixmystreet/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "Få uppdateringar om problem i denna %s" @@ -1159,6 +1126,10 @@ msgstr "Få uppdateringar om problem i denna %s" msgid "Give me an RSS feed" msgstr "Ge mig ett RSS-flöde" +#: templates/web/base/questionnaire/completed.html:14 +msgid "Glad to hear it’s been fixed!" +msgstr "Vi är glada att höra att det har blivit löst!" + #: templates/web/base/alert/index.html:34 #: templates/web/base/around/postcode_form.html:8 #: templates/web/fixmystreet/around/postcode_form.html:21 @@ -1166,7 +1137,7 @@ msgstr "Ge mig ett RSS-flöde" msgid "Go" msgstr "Gå" -#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:93 msgid "Going to send questionnaire?" msgstr "Skicka enkät?" @@ -1188,9 +1159,7 @@ msgstr "Har det här problemet blivit löst?" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "Har du någonsin rapporterat ett problem till en kommun tidigare eller är det här första gången?" -#: templates/web/base/footer.html:15 templates/web/fiksgatami/footer.html:27 -#: templates/web/fiksgatami/nn/footer.html:27 -#: templates/web/fixmystreet/footer.html:30 +#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:30 #: templates/web/zurich/faq/faq-de-ch.html:1 #: templates/web/zurich/footer.html:21 #: templates/web/zurich/nav_over_content.html:8 @@ -1202,18 +1171,17 @@ msgstr "Hjälp" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "Här är de olika typerna för lokala problem för ‘%s’" -#: templates/web/fiksgatami/header.html:48 -#: templates/web/fixmystreet/header.html:52 +#: templates/web/fixmystreet/header.html:58 #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "Hej %s" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:50 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:63 +#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/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:86 #: templates/web/zurich/admin/report_edit.html:90 #: templates/web/zurich/admin/stats.html:32 @@ -1229,7 +1197,7 @@ msgstr "Göm äldre" msgid "Hide pins" msgstr "Göm pinnar" -#: templates/web/base/admin/category_edit.html:79 +#: templates/web/base/admin/category_edit.html:84 msgid "History" msgstr "Historik" @@ -1245,19 +1213,25 @@ msgstr "Hur man rapporterar ett problem" msgid "How to send successful reports" msgstr "Hur bra rapporter skickas" -#: perllib/FixMyStreet/App/Controller/Admin.pm:742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:740 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Tyvärr kan du inte bekräfta obekräftade rapporter" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:89 +#: templates/web/base/tokens/confirm_problem.html:23 +#: templates/web/base/tokens/confirm_problem.html:27 +msgid "I just reported a problem on @fixmystreet" +msgstr "Jag rapporterade precis ett problem på @fixamingata" + +#: templates/web/base/tokens/confirm_update.html:19 +#: templates/web/base/tokens/confirm_update.html:23 +msgid "I just updated a problem on @fixmystreet" +msgstr "Jag uppdaterade precis ett problem på @fixamingata" + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Tyvärr kunde vi inte hitta ditt problem i databasen.\n" -#: 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 "Tyvärr känner vi inte igen den rapporten, troligen eftersom rapporten gjordes för länge sedan." - -#: perllib/FixMyStreet/App/Controller/Tokens.pm:260 +#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 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 "Tyvärr kan vi inte hitta den rapporten. Om du kopierade en länk från ett epost bör du verifiera att du kopierade länken exakt.\n" @@ -1279,7 +1253,7 @@ msgid "" " For basic installations, you don't need to join bodies in this way." msgstr "Identifiera en <strong>förälder</strong> om den här förvaltningen är en del av en annan förvaltning. Den här typen av kopplingar behövs inte göras i enklare installationer." -#: templates/web/base/admin/body.html:125 +#: templates/web/base/admin/body.html:133 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." @@ -1297,7 +1271,12 @@ msgstr "Om du inte gör det kommer ditt problem inte att skickas." msgid "If you do not, your update will not be posted." msgstr "Om du inte gör det kommer din uppdatering inte att skickas." -#: templates/web/base/report/new/councils_text_none.html:9 +#: templates/web/base/questionnaire/completed.html:8 +msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." +msgstr "Om du får mer information om problemets status får du gärna komma tillbaka hit och lämna en uppdatering." + +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:8 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 "Om du anmäler ett problem i FixaMinGata kommer ärendet och detaljerna att visas här, men rapporten kommer <strong>inte</strong> att skickas till kommunen." @@ -1313,34 +1292,34 @@ msgid "" "your experience of getting the problem fixed?" msgstr "Om du vill lämna ytterligare information om problemet, ange det här. Till exempel, hur upplevde du kommunikationen med kommunen? Om du skickar en rapport här kommer den att visas offentligt på FixaMinGata." -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/body.html:149 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "Om du använder <strong>en utskicksmetod som inte är e-post</strong>, ange ditt service-ID (Open311) eller liknande här." -#: templates/web/base/admin/body-form.html:200 -#: templates/web/base/admin/body-form.html:201 +#: templates/web/base/admin/body-form.html:207 +#: templates/web/base/admin/body-form.html:208 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 "Om du har aktiverat Open311-uppdateringsutskick ovan: Open311 accepterar oftast bara OPEN- och CLOSED-statusvärden i sina uppdateringar. Aktivera <strong>Utökade Open311-statusvärden</strong> om du vill tillåta att ytterligare tillstånd godkänns. Kontrollera att FixaMinGata stödjer den här funktionaliteten innan du aktiverar den." -#: templates/web/base/admin/body-form.html:187 -#: templates/web/base/admin/body-form.html:188 +#: templates/web/base/admin/body-form.html:194 +#: templates/web/base/admin/body-form.html:195 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 "Om du har aktiverat Open311-uppdateringsutskick ovan: Aktivera <strong>Inaktivera alarm</strong> om du <strong>inte</strong> vill att användare skall bli notifierade när dessa uppdateringar skapas." -#: templates/web/base/admin/body-form.html:173 -#: templates/web/base/admin/body-form.html:174 +#: templates/web/base/admin/body-form.html:177 +#: templates/web/base/admin/body-form.html:178 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 "Om du har aktiverat Open311-uppdateringsutskick ovan: Du måste identifiera vilken <strongFixaMinGata-användare</strong> som skall anges som skapare av dessa uppdateringar när de visas på sajten. Ange ID-numret för den här användaren." -#: perllib/FixMyStreet/App/Controller/Contact.pm:127 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 msgid "Illegal ID" msgstr "Ogiltigt ID" @@ -1365,17 +1344,21 @@ msgstr "I missbrukstabellen?" msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." msgstr "I tillägg, följande attribut som inte är del av Open311 v2-specifikationen returneras: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:143 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:38 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:144 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 #: templates/web/fixmystreet/report/banner.html:19 -#: templates/web/zurich/admin/header.html:2 +#: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 #: templates/web/zurich/admin/report_edit.html:99 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "Pågående" +#: templates/web/base/tokens/confirm_alert.html:11 +msgid "Inbox zero, here we come!" +msgstr "Inbox zero, här kommer vi!" + #: templates/web/zurich/admin/report_edit.html:160 msgid "Include reporter personal details" msgstr "Inkludera rapportörens personuppgifter" @@ -1384,7 +1367,7 @@ msgstr "Inkludera rapportörens personuppgifter" msgid "Include unconfirmed reports" msgstr "Inkludera obekräftade rapporter" -#: perllib/FixMyStreet/App/Controller/Open311.pm:354 +#: perllib/FixMyStreet/App/Controller/Open311.pm:359 msgid "Incorrect has_photo value \"%s\"" msgstr "Inkorrekt värde för has_photo, \"%s\"" @@ -1392,29 +1375,29 @@ msgstr "Inkorrekt värde för has_photo, \"%s\"" msgid "Internal notes" msgstr "Interna anteckningar" -#: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:61 msgid "Internal referral" msgstr "Interna refereringar" -#: perllib/FixMyStreet/App/Controller/Open311.pm:339 +#: perllib/FixMyStreet/App/Controller/Open311.pm:344 msgid "Invalid agency_responsible value %s" msgstr "Inkorrekt värde för agency_responsible, \"%s\"" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1114 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1112 msgid "Invalid end date" msgstr "Inkorrekt slutdatum" -#: perllib/FixMyStreet/App/Controller/Open311.pm:432 +#: perllib/FixMyStreet/App/Controller/Open311.pm:437 msgid "Invalid format %s specified." msgstr "Inkorrekt format %s angivet." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1110 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 msgid "Invalid start date" msgstr "Inkorrekt startdatum" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:37 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:50 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 #: templates/web/base/report/update-form.html:30 @@ -1428,8 +1411,12 @@ msgstr "Utredes" msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "Det går oftast snabbast att <a href=\"%s\">kolla vår FAQ</a> och se om svaret finns där." +#: templates/web/base/tokens/confirm_problem.html:14 +msgid "It’s on its way to the council right now." +msgstr "Det är nu på väg till kommunen." + #: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:150 +#: templates/web/base/report/new/fill_in_details_form.html:131 #: templates/web/base/report/update-form.html:104 #: templates/web/fixmystreet/auth/general.html:47 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 @@ -1438,12 +1425,12 @@ msgstr "Det går oftast snabbast att <a href=\"%s\">kolla vår FAQ</a> och se om msgid "Keep me signed in on this computer" msgstr "Behåll mig inloggad på den här datorn" -#: templates/web/base/admin/body.html:62 +#: templates/web/base/admin/body.html:70 #: templates/web/zurich/admin/body.html:16 msgid "Last editor" msgstr "Senaste redaktör" -#: templates/web/base/admin/report_edit.html:72 +#: templates/web/base/admin/report_edit.html:88 msgid "Last update:" msgstr "Senaste uppdatering:" @@ -1451,43 +1438,38 @@ msgstr "Senaste uppdatering:" msgid "Last update:" msgstr "Senaste uppdatering:" -#: templates/web/base/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:229 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "Lämna den här blank om samtliga rapporter till den här förvaltningen skall skickas med samma utskicksmetod (exv. \"%s\")." -#: templates/web/base/admin/body.html:17 templates/web/base/admin/body.html:19 +#: templates/web/base/admin/body.html:27 msgid "List all reported problems" msgstr "Lista alla rapporterade problem" -#: templates/web/base/report/new/fill_in_details_form.html:69 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:54 -#: templates/web/zurich/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/category_wrapper.html:4 msgid "Loading..." msgstr "Laddar..." #: templates/web/base/alert/choose.html:1 #: templates/web/base/alert/choose.html:3 #: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3 -#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:5 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5 #: templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 -#: templates/web/base/tokens/confirm_alert.html:4 #: templates/web/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "Lokala RSS-flöden och epostbevakningar" -#: templates/web/base/alert/list.html:13 templates/web/base/alert/list.html:14 -#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:3 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:12 +#: templates/web/base/alert/list.html:14 templates/web/base/alert/list.html:3 msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Lokala RSS-flöden och epostbevakningar för '%s'" -#: templates/web/base/footer.html:13 templates/web/fiksgatami/footer.html:25 -#: templates/web/fiksgatami/nn/footer.html:25 -#: templates/web/fixmystreet/footer.html:28 +#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:28 msgid "Local alerts" msgstr "Lokala rapporter" -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:25 msgid "Locate the problem on a map of the area" msgstr "Lokalisera problemet på en karta över området" @@ -1496,17 +1478,27 @@ msgid "MAP" msgstr "KARTA" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" -msgstr "" +msgstr "Karta" -#: perllib/FixMyStreet/Map/OSM.pm:42 -msgid "Map © <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 "Karta © <a id=\"osm_link\" href=\"http://www.openstreetmap.org/\">OpenStreetMap</a> och bidragsgivare" +#: templates/web/base/admin/report_edit.html:86 +#, fuzzy +msgid "Mark as sent" +msgstr "markerad som stängd" -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/user-form.html:44 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." msgstr "Markera användare som du vill hålla ett öga på som <strong>flaggade</strong>." +#: templates/web/base/reports/index.html:24 +msgid "Marked fixed/closed in the past eight weeks" +msgstr "" + +#: templates/web/base/reports/index.html:25 +msgid "Marked fixed/closed more than eight weeks ago" +msgstr "" + #: templates/web/fixmystreet/contact/index.html:106 msgid "Message" msgstr "Meddelande" @@ -1515,7 +1507,7 @@ msgstr "Meddelande" msgid "Message:" msgstr "Meddelande:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:440 +#: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" msgstr "Saknat jurisdiction_id" @@ -1545,11 +1537,11 @@ msgstr "Fler närliggande problem" #: templates/web/fixmystreet/report/update-form.html:138 #: 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:94 +#: templates/web/zurich/report/new/fill_in_details_form.html:77 msgid "Name" msgstr "Namn" -#: templates/web/base/admin/report_edit.html:66 +#: templates/web/base/admin/report_edit.html:79 #: templates/web/base/admin/update_edit.html:32 #: templates/web/base/admin/user-form.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:43 @@ -1558,25 +1550,25 @@ msgstr "Namn" msgid "Name:" msgstr "Namn:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:321 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:313 msgid "Name: %s" msgstr "Namn: %s" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:186 -#: perllib/FixMyStreet/Geocode/OSM.pm:164 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 +#: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "Närmaste namngivna gata till placeringen på kartan (genereras automatiskt via OpenStreetMap): %s%s" -#: perllib/FixMyStreet/Cobrand/UK.pm:137 +#: perllib/FixMyStreet/Cobrand/UK.pm:127 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Närmaste postnummer till placeringen på kartan (genereras automatiskt): %s (%s meter bort)" -#: perllib/FixMyStreet/Cobrand/Default.pm:421 -#: perllib/FixMyStreet/Cobrand/Default.pm:461 +#: perllib/FixMyStreet/Cobrand/Default.pm:442 +#: perllib/FixMyStreet/Cobrand/Default.pm:482 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Närmaste gata till placeringen på kartan (genereras automatiskt av Bing Maps): %s" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:277 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1592,11 +1584,11 @@ msgstr "Nästan klar! Kolla nu din epost." msgid "New <br>problems" msgstr "Nya <br>problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:264 +#: perllib/FixMyStreet/App/Controller/Admin.pm:261 msgid "New body added" msgstr "Ny förvaltning tillagd" -#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:379 msgid "New category contact added" msgstr "Nya kategorikontakter tillagda" @@ -1669,15 +1661,15 @@ msgstr "Ny uppdatering:" msgid "Next" msgstr "Nästa" -#: templates/web/base/admin/body.html:72 templates/web/base/admin/body.html:74 -#: templates/web/base/admin/body.html:78 templates/web/base/admin/body.html:80 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:93 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:44 @@ -1695,7 +1687,7 @@ msgstr "Ingen förvaltning" msgid "No council" msgstr "Ingen kommun" -#: perllib/FixMyStreet/DB/Result/Problem.pm:376 +#: perllib/FixMyStreet/DB/Result/Problem.pm:401 msgid "No council selected" msgstr "Ingen kommun vald" @@ -1736,12 +1728,12 @@ msgid "" " your config file is not pointing to a live MapIt service." msgstr "Inga områden är tillgängliga eftersom <code>MAPIT_URL</code> i konfigurationsfilen inte pekar på en aktiv MapIt-tjänst." -#: templates/web/base/report/_support.html:3 +#: templates/web/base/report/_support.html:2 #: templates/web/base/report/_support.html:4 msgid "No supporters" msgstr "Inga supporters" -#: templates/web/base/admin/report_edit.html:30 +#: templates/web/base/admin/report_edit.html:41 #: templates/web/zurich/admin/report_edit-sdm.html:46 #: templates/web/zurich/admin/report_edit.html:60 msgid "None" @@ -1756,14 +1748,14 @@ msgid "" " activity across their body), the ability to hide reports or set special report statuses." msgstr "Normala (publika) användare skall inte associeras med någon <strong>förvaltning</strong>.<br>Användare för behörig personal skall kunna bli associerade med den förvaltning som de representerar.<br>Beroende på implementationen kan personal ha tillgång till dashboard-sidan (som summerar förvaltningsaktiviteterna), möjligheten att dölja rapporter, eller möjligheten att sätta speciella rapportstatusvärden." -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:46 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 #: templates/web/base/report/update-form.html:30 #: templates/web/base/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 "Ej Ansvarig" +msgstr "Ej ansvarig" #: templates/web/zurich/admin/report_edit-sdm.html:18 msgid "Not for my subdivision" @@ -1773,12 +1765,12 @@ msgstr "Inte för min underavdelning" msgid "Not reported before" msgstr "Ej rapporterat tidigare" -#: templates/web/base/report/_main.html:61 +#: templates/web/base/report/_main.html:62 msgid "Not reported to council" msgstr "Ej rapporterat till kommunen" -#: templates/web/base/admin/body.html:63 -#: templates/web/base/admin/category_edit.html:87 +#: templates/web/base/admin/body.html:71 +#: templates/web/base/admin/category_edit.html:92 #: templates/web/zurich/admin/body.html:17 msgid "Note" msgstr "Observera" @@ -1787,8 +1779,8 @@ msgstr "Observera" 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 "Observera att när vi listar obegräftade rapporter använder vi datumet när rapporten skapades, vilket inte nödvändigtvis är samma månad som när rapporten bekräftades, så vissa avvikelser kan uppstå." -#: templates/web/base/admin/body.html:178 -#: templates/web/base/admin/category_edit.html:44 +#: templates/web/base/admin/body.html:186 +#: templates/web/base/admin/category_edit.html:49 #: templates/web/zurich/admin/body.html:53 msgid "Note:" msgstr "Observera:" @@ -1801,7 +1793,7 @@ msgstr "Observera: <strong>%s</strong>" msgid "Now to submit your report…" msgstr "För att skicka din rapport…" -#: templates/web/base/report/new/fill_in_details_form.html:132 +#: templates/web/base/report/new/fill_in_details_form.html:113 msgid "Now to submit your report… do you have a FixMyStreet password?" msgstr "För att skicka din rapport… har du ett lösenord för FixaMinGata?" @@ -1818,7 +1810,7 @@ msgid "OK" msgstr "OK" #: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:16 +#: templates/web/base/report/update.html:17 msgid "Offensive? Unsuitable? Tell us" msgstr "Kränkande eller olämpligt? Kontakta oss" @@ -1838,19 +1830,19 @@ msgstr "Äldre <br>fixat" msgid "Older <br>problems" msgstr "Äldre <br>problem" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:37 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 msgid "One-line summary" msgstr "Kort sammanfattning" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:137 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:36 -#: templates/web/base/admin/report_edit.html:37 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:138 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:49 +#: templates/web/base/admin/report_edit.html:50 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/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:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/report_edit.html:86 #: templates/web/zurich/admin/report_edit.html:88 @@ -1859,10 +1851,19 @@ msgstr "Kort sammanfattning" msgid "Open" msgstr "Öppen" -#: templates/web/base/my/my.html:30 templates/web/fixmystreet/my/my.html:36 +#: templates/web/base/reports/index.html:22 +msgid "Open for more than four weeks, with an update within the past eight weeks" +msgstr "" + +#: templates/web/base/my/my.html:30 +#: templates/web/fixmystreet/my/_problem-list.html:2 msgid "Open reports" msgstr "Öppna rapporter" +#: templates/web/base/reports/index.html:23 +msgid "Open, but not had any update in eight weeks" +msgstr "" + #: templates/web/base/open311/index.html:70 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "Open311 API för FixaMinGata" @@ -1885,15 +1886,15 @@ msgstr "Eller problem rapporterade til:" msgid "Or you can subscribe to an alert based upon what ward or council you’re in:" msgstr "Du kan också prenumerera på bevakningar baserat på vilken kommun du bor i:" -#: 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:560 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 -#: perllib/FixMyStreet/DB/Result/Problem.pm:592 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:372 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 +#: perllib/FixMyStreet/DB/Result/Problem.pm:597 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:393 msgid "Other" msgstr "Övrig" @@ -1915,8 +1916,8 @@ msgstr "Sidan hittas ej" msgid "Parent" msgstr "Förälder" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 msgid "Partial" msgstr "Partiell" @@ -1936,7 +1937,7 @@ msgstr "Lösenord:" msgid "Permalink" msgstr "Permanent länk" -#: templates/web/zurich/report/new/fill_in_details_form.html:100 +#: templates/web/zurich/report/new/fill_in_details_form.html:83 msgid "Phone number" msgstr "Telefonnummer" @@ -1945,27 +1946,27 @@ msgstr "Telefonnummer" msgid "Phone number (optional)" msgstr "Telefonnummer (valfritt)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:286 -#: templates/web/base/admin/report_edit.html:68 -#: templates/web/base/report/new/fill_in_details_form.html:216 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:291 +#: templates/web/base/admin/report_edit.html:81 +#: templates/web/base/report/new/fill_in_details_form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:46 #: templates/web/zurich/admin/report_edit.html:60 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Telefonnummer:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:72 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 #: 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 +#: templates/web/zurich/report/new/fill_in_details_form.html:51 msgid "Photo" msgstr "Foto" #: templates/web/base/questionnaire/index.html:71 -#: templates/web/base/report/new/fill_in_details_form.html:103 +#: templates/web/base/report/new/fill_in_details_form.html:84 #: templates/web/base/report/update-form.html:62 #: templates/web/fixmystreet/questionnaire/index.html:91 msgid "Photo:" @@ -1979,11 +1980,11 @@ msgstr "Foton från närliggande rapporter" msgid "Place pin on map" msgstr "Placera nålen på kartan" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:38 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/zurich/admin/header.html:2 +#: 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:86 @@ -2017,20 +2018,19 @@ msgstr "Vänligen kontrollera din epost" msgid "Please check your email address is correct" msgstr "Vänligen kontrollera att din epostadress är korrekt" -#: perllib/FixMyStreet/App/Controller/Admin.pm:349 -#: 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:395 +#: perllib/FixMyStreet/App/Controller/Admin.pm:343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:876 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 +#: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" msgstr "Välj en kategori" -#: perllib/FixMyStreet/DB/Result/Problem.pm:401 +#: perllib/FixMyStreet/DB/Result/Problem.pm:418 msgid "Please choose a property type" msgstr "Välj en fastighetstyp" -#: perllib/FixMyStreet/App/Controller/Admin.pm:376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:370 msgid "Please correct the errors below" msgstr "Vänligen korrigera felen nedan" @@ -2046,8 +2046,8 @@ msgstr "Var snäll och rapportera <strong>inga</strong> problem genom det här f msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "Var snäll och missbruka inte tjänsten, det förstör för alla." -#: perllib/FixMyStreet/App/Controller/Admin.pm:352 -#: perllib/FixMyStreet/DB/Result/Comment.pm:133 +#: perllib/FixMyStreet/App/Controller/Admin.pm:346 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "Skriv in ett meddelande" @@ -2058,15 +2058,15 @@ msgstr "Skriv in ett meddelande" msgid "Please enter a password" msgstr "Skriv in ett lösenord" -#: perllib/FixMyStreet/App/Controller/Contact.pm:108 -#: perllib/FixMyStreet/DB/Result/Problem.pm:370 +#: perllib/FixMyStreet/App/Controller/Contact.pm:113 +#: perllib/FixMyStreet/DB/Result/Problem.pm:395 #: templates/web/base/js/translation_strings.html:3 msgid "Please enter a subject" msgstr "Skriv in ett ärende" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1050 -#: perllib/FixMyStreet/App/Controller/Admin.pm:351 -#: perllib/FixMyStreet/App/Controller/Admin.pm:997 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin.pm:995 #: perllib/FixMyStreet/DB/Result/User.pm:127 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 @@ -2074,16 +2074,16 @@ msgid "Please enter a valid email" msgstr "Skriv in en giltig epostadress" #: perllib/FixMyStreet/App/Controller/Alert.pm:346 -#: perllib/FixMyStreet/App/Controller/Contact.pm:118 +#: perllib/FixMyStreet/App/Controller/Contact.pm:123 msgid "Please enter a valid email address" msgstr "Skriv in en giltig epostadress" -#: perllib/FixMyStreet/DB/Result/Problem.pm:373 +#: perllib/FixMyStreet/DB/Result/Problem.pm:398 #: templates/web/base/js/translation_strings.html:4 msgid "Please enter some details" msgstr "Skriv några detaljer" -#: perllib/FixMyStreet/App/Controller/Contact.pm:107 +#: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/User.pm:124 #: templates/web/base/auth/general.html:13 #: templates/web/base/auth/general.html:8 @@ -2097,7 +2097,7 @@ msgid "Please enter your email" msgstr "Skriv in din epostadress" #: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:75 msgid "Please enter your email address" msgstr "Skriv in din epostadress" @@ -2105,14 +2105,14 @@ msgstr "Skriv in din epostadress" msgid "Please enter your first name" msgstr "Skriv in ditt förnamn" -#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: perllib/FixMyStreet/Cobrand/UK.pm:318 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Skriv in ditt namn och efternamn om kommunen behöver den informationen. Om du inte vill att dit namn visas kan du välja det nedanför" -#: perllib/FixMyStreet/App/Controller/Contact.pm:106 -#: perllib/FixMyStreet/DB/Result/Comment.pm:130 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Contact.pm:111 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 +#: perllib/FixMyStreet/DB/Result/Problem.pm:406 #: perllib/FixMyStreet/DB/Result/User.pm:120 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" @@ -2135,7 +2135,7 @@ msgstr "Skriv in din titel" msgid "Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a href=\"/\">front page</a>." msgstr "Välkommen att <a href=\"&s\">logga in igen</a>, eller gå tillbaka till <a href=\"/\">startsidan</a>." -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:8 msgid "Please fill in details of the problem below." msgstr "Fyll i information om problemet nedan." @@ -2150,7 +2150,7 @@ msgstr "Fyll i information om problemet nedan." msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "Fyll i information om problemet nedan och beskriv den exakta platsen för problemet så noga du kan." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:251 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Ange ifall du vill ta emot ett annat frågeformulär" @@ -2173,16 +2173,16 @@ msgstr "Observera att din rapport <strong>inte har skickats än</strong>. Välj msgid "Please note:" msgstr "Observera:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:246 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:254 msgid "Please provide some explanation as to why you're reopening this report" msgstr "Skriv en förklaring till varför du öppna de här rapporten igen" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:261 msgid "Please provide some text as well as a photo" msgstr "Skriv lite förklarande text tillsammans med ett foto" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:116 -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:239 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:247 msgid "Please say whether you've ever reported a problem to your council before" msgstr "Ange om du har anmält ett problem till kommunen tidigare eller ej" @@ -2194,7 +2194,7 @@ msgstr "Välj det RSS-flöde du vill ha" msgid "Please select the type of alert you want" msgstr "Välj den kategori av rapporter du vill ha" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please state whether or not the problem has been fixed" msgstr "Ange om problemet har lösts eller ej" @@ -2202,15 +2202,13 @@ msgstr "Ange om problemet har lösts eller ej" msgid "Please take a look at the updates that have been left." msgstr "Titta på de uppdateringar som har lämnats." -#: perllib/FixMyStreet/App/Controller/Photo.pm:176 +#: perllib/FixMyStreet/App/Controller/Photo.pm:177 +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 +#: perllib/FixMyStreet/App/Controller/Photo.pm:189 msgid "Please upload a JPEG image only" msgstr "Ladda upp en JPEG-bild" -#: perllib/FixMyStreet/App/Controller/Photo.pm:183 -msgid "Please upload a JPEG image only\n" -msgstr "Ladda upp en JPEG-bild\n" - -#: perllib/FixMyStreet/App/Controller/Contact.pm:109 +#: perllib/FixMyStreet/App/Controller/Contact.pm:114 msgid "Please write a message" msgstr "Skriv ett meddelande" @@ -2249,14 +2247,14 @@ msgstr "Föregående" msgid "Privacy" msgstr "Personlig integritet" -#: templates/web/base/admin/body.html:194 -#: templates/web/base/admin/body.html:77 -#: templates/web/base/admin/category_edit.html:40 -#: templates/web/base/admin/report_edit.html:79 +#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:85 +#: templates/web/base/admin/category_edit.html:45 +#: templates/web/base/admin/report_edit.html:95 msgid "Private" msgstr "Privat" -#: templates/web/base/maps/openlayers.html:86 +#: templates/web/base/maps/openlayers.html:89 msgid "Problem" msgstr "Rapport" @@ -2277,7 +2275,7 @@ msgstr "Rapport %s skickad till %s" msgid "Problem breakdown by state" msgstr "Rapporter per status" -#: perllib/FixMyStreet/App/Controller/Admin.pm:968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:966 msgid "Problem marked as open." msgstr "Problemet markerat som öppet." @@ -2312,16 +2310,15 @@ msgstr "Problem nyligen rapporterade som lösta på FixaMinGata" msgid "Problems within %.1fkm of this location" msgstr "Problem inom %.1f km från denna position" -#: perllib/FixMyStreet/Cobrand/Default.pm:629 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:114 +#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:151 -#: perllib/FixMyStreet/Cobrand/UK.pm:217 +#: perllib/FixMyStreet/Cobrand/UK.pm:207 msgid "Problems within %s" msgstr "Problem inom %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:122 -#: perllib/FixMyStreet/Cobrand/UK.pm:231 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "Problems within %s ward" msgstr "Problem inom området %s" @@ -2339,7 +2336,7 @@ msgstr "Problem inom gränsen för:" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "Fastigheter nyligen rapporterade som åtgärdade på reportemptyhomes.com" -#: templates/web/base/admin/report_edit.html:32 +#: templates/web/base/admin/report_edit.html:45 msgid "Property address:" msgstr "Fastighetsadress:" @@ -2356,7 +2353,7 @@ msgstr "Ge en uppdatering" 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 "Du måste inte ange namn och ett lösenord men om du gör det är det lättare att rapportera problem, lämna uppdateringar och hantera dina rapporter." -#: templates/web/base/report/new/fill_in_details_form.html:174 +#: templates/web/base/report/new/fill_in_details_form.html:155 #: templates/web/base/report/update-form.html:128 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 #: templates/web/fixmystreet/report/update-form.html:119 @@ -2377,7 +2374,7 @@ msgstr "Publicera foto" msgid "Publish the response" msgstr "Publicera svaret" -#: templates/web/base/questionnaire/completed.html:2 +#: templates/web/base/questionnaire/completed.html:1 #: templates/web/base/questionnaire/index.html:0 #: templates/web/base/questionnaire/index.html:14 #: templates/web/base/questionnaire/index.html:4 @@ -2396,11 +2393,12 @@ msgstr "Frågeformulär %d svarat för problem %d, %s till %s" msgid "Questionnaire %d sent for problem %d" msgstr "Frågeformulär %d skickat för problem %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 msgid "Questionnaire filled in by problem reporter" msgstr "Frågeformulär ifyllt av rapportören" #: templates/web/base/alert/_list.html:21 +#: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display.html:50 #: templates/web/base/reports/_rss.html:1 @@ -2410,11 +2408,11 @@ msgstr "Frågeformulär ifyllt av rapportören" msgid "RSS feed" msgstr "RSS-flöde" -#: perllib/FixMyStreet/Cobrand/UK.pm:260 perllib/FixMyStreet/Cobrand/UK.pm:272 +#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 msgid "RSS feed for %s" msgstr "RSS-flöde för %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "RSS feed for %s ward, %s" msgstr "RSS-flöde för område %s, %s" @@ -2422,15 +2420,11 @@ msgstr "RSS-flöde för område %s, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:167 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:175 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:185 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:193 -#: perllib/FixMyStreet/Cobrand/UK.pm:286 perllib/FixMyStreet/Cobrand/UK.pm:298 +#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 msgid "RSS feed of %s" msgstr "RSS-flöde för %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 msgid "RSS feed of %s, within %s ward" msgstr "RSS-flöde för %s, inom område %s" @@ -2443,20 +2437,19 @@ msgstr "RSS-flöde av närliggande problem" msgid "RSS feed of problems in this %s" msgstr "RSS-flöde för problem i denna %s" -#: perllib/FixMyStreet/Cobrand/Default.pm:630 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:115 +#: perllib/FixMyStreet/Cobrand/Default.pm:651 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:150 -#: perllib/FixMyStreet/Cobrand/UK.pm:224 +#: perllib/FixMyStreet/Cobrand/UK.pm:214 msgid "RSS feed of problems within %s" msgstr "RSS-flöde för problem inom %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 -#: perllib/FixMyStreet/Cobrand/UK.pm:230 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s ward" msgstr "RSS-flöde för problem inom område %s" -#: templates/web/base/around/display_location.html:3 +#: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:4 msgid "RSS feed of recent local problems" msgstr "RSS-flöde för senaste lokala problemen" @@ -2496,15 +2489,18 @@ msgstr "Kom ihåg att FixaMinGata primärt är avsett för att rapportera fysisk msgid "Remove flag" msgstr "Ta bort flagga" -#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/report_edit.html:110 #: templates/web/base/admin/update_edit.html:62 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Ta bort foto (kan inte ångras!)" -#: templates/web/base/footer.html:7 templates/web/fiksgatami/footer.html:19 -#: templates/web/fiksgatami/nn/footer.html:19 -#: templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 +msgid "Report" +msgstr "Rapportera" + +#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 #: templates/web/zurich/footer.html:17 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2514,11 +2510,6 @@ msgstr "Rapportera ett problem" msgid "Report abuse" msgstr "Rapportera missbruk" -#: templates/web/base/report_created.html:1 -#: templates/web/base/report_created.html:3 -msgid "Report created" -msgstr "Rapport skapad" - #: perllib/FixMyStreet/App/Controller/Rss.pm:295 msgid "Report on %s" msgstr "Rappoort på %s" @@ -2542,7 +2533,7 @@ msgstr "Rapporterade %s" msgid "Reported %s, to %s" msgstr "Rapporterat %s till %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:580 #: templates/web/base/contact/index.html:50 #: templates/web/fixmystreet/contact/index.html:65 msgid "Reported anonymously at %s" @@ -2554,7 +2545,7 @@ msgstr "Rapporterat anonymt %s" msgid "Reported before" msgstr "Rapporterat tidigare" -#: perllib/FixMyStreet/DB/Result/Problem.pm:598 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 #: templates/web/base/contact/index.html:52 #: templates/web/fixmystreet/contact/index.html:67 msgid "Reported by %s at %s" @@ -2564,31 +2555,36 @@ msgstr "Rapporterat av %s den %s" msgid "Reported in the %s category" msgstr "Rapporterat i kategori %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:571 +#: perllib/FixMyStreet/DB/Result/Problem.pm:576 msgid "Reported in the %s category anonymously at %s" msgstr "Anonym rapport i kategori %s, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:598 msgid "Reported in the %s category by %s at %s" msgstr "Rapporterat i kategori %s av %s den %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:567 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 msgid "Reported via %s anonymously at %s" msgstr "Rapporterat av %s anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:589 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 msgid "Reported via %s by %s at %s" msgstr "Rapporterat av %s av %s den %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:563 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Rapporterat av %s i kategorin %s, anonymt %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:583 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 msgid "Reported via %s in the %s category by %s at %s" -msgstr "Rapporterat av %s i kategorin %s, anonymt av %s den %s" +msgstr "Rapporterat av %s i kategorin %s av %s den %s" + +#: templates/web/base/reports/index.html:21 +#, fuzzy +msgid "Reported within the last four weeks" +msgstr "Rapporterat i kategori %s" -#: templates/web/base/around/around_index.html:2 +#: templates/web/base/around/around_index.html:1 #: templates/web/base/around/around_index.html:3 #: templates/web/base/js/translation_strings.html:41 #: templates/web/base/report/new/fill_in_details.html:0 @@ -2598,14 +2594,13 @@ msgstr "Rapporterat av %s i kategorin %s, anonymt av %s den %s" msgid "Reporting a problem" msgstr "Rapportera ett problem" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:294 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "Rapporter" -#: perllib/FixMyStreet/DB/Result/Problem.pm:409 -#: perllib/FixMyStreet/DB/Result/Problem.pm:413 +#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "Rapporter kan bara innehålla %s tecken. Var vänlig korta ned din rapport" @@ -2621,7 +2616,7 @@ msgstr "Rapporter på och runt kartbilden" msgid "Reports published" msgstr "Publicerade rapporter" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:85 msgid "Resend report" msgstr "Skicka om rapporten" @@ -2629,36 +2624,35 @@ msgstr "Skicka om rapporten" msgid "Right place?" msgstr "Rätt plats?" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:193 -#: perllib/FixMyStreet/Geocode/OSM.pm:171 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:167 +#: perllib/FixMyStreet/Geocode/OSM.pm:152 msgid "Road operator for this named road (derived from road reference number and type): %s" msgstr "Vägoperatör för den här namngivna vägen (hämtat från vägens nummer och typ): %s" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:190 -#: perllib/FixMyStreet/Geocode/OSM.pm:168 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:164 +#: perllib/FixMyStreet/Geocode/OSM.pm:149 msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Vägoperatör för den här namngivna vägen (från OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1394 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 -#: templates/web/base/admin/report_edit.html:90 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1403 +#: templates/web/base/admin/report_edit.html:106 #: templates/web/zurich/admin/report_edit.html:73 msgid "Rotate Left" msgstr "Rotera åt vänster" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1394 -#: templates/web/base/admin/report_edit.html:91 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: templates/web/base/admin/report_edit.html:107 #: templates/web/zurich/admin/report_edit.html:74 msgid "Rotate Right" msgstr "Rotera åt höger" #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" -msgstr "" +msgstr "Satellit" -#: templates/web/base/admin/body.html:200 -#: templates/web/base/admin/category_edit.html:76 +#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/category_edit.html:81 #: templates/web/zurich/admin/body.html:59 msgid "Save changes" msgstr "Spara ändringar" @@ -2686,7 +2680,7 @@ msgstr "Sök:" msgid "Searching found no reports." msgstr "Inga rapporter hittades." -#: templates/web/base/admin/users.html:39 +#: templates/web/base/admin/users.html:41 msgid "Searching found no users." msgstr "Inga användare hittades." @@ -2709,15 +2703,15 @@ msgstr "Välj ett 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 "Välj vilken kategori av rapporter du vill få och klicka knappen för ett RSS-flöde eller ange din epostadress för att prenumerera via epost." -#: perllib/FixMyStreet/DB/Result/Problem.pm:680 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "Sent to %s %s later" msgstr "Skickades till %s, %s senare" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:84 msgid "Sent:" msgstr "Skickades:" -#: templates/web/base/admin/report_edit.html:73 +#: templates/web/base/admin/report_edit.html:89 #: templates/web/zurich/admin/stats.html:45 msgid "Service:" msgstr "Tjänst:" @@ -2726,7 +2720,7 @@ msgstr "Tjänst:" msgid "Share" msgstr "Dela" -#: templates/web/base/report/new/fill_in_details_form.html:211 +#: templates/web/base/report/new/fill_in_details_form.html:192 #: templates/web/base/report/update-form.html:157 #: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 @@ -2771,12 +2765,12 @@ msgstr "Logga ut" msgid "Signed in as %s" msgstr "Inloggad som %s" -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 msgid "Some categories may require additional information." msgstr "Vissa kategorier kan kräva ytterligare information." -#: templates/web/base/admin/body-form.html:145 -#: templates/web/base/admin/body-form.html:146 +#: templates/web/base/admin/body-form.html:149 +#: templates/web/base/admin/body-form.html:150 msgid "" "Some endpoints require an <strong>API key</strong> to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -2789,11 +2783,11 @@ msgid "Some photos of recent reports" msgstr "Foton från de senaste rapporterna" #: perllib/FixMyStreet/App/View/Email.pm:32 -#: perllib/FixMyStreet/App/View/Web.pm:44 +#: perllib/FixMyStreet/App/View/Web.pm:43 msgid "Some text to localize" msgstr "Lite text att lokalisera" -#: perllib/FixMyStreet/Cobrand/UK.pm:88 +#: perllib/FixMyStreet/Cobrand/UK.pm:78 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "Tyvärr, det verkar vara ett postnummer som vi inte täcker." @@ -2801,17 +2795,16 @@ msgstr "Tyvärr, det verkar vara ett postnummer som vi inte täcker." msgid "Sorry, there has been an error confirming your problem." msgstr "Tyvärr har det uppstått ett fel med att bekräfta ditt problem." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:215 -#: perllib/FixMyStreet/Geocode.pm:26 perllib/FixMyStreet/Geocode/Bing.pm:56 -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:73 -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:93 -#: perllib/FixMyStreet/Geocode/Google.pm:72 -#: perllib/FixMyStreet/Geocode/OSM.pm:64 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:214 +#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 +#: perllib/FixMyStreet/Geocode/Google.pm:47 +#: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "Tyvärr kan vi inte hitta den adressen." -#: perllib/FixMyStreet/Geocode/Bing.pm:51 -#: perllib/FixMyStreet/Geocode/Google.pm:67 +#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: perllib/FixMyStreet/Geocode/Google.pm:44 #: perllib/FixMyStreet/Geocode/Zurich.pm:87 msgid "Sorry, we could not parse that location. Please try again." msgstr "Tyvärr kan vi inte förstå den adressen. Försök gärna igen." @@ -2820,7 +2813,7 @@ msgstr "Tyvärr kan vi inte förstå den adressen. Försök gärna igen." msgid "Start Date:" msgstr "Startdatum:" -#: templates/web/base/admin/body.html:61 +#: templates/web/base/admin/body.html:69 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 @@ -2828,7 +2821,7 @@ msgstr "Startdatum:" msgid "State" msgstr "Status" -#: templates/web/base/admin/report_edit.html:34 +#: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 #: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:53 @@ -2837,8 +2830,8 @@ msgstr "Status" msgid "State:" msgstr "Status:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1200 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:304 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:308 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" @@ -2854,7 +2847,7 @@ msgstr "Status" msgid "Still open, via questionnaire, %s" msgstr "Fortfarande öppen, via frågeformulär, %s" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:381 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 msgid "Subcategory: %s" msgstr "Underkategori: %s" @@ -2874,19 +2867,19 @@ msgid "Subject:" msgstr "Ärende:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:115 -#: templates/web/base/report/new/fill_in_details_form.html:155 -#: templates/web/base/report/new/fill_in_details_form.html:177 +#: templates/web/base/report/new/fill_in_details_form.html:136 +#: templates/web/base/report/new/fill_in_details_form.html:158 +#: templates/web/base/report/new/fill_in_details_form.html:96 #: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 -#: templates/web/zurich/report/new/fill_in_details_form.html:108 +#: templates/web/zurich/report/new/fill_in_details_form.html:91 msgid "Submit" msgstr "Skicka" -#: templates/web/base/admin/report_edit.html:97 +#: templates/web/base/admin/report_edit.html:113 #: templates/web/base/admin/update_edit.html:65 -#: templates/web/base/admin/user-form.html:55 +#: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:64 #: templates/web/zurich/admin/report_edit.html:221 #: templates/web/zurich/admin/update_edit.html:38 @@ -2898,8 +2891,8 @@ msgstr "Skicka förändringar" msgid "Submit questionnaire" msgstr "Skicka frågeformulär" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:133 -#: templates/web/zurich/admin/header.html:2 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:134 +#: 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 @@ -2923,8 +2916,8 @@ msgstr "Prenumerera" msgid "Subscribe me to an email alert" msgstr "Prenumerera med epost" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1191 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:293 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 #: templates/web/zurich/admin/index-dm.html:1 @@ -2932,7 +2925,7 @@ msgstr "Prenumerera med epost" #: templates/web/zurich/admin/index.html:1 templates/web/zurich/footer.html:12 #: templates/web/zurich/header.html:57 msgid "Summary" -msgstr "Summering" +msgstr "Sammanfattning" #: templates/web/base/reports/index.html:1 #: templates/web/zurich/reports/index.html:0 @@ -2940,7 +2933,7 @@ msgstr "Summering" msgid "Summary reports" msgstr "Sammanställningsrapporter" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 msgid "Survey" msgstr "Enkät" @@ -2954,7 +2947,7 @@ msgstr "Frågeresultat" msgid "Text" msgstr "Text" -#: templates/web/base/admin/body.html:21 +#: templates/web/base/admin/body.html:28 msgid "Text only version" msgstr "Version med endast text" @@ -2963,49 +2956,55 @@ msgstr "Version med endast text" msgid "Text:" msgstr "Text:" -#: templates/web/base/tokens/confirm_update.html:9 -msgid "Thank you — you can <a href=\"%s\">view your updated problem</a> on the site." -msgstr "Tack! Du kan <a href=\"%s\">visa din uppdaterade rapport</a> på webbplatsen." - -#: templates/web/base/tokens/confirm_problem.html:18 -msgid "Thank you for reporting this issue" -msgstr "Tack för att du rapporterade detta ärende" +#: templates/web/base/tokens/confirm_problem.html:12 +msgid "Thank you for reporting this issue!" +msgstr "Tack för att du rapporterade detta ärende!" #: templates/web/base/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 "Tack för att du försöker bekräfta din uppdatering eller rapport. Vi har tyvärr stött på ett fel och uppskattar om du kan <a href=\"%s\">rapporterar vad som hände</a> så att vi kan titta på det." +#: templates/web/base/tokens/confirm_update.html:15 +msgid "Thank you for updating this issue!" +msgstr "Tack för att du uppdaterade detta ärende!" + +#: templates/web/base/contact/submit.html:6 +#: templates/web/base/questionnaire/completed.html:5 +msgid "Thank you for your feedback" +msgstr "Tack för dina synpunkter" + #: templates/web/fixmystreet/around/around_index.html:28 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 :" msgstr "Tack för att du bifogade ett foto. Vi måste nu lokalisera ditt problem så var vänlig ange närliggande gatunamn och ort eller postnummer i rutan ovan :" -#: templates/web/base/contact/submit.html:8 -msgid "Thanks for your feedback. We'll get back to you as soon as we can!" -msgstr "Tack för din återkoppling. Vi återkommer så snart vi kan!" - #: templates/web/base/questionnaire/creator_fixed.html:9 msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "Tack, vi är glada över att det har blivit åtgärdat. Har du rapporterat ett problem till en kommun tidigare?" -#: perllib/FixMyStreet/App/Controller/Photo.pm:190 +#: perllib/FixMyStreet/App/Controller/Photo.pm:195 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Bilden verkar inte ha laddats upp korrekt (%s), var vänlig försök igen." -#: perllib/FixMyStreet/App/Controller/Council.pm:100 +#: perllib/FixMyStreet/App/Controller/Council.pm:97 msgid "That location does not appear to be covered by a council; perhaps it is offshore or outside the country. Please try again." msgstr "Den positionen verkar inte täckas av någon kommun och ligger eventuellt utanför kartan eller utanför landet. Försök gärna med en ny position." -#: perllib/FixMyStreet/App/Controller/Location.pm:124 +#: perllib/FixMyStreet/App/Controller/Location.pm:126 msgid "That location does not appear to be in the UK; please try again." msgstr "Den positionen verkar inte vara i Sverige: försök gärna igen." #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:81 +#: perllib/FixMyStreet/Cobrand/UK.pm:71 msgid "That postcode was not recognised, sorry." msgstr "Det postnummret finns tyvärr inte." -#: perllib/FixMyStreet/App/Controller/Admin.pm:713 +#: perllib/FixMyStreet/App/Controller/Admin.pm:712 +#, fuzzy +msgid "That problem has been marked as sent." +msgstr "Rapportern kommer nu att skickas om." + +#: perllib/FixMyStreet/App/Controller/Admin.pm:704 msgid "That problem will now be resent." msgstr "Rapportern kommer nu att skickas om." @@ -3017,28 +3016,28 @@ msgstr "Rapporten kan inte visas på %s." msgid "That report has been removed from FixMyStreet." msgstr "Rapporten har tagits bort från FixaMinGata." -#: templates/web/base/admin/body.html:136 +#: templates/web/base/admin/body.html:144 msgid "" "The <strong>email address</strong> is the destination to which reports about this category will be sent. \n" " Other categories for this body may have the same email address." msgstr "<strong>E-postadressen</strong> är destinationen till vilken rapporter i den här kategorin kommer att skickas. Andra förvaltningskategorier kan ha samma e-postadress." -#: templates/web/base/admin/body-form.html:119 -#: templates/web/base/admin/body-form.html:120 +#: templates/web/base/admin/body-form.html:123 +#: templates/web/base/admin/body-form.html:124 msgid "" "The <strong>endpoint</strong> is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." msgstr "<strong>Ändpunkten</strong> är den webbadress till den tjänst som FixaMinGata kommer att ansluta till när rapporter skickas till den här förvaltningen." -#: templates/web/base/admin/body-form.html:132 -#: templates/web/base/admin/body-form.html:133 +#: templates/web/base/admin/body-form.html:136 +#: templates/web/base/admin/body-form.html:137 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 "<strong>Jurisdiktion</strong> behövs bara om samma ändpunkt används av flera enheter. Om förvaltningen kör sin egen ändpunkt kan du lämna detta fält blankt." -#: templates/web/base/admin/body-form.html:90 -#: templates/web/base/admin/body-form.html:91 +#: templates/web/base/admin/body-form.html:94 +#: templates/web/base/admin/body-form.html:95 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>." @@ -3059,7 +3058,7 @@ msgstr "Förvaltningens namn identifierar förvaltningen (till exempel, <em>Sand msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." msgstr "Bekräftelsebrevet <strong>kan</strong> ta ett par minuter att komma fram — var tålmodig." -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:3 msgid "The council won’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 "Fyll i information om problemet nedan. Kommunen kommer inte att kunna hjälpa till om du inte lämnar tillräckligt med detaljer. Beskriv så noga du kan den exakta platsen för problemet (exempelvis \"på väggen\"), vad problemet är, hur länge det har funntis och en beskrivning. Om du har ett foto får du gärna bifoga detta också." @@ -3086,8 +3085,8 @@ msgstr "Felet var: %s" msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "Följande Open311 v2-attribut returneras för varje begäran: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:185 -#: perllib/FixMyStreet/Geocode/OSM.pm:163 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:159 +#: perllib/FixMyStreet/Geocode/OSM.pm:144 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap." msgstr "Följande information om den närmaste vägen kan vara inexakt eller ogiltigt om problemet är nära flera olika vägar eller nära en väg utan ett namn i OpenStreetMap." @@ -3145,7 +3144,7 @@ msgstr "Listan av tillgängliga områden förses av MapIt-tjänsten på %s." msgid "The passwords do not match" msgstr "Lösenorden stämmer inte överens" -#: templates/web/base/errors/page_error_404_not_found.html:11 +#: templates/web/base/errors/page_error_404_not_found.html:10 #: templates/web/base/errors/page_error_404_not_found.html:12 msgid "The requested URL '%s' was not found on this server" msgstr "Den sökta adressen '%s' hittades inte på denna server" @@ -3162,7 +3161,7 @@ msgstr "Vår enklaste bevakning är för rapporter inom ett geografiskt område: msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "Sammanfattningen och beskrivningen kommer också att visas offentligt (se vår <a href=\"/privacy\">integritetsskyddspolicy</a>)." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:295 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:300 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "Användaren kunde inte lokalisera problemet på kartan men angav en area inom vilket problemet finns" @@ -3173,16 +3172,20 @@ msgid "" " Names are not necessarily unique." msgstr "Användarens <strong>namn</strong> visas offentligt i rapporter som inte har markerats som <strong>anonyma</strong>. Namn är inte nödvändigtvis unika." +#: templates/web/base/reports/_problem-list.html:15 +msgid "There are no reports to show." +msgstr "Det finns inga rapporter att visa." + #: perllib/FixMyStreet/App/Controller/Reports.pm:75 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "Det uppstod ett problem med att visa sidan med alla rapporter. Försök gärna igen senare." -#: perllib/FixMyStreet/App/Controller/Contact.pm:131 +#: perllib/FixMyStreet/App/Controller/Contact.pm:136 #: perllib/FixMyStreet/App/Controller/Dashboard.pm:59 msgid "There was a problem showing this page. Please try again later." msgstr "Det uppstod ett problem med att visa denna sida. Försök gärna igen senare." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:755 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:762 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 #: templates/web/base/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:25 @@ -3198,7 +3201,7 @@ msgstr "Felaktigt lösenord eller epostadress. Försök igen." msgid "There was a problem with your update. Please try again." msgstr "Det uppstod ett problem med din uppdatering. Försök igen." -#: perllib/FixMyStreet/App/Controller/Contact.pm:135 +#: perllib/FixMyStreet/App/Controller/Contact.pm:140 msgid "There were problems with your report. Please see below." msgstr "Det uppstod ett problem med din rapport. Se nedan." @@ -3206,8 +3209,8 @@ msgstr "Det uppstod ett problem med din rapport. Se nedan." msgid "There were problems with your update. Please see below." msgstr "Det uppstod ett problem med din uppdatering. Se nedan." -#: templates/web/base/admin/body-form.html:108 -#: templates/web/base/admin/body-form.html:109 +#: templates/web/base/admin/body-form.html:112 +#: templates/web/base/admin/body-form.html:113 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" @@ -3220,14 +3223,14 @@ msgstr "Dessa inställningar är för förvaltningar som använder Open311 (elle msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "Den här API-implementationen är ett pågående arbete och har inte stabiliserats än. Den kommer att förändras." -#: templates/web/base/admin/body.html:36 +#: templates/web/base/admin/body.html:44 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 "Den här förvaltningen är inte associerad med något geografiskt område. Det betyder att den inte kan ha någon jurisdiktion över problem som rapporteras. Följaktligen kommer ingen av dess kategorier att visas i rullgardinsmenyn som visas på problemrapporteringssidan. För närvarende kan problem <strong>inte rapporteras till denna förvaltning</strong>." -#: templates/web/base/admin/body.html:46 +#: templates/web/base/admin/body.html:54 msgid "This body has no contacts. This means that currently problems reported to this body <strong>will not be sent</strong>." msgstr "Den här förvaltningen har inga kontakter. Det betyder att problem rapporterade till den här förvaltningen <strong>inte kommer att skickas</strong>." @@ -3238,18 +3241,18 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "Den här förvaltningen kommer endast att skickas rapporter för problem inom dess <strong>geografiska område</strong>. En förvaltning kommer inte att få några rapporter om den inte täcker åtminstone ett område." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:388 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:394 msgid "This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system." msgstr "Det här brevet har skickats till flera adresser eftersom rapportören inte angav någon kategori, eller den kategori som angavs hör till flera olika enheter. Du kan ignorera det här brevet om du inte är rätt person att hantera det, men det vore också mycket hjälpsamt om du kan ta reda på vem som är rätt person och anmäla detta till oss så att vi kan ändra databasen för framtida brev." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:391 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 msgid "This email has been sent to several councils covering the location of the problem, as the category selected is provided for all of them; please ignore it if you're not the correct council to deal with the issue." msgstr "Det här brevet har skickats till flera adresser eftersom rapportören inte angav någon kategori, eller den kategori som angavs hör till flera olika enheter. Du kan ignorera det här brevet om du inte är rätt person att hantera det, men det vore också mycket hjälpsamt om du kan ta reda på vem som är rätt person och anmäla detta till oss så att vi kan ändra databasen för framtida brev." -#: perllib/FixMyStreet/App/Controller/Report/New.pm:898 -#: perllib/FixMyStreet/App/Controller/Report/New.pm:968 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:136 -#: perllib/FixMyStreet/Cobrand/UK.pm:53 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:902 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:972 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/Cobrand/UK.pm:43 msgid "This information is required" msgstr "Den här informationen krävs" @@ -3288,8 +3291,8 @@ msgstr "Arbete pågår med att lösa problemet" msgid "This problem is old and of unknown status." msgstr "Problemet är gammalt och har okänt status" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:130 #: perllib/FixMyStreet/Cobrand/Zurich.pm:131 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:132 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Den här rapporten väntar på att granskas." @@ -3306,15 +3309,15 @@ msgstr "Det här problemet är markerat som löst" msgid "This report is currently marked as open." msgstr "Den här rapportern är öppen" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:319 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:311 msgid "This report was submitted anonymously" msgstr "Den här rapporten skickades anonymt." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:293 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Den här sidan innehåller också ett foto av problemet" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Tidslinje" @@ -3332,7 +3335,7 @@ msgstr "Klicka på kartan för att <strong>rapportera ett problem</strong>." msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" msgstr "Skriv in postnummer eller gatunamn och ort för att se rapporter kring den platsen." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:294 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:299 msgid "To view a map of the precise location of this issue" msgstr "För att visa en karta med den exakta positionen för problemet" @@ -3348,8 +3351,12 @@ msgstr "Totalt" msgid "Try again" msgstr "Försök igen" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:46 +#: templates/web/base/contact/submit.html:14 +msgid "Try emailing us directly:" +msgstr "Prova att skicka ett e-brev till oss direkt:" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -3357,8 +3364,8 @@ msgstr "Försök igen" msgid "Unable to fix" msgstr "Kunde inte åtgärda" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/admin/update_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:45 #: templates/web/zurich/admin/report_edit.html:58 @@ -3400,7 +3407,7 @@ msgstr "Uppdateringen nedan tillagd anonymt %s" msgid "Update below added by %s at %s" msgstr "Uppdateringen nedan tillagd av %s den %s" -#: templates/web/base/admin/body-form.html:233 +#: templates/web/base/admin/body-form.html:240 #: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "Uppdatera förvaltning" @@ -3426,7 +3433,7 @@ msgstr "Uppdateringen markerade problemet som löst" msgid "Update reopened problem" msgstr "Uppdateringen öppnade rapporten på nytt" -#: templates/web/base/admin/body.html:93 +#: templates/web/base/admin/body.html:101 msgid "Update statuses" msgstr "Uppdaterad status" @@ -3440,12 +3447,12 @@ msgstr "Uppdatering:" msgid "Updated" msgstr "Uppdaterad" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1016 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1060 -#: perllib/FixMyStreet/App/Controller/Admin.pm:810 -#: perllib/FixMyStreet/App/Controller/Admin.pm:958 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:549 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:618 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1014 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:808 +#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:556 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:625 msgid "Updated!" msgstr "Uppdaterad!" @@ -3457,7 +3464,7 @@ msgstr "Uppdaterad!" msgid "Updates" msgstr "Uppdateringar" -#: perllib/FixMyStreet/DB/Result/Comment.pm:139 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "Uppdateringar kan inte innehålla mer än %s tecken. Var vänlig korta ned din uppdatering." @@ -3472,7 +3479,7 @@ msgstr "Uppdateringar för {{title}}" msgid "Updates to this problem, FixMyStreet" msgstr "Uppdateringar för det här problemet, FixaMinGata" -#: templates/web/base/admin/body.html:174 +#: templates/web/base/admin/body.html:182 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 "Använd <strong>anteckningen</strong> för att dokumentera information som bara visas för administratörer. Anteckningar visas inte offentligt och skickas inte till förvaltningen." @@ -3481,11 +3488,11 @@ msgstr "Använd <strong>anteckningen</strong> för att dokumentera information s msgid "User" msgstr "Användare" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1357 msgid "User flag removed" msgstr "Användarflaggan borttagen" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1331 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1329 msgid "User flagged" msgstr "Användaren flaggad" @@ -3493,16 +3500,16 @@ msgstr "Användaren flaggad" msgid "User search finds matches in users' names and email addresses." msgstr "Användarsökningen matchar mot användares namn och e-postadresser." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:303 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:307 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Användare" -#: perllib/FixMyStreet/App/Controller/Admin.pm:380 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:430 +#: perllib/FixMyStreet/App/Controller/Admin.pm:374 +#: perllib/FixMyStreet/App/Controller/Admin.pm:404 +#: perllib/FixMyStreet/App/Controller/Admin.pm:421 msgid "Values updated" msgstr "Värden uppdaterade" @@ -3556,11 +3563,11 @@ msgstr "Vi visar aldrig din epostadress publikt" msgid "We never show your email address or phone number." msgstr "Vi visar aldrig din epostadress eller telefonnummer publikt." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:403 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "Det här problemet kan höra till %s. Dessvärre har vi ingen kontaktinformation till dem. Om du vet om en lämplig kontaktadress hör vi gärna från dig." -#: templates/web/base/index-steps.html:38 +#: templates/web/base/index-steps.html:31 msgid "We send it to the council on your behalf" msgstr "Vi skickar rapportern till berörd kommun" @@ -3569,15 +3576,23 @@ msgstr "Vi skickar rapportern till berörd kommun" msgid "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>" msgstr "Vi kommer endast att använda din information i enlighet med vår <a href=\"/privacy\">sekretesspolicy.</a>" +#: templates/web/base/questionnaire/completed-open.html:2 +msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" +msgstr "Tråkigt att problemet inte åtgärdats. Du kan prova att skriva direkt till din kommun för att uppmana dem att åtgärda problemet." + #: templates/web/base/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 "Vi vill gärna höra vad du tycker om FixaMinGata. Fyll i formuläret nedan och skicka in, eller skicka epost till <a href='mailto:%s'>%s</a>:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:41 +#: templates/web/base/contact/submit.html:7 +msgid "We’ll get back to you as soon as we can." +msgstr "Vi återkommer så snart vi kan!" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 msgid "What’s the issue, and where is it?" msgstr "Vad och var är problemet?" -#: templates/web/base/admin/category_edit.html:82 +#: templates/web/base/admin/category_edit.html:87 #: templates/web/zurich/admin/body.html:18 msgid "When edited" msgstr "Vid förändringar" @@ -3586,15 +3601,18 @@ msgstr "Vid förändringar" msgid "When sent" msgstr "Vid avsändning" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Whole block of empty flats" msgstr "Hela block med tomma lägenheter" +#: templates/web/base/tokens/confirm_alert.html:7 +msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." +msgstr "Varför sluta där? <a href=\"/alert\">Sätt upp fler notifikationer</a> gratis." + #: templates/web/base/open311/index.html:92 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 "Vid sökningar är det också möjligt att söka efter agency_responsible för att begränsa svaren till de som skickats till en enstaka kommun. Söktermen för administrations-IDt erhålls av <a href=\"%s\">MapIt</a>." -#: templates/web/fiksgatami/front/footer-marketing.html:15 #: templates/web/fixmystreet/front/footer-marketing.html:17 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "Vill du bidra till FixaMinGata? Vår kod är öppen programvara och <a href=\"http://fixmystreet.org\">tillgänglig på fixmystreet.org</a>." @@ -3618,18 +3636,18 @@ msgid "Year" msgstr "År" #: templates/web/base/admin/bodies.html:66 -#: templates/web/base/admin/body.html:72 templates/web/base/admin/body.html:74 -#: templates/web/base/admin/body.html:78 templates/web/base/admin/body.html:80 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:76 +#: templates/web/base/admin/report_edit.html:93 #: templates/web/base/admin/update_edit.html:24 -#: templates/web/base/admin/users.html:29 +#: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:42 #: templates/web/base/questionnaire/index.html:81 @@ -3658,14 +3676,12 @@ msgstr "Du vill anmäla missbruk, personlig inforation, eller motsvarande i föl msgid "You are reporting the following update for being abusive, containing personal information, or similar:" msgstr "Du vill anmäla missbruk, personlig inforation, eller motsvarande i följande uppdatering:" -#: templates/web/base/tokens/confirm_problem.html:25 -#: templates/web/base/tokens/confirm_problem.html:26 -#: templates/web/zurich/tokens/confirm_problem.html:6 +#: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:8 msgid "You can <a href=\"%s%s\">view the problem on this site</a>." msgstr "Du kan <a href=\"%s%s\">se problemet på den här webbplatsen</a>." -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:48 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "Du kan lägga till en elakartade användares e-postadresser i missbrukarlistan, vilket automatiskt döljer (och aldrig skickar) rapporter som användarna skapar." @@ -3680,14 +3696,14 @@ msgid "" " reports in the past." msgstr "Du kan flagga rapporter eller användare under dess inställningar, och de kommer då att visas på den här sidan. Detta kan exempelvis vara användbart om du vill hålla ett öga på en användare som tidigare har rapporterat olämpliga rapporter." -#: templates/web/base/report/new/councils_text_none.html:19 -#: templates/web/base/report/new/councils_text_none.html:20 -#: templates/web/base/report/new/councils_text_some.html:20 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 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 hjälpa oss med att hitta kontaktadressen för %s och eposta till oss på <a href='mailto:%s'>%s</a>." -#: templates/web/base/admin/body-form.html:81 +#: templates/web/base/admin/body-form.html:85 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "Du kan markera en förvaltning som borttagen om du inte vill att den skall vara aktiv på sajten." @@ -3700,10 +3716,10 @@ msgid "You have already answered this questionnaire. If you have a question, ple msgstr "Du har redan svarat på det här frågeformuläret. Om du har en fråga, <a href=\"%s\">kontakta oss</a> eller <a href=\"%s\">visa problemet</a>.\n" #: templates/web/base/questionnaire/index.html:68 -#: templates/web/base/report/new/fill_in_details_form.html:94 +#: templates/web/base/report/new/fill_in_details_form.html:75 #: templates/web/fixmystreet/questionnaire/index.html:88 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:79 -#: templates/web/zurich/report/new/fill_in_details_form.html:75 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 +#: templates/web/zurich/report/new/fill_in_details_form.html:58 msgid "You have already attached a photo to this report, attaching another one will replace it." msgstr "Du har redan bifogat ett foto till rapporten. Om du bifogar ett nytt foto kommer det att ersätta det tidigare." @@ -3712,35 +3728,20 @@ msgstr "Du har redan bifogat ett foto till rapporten. Om du bifogar ett nytt fot msgid "You have already attached a photo to this update, attaching another one will replace it." msgstr "Du har redan bifogat ett foto till uppdateringen. Om du bifogar ett nytt foto kommer det att ersätta det tidigare." -#: templates/web/base/auth/sign_out.html:3 +#: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" msgstr "Du har blivit utloggad" #: 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 "Du har markerat problemet med den gröna pinnen på kartan. Om det inte är rätt position, klicka på rätt plats på kartan igen." - -#: templates/web/base/tokens/confirm_alert.html:8 -msgid "You have successfully confirmed your alert." -msgstr "Du har bekräftat din bevakning." +msgstr "Du har markerat problemet med den gröna nålmarkören på kartan. Om det inte är rätt position, klicka på rätt plats på kartan igen." +#: 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 bekräftat din e-postadress." -#: templates/web/base/tokens/confirm_update.html:14 -msgid "You have successfully confirmed your update and you can now <a href=\"%s\">view it on the site</a>." -msgstr "Du har bekräftat din uppdatering och kan nu <a href=\"%s\">se den på FixaMinGata</a>." - -#: templates/web/base/tokens/confirm_alert.html:12 -msgid "You have successfully created your alert." -msgstr "Du har skapat en bevakning." - -#: templates/web/base/tokens/confirm_alert.html:10 -msgid "You have successfully deleted your alert." -msgstr "Du har tagit bort en bevakning." - #: templates/web/base/report/display.html:20 #: templates/web/base/report/new/fill_in_details.html:37 #: templates/web/fixmystreet/report/display.html:17 @@ -3766,7 +3767,7 @@ msgid "" " contacts (such as an email address) to which reports are sent." msgstr "Du behöver lägga till förvaltningar (som kommuner) så att du sedan kan lägga till problemkategorier som de kan hantera (som Väggrop eller Gatubelysning) och kontakter (som e-postadresser) till vilka rapporter skickas." -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:85 msgid "You really want to resend?" msgstr "Vill du verkligen skicka om?" @@ -3786,7 +3787,7 @@ msgstr "Dina rapporter" #: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 #: templates/web/fixmystreet/report/update-form.html:76 -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:71 msgid "Your email" msgstr "Din epostadress" @@ -3802,7 +3803,7 @@ msgid "Your email address:" msgstr "Din epostadress:" #: templates/web/base/alert/_list.html:92 -#: templates/web/base/report/new/fill_in_details_form.html:125 +#: templates/web/base/report/new/fill_in_details_form.html:106 #: templates/web/base/report/update-form.html:81 msgid "Your email:" msgstr "Din epostadress:" @@ -3817,13 +3818,13 @@ msgstr "Din information kommer endast att användas i enlighet med vår <a href= #: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 #: templates/web/fixmystreet/report/update-form.html:142 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:98 +#: templates/web/zurich/report/new/fill_in_details_form.html:81 msgid "Your name" msgstr "Ditt namn och efternamn" #: templates/web/base/auth/general.html:59 #: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:204 +#: templates/web/base/report/new/fill_in_details_form.html:185 #: templates/web/base/report/update-form.html:151 msgid "Your name:" msgstr "Ditt namn:" @@ -3841,33 +3842,19 @@ msgstr "Ditt lösenord har ändrats" #: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 -#: templates/web/zurich/report/new/fill_in_details_form.html:104 +#: templates/web/zurich/report/new/fill_in_details_form.html:87 msgid "Your phone number" msgstr "Ditt telefonnummer" -#: templates/web/base/tokens/confirm_problem.html:4 -msgid "Your problem has been confirmed!" -msgstr "Ditt problem har bekräftats!" - #: templates/web/fixmystreet/questionnaire/index.html:16 msgid "Your report" msgstr "Din rapport" -#: templates/web/base/report_created.html:6 -msgid "Your report has been created and will shortly be sent." -msgstr "Din rapport har skapats och kommer att skickas inom kort." - -#: templates/web/base/footer.html:9 templates/web/fiksgatami/footer.html:21 -#: templates/web/fiksgatami/nn/footer.html:21 -#: templates/web/fixmystreet/footer.html:24 +#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:24 msgid "Your reports" msgstr "Dina rapporter" -#: templates/web/base/tokens/confirm_update.html:4 -msgid "Your update has been confirmed!" -msgstr "Din uppdatering har bekräftats!" - -#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:59 +#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:41 msgid "Your updates" msgstr "Dina uppdateringar" @@ -3884,11 +3871,7 @@ msgstr "av %s" msgid "council" msgstr "kommun" -#: perllib/FixMyStreet/DB/Result/Problem.pm:665 -msgid "council ref: %s" -msgstr "kommunens referens: %s" - -#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:32 #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:54 msgid "didn't use map" @@ -3899,6 +3882,7 @@ msgstr "använde inte kartan" msgid "e.g. ‘%s’ or ‘%s’" msgstr "ex.v. '%s' eller '%s'" +#: templates/web/base/admin/body-form.html:188 #: templates/web/base/admin/flagged.html:51 msgid "edit user" msgstr "ändra användare" @@ -3913,7 +3897,7 @@ msgstr "från %d olika användare" msgid "last updated %s" msgstr "senast uppdaterad %s" -#: perllib/Utils.pm:263 +#: perllib/Utils.pm:235 msgid "less than a minute" msgstr "mindre än en minut" @@ -3973,22 +3957,22 @@ msgstr "eller" msgid "or locate me automatically" msgstr "eller <strong>hitta min position automatiskt</strong>." -#: templates/web/base/admin/report_edit.html:25 -#: templates/web/base/admin/report_edit.html:26 -#: templates/web/zurich/admin/report_edit-sdm.html:28 +#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:30 +#: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit-sdm.html:29 -#: templates/web/zurich/admin/report_edit-sdm.html:37 +#: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:38 -#: templates/web/zurich/admin/report_edit.html:28 +#: templates/web/zurich/admin/report_edit.html:27 #: templates/web/zurich/admin/report_edit.html:29 -#: templates/web/zurich/admin/report_edit.html:39 +#: templates/web/zurich/admin/report_edit.html:38 #: templates/web/zurich/admin/report_edit.html:40 -#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit.html:50 #: templates/web/zurich/admin/report_edit.html:52 msgid "originally entered: “%s”" msgstr "ursprungligen inmatat: “%s”" -#: templates/web/base/admin/report_edit.html:30 +#: templates/web/base/admin/report_edit.html:43 msgid "other areas:" msgstr "andra områden:" @@ -3997,13 +3981,12 @@ msgstr "andra områden:" msgid "reopened" msgstr "öppnat på nytt" -#: templates/web/fiksgatami/header.html:49 -#: templates/web/fixmystreet/header.html:53 +#: templates/web/fixmystreet/header.html:59 #: templates/web/zurich/footer.html:12 msgid "sign out" msgstr "logga ut" -#: templates/web/base/report/new/fill_in_details_form.html:13 +#: templates/web/base/report/new/fill_in_details_form.html:12 #: templates/web/base/report/new/fill_in_details_form.html:15 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 @@ -4015,15 +3998,15 @@ msgstr "kommunen" msgid "there is no pin shown as the user did not use the map" msgstr "det finns ingen kartmarkering eftersom användaren inte använde kartan" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:373 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:379 msgid "this type of local problem" msgstr "den här typen av problem" -#: perllib/Utils.pm:235 +#: perllib/Utils.pm:207 msgid "today" msgstr "idag" -#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:32 #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:54 msgid "used map" @@ -4049,7 +4032,7 @@ msgid_plural "<big>%s</big> reports recently" msgstr[0] "<big>%s</big> rapport nyligen" msgstr[1] "<big>%s</big> rapporter nyligen" -#: perllib/Utils.pm:282 +#: perllib/Utils.pm:254 #, perl-format msgid "%d hour" msgid_plural "%d hours" @@ -4063,7 +4046,7 @@ msgid_plural "%d supporters" msgstr[0] "%d supporter" msgstr[1] "%d supportrar" -#: perllib/Utils.pm:284 +#: perllib/Utils.pm:256 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -4084,7 +4067,7 @@ msgid_plural "We do not yet have details for the councils that cover this locati msgstr[0] "Vi har ännu ingen information om kommunen på den platsen" msgstr[1] "Kommunen på platsen har valt att inte ta emot rapporter från FixaMinGata." -#: perllib/Utils.pm:278 +#: perllib/Utils.pm:250 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -4105,7 +4088,7 @@ msgid_plural "<big>%s</big> fixed in past month" msgstr[0] "<big>%s</big> löst problem senaste månaden" msgstr[1] "<big>%s</big> lösta problem senaste månaden" -#: perllib/Utils.pm:280 +#: perllib/Utils.pm:252 #, perl-format msgid "%d day" msgid_plural "%d days" @@ -4119,8 +4102,5 @@ msgid_plural "We do <strong>not</strong> yet have details for the other councils msgstr[0] "Vi har ännu <strong>ingen</strong> information om kommunen på den platsen" msgstr[1] "Kommunen på platsen har valt att inte ta emot rapporter från FixaMinGata." -#~ msgid "Configuration updated - contacts will be generated automatically later" -#~ msgstr "Konfigurationen uppdaterad. Kontakterna kommer att genereras automatiskt senare" - -#~ msgid "The subject and details of the problem will be public, plus your name if you give us permission." -#~ msgstr "Ärendet och informationen om problemet kommer att vara publikt. Ditt namn kommer också att vara publikt om du ger oss tillstånd att visa det." +#~ msgid "For council(s):" +#~ msgstr "För kommuner:" diff --git a/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po index 24e3dd450..3e9a381c9 100644 --- a/locale/uk_UA.UTF-8/LC_MESSAGES/FixMyStreet.po +++ b/locale/uk_UA.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: 2015-01-20 16:59+0000\n" -"PO-Revision-Date: 2014-11-19 18:30+0000\n" +"POT-Creation-Date: 2015-07-31 14:28+0100\n" +"PO-Revision-Date: 2015-07-10 13:31+0000\n" "Last-Translator: mySociety <transifex@mysociety.org>\n" "Language-Team: Ukrainian (Ukraine) (http://www.transifex.com/projects/p/fixmystreet/language/uk_UA/)\n" "Language: uk_UA\n" @@ -20,17 +20,15 @@ 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:618 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:386 +#: perllib/FixMyStreet/DB/Result/Problem.pm:623 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:392 msgid " and " msgstr "і" -#: templates/web/base/report/new/councils_text_all.html:12 -#: templates/web/base/report/new/councils_text_all.html:19 -#: templates/web/base/report/new/councils_text_all.html:5 -#: templates/web/base/report/new/councils_text_none.html:19 -#: templates/web/base/report/new/councils_text_none.html:21 -#: templates/web/base/report/new/councils_text_some.html:20 +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_none.html:11 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:22 #: templates/web/base/report/new/councils_text_some.html:5 msgid " or " @@ -66,22 +64,26 @@ msgstr "%d до %d з %d" msgid "%s - Summary reports" msgstr "%s - підсумкових звітів" -#: perllib/FixMyStreet/DB/Result/Problem.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:672 msgid "%s ref: %s" msgstr "%s посилання: %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:265 perllib/FixMyStreet/Cobrand/UK.pm:277 +#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 msgid "%s ward, %s" msgstr "%s район, %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:554 +#: perllib/FixMyStreet/DB/Result/Problem.pm:559 msgid "%s, reported at %s" msgstr "%s, сповіщено о %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:292 perllib/FixMyStreet/Cobrand/UK.pm:304 +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 msgid "%s, within %s ward" msgstr "%s, в межах %s району" +#: perllib/FixMyStreet/Map/OSM.pm:42 +msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" +msgstr "" + #: templates/web/base/email_sent.html:29 msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" msgstr "(Don't worry — we'll hang on to your alert while you're checking your email.)" @@ -95,7 +97,7 @@ msgid "(Don't worry — we'll hang on to your update while you're checking y msgstr "(Don't worry — we'll hang on to your update while you're checking your email.)" #: templates/web/base/admin/report_blocks.html:11 -#: templates/web/base/admin/users.html:29 +#: templates/web/base/admin/users.html:31 msgid "(Email in abuse table)" msgstr "(поштова скринька в чорному списку)" @@ -123,7 +125,7 @@ msgstr "(закрито)" msgid "(fixed)" msgstr "(полагоджено)" -#: templates/web/base/index.html:9 +#: templates/web/base/index.html:8 templates/web/base/index.html:9 #: templates/web/fixmystreet/around/intro.html:2 msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" msgstr "(графіті, сміття, крива бруківка, проблеми з вуличним освітленням тощо)" @@ -133,8 +135,8 @@ msgstr "(графіті, сміття, крива бруківка, пробле msgid "(not sent to council)" msgstr "(не відправлено муніципалітету)" -#: templates/web/base/report/new/fill_in_details_form.html:218 -#: templates/web/zurich/report/new/fill_in_details_form.html:94 +#: templates/web/base/report/new/fill_in_details_form.html:199 +#: templates/web/zurich/report/new/fill_in_details_form.html:77 msgid "(optional)" msgstr "(вибірково)" @@ -147,7 +149,7 @@ msgstr "" msgid "(sent to both)" msgstr "(відправлено обидвом)" -#: templates/web/base/report/new/fill_in_details_form.html:212 +#: templates/web/base/report/new/fill_in_details_form.html:193 msgid "(we never show your email address or phone number)" msgstr "(ми не публікуєм вашу електронну адресу і номер телефону)" @@ -155,14 +157,13 @@ msgstr "(ми не публікуєм вашу електронну адресу 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:393 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/DB/Result/Problem.pm:410 msgid "-- Pick a category --" msgstr "-- Оберіть категорію --" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:618 -#: perllib/FixMyStreet/DB/Result/Problem.pm:399 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:630 +#: perllib/FixMyStreet/DB/Result/Problem.pm:416 msgid "-- Pick a property type --" msgstr "-- Оберіть тип майна --" @@ -177,43 +178,7 @@ msgstr "" " This is probably why \"area covered\" is empty (below).<br>\n" " Maybe add some <code>MAPIT_TYPES</code> to your config file?" -#: templates/web/base/questionnaire/completed.html:20 -msgid "<p style=\"font-size:150%\">Thank you very much for filling in our questionnaire; glad to hear it’s been fixed.</p>" -msgstr "<p style=\"font-size:150%\">Дякуємо, що заповнили опитувальник; раді дізнатись, що проблему вирішено.</p>" - -#: templates/web/fiksgatami/questionnaire/completed-open.html:1 -msgid "" -"<p style=\"font-size:150%\">We’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’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%\">We’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’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>" - -#: templates/web/base/questionnaire/completed-open.html:6 -msgid "" -"<p style=\"font-size:150%\">We’re sorry to hear that. We have two\n" -"suggestions: why not try writing to your local representatives or, if\n" -"it’s a problem that could be fixed by local people working together, why\n" -"not <a href=\"http://www.pledgebank.com/new\">make and publicise a pledge</a>?\n" -"</p>" -msgstr "" - -#: templates/web/base/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>Щиро дякуєм за участь у опитуванні; якщо у вас зявиться нова інформація щодо проблеми - повертайтесь на сайт і поновіть інформацію.</p>" - -#: templates/web/base/around/_report_banner.html:4 +#: templates/web/base/around/_report_banner.html:3 #: templates/web/base/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>" @@ -240,7 +205,7 @@ msgstr "<strong>Ні</strong> я залогінюсь через е-пошту" msgid "<strong>No</strong>, I do not, let me sign in by email:" msgstr "<strong>Ні</strong>, я залогінюсь через е-пошту" -#: templates/web/base/report/new/fill_in_details_form.html:163 +#: templates/web/base/report/new/fill_in_details_form.html:144 msgid "<strong>No</strong>, let me confirm my report by email:" msgstr "<strong>Ні</strong>, я підтверджу сповіщення е-поштою" @@ -248,13 +213,8 @@ msgstr "<strong>Ні</strong>, я підтверджу сповіщення е- msgid "<strong>No</strong>, let me confirm my update by email:" msgstr "<strong>Ні</strong>, Я підтверджу поновлення е-поштою:" -#: templates/web/base/tokens/confirm_problem.html:19 -#: templates/web/base/tokens/confirm_problem.html:20 -msgid "<strong>We will now send it to the council</strong>." -msgstr "" - #: templates/web/base/auth/general.html:37 -#: templates/web/base/report/new/fill_in_details_form.html:141 +#: templates/web/base/report/new/fill_in_details_form.html:122 #: templates/web/base/report/update-form.html:95 #: templates/web/fixmystreet/auth/general.html:37 #: templates/web/fixmystreet/auth/general.html:39 @@ -268,8 +228,8 @@ msgstr "<strong>Так</strong> В мене є пароль" msgid "About us" msgstr "Про нас" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:39 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:52 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:31 #: templates/web/fixmystreet/report/update-form.html:28 @@ -285,26 +245,26 @@ msgid "" " categories of problem) to each body." msgstr "Додайте <strong>запис</strong> для кожної адміністративної одиниці, ради чи департаменту, яким можна надсилати сповіщення. Ви можете додати один або більше контактів (для різних категорій проблем) для кожного запису." -#: templates/web/base/admin/body.html:48 +#: templates/web/base/admin/body.html:56 msgid "Add a contact using the form below." msgstr "Додати контакт через форму нижче." #: templates/web/base/admin/bodies.html:74 -#: templates/web/base/admin/body-form.html:233 +#: templates/web/base/admin/body-form.html:240 #: templates/web/zurich/admin/body-form.html:51 msgid "Add body" msgstr "Додати запис" -#: templates/web/base/admin/body.html:108 +#: templates/web/base/admin/body.html:116 #: templates/web/zurich/admin/body.html:31 msgid "Add new category" msgstr "Додати нову категорію" -#: templates/web/base/admin/users.html:45 +#: templates/web/base/admin/users.html:47 msgid "Add user" msgstr "Додати користувача" -#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:70 +#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:52 msgid "Added %s" msgstr "Додано %s" @@ -331,9 +291,7 @@ msgstr "Повідомляти мене про оновлення" msgid "All Reports" msgstr "Всі звіти" -#: templates/web/base/footer.html:11 templates/web/fiksgatami/footer.html:23 -#: templates/web/fiksgatami/nn/footer.html:23 -#: templates/web/fixmystreet/footer.html:26 +#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:26 #: templates/web/zurich/admin/index-dm.html:12 #: templates/web/zurich/admin/stats.html:13 #: templates/web/zurich/footer.html:19 @@ -350,19 +308,9 @@ msgstr "Всі звіти в проміжку з %s по %s" msgid "All the information you provide here will be sent to" msgstr "Всю надану інформацію буде надіслано до" -#: templates/web/base/report/new/councils_text_all.html:12 -#: templates/web/base/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/base/report/new/councils_text_all.html:5 -#: templates/web/base/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> або до релевантного <strong>відділу</strong>, через систему скарг" - -#: templates/web/base/report/new/councils_text_all.html:19 -#: templates/web/base/report/new/councils_text_all.html:20 -#: templates/web/base/report/new/fill_in_details_form.html:13 +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_all.html:4 +#: templates/web/base/report/new/fill_in_details_form.html:12 #: templates/web/base/report/new/fill_in_details_form.html:14 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 @@ -379,7 +327,7 @@ msgstr "Оновлення відмітило цю проблему як вир msgid "Anonymous" msgstr "Анонім" -#: templates/web/base/admin/report_edit.html:62 +#: templates/web/base/admin/report_edit.html:75 #: templates/web/base/admin/update_edit.html:23 msgid "Anonymous:" msgstr "Анонім:" @@ -388,18 +336,18 @@ msgstr "Анонім:" msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?" msgstr "Ви <strong>розробник</strong>? Хочете долучитись до проекту?" -#: templates/web/fiksgatami/front/footer-marketing.html:14 #: templates/web/fixmystreet/front/footer-marketing.html:16 msgid "Are you a developer?" msgstr "Ви розробник?" #: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/body.html:16 #: templates/web/zurich/admin/body-form.html:24 msgid "Area covered" msgstr "Зона покрита" #: templates/web/base/admin/bodies.html:15 -#: templates/web/base/admin/body.html:52 +#: templates/web/base/admin/body.html:60 msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." msgstr "" @@ -417,7 +365,7 @@ msgstr "Назначити зовнішньому відділу:" msgid "Assign to subdivision:" msgstr "Назначити підрозділу:" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:163 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:165 #: templates/web/zurich/report/updates.html:11 msgid "Assigned to %s" msgstr "Назначити %s" @@ -430,7 +378,7 @@ msgstr "At most %d requests are returned in each query. The returned requests a msgid "At the moment only searching for and looking at reports work." msgstr "Наразі лише роздивляюсь як працюють звіти" -#: perllib/FixMyStreet/DB/Result/Problem.pm:348 +#: perllib/FixMyStreet/DB/Result/Problem.pm:373 #: templates/web/zurich/report/_item.html:11 msgid "Awaiting moderation" msgstr "Очікує перевірки модератором" @@ -443,8 +391,8 @@ msgstr "Назад" msgid "Ban email address" msgstr "Забанити адресу" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:297 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:301 #: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 msgid "Bodies" msgstr "Органи" @@ -455,6 +403,7 @@ msgstr "Органи" msgid "Body" msgstr "Орган" +#: templates/web/base/admin/report_edit.html:34 #: templates/web/base/admin/user-form.html:32 msgid "Body:" msgstr "Орган:" @@ -467,16 +416,15 @@ msgstr "По даті" msgid "Can't see the map? <em>Skip this step</em>" msgstr "Не бачите мапу? <em>Пропустіть цей крок</em>" -#: templates/web/base/admin/body.html:60 +#: templates/web/base/admin/body.html:68 #: templates/web/base/admin/index.html:55 #: templates/web/base/report/new/category.html:10 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:53 +#: templates/web/base/report/new/category_wrapper.html:3 #: templates/web/zurich/admin/body.html:14 #: templates/web/zurich/admin/index-dm.html:23 #: templates/web/zurich/admin/index-sdm.html:21 #: templates/web/zurich/admin/reports.html:13 #: templates/web/zurich/admin/stats.html:50 -#: templates/web/zurich/report/new/fill_in_details_form.html:50 msgid "Category" msgstr "Категорія" @@ -484,17 +432,16 @@ msgstr "Категорія" msgid "Category fix rate for problems > 4 weeks old" msgstr "В цій категорії проблеми не вирішуються > 4 тижнів" -#: templates/web/base/admin/body.html:130 +#: templates/web/base/admin/body.html:138 #: templates/web/base/admin/category_edit.html:23 -#: templates/web/base/admin/report_edit.html:61 -#: templates/web/base/report/new/fill_in_details_form.html:68 +#: templates/web/base/admin/report_edit.html:74 #: templates/web/zurich/admin/body.html:43 #: templates/web/zurich/admin/report_edit-sdm.html:42 #: templates/web/zurich/admin/report_edit.html:140 msgid "Category:" msgstr "Категорія:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:377 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383 msgid "Category: %s" msgstr "Категорія: %s" @@ -505,7 +452,7 @@ msgstr "Категорія: %s" msgid "Change password" msgstr "Змінити пароль" -#: templates/web/base/admin/body.html:152 +#: templates/web/base/admin/body.html:160 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." @@ -513,13 +460,13 @@ msgstr "" "Позначте <strong>підтверджений</strong>, щоб вказати, що цей контакт був підтверджений як вірний.\n" "Якщо ви не впевнені у походженні та достовірність контакта, залиште не позначеним." -#: templates/web/base/admin/body.html:163 +#: templates/web/base/admin/body.html:171 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/base/admin/body.html:183 +#: templates/web/base/admin/body.html:191 msgid "" "Check <strong>private</strong> if reports in this category should <strong>never be displayed on the website</strong>.\n" " <br>\n" @@ -530,7 +477,7 @@ msgid "" " at a specific address." msgstr "" -#: templates/web/base/admin/body.html:122 +#: templates/web/base/admin/body.html:130 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." @@ -546,16 +493,16 @@ msgstr "Натисніть тут або введіть в форматі дд/ msgid "Click map to report a problem" msgstr "Натисніть на точку на мапі щоб прозвітувати проблему" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:140 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:45 -#: templates/web/base/admin/report_edit.html:47 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:58 +#: templates/web/base/admin/report_edit.html:60 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/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:95 #: templates/web/zurich/admin/report_edit.html:97 #: templates/web/zurich/admin/stats.html:31 @@ -563,11 +510,12 @@ msgstr "Натисніть на точку на мапі щоб прозвіту msgid "Closed" msgstr "Закрито" -#: perllib/FixMyStreet/DB/Result/Problem.pm:762 +#: perllib/FixMyStreet/DB/Result/Problem.pm:771 msgid "Closed by council" msgstr "Закрито муніципалітетом" -#: templates/web/base/my/my.html:40 templates/web/fixmystreet/my/my.html:46 +#: templates/web/base/my/my.html:40 +#: templates/web/fixmystreet/my/_problem-list.html:12 msgid "Closed reports" msgstr "Закриті звіти" @@ -575,7 +523,7 @@ msgstr "Закриті звіти" msgid "Closed:" msgstr "Закрито:" -#: templates/web/base/around/tabbed_lists.html:11 +#: templates/web/base/around/tabbed_lists.html:10 #: templates/web/base/around/tabbed_lists.html:12 msgid "Closest nearby problems <small>(within %skm)</small>" msgstr "Найближчі проблеми <small>(в межах %sкм)</small>" @@ -590,26 +538,26 @@ msgstr "Погоджувачы:" msgid "Cobrand" msgstr "Cobrand" -#: templates/web/base/admin/report_edit.html:75 +#: templates/web/base/admin/report_edit.html:91 #: templates/web/base/admin/update_edit.html:50 msgid "Cobrand data:" msgstr "Cobrand data:" -#: templates/web/base/admin/report_edit.html:74 +#: templates/web/base/admin/report_edit.html:90 #: templates/web/base/admin/update_edit.html:49 msgid "Cobrand:" msgstr "Cobrand:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1201 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 #: templates/web/base/admin/config_page.html:1 msgid "Configuration" msgstr "Конфігурація" -#: templates/web/base/admin/category_edit.html:47 +#: templates/web/base/admin/category_edit.html:52 msgid "Configure Endpoint" msgstr "Налаштувати ендпойнт" -#: templates/web/base/admin/body.html:64 +#: templates/web/base/admin/body.html:72 msgid "Confirm" msgstr "Підтвердити" @@ -630,10 +578,10 @@ msgstr "Підтвердіть е-адресу, ввівши новий паро msgid "Confirmation" msgstr "Підтвердження" -#: templates/web/base/admin/body.html:158 -#: templates/web/base/admin/body.html:71 -#: templates/web/base/admin/category_edit.html:32 -#: templates/web/base/admin/category_edit.html:84 +#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/category_edit.html:37 +#: templates/web/base/admin/category_edit.html:89 #: templates/web/zurich/admin/stats.html:40 msgid "Confirmed" msgstr "Підтверджено" @@ -644,7 +592,7 @@ msgstr "Підтверджені звіти з %s по %s" #: templates/web/base/admin/list_updates.html:39 #: templates/web/base/admin/problem_row.html:36 -#: templates/web/base/admin/report_edit.html:70 +#: templates/web/base/admin/report_edit.html:83 msgid "Confirmed:" msgstr "Підтверджені:" @@ -661,13 +609,12 @@ msgid "Contact Us" msgstr "Зворотній звязок" #: templates/web/base/contact/index.html:6 -#: templates/web/base/contact/submit.html:3 #: templates/web/fixmystreet/contact/index.html:20 msgid "Contact the team" msgstr "Звернутись до команди" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1327 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1355 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1325 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1353 msgid "Could not find user" msgstr "Не вдалось знайти користувача" @@ -685,6 +632,10 @@ msgstr "Рада" msgid "Council contacts for %s" msgstr "Контакти ради для %s" +#: perllib/FixMyStreet/DB/Result/Problem.pm:670 +msgid "Council ref: %s" +msgstr "рада ref: %s" + #: templates/web/base/admin/stats.html:84 msgid "Council:" msgstr "Рада:" @@ -700,7 +651,7 @@ msgstr "Число" msgid "Create a report" msgstr "Створити сповіщення" -#: templates/web/base/admin/body.html:200 +#: templates/web/base/admin/body.html:208 #: templates/web/zurich/admin/body.html:59 msgid "Create category" msgstr "Створити категорію" @@ -712,7 +663,7 @@ msgid "Created" msgstr "Створено" #: templates/web/base/admin/list_updates.html:38 -#: templates/web/base/admin/report_edit.html:69 +#: templates/web/base/admin/report_edit.html:82 #: templates/web/base/admin/update_edit.html:51 #: templates/web/zurich/admin/report_edit-sdm.html:47 #: templates/web/zurich/admin/report_edit.html:61 @@ -729,7 +680,7 @@ msgstr "Поточний стан" msgid "Currently no bodies have been created." msgstr "Наразі жодних органів не було створено" -#: templates/web/base/dashboard/index.html:6 +#: templates/web/base/dashboard/index.html:5 #: templates/web/base/dashboard/index.html:7 msgid "Dashboard" msgstr "Дашборд" @@ -739,14 +690,14 @@ msgid "Dealt with by subdivision within 5 working days" msgstr "Dealt with by subdivision within 5 working days" #: templates/web/base/admin/bodies.html:27 -#: templates/web/base/admin/body.html:169 -#: templates/web/base/admin/body.html:73 -#: templates/web/base/admin/category_edit.html:37 -#: templates/web/base/admin/category_edit.html:85 +#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:81 +#: templates/web/base/admin/category_edit.html:42 +#: templates/web/base/admin/category_edit.html:90 msgid "Deleted" msgstr "Видалено" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:43 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 #: templates/web/zurich/admin/index-dm.html:22 #: templates/web/zurich/admin/index-sdm.html:20 #: templates/web/zurich/admin/reports.html:12 @@ -766,7 +717,7 @@ msgstr "Подробиці" msgid "Details:" msgstr "Подробиці:" -#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/body.html:87 msgid "Devolved" msgstr "Передано" @@ -794,8 +745,8 @@ msgstr "Не знаю" msgid "Don't like forms?" msgstr "Не любите форми?" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:47 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:60 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:32 #: templates/web/fixmystreet/report/update-form.html:28 @@ -803,7 +754,7 @@ msgstr "Не любите форми?" msgid "Duplicate" msgstr "Дубль" -#: templates/web/base/admin/body.html:98 +#: templates/web/base/admin/body.html:106 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" @@ -813,20 +764,20 @@ msgstr "" #: templates/web/base/admin/list_updates.html:42 #: templates/web/base/admin/problem_row.html:41 -#: templates/web/base/admin/users.html:31 +#: templates/web/base/admin/users.html:33 #: templates/web/zurich/admin/problem_row.html:42 msgid "Edit" msgstr "Редагувати" -#: templates/web/base/admin/body.html:212 +#: templates/web/base/admin/body.html:220 #: templates/web/zurich/admin/body.html:71 msgid "Edit body details" msgstr "Редагувати дані про орган" #: templates/web/base/admin/report_edit.html:1 -#: templates/web/zurich/admin/report_edit-sdm.html:2 +#: 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:2 +#: templates/web/zurich/admin/report_edit.html:1 #: templates/web/zurich/admin/report_edit.html:5 msgid "Editing problem %d" msgstr "Редагуємо проблему %d" @@ -840,12 +791,12 @@ msgstr "Редагуємо оновлення %d" msgid "Editing user %d" msgstr "Редагуємо користувача %d" -#: templates/web/base/admin/category_edit.html:86 +#: templates/web/base/admin/category_edit.html:91 msgid "Editor" msgstr "Редактор" #: templates/web/base/admin/bodies.html:23 -#: templates/web/base/admin/category_edit.html:83 +#: templates/web/base/admin/category_edit.html:88 #: templates/web/base/admin/flagged.html:38 #: templates/web/base/admin/users.html:16 #: templates/web/fixmystreet/auth/general.html:21 @@ -856,15 +807,23 @@ msgstr "Редактор" msgid "Email" msgstr "Е-пошта" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1303 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1301 msgid "Email added to abuse list" msgstr "Пошта занесена в чорний список" -#: templates/web/base/admin/body.html:147 +#: templates/web/base/admin/body.html:155 msgid "Email address:" msgstr "Адреса е-пошти:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1300 +#: templates/web/base/tokens/confirm_alert.html:6 +msgid "Email alert created" +msgstr "" + +#: templates/web/base/tokens/confirm_alert.html:10 +msgid "Email alert deleted" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1298 msgid "Email already in abuse list" msgstr "Адреса вже в чорному списку" @@ -876,8 +835,8 @@ msgstr "Повідомляйте мене про локальні проблем msgid "Email me updates" msgstr "Надсилайте мені новини" -#: templates/web/base/admin/category_edit.html:26 -#: templates/web/base/admin/report_edit.html:67 +#: templates/web/base/admin/category_edit.html:31 +#: templates/web/base/admin/report_edit.html:80 #: templates/web/base/admin/update_edit.html:33 #: templates/web/base/admin/user-form.html:20 #: templates/web/base/alert/updates.html:13 @@ -888,32 +847,32 @@ msgstr "Надсилайте мені новини" msgid "Email:" msgstr "Е-пошта:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:322 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 msgid "Email: %s" msgstr "Е-пошта: %s" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:620 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 msgid "Empty flat or maisonette" msgstr "Порожня квартира або дворівнева" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:619 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:631 msgid "Empty house or bungalow" msgstr "Порожній будинок або бунгало" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:622 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 msgid "Empty office or other commercial" msgstr "Порожній офіс або інше комерційне приміщення" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:623 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 msgid "Empty pub or bar" msgstr "Порожній паб або бар" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:624 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 msgid "Empty public building - school, hospital, etc." msgstr "Порожня громадська будівля - школа, лікарня та ін." -#: templates/web/base/admin/body-form.html:158 -#: templates/web/base/admin/body-form.html:159 +#: templates/web/base/admin/body-form.html:162 +#: templates/web/base/admin/body-form.html:163 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" @@ -921,8 +880,8 @@ msgid "" " <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>." msgstr "" -#: templates/web/base/admin/body-form.html:215 -#: templates/web/base/admin/body-form.html:216 +#: templates/web/base/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:223 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" @@ -933,11 +892,11 @@ msgstr "" msgid "End Date:" msgstr "Кінцева дата:" -#: templates/web/base/admin/body-form.html:126 +#: templates/web/base/admin/body-form.html:130 msgid "Endpoint" msgstr "Кінцева точка" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:72 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:73 msgid "Enter a Zürich street name" msgstr "" @@ -950,7 +909,9 @@ msgstr "Вкажіть поштовий код UK або назву вулиці msgid "Enter a nearby postcode, or street name and area" msgstr "Введіть найближчу поштову адресу, або назву вулиці чи району" +#: templates/web/base/around/postcode_form.html:1 #: templates/web/base/around/postcode_form.html:2 +#: templates/web/fixmystreet/around/postcode_form.html:10 #: templates/web/fixmystreet/around/postcode_form.html:11 msgid "Enter a nearby street name and area" msgstr "Введіть назву вулиці чи району поблизу" @@ -960,7 +921,7 @@ msgid "Enter a nearby street name and area, postal code or district in Delhi" msgstr "" #: templates/web/base/auth/general.html:64 -#: templates/web/base/report/new/fill_in_details_form.html:170 +#: templates/web/base/report/new/fill_in_details_form.html:151 #: templates/web/base/report/update-form.html:124 msgid "Enter a new password:" msgstr "Введіть новий пароль:" @@ -972,7 +933,7 @@ msgstr "Введіть новий пароль:" msgid "Enter a password" msgstr "Введіть пароль" -#: templates/web/base/index-steps.html:33 +#: templates/web/base/index-steps.html:26 msgid "Enter details of the problem" msgstr "Введіть подробиці проблеми" @@ -995,17 +956,22 @@ msgstr "Зразок поштового коду %s" msgid "Examples:" msgstr "Приклади:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:47 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" msgstr "" -#: templates/web/base/admin/report_edit.html:76 +#: templates/web/base/admin/body-form.html:81 +msgid "External URL" +msgstr "" + +#: templates/web/base/admin/category_edit.html:27 +#: templates/web/base/admin/report_edit.html:92 msgid "Extra data:" msgstr "Додаткові дані:" -#: templates/web/base/contact/submit.html:15 -msgid "Failed to send message. Please try again, or <a href=\"mailto:%s\">email us</a>." -msgstr "Не вдалось відправити повідомлення. Будь ласка спробуйте ще, або <a href=\"mailto:%s\">напишіть нам</a>." +#: templates/web/base/contact/submit.html:13 +msgid "Failed to send message" +msgstr "" #: templates/web/zurich/admin/index-dm.html:33 #: templates/web/zurich/admin/index-sdm.html:30 @@ -1017,7 +983,7 @@ msgstr "Фільтрувати список звітів" msgid "First time" msgstr "Ім’я" -#: templates/web/base/admin/body.html:40 +#: templates/web/base/admin/body.html:48 msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." msgstr "Полагодіть це вибравши <strong>зону покриття</strong> в <em>формі редагування органу </em> нижче." @@ -1048,9 +1014,9 @@ msgid "" msgstr "" #: templates/web/base/admin/index.html:55 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:41 -#: templates/web/base/admin/report_edit.html:42 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:54 +#: templates/web/base/admin/report_edit.html:55 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:144 #: templates/web/base/report/update-form.html:30 @@ -1061,17 +1027,18 @@ msgstr "" msgid "Fixed" msgstr "Вирішено" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:43 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:56 msgid "Fixed - Council" msgstr "Вирішено - Рада" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:42 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:55 msgid "Fixed - User" msgstr "Вирішено - Користувач" -#: templates/web/base/my/my.html:35 templates/web/fixmystreet/my/my.html:41 +#: templates/web/base/my/my.html:35 +#: templates/web/fixmystreet/my/_problem-list.html:7 msgid "Fixed reports" msgstr "Звіти про вирішені проблеми" @@ -1079,7 +1046,7 @@ msgstr "Звіти про вирішені проблеми" msgid "Fixed:" msgstr "Вирішено:" -#: templates/web/base/admin/body-form.html:84 +#: templates/web/base/admin/body-form.html:89 #: templates/web/zurich/admin/body-form.html:36 msgid "Flag as deleted" msgstr "Відмітьте як видалене" @@ -1088,7 +1055,7 @@ msgstr "Відмітьте як видалене" msgid "Flag user" msgstr "Відмітьте користувача" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 #: templates/web/base/admin/users.html:19 msgid "Flagged" msgstr "Відмічено" @@ -1097,7 +1064,7 @@ msgstr "Відмічено" msgid "Flagged reports and users" msgstr "Відмічені звіти та користувачі" -#: templates/web/base/admin/user-form.html:45 +#: templates/web/base/admin/user-form.html:46 msgid "Flagged users are listed on the <a href='%s'>flagged</a> page." msgstr "Відмічені користувачі виписані на <a href='%s'>відміченій</a> сторінці." @@ -1105,8 +1072,8 @@ msgstr "Відмічені користувачі виписані на <a href= msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." msgstr "Відмічені користувачі не заборонені. Це просто список користувачів, які потребують уваги." -#: templates/web/base/admin/report_edit.html:78 -#: templates/web/base/admin/user-form.html:51 +#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/user-form.html:52 msgid "Flagged:" msgstr "Відмічено:" @@ -1115,10 +1082,6 @@ msgstr "Відмічено:" msgid "Follow a ward link to view only reports within that ward." msgstr "Прослійте за посиланням на район щоб бачити звіти лише по цьому району" -#: templates/web/base/admin/report_edit.html:30 -msgid "For council(s):" -msgstr "Для рад(и):" - #: templates/web/base/admin/body-form.html:65 msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." msgstr "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." @@ -1131,8 +1094,6 @@ msgstr "Забули пароль?" #: templates/web/base/faq/faq-en-gb.html:1 #: templates/web/base/static/privacy.html:1 #: templates/web/base/static/privacy.html:2 -#: templates/web/fiksgatami/faq/faq-nb.html:1 -#: templates/web/fiksgatami/nn/faq/faq-nn.html:1 msgid "Frequently Asked Questions" msgstr "Часто задавані питання" @@ -1145,13 +1106,13 @@ msgstr "" msgid "Get updates" msgstr "Отримувати оновлення" -#: templates/web/fixmystreet/reports/_rss.html:4 +#: templates/web/fixmystreet/reports/_rss.html:3 #: templates/web/fixmystreet/reports/_rss.html:9 msgid "Get updates of %s problems" msgstr "Отримувати оновлення по %s проблем" #: templates/web/fixmystreet/reports/_rss.html:11 -#: templates/web/fixmystreet/reports/_rss.html:4 +#: templates/web/fixmystreet/reports/_rss.html:3 msgid "Get updates of problems in this %s" msgstr "Отримувати оновлення про проблеми в %s" @@ -1160,6 +1121,10 @@ msgstr "Отримувати оновлення про проблеми в %s" msgid "Give me an RSS feed" msgstr "Дайте RSS фід" +#: templates/web/base/questionnaire/completed.html:14 +msgid "Glad to hear it’s been fixed!" +msgstr "" + #: templates/web/base/alert/index.html:34 #: templates/web/base/around/postcode_form.html:8 #: templates/web/fixmystreet/around/postcode_form.html:21 @@ -1167,7 +1132,7 @@ msgstr "Дайте RSS фід" msgid "Go" msgstr "Вперед" -#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:93 msgid "Going to send questionnaire?" msgstr "Збираєтесь відправити опитувальник?" @@ -1189,9 +1154,7 @@ msgstr "Проблему було вирішено?" msgid "Have you ever reported a problem to a council before, or is this your first time?" msgstr "Ви вже сповіщали про проблеми раніше, чи це вперше?" -#: templates/web/base/footer.html:15 templates/web/fiksgatami/footer.html:27 -#: templates/web/fiksgatami/nn/footer.html:27 -#: templates/web/fixmystreet/footer.html:30 +#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:30 #: templates/web/zurich/faq/faq-de-ch.html:1 #: templates/web/zurich/footer.html:21 #: templates/web/zurich/nav_over_content.html:8 @@ -1203,18 +1166,17 @@ msgstr "Допомога" msgid "Here are the types of local problem alerts for ‘%s’." msgstr "От типи локальних сповіщень про проблеми для ‘%s’." -#: templates/web/fiksgatami/header.html:48 -#: templates/web/fixmystreet/header.html:52 +#: templates/web/fixmystreet/header.html:58 #: templates/web/zurich/footer.html:11 msgid "Hi %s" msgstr "Вітаємо, %s" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:50 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:63 +#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/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:86 #: templates/web/zurich/admin/report_edit.html:90 #: templates/web/zurich/admin/stats.html:32 @@ -1230,7 +1192,7 @@ msgstr "Приховати застарілі" msgid "Hide pins" msgstr "Приховати привязки" -#: templates/web/base/admin/category_edit.html:79 +#: templates/web/base/admin/category_edit.html:84 msgid "History" msgstr "Історія" @@ -1246,19 +1208,25 @@ msgstr "Як сповістити про проблему" msgid "How to send successful reports" msgstr "Як надіслати якісне сповіщення" -#: perllib/FixMyStreet/App/Controller/Admin.pm:742 +#: perllib/FixMyStreet/App/Controller/Admin.pm:740 msgid "I am afraid you cannot confirm unconfirmed reports." msgstr "Нажаль ви не можете підтвердити непідтверджені сповіщення" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:89 +#: templates/web/base/tokens/confirm_problem.html:23 +#: templates/web/base/tokens/confirm_problem.html:27 +msgid "I just reported a problem on @fixmystreet" +msgstr "" + +#: templates/web/base/tokens/confirm_update.html:19 +#: templates/web/base/tokens/confirm_update.html:23 +msgid "I just updated a problem on @fixmystreet" +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 msgid "I'm afraid we couldn't locate your problem in the database.\n" msgstr "Нажаль ми не можем знайти вашу проблему в базі даних.\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 +#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 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 "Нажаль ми не можем валідувати цей токен. Якщо ви зкопіювали посилання з е-пошти, перевірте чи воно скопійовано вірно.\n" @@ -1282,7 +1250,7 @@ msgstr "" "Визначіть <strong>предка</strong> якщо цей орган є частиною іншого органу.\n" " Для базових налаштувань вам не потрібно поєднувати органи таким чином." -#: templates/web/base/admin/body.html:125 +#: templates/web/base/admin/body.html:133 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." @@ -1302,7 +1270,12 @@ msgstr "Якщо ні, ваша проблема не буде прозвіто msgid "If you do not, your update will not be posted." msgstr "Якщо ні, ваше оновлення не буде опубліковано." -#: templates/web/base/report/new/councils_text_none.html:9 +#: templates/web/base/questionnaire/completed.html:8 +msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." +msgstr "" + +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:8 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 "Якщо ви відправите проблему тут, то тема і подробиці проблеми будуть публічними, але проблема <strong>не буде</strong> відправлена департаментам." @@ -1318,34 +1291,34 @@ msgid "" "your experience of getting the problem fixed?" msgstr "Якщо ви хочете додати якусь публічну інформацію про проблему, введіть її тут (зауважте, що ця інформація не буде надіслана департаментам). Наприклад, розкажіть яки кроками була вирішена проблема." -#: templates/web/base/admin/body.html:141 +#: templates/web/base/admin/body.html:149 msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." msgstr "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." -#: templates/web/base/admin/body-form.html:200 -#: templates/web/base/admin/body-form.html:201 +#: templates/web/base/admin/body-form.html:207 +#: templates/web/base/admin/body-form.html:208 msgid "" "If you've enabled Open311 update-sending above, Open311 usually only accepts OPEN or CLOSED status in \n" " its updates. Enable <strong>extended Open311 stauses</strong> if you want to allow extra states to be passed.\n" " Check that your cobrand supports this feature before switching it on." msgstr "" -#: templates/web/base/admin/body-form.html:187 -#: templates/web/base/admin/body-form.html:188 +#: templates/web/base/admin/body-form.html:194 +#: templates/web/base/admin/body-form.html:195 msgid "" "If you've enabled Open311 update-sending above, enable <strong>suppression of alerts</strong> \n" " if you do <strong>not</strong> want that user to be notified whenever these updates are created." msgstr "" -#: templates/web/base/admin/body-form.html:173 -#: templates/web/base/admin/body-form.html:174 +#: templates/web/base/admin/body-form.html:177 +#: templates/web/base/admin/body-form.html:178 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:127 +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 msgid "Illegal ID" msgstr "Невірний ідентифікатор" @@ -1370,17 +1343,21 @@ 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:143 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:38 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:144 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 #: templates/web/fixmystreet/report/banner.html:19 -#: templates/web/zurich/admin/header.html:2 +#: templates/web/zurich/admin/header.html:1 #: templates/web/zurich/admin/header.html:8 #: templates/web/zurich/admin/report_edit.html:99 #: templates/web/zurich/report/banner.html:15 msgid "In progress" msgstr "В процесі" +#: templates/web/base/tokens/confirm_alert.html:11 +msgid "Inbox zero, here we come!" +msgstr "" + #: templates/web/zurich/admin/report_edit.html:160 msgid "Include reporter personal details" msgstr "Додати особисті дані автора сповіщення" @@ -1389,7 +1366,7 @@ msgstr "Додати особисті дані автора сповіщення msgid "Include unconfirmed reports" msgstr "Включити непідтверджені сповіщення" -#: perllib/FixMyStreet/App/Controller/Open311.pm:354 +#: perllib/FixMyStreet/App/Controller/Open311.pm:359 msgid "Incorrect has_photo value \"%s\"" msgstr "Невірне значення has_photo \"%s\"" @@ -1397,29 +1374,29 @@ msgstr "Невірне значення has_photo \"%s\"" msgid "Internal notes" msgstr "Внутрішні нотатки" -#: templates/web/base/admin/report_edit.html:35 #: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:61 msgid "Internal referral" msgstr "Внутрішнє посилання" -#: perllib/FixMyStreet/App/Controller/Open311.pm:339 +#: perllib/FixMyStreet/App/Controller/Open311.pm:344 msgid "Invalid agency_responsible value %s" msgstr "Невірне значення agency_responsible %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1114 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1112 msgid "Invalid end date" msgstr "Невірна кінцева дата" -#: perllib/FixMyStreet/App/Controller/Open311.pm:432 +#: perllib/FixMyStreet/App/Controller/Open311.pm:437 msgid "Invalid format %s specified." msgstr "Невірний формат %s ." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1110 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 msgid "Invalid start date" msgstr "Невірна початкова дата" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:37 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:50 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 #: templates/web/base/report/update-form.html:30 @@ -1433,8 +1410,12 @@ msgstr "Дослідження" msgid "It's often quickest to <a href=\"%s\">check our FAQs</a> and see if the answer is there." msgstr "" +#: templates/web/base/tokens/confirm_problem.html:14 +msgid "It’s on its way to the council right now." +msgstr "" + #: templates/web/base/auth/general.html:44 -#: templates/web/base/report/new/fill_in_details_form.html:150 +#: templates/web/base/report/new/fill_in_details_form.html:131 #: templates/web/base/report/update-form.html:104 #: templates/web/fixmystreet/auth/general.html:47 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 @@ -1443,12 +1424,12 @@ msgstr "" msgid "Keep me signed in on this computer" msgstr "Запам'ятати мене на цьому комп'ютері" -#: templates/web/base/admin/body.html:62 +#: templates/web/base/admin/body.html:70 #: templates/web/zurich/admin/body.html:16 msgid "Last editor" msgstr "Остання правка" -#: templates/web/base/admin/report_edit.html:72 +#: templates/web/base/admin/report_edit.html:88 msgid "Last update:" msgstr "Останнє поновлення:" @@ -1456,43 +1437,38 @@ msgstr "Останнє поновлення:" msgid "Last update:" msgstr "Останнє поновлення:" -#: templates/web/base/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:229 msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." msgstr "Залишіть це поле порожнім якщо всі сповіщення цьому органу будуть відсилатись одним і тим самим чином (наприклад, \"%s\")." -#: templates/web/base/admin/body.html:17 templates/web/base/admin/body.html:19 +#: templates/web/base/admin/body.html:27 msgid "List all reported problems" msgstr "Показати всі прозвітовані проблеми" -#: templates/web/base/report/new/fill_in_details_form.html:69 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:54 -#: templates/web/zurich/report/new/fill_in_details_form.html:51 +#: templates/web/base/report/new/category_wrapper.html:4 msgid "Loading..." msgstr "Завантаження..." #: templates/web/base/alert/choose.html:1 #: templates/web/base/alert/choose.html:3 #: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3 -#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:5 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5 #: templates/web/base/alert/updates.html:1 #: templates/web/base/tokens/confirm_alert.html:1 -#: templates/web/base/tokens/confirm_alert.html:4 #: templates/web/fixmystreet/alert/updates.html:1 msgid "Local RSS feeds and email alerts" msgstr "Локальний RSS потік та поштові сповіщення" -#: templates/web/base/alert/list.html:13 templates/web/base/alert/list.html:14 -#: templates/web/base/alert/list.html:2 templates/web/base/alert/list.html:3 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:12 +#: templates/web/base/alert/list.html:14 templates/web/base/alert/list.html:3 msgid "Local RSS feeds and email alerts for ‘%s’" msgstr "Локальний RSS потік та поштові сповіщення для ‘%s’" -#: templates/web/base/footer.html:13 templates/web/fiksgatami/footer.html:25 -#: templates/web/fiksgatami/nn/footer.html:25 -#: templates/web/fixmystreet/footer.html:28 +#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:28 msgid "Local alerts" msgstr "Локальні сповіщення" -#: templates/web/base/index-steps.html:31 +#: templates/web/base/index-steps.html:25 msgid "Locate the problem on a map of the area" msgstr "Позначте проблему на карті району" @@ -1501,17 +1477,27 @@ msgid "MAP" msgstr "Мапа" #: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 msgid "Map" msgstr "" -#: perllib/FixMyStreet/Map/OSM.pm:42 -msgid "Map © <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/base/admin/report_edit.html:86 +#, fuzzy +msgid "Mark as sent" +msgstr "позначено закритим" -#: templates/web/base/admin/user-form.html:43 +#: templates/web/base/admin/user-form.html:44 msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." msgstr "Позначте користувачів, чию поведінку ви хочете відстежувати <strong>прапорцем</strong>." +#: templates/web/base/reports/index.html:24 +msgid "Marked fixed/closed in the past eight weeks" +msgstr "" + +#: templates/web/base/reports/index.html:25 +msgid "Marked fixed/closed more than eight weeks ago" +msgstr "" + #: templates/web/fixmystreet/contact/index.html:106 msgid "Message" msgstr "Повідомлення" @@ -1520,7 +1506,7 @@ msgstr "Повідомлення" msgid "Message:" msgstr "Повідомлення:" -#: perllib/FixMyStreet/App/Controller/Open311.pm:440 +#: perllib/FixMyStreet/App/Controller/Open311.pm:445 msgid "Missing jurisdiction_id" msgstr "Бракує jurisdiction_id" @@ -1550,11 +1536,11 @@ msgstr "Ще проблеми поблизу" #: templates/web/fixmystreet/report/update-form.html:138 #: 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:94 +#: templates/web/zurich/report/new/fill_in_details_form.html:77 msgid "Name" msgstr "Ім'я" -#: templates/web/base/admin/report_edit.html:66 +#: templates/web/base/admin/report_edit.html:79 #: templates/web/base/admin/update_edit.html:32 #: templates/web/base/admin/user-form.html:18 #: templates/web/zurich/admin/report_edit-sdm.html:43 @@ -1563,25 +1549,25 @@ msgstr "Ім'я" msgid "Name:" msgstr "Ім'я:" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:321 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:313 msgid "Name: %s" msgstr "Ім'я: %s" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:186 -#: perllib/FixMyStreet/Geocode/OSM.pm:164 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 +#: perllib/FixMyStreet/Geocode/OSM.pm:145 msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" msgstr "Найближча дорога до шпильки на карті (автоматично згенеровано через OpenStreetMap): %s%s" -#: perllib/FixMyStreet/Cobrand/UK.pm:137 +#: perllib/FixMyStreet/Cobrand/UK.pm:127 msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" msgstr "Найближчий поштовий індекс до шпильки на карті (автоматично згенеровано): %s (відстань: %sм)" -#: perllib/FixMyStreet/Cobrand/Default.pm:421 -#: perllib/FixMyStreet/Cobrand/Default.pm:461 +#: perllib/FixMyStreet/Cobrand/Default.pm:442 +#: perllib/FixMyStreet/Cobrand/Default.pm:482 msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" msgstr "Найближча дорога до шпильки на карті (автоматично згенеровано через Bing карти): %s%s" -#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:277 msgid "" "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" "\n" @@ -1597,11 +1583,11 @@ msgstr "Майже закінчили! Тепер перевірте вашу е msgid "New <br>problems" msgstr "Нові <br>проблеми" -#: perllib/FixMyStreet/App/Controller/Admin.pm:264 +#: perllib/FixMyStreet/App/Controller/Admin.pm:261 msgid "New body added" msgstr "Новий орган додано" -#: perllib/FixMyStreet/App/Controller/Admin.pm:385 +#: perllib/FixMyStreet/App/Controller/Admin.pm:379 msgid "New category contact added" msgstr "Новий контакт категорії додано" @@ -1674,15 +1660,15 @@ msgstr "Поновлення:" msgid "Next" msgstr "Далі" -#: templates/web/base/admin/body.html:72 templates/web/base/admin/body.html:74 -#: templates/web/base/admin/body.html:78 templates/web/base/admin/body.html:80 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 #: templates/web/base/admin/category_edit.html:4 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:93 #: templates/web/base/admin/update_edit.html:25 #: templates/web/base/questionnaire/creator_fixed.html:16 #: templates/web/base/questionnaire/index.html:44 @@ -1700,7 +1686,7 @@ msgstr "Без органу" msgid "No council" msgstr "Без департаменту" -#: perllib/FixMyStreet/DB/Result/Problem.pm:376 +#: perllib/FixMyStreet/DB/Result/Problem.pm:401 msgid "No council selected" msgstr "Не вибраний департамент" @@ -1741,12 +1727,12 @@ msgid "" " your config file is not pointing to a live MapIt service." msgstr "" -#: templates/web/base/report/_support.html:3 +#: templates/web/base/report/_support.html:2 #: templates/web/base/report/_support.html:4 msgid "No supporters" msgstr "Ніхто не підтримав" -#: templates/web/base/admin/report_edit.html:30 +#: templates/web/base/admin/report_edit.html:41 #: templates/web/zurich/admin/report_edit-sdm.html:46 #: templates/web/zurich/admin/report_edit.html:60 msgid "None" @@ -1761,8 +1747,8 @@ msgid "" " activity across their body), the ability to hide reports or set special report statuses." msgstr "" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:46 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -1778,12 +1764,12 @@ msgstr "Не мій підрозділ" msgid "Not reported before" msgstr "Не прозвітовано раніше" -#: templates/web/base/report/_main.html:61 +#: templates/web/base/report/_main.html:62 msgid "Not reported to council" msgstr "Не прозвітовано департаменту" -#: templates/web/base/admin/body.html:63 -#: templates/web/base/admin/category_edit.html:87 +#: templates/web/base/admin/body.html:71 +#: templates/web/base/admin/category_edit.html:92 #: templates/web/zurich/admin/body.html:17 msgid "Note" msgstr "Нотатка" @@ -1792,8 +1778,8 @@ msgstr "Нотатка" 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/base/admin/body.html:178 -#: templates/web/base/admin/category_edit.html:44 +#: templates/web/base/admin/body.html:186 +#: templates/web/base/admin/category_edit.html:49 #: templates/web/zurich/admin/body.html:53 msgid "Note:" msgstr "Нотатка:" @@ -1806,7 +1792,7 @@ msgstr "Нотатка: <strong>%s</strong>" msgid "Now to submit your report…" msgstr "Тепер відправити ваше сповіщення …" -#: templates/web/base/report/new/fill_in_details_form.html:132 +#: templates/web/base/report/new/fill_in_details_form.html:113 msgid "Now to submit your report… do you have a FixMyStreet password?" msgstr "Тепер щоб відправити ваше сповіщення… у вас є пароль?" @@ -1823,7 +1809,7 @@ msgid "OK" msgstr "Гаразд" #: templates/web/base/report/display.html:28 -#: templates/web/base/report/update.html:16 +#: templates/web/base/report/update.html:17 msgid "Offensive? Unsuitable? Tell us" msgstr "Образливо? Недопустимо? Розкажіть нам" @@ -1843,19 +1829,19 @@ msgstr "Раніше <br>виправлено" msgid "Older <br>problems" msgstr "Старіші <br>проблеми" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:37 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 msgid "One-line summary" msgstr "" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:137 -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:36 -#: templates/web/base/admin/report_edit.html:37 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:138 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:49 +#: templates/web/base/admin/report_edit.html:50 #: templates/web/base/admin/update_edit.html:28 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/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:1 #: templates/web/zurich/admin/header.html:7 #: templates/web/zurich/admin/report_edit.html:86 #: templates/web/zurich/admin/report_edit.html:88 @@ -1864,10 +1850,19 @@ msgstr "" msgid "Open" msgstr "Відкрити" -#: templates/web/base/my/my.html:30 templates/web/fixmystreet/my/my.html:36 +#: templates/web/base/reports/index.html:22 +msgid "Open for more than four weeks, with an update within the past eight weeks" +msgstr "" + +#: templates/web/base/my/my.html:30 +#: templates/web/fixmystreet/my/_problem-list.html:2 msgid "Open reports" msgstr "Відкрити сповіщення" +#: templates/web/base/reports/index.html:23 +msgid "Open, but not had any update in eight weeks" +msgstr "" + #: templates/web/base/open311/index.html:70 msgid "Open311 API for the mySociety FixMyStreet server" msgstr "" @@ -1890,15 +1885,15 @@ msgstr "Або проблеми прозвітовані до:" msgid "Or you can subscribe to an alert based upon what ward or council you’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:560 -#: perllib/FixMyStreet/DB/Result/Problem.pm:570 -#: perllib/FixMyStreet/DB/Result/Problem.pm:580 -#: perllib/FixMyStreet/DB/Result/Problem.pm:592 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:372 -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 +#: perllib/FixMyStreet/DB/Result/Problem.pm:597 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:393 msgid "Other" msgstr "Інше" @@ -1920,8 +1915,8 @@ msgstr "Сторінку не знайдено" msgid "Parent" msgstr "Предок" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 msgid "Partial" msgstr "Частково" @@ -1941,7 +1936,7 @@ msgstr "Пароль:" msgid "Permalink" msgstr "Постійне посилання" -#: templates/web/zurich/report/new/fill_in_details_form.html:100 +#: templates/web/zurich/report/new/fill_in_details_form.html:83 msgid "Phone number" msgstr "Номер телефону" @@ -1950,27 +1945,27 @@ msgstr "Номер телефону" msgid "Phone number (optional)" msgstr "Номер телефону (опціонально)" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:286 -#: templates/web/base/admin/report_edit.html:68 -#: templates/web/base/report/new/fill_in_details_form.html:216 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:291 +#: templates/web/base/admin/report_edit.html:81 +#: templates/web/base/report/new/fill_in_details_form.html:197 #: templates/web/zurich/admin/report_edit-sdm.html:46 #: templates/web/zurich/admin/report_edit.html:60 #: templates/web/zurich/admin/stats.html:39 msgid "Phone:" msgstr "Телефон:" -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:72 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 #: 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 +#: templates/web/zurich/report/new/fill_in_details_form.html:51 msgid "Photo" msgstr "Фото" #: templates/web/base/questionnaire/index.html:71 -#: templates/web/base/report/new/fill_in_details_form.html:103 +#: templates/web/base/report/new/fill_in_details_form.html:84 #: templates/web/base/report/update-form.html:62 #: templates/web/fixmystreet/questionnaire/index.html:91 msgid "Photo:" @@ -1984,11 +1979,11 @@ msgstr "Фотографії найближчих сповіщень" msgid "Place pin on map" msgstr "Розмістіть шпильку на карті" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:38 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 #: templates/web/base/dashboard/index.html:142 #: templates/web/base/dashboard/index.html:143 -#: templates/web/zurich/admin/header.html:2 +#: 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:86 @@ -2022,20 +2017,19 @@ msgstr "Будь ласка перевірте вашу пошту" msgid "Please check your email address is correct" msgstr "Будь ласка перевірте чи ваша адреса е-пошти вірна" -#: perllib/FixMyStreet/App/Controller/Admin.pm:349 -#: 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:395 +#: perllib/FixMyStreet/App/Controller/Admin.pm:343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:876 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 +#: perllib/FixMyStreet/DB/Result/Problem.pm:412 #: templates/web/base/js/translation_strings.html:9 msgid "Please choose a category" msgstr "Будь ласка оберіть категорію" -#: perllib/FixMyStreet/DB/Result/Problem.pm:401 +#: perllib/FixMyStreet/DB/Result/Problem.pm:418 msgid "Please choose a property type" msgstr "Будь ласка оберіть тип майна" -#: perllib/FixMyStreet/App/Controller/Admin.pm:376 +#: perllib/FixMyStreet/App/Controller/Admin.pm:370 msgid "Please correct the errors below" msgstr "" @@ -2051,8 +2045,8 @@ msgstr "" msgid "Please do not be abusive — abusing your council devalues the service for all users." msgstr "Будь ласка не використовуйте образи — ображаючи департамент ві підриваєте цінність сервісу для всіх користувачів" -#: perllib/FixMyStreet/App/Controller/Admin.pm:352 -#: perllib/FixMyStreet/DB/Result/Comment.pm:133 +#: perllib/FixMyStreet/App/Controller/Admin.pm:346 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 #: templates/web/base/js/translation_strings.html:2 msgid "Please enter a message" msgstr "Будь ласка введіть повідомлення" @@ -2063,15 +2057,15 @@ msgstr "Будь ласка введіть повідомлення" msgid "Please enter a password" msgstr "Будь ласка введіть пароль" -#: perllib/FixMyStreet/App/Controller/Contact.pm:108 -#: perllib/FixMyStreet/DB/Result/Problem.pm:370 +#: perllib/FixMyStreet/App/Controller/Contact.pm:113 +#: perllib/FixMyStreet/DB/Result/Problem.pm:395 #: templates/web/base/js/translation_strings.html:3 msgid "Please enter a subject" msgstr "Будь ласка вкажіть тему" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1050 -#: perllib/FixMyStreet/App/Controller/Admin.pm:351 -#: perllib/FixMyStreet/App/Controller/Admin.pm:997 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin.pm:995 #: perllib/FixMyStreet/DB/Result/User.pm:127 #: templates/web/base/js/translation_strings.html:12 #: templates/web/base/js/translation_strings.html:16 @@ -2079,16 +2073,16 @@ msgid "Please enter a valid email" msgstr "Будь ласка введіть правильну адресу е-пошти" #: perllib/FixMyStreet/App/Controller/Alert.pm:346 -#: perllib/FixMyStreet/App/Controller/Contact.pm:118 +#: perllib/FixMyStreet/App/Controller/Contact.pm:123 msgid "Please enter a valid email address" msgstr "Будь ласка введіть правильну адресу е-пошти" -#: perllib/FixMyStreet/DB/Result/Problem.pm:373 +#: perllib/FixMyStreet/DB/Result/Problem.pm:398 #: templates/web/base/js/translation_strings.html:4 msgid "Please enter some details" msgstr "Будь ласка додайте трохи подробиць" -#: perllib/FixMyStreet/App/Controller/Contact.pm:107 +#: perllib/FixMyStreet/App/Controller/Contact.pm:112 #: perllib/FixMyStreet/DB/Result/User.pm:124 #: templates/web/base/auth/general.html:13 #: templates/web/base/auth/general.html:8 @@ -2102,7 +2096,7 @@ msgid "Please enter your email" msgstr "Будь ласка вкажіть е-пошту" #: templates/web/fixmystreet/report/new/form_user_loggedout.html:7 -#: templates/web/zurich/report/new/fill_in_details_form.html:92 +#: templates/web/zurich/report/new/fill_in_details_form.html:75 msgid "Please enter your email address" msgstr "Будь ласка вкажіть адресу е-пошти" @@ -2110,14 +2104,14 @@ msgstr "Будь ласка вкажіть адресу е-пошти" msgid "Please enter your first name" msgstr "Будь ласка введіть ім'я" -#: perllib/FixMyStreet/DB/Result/Problem.pm:388 +#: perllib/FixMyStreet/Cobrand/UK.pm:318 #: templates/web/base/js/translation_strings.html:7 msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" msgstr "Будь ласка введіть ім'я та прізвище - департаментам потрібні ці дані. Якщо не хочете їх показувати - не ставте галочку внизу." -#: perllib/FixMyStreet/App/Controller/Contact.pm:106 -#: perllib/FixMyStreet/DB/Result/Comment.pm:130 -#: perllib/FixMyStreet/DB/Result/Problem.pm:381 +#: perllib/FixMyStreet/App/Controller/Contact.pm:111 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 +#: perllib/FixMyStreet/DB/Result/Problem.pm:406 #: perllib/FixMyStreet/DB/Result/User.pm:120 #: templates/web/base/js/translation_strings.html:6 msgid "Please enter your name" @@ -2140,7 +2134,7 @@ msgstr "Будь ласка вкажіть заголовок" msgid "Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a href=\"/\">front page</a>." msgstr "Ви можете <a href=\"%s\">увійти знов</a>, або повернутись до <a href=\"/\">головної сторінки</a>." -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:8 msgid "Please fill in details of the problem below." msgstr "Будь ласка додайте подробиці про проблему нижче." @@ -2155,7 +2149,7 @@ msgstr "Будь ласка опишіть проблему детально" msgid "Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box." msgstr "Будь ласка заповніть форму нижче подробицями проблеми, і опишіть місцезнаходження якомога точніше в полі подробиць." -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:251 msgid "Please indicate whether you'd like to receive another questionnaire" msgstr "Будь ласка вкажіть чи ви хочете отримати інші опитування." @@ -2178,16 +2172,16 @@ msgstr "Будь ласка заауважте, що сповіщення <stron msgid "Please note:" msgstr "Будь ласка зауважте:" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:246 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:254 msgid "Please provide some explanation as to why you're reopening this report" msgstr "Будь ласка додайте трохи пояснень стосовно перевідкриття сповіщення" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:253 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:261 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 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:247 msgid "Please say whether you've ever reported a problem to your council before" msgstr "Будь ласка розкажіть чи ви відправляли сповіщення департаменту раніше" @@ -2199,7 +2193,7 @@ msgstr "Оберіть бажаний потік інформації" msgid "Please select the type of alert you want" msgstr "Будь ласка оберіть тип бажаних алярмів" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:235 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:243 msgid "Please state whether or not the problem has been fixed" msgstr "Будь ласка вкажіть чи була вирішена проблема" @@ -2207,15 +2201,13 @@ msgstr "Будь ласка вкажіть чи була вирішена про msgid "Please take a look at the updates that have been left." msgstr "Будь ласка перегляньте поновлення які залишились" -#: perllib/FixMyStreet/App/Controller/Photo.pm:176 +#: perllib/FixMyStreet/App/Controller/Photo.pm:177 +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 +#: perllib/FixMyStreet/App/Controller/Photo.pm:189 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 "Будь ласка завантажуйте тільки JPEG зображення\n" - -#: perllib/FixMyStreet/App/Controller/Contact.pm:109 +#: perllib/FixMyStreet/App/Controller/Contact.pm:114 msgid "Please write a message" msgstr "Будь ласка напишіть повідомлення" @@ -2254,14 +2246,14 @@ msgstr "Попередній" msgid "Privacy" msgstr "" -#: templates/web/base/admin/body.html:194 -#: templates/web/base/admin/body.html:77 -#: templates/web/base/admin/category_edit.html:40 -#: templates/web/base/admin/report_edit.html:79 +#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:85 +#: templates/web/base/admin/category_edit.html:45 +#: templates/web/base/admin/report_edit.html:95 msgid "Private" msgstr "Приватний" -#: templates/web/base/maps/openlayers.html:86 +#: templates/web/base/maps/openlayers.html:89 msgid "Problem" msgstr "Проблема" @@ -2282,7 +2274,7 @@ msgstr "Проблему %s надіслано департаменту %s" msgid "Problem breakdown by state" msgstr "Розбивка проблем по стану" -#: perllib/FixMyStreet/App/Controller/Admin.pm:968 +#: perllib/FixMyStreet/App/Controller/Admin.pm:966 msgid "Problem marked as open." msgstr "Проблема маркована відкритою." @@ -2317,16 +2309,15 @@ msgstr "Нещодавно вирішені проблеми" msgid "Problems within %.1fkm of this location" msgstr "Проблеми в радіусі %.1fkm від цієї точки" -#: perllib/FixMyStreet/Cobrand/Default.pm:629 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:114 +#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:151 -#: perllib/FixMyStreet/Cobrand/UK.pm:217 +#: perllib/FixMyStreet/Cobrand/UK.pm:207 msgid "Problems within %s" msgstr "Проблеми в межах %s" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:122 -#: perllib/FixMyStreet/Cobrand/UK.pm:231 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 msgid "Problems within %s ward" msgstr "Проблеми в межах %s району" @@ -2344,7 +2335,7 @@ msgstr "Проблеми в межах:" msgid "Properties recently reported as put back to use on reportemptyhomes.com" msgstr "" -#: templates/web/base/admin/report_edit.html:32 +#: templates/web/base/admin/report_edit.html:45 msgid "Property address:" msgstr "Адреса майна:" @@ -2361,7 +2352,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/base/report/new/fill_in_details_form.html:174 +#: templates/web/base/report/new/fill_in_details_form.html:155 #: templates/web/base/report/update-form.html:128 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 #: templates/web/fixmystreet/report/update-form.html:119 @@ -2382,7 +2373,7 @@ msgstr "Публічне фото" msgid "Publish the response" msgstr "Опублікувати відповідь" -#: templates/web/base/questionnaire/completed.html:2 +#: templates/web/base/questionnaire/completed.html:1 #: templates/web/base/questionnaire/index.html:0 #: templates/web/base/questionnaire/index.html:14 #: templates/web/base/questionnaire/index.html:4 @@ -2401,11 +2392,12 @@ msgstr "Опитування %d проведено стосовно пробле msgid "Questionnaire %d sent for problem %d" msgstr "Анкета %d відправлена по проблемі %d" -#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:192 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 msgid "Questionnaire filled in by problem reporter" msgstr "Анкета заповнена автором сповіщення" #: templates/web/base/alert/_list.html:21 +#: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:3 #: templates/web/base/report/display.html:50 #: templates/web/base/reports/_rss.html:1 @@ -2415,11 +2407,11 @@ msgstr "Анкета заповнена автором сповіщення" msgid "RSS feed" msgstr "RSS потік" -#: perllib/FixMyStreet/Cobrand/UK.pm:260 perllib/FixMyStreet/Cobrand/UK.pm:272 +#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 msgid "RSS feed for %s" msgstr "RSS потік для %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:266 perllib/FixMyStreet/Cobrand/UK.pm:278 +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 msgid "RSS feed for %s ward, %s" msgstr "RSS потік для %s району, %s" @@ -2427,15 +2419,11 @@ msgstr "RSS потік для %s району, %s" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:167 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:175 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:185 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:193 -#: perllib/FixMyStreet/Cobrand/UK.pm:286 perllib/FixMyStreet/Cobrand/UK.pm:298 +#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 msgid "RSS feed of %s" msgstr "RSS потік з %s" -#: perllib/FixMyStreet/Cobrand/UK.pm:291 perllib/FixMyStreet/Cobrand/UK.pm:303 +#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 msgid "RSS feed of %s, within %s ward" msgstr "" @@ -2448,20 +2436,19 @@ msgstr "" msgid "RSS feed of problems in this %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/Default.pm:630 -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:115 +#: perllib/FixMyStreet/Cobrand/Default.pm:651 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 -#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:150 -#: perllib/FixMyStreet/Cobrand/UK.pm:224 +#: perllib/FixMyStreet/Cobrand/UK.pm:214 msgid "RSS feed of problems within %s" msgstr "" -#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 -#: perllib/FixMyStreet/Cobrand/UK.pm:230 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:220 msgid "RSS feed of problems within %s ward" msgstr "" -#: templates/web/base/around/display_location.html:3 +#: templates/web/base/around/display_location.html:1 #: templates/web/base/around/display_location.html:4 msgid "RSS feed of recent local problems" msgstr "RSS стрічка недавніх локальних проблем" @@ -2501,15 +2488,18 @@ msgstr "" msgid "Remove flag" msgstr "Зняти прапорець" -#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/report_edit.html:110 #: templates/web/base/admin/update_edit.html:62 #: templates/web/zurich/admin/update_edit.html:35 msgid "Remove photo (can't be undone!)" msgstr "Видалити фото (це незворотня операція!)" -#: templates/web/base/footer.html:7 templates/web/fiksgatami/footer.html:19 -#: templates/web/fiksgatami/nn/footer.html:19 -#: templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 +msgid "Report" +msgstr "" + +#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 #: templates/web/zurich/footer.html:17 #: templates/web/zurich/nav_over_content.html:4 msgid "Report a problem" @@ -2519,11 +2509,6 @@ msgstr "Сповістити про проблему" msgid "Report abuse" msgstr "Поскаржитись" -#: templates/web/base/report_created.html:1 -#: templates/web/base/report_created.html:3 -msgid "Report created" -msgstr "Сповіщення створено" - #: perllib/FixMyStreet/App/Controller/Rss.pm:295 msgid "Report on %s" msgstr "Звіт по %s" @@ -2547,7 +2532,7 @@ msgstr "Сповіщено %s" msgid "Reported %s, to %s" msgstr "Сповіщено %s, до %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:580 #: templates/web/base/contact/index.html:50 #: templates/web/fixmystreet/contact/index.html:65 msgid "Reported anonymously at %s" @@ -2559,7 +2544,7 @@ msgstr "Сповіщено анонімно по %s" msgid "Reported before" msgstr "Сповіщено раніше" -#: perllib/FixMyStreet/DB/Result/Problem.pm:598 +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 #: templates/web/base/contact/index.html:52 #: templates/web/fixmystreet/contact/index.html:67 msgid "Reported by %s at %s" @@ -2569,31 +2554,36 @@ msgstr "Перевідкрито %s о %s" msgid "Reported in the %s category" msgstr "Сповіщено в категорії %s " -#: perllib/FixMyStreet/DB/Result/Problem.pm:571 +#: perllib/FixMyStreet/DB/Result/Problem.pm:576 msgid "Reported in the %s category anonymously at %s" msgstr "Сповіщено в категорії %s анонімно о %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:593 +#: perllib/FixMyStreet/DB/Result/Problem.pm:598 msgid "Reported in the %s category by %s at %s" msgstr "Сповіщено в категорію %s %s о %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:567 +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 msgid "Reported via %s anonymously at %s" msgstr "Сповіщено %s анонімно о %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:589 +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 msgid "Reported via %s by %s at %s" msgstr "Сповіщено через %s %s о %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:563 +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 msgid "Reported via %s in the %s category anonymously at %s" msgstr "Сповіщено через %s в категорію %s анонімно о %s" -#: perllib/FixMyStreet/DB/Result/Problem.pm:583 +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 msgid "Reported via %s in the %s category by %s at %s" msgstr "Сповіщено через %s в категорію %s %s о %s" -#: templates/web/base/around/around_index.html:2 +#: templates/web/base/reports/index.html:21 +#, fuzzy +msgid "Reported within the last four weeks" +msgstr "Сповіщено в категорії %s " + +#: templates/web/base/around/around_index.html:1 #: templates/web/base/around/around_index.html:3 #: templates/web/base/js/translation_strings.html:41 #: templates/web/base/report/new/fill_in_details.html:0 @@ -2603,14 +2593,13 @@ msgstr "Сповіщено через %s в категорію %s %s о %s" msgid "Reporting a problem" msgstr "Сповістити про проблему" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:290 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:294 #: templates/web/zurich/header.html:60 msgid "Reports" msgstr "Сповіщення" -#: perllib/FixMyStreet/DB/Result/Problem.pm:409 -#: perllib/FixMyStreet/DB/Result/Problem.pm:413 +#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 msgid "Reports are limited to %s characters in length. Please shorten your report" msgstr "Сповіщення обмежені %s символами. Буль ласка скоротіть сповіщення." @@ -2626,7 +2615,7 @@ msgstr "Сповіщення на мапі" msgid "Reports published" msgstr "Сповіщення опубліковано" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:85 msgid "Resend report" msgstr "Перевідіслати сповіщення" @@ -2634,36 +2623,35 @@ msgstr "Перевідіслати сповіщення" msgid "Right place?" msgstr "Те місце?" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:193 -#: perllib/FixMyStreet/Geocode/OSM.pm:171 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:167 +#: perllib/FixMyStreet/Geocode/OSM.pm:152 msgid "Road operator for this named road (derived from road reference number and type): %s" msgstr "Обслуговувач цієї дороги (отримано з дорожнього сервісу): %s" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:190 -#: perllib/FixMyStreet/Geocode/OSM.pm:168 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:164 +#: perllib/FixMyStreet/Geocode/OSM.pm:149 msgid "Road operator for this named road (from OpenStreetMap): %s" msgstr "Обслуговувач цієї дороги (з OpenStreetMap): %s" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1394 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1405 -#: templates/web/base/admin/report_edit.html:90 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1403 +#: templates/web/base/admin/report_edit.html:106 #: templates/web/zurich/admin/report_edit.html:73 msgid "Rotate Left" msgstr "Повернули вліво" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1394 -#: templates/web/base/admin/report_edit.html:91 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: templates/web/base/admin/report_edit.html:107 #: templates/web/zurich/admin/report_edit.html:74 msgid "Rotate Right" msgstr "Повернути вправо" #: templates/web/base/js/translation_strings.html:46 -#: templates/web/base/maps/google-ol.html:13 msgid "Satellite" msgstr "" -#: templates/web/base/admin/body.html:200 -#: templates/web/base/admin/category_edit.html:76 +#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/category_edit.html:81 #: templates/web/zurich/admin/body.html:59 msgid "Save changes" msgstr "Зберети зміни" @@ -2691,7 +2679,7 @@ msgstr "Пошук:" msgid "Searching found no reports." msgstr "Пошук не знайшов сповіщень." -#: templates/web/base/admin/users.html:39 +#: templates/web/base/admin/users.html:41 msgid "Searching found no users." msgstr "Пошук не знайшов користувачів." @@ -2714,15 +2702,15 @@ 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 "Оберіть вподобаний тип алярму і натисніть кнопку для RSS фіду, або введіть поштову адресу щоб підписатись на алярми поштою." -#: perllib/FixMyStreet/DB/Result/Problem.pm:680 +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 msgid "Sent to %s %s later" msgstr "Відправити %s %s пізніше" -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:84 msgid "Sent:" msgstr "Надіслано:" -#: templates/web/base/admin/report_edit.html:73 +#: templates/web/base/admin/report_edit.html:89 #: templates/web/zurich/admin/stats.html:45 msgid "Service:" msgstr "Сервіс:" @@ -2731,7 +2719,7 @@ msgstr "Сервіс:" msgid "Share" msgstr "Поширити" -#: templates/web/base/report/new/fill_in_details_form.html:211 +#: templates/web/base/report/new/fill_in_details_form.html:192 #: templates/web/base/report/update-form.html:157 #: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 @@ -2776,12 +2764,12 @@ msgstr "Вийти" msgid "Signed in as %s" msgstr "Увійшли як %s" -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 msgid "Some categories may require additional information." msgstr "Деякі категорії потребуватимуть додаткової інформації" -#: templates/web/base/admin/body-form.html:145 -#: templates/web/base/admin/body-form.html:146 +#: templates/web/base/admin/body-form.html:149 +#: templates/web/base/admin/body-form.html:150 msgid "" "Some endpoints require an <strong>API key</strong> to indicate that the reports are being\n" " sent from your FixMyStreet installation." @@ -2792,11 +2780,11 @@ msgid "Some photos of recent reports" msgstr "Деякі фото нещодавніх проблем" #: perllib/FixMyStreet/App/View/Email.pm:32 -#: perllib/FixMyStreet/App/View/Web.pm:44 +#: perllib/FixMyStreet/App/View/Web.pm:43 msgid "Some text to localize" msgstr "Певний текст для локалізації" -#: perllib/FixMyStreet/Cobrand/UK.pm:88 +#: perllib/FixMyStreet/Cobrand/UK.pm:78 msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." msgstr "" @@ -2804,17 +2792,16 @@ msgstr "" msgid "Sorry, there has been an error confirming your problem." msgstr "Вибачте, сталася помилка" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:215 -#: perllib/FixMyStreet/Geocode.pm:26 perllib/FixMyStreet/Geocode/Bing.pm:56 -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:73 -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:93 -#: perllib/FixMyStreet/Geocode/Google.pm:72 -#: perllib/FixMyStreet/Geocode/OSM.pm:64 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:214 +#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 +#: perllib/FixMyStreet/Geocode/Google.pm:47 +#: perllib/FixMyStreet/Geocode/OSM.pm:48 msgid "Sorry, we could not find that location." msgstr "Вибачте, ми не знайшли це місце" -#: perllib/FixMyStreet/Geocode/Bing.pm:51 -#: perllib/FixMyStreet/Geocode/Google.pm:67 +#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: perllib/FixMyStreet/Geocode/Google.pm:44 #: perllib/FixMyStreet/Geocode/Zurich.pm:87 msgid "Sorry, we could not parse that location. Please try again." msgstr "Вибачте, ми не можем розпізнати це місце. Спробуйте пізніше." @@ -2823,7 +2810,7 @@ msgstr "Вибачте, ми не можем розпізнати це місц msgid "Start Date:" msgstr "Початкова дата:" -#: templates/web/base/admin/body.html:61 +#: templates/web/base/admin/body.html:69 #: templates/web/base/admin/flagged.html:18 #: templates/web/base/admin/list_updates.html:11 #: templates/web/base/admin/reports.html:15 @@ -2831,7 +2818,7 @@ msgstr "Початкова дата:" msgid "State" msgstr "Стан" -#: templates/web/base/admin/report_edit.html:34 +#: templates/web/base/admin/report_edit.html:47 #: templates/web/base/admin/update_edit.html:27 #: templates/web/base/report/update-form.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:53 @@ -2840,8 +2827,8 @@ msgstr "Стан" msgid "State:" msgstr "Стан:" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1200 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:304 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:308 #: templates/web/base/admin/stats.html:1 #: templates/web/zurich/admin/stats.html:1 templates/web/zurich/header.html:72 msgid "Stats" @@ -2857,7 +2844,7 @@ msgstr "Статус" msgid "Still open, via questionnaire, %s" msgstr "Все ще відкрито, через анкету, %s" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:381 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 msgid "Subcategory: %s" msgstr "Підкатегорія: %s" @@ -2877,19 +2864,19 @@ msgid "Subject:" msgstr "Тема:" #: templates/web/base/questionnaire/creator_fixed.html:19 -#: templates/web/base/report/new/fill_in_details_form.html:115 -#: templates/web/base/report/new/fill_in_details_form.html:155 -#: templates/web/base/report/new/fill_in_details_form.html:177 +#: templates/web/base/report/new/fill_in_details_form.html:136 +#: templates/web/base/report/new/fill_in_details_form.html:158 +#: templates/web/base/report/new/fill_in_details_form.html:96 #: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 -#: templates/web/zurich/report/new/fill_in_details_form.html:108 +#: templates/web/zurich/report/new/fill_in_details_form.html:91 msgid "Submit" msgstr "Підтвердити" -#: templates/web/base/admin/report_edit.html:97 +#: templates/web/base/admin/report_edit.html:113 #: templates/web/base/admin/update_edit.html:65 -#: templates/web/base/admin/user-form.html:55 +#: templates/web/base/admin/user-form.html:56 #: templates/web/zurich/admin/report_edit-sdm.html:64 #: templates/web/zurich/admin/report_edit.html:221 #: templates/web/zurich/admin/update_edit.html:38 @@ -2901,8 +2888,8 @@ msgstr "Підтвердити зміни" msgid "Submit questionnaire" msgstr "Підтвердити анкету" -#: perllib/FixMyStreet/Cobrand/Zurich.pm:133 -#: templates/web/zurich/admin/header.html:2 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:134 +#: 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 @@ -2926,8 +2913,8 @@ msgstr "Підписатись" msgid "Subscribe me to an email alert" msgstr "Підпишіть мене на поштові алярми" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:289 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1191 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:293 #: templates/web/base/admin/bodies.html:25 #: templates/web/base/admin/index.html:1 #: templates/web/zurich/admin/index-dm.html:1 @@ -2943,7 +2930,7 @@ msgstr "Резюме" msgid "Summary reports" msgstr "Сумарні сповіщення" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1195 msgid "Survey" msgstr "Опитування" @@ -2957,7 +2944,7 @@ msgstr "Результати опитування" msgid "Text" msgstr "Текст" -#: templates/web/base/admin/body.html:21 +#: templates/web/base/admin/body.html:28 msgid "Text only version" msgstr "Лише текстова версія" @@ -2966,49 +2953,55 @@ msgstr "Лише текстова версія" msgid "Text:" msgstr "Текст:" -#: templates/web/base/tokens/confirm_update.html:9 -msgid "Thank you — you can <a href=\"%s\">view your updated problem</a> on the site." -msgstr "Дякуємо, — ви можете <a href=\"%s\">переглянути або доповнити проблему</a> на сайті." - -#: templates/web/base/tokens/confirm_problem.html:18 -msgid "Thank you for reporting this issue" +#: templates/web/base/tokens/confirm_problem.html:12 +msgid "Thank you for reporting this issue!" msgstr "" #: templates/web/base/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 "Дякуємо за спробу підтвердити доповнення проблеми. У нас тут помилка, тому <a href=\"%s\">будь ласка розкажіть що сталось</a> і ми до того подивимось." +#: templates/web/base/tokens/confirm_update.html:15 +msgid "Thank you for updating this issue!" +msgstr "" + +#: templates/web/base/contact/submit.html:6 +#: templates/web/base/questionnaire/completed.html:5 +msgid "Thank you for your feedback" +msgstr "" + #: templates/web/fixmystreet/around/around_index.html:28 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 :" msgstr "Дякуємо за надіслане фото. Тепер нам потрібно визначити місце проблеми, тому будь ласка введіть назву вулиці поблизу чи поштовий код в полі вище :" -#: templates/web/base/contact/submit.html:8 -msgid "Thanks for your feedback. We'll get back to you as soon as we can!" -msgstr "Дякуємо за відгук. Ми зв'яжемось з вами найближчим часом!" - #: templates/web/base/questionnaire/creator_fixed.html:9 msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" msgstr "Дякуєм, раді чути, що проблему вирішено! Можемо ми поцікавитись чи сповіщали ви органи про будь-яку проблему раніше?" -#: perllib/FixMyStreet/App/Controller/Photo.pm:190 +#: perllib/FixMyStreet/App/Controller/Photo.pm:195 msgid "That image doesn't appear to have uploaded correctly (%s), please try again." msgstr "Під час завантаження фото трапилась помилка(%s), будь ласка повторіть" -#: perllib/FixMyStreet/App/Controller/Council.pm:100 +#: perllib/FixMyStreet/App/Controller/Council.pm:97 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 +#: perllib/FixMyStreet/App/Controller/Location.pm:126 msgid "That location does not appear to be in the UK; please try again." msgstr "" #: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 #: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 -#: perllib/FixMyStreet/Cobrand/UK.pm:81 +#: perllib/FixMyStreet/Cobrand/UK.pm:71 msgid "That postcode was not recognised, sorry." msgstr "Поштовий код не розпізнано, вибачте." -#: perllib/FixMyStreet/App/Controller/Admin.pm:713 +#: perllib/FixMyStreet/App/Controller/Admin.pm:712 +#, fuzzy +msgid "That problem has been marked as sent." +msgstr "Цю проблему зараз перезвітують." + +#: perllib/FixMyStreet/App/Controller/Admin.pm:704 msgid "That problem will now be resent." msgstr "Цю проблему зараз перезвітують." @@ -3020,7 +3013,7 @@ msgstr "Цей сповіщення неможливо показати на %s. msgid "That report has been removed from FixMyStreet." msgstr "Це сповіщення було видалено." -#: templates/web/base/admin/body.html:136 +#: templates/web/base/admin/body.html:144 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." @@ -3028,8 +3021,8 @@ msgstr "" "<strong>На цю адресу е-пошти</strong> будуть надіслані сповіщення по даній категорії. \n" " Інші категорії по цьому органу можуть мати аналогічну адресу." -#: templates/web/base/admin/body-form.html:119 -#: templates/web/base/admin/body-form.html:120 +#: templates/web/base/admin/body-form.html:123 +#: templates/web/base/admin/body-form.html:124 msgid "" "The <strong>endpoint</strong> is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." @@ -3037,15 +3030,15 @@ msgstr "" "The <strong>endpoint</strong> is the URL of the service that FixMyStreet will connect to \n" " when sending reports to this body." -#: templates/web/base/admin/body-form.html:132 -#: templates/web/base/admin/body-form.html:133 +#: templates/web/base/admin/body-form.html:136 +#: templates/web/base/admin/body-form.html:137 msgid "" "The <strong>jurisdiction</strong> is only needed if the endpoint is serving more\n" " than one. If the body is running its own endpoint, you can usually leave this blank." msgstr "" -#: templates/web/base/admin/body-form.html:90 -#: templates/web/base/admin/body-form.html:91 +#: templates/web/base/admin/body-form.html:94 +#: templates/web/base/admin/body-form.html:95 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>." @@ -3066,7 +3059,7 @@ msgstr "" msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." msgstr "Лист з підтвердженням <strong>може</strong> надійти через кілька хвилин — <em>будь ласка</em> будьте терплячими." -#: templates/web/base/report/new/fill_in_details_text.html:2 +#: templates/web/base/report/new/fill_in_details_text.html:1 #: templates/web/base/report/new/fill_in_details_text.html:3 msgid "The council won’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 "Департамент не зможе допомгти доки інформація не буде достатьою, тому будь ласка опишіть точне місцезнаходження проблеми (наприклад на стіні), що це за проблема, як довго вона існує, опис (і фото проблеми, якщо є), і т.д." @@ -3093,8 +3086,8 @@ msgstr "Трапилась помилка: %s" msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." msgstr "" -#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:185 -#: perllib/FixMyStreet/Geocode/OSM.pm:163 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:159 +#: perllib/FixMyStreet/Geocode/OSM.pm:144 msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap." msgstr "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." @@ -3152,7 +3145,7 @@ msgstr "" msgid "The passwords do not match" msgstr "Паролі не співпадають" -#: templates/web/base/errors/page_error_404_not_found.html:11 +#: templates/web/base/errors/page_error_404_not_found.html:10 #: templates/web/base/errors/page_error_404_not_found.html:12 msgid "The requested URL '%s' was not found on this server" msgstr "Адреса '%s' не знайдена на сервері" @@ -3169,7 +3162,7 @@ msgstr "Найпростіший алярм - географічний:" msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:295 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:300 msgid "The user could not locate the problem on a map, but to see the area around the location they entered" msgstr "Користувач не зміг позначити проблему на карті, тільки введену зону" @@ -3182,16 +3175,20 @@ msgstr "" "Користувацьке <strong>ім'я</strong> відображаються публічно на сповіщеннях, які не відмічені <em>анонімними</em>.\n" " Імена не обов'язково мають бути унікальними." +#: templates/web/base/reports/_problem-list.html:15 +msgid "There are no reports to show." +msgstr "" + #: perllib/FixMyStreet/App/Controller/Reports.pm:75 msgid "There was a problem showing the All Reports page. Please try again later." msgstr "Сталась проблема з відображенням сторінки всіх сповіщень. Спробуйте пізніше." -#: perllib/FixMyStreet/App/Controller/Contact.pm:131 +#: perllib/FixMyStreet/App/Controller/Contact.pm:136 #: 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/New.pm:762 #: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 #: templates/web/base/auth/general.html:23 #: templates/web/fixmystreet/auth/general.html:25 @@ -3207,7 +3204,7 @@ msgstr "Сталась проблема з вашою комбінацією а msgid "There was a problem with your update. Please try again." msgstr "Сталась проблема з поновленням. Будь ласка спробуйте ще раз." -#: perllib/FixMyStreet/App/Controller/Contact.pm:135 +#: perllib/FixMyStreet/App/Controller/Contact.pm:140 msgid "There were problems with your report. Please see below." msgstr "Зі сповіщенням є негаразди. Гляньте нижче." @@ -3215,8 +3212,8 @@ msgstr "Зі сповіщенням є негаразди. Гляньте ниж msgid "There were problems with your update. Please see below." msgstr "З поновленням щось негаразд. Гляньте нижче." -#: templates/web/base/admin/body-form.html:108 -#: templates/web/base/admin/body-form.html:109 +#: templates/web/base/admin/body-form.html:112 +#: templates/web/base/admin/body-form.html:113 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" @@ -3229,14 +3226,14 @@ msgstr "" msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." msgstr "" -#: templates/web/base/admin/body.html:36 +#: templates/web/base/admin/body.html:44 msgid "" "This body covers no area. This means that it has no jurisdiction over problems reported <em>at any location</em>.\n" " Consequently, none of its categories will appear in the drop-down category menu when users report problems.\n" " Currently, users <strong>cannot report problems to this body</strong>." msgstr "" -#: templates/web/base/admin/body.html:46 +#: templates/web/base/admin/body.html:54 msgid "This body has no contacts. This means that currently problems reported to this body <strong>will not be sent</strong>." msgstr "" @@ -3247,18 +3244,18 @@ msgid "" " A body will not receive any reports unless it covers at least one area." msgstr "" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:388 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:394 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:391 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 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:136 -#: perllib/FixMyStreet/Cobrand/UK.pm:53 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:902 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:972 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/Cobrand/UK.pm:43 msgid "This information is required" msgstr "Ця інформація обов'язкова" @@ -3297,8 +3294,8 @@ msgstr "Ця проблема в процесі" msgid "This problem is old and of unknown status." msgstr "Ця проблема застаріла і її статус невідомий." -#: perllib/FixMyStreet/Cobrand/Zurich.pm:130 #: perllib/FixMyStreet/Cobrand/Zurich.pm:131 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:132 #: templates/web/zurich/report/_main.html:14 msgid "This report is awaiting moderation." msgstr "Це сповіщення очікує модерації." @@ -3315,15 +3312,15 @@ msgstr "Це сповіщення наразі відмічено вирішен msgid "This report is currently marked as open." msgstr "Це сповіщення відмічено відкритим." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:319 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:311 msgid "This report was submitted anonymously" msgstr "Це сповіщення надіслано анонімно" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:288 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:293 msgid "This web page also contains a photo of the problem, provided by the user." msgstr "Ця веб-сторінка також містить фото проблеми, які надав користувач." -#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 #: templates/web/base/admin/timeline.html:1 msgid "Timeline" msgstr "Хронологія" @@ -3341,7 +3338,7 @@ msgstr "Щоб <strong>сповістити про проблему</strong>, н 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:294 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:299 msgid "To view a map of the precise location of this issue" msgstr "До перегляду точного місцезнаходження проблеми на карті" @@ -3357,8 +3354,12 @@ msgstr "Загалом" msgid "Try again" msgstr "Спробуйте ще раз" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:46 +#: templates/web/base/contact/submit.html:14 +msgid "Try emailing us directly:" +msgstr "" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 #: templates/web/base/report/update-form.html:30 #: templates/web/base/report/update-form.html:33 #: templates/web/fixmystreet/report/update-form.html:28 @@ -3366,8 +3367,8 @@ msgstr "Спробуйте ще раз" msgid "Unable to fix" msgstr "Неможливо виправити" -#: templates/web/base/admin/report_edit.html:35 -#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 #: templates/web/base/admin/update_edit.html:28 #: templates/web/zurich/admin/report_edit-sdm.html:45 #: templates/web/zurich/admin/report_edit.html:58 @@ -3409,7 +3410,7 @@ msgstr "Поновлення додано анонімно о %s" msgid "Update below added by %s at %s" msgstr "Поновлення нижче додано %s о %s" -#: templates/web/base/admin/body-form.html:233 +#: templates/web/base/admin/body-form.html:240 #: templates/web/zurich/admin/body-form.html:51 msgid "Update body" msgstr "Поновити орган" @@ -3435,7 +3436,7 @@ msgstr "Поновлення відмітило проблему як виріш msgid "Update reopened problem" msgstr "Поновлення перевідкрило проблему" -#: templates/web/base/admin/body.html:93 +#: templates/web/base/admin/body.html:101 msgid "Update statuses" msgstr "Поновити статуси" @@ -3449,12 +3450,12 @@ msgstr "Поновлення:" msgid "Updated" msgstr "Поновлено" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1016 -#: perllib/FixMyStreet/App/Controller/Admin.pm:1060 -#: perllib/FixMyStreet/App/Controller/Admin.pm:810 -#: perllib/FixMyStreet/App/Controller/Admin.pm:958 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:549 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:618 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1014 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:808 +#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:556 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:625 msgid "Updated!" msgstr "Поновлено!" @@ -3466,7 +3467,7 @@ msgstr "Поновлено!" msgid "Updates" msgstr "Поновлення" -#: perllib/FixMyStreet/DB/Result/Comment.pm:139 +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 msgid "Updates are limited to %s characters in length. Please shorten your update" msgstr "Поновлення обмежені кількістю в %s символів. Будь ласка скоротіть текст." @@ -3481,7 +3482,7 @@ msgstr "Поновлення стосовно {{title}}" msgid "Updates to this problem, FixMyStreet" msgstr "Оновлення по цій проблемі, FixMyStreet" -#: templates/web/base/admin/body.html:174 +#: templates/web/base/admin/body.html:182 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 "" @@ -3490,11 +3491,11 @@ msgstr "" msgid "User" msgstr "Користувач" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1359 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1357 msgid "User flag removed" msgstr "Користувацький прапорець видалено" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1331 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1329 msgid "User flagged" msgstr "Користувач відмічений" @@ -3502,16 +3503,16 @@ msgstr "Користувач відмічений" msgid "User search finds matches in users' names and email addresses." msgstr "Пошук користувачів знайшов співпадіння в іменах та поштових адресах" -#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 -#: perllib/FixMyStreet/Cobrand/Zurich.pm:303 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:307 #: templates/web/base/admin/flagged.html:29 #: templates/web/zurich/header.html:69 msgid "Users" msgstr "Користувачі" -#: perllib/FixMyStreet/App/Controller/Admin.pm:380 -#: perllib/FixMyStreet/App/Controller/Admin.pm:410 -#: perllib/FixMyStreet/App/Controller/Admin.pm:430 +#: perllib/FixMyStreet/App/Controller/Admin.pm:374 +#: perllib/FixMyStreet/App/Controller/Admin.pm:404 +#: perllib/FixMyStreet/App/Controller/Admin.pm:421 msgid "Values updated" msgstr "Значення оновлено" @@ -3565,11 +3566,11 @@ msgstr "Ми ніколи не публікуєм вашу поштову адр msgid "We never show your email address or phone number." msgstr "Ми ніколи не публікуємо вашу поштову адресу чи номер телефону." -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:397 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:403 msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." msgstr "Ми розумієм, що проблема може лежати у відповідальності %s; нажаль, наразі у нас немає їх контактних даних. Якщо ви знаєте точну адресу, будь ласка залишайтесь на зв'язку." -#: templates/web/base/index-steps.html:38 +#: templates/web/base/index-steps.html:31 msgid "We send it to the council on your behalf" msgstr "Ми надіслали це відповідному департаменту від вашого імені" @@ -3578,15 +3579,23 @@ msgstr "Ми надіслали це відповідному департаме msgid "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>" msgstr "Ми будем використовувати ваші персональні дані лише у відповідності до <a href=\"/faq#privacy\">політики конфіденційності.</a>" +#: templates/web/base/questionnaire/completed-open.html:2 +msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" +msgstr "" + #: templates/web/base/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/fixmystreet/report/new/fill_in_details_form.html:41 +#: templates/web/base/contact/submit.html:7 +msgid "We’ll get back to you as soon as we can." +msgstr "" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 msgid "What’s the issue, and where is it?" msgstr "" -#: templates/web/base/admin/category_edit.html:82 +#: templates/web/base/admin/category_edit.html:87 #: templates/web/zurich/admin/body.html:18 msgid "When edited" msgstr "Коли відредаговано" @@ -3595,15 +3604,18 @@ msgstr "Коли відредаговано" msgid "When sent" msgstr "Коли відправлено" -#: perllib/FixMyStreet/App/Controller/Report/New.pm:621 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 msgid "Whole block of empty flats" msgstr "Whole block of empty flats" +#: templates/web/base/tokens/confirm_alert.html:7 +msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." +msgstr "" + #: templates/web/base/open311/index.html:92 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/fiksgatami/front/footer-marketing.html:15 #: templates/web/fixmystreet/front/footer-marketing.html:17 msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." msgstr "" @@ -3627,18 +3639,18 @@ msgid "Year" msgstr "Рік" #: templates/web/base/admin/bodies.html:66 -#: templates/web/base/admin/body.html:72 templates/web/base/admin/body.html:74 -#: templates/web/base/admin/body.html:78 templates/web/base/admin/body.html:80 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 #: templates/web/base/admin/category_edit.html:5 #: templates/web/base/admin/flagged.html:47 #: templates/web/base/admin/list_updates.html:32 #: templates/web/base/admin/list_updates.html:34 #: templates/web/base/admin/list_updates.html:35 #: templates/web/base/admin/problem_row.html:20 -#: templates/web/base/admin/report_edit.html:63 -#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:76 +#: templates/web/base/admin/report_edit.html:93 #: templates/web/base/admin/update_edit.html:24 -#: templates/web/base/admin/users.html:29 +#: templates/web/base/admin/users.html:31 #: templates/web/base/questionnaire/creator_fixed.html:14 #: templates/web/base/questionnaire/index.html:42 #: templates/web/base/questionnaire/index.html:81 @@ -3667,14 +3679,12 @@ msgstr "You are reporting the following problem report for being abusive, contai 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/base/tokens/confirm_problem.html:25 -#: templates/web/base/tokens/confirm_problem.html:26 -#: templates/web/zurich/tokens/confirm_problem.html:6 +#: templates/web/zurich/tokens/confirm_problem.html:5 #: templates/web/zurich/tokens/confirm_problem.html:8 msgid "You can <a href=\"%s%s\">view the problem on this site</a>." msgstr "Ви можете <a href=\"%s%s\">переглянути проблему на цьому сайті</a>." -#: templates/web/base/admin/user-form.html:47 +#: templates/web/base/admin/user-form.html:48 msgid "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." msgstr "You can add an abusive user's email to the abuse list, which automatically hides (and never sends) reports they create." @@ -3689,14 +3699,14 @@ msgid "" " reports in the past." msgstr "" -#: templates/web/base/report/new/councils_text_none.html:19 -#: templates/web/base/report/new/councils_text_none.html:20 -#: templates/web/base/report/new/councils_text_some.html:20 +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 #: templates/web/base/report/new/councils_text_some.html:21 msgid "You can help us by finding a contact email address for local problems for %s and emailing it to us at <a href='mailto:%s'>%s</a>." msgstr "" -#: templates/web/base/admin/body-form.html:81 +#: templates/web/base/admin/body-form.html:85 msgid "You can mark a body as deleted if you do not want it to be active on the site." msgstr "" @@ -3709,10 +3719,10 @@ msgid "You have already answered this questionnaire. If you have a question, ple msgstr "You have already answered this questionnaire. If you have a question, please <a href='%s'>get in touch</a>, or <a href='%s'>view your problem</a>.\n" #: templates/web/base/questionnaire/index.html:68 -#: templates/web/base/report/new/fill_in_details_form.html:94 +#: templates/web/base/report/new/fill_in_details_form.html:75 #: templates/web/fixmystreet/questionnaire/index.html:88 -#: templates/web/fixmystreet/report/new/fill_in_details_form.html:79 -#: templates/web/zurich/report/new/fill_in_details_form.html:75 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 +#: templates/web/zurich/report/new/fill_in_details_form.html:58 msgid "You have already attached a photo to this report, attaching another one will replace it." msgstr "Ви вже додали фото до цього сповіщення, додавання нового фото видалить попереднє." @@ -3721,7 +3731,7 @@ msgstr "Ви вже додали фото до цього сповіщення, msgid "You have already attached a photo to this update, attaching another one will replace it." msgstr "Ви вже додали фото до цього поновлення, додавання нового фото видалить попереднє." -#: templates/web/base/auth/sign_out.html:3 +#: templates/web/base/auth/sign_out.html:4 #: templates/web/zurich/auth/sign_out.html:3 msgid "You have been signed out" msgstr "Ви успішно вийшли." @@ -3730,26 +3740,11 @@ msgstr "Ви успішно вийшли." 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/base/tokens/confirm_alert.html:8 -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/base/tokens/confirm_update.html:14 -msgid "You have successfully confirmed your update and you can now <a href=\"%s\">view it on the site</a>." -msgstr "Ви успішно підтвердили поновлення і можете <a href=\"%s\">переглянути його на сайті</a>." - -#: templates/web/base/tokens/confirm_alert.html:12 -msgid "You have successfully created your alert." -msgstr "Ви успішно створили алярму." - -#: templates/web/base/tokens/confirm_alert.html:10 -msgid "You have successfully deleted your alert." -msgstr "Ви успішно видалили свою алярму." - #: templates/web/base/report/display.html:20 #: templates/web/base/report/new/fill_in_details.html:37 #: templates/web/fixmystreet/report/display.html:17 @@ -3778,7 +3773,7 @@ msgstr "" " 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." -#: templates/web/base/admin/report_edit.html:71 +#: templates/web/base/admin/report_edit.html:85 msgid "You really want to resend?" msgstr "Дійсно бажаєте перевідправити?" @@ -3798,7 +3793,7 @@ msgstr "Ваші сповіщення" #: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 #: templates/web/fixmystreet/report/update-form.html:76 -#: templates/web/zurich/report/new/fill_in_details_form.html:88 +#: templates/web/zurich/report/new/fill_in_details_form.html:71 msgid "Your email" msgstr "Ваша пошта" @@ -3814,7 +3809,7 @@ msgid "Your email address:" msgstr "Ваша адреса е-пошти:" #: templates/web/base/alert/_list.html:92 -#: templates/web/base/report/new/fill_in_details_form.html:125 +#: templates/web/base/report/new/fill_in_details_form.html:106 #: templates/web/base/report/update-form.html:81 msgid "Your email:" msgstr "Ваша е-пошта:" @@ -3829,13 +3824,13 @@ msgstr "Ваша інформація буде використана згідн #: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 #: templates/web/fixmystreet/report/update-form.html:142 #: templates/web/zurich/auth/general.html:61 -#: templates/web/zurich/report/new/fill_in_details_form.html:98 +#: templates/web/zurich/report/new/fill_in_details_form.html:81 msgid "Your name" msgstr "Ваше ім'я" #: templates/web/base/auth/general.html:59 #: templates/web/base/contact/index.html:73 -#: templates/web/base/report/new/fill_in_details_form.html:204 +#: templates/web/base/report/new/fill_in_details_form.html:185 #: templates/web/base/report/update-form.html:151 msgid "Your name:" msgstr "Ваше ім'я:" @@ -3853,33 +3848,19 @@ msgstr "Ваш пароль було змінено" #: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 #: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 -#: templates/web/zurich/report/new/fill_in_details_form.html:104 +#: templates/web/zurich/report/new/fill_in_details_form.html:87 msgid "Your phone number" msgstr "Ваш телефон" -#: templates/web/base/tokens/confirm_problem.html:4 -msgid "Your problem has been confirmed!" -msgstr "" - #: templates/web/fixmystreet/questionnaire/index.html:16 msgid "Your report" msgstr "Ваше сповіщення" -#: templates/web/base/report_created.html:6 -msgid "Your report has been created and will shortly be sent." -msgstr "Ваше сповіщення було створено і скоро буде надіслано" - -#: templates/web/base/footer.html:9 templates/web/fiksgatami/footer.html:21 -#: templates/web/fiksgatami/nn/footer.html:21 -#: templates/web/fixmystreet/footer.html:24 +#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:24 msgid "Your reports" msgstr "Ваші сповіщення" -#: templates/web/base/tokens/confirm_update.html:4 -msgid "Your update has been confirmed!" -msgstr "" - -#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:59 +#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:41 msgid "Your updates" msgstr "Ваші поновлення" @@ -3896,11 +3877,7 @@ msgstr "від %s" msgid "council" msgstr "рада" -#: perllib/FixMyStreet/DB/Result/Problem.pm:665 -msgid "council ref: %s" -msgstr "рада ref: %s" - -#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:32 #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:54 msgid "didn't use map" @@ -3911,6 +3888,7 @@ msgstr "не використовував карту" msgid "e.g. ‘%s’ or ‘%s’" msgstr "наприклад ‘%s’ чи ‘%s’" +#: templates/web/base/admin/body-form.html:188 #: templates/web/base/admin/flagged.html:51 msgid "edit user" msgstr "редагувати користувача" @@ -3925,7 +3903,7 @@ msgstr "від %d різних користувачів" msgid "last updated %s" msgstr "останнє поновлення %s" -#: perllib/Utils.pm:263 +#: perllib/Utils.pm:235 msgid "less than a minute" msgstr "менше хвилини" @@ -3985,22 +3963,22 @@ msgstr "або" msgid "or locate me automatically" msgstr "або знайти мене автоматично" -#: templates/web/base/admin/report_edit.html:25 -#: templates/web/base/admin/report_edit.html:26 -#: templates/web/zurich/admin/report_edit-sdm.html:28 +#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:30 +#: templates/web/zurich/admin/report_edit-sdm.html:27 #: templates/web/zurich/admin/report_edit-sdm.html:29 -#: templates/web/zurich/admin/report_edit-sdm.html:37 +#: templates/web/zurich/admin/report_edit-sdm.html:36 #: templates/web/zurich/admin/report_edit-sdm.html:38 -#: templates/web/zurich/admin/report_edit.html:28 +#: templates/web/zurich/admin/report_edit.html:27 #: templates/web/zurich/admin/report_edit.html:29 -#: templates/web/zurich/admin/report_edit.html:39 +#: templates/web/zurich/admin/report_edit.html:38 #: templates/web/zurich/admin/report_edit.html:40 -#: templates/web/zurich/admin/report_edit.html:51 +#: templates/web/zurich/admin/report_edit.html:50 #: templates/web/zurich/admin/report_edit.html:52 msgid "originally entered: “%s”" msgstr "в оригіналі вказано: “%s”" -#: templates/web/base/admin/report_edit.html:30 +#: templates/web/base/admin/report_edit.html:43 msgid "other areas:" msgstr "інші зони:" @@ -4009,13 +3987,12 @@ msgstr "інші зони:" msgid "reopened" msgstr "перевідкрито" -#: templates/web/fiksgatami/header.html:49 -#: templates/web/fixmystreet/header.html:53 +#: templates/web/fixmystreet/header.html:59 #: templates/web/zurich/footer.html:12 msgid "sign out" msgstr "вийти" -#: templates/web/base/report/new/fill_in_details_form.html:13 +#: templates/web/base/report/new/fill_in_details_form.html:12 #: templates/web/base/report/new/fill_in_details_form.html:15 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 #: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 @@ -4027,15 +4004,15 @@ msgstr "місцевий орган" msgid "there is no pin shown as the user did not use the map" msgstr "шпильки немає так як користувач не використав мапу" -#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:373 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:379 msgid "this type of local problem" msgstr "цей тип локальної проблеми" -#: perllib/Utils.pm:235 +#: perllib/Utils.pm:207 msgid "today" msgstr "сьогодні" -#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:32 #: templates/web/zurich/admin/report_edit-sdm.html:40 #: templates/web/zurich/admin/report_edit.html:54 msgid "used map" @@ -4062,7 +4039,7 @@ msgstr[0] "<big>%s</big> звіт недавно" msgstr[1] "<big>%s</big> звітів недавно" msgstr[2] "<big>%s</big> звітів недавно" -#: perllib/Utils.pm:282 +#: perllib/Utils.pm:254 #, perl-format msgid "%d hour" msgid_plural "%d hours" @@ -4078,7 +4055,7 @@ msgstr[0] "%d прибічник" msgstr[1] "%d прибічників" msgstr[2] "%d прибічників" -#: perllib/Utils.pm:284 +#: perllib/Utils.pm:256 #, perl-format msgid "%d minute" msgid_plural "%d minutes" @@ -4102,7 +4079,7 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#: perllib/Utils.pm:278 +#: perllib/Utils.pm:250 #, perl-format msgid "%d week" msgid_plural "%d weeks" @@ -4126,7 +4103,7 @@ msgstr[0] "<big>%s</big> полагоджено минувшого місяця" msgstr[1] "<big>%s</big> полагоджено минувшого місяця" msgstr[2] "<big>%s</big> полагоджено минувшого місяця" -#: perllib/Utils.pm:280 +#: perllib/Utils.pm:252 #, perl-format msgid "%d day" msgid_plural "%d days" @@ -4142,8 +4119,5 @@ msgstr[0] "" msgstr[1] "" msgstr[2] "" -#~ msgid "Configuration updated - contacts will be generated automatically later" -#~ msgstr "Конфігурацію оновлено - контакти будуть згенеровані автоматично пізніше" - -#~ msgid "The subject and details of the problem will be public, plus your name if you give us permission." -#~ msgstr "Тема і подробиці проблеми будуть публічними. З вашого дозволу можна опублікувати ім'я" +#~ msgid "For council(s):" +#~ msgstr "Для рад(и):" diff --git a/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po b/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po new file mode 100644 index 000000000..2e967fdc1 --- /dev/null +++ b/locale/zh.UTF-8/LC_MESSAGES/FixMyStreet.po @@ -0,0 +1,4176 @@ +# 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: +# Chi-Hsun Tsai <chihsun.tsai@gmail.com>, 2015 +msgid "" +msgstr "" +"Project-Id-Version: fixmystreet\n" +"Report-Msgid-Bugs-To: matthew@mysociety.org\n" +"POT-Creation-Date: 2015-07-31 14:28+0100\n" +"PO-Revision-Date: 2015-07-10 13:31+0000\n" +"Last-Translator: mySociety <transifex@mysociety.org>\n" +"Language-Team: Chinese (http://www.transifex.com/projects/p/fixmystreet/language/zh/)\n" +"Language: zh\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:623 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:392 +msgid " and " +msgstr "與" + +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_none.html:11 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 +#: templates/web/base/report/new/councils_text_some.html:22 +#: templates/web/base/report/new/councils_text_some.html:5 +msgid " or " +msgstr "或" + +#: templates/web/base/admin/index.html:36 +msgid "%d confirmed alerts, %d unconfirmed" +msgstr "%d 已確認通知, %d 未確認 " + +#: templates/web/base/admin/index.html:38 +#: templates/web/zurich/admin/index.html:6 +msgid "%d council contacts – %d confirmed, %d unconfirmed" +msgstr "%d 地方政府承辦人員 – %d 確認 %d 尚未確認" + +#: templates/web/base/admin/edit-league.html:12 +msgid "%d edits by %s" +msgstr " 由 %d 編輯 %d" + +#: templates/web/base/admin/index.html:35 +msgid "%d live updates" +msgstr "%d 現場更新" + +#: templates/web/base/admin/index.html:37 +msgid "%d questionnaires sent – %d answered (%s%%)" +msgstr "%d 問卷送出 – % 回覆(%s%%)" + +#: templates/web/base/pagination.html:10 +msgid "%d to %d of %d" +msgstr "%d 到 %d 的 %d " + +#: templates/web/base/reports/body.html:0 +#: templates/web/base/reports/body.html:23 +msgid "%s - Summary reports" +msgstr "%s -申報總結" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:672 +msgid "%s ref: %s" +msgstr "%s 流水號: %s " + +#: perllib/FixMyStreet/Cobrand/UK.pm:255 perllib/FixMyStreet/Cobrand/UK.pm:267 +msgid "%s ward, %s" +msgstr "%s 里/區, %s " + +#: perllib/FixMyStreet/DB/Result/Problem.pm:559 +msgid "%s, reported at %s" +msgstr "%s 在 %s 處之申報 " + +#: perllib/FixMyStreet/Cobrand/UK.pm:282 perllib/FixMyStreet/Cobrand/UK.pm:294 +msgid "%s, within %s ward" +msgstr "%s, 在%s 里/區" + +#: perllib/FixMyStreet/Map/OSM.pm:42 +msgid "© <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap</a> contributors" +msgstr "版本; <a href=\"http://www.openstreetmap.org/copyright\">OpenStreetMap開放街道地圖</a> 貢獻者" + +#: templates/web/base/email_sent.html:29 +msgid "(Don't worry — we'll hang on to your alert while you're checking your email.)" +msgstr "(別擔心 — 在您檢查email這段時間，我們會保留你的通知。)" + +#: templates/web/base/email_sent.html:25 +msgid "(Don't worry — we'll hang on to your problem report while you're checking your email.)" +msgstr "(別擔心 — 在您檢查email這段時間，我們會保留你的申報。)" + +#: templates/web/base/email_sent.html:27 +msgid "(Don't worry — we'll hang on to your update while you're checking your email.)" +msgstr "(別擔心 — 在您檢查email這段時間，我們會保留你的更新。)" + +#: templates/web/base/admin/report_blocks.html:11 +#: templates/web/base/admin/users.html:31 +msgid "(Email in abuse table)" +msgstr "電郵為濫發信件" + +#: templates/web/base/alert/_list.html:20 +#: templates/web/fixmystreet/alert/_list.html:24 +msgid "(a default distance which covers roughly 200,000 people)" +msgstr "預設距離約涵蓋20萬人口" + +#: templates/web/base/alert/_list.html:25 +#: templates/web/fixmystreet/alert/_list.html:28 +msgid "(alternatively the RSS feed can be customised, within" +msgstr "或可修改RSS訂閱" + +#: templates/web/base/around/around_map_list_items.html:12 +#: templates/web/base/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/base/around/around_map_list_items.html:10 +#: templates/web/base/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/base/index.html:8 templates/web/base/index.html:9 +#: templates/web/fixmystreet/around/intro.html:2 +msgid "(like graffiti, fly tipping, broken paving slabs, or street lighting)" +msgstr "(例如塗鴉, 文宣張貼, 人行道鋪板或街燈損壤, )" + +#: templates/web/base/reports/_list-entry.html:4 +#: templates/web/fixmystreet/report/_item.html:21 +msgid "(not sent to council)" +msgstr "不要向地方政府送出" + +#: templates/web/base/report/new/fill_in_details_form.html:199 +#: templates/web/zurich/report/new/fill_in_details_form.html:77 +msgid "(optional)" +msgstr "(任選)" + +#: templates/web/fixmystreet/report/public_label.html:1 +msgid "(public)" +msgstr "(公開)" + +#: templates/web/base/reports/_list-entry.html:2 +#: templates/web/fixmystreet/report/_item.html:20 +msgid "(sent to both)" +msgstr "兩個都送出" + +#: templates/web/base/report/new/fill_in_details_form.html:193 +msgid "(we never show your email address or phone number)" +msgstr "(我們不會透露您的電話或電郵)" + +#: templates/web/base/report/update-form.html:158 +msgid "(we never show your email)" +msgstr "(我們不會公開您的電子郵件)" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/DB/Result/Problem.pm:410 +msgid "-- Pick a category --" +msgstr "選擇分類" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:630 +#: perllib/FixMyStreet/DB/Result/Problem.pm:416 +msgid "-- Pick a property type --" +msgstr "選擇公物種類" + +#: templates/web/base/admin/body-form.html:42 +#: templates/web/base/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>地圖連結</code> 被設定為(<code>%s</code>) 但無<code>地圖連結別</code>.<br>\n" +"\n" +"此可能因涵蓋區域為空白 (見下方)<br>\n" +"\n" +"可以在你的設定檔加入一些 <code>地圖連結別</code> " + +#: templates/web/base/around/_report_banner.html:3 +#: templates/web/base/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/base/admin/index.html:33 +#: templates/web/zurich/admin/index.html:4 +msgid "<strong>%d</strong> live problems" +msgstr "<strong>%d</strong> 現場問題" + +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:39 +msgid "<strong>No</strong> Let me confirm my report by email" +msgstr "<strong>不</strong> 我要利用電子郵件確認我的申報 " + +#: templates/web/fixmystreet/report/update-form.html:112 +msgid "<strong>No</strong> Let me confirm my update by email" +msgstr "<strong>不</strong> 我要用電子郵件收到更新通知" + +#: templates/web/fixmystreet/auth/general.html:51 +#: templates/web/zurich/auth/general.html:51 +msgid "<strong>No</strong> let me sign in by email" +msgstr "<strong>不</strong> 我要用電子郵件登入" + +#: templates/web/base/auth/general.html:55 +msgid "<strong>No</strong>, I do not, let me sign in by email:" +msgstr "<strong>不</strong>, 不用, 我要用電子郵件登入:" + +#: templates/web/base/report/new/fill_in_details_form.html:144 +msgid "<strong>No</strong>, let me confirm my report by email:" +msgstr "<strong>不</strong>, 我想用電子郵件確認我的申報l:" + +#: templates/web/base/report/update-form.html:117 +msgid "<strong>No</strong>, let me confirm my update by email:" +msgstr "<strong>不</strong>, 我要利用電子郵件收取更新通知:" + +#: templates/web/base/auth/general.html:37 +#: templates/web/base/report/new/fill_in_details_form.html:122 +#: templates/web/base/report/update-form.html:95 +#: templates/web/fixmystreet/auth/general.html:37 +#: templates/web/fixmystreet/auth/general.html:39 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:15 +#: templates/web/fixmystreet/report/update-form.html:89 +msgid "<strong>Yes</strong> I have a password" +msgstr "<strong>是</strong> 我有密碼" + +#: templates/web/base/static/about-en-gb.html:1 +#: templates/web/base/static/about-en-gb.html:3 +msgid "About us" +msgstr "關於我們" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:52 +#: templates/web/base/report/update-form.html:30 +#: templates/web/base/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/base/admin/body-form.html:3 +#: templates/web/base/admin/body-form.html:4 +msgid "" +"Add a <strong>body</strong> for each administrative body, such as a council or department\n" +" to which problem reports can be sent. You can add one or more contacts (for different\n" +" categories of problem) to each body." +msgstr "" +"附上<strong>內文</strong> 給每一個主管部門,例如向地方政府或是某單位\n" +"申報該問題 \n" +"每份內容中 ,你可以加入一個或更多聯絡對象(因不同\n" +"類型的問題) " + +#: templates/web/base/admin/body.html:56 +msgid "Add a contact using the form below." +msgstr "增加聯絡人請使用下方表單" + +#: templates/web/base/admin/bodies.html:74 +#: templates/web/base/admin/body-form.html:240 +#: templates/web/zurich/admin/body-form.html:51 +msgid "Add body" +msgstr "新增有關單位" + +#: templates/web/base/admin/body.html:116 +#: templates/web/zurich/admin/body.html:31 +msgid "Add new category" +msgstr "新增種類" + +#: templates/web/base/admin/users.html:47 +msgid "Add user" +msgstr "新增使用者" + +#: templates/web/base/my/my.html:64 templates/web/fixmystreet/my/my.html:52 +msgid "Added %s" +msgstr "新增 %s" + +#: templates/web/base/auth/change_password.html:29 +msgid "Again:" +msgstr "再一次" + +#: templates/web/base/admin/timeline.html:35 +msgid "Alert %d created for %s, type %s, parameters %s / %s" +msgstr "%s創建之 %d通知, 種類 %s, 參數 %s / %s" + +#: templates/web/base/admin/timeline.html:37 +msgid "Alert %d disabled (created %s)" +msgstr "%d 關閉通知 " + +#: templates/web/base/report/update-form.html:163 +#: templates/web/fixmystreet/report/update-form.html:150 +msgid "Alert me to future updates" +msgstr "通知我此事後續" + +#: templates/web/base/reports/index.html:3 +#: templates/web/zurich/admin/stats.html:5 +#: templates/web/zurich/reports/index.html:12 +msgid "All Reports" +msgstr "所有事件申報" + +#: templates/web/base/footer.html:11 templates/web/fixmystreet/footer.html:26 +#: 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/base/admin/stats.html:5 +#: templates/web/zurich/admin/stats.html:8 +msgid "All reports between %s and %s" +msgstr "%s 與 %s 之間申報" + +#: templates/web/base/report/new/councils_text_some.html:2 +msgid "All the information you provide here will be sent to" +msgstr "你所提供的資訊即將送出" + +#: templates/web/base/report/new/councils_text_all.html:2 +#: templates/web/base/report/new/councils_text_all.html:4 +#: templates/web/base/report/new/fill_in_details_form.html:12 +#: templates/web/base/report/new/fill_in_details_form.html:14 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:11 +msgid "All the information you provide here will be sent to <strong>%s</strong>." +msgstr "所有您提供的资訊將送出給<strong>%s</strong>." + +#: templates/web/base/questionnaire/index.html:36 +#: templates/web/fixmystreet/questionnaire/index.html:55 +msgid "An update marked this problem as fixed." +msgstr "本問題已解決之更新標註" + +#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/problem_row.html:20 +msgid "Anonymous" +msgstr "匿名" + +#: templates/web/base/admin/report_edit.html:75 +#: templates/web/base/admin/update_edit.html:23 +msgid "Anonymous:" +msgstr "匿名:" + +#: templates/web/base/footer.html:26 +msgid "Are you a <strong>developer</strong>? Would you like to contribute to FixMyStreet?" +msgstr "您是否為<strong>程式開發員</strong>?您願意為一起本軟體開發作貢獻嗎 " + +#: templates/web/fixmystreet/front/footer-marketing.html:16 +msgid "Are you a developer?" +msgstr "你是程式開發者嗎?" + +#: templates/web/base/admin/body-form.html:69 +#: templates/web/base/admin/body.html:16 +#: templates/web/zurich/admin/body-form.html:24 +msgid "Area covered" +msgstr "涵蓋區域" + +#: templates/web/base/admin/bodies.html:15 +#: templates/web/base/admin/body.html:60 +msgid "As this is a staging site and %s is false, reports made on this site will be sent to the problem reporter, not the contact given for the report’s category." +msgstr "作為一個支援平台 %s出錯，本站所作的申報將送達給申報者，而不是申報類別下提供的承辦人員。 " + +#: templates/web/zurich/admin/report_edit.html:141 +#: templates/web/zurich/admin/stats.html:36 +msgid "Assign to different category:" +msgstr "歸至其它種類" + +#: templates/web/zurich/admin/report_edit.html:150 +msgid "Assign to external body:" +msgstr "分派給外部機：" + +#: templates/web/zurich/admin/report_edit.html:130 +#: templates/web/zurich/admin/report_edit.html:187 +msgid "Assign to subdivision:" +msgstr "交派給下級單位：" + +#: perllib/FixMyStreet/Cobrand/Zurich.pm:165 +#: templates/web/zurich/report/updates.html:11 +msgid "Assigned to %s" +msgstr "派給 %s" + +#: templates/web/base/open311/index.html:84 +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 "每一則詢問的申報幾乎達 %d地回覆了。所有的要求，依其時間排列，故搜尋時請設定啟始與結束日期。" + +#: templates/web/base/open311/index.html:76 +msgid "At the moment only searching for and looking at reports work." +msgstr "目前僅提供部份查詢與查閱" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:373 +#: templates/web/zurich/report/_item.html:11 +msgid "Awaiting moderation" +msgstr "待核可" + +#: templates/web/base/js/translation_strings.html:32 +msgid "Back" +msgstr "回上層" + +#: templates/web/base/admin/report_blocks.html:11 +msgid "Ban email address" +msgstr "禁止之電子郵件" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1192 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:301 +#: templates/web/base/admin/bodies.html:1 templates/web/zurich/header.html:64 +msgid "Bodies" +msgstr "有關單位" + +#: templates/web/base/admin/flagged.html:17 +#: templates/web/base/admin/reports.html:14 +#: templates/web/base/admin/users.html:17 +msgid "Body" +msgstr "有關單位" + +#: templates/web/base/admin/report_edit.html:34 +#: templates/web/base/admin/user-form.html:32 +msgid "Body:" +msgstr "有關單位:" + +#: templates/web/base/admin/stats.html:80 +msgid "By Date" +msgstr "日期" + +#: templates/web/fixmystreet/around/_report_banner.html:8 +msgid "Can't see the map? <em>Skip this step</em>" +msgstr "無法顯示地圖？ <em>略過本步驟</em>" + +#: templates/web/base/admin/body.html:68 +#: templates/web/base/admin/index.html:55 +#: templates/web/base/report/new/category.html:10 +#: templates/web/base/report/new/category_wrapper.html:3 +#: templates/web/zurich/admin/body.html:14 +#: templates/web/zurich/admin/index-dm.html:23 +#: templates/web/zurich/admin/index-sdm.html:21 +#: templates/web/zurich/admin/reports.html:13 +#: templates/web/zurich/admin/stats.html:50 +msgid "Category" +msgstr "類別" + +#: templates/web/base/admin/index.html:53 +msgid "Category fix rate for problems > 4 weeks old" +msgstr "4週前己修復問題之類別" + +#: templates/web/base/admin/body.html:138 +#: templates/web/base/admin/category_edit.html:23 +#: templates/web/base/admin/report_edit.html:74 +#: templates/web/zurich/admin/body.html:43 +#: templates/web/zurich/admin/report_edit-sdm.html:42 +#: templates/web/zurich/admin/report_edit.html:140 +msgid "Category:" +msgstr "類別:" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:383 +msgid "Category: %s" +msgstr "類別: %s" + +#: templates/web/base/auth/change_password.html:1 +#: templates/web/base/auth/change_password.html:3 +#: templates/web/base/auth/change_password.html:33 +#: templates/web/base/my/my.html:17 templates/web/fixmystreet/my/my.html:17 +msgid "Change password" +msgstr "更換密碼" + +#: templates/web/base/admin/body.html:160 +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 "" +"看看<strong>已確認申報</strong> 此顯示承辦人員已確認申訴無誤。\n" +"如果你無法確定承辯人員來源與有效與否, 請保留空白。" + +#: templates/web/base/admin/body.html:171 +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 "" +"看看<strong>已刪除</strong> 以移除該類別。\n" +"此遭刪除類別將不會顯示在申報問題頁的下拉式選項上。" + +#: templates/web/base/admin/body.html:191 +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 "" +"檢查 <strong>私人類別</strong> 如果申報在此類別下 <strong>將不會公開在網頁上</strong>\n" +"<br>\n" +"一般而言類別不會設為私人\n" +"<br>\n" +"這類問題適合於用戶申報給有關機關，但公開申報資料並無公益性\n" +"例如在英國想在某特定地點要求多安置垃圾筒" + +#: templates/web/base/admin/body.html:130 +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 "選擇民眾可理解的<strong>類別</strong> (例如., \"路面坑洞\", \"街燈故障\") 也助於讓有關單位掌握. 此類別將會顯示在申報問題頁的下拉式選項上。" + +#: templates/web/base/admin/stats.html:65 +#: templates/web/base/admin/stats.html:71 +msgid "Click here or enter as dd/mm/yyyy" +msgstr "點選此處或輸入日期/月份/年份" + +#: templates/web/base/js/translation_strings.html:50 +#: templates/web/fixmystreet/around/_report_banner.html:2 +msgid "Click map to report a problem" +msgstr "點擊地圖以申報問題 " + +#: perllib/FixMyStreet/Cobrand/Zurich.pm:141 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:58 +#: templates/web/base/admin/report_edit.html:60 +#: templates/web/base/dashboard/index.html:142 +#: templates/web/base/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:95 +#: templates/web/zurich/admin/report_edit.html:97 +#: templates/web/zurich/admin/stats.html:31 +#: templates/web/zurich/report/banner.html:13 +msgid "Closed" +msgstr "關閉" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:771 +msgid "Closed by council" +msgstr "由地方政府關閉" + +#: templates/web/base/my/my.html:40 +#: templates/web/fixmystreet/my/_problem-list.html:12 +msgid "Closed reports" +msgstr "完結之申報 " + +#: templates/web/base/admin/problem_row.html:38 +msgid "Closed:" +msgstr "關閉:" + +#: templates/web/base/around/tabbed_lists.html:10 +#: templates/web/base/around/tabbed_lists.html:12 +msgid "Closest nearby problems <small>(within %skm)</small>" +msgstr "最鄰近問題<small>( %s公里之內)</small>" + +#: templates/web/base/admin/report_edit.html:23 +#: templates/web/zurich/admin/report_edit-sdm.html:33 +#: templates/web/zurich/admin/report_edit.html:46 +msgid "Co-ordinates:" +msgstr "協同單位:" + +#: templates/web/base/admin/list_updates.html:10 +msgid "Cobrand" +msgstr "聯合品牌" + +#: templates/web/base/admin/report_edit.html:91 +#: templates/web/base/admin/update_edit.html:50 +msgid "Cobrand data:" +msgstr "聯合品牌資料:" + +#: templates/web/base/admin/report_edit.html:90 +#: templates/web/base/admin/update_edit.html:49 +msgid "Cobrand:" +msgstr "聯合品牌:" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1199 +#: templates/web/base/admin/config_page.html:1 +msgid "Configuration" +msgstr "設定" + +#: templates/web/base/admin/category_edit.html:52 +msgid "Configure Endpoint" +msgstr "組態端 點" + +#: templates/web/base/admin/body.html:72 +msgid "Confirm" +msgstr "確認" + +#: templates/web/base/auth/token.html:1 +msgid "Confirm account" +msgstr "確認帳戶" + +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:33 +#: templates/web/fixmystreet/report/update-form.html:107 +msgid "Confirm by email below, providing a new password at that point. When you confirm, your password will be updated." +msgstr "確認下方電子郵件，輸入新密碼，按確認鍵後，您的密碼即刻更新。" + +#: templates/web/base/questionnaire/creator_fixed.html:1 +#: templates/web/base/tokens/confirm_problem.html:1 +#: templates/web/base/tokens/confirm_update.html:1 +#: templates/web/zurich/tokens/confirm_problem.html:1 +#: templates/web/zurich/tokens/confirm_problem.html:3 +msgid "Confirmation" +msgstr "確認" + +#: templates/web/base/admin/body.html:166 +#: templates/web/base/admin/body.html:79 +#: templates/web/base/admin/category_edit.html:37 +#: templates/web/base/admin/category_edit.html:89 +#: templates/web/zurich/admin/stats.html:40 +msgid "Confirmed" +msgstr "已確認" + +#: templates/web/base/admin/stats.html:5 +msgid "Confirmed reports between %s and %s" +msgstr "%s 與 %s 之間已確認的申報" + +#: templates/web/base/admin/list_updates.html:39 +#: templates/web/base/admin/problem_row.html:36 +#: templates/web/base/admin/report_edit.html:83 +msgid "Confirmed:" +msgstr "已確認：" + +#: templates/web/base/footer.html:24 +msgid "Contact FixMyStreet" +msgstr "連絡「FixMyStreet」" + +#: templates/web/base/contact/index.html:1 +#: templates/web/base/contact/index.html:2 +#: templates/web/base/contact/submit.html:1 +#: templates/web/fixmystreet/contact/index.html:1 +#: templates/web/fixmystreet/contact/index.html:2 +msgid "Contact Us" +msgstr "連絡我們" + +#: templates/web/base/contact/index.html:6 +#: templates/web/fixmystreet/contact/index.html:20 +msgid "Contact the team" +msgstr "連結本團隊" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1325 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1353 +msgid "Could not find user" +msgstr "找不到該戶用" + +#: templates/web/base/js/translation_strings.html:37 +msgid "Could not look up location" +msgstr "找不到此地點" + +#: templates/web/base/admin/list_updates.html:9 +msgid "Council" +msgstr "地方政府" + +#: templates/web/base/admin/body.html:1 +#: templates/web/base/admin/category_edit.html:1 +#: templates/web/zurich/admin/body.html:1 +msgid "Council contacts for %s" +msgstr "聯繋地方政府 %s" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:670 +msgid "Council ref: %s" +msgstr "地方政府流水號 ref: %s" + +#: templates/web/base/admin/stats.html:84 +msgid "Council:" +msgstr "地方政府" + +#: templates/web/base/admin/stats.html:12 +#: templates/web/base/admin/stats.html:32 +#: templates/web/zurich/admin/stats.html:45 +#: templates/web/zurich/admin/stats.html:50 +msgid "Count" +msgstr "數量" + +#: templates/web/base/email_sent.html:1 +msgid "Create a report" +msgstr "創建申報" + +#: templates/web/base/admin/body.html:208 +#: templates/web/zurich/admin/body.html:59 +msgid "Create category" +msgstr "創建類別" + +#: templates/web/base/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/base/admin/list_updates.html:38 +#: templates/web/base/admin/report_edit.html:82 +#: templates/web/base/admin/update_edit.html:51 +#: templates/web/zurich/admin/report_edit-sdm.html:47 +#: templates/web/zurich/admin/report_edit.html:61 +#: templates/web/zurich/admin/update_edit.html:29 +msgid "Created:" +msgstr "建立:" + +#: templates/web/base/admin/stats.html:31 +msgid "Current state" +msgstr "目前狀況" + +#: templates/web/base/admin/bodies.html:5 +#: templates/web/base/admin/index.html:16 +msgid "Currently no bodies have been created." +msgstr "目前未創建內文" + +#: templates/web/base/dashboard/index.html:5 +#: templates/web/base/dashboard/index.html:7 +msgid "Dashboard" +msgstr "控制台" + +#: templates/web/zurich/admin/stats.html:35 +msgid "Dealt with by subdivision within 5 working days" +msgstr "下屬單位5個工作天內處理。" + +#: templates/web/base/admin/bodies.html:27 +#: templates/web/base/admin/body.html:177 +#: templates/web/base/admin/body.html:81 +#: templates/web/base/admin/category_edit.html:42 +#: templates/web/base/admin/category_edit.html:90 +msgid "Deleted" +msgstr "刪除" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:51 +#: 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/base/js/translation_strings.html:34 +#: templates/web/zurich/report/new/fill_in_details_form.html:42 +msgid "Details" +msgstr "細節" + +#: templates/web/base/admin/report_edit.html:20 +#: templates/web/base/report/new/fill_in_details_form.html:62 +#: templates/web/zurich/admin/report_edit-sdm.html:25 +#: templates/web/zurich/admin/report_edit.html:25 +#: templates/web/zurich/admin/report_edit.html:35 +msgid "Details:" +msgstr "細節:" + +#: templates/web/base/admin/body.html:87 +msgid "Devolved" +msgstr "下放" + +#: templates/web/base/admin/edit-league.html:8 +msgid "Diligency prize league table" +msgstr "勤奮表現名單" + +#: templates/web/fixmystreet/auth/general.html:31 +msgid "Do you have a FixMyBarangay password?" +msgstr "您是否有FixMyBarangay 之密碼？" + +#: templates/web/base/auth/general.html:32 +#: templates/web/fixmystreet/auth/general.html:33 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:11 +#: templates/web/fixmystreet/report/update-form.html:86 +msgid "Do you have a FixMyStreet password?" +msgstr "您是否有 FixMyStreet 密碼？ " + +#: templates/web/base/questionnaire/index.html:46 +#: templates/web/fixmystreet/questionnaire/index.html:65 +msgid "Don’t know" +msgstr "不知道" + +#: templates/web/fixmystreet/contact/index.html:118 +msgid "Don't like forms?" +msgstr "不喜歡此表單？" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:60 +#: templates/web/base/report/update-form.html:30 +#: templates/web/base/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/base/admin/body.html:106 +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 "" +"有關單位的每位承辦人員皆有其類別，此為公開資訊。\n" +"不同類別 <strong>能夠同一位承辦人</strong> (電子郵件)\n" +"這表示你可以多加一些類別，即使你只聯絡一位承辦人員。" + +#: templates/web/base/admin/list_updates.html:42 +#: templates/web/base/admin/problem_row.html:41 +#: templates/web/base/admin/users.html:33 +#: templates/web/zurich/admin/problem_row.html:42 +msgid "Edit" +msgstr "編輯" + +#: templates/web/base/admin/body.html:220 +#: templates/web/zurich/admin/body.html:71 +msgid "Edit body details" +msgstr "編輯有關單位細節" + +#: templates/web/base/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 +msgid "Editing problem %d" +msgstr "編輯問題 %d" + +#: templates/web/base/admin/update_edit.html:1 +#: templates/web/zurich/admin/update_edit.html:1 +msgid "Editing update %d" +msgstr "編輯更新 %d" + +#: templates/web/base/admin/user_edit.html:1 +msgid "Editing user %d" +msgstr "編輯用戶帳號 $d" + +#: templates/web/base/admin/category_edit.html:91 +msgid "Editor" +msgstr "編輯器" + +#: templates/web/base/admin/bodies.html:23 +#: templates/web/base/admin/category_edit.html:88 +#: templates/web/base/admin/flagged.html:38 +#: templates/web/base/admin/users.html:16 +#: templates/web/fixmystreet/auth/general.html:21 +#: templates/web/zurich/admin/body-form.html:9 +#: templates/web/zurich/admin/body.html:15 +#: templates/web/zurich/auth/general.html:24 +#: templates/web/zurich/auth/general.html:54 +msgid "Email" +msgstr "電子郵件" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1301 +msgid "Email added to abuse list" +msgstr "電子郵件列入濫發名單" + +#: templates/web/base/admin/body.html:155 +msgid "Email address:" +msgstr "電子郵件:" + +#: templates/web/base/tokens/confirm_alert.html:6 +msgid "Email alert created" +msgstr "建立電郵通知" + +#: templates/web/base/tokens/confirm_alert.html:10 +msgid "Email alert deleted" +msgstr "取消電郵通知" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1298 +msgid "Email already in abuse list" +msgstr "電子郵件己在濫發名單" + +#: templates/web/base/around/_updates.html:5 +msgid "Email me new local problems" +msgstr "以電郵通知其它問題" + +#: templates/web/base/report/display.html:38 +msgid "Email me updates" +msgstr "以電郵通知更新" + +#: templates/web/base/admin/category_edit.html:31 +#: templates/web/base/admin/report_edit.html:80 +#: templates/web/base/admin/update_edit.html:33 +#: templates/web/base/admin/user-form.html:20 +#: templates/web/base/alert/updates.html:13 +#: templates/web/base/report/display.html:42 +#: templates/web/zurich/admin/body.html:47 +#: templates/web/zurich/admin/report_edit-sdm.html:44 +#: templates/web/zurich/admin/report_edit.html:57 +msgid "Email:" +msgstr "電子郵件:" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:314 +msgid "Email: %s" +msgstr "電子郵件: %s" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:632 +msgid "Empty flat or maisonette" +msgstr "閒置的公寓或大樓" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:631 +msgid "Empty house or bungalow" +msgstr "閒置的房舍" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:634 +msgid "Empty office or other commercial" +msgstr "閒置的辦公室或其它商業空間" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:635 +msgid "Empty pub or bar" +msgstr "閒置的酒館或咖啡廳" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:636 +msgid "Empty public building - school, hospital, etc." +msgstr "閒置的公共建築物，如學校,醫院等" + +#: templates/web/base/admin/body-form.html:162 +#: templates/web/base/admin/body-form.html:163 +msgid "" +"Enable <strong>Open311 update-sending</strong> if the endpoint will send and receive\n" +" updates to existing reports. If you're not sure, it probably does not, so leave this unchecked.\n" +" For more information, see \n" +" <a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>this article</a>." +msgstr "" +"開啟<strong>Open311 更新送出</strong> 終端即可以送出與接收現有申報之更新\n" +"如果您不確定是否要開啟，請保留空白\n" +"更多資訊說明<a href='https://www.mysociety.org/2013/02/20/open311-extended/' class='admin-offsite-link'>請見本文(英文)</a>." + +#: templates/web/base/admin/body-form.html:222 +#: templates/web/base/admin/body-form.html:223 +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 "" +"開啟<strong>此設定將造成權限混亂</strong>因相關單位可能有多位承辦人員使用不同\n" +"端點(與送出方式)。例如，如果某些類別的問題申報必須由電子郵件送出，而其它類別則透過Open311送出。" + +#: templates/web/base/admin/stats.html:70 +msgid "End Date:" +msgstr "結束日期:" + +#: templates/web/base/admin/body-form.html:130 +msgid "Endpoint" +msgstr "結束點" + +#: perllib/FixMyStreet/Cobrand/Zurich.pm:73 +msgid "Enter a Zürich street name" +msgstr "輸入街道名稱 " + +#: perllib/FixMyStreet/Cobrand/UK.pm:13 +msgid "Enter a nearby UK postcode, or street name and area" +msgstr "輸入本區的郵編，街名或區域。" + +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:20 +#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:21 +msgid "Enter a nearby postcode, or street name and area" +msgstr "輸入本區的郵編，街名或區域。" + +#: templates/web/base/around/postcode_form.html:1 +#: templates/web/base/around/postcode_form.html:2 +#: templates/web/fixmystreet/around/postcode_form.html:10 +#: templates/web/fixmystreet/around/postcode_form.html:11 +msgid "Enter a nearby street name and area" +msgstr "輸入最近的街名或地區" + +#: perllib/FixMyStreet/Cobrand/ZeroTB.pm:7 +msgid "Enter a nearby street name and area, postal code or district in Delhi" +msgstr "輸入最近的街名，地區或郵編號碼" + +#: templates/web/base/auth/general.html:64 +#: templates/web/base/report/new/fill_in_details_form.html:151 +#: templates/web/base/report/update-form.html:124 +msgid "Enter a new password:" +msgstr "請輸入新密碼" + +#: templates/web/fixmystreet/auth/general.html:63 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:75 +#: templates/web/fixmystreet/report/update-form.html:123 +#: templates/web/zurich/auth/general.html:65 +msgid "Enter a password" +msgstr "請輸入密碼" + +#: templates/web/base/index-steps.html:26 +msgid "Enter details of the problem" +msgstr "請在此填寫問題的細節" + +#: templates/web/base/auth/token.html:5 +#: templates/web/base/errors/generic.html:1 +#: templates/web/base/errors/generic.html:3 +#: templates/web/base/tokens/abuse.html:1 +#: templates/web/base/tokens/abuse.html:3 +#: templates/web/base/tokens/error.html:1 +#: templates/web/base/tokens/error.html:3 +msgid "Error" +msgstr "錯誤" + +#: templates/web/base/admin/body.html:14 +#: templates/web/base/admin/category_edit.html:18 +msgid "Example postcode %s" +msgstr "郵遞區號範例 %s" + +#: templates/web/base/open311/index.html:94 +msgid "Examples:" +msgstr "範例：" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:55 +msgid "Explain what’s wrong, exactly where it is, and how long it’s been there…" +msgstr "說明什麼壞掉故障了，確切的地點以及它置於此處有多久了" + +#: templates/web/base/admin/body-form.html:81 +msgid "External URL" +msgstr "" + +#: templates/web/base/admin/category_edit.html:27 +#: templates/web/base/admin/report_edit.html:92 +msgid "Extra data:" +msgstr "其它資料：" + +#: templates/web/base/contact/submit.html:13 +msgid "Failed to send message" +msgstr "無法送出留言" + +#: templates/web/zurich/admin/index-dm.html:33 +#: templates/web/zurich/admin/index-sdm.html:30 +msgid "Filter report list" +msgstr "過濾初次申報 " + +#: templates/web/base/questionnaire/index.html:55 +#: templates/web/fixmystreet/questionnaire/index.html:74 +msgid "First time" +msgstr "首次" + +#: templates/web/base/admin/body.html:48 +msgid "Fix this by choosing an <strong>area covered</strong> in the <em>Edit body details</em> form below." +msgstr "選擇<strong>涵蓋的區域</strong> <em>編輯有關單位</em> 表單。" + +#: templates/web/base/header.html:24 +msgid "FixMyStreet" +msgstr "FixMyStreet" + +#: templates/web/base/admin/header.html:10 +msgid "FixMyStreet admin:" +msgstr "FixMyStreet 管理員:" + +#: templates/web/base/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 "" +"FixMyStree針對在地問題，提供各種 RSS 訂閱與電子郵件通知信，包括\n" +"某指定區域或政府部門內各類問題的通知\n" +"或是某一範圍內各類問題的通知" + +#: templates/web/base/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’s alerts, but will only appear in the \"Within the boundary\" alert\n" +"for the county council." +msgstr "" +"FixMyStreet 送出不同類別的問題申報給\n" +"適宜的地方政府機關，如果問題發生在某政府的轄區內\n" +"這樣處理或許的確適當。例如，塗鴉問題將\n" +"申報給里/區機構，所以會在里/區機關的通告上\n" +"而在地方政府的公告版上只會出現在轄內通知上" + +#: templates/web/base/admin/index.html:55 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:54 +#: templates/web/base/admin/report_edit.html:55 +#: templates/web/base/dashboard/index.html:142 +#: templates/web/base/dashboard/index.html:144 +#: templates/web/base/report/update-form.html:30 +#: templates/web/base/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/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:56 +msgid "Fixed - Council" +msgstr "已處理－地方政府" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:55 +msgid "Fixed - User" +msgstr "已處理－用戶" + +#: templates/web/base/my/my.html:35 +#: templates/web/fixmystreet/my/_problem-list.html:7 +msgid "Fixed reports" +msgstr "已處理之申報 " + +#: templates/web/base/admin/problem_row.html:37 +msgid "Fixed:" +msgstr "已處理:" + +#: templates/web/base/admin/body-form.html:89 +#: templates/web/zurich/admin/body-form.html:36 +msgid "Flag as deleted" +msgstr "標記警告為刪除 " + +#: templates/web/base/admin/report_blocks.html:16 +msgid "Flag user" +msgstr "標記警告用戶" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1197 +#: templates/web/base/admin/users.html:19 +msgid "Flagged" +msgstr "標記警告" + +#: templates/web/base/admin/flagged.html:1 +msgid "Flagged reports and users" +msgstr "標記警告申報與用戶" + +#: templates/web/base/admin/user-form.html:46 +msgid "Flagged users are listed on the <a href='%s'>flagged</a> page." +msgstr "標記警告用戶其已被列入 <a href='%s'>警告頁</a>" + +#: templates/web/base/admin/flagged.html:31 +msgid "Flagged users are not restricted in any way. This is just a list of users that have been marked for attention." +msgstr "被標記警告的用戶其權限不受影響，只是列入特別關注名單" + +#: templates/web/base/admin/report_edit.html:94 +#: templates/web/base/admin/user-form.html:52 +msgid "Flagged:" +msgstr "警告:" + +#: templates/web/base/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/base/admin/body-form.html:65 +msgid "For more information, see <a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>How FixMyStreet uses Mapit</a>." +msgstr "更多資訊，請詳見<a href='http://fixmystreet.org/customising/fms_and_mapit' class='admin-offsite-link'>如何使用 FixMyStreet 地圖標記</a>（英文）" + +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:32 +#: templates/web/fixmystreet/report/update-form.html:106 +msgid "Forgotten your password?" +msgstr "忘記您的密碼?" + +#: templates/web/base/faq/faq-en-gb.html:1 +#: templates/web/base/static/privacy.html:1 +#: templates/web/base/static/privacy.html:2 +msgid "Frequently Asked Questions" +msgstr "常見問題回覆 " + +#: templates/web/base/open311/index.html:136 +msgid "GeoRSS on Google Maps" +msgstr "google 地圖上的地理RSS" + +#: templates/web/fixmystreet/around/_updates.html:3 +#: templates/web/fixmystreet/report/display.html:35 +msgid "Get updates" +msgstr "取得更新" + +#: templates/web/fixmystreet/reports/_rss.html:3 +#: templates/web/fixmystreet/reports/_rss.html:9 +msgid "Get updates of %s problems" +msgstr "取得 %s問題之更新" + +#: templates/web/fixmystreet/reports/_rss.html:11 +#: templates/web/fixmystreet/reports/_rss.html:3 +msgid "Get updates of problems in this %s" +msgstr "取得 %s區域內的問題更新" + +#: templates/web/base/alert/_list.html:83 +#: templates/web/fixmystreet/alert/_list.html:82 +msgid "Give me an RSS feed" +msgstr "我要訂閱RSS" + +#: templates/web/base/questionnaire/completed.html:14 +msgid "Glad to hear it’s been fixed!" +msgstr "很高興聽到問題已處理了。" + +#: templates/web/base/alert/index.html:34 +#: templates/web/base/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/base/admin/report_edit.html:93 +msgid "Going to send questionnaire?" +msgstr "即將送出問卷？" + +#: templates/web/base/admin/index.html:43 +msgid "Graph of problem creation by status over time" +msgstr "隨時間産生的問題圖片" + +#: templates/web/base/reports/index.html:12 +msgid "Greyed-out lines are councils that no longer exist." +msgstr "灰色的地方政府機關表示為已不再存在" + +#: templates/web/base/questionnaire/index.html:37 +#: templates/web/fixmystreet/questionnaire/index.html:56 +msgid "Has this problem been fixed?" +msgstr "問題已處理了嗎?" + +#: templates/web/base/questionnaire/index.html:50 +#: templates/web/fixmystreet/questionnaire/index.html:69 +msgid "Have you ever reported a problem to a council before, or is this your first time?" +msgstr "您之前是否曾向地方政府申報過問題？或者此為您的首次申報？ " + +#: templates/web/base/footer.html:15 templates/web/fixmystreet/footer.html:30 +#: 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/base/alert/_list.html:6 +#: templates/web/fixmystreet/alert/_list.html:8 +msgid "Here are the types of local problem alerts for ‘%s’." +msgstr "此為在地問題的種類 ‘%s’." + +#: templates/web/fixmystreet/header.html:58 +#: templates/web/zurich/footer.html:11 +msgid "Hi %s" +msgstr "您好 %s" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:63 +#: templates/web/base/admin/report_edit.html:64 +#: templates/web/base/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:86 +#: templates/web/zurich/admin/report_edit.html:90 +#: templates/web/zurich/admin/stats.html:32 +#: templates/web/zurich/admin/update_edit.html:18 +msgid "Hidden" +msgstr "隱藏" + +#: templates/web/base/around/display_location.html:65 +msgid "Hide old" +msgstr "隱藏舊文" + +#: templates/web/base/around/display_location.html:60 +msgid "Hide pins" +msgstr "隱藏地圖標示" + +#: templates/web/base/admin/category_edit.html:84 +msgid "History" +msgstr "歷程 " + +#: templates/web/base/js/translation_strings.html:31 +msgid "Home" +msgstr "首頁" + +#: templates/web/base/index-steps.html:1 +msgid "How to report a problem" +msgstr "如何申報問題 " + +#: templates/web/base/js/translation_strings.html:33 +msgid "How to send successful reports" +msgstr "如何成功地送出申報" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:740 +msgid "I am afraid you cannot confirm unconfirmed reports." +msgstr "您不能確認此尚未確認之申報 " + +#: templates/web/base/tokens/confirm_problem.html:23 +#: templates/web/base/tokens/confirm_problem.html:27 +msgid "I just reported a problem on @fixmystreet" +msgstr "我剛才申報了一個問題 " + +#: templates/web/base/tokens/confirm_update.html:19 +#: templates/web/base/tokens/confirm_update.html:23 +msgid "I just updated a problem on @fixmystreet" +msgstr "我利用@fixmystreet 申報了一個問題 " + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:96 +msgid "I'm afraid we couldn't locate your problem in the database.\n" +msgstr " 我們無法在資料庫中找到您的問題。\n" + +#: perllib/FixMyStreet/App/Controller/Tokens.pm:327 +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 "們無法驗證此代號，如果您從電子郵件中複製了超連結網址，請檢查您複製是否正確。\n" + +#: templates/web/base/admin/flagged.html:14 +#: templates/web/base/admin/list_updates.html:6 +#: templates/web/base/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/base/admin/body-form.html:24 +#: templates/web/base/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 "" +"辨別<strong>上級主責</strong> 如果該有關單位為其它單位的下屬\n" +"基本安裝中，您不必加入有關單位" + +#: templates/web/base/admin/body.html:133 +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 "" +"如果同一區域有二位以上的負責單位, FixMyStreet 會合併一個可辨識的類別列入選單上單一條目\n" +"\n" +"如果你想這樣，請確保你在有關單位中使用同一類別。" + +#: templates/web/base/email_sent.html:19 +msgid "If you do not, your alert will not be activated." +msgstr "如果您選不，您的通知將不會生效" + +#: templates/web/base/email_sent.html:15 +msgid "If you do not, your problem will not be posted." +msgstr "如果您選擇不，您的問題將不會被貼出" + +#: templates/web/base/email_sent.html:17 +msgid "If you do not, your update will not be posted." +msgstr "如果您選擇不，您的更新將不會顯示" + +#: templates/web/base/questionnaire/completed.html:8 +msgid "If you get some more information about the status of your problem, please come back to the site and leave an update." +msgstr "如果你對申報之問題有進一步狀況，歡迎回到本站留言更新" + +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_none.html:8 +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 "您在此交付投訴問題的主旨與細節都將在此公開, 但此問題 <strong>n並不會</strong> 被呈遞給地方政府。" + +#: templates/web/base/auth/token.html:22 templates/web/base/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/base/questionnaire/index.html:59 +#: templates/web/fixmystreet/questionnaire/index.html:78 +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 "" +"如果您希望公開留言該問題之更新，請在此輸入\n" +"(請注意它不會自動送到地方政府)例如\n" +"您對於原問題已獲解決的體驗 " + +#: templates/web/base/admin/body.html:149 +msgid "If you're using <strong>a send method that is not email</strong>, enter the service ID (Open311) or equivalent identifier here." +msgstr "如果您使用 <strong>非電子郵件送出申訴方式</strong>, 請在此輸入此服務代號 (Open311) 或同等的代號。" + +#: templates/web/base/admin/body-form.html:207 +#: templates/web/base/admin/body-form.html:208 +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 "" +"如果您啟動上方Open311更新傳送 , Open311之更新 通常只有開啟或關閉二種狀態 \n" +"\n" +"啟動<strong>擴展 Open311 狀態</strong> ，可以讓您可以有更多的陳述可使用\n" +"\n" +"確認您的共同品牌支援此功能，再啟動它。" + +#: templates/web/base/admin/body-form.html:194 +#: templates/web/base/admin/body-form.html:195 +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 "" +"如果您啟動上方Open311更新傳送 ,確認 <strong>有選擇通知按鍵</strong> \n" +"\n" +"如您<strong>不想</strong> 一直收到問題更新通知，勿啟動它。" + +#: templates/web/base/admin/body-form.html:177 +#: templates/web/base/admin/body-form.html:178 +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 "" +"如果您已啟動上方Open311更新傳送 ，你必須找出哪一位\n" +"<strong>FixMyStreet</strong> 用戶可以是這些問題更新的發言者\n" +"一旦他們上線時。請輸入其帳戶ID(編號) " + +#: perllib/FixMyStreet/App/Controller/Contact.pm:132 +msgid "Illegal ID" +msgstr "無效帳戶" + +#: perllib/FixMyStreet/App/Controller/Alert.pm:100 +msgid "Illegal feed selection" +msgstr "無效的訂閱選項" + +#: templates/web/base/dashboard/index.html:142 +#: templates/web/base/dashboard/index.html:144 +#: templates/web/base/report/update-form.html:30 +#: templates/web/base/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/base/admin/flagged.html:39 +msgid "In abuse table?" +msgstr "濫用表格？" + +#: templates/web/base/open311/index.html:88 +msgid "In addition, the following attributes that are not part of the Open311 v2 specification are returned: agency_sent_datetime, title (also returned as part of description), interface_used, comment_count, requestor_name (only present if requestor allowed the name to be shown on this site)." +msgstr "此外，下列理由並非為Open311 v2更新特定部份回覆傳送: agency_sent_datetime, 主旨(部份回覆之敍述), interface_used, comment_count, requestor_name (只有在同意姓名公開下才會呈現)." + +#: perllib/FixMyStreet/Cobrand/Zurich.pm:144 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 +#: 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:99 +#: templates/web/zurich/report/banner.html:15 +msgid "In progress" +msgstr "處理中" + +#: templates/web/base/tokens/confirm_alert.html:11 +msgid "Inbox zero, here we come!" +msgstr "信箱已閱畢！" + +#: templates/web/zurich/admin/report_edit.html:160 +msgid "Include reporter personal details" +msgstr "包括申報人的個人細節" + +#: templates/web/base/admin/stats.html:76 +msgid "Include unconfirmed reports" +msgstr "包括未確認的申報 " + +#: perllib/FixMyStreet/App/Controller/Open311.pm:359 +msgid "Incorrect has_photo value \"%s\"" +msgstr "不正確的照片值數 \"%s\"" + +#: templates/web/zurich/admin/list_updates.html:3 +msgid "Internal notes" +msgstr "內部筆記" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:61 +msgid "Internal referral" +msgstr "內部推薦" + +#: perllib/FixMyStreet/App/Controller/Open311.pm:344 +msgid "Invalid agency_responsible value %s" +msgstr "無效的權責單位數值 %s" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1112 +msgid "Invalid end date" +msgstr "無效的結束日期" + +#: perllib/FixMyStreet/App/Controller/Open311.pm:437 +msgid "Invalid format %s specified." +msgstr "無效的%s 特定格式" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1108 +msgid "Invalid start date" +msgstr "無效的開始日期" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:50 +#: templates/web/base/dashboard/index.html:142 +#: templates/web/base/dashboard/index.html:143 +#: templates/web/base/report/update-form.html:30 +#: templates/web/base/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/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 "最快方式是 <a href=\"%s\">先查看問答集</a> ，看看答案是否在此" + +#: templates/web/base/tokens/confirm_problem.html:14 +msgid "It’s on its way to the council right now." +msgstr "正呈送給地方政府中" + +#: templates/web/base/auth/general.html:44 +#: templates/web/base/report/new/fill_in_details_form.html:131 +#: templates/web/base/report/update-form.html:104 +#: templates/web/fixmystreet/auth/general.html:47 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:28 +#: templates/web/fixmystreet/report/update-form.html:102 +#: templates/web/zurich/auth/general.html:40 +msgid "Keep me signed in on this computer" +msgstr "新增類別承辦人" + +#: templates/web/base/admin/body.html:70 +#: templates/web/zurich/admin/body.html:16 +msgid "Last editor" +msgstr "最後編輯 " + +#: templates/web/base/admin/report_edit.html:88 +msgid "Last update:" +msgstr "上回更新:" + +#: templates/web/base/admin/problem_row.html:39 +msgid "Last update:" +msgstr "上一次更新:" + +#: templates/web/base/admin/body-form.html:229 +msgid "Leave this blank if all reports to this body should be sent using the same send method (e.g., \"%s\")." +msgstr "如所有申報皆是用同樣方式送出(例如: \"%s\")，此處請保留空白 " + +#: templates/web/base/admin/body.html:27 +msgid "List all reported problems" +msgstr "列出所有申報的問題 " + +#: templates/web/base/report/new/category_wrapper.html:4 +msgid "Loading..." +msgstr "載入中...." + +#: templates/web/base/alert/choose.html:1 +#: templates/web/base/alert/choose.html:3 +#: templates/web/base/alert/index.html:1 templates/web/base/alert/index.html:3 +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:5 +#: templates/web/base/alert/updates.html:1 +#: templates/web/base/tokens/confirm_alert.html:1 +#: templates/web/fixmystreet/alert/updates.html:1 +msgid "Local RSS feeds and email alerts" +msgstr "當地問題訂閱與電郵通知" + +#: templates/web/base/alert/list.html:1 templates/web/base/alert/list.html:12 +#: templates/web/base/alert/list.html:14 templates/web/base/alert/list.html:3 +msgid "Local RSS feeds and email alerts for ‘%s’" +msgstr "當地問題訂閱與電郵通知 %s " + +#: templates/web/base/footer.html:13 templates/web/fixmystreet/footer.html:28 +msgid "Local alerts" +msgstr "當地問題 " + +#: templates/web/base/index-steps.html:25 +msgid "Locate the problem on a map of the area" +msgstr "在地圖上標記問題之區域" + +#: templates/web/base/js/translation_strings.html:43 +msgid "MAP" +msgstr "地圖" + +#: templates/web/base/js/translation_strings.html:45 +#: templates/web/base/maps/google-ol.html:13 +msgid "Map" +msgstr "地圖" + +#: templates/web/base/admin/report_edit.html:86 +#, fuzzy +msgid "Mark as sent" +msgstr "標註為關閉" + +#: templates/web/base/admin/user-form.html:44 +msgid "Mark users whose behaviour you want to keep a check on as <strong>flagged</strong>." +msgstr "標註用戶哪些行為您將要給予<strong>警告標記</strong>." + +#: templates/web/base/reports/index.html:24 +msgid "Marked fixed/closed in the past eight weeks" +msgstr "" + +#: templates/web/base/reports/index.html:25 +msgid "Marked fixed/closed more than eight weeks ago" +msgstr "" + +#: templates/web/fixmystreet/contact/index.html:106 +msgid "Message" +msgstr "留言" + +#: templates/web/base/contact/index.html:97 +msgid "Message:" +msgstr "留言" + +#: perllib/FixMyStreet/App/Controller/Open311.pm:445 +msgid "Missing jurisdiction_id" +msgstr "遺失 jurisdiction_id" + +#: templates/web/zurich/admin/stats.html:34 +msgid "Moderated by division within one working day" +msgstr "一個工作天內協調出部門" + +#: templates/web/base/admin/stats.html:11 +msgid "Month" +msgstr "月份" + +#: templates/web/base/report/display.html:34 +msgid "More problems nearby" +msgstr "更多鄰近的問題 " + +#: templates/web/base/admin/bodies.html:21 +#: templates/web/base/admin/body-form.html:18 +#: templates/web/base/admin/flagged.html:16 +#: templates/web/base/admin/flagged.html:37 +#: templates/web/base/admin/list_updates.html:7 +#: templates/web/base/admin/reports.html:13 +#: templates/web/base/admin/users.html:15 +#: templates/web/base/reports/index.html:20 +#: templates/web/fixmystreet/auth/general.html:53 +#: templates/web/fixmystreet/report/new/form_user_loggedin.html:9 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:44 +#: templates/web/fixmystreet/report/update-form.html:138 +#: 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:77 +msgid "Name" +msgstr "名字" + +#: templates/web/base/admin/report_edit.html:79 +#: templates/web/base/admin/update_edit.html:32 +#: templates/web/base/admin/user-form.html:18 +#: templates/web/zurich/admin/report_edit-sdm.html:43 +#: templates/web/zurich/admin/report_edit.html:56 +#: templates/web/zurich/admin/stats.html:41 +msgid "Name:" +msgstr "名字：" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:313 +msgid "Name: %s" +msgstr "名字： %s" + +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:160 +#: perllib/FixMyStreet/Geocode/OSM.pm:145 +msgid "Nearest named road to the pin placed on the map (automatically generated using OpenStreetMap): %s%s" +msgstr "找出地圖標記上最近的街道名稱(利用 OpenStreetMap自動産生): %s%s" + +#: perllib/FixMyStreet/Cobrand/UK.pm:127 +msgid "Nearest postcode to the pin placed on the map (automatically generated): %s (%sm away)" +msgstr "找出地圖標記上最近的郵遞區號(自動産生): %s(%sm away)" + +#: perllib/FixMyStreet/Cobrand/Default.pm:442 +#: perllib/FixMyStreet/Cobrand/Default.pm:482 +msgid "Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s" +msgstr "找出地圖標記上最近的街道(利用 Bing Maps自動産生): %s" + +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:277 +msgid "" +"Nearest road to the pin placed on the map (automatically generated by Bing Maps): %s\n" +"\n" +msgstr "" +"找出地圖標記上最近的街道(利用 Bing Maps自動産生): %s\n" +"\n" + +#: templates/web/base/email_sent.html:3 +msgid "Nearly Done! Now check your email..." +msgstr "差不多快完成了，現在檢查您的電子信箱" + +#: templates/web/base/reports/index.html:21 +msgid "New <br>problems" +msgstr "新 <br>問題 " + +#: perllib/FixMyStreet/App/Controller/Admin.pm:261 +msgid "New body added" +msgstr "新增內文" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:379 +msgid "New category contact added" +msgstr "新增類別承辦 人" + +#: templates/web/zurich/admin/report_edit-sdm.html:55 +#: templates/web/zurich/admin/report_edit.html:81 +msgid "New internal note:" +msgstr "新內部筆記" + +#: db/alert_types.pl:18 db/alert_types.pl:22 +msgid "New local problems on FixMyStreet" +msgstr "FixMyStreet之新近當地問題 " + +#: db/alert_types_eha.pl:12 +msgid "New local reports on reportemptyhomes.com" +msgstr "reportemptyhomes.com 上之新近申報 " + +#: db/alert_types.pl:38 +msgid "New problems for {{COUNCIL}} within {{WARD}} ward on FixMyStreet" +msgstr "FixMyStreet上{{里/區}}{{地方政府}} 之新近問題" + +#: db/alert_types.pl:26 db/alert_types.pl:30 +msgid "New problems near {{POSTCODE}} on FixMyStreet" +msgstr " FixMyStreet上{{郵遞區號}} 之新近問題 " + +#: db/alert_types.pl:10 +msgid "New problems on FixMyStreet" +msgstr " FixMyStreet上新進問題 " + +#: db/alert_types.pl:34 +msgid "New problems to {{COUNCIL}} on FixMyStreet" +msgstr " FixMyStreet上給{{地方政府}} 之新近問題 " + +#: db/alert_types.pl:42 +msgid "New problems within {{NAME}}'s boundary on FixMyStreet" +msgstr " FixMyStree{{Name}} 範圍 之新近問題 " + +#: 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 "reportemptyhomes.com{{里/區}}{{地方政府}} 之新近問題" + +#: db/alert_types_eha.pl:5 +msgid "New reports on reportemptyhomes.com" +msgstr "reportemptyhomes.com新近問題 " + +#: db/alert_types_eha.pl:16 +msgid "New reports on reportemptyhomes.com near {{POSTCODE}}" +msgstr "reportemptyhomes.com上{{郵遞區號}} 之新近問題 " + +#: db/alert_types_eha.pl:19 +msgid "New reports to {{COUNCIL}} on reportemptyhomes.com" +msgstr "reportemptyhomes.com上給{{地方政府}} 之新近問題 " + +#: db/alert_types_eha.pl:27 +msgid "New reports within {{NAME}}'s boundary on reportemptyhomes.com" +msgstr "reportemptyhomes.com{{Name}} 範圍 之新近問題 " + +#: templates/web/base/admin/questionnaire.html:24 +msgid "New state" +msgstr "新陳述" + +#: templates/web/zurich/admin/report_edit-sdm.html:58 +msgid "New update:" +msgstr "好" + +#: templates/web/base/pagination.html:13 +msgid "Next" +msgstr "下一步" + +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 +#: templates/web/base/admin/category_edit.html:4 +#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:34 +#: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/problem_row.html:20 +#: templates/web/base/admin/report_edit.html:77 +#: templates/web/base/admin/report_edit.html:93 +#: templates/web/base/admin/update_edit.html:25 +#: templates/web/base/questionnaire/creator_fixed.html:16 +#: templates/web/base/questionnaire/index.html:44 +#: templates/web/base/questionnaire/index.html:83 +#: templates/web/fixmystreet/questionnaire/index.html:102 +#: templates/web/fixmystreet/questionnaire/index.html:63 +msgid "No" +msgstr "無" + +#: templates/web/base/admin/user-form.html:33 +msgid "No body" +msgstr "無有關單位" + +#: templates/web/base/admin/stats.html:85 +msgid "No council" +msgstr "無地方政府" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:401 +msgid "No council selected" +msgstr "未選擇地方政府" + +#: templates/web/base/admin/edit-league.html:17 +msgid "No edits have yet been made." +msgstr "尚未編 輯申報內容" + +#: templates/web/base/admin/flagged.html:25 +msgid "No flagged problems found." +msgstr "未發現標記警告問題 " + +#: templates/web/base/admin/flagged.html:58 +msgid "No flagged users found." +msgstr "未發現標記警告用戶" + +#: templates/web/zurich/admin/report_edit-sdm.html:65 +msgid "No further updates" +msgstr "尚無更新" + +#: templates/web/base/around/around_map_list_items.html:17 +#: templates/web/fixmystreet/around/around_map_list_items.html:8 +msgid "No problems found." +msgstr "找無問題" + +#: templates/web/base/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/base/js/translation_strings.html:38 +msgid "No result returned" +msgstr "查無結果" + +#: templates/web/base/admin/body-form.html:60 +#: templates/web/base/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 "" +"某區目前尚無資籵，因為<code>MAPIT_URL</code> 您的地圖檔設定\n" +"未指MapIt 服務。" + +#: templates/web/base/report/_support.html:2 +#: templates/web/base/report/_support.html:4 +msgid "No supporters" +msgstr "無支援" + +#: templates/web/base/admin/report_edit.html:41 +#: templates/web/zurich/admin/report_edit-sdm.html:46 +#: templates/web/zurich/admin/report_edit.html:60 +msgid "None" +msgstr "沒有" + +#: templates/web/base/admin/user-form.html:24 +#: templates/web/base/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 "" +"一般(公眾)用戶不會與 <strong>政府相關單位</strong>有所聯繫<br>\n" +"有權限的工作人員用戶可能和其代表政府機關相關聯<br>\n" +"這要看具體落實執行狀況，工作人員可能有權使用控制台(其關構下的\n" +"所有活動總覧)。也有能力隱暪某些申報或更改某些申報的狀況。" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 +#: templates/web/base/report/update-form.html:30 +#: templates/web/base/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:18 +msgid "Not for my subdivision" +msgstr "非下屬單位" + +#: templates/web/base/admin/questionnaire.html:6 +msgid "Not reported before" +msgstr "之前未申報過" + +#: templates/web/base/report/_main.html:62 +msgid "Not reported to council" +msgstr "未呈報給地方政府" + +#: templates/web/base/admin/body.html:71 +#: templates/web/base/admin/category_edit.html:92 +#: templates/web/zurich/admin/body.html:17 +msgid "Note" +msgstr "註記" + +#: templates/web/base/admin/stats.html:51 +msgid "Note that when including unconfirmed reports we use the date the report was created which may not be in the same month the report was confirmed so the numbers may jump about a little" +msgstr "請注意這裏包括了本月份總結撰寫前，尚未確認的申報，所以數目可能稍有降低。" + +#: templates/web/base/admin/body.html:186 +#: templates/web/base/admin/category_edit.html:49 +#: templates/web/zurich/admin/body.html:53 +msgid "Note:" +msgstr "註記:" + +#: templates/web/base/open311/index.html:73 +msgid "Note: <strong>%s</strong>" +msgstr "筆記: <strong>%s</strong>" + +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:10 +msgid "Now to submit your report…" +msgstr "現在送出您的申報 …" + +#: templates/web/base/report/new/fill_in_details_form.html:113 +msgid "Now to submit your report… do you have a FixMyStreet password?" +msgstr "現在送出您的申報 … 您是否有本站帳密？" + +#: templates/web/fixmystreet/report/update-form.html:85 +msgid "Now to submit your update…" +msgstr "現在送出您更新的申報 … 您是否有本站帳密？" + +#: templates/web/base/report/update-form.html:86 +msgid "Now to submit your update… do you have a FixMyStreet password?" +msgstr "現在送出您更新的申報 …" + +#: templates/web/base/js/translation_strings.html:42 +msgid "OK" +msgstr "好了" + +#: templates/web/base/report/display.html:28 +#: templates/web/base/report/update.html:17 +msgid "Offensive? Unsuitable? Tell us" +msgstr "受到羞辱？不適當？請 告訴我們" + +#: templates/web/base/reports/index.html:23 +msgid "Old / unknown <br>problems" +msgstr "老/ 未知 <br>問題 " + +#: templates/web/base/admin/questionnaire.html:24 +msgid "Old state" +msgstr "舊陳述" + +#: templates/web/base/reports/index.html:25 +msgid "Older <br>fixed" +msgstr "己解決之舊問題 " + +#: templates/web/base/reports/index.html:22 +msgid "Older <br>problems" +msgstr "舊問題 " + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:45 +msgid "One-line summary" +msgstr "一句總結" + +#: perllib/FixMyStreet/Cobrand/Zurich.pm:138 +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:49 +#: templates/web/base/admin/report_edit.html:50 +#: templates/web/base/admin/update_edit.html:28 +#: templates/web/base/dashboard/index.html:142 +#: templates/web/base/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:86 +#: templates/web/zurich/admin/report_edit.html:88 +#: templates/web/zurich/admin/update_edit.html:18 +#: templates/web/zurich/report/banner.html:11 +msgid "Open" +msgstr "開放" + +#: templates/web/base/reports/index.html:22 +msgid "Open for more than four weeks, with an update within the past eight weeks" +msgstr "" + +#: templates/web/base/my/my.html:30 +#: templates/web/fixmystreet/my/_problem-list.html:2 +msgid "Open reports" +msgstr "開啟申報 " + +#: templates/web/base/reports/index.html:23 +msgid "Open, but not had any update in eight weeks" +msgstr "" + +#: templates/web/base/open311/index.html:70 +msgid "Open311 API for the mySociety FixMyStreet server" +msgstr "Open311 API for the mySociety FixMyStreet server" + +#: templates/web/base/open311/index.html:80 +msgid "Open311 initiative web page" +msgstr "Open311 啟動網頁" + +#: templates/web/base/open311/index.html:81 +msgid "Open311 specification" +msgstr "Open311 規範 " + +#: templates/web/base/alert/_list.html:58 +#: templates/web/fixmystreet/alert/_list.html:60 +msgid "Or problems reported to:" +msgstr "或將此問題 申報給:" + +#: templates/web/base/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’re in:" +msgstr "您可以訂閱 里/區內的更新通知" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:1061 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:666 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:667 +#: perllib/FixMyStreet/DB/Result/Problem.pm:565 +#: perllib/FixMyStreet/DB/Result/Problem.pm:575 +#: perllib/FixMyStreet/DB/Result/Problem.pm:585 +#: perllib/FixMyStreet/DB/Result/Problem.pm:597 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:378 +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:393 +msgid "Other" +msgstr "其它" + +#: templates/web/base/footer.html:27 +msgid "Our code is open source and <a href=\"http://github.com/mysociety/fixmystreet\">available on GitHub</a>." +msgstr "我們的原始碼可在 <a href=\"http://github.com/mysociety/fixmystreet\">GitHub</a>取得" + +#: templates/web/base/admin/list_updates.html:8 +msgid "Owner" +msgstr "物主" + +#: templates/web/base/errors/page_error_404_not_found.html:1 +#: templates/web/base/errors/page_error_404_not_found.html:3 +msgid "Page Not Found" +msgstr "找無此頁" + +#: templates/web/base/admin/body-form.html:31 +#: templates/web/zurich/admin/body-form.html:14 +msgid "Parent" +msgstr "上級 " + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 +msgid "Partial" +msgstr "部份" + +#: templates/web/fixmystreet/auth/general.html:56 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:68 +#: templates/web/fixmystreet/report/update-form.html:116 +#: templates/web/zurich/auth/general.html:32 +#: templates/web/zurich/auth/general.html:63 +msgid "Password (optional)" +msgstr "密碼(任選):" + +#: templates/web/base/auth/change_password.html:25 +msgid "Password:" +msgstr "密碼:" + +#: templates/web/base/js/translation_strings.html:48 +msgid "Permalink" +msgstr "永久連結" + +#: templates/web/zurich/report/new/fill_in_details_form.html:83 +msgid "Phone number" +msgstr "電話號碼" + +#: templates/web/fixmystreet/report/new/form_user_loggedin.html:26 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:62 +msgid "Phone number (optional)" +msgstr "電話號碼(非必填)" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:291 +#: templates/web/base/admin/report_edit.html:81 +#: templates/web/base/report/new/fill_in_details_form.html:197 +#: templates/web/zurich/admin/report_edit-sdm.html:46 +#: templates/web/zurich/admin/report_edit.html:60 +#: templates/web/zurich/admin/stats.html:39 +msgid "Phone:" +msgstr "電話" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:66 +#: 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:51 +msgid "Photo" +msgstr "照片" + +#: templates/web/base/questionnaire/index.html:71 +#: templates/web/base/report/new/fill_in_details_form.html:84 +#: templates/web/base/report/update-form.html:62 +#: templates/web/fixmystreet/questionnaire/index.html:91 +msgid "Photo:" +msgstr "照片:" + +#: templates/web/base/alert/list.html:26 +msgid "Photos of recent nearby reports" +msgstr "最近申報之照片" + +#: templates/web/base/js/translation_strings.html:30 +msgid "Place pin on map" +msgstr "在地圖上作標記" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:51 +#: templates/web/base/dashboard/index.html:142 +#: templates/web/base/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:86 +#: templates/web/zurich/admin/report_edit.html:89 +msgid "Planned" +msgstr "已規劃" + +#: templates/web/fixmystreet/questionnaire/index.html:45 +msgid "Please <a class=\"tab_link\" href=\"#report\">take a look</a> at the updates that have been left." +msgstr "請<a class=\"tab_link\" href=\"#report\">按此查看</a> 最近更新" + +#: templates/web/base/report/new/notes.html:5 +msgid "Please be polite, concise and to the point." +msgstr "用語請遵守禮節，明確解釋問題 " + +#: templates/web/base/auth/change_password.html:12 +#: templates/web/base/auth/change_password.html:17 +msgid "Please check the passwords and try again" +msgstr "請再次確認您的密碼" + +#: templates/web/base/auth/token.html:14 +msgid "Please check your email" +msgstr "請檢查您的電子郵件" + +#: templates/web/base/auth/general.html:14 +#: templates/web/base/auth/general.html:8 +#: templates/web/fixmystreet/auth/general.html:10 +#: templates/web/fixmystreet/auth/general.html:16 +#: 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/Admin.pm:343 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:876 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:925 +#: perllib/FixMyStreet/DB/Result/Problem.pm:412 +#: templates/web/base/js/translation_strings.html:9 +msgid "Please choose a category" +msgstr "請選擇類別" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:418 +msgid "Please choose a property type" +msgstr "選擇公物種類" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:370 +msgid "Please correct the errors below" +msgstr "請更正下方之錯誤" + +#: templates/web/base/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 "" +"請<strong>勿</strong> 透過本表單申報問題; 留言會跑到\n" +"FixMyStreet維護團隊,而不是地方政府。要申報問題\n" +"請到 <a href=\"/\">首頁</a> 按指示操作。" + +#: templates/web/base/report/new/notes.html:6 +msgid "Please do not be abusive — abusing your council devalues the service for all users." +msgstr "請勿濫用本服務，濫用將造成您的政府輕視其它使用者之意見 " + +#: perllib/FixMyStreet/App/Controller/Admin.pm:346 +#: perllib/FixMyStreet/DB/Result/Comment.pm:125 +#: templates/web/base/js/translation_strings.html:2 +msgid "Please enter a message" +msgstr "請寫下您的留言" + +#: templates/web/base/auth/change_password.html:12 +#: templates/web/base/auth/change_password.html:15 +#: templates/web/base/js/translation_strings.html:19 +msgid "Please enter a password" +msgstr "請輸入密碼" + +#: perllib/FixMyStreet/App/Controller/Contact.pm:113 +#: perllib/FixMyStreet/DB/Result/Problem.pm:395 +#: templates/web/base/js/translation_strings.html:3 +msgid "Please enter a subject" +msgstr "請填下主旨" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1048 +#: perllib/FixMyStreet/App/Controller/Admin.pm:345 +#: perllib/FixMyStreet/App/Controller/Admin.pm:995 +#: perllib/FixMyStreet/DB/Result/User.pm:127 +#: templates/web/base/js/translation_strings.html:12 +#: templates/web/base/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:123 +msgid "Please enter a valid email address" +msgstr "請輸入有效的電子郵件" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:398 +#: templates/web/base/js/translation_strings.html:4 +msgid "Please enter some details" +msgstr "請填寫進一步細節" + +#: perllib/FixMyStreet/App/Controller/Contact.pm:112 +#: perllib/FixMyStreet/DB/Result/User.pm:124 +#: templates/web/base/auth/general.html:13 +#: templates/web/base/auth/general.html:8 +#: templates/web/base/js/translation_strings.html:11 +#: templates/web/base/js/translation_strings.html:15 +#: templates/web/fixmystreet/auth/general.html:10 +#: templates/web/fixmystreet/auth/general.html:15 +#: 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/form_user_loggedout.html:7 +#: templates/web/zurich/report/new/fill_in_details_form.html:75 +msgid "Please enter your email address" +msgstr "請輸入您的電子郵件" + +#: templates/web/base/js/translation_strings.html:25 +msgid "Please enter your first name" +msgstr "請輸入您的大名" + +#: perllib/FixMyStreet/Cobrand/UK.pm:318 +#: templates/web/base/js/translation_strings.html:7 +msgid "Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below" +msgstr "請輸入您的全名，地方政府需要此資料 – 如果您不希望名字公開在網站上，請在下面方格中劃掉勾選。" + +#: perllib/FixMyStreet/App/Controller/Contact.pm:111 +#: perllib/FixMyStreet/DB/Result/Comment.pm:122 +#: perllib/FixMyStreet/DB/Result/Problem.pm:406 +#: perllib/FixMyStreet/DB/Result/User.pm:120 +#: templates/web/base/js/translation_strings.html:6 +msgid "Please enter your name" +msgstr "請輸入您的姓氐" + +#: templates/web/base/js/translation_strings.html:22 +msgid "Please enter your phone number" +msgstr "請輸入您的電話號碼" + +#: templates/web/base/js/translation_strings.html:26 +msgid "Please enter your second name" +msgstr "請輸入您的別名" + +#: templates/web/base/js/translation_strings.html:24 +msgid "Please enter your title" +msgstr "請輸入您的稱呼" + +#: templates/web/base/auth/sign_out.html:5 +#: templates/web/zurich/auth/sign_out.html:5 +msgid "Please feel free to <a href=\"%s\">sign in again</a>, or go back to the <a href=\"/\">front page</a>." +msgstr "歡迎<a href=\"%s\">再次登入</a>, 或是再次光臨 <a href=\"/\">本網站</a>." + +#: templates/web/base/report/new/fill_in_details_text.html:1 +#: templates/web/base/report/new/fill_in_details_text.html:8 +msgid "Please fill in details of the problem below." +msgstr "請在下方輸入問題的細節" + +#: templates/web/zurich/report/new/fill_in_details_form.html:46 +msgid "Please fill in details of the problem." +msgstr "請在此填寫問題的細節" + +#: templates/web/base/report/new/fill_in_details_form.html:28 +#: templates/web/fixmystreet/report/new/sidebar.html:7 +#: 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:251 +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/base/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/base/report/new/fill_in_details_form.html:8 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:21 +#: 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 "請注意您的申報還<strong>未送出</strong>. 選擇合適類別及進一步資訊，再予送出。" + +#: templates/web/base/report/new/notes.html:1 +#: templates/web/zurich/report/new/notes.html:1 +msgid "Please note:" +msgstr "請加註記" + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:254 +msgid "Please provide some explanation as to why you're reopening this report" +msgstr "如果您是再次申報，請說明原因" + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:261 +msgid "Please provide some text as well as a photo" +msgstr "請提供一些文字敍述與照片" + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:124 +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:247 +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:243 +msgid "Please state whether or not the problem has been fixed" +msgstr "請敍明該問題是否已解決" + +#: templates/web/base/questionnaire/index.html:26 +msgid "Please take a look at the updates that have been left." +msgstr "請看看目前的最新狀況" + +#: perllib/FixMyStreet/App/Controller/Photo.pm:177 +#: perllib/FixMyStreet/App/Controller/Photo.pm:187 +#: perllib/FixMyStreet/App/Controller/Photo.pm:189 +msgid "Please upload a JPEG image only" +msgstr "請上傳JPEG格式照片" + +#: perllib/FixMyStreet/App/Controller/Contact.pm:114 +msgid "Please write a message" +msgstr "諘寫下您的留言" + +#: templates/web/fixmystreet/report/update-form.html:23 +msgid "Please write your update here" +msgstr "請寫下您的更新" + +#: templates/web/base/contact/index.html:100 +#: templates/web/base/report/update-form.html:109 +#: templates/web/base/report/update-form.html:131 +#: templates/web/base/report/update-form.html:72 +#: templates/web/fixmystreet/contact/index.html:113 +#: templates/web/fixmystreet/report/update-form.html:124 +#: templates/web/fixmystreet/report/update-form.html:71 +#: templates/web/fixmystreet/report/update-form.html:97 +msgid "Post" +msgstr "張貼" + +#: templates/web/base/report/updates.html:15 +msgid "Posted anonymously at %s" +msgstr "匿名張貼 %s" + +#: templates/web/base/report/updates.html:22 +msgid "Posted by %s (<strong>%s</strong>) at %s" +msgstr "由%s (<strong>%s</strong>) 在%s" + +#: templates/web/base/report/updates.html:24 +msgid "Posted by %s at %s" +msgstr "由 %s 在 %s 張貼" + +#: templates/web/base/pagination.html:7 +msgid "Previous" +msgstr "之前" + +#: templates/web/fixmystreet/footer.html:32 +msgid "Privacy" +msgstr "隱私" + +#: templates/web/base/admin/body.html:202 +#: templates/web/base/admin/body.html:85 +#: templates/web/base/admin/category_edit.html:45 +#: templates/web/base/admin/report_edit.html:95 +msgid "Private" +msgstr "私人" + +#: templates/web/base/maps/openlayers.html:89 +msgid "Problem" +msgstr "問題" + +#: templates/web/base/admin/timeline.html:22 +msgid "Problem %d created" +msgstr "%d提出的問題" + +#: templates/web/base/admin/timeline.html:24 +msgid "Problem %s confirmed" +msgstr "%s 問題已被確認 " + +#: templates/web/base/admin/timeline.html:26 +msgid "Problem %s sent to council %s" +msgstr "%s 問題已送達到地方政府 %s " + +#: templates/web/base/admin/index.html:47 +#: templates/web/zurich/admin/index.html:9 +msgid "Problem breakdown by state" +msgstr "本站出現故障問題 " + +#: perllib/FixMyStreet/App/Controller/Admin.pm:966 +msgid "Problem marked as open." +msgstr "問題標註為開放" + +#: templates/web/base/admin/questionnaire.html:21 +msgid "Problem state change based on survey results" +msgstr "依調查結果呈現的問題改善" + +#: templates/web/base/admin/flagged.html:10 +msgid "Problems" +msgstr "問題" + +#: templates/web/base/around/_updates.html:1 +msgid "Problems in this area" +msgstr "本區域內的問題" + +#: templates/web/fixmystreet/around/tabbed_lists.html:4 +#: templates/web/fixmystreet/report/display.html:43 +msgid "Problems nearby" +msgstr "鄰近的問題" + +#: templates/web/fixmystreet/around/tabbed_lists.html:3 +#: templates/web/fixmystreet/report/display.html:41 +msgid "Problems on the map" +msgstr "地圖上的問題" + +#: db/alert_types.pl:14 +msgid "Problems recently reported fixed on FixMyStreet" +msgstr "FixMyStreet 最近回報的已修復問題 " + +#: templates/web/base/alert/_list.html:19 +#: templates/web/fixmystreet/alert/_list.html:21 +msgid "Problems within %.1fkm of this location" +msgstr "該地點 %.1f公里內的問題 " + +#: perllib/FixMyStreet/Cobrand/Default.pm:650 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:120 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:139 +#: perllib/FixMyStreet/Cobrand/UK.pm:207 +msgid "Problems within %s" +msgstr "在 %s 內的問題" + +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:128 +#: perllib/FixMyStreet/Cobrand/UK.pm:221 +msgid "Problems within %s ward" +msgstr "在 %s 里/區的問題" + +#: templates/web/base/reports/body.html:0 +#: templates/web/base/reports/body.html:24 +msgid "Problems within %s, FixMyStreet" +msgstr "在 %s 的問題, FixMyStreet" + +#: templates/web/base/alert/_list.html:40 +#: 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 "reportemptyhomes.com近期送回處理之公物 " + +#: templates/web/base/admin/report_edit.html:45 +msgid "Property address:" +msgstr "公物地址：" + +#: templates/web/base/report/new/category.html:8 +msgid "Property type:" +msgstr "公物種類" + +#: templates/web/base/report/update-form.html:3 +#: templates/web/fixmystreet/report/update-form.html:4 +msgid "Provide an update" +msgstr "提供更新資訊" + +#: templates/web/fixmystreet/auth/general.html:59 +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/base/report/new/fill_in_details_form.html:155 +#: templates/web/base/report/update-form.html:128 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:71 +#: templates/web/fixmystreet/report/update-form.html:119 +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/zurich/admin/report_edit.html:195 +#: templates/web/zurich/admin/report_edit.html:211 +msgid "Public response:" +msgstr "公眾反應" + +#: templates/web/zurich/admin/report_edit.html:77 +#: templates/web/zurich/admin/stats.html:38 +msgid "Publish photo" +msgstr "發出照片" + +#: templates/web/zurich/admin/report_edit.html:219 +msgid "Publish the response" +msgstr "公開此回應" + +#: templates/web/base/questionnaire/completed.html:1 +#: templates/web/base/questionnaire/index.html:0 +#: templates/web/base/questionnaire/index.html:14 +#: templates/web/base/questionnaire/index.html:4 +#: templates/web/fixmystreet/questionnaire/index.html:0 +#: templates/web/fixmystreet/questionnaire/index.html:15 +#: templates/web/fixmystreet/questionnaire/index.html:33 +#: templates/web/fixmystreet/questionnaire/index.html:5 +msgid "Questionnaire" +msgstr "問卷" + +#: templates/web/base/admin/timeline.html:30 +msgid "Questionnaire %d answered for problem %d, %s to %s" +msgstr " %d回覆之問題%d, %s 到 %s 問卷 " + +#: templates/web/base/admin/timeline.html:28 +msgid "Questionnaire %d sent for problem %d" +msgstr "關於 %d問題所送出之 %d問卷 " + +#: perllib/FixMyStreet/App/Controller/Questionnaire.pm:200 +msgid "Questionnaire filled in by problem reporter" +msgstr "由問題申報者所填之問卷" + +#: templates/web/base/alert/_list.html:21 +#: templates/web/base/around/display_location.html:1 +#: templates/web/base/around/display_location.html:3 +#: templates/web/base/report/display.html:50 +#: templates/web/base/reports/_rss.html:1 +#: templates/web/fixmystreet/alert/_list.html:22 +#: templates/web/fixmystreet/alert/updates.html:9 +#: templates/web/fixmystreet/report/display.html:58 +msgid "RSS feed" +msgstr "RSS訂閱" + +#: perllib/FixMyStreet/Cobrand/UK.pm:250 perllib/FixMyStreet/Cobrand/UK.pm:262 +msgid "RSS feed for %s" +msgstr "%s RSS訂閱" + +#: perllib/FixMyStreet/Cobrand/UK.pm:256 perllib/FixMyStreet/Cobrand/UK.pm:268 +msgid "RSS feed for %s ward, %s" +msgstr "%s里/區 RSS訂閱" + +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:155 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:163 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:173 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:181 +#: perllib/FixMyStreet/Cobrand/UK.pm:276 perllib/FixMyStreet/Cobrand/UK.pm:288 +msgid "RSS feed of %s" +msgstr "%s RSS訂閱" + +#: perllib/FixMyStreet/Cobrand/UK.pm:281 perllib/FixMyStreet/Cobrand/UK.pm:293 +msgid "RSS feed of %s, within %s ward" +msgstr "%s, 在%s 里/區" + +#: templates/web/base/alert/_list.html:21 +#: templates/web/fixmystreet/alert/_list.html:22 +msgid "RSS feed of nearby problems" +msgstr " RSS訂閱 %s區域問題" + +#: templates/web/base/reports/_rss.html:1 +msgid "RSS feed of problems in this %s" +msgstr "此 %s 問題之RSS 訂閱" + +#: perllib/FixMyStreet/Cobrand/Default.pm:651 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:121 +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:138 +#: perllib/FixMyStreet/Cobrand/UK.pm:214 +msgid "RSS feed of problems within %s" +msgstr "在 %s 內之問題RSS 訂閱" + +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:127 +#: perllib/FixMyStreet/Cobrand/UK.pm:220 +msgid "RSS feed of problems within %s ward" +msgstr "在 %s 里/區問題的RSS 訂閱" + +#: templates/web/base/around/display_location.html:1 +#: templates/web/base/around/display_location.html:4 +msgid "RSS feed of recent local problems" +msgstr "最近當地問題的RSS訂閱" + +#: templates/web/base/report/display.html:50 +#: templates/web/fixmystreet/alert/updates.html:9 +#: templates/web/fixmystreet/report/display.html:58 +msgid "RSS feed of updates to this problem" +msgstr "最近當地問題更新的RSS訂閱" + +#: templates/web/base/alert/updates.html:9 +#: templates/web/base/report/display.html:41 +#: templates/web/fixmystreet/alert/updates.html:14 +#: templates/web/fixmystreet/report/display.html:60 +msgid "Receive email when updates are left on this problem." +msgstr "透過電子郵件收取該問題之更新消息" + +#: templates/web/base/around/display_location.html:0 +#: templates/web/base/around/display_location.html:33 +msgid "Recent local problems, FixMyStreet" +msgstr "FixMyStreet 近期的當地問題 " + +#: templates/web/base/reports/index.html:24 +msgid "Recently <br>fixed" +msgstr "最新 <br>解決" + +#: templates/web/base/index.html:30 +#: templates/web/fixmystreet/front/recent.html:11 +msgid "Recently reported problems" +msgstr "近期申報之問題 " + +#: templates/web/zurich/report/new/notes.html:5 +msgid "Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website." +msgstr "記住 FixMyStreet主要為申報可修復之物理性問題。如果您的問題不適合透過本網站投送，請直接到地方政府各機關之網站。 " + +#: templates/web/base/admin/report_blocks.html:16 +msgid "Remove flag" +msgstr "移除標記" + +#: templates/web/base/admin/report_edit.html:110 +#: templates/web/base/admin/update_edit.html:62 +#: templates/web/zurich/admin/update_edit.html:35 +msgid "Remove photo (can't be undone!)" +msgstr "移陯照片(無法回復)" + +#: templates/web/fixmystreet/header_logo.html:2 +msgid "Report" +msgstr "" + +#: templates/web/base/footer.html:7 templates/web/fixmystreet/footer.html:22 +#: templates/web/fixmystreet/header_logo.html:2 +#: 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:32 +msgid "Report abuse" +msgstr "申報濫用" + +#: perllib/FixMyStreet/App/Controller/Rss.pm:295 +msgid "Report on %s" +msgstr "在%s 申報 " + +#: templates/web/base/report/new/fill_in_details_form.html:1 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:2 +msgid "Report your problem" +msgstr "申報你的問題" + +#: templates/web/base/index.html:11 +#: templates/web/fixmystreet/around/intro.html:1 +#: templates/web/zurich/around/intro.html:1 +msgid "Report, view, or discuss local problems" +msgstr "申報，檢視，或討論在地問題" + +#: templates/web/base/my/my.html:82 +msgid "Reported %s" +msgstr "已申報 %s" + +#: templates/web/base/my/my.html:80 +msgid "Reported %s, to %s" +msgstr "申報 %s 給 %s" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:580 +#: templates/web/base/contact/index.html:50 +#: templates/web/fixmystreet/contact/index.html:65 +msgid "Reported anonymously at %s" +msgstr "在%s 匿名申報 " + +#: templates/web/base/admin/questionnaire.html:5 +#: templates/web/base/questionnaire/index.html:53 +#: templates/web/fixmystreet/questionnaire/index.html:72 +msgid "Reported before" +msgstr "之前的申報" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:603 +#: templates/web/base/contact/index.html:52 +#: templates/web/fixmystreet/contact/index.html:67 +msgid "Reported by %s at %s" +msgstr "由%s 的 %s 申報" + +#: templates/web/zurich/report/_main.html:2 +msgid "Reported in the %s category" +msgstr "%s 種類之申報" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:576 +msgid "Reported in the %s category anonymously at %s" +msgstr "%s 種類下的匿名申報" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:598 +msgid "Reported in the %s category by %s at %s" +msgstr "%s 在 %s %s類別的申報 " + +#: perllib/FixMyStreet/DB/Result/Problem.pm:572 +msgid "Reported via %s anonymously at %s" +msgstr "在%s 匿名申報 " + +#: perllib/FixMyStreet/DB/Result/Problem.pm:594 +msgid "Reported via %s by %s at %s" +msgstr "%s 透過 %s 在 %s類別的申報" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:568 +msgid "Reported via %s in the %s category anonymously at %s" +msgstr "透過 %s 在 %s類別的匿名申報" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:588 +msgid "Reported via %s in the %s category by %s at %s" +msgstr "%s 在 %s %s類別的申報 " + +#: templates/web/base/reports/index.html:21 +#, fuzzy +msgid "Reported within the last four weeks" +msgstr "%s 種類之申報" + +#: templates/web/base/around/around_index.html:1 +#: templates/web/base/around/around_index.html:3 +#: templates/web/base/js/translation_strings.html:41 +#: templates/web/base/report/new/fill_in_details.html:0 +#: templates/web/base/report/new/fill_in_details.html:5 +#: templates/web/fixmystreet/around/around_index.html:2 +#: templates/web/zurich/report/new/fill_in_details_form.html:2 +msgid "Reporting a problem" +msgstr "申報問題" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1193 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:294 +#: templates/web/zurich/header.html:60 +msgid "Reports" +msgstr "申報" + +#: perllib/FixMyStreet/Cobrand/UK.pm:327 perllib/FixMyStreet/Cobrand/UK.pm:331 +msgid "Reports are limited to %s characters in length. Please shorten your report" +msgstr "申請內容有 %s 字數限制，請簡化您的申報。" + +#: templates/web/zurich/admin/index-sdm.html:7 +msgid "Reports awaiting approval" +msgstr "待核實之申報" + +#: templates/web/base/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/base/admin/report_edit.html:85 +msgid "Resend report" +msgstr "重新送出申報" + +#: templates/web/base/js/translation_strings.html:28 +msgid "Right place?" +msgstr "正確地點？" + +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:167 +#: perllib/FixMyStreet/Geocode/OSM.pm:152 +msgid "Road operator for this named road (derived from road reference number and type): %s" +msgstr "此指定街道之道路營運者(取自道路參照碼與種類): %s" + +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:164 +#: perllib/FixMyStreet/Geocode/OSM.pm:149 +msgid "Road operator for this named road (from OpenStreetMap): %s" +msgstr "此指定街道之道路營運者(來自OpenStreetMap): %s" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1403 +#: templates/web/base/admin/report_edit.html:106 +#: templates/web/zurich/admin/report_edit.html:73 +msgid "Rotate Left" +msgstr "左轉 " + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1392 +#: templates/web/base/admin/report_edit.html:107 +#: templates/web/zurich/admin/report_edit.html:74 +msgid "Rotate Right" +msgstr "右轉 " + +#: templates/web/base/js/translation_strings.html:46 +msgid "Satellite" +msgstr "衛星" + +#: templates/web/base/admin/body.html:208 +#: templates/web/base/admin/category_edit.html:81 +#: templates/web/zurich/admin/body.html:59 +msgid "Save changes" +msgstr "儲存變動" + +#: templates/web/base/admin/reports.html:1 +#: templates/web/zurich/admin/reports.html:1 +msgid "Search Reports" +msgstr "搜尋申報" + +#: templates/web/base/admin/users.html:1 +msgid "Search Users" +msgstr "搜尋使用者" + +#: templates/web/zurich/header.html:77 +msgid "Search reports" +msgstr "搜尋申報" + +#: templates/web/base/admin/reports.html:5 +#: templates/web/base/admin/users.html:8 +#: templates/web/zurich/admin/reports.html:5 +msgid "Search:" +msgstr "搜尋" + +#: templates/web/base/admin/reports.html:26 +msgid "Searching found no reports." +msgstr "查無此申報" + +#: templates/web/base/admin/users.html:41 +msgid "Searching found no users." +msgstr "查無此用戶" + +#: templates/web/base/admin/body-form.html:33 +#: templates/web/zurich/admin/body-form.html:16 +msgid "Select a body" +msgstr "選擇單位" + +#: templates/web/base/reports/index.html:9 +msgid "Select a particular council to see the reports sent there." +msgstr "選擇特定議會呈送申報" + +#: templates/web/base/admin/body-form.html:71 +#: templates/web/zurich/admin/body-form.html:26 +msgid "Select an area" +msgstr "選擇區域" + +#: templates/web/base/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 "選擇您要想的通知方式或點選RSS訂閱按鈕，或者輸入您的電子郵件以收受通知。" + +#: perllib/FixMyStreet/DB/Result/Problem.pm:685 +msgid "Sent to %s %s later" +msgstr "%s 稍後送給%s" + +#: templates/web/base/admin/report_edit.html:84 +msgid "Sent:" +msgstr "送出" + +#: templates/web/base/admin/report_edit.html:89 +#: templates/web/zurich/admin/stats.html:45 +msgid "Service:" +msgstr "服務" + +#: templates/web/fixmystreet/report/display.html:38 +msgid "Share" +msgstr "分享" + +#: templates/web/base/report/new/fill_in_details_form.html:192 +#: templates/web/base/report/update-form.html:157 +#: templates/web/fixmystreet/report/new/form_user_loggedin.html:23 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:59 +#: templates/web/fixmystreet/report/update-form.html:146 +msgid "Show my name publicly" +msgstr "公開我的姓名" + +#: templates/web/base/around/display_location.html:67 +msgid "Show old" +msgstr "顯示舊文" + +#: templates/web/base/around/display_location.html:58 +msgid "Show pins" +msgstr "顯示地圖標示" + +#: templates/web/base/auth/general.html:3 +#: templates/web/base/auth/general.html:49 +#: templates/web/fixmystreet/auth/general.html:4 +#: templates/web/fixmystreet/auth/general.html:43 +#: templates/web/fixmystreet/auth/general.html:64 +#: templates/web/zurich/auth/general.html:18 +#: templates/web/zurich/auth/general.html:35 +msgid "Sign in" +msgstr "登入" + +#: templates/web/base/auth/general.html:74 +msgid "Sign in by email" +msgstr "透過電子郵件登入" + +#: templates/web/base/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/base/auth/sign_out.html:1 templates/web/base/header.html:30 +#: templates/web/zurich/auth/sign_out.html:1 +msgid "Sign out" +msgstr "登出" + +#: templates/web/base/header.html:29 +msgid "Signed in as %s" +msgstr "以 %s身份登入" + +#: templates/web/base/report/new/fill_in_details_text.html:1 +msgid "Some categories may require additional information." +msgstr "某些類別要求其它資訊" + +#: templates/web/base/admin/body-form.html:149 +#: templates/web/base/admin/body-form.html:150 +msgid "" +"Some endpoints require an <strong>API key</strong> to indicate that the reports are being\n" +" sent from your FixMyStreet installation." +msgstr "" +"有端點需要一個 <strong>API key</strong>以顯示其申報從這個網站\n" +"被送出至地方政府\n" +"." + +#: templates/web/base/alert/index.html:42 +msgid "Some photos of recent reports" +msgstr "最近申報之照片" + +#: perllib/FixMyStreet/App/View/Email.pm:32 +#: perllib/FixMyStreet/App/View/Web.pm:43 +msgid "Some text to localize" +msgstr "有些文字需在地化" + +#: perllib/FixMyStreet/Cobrand/UK.pm:78 +msgid "Sorry, that appears to be a Crown dependency postcode, which we don't cover." +msgstr "抱歉，該郵區號碼我們尚未支援" + +#: templates/web/base/tokens/abuse.html:5 +msgid "Sorry, there has been an error confirming your problem." +msgstr "抱歉無法確認你的問題" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:214 +#: perllib/FixMyStreet/Geocode.pm:37 perllib/FixMyStreet/Geocode/Bing.pm:37 +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:56 +#: perllib/FixMyStreet/Geocode/Google.pm:47 +#: perllib/FixMyStreet/Geocode/OSM.pm:48 +msgid "Sorry, we could not find that location." +msgstr "抱歉，我們無法找到此位置" + +#: perllib/FixMyStreet/Geocode/Bing.pm:34 +#: perllib/FixMyStreet/Geocode/Google.pm:44 +#: perllib/FixMyStreet/Geocode/Zurich.pm:87 +msgid "Sorry, we could not parse that location. Please try again." +msgstr "抱歉，我們無法解析此地點，請重試一次" + +#: templates/web/base/admin/stats.html:64 +msgid "Start Date:" +msgstr "問始日：" + +#: templates/web/base/admin/body.html:69 +#: templates/web/base/admin/flagged.html:18 +#: templates/web/base/admin/list_updates.html:11 +#: templates/web/base/admin/reports.html:15 +#: templates/web/fixmystreet/report/update-form.html:26 +msgid "State" +msgstr "陳述" + +#: templates/web/base/admin/report_edit.html:47 +#: templates/web/base/admin/update_edit.html:27 +#: templates/web/base/report/update-form.html:28 +#: templates/web/zurich/admin/report_edit-sdm.html:53 +#: templates/web/zurich/admin/report_edit.html:84 +#: templates/web/zurich/admin/update_edit.html:17 +msgid "State:" +msgstr "陳述:" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1198 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:308 +#: templates/web/base/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/base/report/updates.html:10 +msgid "Still open, via questionnaire, %s" +msgstr " %s問卷仍開放中" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:387 +msgid "Subcategory: %s" +msgstr "子類別：%s" + +#: templates/web/zurich/admin/index-dm.html:27 +msgid "Subdivision/Body" +msgstr "下屬單位/機關" + +#: templates/web/fixmystreet/contact/index.html:98 +msgid "Subject" +msgstr "主旨" + +#: templates/web/base/admin/report_edit.html:19 +#: templates/web/base/contact/index.html:88 +#: templates/web/base/report/new/fill_in_details_form.html:53 +#: templates/web/zurich/admin/report_edit.html:34 +msgid "Subject:" +msgstr "主旨:" + +#: templates/web/base/questionnaire/creator_fixed.html:19 +#: templates/web/base/report/new/fill_in_details_form.html:136 +#: templates/web/base/report/new/fill_in_details_form.html:158 +#: templates/web/base/report/new/fill_in_details_form.html:96 +#: templates/web/fixmystreet/report/new/form_user_loggedin.html:36 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:23 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:91 +msgid "Submit" +msgstr "送出" + +#: templates/web/base/admin/report_edit.html:113 +#: templates/web/base/admin/update_edit.html:65 +#: templates/web/base/admin/user-form.html:56 +#: templates/web/zurich/admin/report_edit-sdm.html:64 +#: templates/web/zurich/admin/report_edit.html:221 +#: templates/web/zurich/admin/update_edit.html:38 +msgid "Submit changes" +msgstr "送出更新" + +#: templates/web/base/questionnaire/index.html:88 +#: templates/web/fixmystreet/questionnaire/index.html:106 +msgid "Submit questionnaire" +msgstr "送出問卷" + +#: perllib/FixMyStreet/Cobrand/Zurich.pm:134 +#: 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:86 +#: templates/web/zurich/admin/report_edit.html:87 +#: templates/web/zurich/admin/reports.html:13 +#: templates/web/zurich/report/banner.html:9 +msgid "Submitted" +msgstr "已送出" + +#: templates/web/base/alert/updates.html:17 +#: templates/web/base/report/display.html:46 +#: templates/web/fixmystreet/alert/updates.html:23 +#: templates/web/fixmystreet/report/display.html:65 +msgid "Subscribe" +msgstr "訂閱" + +#: templates/web/base/alert/_list.html:97 +#: templates/web/fixmystreet/alert/_list.html:92 +msgid "Subscribe me to an email alert" +msgstr "加入通知信件" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1191 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:293 +#: templates/web/base/admin/bodies.html:25 +#: templates/web/base/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/base/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:1195 +msgid "Survey" +msgstr "調查" + +#: templates/web/base/admin/questionnaire.html:1 +msgid "Survey Results" +msgstr "調查結果" + +#: templates/web/base/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/base/admin/body.html:28 +msgid "Text only version" +msgstr "文字版" + +#: templates/web/base/admin/update_edit.html:20 +#: templates/web/zurich/admin/update_edit.html:12 +msgid "Text:" +msgstr "內文:" + +#: templates/web/base/tokens/confirm_problem.html:12 +msgid "Thank you for reporting this issue!" +msgstr "感謝您申報此問題" + +#: templates/web/base/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 "感謝您試著確 認本問題的更新。目前網站似乎遇上一點問題，<a href=\"%s\">請回報給我們</a> 以通知工程人員查看狀況。 " + +#: templates/web/base/tokens/confirm_update.html:15 +msgid "Thank you for updating this issue!" +msgstr "感謝您更新此狀況" + +#: templates/web/base/contact/submit.html:6 +#: templates/web/base/questionnaire/completed.html:5 +msgid "Thank you for your feedback" +msgstr "感謝您的回饋" + +#: templates/web/fixmystreet/around/around_index.html:28 +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 :" +msgstr "感謝上傳照片，現在需要知道問題的地點位置，請在上方方格內輸入附近街名或郵編 " + +#: templates/web/base/questionnaire/creator_fixed.html:9 +msgid "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?" +msgstr "謝謝，很高興知道此問題己修復了。請問您過去是否曾申報過問題？ " + +#: perllib/FixMyStreet/App/Controller/Photo.pm:195 +msgid "That image doesn't appear to have uploaded correctly (%s), please try again." +msgstr "照片上傳似乎無法正常 (%s), 請再試一次。 " + +#: perllib/FixMyStreet/App/Controller/Council.pm:97 +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:126 +msgid "That location does not appear to be in the UK; please try again." +msgstr "這地點似乎不在台灣; 請再試 一次。" + +#: perllib/FixMyStreet/Cobrand/FiksGataMi.pm:47 +#: perllib/FixMyStreet/Cobrand/FixaMinGata.pm:63 +#: perllib/FixMyStreet/Cobrand/UK.pm:71 +msgid "That postcode was not recognised, sorry." +msgstr "抱歉此郵遞區號無法辨識" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:712 +#, fuzzy +msgid "That problem has been marked as sent." +msgstr "此問題將重新送出" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:704 +msgid "That problem will now be resent." +msgstr "此問題將重新送出" + +#: perllib/FixMyStreet/App/Controller/Report.pm:118 +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 "該申報已遭FixMyStreet 移除 " + +#: templates/web/base/admin/body.html:144 +msgid "" +"The <strong>email address</strong> is the destination to which reports about this category will be sent. \n" +" Other categories for this body may have the same email address." +msgstr "" +"此 <strong>電子郵件</strong> 為此類別申報所將送出的對象\n" +"該主責單位負責的其它類別可能也會使用同一電子郵件" + +#: templates/web/base/admin/body-form.html:123 +#: templates/web/base/admin/body-form.html:124 +msgid "" +"The <strong>endpoint</strong> is the URL of the service that FixMyStreet will connect to \n" +" when sending reports to this body." +msgstr "" +"此<strong>端點</strong> FixMyStreet 服務連結，\n" +"當申報送出給該機關時，就會連結到此。" + +#: templates/web/base/admin/body-form.html:136 +#: templates/web/base/admin/body-form.html:137 +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 "" +"此<strong>管轄區</strong> 功能只有在終端不只一個\n" +"時才會用到。如果機關自行營運用終端，此處功能可以不選留白 " + +#: templates/web/base/admin/body-form.html:94 +#: templates/web/base/admin/body-form.html:95 +msgid "" +"The <strong>send method</strong> determines how problem reports will be sent to the body.\n" +" If you leave this blank, <strong>send method defaults to email</strong>." +msgstr "" +"<strong>送出方式</strong> 決定了問題申報如何送給相關單位\n" +"如果此處未作選擇<strong>系統預設的送出方式為電子郵件</strong>." + +#: templates/web/base/open311/index.html:90 +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 " Open311 v2 的權責單位適用於對接收問題申報機關，但不受限於Open311 v2 規範定義。" + +#: templates/web/base/admin/body-form.html:11 +#: templates/web/base/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 "" +"有關單位<strong>名稱</strong> 可辨認出該機構(例如, <em>高雄市工務局公園處 </em>)\n" +"此名稱會公開顯示。" + +#: templates/web/base/auth/token.html:19 templates/web/base/email_sent.html:6 +msgid "The confirmation email <strong>may</strong> take a few minutes to arrive — <em>please</em> be patient." +msgstr "確認的電子郵件<strong>可能會</strong> 晚幾分鐘收到<em>請</em>耐心等待。" + +#: templates/web/base/report/new/fill_in_details_text.html:1 +#: templates/web/base/report/new/fill_in_details_text.html:3 +msgid "The council won’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:44 +msgid "The details of your problem are available from the other tab above." +msgstr "您問題的細節可以其它分頁中找到" + +#: templates/web/base/questionnaire/index.html:25 +msgid "The details of your problem are available on the right hand side of this page." +msgstr "您問題的細節可以在本頁右邊欄找到" + +#: templates/web/base/admin/edit-league.html:3 +#: templates/web/base/admin/edit-league.html:4 +msgid "The diligency prize league table shows editors' activity (who's been editing the most records)." +msgstr "這個勤奮表單顯示用戶的活動(誰做了做多的修改編輯活動)" + +#: perllib/FixMyStreet/App/Controller/Dashboard.pm:60 +#: perllib/FixMyStreet/App/Controller/Reports.pm:78 +msgid "The error was: %s" +msgstr "顯示錯誤為: %s" + +#: templates/web/base/open311/index.html:86 +msgid "The following Open311 v2 attributes are returned for each request: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." +msgstr "下列 Open311 v2 屬性視要求之回覆而定: service_request_id, description, lat, long, media_url, status, requested_datetime, updated_datetime, service_code and service_name." + +#: perllib/FixMyStreet/Geocode/FixaMinGata.pm:159 +#: perllib/FixMyStreet/Geocode/OSM.pm:144 +msgid "The following information about the nearest road might be inaccurate or irrelevant, if the problem is close to several roads or close to a road without a name registered in OpenStreetMap." +msgstr "下方關於最近道路之資訊未必準確，如果鄰近有多條道路或是在OpenStreetMap上無登記路名資料。" + +#: db/alert_types.pl:19 db/alert_types.pl:23 db/alert_types.pl:27 +#: db/alert_types.pl:31 +msgid "The latest local problems reported by users" +msgstr "用戶申報的本地最新問題" + +#: 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 "用戶提供給{{COUNCIL}} 的本地最新問題 " + +#: db/alert_types.pl:39 +msgid "The latest problems for {{COUNCIL}} within {{WARD}} ward reported by users" +msgstr "用戶提供給{{COUNCIL}} 在{{WARD}} 里/區的最新問題" + +#: 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 "用戶申報{{NAME}}地區內地的最新問題" + +#: 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 "用戶申報給{{COUNCIL}} 的本地最新問題 " + +#: db/alert_types_eha.pl:24 +msgid "The latest reports for {{COUNCIL}} within {{WARD}} ward reported by users" +msgstr "用戶申報給{{COUNCIL}} 在{{WARD}} 里/區的最新問題" + +#: db/alert_types_eha.pl:28 +msgid "The latest reports within {{NAME}}'s boundary reported by users" +msgstr "用戶申報{{NAME}}地區內地的最新問題" + +#: templates/web/base/admin/body-form.html:58 +msgid "The list of available areas is being provided by the MapIt service at %s." +msgstr "%s 區域中，MapIt服務涵蓋的範圍清單" + +#: templates/web/base/auth/change_password.html:12 +#: templates/web/base/auth/change_password.html:16 +msgid "The passwords do not match" +msgstr "密碼不符" + +#: templates/web/base/errors/page_error_404_not_found.html:10 +#: templates/web/base/errors/page_error_404_not_found.html:12 +msgid "The requested URL '%s' was not found on this server" +msgstr "找不到您所要求的網頁連結。" + +#: templates/web/base/alert/_list.html:14 +#: templates/web/fixmystreet/alert/_list.html:16 +msgid "The simplest alert is our geographic one:" +msgstr "您的更新出錯，請再試一次。" + +#: templates/web/base/report/new/councils_extra_text.html:1 +#: templates/web/base/report/new/councils_text_some.html:10 +#: templates/web/base/report/new/fill_in_details_form.html:18 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:14 +msgid "The summary and description will also be made public (see our <a href=\"/privacy\">privacy policy</a>)." +msgstr "總結與描述將會公開(請見我們的 <a href=\"/privacy\">隱私權政策</a>)." + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:300 +msgid "The user could not locate the problem on a map, but to see the area around the location they entered" +msgstr "用戶無法在地點上標示問題，但可以看到他們輸入的地點" + +#: templates/web/base/admin/user-form.html:12 +#: templates/web/base/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 "" +"用戶的<strong>名字</strong> 會公開出現在未標記<em>匿名</em>的申報上\n" +"名字不需要獨特可重覆 " + +#: templates/web/base/reports/_problem-list.html:15 +msgid "There are no reports to show." +msgstr "" + +#: perllib/FixMyStreet/App/Controller/Reports.pm:75 +msgid "There was a problem showing the All Reports page. Please try again later." +msgstr "本頁現在無法願現所要求的申報資料，請稍候再試。" + +#: perllib/FixMyStreet/App/Controller/Contact.pm:136 +#: 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:762 +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:134 +#: templates/web/base/auth/general.html:23 +#: templates/web/fixmystreet/auth/general.html:25 +#: 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 ‘sign in by email’ 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:140 +msgid "There were problems with your report. Please see below." +msgstr "您的申報有問題，請見下方說明" + +#: perllib/FixMyStreet/App/Controller/Report/Update.pm:300 +msgid "There were problems with your update. Please see below." +msgstr "您的更新有問題，請見下方說明" + +#: templates/web/base/admin/body-form.html:112 +#: templates/web/base/admin/body-form.html:113 +msgid "" +"These settings are for bodies that use Open311 (or other back-end integration) to receive problem reports.<br>\n" +" <strong>You don't need to set them if the Send Method is email.</strong>.\n" +" For more information on Open311, see \n" +" <a href='https://www.mysociety.org/2013/01/17/open311-explained/' class='admin-offsite-link'>this article</a>.\n" +" " +msgstr "" +"這裏的設定是讓使用Open311(或其它後台端點整合) 的政府機關可以接收問題申報<br>\n" +"<strong>如果送出方式設為電子郵件，您無須理會此處</strong>\n" +"有關Open311的更多資訊請見\n" +"<a href='https://www.mysociety.org/2013/01/17/open311-explained/' class='admin-offsite-link'>本文</a>" + +#: templates/web/base/open311/index.html:77 +msgid "This API implementation is work in progress and not yet stabilized. It will change without warnings in the future." +msgstr "此API執行正在安裝中尚未完全，未來將作無預警的更動" + +#: templates/web/base/admin/body.html:44 +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 "" +"該單位無責任區，此表示<em>任何地區</em>回報的問題\n" +"它無權管轄。 \n" +"因此它下方的類別不會出現用戶申報問題的下拉選單上。\n" +"目前用戶<strong>無法用此單位申報問題</strong>." + +#: templates/web/base/admin/body.html:54 +msgid "This body has no contacts. This means that currently problems reported to this body <strong>will not be sent</strong>." +msgstr "該單位無聯絡人，此表示目前送至該單位的申報<strong>將無法送出</strong>." + +#: templates/web/base/admin/body-form.html:52 +#: templates/web/base/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 "" +"此單位只涵蓋 <strong>負責區域</strong>的申報問題處理。 \n" +"除非其涵蓋至少一個區域，否則政府單位不會接收到問題申報 " + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:394 +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:397 +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:902 +#: perllib/FixMyStreet/App/Controller/Report/New.pm:972 +#: perllib/FixMyStreet/Cobrand/EmptyHomes.pm:142 +#: perllib/FixMyStreet/Cobrand/UK.pm:43 +msgid "This information is required" +msgstr "本項資訊必填" + +#: templates/web/base/debug_header.html:3 +msgid "This is a developer site; things might break at any time, and the database will be periodically deleted." +msgstr "本站為開發試用，可能隨時故障，資料庫也會定期刪除。" + +#: templates/web/base/reports/index.html:7 +msgid "This is a summary of all reports on this site." +msgstr "本站所有申報總結" + +#: templates/web/base/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/base/report/banner.html:15 +msgid "This problem has been closed" +msgstr "此問題己結案" + +#: templates/web/base/report/banner.html:12 +#: templates/web/base/report/update-form.html:48 +#: templates/web/fixmystreet/report/update-form.html:46 +msgid "This problem has been fixed" +msgstr "問題己處理完畢" + +#: templates/web/base/report/update-form.html:43 +#: templates/web/fixmystreet/report/update-form.html:40 +msgid "This problem has not been fixed" +msgstr "問題尚未解決" + +#: templates/web/base/report/banner.html:19 +msgid "This problem is in progress" +msgstr "問題正在處理中" + +#: templates/web/base/report/banner.html:9 +msgid "This problem is old and of unknown status." +msgstr "此問題已失時效，目前狀況不明" + +#: perllib/FixMyStreet/Cobrand/Zurich.pm:131 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:132 +#: templates/web/zurich/report/_main.html:14 +msgid "This report is awaiting moderation." +msgstr "此問題尚待審核" + +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:87 +msgid "This report is currently marked as closed." +msgstr "該申報目前注記為結案狀態" + +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:85 +msgid "This report is currently marked as fixed." +msgstr "該申報目前注記為解決狀態" + +#: perllib/FixMyStreet/DB/ResultSet/AlertType.pm:89 +msgid "This report is currently marked as open." +msgstr "該申報目前注記為開放狀態" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:311 +msgid "This report was submitted anonymously" +msgstr "此為匿名申報" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:293 +msgid "This web page also contains a photo of the problem, provided by the user." +msgstr "本頁包括由用戶提供反應問題的照片 " + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1194 +#: templates/web/base/admin/timeline.html:1 +msgid "Timeline" +msgstr "時間軸" + +#: templates/web/base/admin/flagged.html:15 +#: templates/web/base/admin/reports.html:12 +msgid "Title" +msgstr "標題" + +#: templates/web/base/around/_report_banner.html:2 +msgid "To <strong>report a problem</strong>, click on the map at the correct location." +msgstr "要<strong>申報問題</strong>, 點擊下方地圖中正確之位置。" + +#: templates/web/base/alert/index.html:27 +msgid "To find out what local alerts we have for you, please enter your postcode or street name and area" +msgstr "找出適合您的在地通知，請輸入您的郵編或街名區域" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:299 +msgid "To view a map of the precise location of this issue" +msgstr "檢視地圖上問題之確切位置" + +#: templates/web/base/admin/index.html:55 +#: templates/web/base/admin/questionnaire.html:24 +#: templates/web/base/admin/stats.html:24 +#: templates/web/base/admin/stats.html:43 +#: templates/web/zurich/admin/stats.html:30 +msgid "Total" +msgstr "總數" + +#: templates/web/base/js/translation_strings.html:29 +msgid "Try again" +msgstr "再試一次" + +#: templates/web/base/contact/submit.html:14 +msgid "Try emailing us directly:" +msgstr "何不直接發信給我們:" + +#: templates/web/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:59 +#: templates/web/base/report/update-form.html:30 +#: templates/web/base/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/base/admin/report_edit.html:48 +#: templates/web/base/admin/report_edit.html:64 +#: templates/web/base/admin/update_edit.html:28 +#: templates/web/zurich/admin/report_edit-sdm.html:45 +#: templates/web/zurich/admin/report_edit.html:58 +#: 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/base/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/base/admin/timeline.html:33 +msgid "Update %s created for problem %d; by %s" +msgstr "由%s 更新%s 申報之問題%s " + +#: templates/web/base/contact/index.html:21 +#: templates/web/fixmystreet/contact/index.html:36 +msgid "Update below added anonymously at %s" +msgstr "下方更新 為匿名提供%s" + +#: templates/web/base/contact/index.html:23 +#: templates/web/fixmystreet/contact/index.html:38 +msgid "Update below added by %s at %s" +msgstr "由%d 在 %s 所提供的更新" + +#: templates/web/base/admin/body-form.html:240 +#: templates/web/zurich/admin/body-form.html:51 +msgid "Update body" +msgstr "更新內文" + +#: templates/web/base/admin/index.html:49 +msgid "Update breakdown by state" +msgstr "陳述目前的故障 " + +#: db/alert_types.pl:7 +msgid "Update by {{name}}" +msgstr "由{{name}}更新" + +#: templates/web/base/admin/update_edit.html:42 +#: templates/web/zurich/admin/update_edit.html:25 +msgid "Update changed problem state to %s" +msgstr "更新改變問題之陳述到%s " + +#: templates/web/base/admin/update_edit.html:44 +msgid "Update marked problem as fixed" +msgstr "本問題已解決之更新標註" + +#: templates/web/base/admin/update_edit.html:46 +msgid "Update reopened problem" +msgstr "更新重申報之問題 " + +#: templates/web/base/admin/body.html:101 +msgid "Update statuses" +msgstr "更新之狀態" + +#: templates/web/base/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:1014 +#: perllib/FixMyStreet/App/Controller/Admin.pm:1058 +#: perllib/FixMyStreet/App/Controller/Admin.pm:808 +#: perllib/FixMyStreet/App/Controller/Admin.pm:956 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:556 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:625 +msgid "Updated!" +msgstr "已更新！" + +#: templates/web/base/admin/list_updates.html:2 +#: templates/web/base/report/update.html:3 +#: templates/web/fixmystreet/report/update.html:5 +#: templates/web/zurich/admin/list_updates.html:24 +#: templates/web/zurich/report/updates.html:2 +msgid "Updates" +msgstr "更新" + +#: perllib/FixMyStreet/DB/Result/Comment.pm:131 +msgid "Updates are limited to %s characters in length. Please shorten your update" +msgstr "更新內容有 %s 字數限制，請簡化您的更新。" + +#: db/alert_types.pl:5 db/alert_types.pl:6 +msgid "Updates on {{title}}" +msgstr "由{{title}}更新" + +#: templates/web/base/report/display.html:0 +#: templates/web/base/report/display.html:5 +#: templates/web/fixmystreet/report/display.html:0 +#: templates/web/fixmystreet/report/display.html:9 +msgid "Updates to this problem, FixMyStreet" +msgstr "向FixMyStreet回報此問題 " + +#: templates/web/base/admin/body.html:182 +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 "使用<strong>記事本</strong> 來記錄給管理員可看到的細節報告。這部份不會公開，也不會送給相關單位。" + +#: 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:1357 +msgid "User flag removed" +msgstr "移除用戶的標記警告" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1329 +msgid "User flagged" +msgstr "給用戶標記警告" + +#: templates/web/base/admin/users.html:5 +msgid "User search finds matches in users' names and email addresses." +msgstr "用戶找到相符的名稱與電子郵件" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:1196 +#: perllib/FixMyStreet/Cobrand/Zurich.pm:307 +#: templates/web/base/admin/flagged.html:29 +#: templates/web/zurich/header.html:69 +msgid "Users" +msgstr "使用者" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:374 +#: perllib/FixMyStreet/App/Controller/Admin.pm:404 +#: perllib/FixMyStreet/App/Controller/Admin.pm:421 +msgid "Values updated" +msgstr "數值更新" + +#: templates/web/base/admin/report_edit.html:18 +#: templates/web/base/admin/update_edit.html:18 +#: templates/web/zurich/admin/report_edit-sdm.html:21 +#: templates/web/zurich/admin/report_edit.html:20 +#: templates/web/zurich/admin/update_edit.html:10 +msgid "View report on site" +msgstr "檢視本站之申報 " + +#: templates/web/base/reports/body.html:14 +msgid "View reports by ward" +msgstr "檢視里/區之申報 " + +#: templates/web/base/around/display_location.html:0 +#: templates/web/base/around/display_location.html:35 +msgid "Viewing a location" +msgstr "檢視地區" + +#: templates/web/base/report/display.html:0 +#: templates/web/fixmystreet/report/display.html:0 +msgid "Viewing a problem" +msgstr "檢視問題 " + +#: templates/web/base/reports/body.html:16 +msgid "Wards of this council" +msgstr "地方政府轄下的里/區" + +#: templates/web/base/alert/choose.html:6 +#: templates/web/base/around/around_index.html:16 +#: templates/web/fixmystreet/around/around_index.html:17 +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/base/auth/token.html:8 +msgid "We have not been able to confirm your account - sorry." +msgstr "抱歉，我們無法確認您的帳戶。" + +#: templates/web/base/auth/token.html:16 +msgid "We have sent you an email containing a link to confirm your account." +msgstr "我們剛寄給您一封內有連結確認的電子郵件。" + +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:2 +#: templates/web/fixmystreet/report/update-form.html:77 +msgid "We never show your email" +msgstr "我們不會公開您的電子郵件" + +#: templates/web/fixmystreet/report/new/form_user_loggedin.html:31 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:65 +msgid "We never show your email address or phone number." +msgstr "我們不會公開您的電子郵件或是電話號碼" + +#: perllib/FixMyStreet/DB/ResultSet/Problem.pm:403 +msgid "We realise this problem might be the responsibility of %s; however, we don't currently have any contact details for them. If you know of an appropriate contact address, please do get in touch." +msgstr "我們理解此問題可能是%s之責任，然而目前我們並無他們的聯絡資訊。如果您知道適當的聯絡人資訊，請告訴我們。" + +#: templates/web/base/index-steps.html:31 +msgid "We send it to the council on your behalf" +msgstr "我們將代表您將此呈報給地方政府" + +#: templates/web/base/report/new/notes.html:4 +#: templates/web/zurich/report/new/notes.html:4 +msgid "We will only use your personal information in accordance with our <a href=\"/privacy\">privacy policy.</a>" +msgstr "您的個人資料，將會依照<a href=\"/privacy\">本站隱私權政策</a>作處理使用" + +#: templates/web/base/questionnaire/completed-open.html:2 +msgid "We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?" +msgstr "很遺憾該問題仍未修復。何不試試聯絡當地議員民代反應此狀況？" + +#: templates/web/base/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/base/contact/submit.html:7 +msgid "We’ll get back to you as soon as we can." +msgstr "我們會儘快回覆您" + +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:49 +msgid "What’s the issue, and where is it?" +msgstr "什麼樣的問題，地點是在?" + +#: templates/web/base/admin/category_edit.html:87 +#: templates/web/zurich/admin/body.html:18 +msgid "When edited" +msgstr "何時編輯 " + +#: templates/web/base/admin/problem_row.html:35 +msgid "When sent" +msgstr "何時送出" + +#: perllib/FixMyStreet/App/Controller/Report/New.pm:633 +msgid "Whole block of empty flats" +msgstr "整區為閒置廢棄空間" + +#: templates/web/base/tokens/confirm_alert.html:7 +msgid "Why stop there? <a href=\"/alert\">Set up more alerts</a> for free." +msgstr "為何在此卡住？免費<a href=\"/alert\">設定更多訊息通知</a> " + +#: templates/web/base/open311/index.html:92 +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 "搜尋要求，也可能限制單一機構中搜尋相關權責單位。其搜尋字眼為 <a href=\"%s\">MaPit</a>提供的主管ID." + +#: templates/web/fixmystreet/front/footer-marketing.html:17 +msgid "Would you like to contribute to FixMyStreet? Our code is open source and <a href=\"http://fixmystreet.org\">available at fixmystreet.org</a>." +msgstr "您願為FixMyStreet貢獻嗎?這個一個開放原始碼，可從 <a href=\"http://fixmystreet.org\">fixmystreet.org</a>官網進一步了解 " + +#: templates/web/base/questionnaire/index.html:78 +#: templates/web/fixmystreet/questionnaire/index.html:97 +msgid "Would you like to receive another questionnaire in 4 weeks, reminding you to check the status?" +msgstr "您是否願意4週後再收到另一份問卷？以提醒您確認最新的狀況" + +#: templates/web/base/report/new/notes.html:7 +msgid "Writing your message entirely in block capitals makes it hard to read, as does a lack of punctuation." +msgstr "請注意留言內容，勿用注音文並應加上標點符號以利閱讀。" + +#: templates/web/base/report/new/fill_in_details_form.html:4 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:5 +msgid "Wrong location? Just click again on the map." +msgstr "錯誤的地? 請再次點擊此地圖" + +#: templates/web/base/admin/stats.html:10 +msgid "Year" +msgstr "年份" + +#: templates/web/base/admin/bodies.html:66 +#: templates/web/base/admin/body.html:80 templates/web/base/admin/body.html:82 +#: templates/web/base/admin/body.html:86 templates/web/base/admin/body.html:88 +#: templates/web/base/admin/category_edit.html:5 +#: templates/web/base/admin/flagged.html:47 +#: templates/web/base/admin/list_updates.html:32 +#: templates/web/base/admin/list_updates.html:34 +#: templates/web/base/admin/list_updates.html:35 +#: templates/web/base/admin/problem_row.html:20 +#: templates/web/base/admin/report_edit.html:76 +#: templates/web/base/admin/report_edit.html:93 +#: templates/web/base/admin/update_edit.html:24 +#: templates/web/base/admin/users.html:31 +#: templates/web/base/questionnaire/creator_fixed.html:14 +#: templates/web/base/questionnaire/index.html:42 +#: templates/web/base/questionnaire/index.html:81 +#: templates/web/fixmystreet/questionnaire/index.html:100 +#: templates/web/fixmystreet/questionnaire/index.html:61 +msgid "Yes" +msgstr "是" + +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:17 +#: templates/web/fixmystreet/report/update-form.html:91 +msgid "Yes I have a password" +msgstr "我有密碼" + +#: templates/web/base/contact/index.html:39 +#: templates/web/fixmystreet/contact/index.html:54 +msgid "You are complaining that this problem report was unnecessarily moderated:" +msgstr "你申訴此問題遭不必要之和諧 " + +#: templates/web/base/contact/index.html:41 +#: templates/web/fixmystreet/contact/index.html:56 +msgid "You are reporting the following problem report for being abusive, containing personal information, or similar:" +msgstr "您檢舉下列問題的申報遭到濫用，包含個人資料或相關問題 " + +#: templates/web/base/contact/index.html:15 +#: templates/web/fixmystreet/contact/index.html:30 +msgid "You are reporting the following update for being abusive, containing personal information, or similar:" +msgstr "您檢舉下列問題之更為濫用，包括個人資料或相似" + +#: templates/web/zurich/tokens/confirm_problem.html:5 +#: templates/web/zurich/tokens/confirm_problem.html:8 +msgid "You can <a href=\"%s%s\">view the problem on this site</a>." +msgstr "您可<a href=\"%s%s\">在本站上檢視問題</a>." + +#: templates/web/base/admin/user-form.html:48 +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:121 +msgid "You can contact technical support on <a href='mailto:%s'>%s</a>" +msgstr "您可寫信給<a href='mailto:%s'>%s</a>詢求技術支援。" + +#: templates/web/base/admin/flagged.html:5 +msgid "" +"You can flag any report or user by editing them, and they will be listed on this page.\n" +" For example, this can useful if you want to keep an eye on a user who has posted inappropriate\n" +" reports in the past." +msgstr "" +"您透過編輯可以給申報或用戶註記警告，他們會出現在此頁上。\n" +"如果某一用戶過往有不當使用記錄，您想特別留意它的活動\n" +"這會很有用。" + +#: templates/web/base/report/new/councils_text_none.html:10 +#: templates/web/base/report/new/councils_text_none.html:2 +#: templates/web/base/report/new/councils_text_some.html:19 +#: templates/web/base/report/new/councils_text_some.html:21 +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/base/admin/body-form.html:85 +msgid "You can mark a body as deleted if you do not want it to be active on the site." +msgstr "您可以刪除某一單位如果不想讓它在本站激活" + +#: templates/web/base/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 "您已回覆過本問卷。如果您有問題，請<href='%s'>保持聯絡</a>, 或是<a href='%s'>檢視 您作的申報</a>\n" + +#: templates/web/base/questionnaire/index.html:68 +#: templates/web/base/report/new/fill_in_details_form.html:75 +#: templates/web/fixmystreet/questionnaire/index.html:88 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:73 +#: templates/web/zurich/report/new/fill_in_details_form.html:58 +msgid "You have already attached a photo to this report, attaching another one will replace it." +msgstr "您已在本申報中附加一張照片，用另一張照片將取代原照片。" + +#: templates/web/base/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/base/auth/sign_out.html:4 +#: templates/web/zurich/auth/sign_out.html:3 +msgid "You have been signed out" +msgstr "您己登出" + +#: templates/web/zurich/report/new/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/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/base/report/display.html:20 +#: templates/web/base/report/new/fill_in_details.html:37 +#: templates/web/fixmystreet/report/display.html:17 +msgid "You have successfully signed in; please check and confirm your details are accurate:" +msgstr "您已成功登入，請檢查您的個人資訊是否正確:" + +#: templates/web/base/my/my.html:20 templates/web/fixmystreet/my/my.html:20 +msgid "You haven’t created any reports yet. <a href=\"%s\">Report a problem now.</a>" +msgstr "您當未創建任何申報，<a href=\"%s\">立即提供申報</a>" + +#: templates/web/base/email_sent.html:13 +msgid "You must now click the link in the email we've just sent you." +msgstr "您必須打開我們送出的電子確認信件上的連結網址 " + +#: templates/web/base/admin/index.html:18 +msgid "You need to <a href=\"%s\">add some bodies</a> (such as councils or departments) before any reports can be sent." +msgstr "您需要 <a href=\"%s\">加入相關單位</a> (例如地方政府或部門) ，在申報送出之前。" + +#: templates/web/base/admin/bodies.html:7 +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 "" +"您需要加上有關單位(例如地方政府或部門)，您可以加入\n" +"要處理的問題類別(像是路面坑洞或街燈故障)以及\n" +"呈送的承辦人員(如電子郵件)" + +#: templates/web/base/admin/report_edit.html:85 +msgid "You really want to resend?" +msgstr "您真的要再送出一次嗎" + +#: templates/web/base/my/my.html:0 templates/web/base/my/my.html:15 +#: templates/web/base/my/my.html:4 templates/web/fixmystreet/my/my.html:0 +#: templates/web/fixmystreet/my/my.html:15 +#: templates/web/fixmystreet/my/my.html:4 +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:91 +#: templates/web/fixmystreet/report/display.html:62 +#: templates/web/fixmystreet/report/display.html:64 +#: templates/web/fixmystreet/report/new/form_user_loggedin.html:3 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:1 +#: templates/web/fixmystreet/report/update-form.html:76 +#: templates/web/zurich/report/new/fill_in_details_form.html:71 +msgid "Your email" +msgstr "您的電子郵件" + +#: templates/web/fixmystreet/auth/general.html:27 +#: templates/web/fixmystreet/report/update-form.html:82 +#: templates/web/zurich/auth/general.html:30 +#: templates/web/zurich/auth/general.html:58 +msgid "Your email address" +msgstr "您的電子郵件" + +#: templates/web/base/auth/general.html:27 +msgid "Your email address:" +msgstr "您的電子郵件" + +#: templates/web/base/alert/_list.html:92 +#: templates/web/base/report/new/fill_in_details_form.html:106 +#: templates/web/base/report/update-form.html:81 +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 "您的個人資料，將會依照<a href=\"/privacy\">本站隱私權政策</a>作處理使用" + +#: templates/web/fixmystreet/auth/general.html:54 +#: templates/web/fixmystreet/contact/index.html:84 +#: templates/web/fixmystreet/report/new/form_user_loggedin.html:18 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:54 +#: templates/web/fixmystreet/report/update-form.html:142 +#: templates/web/zurich/auth/general.html:61 +#: templates/web/zurich/report/new/fill_in_details_form.html:81 +msgid "Your name" +msgstr "姓名" + +#: templates/web/base/auth/general.html:59 +#: templates/web/base/contact/index.html:73 +#: templates/web/base/report/new/fill_in_details_form.html:185 +#: templates/web/base/report/update-form.html:151 +msgid "Your name:" +msgstr "姓名:" + +#: templates/web/fixmystreet/auth/general.html:42 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:22 +#: templates/web/fixmystreet/report/update-form.html:96 +#: templates/web/zurich/auth/general.html:34 +msgid "Your password" +msgstr "密碼" + +#: templates/web/base/auth/change_password.html:6 +msgid "Your password has been changed" +msgstr "密碼已更新" + +#: templates/web/fixmystreet/report/new/form_user_loggedin.html:27 +#: templates/web/fixmystreet/report/new/form_user_loggedout.html:63 +#: templates/web/zurich/report/new/fill_in_details_form.html:87 +msgid "Your phone number" +msgstr "電話號碼" + +#: templates/web/fixmystreet/questionnaire/index.html:16 +msgid "Your report" +msgstr "申報" + +#: templates/web/base/footer.html:9 templates/web/fixmystreet/footer.html:24 +msgid "Your reports" +msgstr "你作的申報" + +#: templates/web/base/my/my.html:53 templates/web/fixmystreet/my/my.html:41 +msgid "Your updates" +msgstr "更新" + +#: templates/web/base/contact/index.html:81 +msgid "Your email:" +msgstr "您的電子郵件:" + +#: templates/web/base/admin/timeline.html:4 +msgid "by %s" +msgstr "由 %s" + +#: templates/web/base/reports/body.html:6 +#: templates/web/base/reports/body.html:7 +msgid "council" +msgstr "地方政府" + +#: templates/web/base/admin/report_edit.html:32 +#: templates/web/zurich/admin/report_edit-sdm.html:40 +#: templates/web/zurich/admin/report_edit.html:54 +msgid "didn't use map" +msgstr "不使用地圖" + +#: templates/web/base/alert/index.html:33 +#: templates/web/fixmystreet/around/postcode_form.html:20 +msgid "e.g. ‘%s’ or ‘%s’" +msgstr "例如 ‘%s’ 或 ‘%s’" + +#: templates/web/base/admin/body-form.html:188 +#: templates/web/base/admin/flagged.html:51 +msgid "edit user" +msgstr "用戶編輯" + +#: templates/web/base/admin/index.html:34 +#: 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 "%s上回更新:" + +#: perllib/Utils.pm:235 +msgid "less than a minute" +msgstr "少於一分鐘" + +#: templates/web/base/report/updates.html:57 +msgid "marked as a duplicate report" +msgstr "標註為重覆之申報" + +#: templates/web/base/report/updates.html:47 +msgid "marked as action scheduled" +msgstr "標註為排程行動" + +#: templates/web/base/report/updates.html:59 +msgid "marked as an internal referral" +msgstr "標註為內部推薦" + +#: templates/web/base/report/updates.html:49 +msgid "marked as closed" +msgstr "標註為關閉" + +#: templates/web/base/report/updates.html:28 +#: templates/web/base/report/updates.html:51 +msgid "marked as fixed" +msgstr "標註為解決" + +#: templates/web/base/report/updates.html:45 +msgid "marked as in progress" +msgstr "標註為處理中" + +#: templates/web/base/report/updates.html:41 +msgid "marked as investigating" +msgstr "標註為調查中" + +#: templates/web/base/report/updates.html:55 +msgid "marked as not the council's responsibility" +msgstr "標註為非本區政府職責範圍" + +#: templates/web/base/report/updates.html:43 +msgid "marked as planned" +msgstr "標註為己規畫" + +#: templates/web/base/report/updates.html:53 +msgid "marked as unable to fix" +msgstr "標註為無法解決" + +#: perllib/FixMyStreet/App/Controller/Admin.pm:130 +#: templates/web/base/admin/questionnaire.html:15 +#: templates/web/base/admin/questionnaire.html:16 +msgid "n/a" +msgstr "不適用" + +#: templates/web/base/alert/_list.html:87 +#: templates/web/fixmystreet/alert/_list.html:85 +msgid "or" +msgstr "或" + +#: templates/web/base/js/translation_strings.html:27 +msgid "or locate me automatically" +msgstr "自動辨識我所在位置 " + +#: templates/web/base/admin/report_edit.html:28 +#: templates/web/base/admin/report_edit.html:30 +#: templates/web/zurich/admin/report_edit-sdm.html:27 +#: templates/web/zurich/admin/report_edit-sdm.html:29 +#: templates/web/zurich/admin/report_edit-sdm.html:36 +#: templates/web/zurich/admin/report_edit-sdm.html:38 +#: templates/web/zurich/admin/report_edit.html:27 +#: templates/web/zurich/admin/report_edit.html:29 +#: templates/web/zurich/admin/report_edit.html:38 +#: templates/web/zurich/admin/report_edit.html:40 +#: templates/web/zurich/admin/report_edit.html:50 +#: templates/web/zurich/admin/report_edit.html:52 +msgid "originally entered: “%s”" +msgstr "原始輸入者" + +#: templates/web/base/admin/report_edit.html:43 +msgid "other areas:" +msgstr "其它地區:" + +#: templates/web/base/report/updates.html:29 +#: templates/web/base/report/updates.html:39 +msgid "reopened" +msgstr "重啟申報" + +#: templates/web/fixmystreet/header.html:59 +#: templates/web/zurich/footer.html:12 +msgid "sign out" +msgstr "登出" + +#: templates/web/base/report/new/fill_in_details_form.html:12 +#: templates/web/base/report/new/fill_in_details_form.html:15 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:10 +#: templates/web/fixmystreet/report/new/fill_in_details_form.html:12 +msgid "the local council" +msgstr "當地地府" + +#: templates/web/base/report/_main.html:57 +#: 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:379 +msgid "this type of local problem" +msgstr "此類在地問題" + +#: perllib/Utils.pm:207 +msgid "today" +msgstr "今天" + +#: templates/web/base/admin/report_edit.html:32 +#: templates/web/zurich/admin/report_edit-sdm.html:40 +#: templates/web/zurich/admin/report_edit.html:54 +msgid "used map" +msgstr "已用過之地圖" + +#: templates/web/base/admin/update_edit.html:35 +msgid "user is from same council as problem - %d" +msgstr "用戶來同一問題的地方政府- %d" + +#: templates/web/base/admin/update_edit.html:38 +msgid "user is problem owner" +msgstr "%d 天數" + +#: templates/web/base/reports/body.html:0 +#: templates/web/base/reports/body.html:3 +msgid "ward" +msgstr "路檔" + +#: templates/web/base/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:254 +#, perl-format +msgid "%d hour" +msgid_plural "%d hours" +msgstr[0] "%d 時數" + +#: templates/web/base/report/_support.html:6 +#, perl-format +msgid "%d supporter" +msgid_plural "%d supporters" +msgstr[0] "%d 支援者" + +#: perllib/Utils.pm:256 +#, perl-format +msgid "%d minute" +msgid_plural "%d minutes" +msgstr[0] "%d 分鐘數" + +#: templates/web/base/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:250 +#, perl-format +msgid "%d week" +msgid_plural "%d weeks" +msgstr[0] "%d 週數" + +#: templates/web/base/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/base/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:252 +#, perl-format +msgid "%d day" +msgid_plural "%d days" +msgstr[0] "%d 日期" + +#: templates/web/base/report/new/councils_text_some.html:13 +#, perl-format +msgid "We do <strong>not</strong> yet have details for the other council that covers this location." +msgid_plural "We do <strong>not</strong> yet have details for the other councils that cover this location." +msgstr[0] "我們<strong>尚未<strong>有該區域其它單位之細節 " + +#~ msgid "For council(s):" +#~ msgstr "給地方政府(s):" diff --git a/notes/no-update-server b/notes/no-update-server index da3656829..74836bcbf 100644 --- a/notes/no-update-server +++ b/notes/no-update-server @@ -333,9 +333,6 @@ GAZE_URL: 'http://gaze.mysociety.org/gaze' # empty = use /usr/sbin/sendmail' SMTP_SMARTHOST: '' -AUTH_SHARED_SECRET: '' -HEARFROMYOURMP_BASE_URL: '' - ANDROID_URL: 'http://wiki.nuug.no/grupper/fiksgatami/android' ALLOWED_COBRANDS: 'fiksgatami' diff --git a/perllib/CrossSell.pm b/perllib/CrossSell.pm deleted file mode 100644 index 9567c2b38..000000000 --- a/perllib/CrossSell.pm +++ /dev/null @@ -1,297 +0,0 @@ -# CrossSell.pm: -# Adverts from FixMyStreet to another site. -# -# Unlike the PHP crosssell script, returns strings rather than prints them; -# and currently displays the same advert if e.g. there's a connection problem. -# -# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. -# Email: matthew@mysociety.org. WWW: http://www.mysociety.org -# -# $Id: CrossSell.pm,v 1.17 2009-09-10 09:36:42 matthew Exp $ - -# Config parameters site needs set to call these functions: -# OPTION_AUTH_SHARED_SECRET -# OPTION_HEARFROMYOURMP_BASE_URL - -package CrossSell; - -use strict; -use LWP::Simple qw($ua get); -use URI::Escape; -use mySociety::AuthToken; -use mySociety::Web qw(ent); - -sub display_random_hfymp_advert { - my ($email, $name, $text) = @_; - $name ||= ''; - my $auth_signature = mySociety::AuthToken::sign_with_shared_secret($email, mySociety::Config::get('AUTH_SHARED_SECRET')); - - # See if already signed up - my $url = mySociety::Config::get('HEARFROMYOURMP_BASE_URL'); - my $already_signed = get($url . '/authed?email=' . uri_escape($email) . "&sign=" . uri_escape($auth_signature)); - # Different from PHP version; display this advert if e.g. connection problem - return '' if $already_signed && $already_signed eq 'already signed'; - - $email = ent($email); - $name = ent($name); - $auth_signature = ent($auth_signature); - $text =~ s#\[form\]#<form action="http://www.hearfromyourmp.com/" method="post"> -<input type="hidden" name="name" value="$name"> -<input type="hidden" name="email" value="$email"> -<input type="hidden" name="sign" value="$auth_signature"> -<h2><input style="font-size:100%" type="submit" value="#; - $text =~ s#\[/form\]#"></h2>#; - - return '<div id="advert_hfymp">' . $text . '</div>'; -} - -sub display_random_gny_advert { - my ($email, $name, $text) = @_; - return '<div id="advert_thin">' . $text . '</div>'; -} - -sub display_random_twfy_alerts_advert { - my ($email, $name, $text) = @_; - my $auth_signature = mySociety::AuthToken::sign_with_shared_secret($email, mySociety::Config::get('AUTH_SHARED_SECRET')); - $text =~ s#\[button\]#<form action="http://www.theyworkforyou.com/alert/" method="post"> -<input type="hidden" name="email" value="$email"> -<input type="hidden" name="sign" value="$auth_signature"> -<input type="hidden" name="site" value="fms"> -<input style="font-size:150%" type="submit" value="#; - $text =~ s#\[/button\]#"></p>#; - return '<div id="advert_thin">' . $text . '</div>'; -} - -sub display_hfyc_cheltenham_advert { - my ($email, $name) = @_; - $name ||= ''; - my $auth_signature = mySociety::AuthToken::sign_with_shared_secret($email, mySociety::Config::get('AUTH_SHARED_SECRET')); - - # See if already signed up - my $already_signed = get('http://cheltenham.hearfromyourcouncillor.com/authed?email=' . uri_escape($email) . "&sign=" . uri_escape($auth_signature)); - # Different from PHP version; display this advert if e.g. connection problem - return '' if $already_signed && $already_signed eq 'already signed'; - - # If not, display advert - $email = ent($email); - $name = ent($name); - $auth_signature = ent($auth_signature); - my $out = <<EOF; -<form action="http://cheltenham.hearfromyourcouncillor.com/" method="post"> -<input type="hidden" name="name" value="$name"> -<input type="hidden" name="email" value="$email"> -<input type="hidden" name="sign" value="$auth_signature"> -<div id="advert_thin"> -EOF - - my $rand = int(rand(2)); - if ($rand == 0) { - $out .= "<h2>Cool! You're interested in Cheltenham!</h2> - <p>We've got an exciting new free service that works exclusively - for people in Cheltenham. Please sign up to help the charity - that runs WriteToThem, and to get a sneak preview of our new - service.</p>"; - } else { - $out .= "<h2>Get to know your councillors.</h2> - <p>Local councillors are really important, but hardly anyone knows them. - Use our new free service to build a low-effort, long term relationship - with your councillor.</p>"; - } - $out .= <<EOF; -<p align="center"> -<input type="submit" value="Sign up to HearFromYourCouncillor"> -</p> -</div> -</form> -EOF - return ($out, "cheltenhamhfyc$rand"); -} - -sub display_democracyclub { - my (%input) = @_; - return <<EOF; -<div id="advert_thin"> -<h2 style="margin-bottom:0">Help make the next election the most accountable ever</h2> <p style="font-size:120%;margin-top:0.5em;"><a href="http://www.democracyclub.org.uk/">Join Democracy Club</a> and have fun keeping an eye on your election candidates. <a href="http://www.democracyclub.org.uk/">Sign me up</a>! -</div> -EOF -} - -sub display_news_form { - my (%input) = @_; - my %input_h = map { $_ => $input{$_} ? ent($input{$_}) : '' } qw(name email signed_email); - my $auth_signature = $input_h{signed_email}; - return <<EOF; -<h1 style="padding-top:0.5em">mySociety newsletter</h1> - -<p>Interested in hearing more about FixMyStreet successes? Enter your email -address below and we’ll send you occasional emails about what mySociety -and our users have been up to.</p> - -<form method="post" action="//mysociety.us9.list-manage.com/subscribe/post?u=53d0d2026dea615ed488a8834&id=287dc28511"> -<label style="position: absolute; left: -5000px;"> -Leave this box empty: <input type="text" name="b_53d0d2026dea615ed488a8834_287dc28511" tabindex="-1" value="" /> -</label> -<label for="name">Name:</label> -<input type="text" name="NAME" id="name" value="$input_h{name}" size="30"> -<br><label for="email">Email:</label> -<input type="text" name="EMAIL" id="email" value="$input_h{email}" size="30"> - <input type="submit" name="subscribe" value="Add me to the list"> -</form> - -<p>mySociety respects your privacy, and we'll never sell or give away your private -details. You can unsubscribe at any time.</p> -EOF -} - -sub display_survey_link { - return <<EOF; -<h1 style="padding-top:0.5em">User Survey</h1> -<p> -We're running a survey to help us understand who uses our sites. If you have 10-15 minutes to spare then we'd be grateful if you could <a href="http://questions.mysociety.org/S/fms/w/" target="_blank">take part</a>. -</p> -EOF -} - -sub display_wtt_link { - return <<EOF; -<h1 style="padding-top:0.5em">WriteToThem</h1> -<p> -Need to write to a politician? Try <a href="https://writetothem.com">WriteToThem</a> - great -for campaigns too. -</p> -EOF -} - -sub display_app_links { - return <<EOF; -<h1>Next time, report your issue quicker.</h1> -<p>Download our awesome app, and make reporting and monitoring issues on the go a breeze.</p> - -<p class="app-links"> -<a href="https://play.google.com/store/apps/details?id=org.mysociety.FixMyStreet"> - <img alt="FixMyStreet Android app on Google Play" - src="/cobrands/fixmystreet/images/google_play_logo.png" /> -</a><a href="https://itunes.apple.com/gb/app/fixmystreet/id297456545"> - <img alt="FixMyStreet app on the App Store" - src="/cobrands/fixmystreet/images/itunes_store_logo.png" /> -</a> -</p> - -<p class="desktop-advice">Not on your mobile? No problem! Download now, and the app will be ready to use when you next pick up your phone.</p> -EOF -} - -# Not currently used, needs more explanation and testing; perhaps in future. -sub display_gny_groups { - my ($lon, $lat) = @_; - my $groups = get("http://www.groupsnearyou.com/rss.php?q=$lon,$lat&category=1&pointonly=1"); - my $out = ''; - my $count = 0; - while ($groups =~ /<item>\s*<title>New group! (.*?)<\/title>.*?<guid isPermaLink="true">(.*?)<\/guid>.*?<description>(.*?)<\/description>/gs) { - $out .= "<li><a href='$2'>$1</a> $3"; - $count++; - } - return unless $out; - return <<EOF; -<h1 style="padding-top:0.5em">$count local groups</h1> -<ul> -$out -</ul> -EOF -} - -# Choose appropriate advert and display it. -# $this_site is to stop a site advertising itself. -sub display_advert ($$;$%) { - my ($c, $email, $name, %data) = @_; - - return '' unless $c->cobrand->moniker eq 'fixmystreet'; - - $ua->timeout(5); - - #if (defined $data{council} && $data{council} eq '2326') { - # my ($out, $ad) = display_hfyc_cheltenham_advert($email, $name); - # if ($out) { - # $c->stash->{scratch} = "advert=$ad"; - # return $out; - # } - #} - - #if ($data{lat}) { - # my $out = display_gny_groups($data{lon}, $data{lat}); - # if ($out) { - # $c->stash->{scratch} = 'advert=gnygroups'; - # return '<div style="margin: 0 5em; border-top: dotted 1px #666666;">' - # . $out . '</div>'; - # } - #} - - #$c->stash->{scratch} = 'advert=demclub0'; - #return display_democracyclub(); - -# return <<EOF; -#<div id="advert_thin"> -#<p>Do you have an issue that’s too big for FixMyStreet? -#It could be time to petition your council. Try our new site: -#<h2 style="margin-top:0; font-size: 150%"> -#<a href="http://www.petitionyourcouncil.com/">PetitionYourCouncil</a></p> -#</h2> -#</div> -#EOF - - #unless (defined $data{done_tms} && $data{done_tms}==1) { - $c->stash->{scratch} = 'advert=wtt'; - return '<div class="advert-mobile-apps">' - . display_app_links() - . '</div>'; - - $c->stash->{scratch} = 'advert=news'; - my $auth_signature = ''; - unless (defined $data{emailunvalidated} && $data{emailunvalidated}==1) { - $auth_signature = mySociety::AuthToken::sign_with_shared_secret($email, mySociety::Config::get('AUTH_SHARED_SECRET')); - } - return '<div style="margin: 0 5em; border-top: dotted 1px #666666;">' - . display_news_form(email => $email, name => $name, signed_email => $auth_signature) - . '</div>'; - #} - - my @adverts = ( - [ 'gny0', '<h2>Are you a member of a local group…</h2> …which uses the internet to coordinate itself, such as a neighbourhood watch? If so, please help the charity that runs FixMyStreet by <a href="http://www.groupsnearyou.com/add/about/">adding some information about it</a> to our new site, GroupsNearYou.' ], - [ 'gny1', '<h2>Help us build a map of the world’s local communities –<br><a href="http://www.groupsnearyou.com/add/about/">Add one to GroupsNearYou</a></h2>' ], - # Since you're interested in your local area, why not - # start a long term relationship with your MP? - #[ 'hfymp0', '<h2 style="margin-bottom:0">Get email from your MP in the future</h2> <p style="font-size:120%;margin-top:0;">and have a chance to discuss what they say in a public forum [form]Sign up to HearFromYourMP[/form]' ], - #[ 'twfy_alerts0', '<h2>Get emailed every time your MP says something in Parliament</h2> [button]Keep an eye on them for free![/button]' ], - ); - while (@adverts) { - my $rand = int(rand(scalar @adverts)); - next unless $adverts[$rand]; - my ($advert_id, $advert_text) = @{$adverts[$rand]}; - (my $advert_site = $advert_id) =~ s/\d+$//; - my $func = "display_random_${advert_site}_advert"; - no strict 'refs'; - my $out = &$func($email, $name, $advert_text); - use strict 'refs'; - if ($out) { - $c->stash->{scratch} = "advert=$advert_id"; - return $out; - } - - for (my $i=0; $i<@adverts; $i++) { - (my $a = $adverts[$i][0]) =~ s/\d+$//; - delete $adverts[$i] if $advert_site eq $a; - } - } - - $c->stash->{scratch} = 'advert=pb'; - return <<EOF; -<div id="advert_thin"> -<h2 style="font-size: 150%"> -If you're interested in improving your local area, -<a href="http://www.pledgebank.com/">use PledgeBank</a> to -do so with other people!</h2> -</div> -EOF -} - -1; diff --git a/perllib/EastHantsWSDL.pm b/perllib/EastHantsWSDL.pm index d799f4025..181cc93a1 100644 --- a/perllib/EastHantsWSDL.pm +++ b/perllib/EastHantsWSDL.pm @@ -5,7 +5,7 @@ package EastHantsWSDL; my %methods = ( INPUTFEEDBACK => { - endpoint => 'http://www.easthants.gov.uk:80/forms.nsf/InputFeedback?OpenWebService', + endpoint => 'http://91.224.27.33/forms.nsf/InputFeedback?OpenWebService', soapaction => 'INPUTFEEDBACK', uri => 'urn:DefaultNamespace', parameters => [ diff --git a/perllib/FixMyStreet.pm b/perllib/FixMyStreet.pm index f3b72c4d0..76760b967 100644 --- a/perllib/FixMyStreet.pm +++ b/perllib/FixMyStreet.pm @@ -6,6 +6,7 @@ use warnings; use Path::Class; my $ROOT_DIR = file(__FILE__)->parent->parent->absolute->resolve; +use DateTime::TimeZone; use Readonly; use Sub::Override; @@ -217,4 +218,23 @@ sub get_email_template { return $template; } +my $tz = DateTime::TimeZone->new( name => "local" ); +my $tz_f; +$tz_f = DateTime::TimeZone->new( name => FixMyStreet->config('TIME_ZONE') ) + if FixMyStreet->config('TIME_ZONE'); + +sub local_time_zone { + return $tz; +} + +sub time_zone { + return $tz_f; +} + +sub set_time_zone { + my ($class, $dt) = @_; + $dt->set_time_zone($tz); + $dt->set_time_zone($tz_f) if $tz_f; +} + 1; diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm index 769a6bb8f..787755a05 100644 --- a/perllib/FixMyStreet/App.pm +++ b/perllib/FixMyStreet/App.pm @@ -89,15 +89,15 @@ __PACKAGE__->config( # Start the application __PACKAGE__->setup(); -# Due to some current issues with proxyings, need to manually -# tell the code we're secure if we are. +# If your site is secure but running behind a proxy, you might need to set the +# SECURE_PROXY_SSL_HEADER configuration variable so this can be spotted. after 'prepare_headers' => sub { my $self = shift; my $base_url = $self->config->{BASE_URL}; + my $ssl_header = $self->config->{SECURE_PROXY_SSL_HEADER}; my $host = $self->req->headers->header('Host'); - $self->req->secure( 1 ) if $base_url eq 'https://www.zueriwieneu.ch'; - $self->req->secure( 1 ) if $base_url eq 'https://www.fixmystreet.com' - && ( $host eq 'fix.bromley.gov.uk' || $host eq 'www.fixmystreet.com' ); + $self->req->secure(1) if $ssl_header && ref $ssl_header eq 'ARRAY' + && @$ssl_header == 2 && $self->req->header($ssl_header->[0]) eq $ssl_header->[1]; }; # set up DB handle for old code @@ -195,7 +195,7 @@ sub setup_request { Memcached::set_namespace( FixMyStreet->config('FMS_DB_NAME') . ":" ); - FixMyStreet::Map::set_map_class( $cobrand->map_type || $c->req->param('map_override') ); + FixMyStreet::Map::set_map_class( $cobrand->map_type || $c->get_param('map_override') ); unless ( FixMyStreet->config('MAPIT_URL') ) { my $port = $c->req->uri->port; @@ -529,6 +529,54 @@ sub is_abuser { return $c->model('DB::Abuse')->search( { email => [ $email, $domain ] } )->first; } +=head2 get_param + + $param = $c->get_param('name'); + +Return the parameter passed in the request, or undef if not present. Like +req->param() in a scalar context, this will return the first parameter if +multiple were provided; unlike req->param it will always return a scalar, +never a list, in order to avoid possible security issues. + +=cut + +sub get_param { + my ($c, $param) = @_; + my $value = $c->req->params->{$param}; + return $value->[0] if ref $value; + return $value; +} + +=head2 get_param_list + + @params = $c->get_param_list('name'); + +Return the parameters passed in the request, as a list. This will always return +a list, with an empty list if no parameter is present. + +=cut + +sub get_param_list { + my ($c, $param) = @_; + my $value = $c->req->params->{$param}; + return @$value if ref $value; + return ($value) if defined $value; + return (); +} + +=head2 set_param + + $c->set_param('name', 'My Name'); + +Sets the query parameter to the passed variable. + +=cut + +sub set_param { + my ($c, $param, $value) = @_; + $c->req->params->{$param} = $value; +} + =head1 SEE ALSO L<FixMyStreet::App::Controller::Root>, L<Catalyst> diff --git a/perllib/FixMyStreet/App/Controller/Admin.pm b/perllib/FixMyStreet/App/Controller/Admin.pm index de13a76de..6145a6eb0 100644 --- a/perllib/FixMyStreet/App/Controller/Admin.pm +++ b/perllib/FixMyStreet/App/Controller/Admin.pm @@ -246,19 +246,16 @@ sub bodies : Path('bodies') : Args(0) { $c->stash->{edit_activity} = $edit_activity; - my $posted = $c->req->param('posted') || ''; + my $posted = $c->get_param('posted') || ''; if ( $posted eq 'body' ) { $c->forward('check_for_super_user'); $c->forward('check_token'); my $params = $c->forward('body_params'); my $body = $c->model('DB::Body')->create( $params ); - my $area_ids = $c->req->params->{area_ids}; - if ($area_ids) { - $area_ids = [ $area_ids ] unless ref $area_ids; - foreach (@$area_ids) { - $c->model('DB::BodyArea')->create( { body => $body, area_id => $_ } ); - } + my @area_ids = $c->get_param_list('area_ids'); + foreach (@area_ids) { + $c->model('DB::BodyArea')->create( { body => $body, area_id => $_ } ); } $c->stash->{updated} = _('New body added'); @@ -266,9 +263,6 @@ sub bodies : Path('bodies') : Args(0) { $c->forward( 'fetch_all_bodies' ); - # XXX For fixmystreet.com, need to exclude bodies that are covering London. - # But soon, this means just don't have bodies covering London. - my $contacts = $c->model('DB::Contact')->search( undef, { @@ -317,7 +311,7 @@ sub body : Path('body') : Args(1) { $c->forward( 'fetch_all_bodies' ); $c->forward( 'body_form_dropdowns' ); - if ( $c->req->param('posted') ) { + if ( $c->get_param('posted') ) { $c->log->debug( 'posted' ); $c->forward('update_contacts'); } @@ -337,7 +331,7 @@ sub check_for_super_user : Private { sub update_contacts : Private { my ( $self, $c ) = @_; - my $posted = $c->req->param('posted'); + my $posted = $c->get_param('posted'); my $editor = $c->forward('get_user'); if ( $posted eq 'new' ) { @@ -345,11 +339,11 @@ sub update_contacts : Private { my %errors; - my $category = $self->trim( $c->req->param( 'category' ) ); + my $category = $self->trim( $c->get_param('category') ); $errors{category} = _("Please choose a category") unless $category; - my $email = $self->trim( $c->req->param( 'email' ) ); - $errors{email} = _('Please enter a valid email') unless is_valid_email($email); - $errors{note} = _('Please enter a message') unless $c->req->param('note'); + my $email = $self->trim( $c->get_param('email') ); + $errors{email} = _('Please enter a valid email') unless is_valid_email($email) || $email eq 'REFUSED'; + $errors{note} = _('Please enter a message') unless $c->get_param('note'); $category = 'Empty property' if $c->cobrand->moniker eq 'emptyhomes'; @@ -361,16 +355,16 @@ sub update_contacts : Private { ); $contact->email( $email ); - $contact->confirmed( $c->req->param('confirmed') ? 1 : 0 ); - $contact->deleted( $c->req->param('deleted') ? 1 : 0 ); - $contact->non_public( $c->req->param('non_public') ? 1 : 0 ); - $contact->note( $c->req->param('note') ); + $contact->confirmed( $c->get_param('confirmed') ? 1 : 0 ); + $contact->deleted( $c->get_param('deleted') ? 1 : 0 ); + $contact->non_public( $c->get_param('non_public') ? 1 : 0 ); + $contact->note( $c->get_param('note') ); $contact->whenedited( \'ms_current_timestamp()' ); $contact->editor( $editor ); - $contact->endpoint( $c->req->param('endpoint') ); - $contact->jurisdiction( $c->req->param('jurisdiction') ); - $contact->api_key( $c->req->param('api_key') ); - $contact->send_method( $c->req->param('send_method') ); + $contact->endpoint( $c->get_param('endpoint') ); + $contact->jurisdiction( $c->get_param('jurisdiction') ); + $contact->api_key( $c->get_param('api_key') ); + $contact->send_method( $c->get_param('send_method') ); if ( %errors ) { $c->stash->{updated} = _('Please correct the errors below'); @@ -389,7 +383,7 @@ sub update_contacts : Private { } elsif ( $posted eq 'update' ) { $c->forward('check_token'); - my @categories = $c->req->param('confirmed'); + my @categories = $c->get_param_list('confirmed'); my $contacts = $c->model('DB::Contact')->search( { @@ -416,13 +410,10 @@ sub update_contacts : Private { $c->stash->{body}->update( $params ); my @current = $c->stash->{body}->body_areas->all; my %current = map { $_->area_id => 1 } @current; - my $area_ids = $c->req->params->{area_ids}; - if ($area_ids) { - $area_ids = [ $area_ids ] unless ref $area_ids; - foreach (@$area_ids) { - $c->model('DB::BodyArea')->find_or_create( { body => $c->stash->{body}, area_id => $_ } ); - delete $current{$_}; - } + my @area_ids = $c->get_param_list('area_ids'); + foreach (@area_ids) { + $c->model('DB::BodyArea')->find_or_create( { body => $c->stash->{body}, area_id => $_ } ); + delete $current{$_}; } # Remove any others $c->stash->{body}->body_areas->search( { area_id => [ keys %current ] } )->delete; @@ -434,7 +425,7 @@ sub update_contacts : Private { sub body_params : Private { my ( $self, $c ) = @_; - my @fields = qw/name endpoint jurisdiction api_key send_method send_comments suppress_alerts send_extended_statuses comment_user_id can_be_devolved parent deleted/; + my @fields = qw/name endpoint jurisdiction api_key send_method external_url/; my %defaults = map { $_ => '' } @fields; %defaults = ( %defaults, send_comments => 0, @@ -445,7 +436,7 @@ sub body_params : Private { parent => undef, deleted => 0, ); - my %params = map { $_ => $c->req->param($_) || $defaults{$_} } @fields; + my %params = map { $_ => $c->get_param($_) || $defaults{$_} } keys %defaults; return \%params; } @@ -456,7 +447,7 @@ sub display_contacts : Private { $c->stash->{contacts} = $contacts; $c->stash->{live_contacts} = $contacts->search({ deleted => 0 }); - if ( $c->req->param('text') && $c->req->param('text') == 1 ) { + if ( $c->get_param('text') && $c->get_param('text') == 1 ) { $c->stash->{template} = 'admin/council_contacts.txt'; $c->res->content_type('text/plain; charset=utf-8'); return 1; @@ -535,16 +526,16 @@ sub reports : Path('reports') { } } - my $order = $c->req->params->{o} || 'created'; - my $dir = defined $c->req->params->{d} ? $c->req->params->{d} : 1; + my $order = $c->get_param('o') || 'created'; + my $dir = defined $c->get_param('d') ? $c->get_param('d') : 1; $c->stash->{order} = $order; $c->stash->{dir} = $dir; $order .= ' desc' if $dir; - my $p_page = $c->req->params->{p} || 1; - my $u_page = $c->req->params->{u} || 1; + my $p_page = $c->get_param('p') || 1; + my $u_page = $c->get_param('u') || 1; - if (my $search = $c->req->param('search')) { + if (my $search = $c->get_param('search')) { $c->stash->{searched} = $search; my $site_restriction = $c->cobrand->site_restriction; @@ -687,7 +678,7 @@ sub report_edit : Path('report_edit') : Args(1) { ); } - if ( $c->req->param('rotate_photo') ) { + if ( $c->get_param('rotate_photo') ) { $c->forward('rotate_photo'); return 1; } @@ -704,7 +695,7 @@ sub report_edit : Path('report_edit') : Args(1) { ->search( { problem_id => $problem->id }, { order_by => 'created' } ) ->all ]; - if ( $c->req->param('resend') ) { + if ( $c->get_param('resend') ) { $c->forward('check_token'); $problem->whensent(undef); @@ -714,24 +705,31 @@ sub report_edit : Path('report_edit') : Args(1) { $c->forward( 'log_edit', [ $id, 'problem', 'resend' ] ); } - elsif ( $c->req->param('flaguser') ) { + elsif ( $c->get_param('mark_sent') ) { + $c->forward('check_token'); + $problem->whensent(\'ms_current_timestamp()'); + $problem->update(); + $c->stash->{status_message} = '<p><em>' . _('That problem has been marked as sent.') . '</em></p>'; + $c->forward( 'log_edit', [ $id, 'problem', 'marked sent' ] ); + } + elsif ( $c->get_param('flaguser') ) { $c->forward('flag_user'); $c->stash->{problem}->discard_changes; } - elsif ( $c->req->param('removeuserflag') ) { + elsif ( $c->get_param('removeuserflag') ) { $c->forward('remove_user_flag'); $c->stash->{problem}->discard_changes; } - elsif ( $c->req->param('banuser') ) { + elsif ( $c->get_param('banuser') ) { $c->forward('ban_user'); } - elsif ( $c->req->param('submit') ) { + elsif ( $c->get_param('submit') ) { $c->forward('check_token'); my $done = 0; my $edited = 0; - my $new_state = $c->req->param('state'); + my $new_state = $c->get_param('state'); my $old_state = $problem->state; if ( $new_state eq 'confirmed' && $problem->state eq 'unconfirmed' @@ -744,35 +742,35 @@ sub report_edit : Path('report_edit') : Args(1) { $done = 1; } - my $flagged = $c->req->param('flagged') ? 1 : 0; - my $non_public = $c->req->param('non_public') ? 1 : 0; + my $flagged = $c->get_param('flagged') ? 1 : 0; + my $non_public = $c->get_param('non_public') ? 1 : 0; # do this here so before we update the values in problem - if ( $c->req->param('anonymous') ne $problem->anonymous - || $c->req->param('name') ne $problem->name - || $c->req->param('email') ne $problem->user->email - || $c->req->param('title') ne $problem->title - || $c->req->param('detail') ne $problem->detail - || ($c->req->param('body') && $c->req->param('body') ne $problem->bodies_str) + if ( $c->get_param('anonymous') ne $problem->anonymous + || $c->get_param('name') ne $problem->name + || $c->get_param('email') ne $problem->user->email + || $c->get_param('title') ne $problem->title + || $c->get_param('detail') ne $problem->detail + || ($c->get_param('body') && $c->get_param('body') ne $problem->bodies_str) || $flagged != $problem->flagged || $non_public != $problem->non_public ) { $edited = 1; } - $problem->anonymous( $c->req->param('anonymous') ); - $problem->title( $c->req->param('title') ); - $problem->detail( $c->req->param('detail') ); + $problem->anonymous( $c->get_param('anonymous') ); + $problem->title( $c->get_param('title') ); + $problem->detail( $c->get_param('detail') ); $problem->state( $new_state ); - $problem->name( $c->req->param('name') ); - $problem->bodies_str( $c->req->param('body') ) if $c->req->param('body'); + $problem->name( $c->get_param('name') ); + $problem->bodies_str( $c->get_param('body') ) if $c->get_param('body'); $problem->flagged( $flagged ); $problem->non_public( $non_public ); - if ( $c->req->param('email') ne $problem->user->email ) { + if ( $c->get_param('email') ne $problem->user->email ) { my $user = $c->model('DB::User')->find_or_create( - { email => $c->req->param('email') } + { email => $c->get_param('email') } ); $user->insert unless $user->in_storage; @@ -780,11 +778,11 @@ sub report_edit : Path('report_edit') : Args(1) { } # Deal with photos - if ( $c->req->param('remove_photo') ) { + if ( $c->get_param('remove_photo') ) { $problem->photo(undef); } - if ( $c->req->param('remove_photo') || $new_state eq 'hidden' ) { + if ( $c->get_param('remove_photo') || $new_state eq 'hidden' ) { unlink glob FixMyStreet->path_to( 'web', 'photo', $problem->id . '.*' ); } @@ -821,7 +819,7 @@ sub report_edit : Path('report_edit') : Args(1) { sub users: Path('users') : Args(0) { my ( $self, $c ) = @_; - if (my $search = $c->req->param('search')) { + if (my $search = $c->get_param('search')) { $c->stash->{searched} = $search; my $isearch = '%' . $search . '%'; @@ -893,52 +891,52 @@ sub update_edit : Path('update_edit') : Args(1) { $c->forward('check_email_for_abuse', [ $update->user->email ] ); - if ( $c->req->param('banuser') ) { + if ( $c->get_param('banuser') ) { $c->forward('ban_user'); } - elsif ( $c->req->param('flaguser') ) { + elsif ( $c->get_param('flaguser') ) { $c->forward('flag_user'); $c->stash->{update}->discard_changes; } - elsif ( $c->req->param('removeuserflag') ) { + elsif ( $c->get_param('removeuserflag') ) { $c->forward('remove_user_flag'); $c->stash->{update}->discard_changes; } - elsif ( $c->req->param('submit') ) { + elsif ( $c->get_param('submit') ) { $c->forward('check_token'); my $old_state = $update->state; - my $new_state = $c->req->param('state'); + my $new_state = $c->get_param('state'); my $edited = 0; # $update->name can be null which makes ne unhappy my $name = $update->name || ''; - if ( $c->req->param('name') ne $name - || $c->req->param('email') ne $update->user->email - || $c->req->param('anonymous') ne $update->anonymous - || $c->req->param('text') ne $update->text ){ + if ( $c->get_param('name') ne $name + || $c->get_param('email') ne $update->user->email + || $c->get_param('anonymous') ne $update->anonymous + || $c->get_param('text') ne $update->text ) { $edited = 1; } - if ( $c->req->param('remove_photo') ) { + if ( $c->get_param('remove_photo') ) { $update->photo(undef); } - if ( $c->req->param('remove_photo') || $new_state eq 'hidden' ) { + if ( $c->get_param('remove_photo') || $new_state eq 'hidden' ) { unlink glob FixMyStreet->path_to( 'web', 'photo', 'c', $update->id . '.*' ); } - $update->name( $c->req->param('name') || '' ); - $update->text( $c->req->param('text') ); - $update->anonymous( $c->req->param('anonymous') ); + $update->name( $c->get_param('name') || '' ); + $update->text( $c->get_param('text') ); + $update->anonymous( $c->get_param('anonymous') ); $update->state( $new_state ); - if ( $c->req->param('email') ne $update->user->email ) { + if ( $c->get_param('email') ne $update->user->email ) { my $user = $c->model('DB::User') - ->find_or_create( { email => $c->req->param('email') } ); + ->find_or_create( { email => $c->get_param('email') } ); $user->insert unless $user->in_storage; $update->user($user); @@ -989,22 +987,22 @@ sub user_add : Path('user_edit') : Args(0) { $c->forward('get_token'); $c->forward('fetch_all_bodies'); - return 1 unless $c->req->param('submit'); + return 1 unless $c->get_param('submit'); $c->forward('check_token'); - if ( $c->cobrand->moniker eq 'zurich' and $c->req->param('email') eq '' ) { + if ( $c->cobrand->moniker eq 'zurich' and $c->get_param('email') eq '' ) { $c->stash->{field_errors}->{email} = _('Please enter a valid email'); return 1; } - return unless $c->req->param('name') && $c->req->param('email'); + return unless $c->get_param('name') && $c->get_param('email'); my $user = $c->model('DB::User')->find_or_create( { - name => $c->req->param('name'), - email => $c->req->param('email'), - from_body => $c->req->param('body') || undef, - flagged => $c->req->param('flagged') || 0, + name => $c->get_param('name'), + email => $c->get_param('email'), + from_body => $c->get_param('body') || undef, + flagged => $c->get_param('flagged') || 0, }, { key => 'users_email_key' } ); @@ -1028,23 +1026,23 @@ sub user_edit : Path('user_edit') : Args(1) { $c->forward('fetch_all_bodies'); - if ( $c->req->param('submit') ) { + if ( $c->get_param('submit') ) { $c->forward('check_token'); my $edited = 0; - if ( $user->email ne $c->req->param('email') || - $user->name ne $c->req->param('name' ) || - ($user->from_body && $user->from_body->id ne $c->req->param('body')) || - (!$user->from_body && $c->req->param('body')) + if ( $user->email ne $c->get_param('email') || + $user->name ne $c->get_param('name') || + ($user->from_body && $user->from_body->id ne $c->get_param('body')) || + (!$user->from_body && $c->get_param('body')) ) { $edited = 1; } - $user->name( $c->req->param('name') ); - $user->email( $c->req->param('email') ); - $user->from_body( $c->req->param('body') || undef ); - $user->flagged( $c->req->param('flagged') || 0 ); + $user->name( $c->get_param('name') ); + $user->email( $c->get_param('email') ); + $user->from_body( $c->get_param('body') || undef ); + $user->flagged( $c->get_param('flagged') || 0 ); if ( $c->cobrand->moniker eq 'zurich' and $user->email eq '' ) { $c->stash->{field_errors}->{email} = _('Please enter a valid email'); @@ -1100,16 +1098,16 @@ sub stats : Path('stats') : Args(0) { return $c->cobrand->admin_stats(); } - if ( $c->req->param('getcounts') ) { + if ( $c->get_param('getcounts') ) { my ( $start_date, $end_date, @errors ); my $parser = DateTime::Format::Strptime->new( pattern => '%d/%m/%Y' ); - $start_date = $parser-> parse_datetime ( $c->req->param('start_date') ); + $start_date = $parser-> parse_datetime ( $c->get_param('start_date') ); push @errors, _('Invalid start date') unless defined $start_date; - $end_date = $parser-> parse_datetime ( $c->req->param('end_date') ) ; + $end_date = $parser-> parse_datetime ( $c->get_param('end_date') ) ; push @errors, _('Invalid end date') unless defined $end_date; @@ -1117,21 +1115,21 @@ sub stats : Path('stats') : Args(0) { $c->stash->{start_date} = $start_date; $c->stash->{end_date} = $end_date; - $c->stash->{unconfirmed} = $c->req->param('unconfirmed') eq 'on' ? 1 : 0; + $c->stash->{unconfirmed} = $c->get_param('unconfirmed') eq 'on' ? 1 : 0; return 1 if @errors; - my $bymonth = $c->req->param('bymonth'); + my $bymonth = $c->get_param('bymonth'); $c->stash->{bymonth} = $bymonth; my ( %body, %dates ); - $body{bodies_str} = { like => $c->req->param('body') } - if $c->req->param('body'); + $body{bodies_str} = { like => $c->get_param('body') } + if $c->get_param('body'); - $c->stash->{selected_body} = $c->req->param('body'); + $c->stash->{selected_body} = $c->get_param('body'); my $field = 'confirmed'; - $field = 'created' if $c->req->param('unconfirmed'); + $field = 'created' if $c->get_param('unconfirmed'); my $one_day = DateTime::Duration->new( days => 1 ); @@ -1143,7 +1141,7 @@ sub stats : Path('stats') : Args(0) { order_by => [ 'state' ], ); - if ( $c->req->param('bymonth') ) { + if ( $c->get_param('bymonth') ) { %select = ( select => [ { extract => \"year from $field", -as => 'c_year' }, @@ -1252,7 +1250,7 @@ not then display 404 page sub check_token : Private { my ( $self, $c ) = @_; - if ( !$c->req->param('token') || $c->req->param('token' ) ne $c->stash->{token} ) { + if ( !$c->get_param('token') || $c->get_param('token') ne $c->stash->{token} ) { $c->detach( '/page_error_404_not_found' ); } @@ -1290,7 +1288,7 @@ accordingly sub ban_user : Private { my ( $self, $c ) = @_; - my $email = $c->req->param('email'); + my $email = $c->get_param('email'); return unless $email; @@ -1317,7 +1315,7 @@ Sets the flag on a user with the given email sub flag_user : Private { my ( $self, $c ) = @_; - my $email = $c->req->param('email'); + my $email = $c->get_param('email'); return unless $email; @@ -1345,7 +1343,7 @@ Remove the flag on a user with the given email sub remove_user_flag : Private { my ( $self, $c ) = @_; - my $email = $c->req->param('email'); + my $email = $c->get_param('email'); return unless $email; @@ -1390,7 +1388,7 @@ Rotate a photo 90 degrees left or right sub rotate_photo : Private { my ( $self, $c ) =@_; - my $direction = $c->req->param('rotate_photo'); + my $direction = $c->get_param('rotate_photo'); return unless $direction eq _('Rotate Left') or $direction eq _('Rotate Right'); my $photo = $c->stash->{problem}->photo; diff --git a/perllib/FixMyStreet/App/Controller/Alert.pm b/perllib/FixMyStreet/App/Controller/Alert.pm index e821b7467..6972bbc04 100644 --- a/perllib/FixMyStreet/App/Controller/Alert.pm +++ b/perllib/FixMyStreet/App/Controller/Alert.pm @@ -53,14 +53,14 @@ Target for subscribe form sub subscribe : Path('subscribe') : Args(0) { my ( $self, $c ) = @_; - $c->detach('rss') if $c->req->param('rss'); + $c->detach('rss') if $c->get_param('rss'); # if it exists then it's been submitted so we should # go to subscribe email and let it work out the next step $c->detach('subscribe_email') - if exists $c->req->params->{'rznvy'} || $c->req->params->{'alert'}; + if $c->get_param('rznvy') || $c->get_param('alert'); - $c->go('updates') if $c->req->params->{'id'}; + $c->go('updates') if $c->get_param('id'); # shouldn't get to here but if we have then do something sensible $c->go('index'); @@ -74,7 +74,7 @@ Redirects to relevant RSS feed sub rss : Private { my ( $self, $c ) = @_; - my $feed = $c->req->params->{feed}; + my $feed = $c->get_param('feed'); unless ($feed) { $c->stash->{errors} = [ _('Please select the feed you want') ]; @@ -114,9 +114,9 @@ sub subscribe_email : Private { $c->stash->{errors} = []; $c->forward('process_user'); - my $type = $c->req->param('type'); + my $type = $c->get_param('type'); push @{ $c->stash->{errors} }, _('Please select the type of alert you want') - if $type && $type eq 'local' && !$c->req->param('feed'); + if $type && $type eq 'local' && !$c->get_param('feed'); if (@{ $c->stash->{errors} }) { $c->go('updates') if $type && $type eq 'updates'; $c->go('list') if $type && $type eq 'local'; @@ -145,8 +145,8 @@ sub subscribe_email : Private { sub updates : Path('updates') : Args(0) { my ( $self, $c ) = @_; - $c->stash->{email} = $c->req->param('rznvy'); - $c->stash->{problem_id} = $c->req->param('id'); + $c->stash->{email} = $c->get_param('rznvy'); + $c->stash->{problem_id} = $c->get_param('id'); } =head2 confirm @@ -209,7 +209,7 @@ Set up the options in the stash required to create a problem update alert sub set_update_alert_options : Private { my ( $self, $c ) = @_; - my $report_id = $c->req->param('id'); + my $report_id = $c->get_param('id'); my $options = { user => $c->stash->{alert_user}, @@ -229,7 +229,7 @@ Set up the options in the stash required to create a local problems alert sub set_local_alert_options : Private { my ( $self, $c ) = @_; - my $feed = $c->req->param('feed'); + my $feed = $c->get_param('feed'); my ( $type, @params, $alert ); if ( $feed =~ /^area:(?:\d+:)?(\d+)/ ) { @@ -305,12 +305,12 @@ This will canonicalise and prettify the postcode and stick a pretty_pc and prett sub prettify_pc : Private { my ( $self, $c ) = @_; - my $pretty_pc = $c->req->params->{'pc'}; + my $pretty_pc = $c->get_param('pc'); - if ( mySociety::PostcodeUtil::is_valid_postcode( $c->req->params->{'pc'} ) ) + if ( mySociety::PostcodeUtil::is_valid_postcode( $c->get_param('pc') ) ) { $pretty_pc = mySociety::PostcodeUtil::canonicalise_postcode( - $c->req->params->{'pc'} ); + $c->get_param('pc') ); my $pretty_pc_text = $pretty_pc; $pretty_pc_text =~ s/ //g; $c->stash->{pretty_pc_text} = $pretty_pc_text; @@ -336,7 +336,7 @@ sub process_user : Private { } # Extract all the params to a hash to make them easier to work with - my %params = map { $_ => scalar $c->req->param($_) } + my %params = map { $_ => $c->get_param($_) } ( 'rznvy' ); # , 'password_register' ); # cleanup the email address @@ -350,7 +350,7 @@ sub process_user : Private { $c->stash->{alert_user} = $alert_user; # # The user is trying to sign in. We only care about email from the params. -# if ( $c->req->param('submit_sign_in') ) { +# if ( $c->get_param('submit_sign_in') ) { # unless ( $c->forward( '/auth/sign_in', [ $email ] ) ) { # $c->stash->{field_errors}->{password} = _('There was a problem with your email/password combination. Please try again.'); # return 1; @@ -441,11 +441,6 @@ sub determine_location : Private { $c->go('index'); } - # truncate the lat,lon for nicer urls - ( $c->stash->{latitude}, $c->stash->{longitude} ) = - map { Utils::truncate_coordinate($_) } - ( $c->stash->{latitude}, $c->stash->{longitude} ); - my $dist = mySociety::Gaze::get_radius_containing_population( $c->stash->{latitude}, $c->stash->{longitude}, 200000 ); @@ -503,14 +498,14 @@ Setup the variables we need for the rest of the request sub setup_request : Private { my ( $self, $c ) = @_; - $c->stash->{rznvy} = $c->req->param('rznvy'); - $c->stash->{selected_feed} = $c->req->param('feed'); + $c->stash->{rznvy} = $c->get_param('rznvy'); + $c->stash->{selected_feed} = $c->get_param('feed'); if ( $c->user ) { $c->stash->{rznvy} ||= $c->user->email; } - $c->stash->{template} = 'alert/list-ajax.html' if $c->req->param('ajax'); + $c->stash->{template} = 'alert/list-ajax.html' if $c->get_param('ajax'); return 1; } diff --git a/perllib/FixMyStreet/App/Controller/Around.pm b/perllib/FixMyStreet/App/Controller/Around.pm index 0e42b8a17..723684793 100644 --- a/perllib/FixMyStreet/App/Controller/Around.pm +++ b/perllib/FixMyStreet/App/Controller/Around.pm @@ -40,8 +40,10 @@ sub around_index : Path : Args(0) { # Try to create a location for whatever we have my $ret = $c->forward('/location/determine_location_from_coords') || $c->forward('/location/determine_location_from_pc'); - return unless $ret; - return $c->res->redirect('/') if $ret == -1 && !$partial_report; + unless ($ret) { + return $c->res->redirect('/') unless $c->get_param('pc') || $partial_report; + return; + } # Check to see if the spot is covered by a area - if not show an error. return unless $c->cobrand->moniker eq 'fixmybarangay' || $c->forward('check_location_is_acceptable'); @@ -76,13 +78,12 @@ Handle coord systems that are no longer in use. sub redirect_en_or_xy_to_latlon : Private { my ( $self, $c ) = @_; - my $req = $c->req; # check for x,y or e,n requests - my $x = $req->param('x'); - my $y = $req->param('y'); - my $e = $req->param('e'); - my $n = $req->param('n'); + my $x = $c->get_param('x'); + my $y = $c->get_param('y'); + my $e = $c->get_param('e'); + my $n = $c->get_param('n'); # lat and lon - fill in below if we need to my ( $lat, $lon ); @@ -116,7 +117,7 @@ token to stash and return report. Otherwise return false. sub load_partial : Private { my ( $self, $c ) = @_; - my $partial = scalar $c->req->param('partial') + my $partial = $c->get_param('partial') || return; # is it in the database @@ -158,21 +159,20 @@ sub display_location : Private { my $latitude = $c->stash->{latitude}; my $longitude = $c->stash->{longitude}; - # truncate the lat,lon for nicer rss urls, and strings for outputting - my $short_latitude = Utils::truncate_coordinate($latitude); - my $short_longitude = Utils::truncate_coordinate($longitude); - $c->stash->{short_latitude} = $short_latitude; - $c->stash->{short_longitude} = $short_longitude; - # Deal with pin hiding/age - my $all_pins = $c->req->param('all_pins') ? 1 : undef; + my $all_pins = $c->get_param('all_pins') ? 1 : undef; $c->stash->{all_pins} = $all_pins; my $interval = $all_pins ? undef : $c->cobrand->on_map_default_max_pin_age; + $c->forward( '/reports/stash_report_filter_status' ); + + # Check the category to filter by, if any, is valid + $c->forward('check_and_stash_category'); + # get the map features my ( $on_map_all, $on_map, $around_map, $distance ) = - FixMyStreet::Map::map_features( $c, $short_latitude, $short_longitude, - $interval ); + FixMyStreet::Map::map_features( $c, $latitude, $longitude, + $interval, $c->stash->{filter_category}, $c->stash->{filter_problem_states} ); # copy the found reports to the stash $c->stash->{on_map} = $on_map; @@ -181,7 +181,7 @@ sub display_location : Private { # create a list of all the pins my @pins; - unless ($c->req->param('no_pins') || $c->cobrand->moniker eq 'emptyhomes') { + unless ($c->get_param('no_pins') || $c->cobrand->moniker eq 'emptyhomes') { @pins = map { # Here we might have a DB::Problem or a DB::Nearby, we always want the problem. my $p = (ref $_ eq 'FixMyStreet::App::Model::DB::Nearby') ? $_->problem : $_; @@ -199,8 +199,8 @@ sub display_location : Private { $c->stash->{page} = 'around'; # So the map knows to make clickable pins, update on pan FixMyStreet::Map::display_map( $c, - latitude => $short_latitude, - longitude => $short_longitude, + latitude => $latitude, + longitude => $longitude, clickable => 1, pins => \@pins, area => $c->cobrand->areas_on_around, @@ -225,6 +225,45 @@ sub check_location_is_acceptable : Private { return $c->forward('/council/load_and_check_areas'); } +=head2 check_and_stash_category + +Check that the 'filter_category' query param is valid, if it's present. Stores +the validated string in the stash as filter_category. +Puts all the valid categories in filter_categories on the stash. + +=cut + +sub check_and_stash_category : Private { + my ( $self, $c ) = @_; + + my $all_areas = $c->stash->{all_areas}; + my @bodies = $c->model('DB::Body')->search( + { 'body_areas.area_id' => [ keys %$all_areas ], deleted => 0 }, + { join => 'body_areas' } + )->all; + my %bodies = map { $_->id => $_ } @bodies; + + my @contacts = $c->model('DB::Contact')->not_deleted->search( + { + body_id => [ keys %bodies ], + }, + { + columns => [ 'category' ], + order_by => [ 'category' ], + distinct => 1 + } + )->all; + my @categories = map { $_->category } @contacts; + $c->stash->{filter_categories} = \@categories; + + + my $category = $c->get_param('filter_category'); + my %categories_mapped = map { $_ => 1 } @categories; + if ( defined $category && $categories_mapped{$category} ) { + $c->stash->{filter_category} = $category; + } +} + =head2 /ajax Handle the ajax calls that the map makes when it is dragged. The info returned @@ -238,7 +277,7 @@ sub ajax : Path('/ajax') { $c->res->content_type('application/json; charset=utf-8'); - unless ( $c->req->param('bbox') ) { + unless ( $c->get_param('bbox') ) { $c->res->status(404); $c->res->body(''); return; @@ -248,7 +287,7 @@ sub ajax : Path('/ajax') { $c->res->header( 'Cache_Control' => 'max-age=0' ); # how far back should we go? - my $all_pins = $c->req->param('all_pins') ? 1 : undef; + my $all_pins = $c->get_param('all_pins') ? 1 : undef; my $interval = $all_pins ? undef : $c->cobrand->on_map_default_max_pin_age; # Need to be the class that can handle it @@ -280,7 +319,7 @@ sub ajax : Path('/ajax') { sub location_autocomplete : Path('/ajax/geocode') { my ( $self, $c ) = @_; $c->res->content_type('application/json; charset=utf-8'); - unless ( $c->req->param('term') ) { + unless ( $c->get_param('term') ) { $c->res->status(404); $c->res->body(''); return; @@ -288,26 +327,26 @@ sub location_autocomplete : Path('/ajax/geocode') { # we want the match even if there's no ambiguity, so recommendation doesn't # disappear when it's the last choice being offered in the autocomplete. $c->stash->{allow_single_geocode_match_strings} = 1; - return $self->_geocode( $c, $c->req->param('term') ); + return $self->_geocode( $c, $c->get_param('term') ); } sub location_lookup : Path('/ajax/lookup_location') { my ( $self, $c ) = @_; $c->res->content_type('application/json; charset=utf-8'); - unless ( $c->req->param('term') ) { + unless ( $c->get_param('term') ) { $c->res->status(404); $c->res->body(''); return; } - return $self->_geocode( $c, $c->req->param('term') ); + return $self->_geocode( $c, $c->get_param('term') ); } sub _geocode : Private { my ( $self, $c, $term ) = @_; my ( $lat, $long, $suggestions ) = - FixMyStreet::Geocode::lookup( $c->req->param('term'), $c ); + FixMyStreet::Geocode::lookup( $c->get_param('term'), $c ); my ($response, @addresses, @locations); @@ -317,7 +356,7 @@ sub _geocode : Private { if ( ref($suggestions) eq 'ARRAY' ) { foreach (@$suggestions) { push @addresses, decode_utf8($_->{address}); - push @locations, { address => decode_utf8($_->{address}), lat => $_->{latitude}, long => $_->{longitude} }; + push @locations, { address => decode_utf8($_->{address}), lat => $_->{latitude}, long => $_->{longitude} }; } $response = { suggestions => \@addresses, locations => \@locations }; } else { diff --git a/perllib/FixMyStreet/App/Controller/Auth.pm b/perllib/FixMyStreet/App/Controller/Auth.pm index fad8941c5..63bf91ff5 100644 --- a/perllib/FixMyStreet/App/Controller/Auth.pm +++ b/perllib/FixMyStreet/App/Controller/Auth.pm @@ -28,22 +28,21 @@ Present the user with a sign in / create account page. sub general : Path : Args(0) { my ( $self, $c ) = @_; - my $req = $c->req; - $c->detach( 'redirect_on_signin', [ $req->param('r') ] ) - if $c->user && $req->param('r'); + $c->detach( 'redirect_on_signin', [ $c->get_param('r') ] ) + if $c->user && $c->get_param('r'); # all done unless we have a form posted to us - return unless $req->method eq 'POST'; + return unless $c->req->method eq 'POST'; # decide which action to take - my $has_password = $req->param('sign_in') || $req->param('password_sign_in'); - my $has_email = $req->param('email_sign_in') || $req->param('name') || $req->param('password_register'); + my $has_password = $c->get_param('sign_in') || $c->get_param('password_sign_in'); + my $has_email = $c->get_param('email_sign_in') || $c->get_param('name') || $c->get_param('password_register'); $c->detach('email_sign_in') if $has_email && !$has_password; $c->forward( 'sign_in' ) - && $c->detach( 'redirect_on_signin', [ $req->param('r') ] ); + && $c->detach( 'redirect_on_signin', [ $c->get_param('r') ] ); } @@ -56,9 +55,9 @@ Allow the user to sign in with a username and a password. sub sign_in : Private { my ( $self, $c, $email ) = @_; - $email ||= $c->req->param('email') || ''; - my $password = $c->req->param('password_sign_in') || ''; - my $remember_me = $c->req->param('remember_me') || 0; + $email ||= $c->get_param('email') || ''; + my $password = $c->get_param('password_sign_in') || ''; + my $remember_me = $c->get_param('remember_me') || 0; # Sign out just in case $c->logout(); @@ -95,7 +94,7 @@ sub email_sign_in : Private { my ( $self, $c ) = @_; # check that the email is valid - otherwise flag an error - my $raw_email = lc( $c->req->param('email') || '' ); + my $raw_email = lc( $c->get_param('email') || '' ); my $email_checker = Email::Valid->new( -mxcheck => 1, @@ -112,8 +111,8 @@ sub email_sign_in : Private { } my $user_params = {}; - $user_params->{password} = $c->req->param('password_register') - if $c->req->param('password_register'); + $user_params->{password} = $c->get_param('password_register') + if $c->get_param('password_register'); my $user = $c->model('DB::User')->new( $user_params ); my $token_obj = $c->model('DB::Token') # @@ -122,8 +121,8 @@ sub email_sign_in : Private { scope => 'email_sign_in', data => { email => $good_email, - r => $c->req->param('r'), - name => $c->req->param('name'), + r => $c->get_param('r'), + name => $c->get_param('name'), password => $user->password, } } @@ -156,6 +155,11 @@ sub token : Path('/M') : Args(1) { return; } + if ( $token_obj->created < DateTime->now->subtract( days => 1 ) ) { + $c->stash->{token_not_found} = 1; + return; + } + # Sign out in case we are another user $c->logout(); @@ -221,8 +225,8 @@ sub change_password : Local { return unless $c->req->method eq 'POST'; # get the passwords - my $new = $c->req->param('new_password') // ''; - my $confirm = $c->req->param('confirm') // ''; + my $new = $c->get_param('new_password') // ''; + my $confirm = $c->get_param('confirm') // ''; # check for errors my $password_error = diff --git a/perllib/FixMyStreet/App/Controller/Contact.pm b/perllib/FixMyStreet/App/Controller/Contact.pm index f48518d77..912224649 100644 --- a/perllib/FixMyStreet/App/Controller/Contact.pm +++ b/perllib/FixMyStreet/App/Controller/Contact.pm @@ -41,6 +41,11 @@ Handle contact us form submission sub submit : Path('submit') : Args(0) { my ( $self, $c ) = @_; + if (my $testing = $c->get_param('_test_')) { + $c->stash->{success} = $c->get_param('success'); + return; + } + $c->res->redirect( '/contact' ) and return unless $c->req->method eq 'POST'; return @@ -61,9 +66,9 @@ generic contact request and set up things accordingly sub determine_contact_type : Private { my ( $self, $c ) = @_; - my $id = $c->req->param('id'); - my $update_id = $c->req->param('update_id'); - my $token = $c->req->param('m'); + my $id = $c->get_param('id'); + my $update_id = $c->get_param('update_id'); + my $token = $c->get_param('m'); $id = undef unless $id && $id =~ /^[1-9]\d*$/; $update_id = undef unless $update_id && $update_id =~ /^[1-9]\d*$/; @@ -111,12 +116,12 @@ sub validate : Private { foreach my $field ( keys %required ) { $field_errors{$field} = $required{$field} - unless $c->req->param($field) =~ /\S/; + unless $c->get_param($field) =~ /\S/; } unless ( $field_errors{em} ) { $field_errors{em} = _('Please enter a valid email address') - if !mySociety::EmailUtil::is_valid_email( $c->req->param('em') ); + if !mySociety::EmailUtil::is_valid_email( $c->get_param('em') ); } %field_errors = ( @@ -125,11 +130,11 @@ sub validate : Private { ); push @errors, _('Illegal ID') - if $c->req->param('id') && !$c->stash->{problem} - or $c->req->param('update_id') && !$c->stash->{update}; + if $c->get_param('id') && !$c->stash->{problem} + or $c->get_param('update_id') && !$c->stash->{update}; push @errors, _('There was a problem showing this page. Please try again later.') - if $c->req->params->{message} && $c->req->params->{message} =~ /\[url=|<a/; + if $c->get_param('message') && $c->get_param('message') =~ /\[url=|<a/; unshift @errors, _('There were problems with your report. Please see below.') @@ -206,11 +211,11 @@ sub setup_request : Private { $c->stash->{contact_email} =~ s/\@/@/; for my $param (qw/em subject message/) { - $c->stash->{$param} = $c->req->param($param); + $c->stash->{$param} = $c->get_param($param); } # name is already used in the stash for the app class name - $c->stash->{form_name} = $c->req->param('name'); + $c->stash->{form_name} = $c->get_param('name'); return 1; } diff --git a/perllib/FixMyStreet/App/Controller/Council.pm b/perllib/FixMyStreet/App/Controller/Council.pm index 8a174c254..a5915aa46 100644 --- a/perllib/FixMyStreet/App/Controller/Council.pm +++ b/perllib/FixMyStreet/App/Controller/Council.pm @@ -49,9 +49,6 @@ sub load_and_check_areas : Private { $area_types = $c->cobrand->area_types; } - my $short_latitude = Utils::truncate_coordinate($latitude); - my $short_longitude = Utils::truncate_coordinate($longitude); - my $all_areas; my %params; @@ -62,7 +59,7 @@ sub load_and_check_areas : Private { my %area_types = map { $_ => 1 } @$area_types; $all_areas = mySociety::MaPit::call( 'point', - "4326/$short_longitude,$short_latitude", %params ); + "4326/$longitude,$latitude", %params ); $c->stash->{all_areas_mapit} = $all_areas; $all_areas = { map { $_ => $all_areas->{$_} } @@ -72,7 +69,7 @@ sub load_and_check_areas : Private { } else { $all_areas = mySociety::MaPit::call( 'point', - "4326/$short_longitude,$short_latitude", %params, + "4326/$longitude,$latitude", %params, type => $area_types ); } if ($all_areas->{error}) { diff --git a/perllib/FixMyStreet/App/Controller/Dashboard.pm b/perllib/FixMyStreet/App/Controller/Dashboard.pm index 25c6e1923..c3aa35008 100644 --- a/perllib/FixMyStreet/App/Controller/Dashboard.pm +++ b/perllib/FixMyStreet/App/Controller/Dashboard.pm @@ -32,9 +32,9 @@ sub example : Local : Args(0) { #$c->forward( '/report/new/setup_categories_and_bodies' ); # See if we've had anything from the dropdowns - perhaps vary results if so - $c->stash->{ward} = $c->req->param('ward'); - $c->stash->{category} = $c->req->param('category'); - $c->stash->{q_state} = $c->req->param('state'); + $c->stash->{ward} = $c->get_param('ward'); + $c->stash->{category} = $c->get_param('category'); + $c->stash->{q_state} = $c->get_param('state'); eval { my $data = File::Slurp::read_file( @@ -108,8 +108,8 @@ sub index : Path : Args(0) { # See if we've had anything from the dropdowns - $c->stash->{ward} = $c->req->param('ward'); - $c->stash->{category} = $c->req->param('category'); + $c->stash->{ward} = $c->get_param('ward'); + $c->stash->{category} = $c->get_param('category'); my %where = ( bodies_str => $body->id, # XXX Does this break in a two tier council? Restriction needs looking at... @@ -128,7 +128,7 @@ sub index : Path : Args(0) { my $dtf = $c->model('DB')->storage->datetime_parser; my %counts; - my $now = DateTime->now( time_zone => 'local' ); + my $now = DateTime->now( time_zone => FixMyStreet->local_time_zone ); my $t = $now->clone->truncate( to => 'day' ); $counts{wtd} = $c->forward( 'updates_search', [ $dtf->format_datetime( $t->clone->subtract( days => $t->dow - 1 ) ) ] ); @@ -143,7 +143,7 @@ sub index : Path : Args(0) { # List of reports underneath summary table - $c->stash->{q_state} = $c->req->param('state') || ''; + $c->stash->{q_state} = $c->get_param('state') || ''; if ( $c->stash->{q_state} eq 'fixed' ) { $prob_where->{'me.state'} = [ FixMyStreet::DB::Result::Problem->fixed_states() ]; } elsif ( $c->stash->{q_state} ) { @@ -170,7 +170,7 @@ sub index : Path : Args(0) { } $c->stash->{lists} = \%problems; - if ( $c->req->params->{export} ) { + if ( $c->get_param('export') ) { $self->export_as_csv($c, $problems_rs, $body); } } diff --git a/perllib/FixMyStreet/App/Controller/JSON.pm b/perllib/FixMyStreet/App/Controller/JSON.pm index 17507a84b..959ead245 100644 --- a/perllib/FixMyStreet/App/Controller/JSON.pm +++ b/perllib/FixMyStreet/App/Controller/JSON.pm @@ -38,9 +38,9 @@ sub problems : Local { : ''; # gather the parameters - my $start_date = $c->req->param('start_date') || ''; - my $end_date = $c->req->param('end_date') || ''; - my $category = $c->req->param('category') || ''; + my $start_date = $c->get_param('start_date') || ''; + my $end_date = $c->get_param('end_date') || ''; + my $category = $c->get_param('category') || ''; my $yyyy_mm_dd = qr{^\d{4}-\d\d-\d\d$}; if ( $start_date !~ $yyyy_mm_dd diff --git a/perllib/FixMyStreet/App/Controller/Location.pm b/perllib/FixMyStreet/App/Controller/Location.pm index 8a68b2b3d..ff90d3d60 100644 --- a/perllib/FixMyStreet/App/Controller/Location.pm +++ b/perllib/FixMyStreet/App/Controller/Location.pm @@ -6,6 +6,7 @@ BEGIN {extends 'Catalyst::Controller'; } use Encode; use FixMyStreet::Geocode; +use Utils; =head1 NAME @@ -28,15 +29,15 @@ Use latitude and longitude if provided in parameters. sub determine_location_from_coords : Private { my ( $self, $c ) = @_; - my $latitude = $c->req->param('latitude') || $c->req->param('lat'); - my $longitude = $c->req->param('longitude') || $c->req->param('lon'); + my $latitude = $c->get_param('latitude') || $c->get_param('lat'); + my $longitude = $c->get_param('longitude') || $c->get_param('lon'); if ( defined $latitude && defined $longitude ) { - $c->stash->{latitude} = $latitude; - $c->stash->{longitude} = $longitude; + ($c->stash->{latitude}, $c->stash->{longitude}) = + map { Utils::truncate_coordinate($_) } ($latitude, $longitude); # Also save the pc if there is one - if ( my $pc = $c->req->param('pc') ) { + if ( my $pc = $c->get_param('pc') ) { $c->stash->{pc} = $pc; } @@ -50,7 +51,7 @@ sub determine_location_from_coords : Private { User has searched for a location - try to find it for them. -Return -1 if nothing provided. +Return false if nothing provided. If one match is found returns true and lat/lng is set. @@ -64,18 +65,19 @@ sub determine_location_from_pc : Private { my ( $self, $c, $pc ) = @_; # check for something to search - $pc ||= $c->req->param('pc') || return -1; + $pc ||= $c->get_param('pc') || return; $c->stash->{pc} = $pc; # for template if ( $pc =~ /^(-?\d+(?:\.\d+)?)\s*,\s*(-?\d+(?:\.\d+)?)$/ ) { - $c->stash->{latitude} = $1; - $c->stash->{longitude} = $2; + ($c->stash->{latitude}, $c->stash->{longitude}) = + map { Utils::truncate_coordinate($_) } ($1, $2); return $c->forward( 'check_location' ); } if ( $c->cobrand->country eq 'GB' && $pc =~ /^([A-Z])([A-Z])([\d\s]{4,})$/i) { if (my $convert = gridref_to_latlon( $1, $2, $3 )) { - $c->stash->{latitude} = $convert->{latitude}; - $c->stash->{longitude} = $convert->{longitude}; + ($c->stash->{latitude}, $c->stash->{longitude}) = + map { Utils::truncate_coordinate($_) } + ($convert->{latitude}, $convert->{longitude}); return $c->forward( 'check_location' ); } } diff --git a/perllib/FixMyStreet/App/Controller/Moderate.pm b/perllib/FixMyStreet/App/Controller/Moderate.pm index ad293fbd7..08c4280a1 100644 --- a/perllib/FixMyStreet/App/Controller/Moderate.pm +++ b/perllib/FixMyStreet/App/Controller/Moderate.pm @@ -65,7 +65,7 @@ sub report : Chained('moderate') : PathPart('report') : CaptureArgs(1) { }); $c->stash->{problem} = $problem; $c->stash->{problem_original} = $original; - $c->stash->{moderation_reason} = $c->req->param('moderation_reason') // ''; + $c->stash->{moderation_reason} = $c->get_param('moderation_reason') // ''; } sub moderate_report : Chained('report') : PathPart('') : Args(0) { @@ -127,7 +127,7 @@ sub report_moderate_hide : Private { my $problem = $c->stash->{problem} or die; - if ($c->req->param('problem_hide')) { + if ($c->get_param('problem_hide')) { $problem->update({ state => 'hidden' }); @@ -145,9 +145,9 @@ sub report_moderate_title : Private { my $old_title = $problem->title; my $original_title = $original->title; - my $title = $c->req->param('problem_revert_title') ? + my $title = $c->get_param('problem_revert_title') ? $original_title - : $self->diff($original_title, $c->req->param('problem_title')); + : $self->diff($original_title, $c->get_param('problem_title')); if ($title ne $old_title) { $original->insert unless $original->in_storage; @@ -166,9 +166,9 @@ sub report_moderate_detail : Private { my $old_detail = $problem->detail; my $original_detail = $original->detail; - my $detail = $c->req->param('problem_revert_detail') ? + my $detail = $c->get_param('problem_revert_detail') ? $original_detail - : $self->diff($original_detail, $c->req->param('problem_detail')); + : $self->diff($original_detail, $c->get_param('problem_detail')); if ($detail ne $old_detail) { $original->insert unless $original->in_storage; @@ -184,7 +184,7 @@ sub report_moderate_anon : Private { my $problem = $c->stash->{problem} or die; my $original = $c->stash->{problem_original}; - my $show_user = $c->req->param('problem_show_name') ? 1 : 0; + my $show_user = $c->get_param('problem_show_name') ? 1 : 0; my $anonymous = $show_user ? 0 : 1; my $old_anonymous = $problem->anonymous ? 1 : 0; @@ -205,7 +205,7 @@ sub report_moderate_photo : Private { return unless $original->photo; - my $show_photo = $c->req->param('problem_show_photo') ? 1 : 0; + my $show_photo = $c->get_param('problem_show_photo') ? 1 : 0; my $old_show_photo = $problem->photo ? 1 : 0; if ($show_photo != $old_show_photo) { @@ -268,7 +268,7 @@ sub update_moderate_hide : Private { my $problem = $c->stash->{problem} or die; my $comment = $c->stash->{comment} or die; - if ($c->req->param('update_hide')) { + if ($c->get_param('update_hide')) { $comment->update({ state => 'hidden' }); $c->detach( 'update_moderate_audit', ['hide'] ); # break chain here. } @@ -284,9 +284,9 @@ sub update_moderate_detail : Private { my $old_detail = $comment->text; my $original_detail = $original->detail; - my $detail = $c->req->param('update_revert_detail') ? + my $detail = $c->get_param('update_revert_detail') ? $original_detail - : $self->diff($original_detail, $c->req->param('update_detail')); + : $self->diff($original_detail, $c->get_param('update_detail')); if ($detail ne $old_detail) { $original->insert unless $original->in_storage; @@ -303,7 +303,7 @@ sub update_moderate_anon : Private { my $comment = $c->stash->{comment} or die; my $original = $c->stash->{comment_original}; - my $show_user = $c->req->param('update_show_name') ? 1 : 0; + my $show_user = $c->get_param('update_show_name') ? 1 : 0; my $anonymous = $show_user ? 0 : 1; my $old_anonymous = $comment->anonymous ? 1 : 0; @@ -324,7 +324,7 @@ sub update_moderate_photo : Private { return unless $original->photo; - my $show_photo = $c->req->param('update_show_photo') ? 1 : 0; + my $show_photo = $c->get_param('update_show_photo') ? 1 : 0; my $old_show_photo = $comment->photo ? 1 : 0; if ($show_photo != $old_show_photo) { diff --git a/perllib/FixMyStreet/App/Controller/My.pm b/perllib/FixMyStreet/App/Controller/My.pm index bbef1f8d8..83d5f7adb 100644 --- a/perllib/FixMyStreet/App/Controller/My.pm +++ b/perllib/FixMyStreet/App/Controller/My.pm @@ -25,20 +25,29 @@ sub my : Path : Args(0) { $c->detach( '/auth/redirect' ) unless $c->user; - my $p_page = $c->req->params->{p} || 1; - my $u_page = $c->req->params->{u} || 1; + my $p_page = $c->get_param('p') || 1; + my $u_page = $c->get_param('u') || 1; + + $c->forward( '/reports/stash_report_filter_status' ); my $pins = []; my $problems = {}; + my $states = $c->stash->{filter_problem_states}; my $params = { - state => [ FixMyStreet::DB::Result::Problem->visible_states() ], + state => [ keys %$states ], }; $params = { %{ $c->cobrand->problems_clause }, %$params } if $c->cobrand->problems_clause; + my $category = $c->get_param('filter_category'); + if ( $category ) { + $params->{category} = $category; + $c->stash->{filter_category} = $category; + } + my $rs = $c->user->problems->search( $params, { order_by => { -desc => 'confirmed' }, rows => 50 @@ -55,6 +64,7 @@ sub my : Path : Args(0) { }; my $state = $problem->is_fixed ? 'fixed' : $problem->is_closed ? 'closed' : 'confirmed'; push @{ $problems->{$state} }, $problem; + push @{ $problems->{all} }, $problem; } $c->stash->{problems_pager} = $rs->pager; $c->stash->{problems} = $problems; @@ -71,6 +81,14 @@ sub my : Path : Args(0) { $c->stash->{updates} = \@updates; $c->stash->{updates_pager} = $rs->pager; + my @categories = $c->user->problems->search( undef, { + columns => [ 'category' ], + distinct => 1, + order_by => [ 'category' ], + } )->all; + @categories = map { $_->category } @categories; + $c->stash->{filter_categories} = \@categories; + $c->stash->{page} = 'my'; FixMyStreet::Map::display_map( $c, diff --git a/perllib/FixMyStreet/App/Controller/Open311.pm b/perllib/FixMyStreet/App/Controller/Open311.pm index f3841acef..96066ca93 100644 --- a/perllib/FixMyStreet/App/Controller/Open311.pm +++ b/perllib/FixMyStreet/App/Controller/Open311.pm @@ -155,9 +155,9 @@ sub get_discovery : Private { sub get_services : Private { my ( $self, $c ) = @_; - my $jurisdiction_id = $c->req->param('jurisdiction_id') || ''; - my $lat = $c->req->param('lat') || ''; - my $lon = $c->req->param('long') || ''; + my $jurisdiction_id = $c->get_param('jurisdiction_id') || ''; + my $lat = $c->get_param('lat') || ''; + my $lon = $c->get_param('long') || ''; # Look up categories for this council or councils my $categories = $c->model('DB::Contact')->not_deleted; @@ -252,7 +252,12 @@ sub output_requests : Private { 'interface_used' => [ $problem->service ], # Not in Open311 v2 }; - if ( $c->cobrand->moniker ne 'zurich' ) { # XXX + if ( $c->cobrand->moniker eq 'zurich' ) { + $request->{service_notice} = [ + $problem->get_extra_metadata('public_response') + ]; + } + else { # FIXME Not according to Open311 v2 $request->{agency_responsible} = $problem->bodies; } @@ -304,7 +309,7 @@ sub get_requests : Private { $c->forward( 'is_jurisdiction_id_ok' ); - my $max_requests = $c->req->param('max_requests') || 0; + my $max_requests = $c->get_param('max_requests') || 0; # Only provide access to the published reports my $states = FixMyStreet::DB::Result::Problem->visible_states(); @@ -322,7 +327,7 @@ sub get_requests : Private { has_photo => [ '=', 'photo' ], ); for my $param (keys %rules) { - my $value = $c->req->param($param); + my $value = $c->get_param($param); next unless $value; my $op = $rules{$param}[0]; my $key = $rules{$param}[1]; @@ -361,12 +366,12 @@ sub get_requests : Private { $criteria->{$key} = { $op, $value }; } - if ( $c->req->param('start_date') and $c->req->param('end_date') ) { - $criteria->{confirmed} = [ '-and' => { '>=', $c->req->param('start_date') }, { '<', $c->req->param('end_date') } ]; - } elsif ( $c->req->param('start_date') ) { - $criteria->{confirmed} = { '>=', $c->req->param('start_date') }; - } elsif ( $c->req->param('end_date') ) { - $criteria->{confirmed} = { '<', $c->req->param('end_date') }; + if ( $c->get_param('start_date') and $c->get_param('end_date') ) { + $criteria->{confirmed} = [ '-and' => { '>=', $c->get_param('start_date') }, { '<', $c->get_param('end_date') } ]; + } elsif ( $c->get_param('start_date') ) { + $criteria->{confirmed} = { '>=', $c->get_param('start_date') }; + } elsif ( $c->get_param('end_date') ) { + $criteria->{confirmed} = { '<', $c->get_param('end_date') }; } if ('rss' eq $c->stash->{format}) { @@ -436,7 +441,7 @@ sub format_output : Private { sub is_jurisdiction_id_ok : Private { my ( $self, $c ) = @_; - unless (my $jurisdiction_id = $c->req->param('jurisdiction_id')) { + unless (my $jurisdiction_id = $c->get_param('jurisdiction_id')) { $c->detach( 'error', [ _('Missing jurisdiction_id') ] ); } } diff --git a/perllib/FixMyStreet/App/Controller/Photo.pm b/perllib/FixMyStreet/App/Controller/Photo.pm index 09afabecf..a2ec7d4c8 100644 --- a/perllib/FixMyStreet/App/Controller/Photo.pm +++ b/perllib/FixMyStreet/App/Controller/Photo.pm @@ -8,6 +8,7 @@ use DateTime::Format::HTTP; use Digest::SHA qw(sha1_hex); use File::Path; use File::Slurp; +use Image::Size; use Path::Class; use if !$ENV{TRAVIS}, 'Image::Magick'; @@ -181,7 +182,11 @@ sub process_photo_upload : Private { my $photo_blob = eval { my $filename = $upload->tempname; my $out = `jhead -se -autorot $filename 2>&1`; - die _("Please upload a JPEG image only"."\n") if $out =~ /Not JPEG:/; + unless (defined $out) { + my ($w, $h, $err) = Image::Size::imgsize($filename); + die _("Please upload a JPEG image only") . "\n" if !defined $w || $err ne 'JPG'; + } + die _("Please upload a JPEG image only") . "\n" if $out && $out =~ /Not JPEG:/; my $photo = $upload->slurp; return $photo; }; @@ -221,7 +226,7 @@ sub process_photo_cache : Private { my ( $self, $c ) = @_; # get the fileid and make sure it is just a hex number - my $fileid = $c->req->param('upload_fileid') || ''; + my $fileid = $c->get_param('upload_fileid') || ''; $fileid =~ s{[^0-9a-f]}{}gi; return unless $fileid; diff --git a/perllib/FixMyStreet/App/Controller/Questionnaire.pm b/perllib/FixMyStreet/App/Controller/Questionnaire.pm index 46d6350d7..f9a08e408 100755 --- a/perllib/FixMyStreet/App/Controller/Questionnaire.pm +++ b/perllib/FixMyStreet/App/Controller/Questionnaire.pm @@ -67,9 +67,16 @@ token), or the mini own-report one (when we'll have a problem ID). sub submit : Path('submit') { my ( $self, $c ) = @_; - if ( $c->req->params->{token} ) { + if (my $token = $c->get_param('token')) { + if ($token eq '_test_') { + $c->stash->{been_fixed} = $c->get_param('been_fixed'); + $c->stash->{new_state} = $c->get_param('new_state'); + $c->stash->{template} = 'questionnaire/completed.html'; + return; + } $c->forward('submit_standard'); - } elsif ( $c->req->params->{problem} ) { + } elsif (my $p = $c->get_param('problem')) { + $c->detach('creator_fixed') if $p eq '_test_'; $c->forward('submit_creator_fixed'); } else { $c->detach( '/page_error_404_not_found' ); @@ -96,8 +103,8 @@ sub submit_creator_fixed : Private { my @errors; - $c->stash->{reported} = $c->req->params->{reported}; - $c->stash->{problem_id} = $c->req->params->{problem}; + $c->stash->{reported} = $c->get_param('reported'); + $c->stash->{problem_id} = $c->get_param('problem'); # should only be able to get to here if we are logged and we have a # problem @@ -106,6 +113,7 @@ sub submit_creator_fixed : Private { } my $problem = $c->cobrand->problems->find( { id => $c->stash->{problem_id} } ); + $c->stash->{problem} = $problem; # you should not be able to answer questionnaires about problems # that you've not submitted @@ -148,7 +156,7 @@ sub submit_creator_fixed : Private { sub submit_standard : Private { my ( $self, $c ) = @_; - $c->forward( '/tokens/load_questionnaire', [ $c->req->params->{token} ] ); + $c->forward( '/tokens/load_questionnaire', [ $c->get_param('token') ] ); $c->forward( 'check_questionnaire' ); $c->forward( 'process_questionnaire' ); @@ -224,7 +232,7 @@ sub submit_standard : Private { sub process_questionnaire : Private { my ( $self, $c ) = @_; - map { $c->stash->{$_} = $c->req->params->{$_} || '' } qw(been_fixed reported another update); + map { $c->stash->{$_} = $c->get_param($_) || '' } qw(been_fixed reported another update); # EHA questionnaires done for you if ($c->cobrand->moniker eq 'emptyhomes') { @@ -279,10 +287,6 @@ sub display : Private { my $problem = $c->stash->{questionnaire}->problem; - ( $c->stash->{short_latitude}, $c->stash->{short_longitude} ) = - map { Utils::truncate_coordinate($_) } - ( $problem->latitude, $problem->longitude ); - $c->stash->{updates} = [ $c->model('DB::Comment')->search( { problem_id => $problem->id, state => 'confirmed' }, { order_by => 'confirmed' } diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm index 88a49f6c9..7b001ee4c 100644 --- a/perllib/FixMyStreet/App/Controller/Report.pm +++ b/perllib/FixMyStreet/App/Controller/Report.pm @@ -24,7 +24,7 @@ Redirect to homepage unless C<id> parameter in query, in which case redirect to sub index : Path('') : Args(0) { my ( $self, $c ) = @_; - my $id = $c->req->param('id'); + my $id = $c->get_param('id'); my $uri = $id @@ -78,7 +78,7 @@ sub _display : Private { sub support : Path('support') : Args(0) { my ( $self, $c ) = @_; - my $id = $c->req->param('id'); + my $id = $c->get_param('id'); my $uri = $id @@ -151,6 +151,10 @@ sub load_updates : Private { @combined = map { $_->[1] } sort { $a->[0] <=> $b->[0] } @combined; $c->stash->{updates} = \@combined; + if ($c->sessionid && $c->flash->{alert_to_reporter}) { + $c->stash->{alert_to_reporter} = 1; + } + return 1; } @@ -159,18 +163,15 @@ sub format_problem_for_display : Private { my $problem = $c->stash->{problem}; - ( $c->stash->{short_latitude}, $c->stash->{short_longitude} ) = + ( $c->stash->{latitude}, $c->stash->{longitude} ) = map { Utils::truncate_coordinate($_) } ( $problem->latitude, $problem->longitude ); - unless ( $c->req->param('submit_update') ) { + unless ( $c->get_param('submit_update') ) { $c->stash->{add_alert} = 1; } $c->stash->{extra_name_info} = $problem->bodies_str && $problem->bodies_str eq '2482' ? 1 : 0; - if ( $c->sessionid && $c->flash->{created_report} ) { - $c->stash->{created_report} = $c->flash->{created_report}; - } $c->forward('generate_map_tags'); diff --git a/perllib/FixMyStreet/App/Controller/Report/New.pm b/perllib/FixMyStreet/App/Controller/Report/New.pm index ed5be4e99..b540a1961 100644 --- a/perllib/FixMyStreet/App/Controller/Report/New.pm +++ b/perllib/FixMyStreet/App/Controller/Report/New.pm @@ -74,7 +74,6 @@ partial =cut -use constant COUNCIL_ID_BARNET => 2489; use constant COUNCIL_ID_BROMLEY => 2482; sub report_new : Path : Args(0) { @@ -220,14 +219,22 @@ sub category_extras_ajax : Path('category_extras') : Args(0) { return 1; } $c->forward('setup_categories_and_bodies'); + $c->forward('check_for_category'); + my $category = $c->stash->{category}; my $category_extra = ''; - if ( $c->stash->{category_extras}->{ $c->req->param('category') } && @{ $c->stash->{category_extras}->{ $c->req->param('category') } } >= 1 ) { + my $generate; + if ( $c->stash->{category_extras}->{$category} && @{ $c->stash->{category_extras}->{$category} } >= 1 ) { $c->stash->{report_meta} = {}; - $c->stash->{report} = { category => $c->req->param('category') }; - $c->stash->{category_extras} = { $c->req->param('category' ) => $c->stash->{category_extras}->{ $c->req->param('category') } }; - - $category_extra= $c->render_fragment( 'report/new/category_extras.html'); + $c->stash->{category_extras} = { $category => $c->stash->{category_extras}->{$category} }; + $generate = 1; + } + if ($c->stash->{unresponsive}->{$category}) { + $generate = 1; + } + if ($generate) { + $c->stash->{report} = { category => $category }; + $category_extra = $c->render_fragment( 'report/new/category_extras.html'); } my $body = JSON->new->utf8(1)->encode( @@ -257,7 +264,7 @@ sub report_import : Path('/import') { $c->res->content_type('text/plain; charset=utf-8'); my %input = - map { $_ => $c->req->param($_) || '' } ( + map { $_ => $c->get_param($_) || '' } ( 'service', 'subject', 'detail', 'name', 'email', 'phone', 'easting', 'northing', 'lat', 'lon', 'id', 'phone_id', ); @@ -408,7 +415,7 @@ sub initialize_report : Private { # create a new one. Stick it on the stash. my $report = undef; - if ( my $partial = scalar $c->req->param('partial') ) { + if ( my $partial = $c->get_param('partial') ) { for (1) { # use as pseudo flow control @@ -462,15 +469,15 @@ sub initialize_report : Private { } - if ( $c->req->param('first_name') && $c->req->param('last_name') ) { - $c->stash->{first_name} = $c->req->param('first_name'); - $c->stash->{last_name} = $c->req->param('last_name'); + if ( $c->get_param('first_name') && $c->get_param('last_name') ) { + $c->stash->{first_name} = $c->get_param('first_name'); + $c->stash->{last_name} = $c->get_param('last_name'); - $c->req->param( 'name', sprintf( '%s %s', $c->req->param('first_name'), $c->req->param('last_name') ) ); + $c->set_param('name', sprintf( '%s %s', $c->get_param('first_name'), $c->get_param('last_name') )); } # Capture whether the map was used - $report->used_map( $c->req->param('skipped') ? 0 : 1 ); + $report->used_map( $c->get_param('skipped') ? 0 : 1 ); $c->stash->{report} = $report; @@ -524,8 +531,8 @@ sub determine_location_from_tile_click : Private { # Extract the data needed my ( $pin_tile_x, $pin_tile_y ) = $x_key =~ m{$param_key_regex}; - my $pin_x = $c->req->param($x_key); - my $pin_y = $c->req->param($y_key); + my $pin_x = $c->get_param($x_key); + my $pin_y = $c->get_param($y_key); # return if they are both 0 - this happens when you submit the form by # hitting enter and not using the button. It also happens if you click @@ -540,8 +547,8 @@ sub determine_location_from_tile_click : Private { ); # store it on the stash - $c->stash->{latitude} = $latitude; - $c->stash->{longitude} = $longitude; + ($c->stash->{latitude}, $c->stash->{longitude}) = + map { Utils::truncate_coordinate($_) } ($latitude, $longitude); # set a flag so that the form is not considered submitted. This will prevent # errors showing on the fields. @@ -604,6 +611,11 @@ sub setup_categories_and_bodies : Private { my %category_extras = (); # extra fields to fill in for open311 my %non_public_categories = (); # categories for which the reports are not public + $c->stash->{unresponsive} = {}; + + if (keys %bodies == 1 && $first_body->send_method && $first_body->send_method eq 'Refused') { + $c->stash->{unresponsive}{ALL} = $first_body->id; + } # FIXME - implement in cobrand if ( $c->cobrand->moniker eq 'emptyhomes' ) { @@ -624,18 +636,6 @@ sub setup_categories_and_bodies : Private { _('Empty public building - school, hospital, etc.') ); - } elsif ($first_area->{id} != COUNCIL_ID_BROMLEY - && $first_area->{id} != COUNCIL_ID_BARNET - && $first_area->{type} eq 'LBO') { - - $bodies_to_list{ $first_body->id } = 1; - my @local_categories; - @local_categories = sort keys %{ Utils::london_categories() }; - @category_options = ( - _('-- Pick a category --'), - @local_categories - ); - } else { # keysort does not appear to obey locale so use strcoll (see i18n.t) @@ -649,8 +649,12 @@ sub setup_categories_and_bodies : Private { unless ( $seen{$contact->category} ) { push @category_options, $contact->category; - $category_extras{ $contact->category } = $contact->extra - if $contact->extra; + my $metas = $contact->get_extra_fields; + $category_extras{ $contact->category } = $metas + if scalar @$metas; + + $c->stash->{unresponsive}{$contact->category} = $contact->body_id + if $contact->email =~ /^REFUSED$/i; $non_public_categories{ $contact->category } = 1 if $contact->non_public; } @@ -664,6 +668,9 @@ sub setup_categories_and_bodies : Private { } } + $c->cobrand->munge_category_list(\@category_options, \@contacts, \%category_extras) + if $c->cobrand->can('munge_category_list'); + if ($c->cobrand->can('hidden_categories')) { my %hidden_categories = map { $_ => 1 } $c->cobrand->hidden_categories; @@ -703,7 +710,7 @@ on the presence of the C<submit_problem> parameter. sub check_form_submitted : Private { my ( $self, $c ) = @_; return if $c->stash->{force_form_not_submitted}; - return $c->req->param('submit_problem') || ''; + return $c->get_param('submit_problem') || ''; } =head2 process_user @@ -718,7 +725,7 @@ sub process_user : Private { my $report = $c->stash->{report}; # Extract all the params to a hash to make them easier to work with - my %params = map { $_ => scalar $c->req->param($_) } + my %params = map { $_ => $c->get_param($_) } ( 'email', 'name', 'phone', 'password_register', 'fms_extra_title' ); my $user_title = Utils::trim_text( $params{fms_extra_title} ); @@ -750,7 +757,7 @@ sub process_user : Private { unless $report->user; # The user is trying to sign in. We only care about email from the params. - if ( $c->req->param('submit_sign_in') || $c->req->param('password_sign_in') ) { + if ( $c->get_param('submit_sign_in') || $c->get_param('password_sign_in') ) { unless ( $c->forward( '/auth/sign_in' ) ) { $c->stash->{field_errors}->{password} = _('There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form.'); return 1; @@ -788,7 +795,7 @@ sub process_report : Private { # Extract all the params to a hash to make them easier to work with my %params = # - map { $_ => scalar $c->req->param($_) } # + map { $_ => $c->get_param($_) } ( 'title', 'detail', 'pc', # 'detail_size', 'detail_depth', @@ -851,15 +858,6 @@ sub process_report : Private { $report->extra( \%extra ); } - } elsif ($first_area->{id} != COUNCIL_ID_BROMLEY - && $first_area->{id} != COUNCIL_ID_BARNET - && $first_area->{type} eq 'LBO') { - - unless ( Utils::london_categories()->{ $report->category } ) { - $c->stash->{field_errors}->{category} = _('Please choose a category'); - } - $report->bodies_str( $first_body->id ); - } elsif ( $report->category ) { # FIXME All contacts were fetched in setup_categories_and_bodies, @@ -880,28 +878,34 @@ sub process_report : Private { return 1; } - # construct the bodies string: - # 'x,x' - x are body IDs that have this category - # 'x,x|y' - x are body IDs that have this category, y body IDs with *no* contact - my $body_string = join( ',', map { $_->body_id } @contacts ); - $body_string .= - '|' . join( ',', map { $_->id } @{ $c->stash->{missing_details_bodies} } ) - if $body_string && @{ $c->stash->{missing_details_bodies} }; - $report->bodies_str($body_string); + if ($c->stash->{unresponsive}{$report->category} || $c->stash->{unresponsive}{ALL}) { + # Unresponsive, don't try and send a report. + $report->bodies_str(-1); + } else { + # construct the bodies string: + # 'x,x' - x are body IDs that have this category + # 'x,x|y' - x are body IDs that have this category, y body IDs with *no* contact + my $body_string = join( ',', map { $_->body_id } @contacts ); + $body_string .= + '|' . join( ',', map { $_->id } @{ $c->stash->{missing_details_bodies} } ) + if $body_string && @{ $c->stash->{missing_details_bodies} }; + $report->bodies_str($body_string); + } - my @extra = (); - my $metas = $contacts[0]->extra; + my @extra; + # NB: we are only checking extras for the *first* retrieved contact. + my $metas = $contacts[0]->get_extra_fields(); foreach my $field ( @$metas ) { if ( lc( $field->{required} ) eq 'true' ) { - unless ( $c->request->param( $field->{code} ) ) { + unless ( $c->get_param($field->{code}) ) { $c->stash->{field_errors}->{ $field->{code} } = _('This information is required'); } } push @extra, { name => $field->{code}, description => $field->{description}, - value => $c->request->param( $field->{code} ) || '', + value => $c->get_param($field->{code}) || '', }; } @@ -913,7 +917,7 @@ sub process_report : Private { if ( @extra ) { $c->stash->{report_meta} = { map { $_->{name} => $_ } @extra }; - $report->extra( \@extra ); + $report->set_extra_fields( @extra ); } } elsif ( @{ $c->stash->{bodies_to_list} } ) { @@ -964,7 +968,7 @@ sub check_for_errors : Private { # We only want to validate the phone number web requests (where the # service parameter is blank) because previous versions of the mobile # apps don't validate the presence of a phone number. - if ( ! $c->req->param('phone') and ! $c->req->param('service') ) { + if ( ! $c->get_param('phone') and ! $c->get_param('service') ) { $field_errors{phone} = _("This information is required"); } } @@ -974,7 +978,7 @@ sub check_for_errors : Private { # if they're got the login details wrong when signing in then # we don't care about the name field even though it's validated # by the user object - if ( $c->req->param('submit_sign_in') and $field_errors{password} ) { + if ( $c->get_param('submit_sign_in') and $field_errors{password} ) { delete $field_errors{name}; } @@ -1060,9 +1064,9 @@ sub save_user_and_report : Private { $report->bodies_str( undef ) if $report->bodies_str eq '-1'; # if there is a Message Manager message ID, pass it back to the client view - if ($c->cobrand->moniker eq 'fixmybarangay' && $c->req->param('external_source_id')=~/^\d+$/) { - $c->stash->{external_source_id} = $c->req->param('external_source_id'); - $report->external_source_id( $c->req->param('external_source_id') ); + if ($c->cobrand->moniker eq 'fixmybarangay' && $c->get_param('external_source_id') =~ /^\d+$/) { + $c->stash->{external_source_id} = $c->get_param('external_source_id'); + $report->external_source_id( $c->get_param('external_source_id') ); $report->external_source( $c->config->{MESSAGE_MANAGER_URL} ) ; } @@ -1090,10 +1094,6 @@ sub generate_map : Private { my $latitude = $c->stash->{latitude}; my $longitude = $c->stash->{longitude}; - ( $c->stash->{short_latitude}, $c->stash->{short_longitude} ) = - map { Utils::truncate_coordinate($_) } - ( $c->stash->{latitude}, $c->stash->{longitude} ); - # Don't do anything if the user skipped the map if ( $c->stash->{report}->used_map ) { $c->stash->{page} = 'new'; @@ -1116,7 +1116,7 @@ sub generate_map : Private { sub check_for_category : Private { my ( $self, $c ) = @_; - $c->stash->{category} = $c->req->param('category'); + $c->stash->{category} = $c->get_param('category'); return 1; } @@ -1136,23 +1136,10 @@ sub redirect_or_confirm_creation : Private { if ( $report->confirmed ) { # Subscribe problem reporter to email updates $c->forward( 'create_reporter_alert' ); - my $report_uri; - - if ( $c->cobrand->moniker eq 'fixmybarangay' && $c->user->from_body && $c->stash->{external_source_id}) { - $report_uri = $c->uri_for( '/report', $report->id, undef, { external_source_id => $c->stash->{external_source_id} } ); - } elsif ( $c->cobrand->never_confirm_reports && $report->non_public ) { - $c->log->info( 'cobrand was set to always confirm reports and report was non public, success page showed'); - $c->stash->{template} = 'report_created.html'; - return 1; - } else { - $report_uri = $c->cobrand->base_url_for_report( $report ) . $report->url; - } - $c->log->info($report->user->id . ' was logged in, redirecting to /report/' . $report->id); - if ( $c->sessionid ) { - $c->flash->{created_report} = 'loggedin'; - } - $c->res->redirect($report_uri); - $c->detach; + $c->log->info($report->user->id . ' was logged in, showing confirmation page for ' . $report->id); + $c->stash->{created_report} = 'loggedin'; + $c->stash->{template} = 'tokens/confirm_problem.html'; + return 1; } # otherwise create a confirm token and email it to them. @@ -1199,7 +1186,7 @@ sub redirect_to_around : Private { my ( $self, $c ) = @_; my $params = { - pc => ( $c->stash->{pc} || $c->req->param('pc') || '' ), + pc => ( $c->stash->{pc} || $c->get_param('pc') || '' ), lat => $c->stash->{latitude}, lon => $c->stash->{longitude}, }; diff --git a/perllib/FixMyStreet/App/Controller/Report/Update.pm b/perllib/FixMyStreet/App/Controller/Report/Update.pm index b97420238..17aec2113 100644 --- a/perllib/FixMyStreet/App/Controller/Report/Update.pm +++ b/perllib/FixMyStreet/App/Controller/Report/Update.pm @@ -20,12 +20,12 @@ Creates an update to a report sub report_update : Path : Args(0) { my ( $self, $c ) = @_; - $c->forward( '/report/load_problem_or_display_error', [ $c->req->param('id') ] ); + $c->forward( '/report/load_problem_or_display_error', [ $c->get_param('id') ] ); $c->forward('process_update'); $c->forward('process_user'); $c->forward('/photo/process_photo'); $c->forward('check_for_errors') - or $c->go( '/report/display', [ $c->req->param('id') ] ); + or $c->go( '/report/display', [ $c->get_param('id') ] ); $c->forward('save_update'); $c->forward('redirect_or_confirm_creation'); @@ -76,7 +76,7 @@ sub update_problem : Private { $problem->state('confirmed'); } - if ( $c->cobrand->can_support_problems && $c->user && $c->user->from_body && $c->req->param('external_source_id') ) { + if ( $c->cobrand->can_support_problems && $c->user && $c->user->from_body && $c->get_param('external_source_id') ) { $problem->interest_count( \'interest_count + 1' ); } @@ -106,9 +106,9 @@ sub process_user : Private { if ( $c->user_exists ) { my $user = $c->user->obj; - my $name = scalar $c->req->param('name'); + my $name = $c->get_param('name'); $user->name( Utils::trim_text( $name ) ) if $name; - my $title = scalar $c->req->param('fms_extra_title'); + my $title = $c->get_param('fms_extra_title'); if ( $title ) { $c->log->debug( 'user exists and title is ' . $title ); $user->title( Utils::trim_text( $title ) ); @@ -118,7 +118,7 @@ sub process_user : Private { } # Extract all the params to a hash to make them easier to work with - my %params = map { $_ => scalar $c->req->param($_) } + my %params = map { $_ => $c->get_param($_) } ( 'rznvy', 'name', 'password_register', 'fms_extra_title' ); # cleanup the email address @@ -129,7 +129,7 @@ sub process_user : Private { unless $update->user; # The user is trying to sign in. We only care about email from the params. - if ( $c->req->param('submit_sign_in') || $c->req->param('password_sign_in') ) { + if ( $c->get_param('submit_sign_in') || $c->get_param('password_sign_in') ) { unless ( $c->forward( '/auth/sign_in', [ $email ] ) ) { $c->stash->{field_errors}->{password} = _('There was a problem with your email/password combination. If you cannot remember your password, or do not have one, please fill in the ‘sign in by email’ section of the form.'); return 1; @@ -164,23 +164,23 @@ want to move adding these elsewhere sub process_update : Private { my ( $self, $c ) = @_; - if ( $c->req->param('first_name' ) && $c->req->param('last_name' ) ) { - my $first_name = $c->req->param('first_name'); - my $last_name = $c->req->param('last_name'); - $c->req->param('name', sprintf( '%s %s', $first_name, $last_name ) ); + if ( $c->get_param('first_name') && $c->get_param('last_name') ) { + my $first_name = $c->get_param('first_name'); + my $last_name = $c->get_param('last_name'); + $c->set_param('name', sprintf( '%s %s', $first_name, $last_name )); $c->stash->{first_name} = $first_name; $c->stash->{last_name} = $last_name; } my %params = - map { $_ => scalar $c->req->param($_) } ( 'update', 'name', 'fixed', 'state', 'reopen' ); + map { $_ => $c->get_param($_) } ( 'update', 'name', 'fixed', 'state', 'reopen' ); $params{update} = Utils::cleanup_text( $params{update}, { allow_multiline => 1 } ); my $name = Utils::trim_text( $params{name} ); - my $anonymous = $c->req->param('may_show_name') ? 0 : 1; + my $anonymous = $c->get_param('may_show_name') ? 0 : 1; $params{reopen} = 0 unless $c->user && $c->user->id == $c->stash->{problem}->user->id; @@ -225,10 +225,10 @@ sub process_update : Private { # TODO Use extra here as it is used on reports. $c->cobrand->process_extras( $c, $update->problem->bodies_str, \@extra ); - if ( $c->req->param('fms_extra_title') ) { + if ( $c->get_param('fms_extra_title') ) { my %extras = (); - $extras{title} = $c->req->param('fms_extra_title'); - $extras{email_alerts_requested} = $c->req->param('add_alert'); + $extras{title} = $c->get_param('fms_extra_title'); + $extras{email_alerts_requested} = $c->get_param('add_alert'); $update->extra( \%extras ); } @@ -239,10 +239,10 @@ sub process_update : Private { $update->extra( $extra ); } - $c->log->debug( 'name is ' . $c->req->param('name') ); + $c->log->debug( 'name is ' . $c->get_param('name') ); - $c->stash->{update} = $update; - $c->stash->{add_alert} = $c->req->param('add_alert'); + $c->stash->{update} = $update; + $c->stash->{add_alert} = $c->get_param('add_alert'); return 1; } @@ -259,11 +259,11 @@ sub check_for_errors : Private { my ( $self, $c ) = @_; # they have to be an authority user to update the state - if ( $c->req->param('state') ) { + if ( $c->get_param('state') ) { my $error = 0; $error = 1 unless $c->user && $c->user->belongs_to_body( $c->stash->{update}->problem->bodies_str ); - my $state = $c->req->param('state'); + my $state = $c->get_param('state'); $state = 'fixed - council' if $state eq 'fixed'; $error = 1 unless ( grep { $state eq $_ } ( FixMyStreet::DB::Result::Problem->council_states() ) ); @@ -376,11 +376,8 @@ sub redirect_or_confirm_creation : Private { if ( $update->confirmed ) { $c->forward( 'update_problem' ); $c->forward( 'signup_for_alerts' ); - - my $report_uri = $c->cobrand->base_url_for_report( $update->problem ) . $update->problem->url; - $c->flash->{comment_created} = 1; - $c->res->redirect($report_uri); - $c->detach; + $c->stash->{template} = 'tokens/confirm_update.html'; + return 1; } # otherwise create a confirm token and email it to them. @@ -391,7 +388,7 @@ sub redirect_or_confirm_creation : Private { data => { %$data, id => $update->id, - add_alert => ( $c->req->param('add_alert') ? 1 : 0 ), + add_alert => ( $c->get_param('add_alert') ? 1 : 0 ), } } ); @@ -423,8 +420,8 @@ happen before calling this. sub signup_for_alerts : Private { my ( $self, $c ) = @_; + my $update = $c->stash->{update}; if ( $c->stash->{add_alert} ) { - my $update = $c->stash->{update}; my $options = { user => $update->user, alert_type => 'new_updates', @@ -441,7 +438,7 @@ sub signup_for_alerts : Private { } $alert->confirm(); - } elsif ( $c->user && ( my $alert = $c->user->alert_for_problem($c->stash->{update}->problem_id) ) ) { + } elsif ( my $alert = $update->user->alert_for_problem($update->problem_id) ) { $alert->disable(); } diff --git a/perllib/FixMyStreet/App/Controller/Reports.pm b/perllib/FixMyStreet/App/Controller/Reports.pm index 352c47da8..6b0d516a6 100644 --- a/perllib/FixMyStreet/App/Controller/Reports.pm +++ b/perllib/FixMyStreet/App/Controller/Reports.pm @@ -109,6 +109,7 @@ sub ward : Path : Args(2) { $c->forward( 'ward_check', [ $ward ] ) if $ward; $c->forward( 'check_canonical_url', [ $body ] ); + $c->forward( 'stash_report_filter_status' ); $c->forward( 'load_and_group_problems' ); my $body_short = $c->cobrand->short_name( $c->stash->{body} ); @@ -120,6 +121,15 @@ sub ward : Path : Args(2) { $c->stash->{stats} = $c->cobrand->get_report_stats(); + my @categories = $c->stash->{body}->contacts->search( undef, { + columns => [ 'category' ], + distinct => 1, + order_by => [ 'category' ], + } )->all; + @categories = map { $_->category } @categories; + $c->stash->{filter_categories} = \@categories; + $c->stash->{filter_category} = $c->get_param('filter_category'); + my $pins = $c->stash->{pins}; $c->stash->{page} = 'reports'; # So the map knows to make clickable pins @@ -373,13 +383,15 @@ sub check_canonical_url : Private { sub load_and_group_problems : Private { my ( $self, $c ) = @_; - my $page = $c->req->params->{p} || 1; - my $type = $c->req->params->{t} || 'all'; - my $category = $c->req->params->{c} || ''; + my $page = $c->get_param('p') || 1; + # NB: If 't' is specified, it will override 'status'. + my $type = $c->get_param('t') || 'all'; + my $category = $c->get_param('c') || $c->get_param('filter_category') || ''; + my $states = $c->stash->{filter_problem_states}; my $where = { non_public => 0, - state => [ FixMyStreet::DB::Result::Problem->visible_states() ] + state => [ keys %$states ] }; my $not_open = [ FixMyStreet::DB::Result::Problem::fixed_states(), FixMyStreet::DB::Result::Problem::closed_states() ]; @@ -430,7 +442,7 @@ sub load_and_group_problems : Private { my $problems = $c->cobrand->problems->search( $where, { - order_by => { -desc => 'lastupdate' }, + order_by => $c->cobrand->reports_ordering, rows => $c->cobrand->reports_per_page, } )->page( $page ); @@ -485,6 +497,26 @@ sub redirect_body : Private { $c->res->redirect( $c->uri_for($url, $c->req->params ) ); } +sub stash_report_filter_status : Private { + my ( $self, $c ) = @_; + + my $status = $c->get_param('status') || $c->cobrand->on_map_default_status; + if ( $status eq 'all' ) { + $c->stash->{filter_status} = 'all'; + $c->stash->{filter_problem_states} = FixMyStreet::DB::Result::Problem->visible_states(); + } elsif ( $status eq 'open' ) { + $c->stash->{filter_status} = 'open'; + $c->stash->{filter_problem_states} = FixMyStreet::DB::Result::Problem->open_states(); + } elsif ( $status eq 'fixed' ) { + $c->stash->{filter_status} = 'fixed'; + $c->stash->{filter_problem_states} = FixMyStreet::DB::Result::Problem->fixed_states(); + } else { + $c->stash->{filter_status} = $c->cobrand->on_map_default_status; + } + + return 1; +} + sub add_row { my ( $c, $problem, $body, $problems, $pins ) = @_; push @{$problems->{$body}}, $problem; diff --git a/perllib/FixMyStreet/App/Controller/Root.pm b/perllib/FixMyStreet/App/Controller/Root.pm index 769a147bf..16f4aa491 100644 --- a/perllib/FixMyStreet/App/Controller/Root.pm +++ b/perllib/FixMyStreet/App/Controller/Root.pm @@ -47,7 +47,7 @@ sub index : Path : Args(0) { my %old_params = (); foreach my $key (@old_param_keys) { - my $val = $c->req->param($key); + my $val = $c->get_param($key); next unless $val; $old_params{$key} = $val; } diff --git a/perllib/FixMyStreet/App/Controller/Rss.pm b/perllib/FixMyStreet/App/Controller/Rss.pm index cbeddce85..7aafc99ff 100755 --- a/perllib/FixMyStreet/App/Controller/Rss.pm +++ b/perllib/FixMyStreet/App/Controller/Rss.pm @@ -350,7 +350,7 @@ sub get_query_parameters : Private { $d = '' unless $d && $d =~ /^\d+$/; $c->stash->{distance} = $d; - my $state = $c->req->param('state') || 'all'; + my $state = $c->get_param('state') || 'all'; $state = 'all' unless $state =~ /^(all|open|fixed)$/; $c->stash->{state_qs} = "?state=$state" unless $state eq 'all'; diff --git a/perllib/FixMyStreet/App/Controller/Static.pm b/perllib/FixMyStreet/App/Controller/Static.pm index 8cd82b68e..d91a07fea 100755 --- a/perllib/FixMyStreet/App/Controller/Static.pm +++ b/perllib/FixMyStreet/App/Controller/Static.pm @@ -61,6 +61,25 @@ sub council : Global : Args(0) { my ( $self, $c ) = @_; } +sub unresponsive : Global : Args(0) { + my ( $self, $c ) = @_; + my $body = $c->stash->{body} = $c->model('DB::Body')->find({ id => $c->get_param('body') }) + or $c->detach( '/page_error_404_not_found' ); + + $c->stash->{category} = $c->get_param('category'); + + # If the whole body isn't set to refused, we need to check the contacts + if (!$body->send_method || $body->send_method ne 'Refused') { + my @contacts = $c->model('DB::Contact')->not_deleted->search( { body_id => $body->id } )->all; + my $any_unresponsive = 0; + foreach my $contact (@contacts) { + $any_unresponsive = 1 if $contact->email =~ /^REFUSED$/i; + } + + $c->detach( '/page_error_404_not_found' ) unless $any_unresponsive; + } +} + __PACKAGE__->meta->make_immutable; 1; diff --git a/perllib/FixMyStreet/App/Controller/Tokens.pm b/perllib/FixMyStreet/App/Controller/Tokens.pm index 44cb2429d..21c269502 100644 --- a/perllib/FixMyStreet/App/Controller/Tokens.pm +++ b/perllib/FixMyStreet/App/Controller/Tokens.pm @@ -28,22 +28,32 @@ problem but are not logged in. sub confirm_problem : Path('/P') { my ( $self, $c, $token_code ) = @_; + if ($token_code eq '_test_') { + $c->stash->{report} = { + id => 123, + title => 'Title of Report', + bodies_str => 'True', + url => '/report/123', + }; + return; + } + my $auth_token = $c->forward( 'load_auth_token', [ $token_code, 'problem' ] ); # Load the problem my $data = $auth_token->data; - my $problem_id = ref $data ? $data->{id} : $data; + $data = { id => $data } unless ref $data; + + my $problem_id = $data->{id}; # Look at all problems, not just cobrand, in case am approving something we don't actually show my $problem = $c->model('DB::Problem')->find( { id => $problem_id } ) || $c->detach('token_error'); - $c->stash->{problem} = $problem; + $c->stash->{report} = $problem; - if ( $problem->state eq 'unconfirmed' && $auth_token->created < DateTime->now->subtract( months => 1 ) ) { - $c->stash->{template} = 'errors/generic.html'; - $c->stash->{message} = _("I'm afraid we couldn't validate that token, as the report was made too long ago."); - return; - } + $c->detach('token_too_old') + if $problem->state eq 'unconfirmed' + && $auth_token->created < DateTime->now->subtract( months => 1 ); # check that this email or domain are not the cause of abuse. If so hide it. if ( $problem->is_from_abuser ) { @@ -56,14 +66,12 @@ sub confirm_problem : Path('/P') { # For Zurich, email confirmation simply sets a flag, it does not change the # problem state, log in, or anything else if ($c->cobrand->moniker eq 'zurich') { - my $extra = { %{ $problem->extra || {} } }; - $extra->{email_confirmed} = 1; + $problem->set_extra_metadata( email_confirmed => 1 ); $problem->update( { - extra => $extra, confirmed => \'ms_current_timestamp()', } ); - if ( ref($data) && ( $data->{name} || $data->{password} ) ) { + if ( $data->{name} || $data->{password} ) { $problem->user->name( $data->{name} ) if $data->{name}; $problem->user->phone( $data->{phone} ) if $data->{phone}; $problem->user->update; @@ -72,22 +80,26 @@ sub confirm_problem : Path('/P') { return 1; } - # We have a problem - confirm it if needed! - my $old_state = $problem->state; + if ($problem->state ne 'unconfirmed') { + my $report_uri = $c->cobrand->base_url_for_report( $problem ) . $problem->url; + $c->res->redirect($report_uri); + return; + } + + # We have an unconfirmed problem $problem->update( { state => 'confirmed', confirmed => \'ms_current_timestamp()', lastupdate => \'ms_current_timestamp()', } - ) if $problem->state eq 'unconfirmed'; + ); # Subscribe problem reporter to email updates - $c->stash->{report} = $c->stash->{problem}; $c->forward( '/report/new/create_reporter_alert' ); # log the problem creation user in to the site - if ( ref($data) && ( $data->{name} || $data->{password} ) ) { + if ( $data->{name} || $data->{password} ) { $problem->user->name( $data->{name} ) if $data->{name}; $problem->user->phone( $data->{phone} ) if $data->{phone}; $problem->user->password( $data->{password}, 1 ) if $data->{password}; @@ -97,11 +109,6 @@ sub confirm_problem : Path('/P') { $c->authenticate( { email => $problem->user->email }, 'no_password' ); $c->set_session_cookie_expire(0); - if ( FixMyStreet::DB::Result::Problem->visible_states()->{$old_state} ) { - my $report_uri = $c->cobrand->base_url_for_report( $problem ) . $problem->url; - $c->res->redirect($report_uri); - } - $c->stash->{created_report} = 'fromemail'; return 1; } @@ -135,23 +142,34 @@ alert but are not logged in. sub confirm_alert : Path('/A') { my ( $self, $c, $token_code ) = @_; + if ($token_code eq '_test_') { + $c->stash->{confirm_type} = $c->get_param('confirm_type'); + return; + } + my $auth_token = $c->forward( 'load_auth_token', [ $token_code, 'alert' ] ); - # Load the problem + # Load the alert my $alert_id = $auth_token->data->{id}; $c->stash->{confirm_type} = $auth_token->data->{type}; my $alert = $c->model('DB::Alert')->find( { id => $alert_id } ) || $c->detach('token_error'); $c->stash->{alert} = $alert; + $c->detach('token_too_old') + if $c->stash->{confirm_type} ne 'unsubscribe' + && $auth_token->created < DateTime->now->subtract( months => 1 ); + # check that this email or domain are not the cause of abuse. If so hide it. if ( $alert->is_from_abuser ) { $c->stash->{template} = 'tokens/abuse.html'; return; } - $c->authenticate( { email => $alert->user->email }, 'no_password' ); - $c->set_session_cookie_expire(0); + if (!$alert->confirmed && $c->stash->{confirm_type} ne 'unsubscribe') { + $c->authenticate( { email => $alert->user->email }, 'no_password' ); + $c->set_session_cookie_expire(0); + } $c->forward('/alert/confirm'); @@ -170,10 +188,20 @@ update but are not logged in. sub confirm_update : Path('/C') { my ( $self, $c, $token_code ) = @_; + if ($token_code eq '_test_') { + $c->stash->{problem} = { + id => 123, + title => 'Title of Report', + bodies_str => 'True', + url => '/report/123', + }; + return; + } + my $auth_token = $c->forward( 'load_auth_token', [ $token_code, 'comment' ] ); - # Load the problem + # Load the update my $data = $auth_token->data; my $comment_id = $data->{id}; $c->stash->{add_alert} = $data->{add_alert}; @@ -182,26 +210,32 @@ sub confirm_update : Path('/C') { || $c->detach('token_error'); $c->stash->{update} = $comment; + $c->detach('token_too_old') + if $comment->state ne 'confirmed' + && $auth_token->created < DateTime->now->subtract( months => 1 ); + # check that this email or domain are not the cause of abuse. If so hide it. if ( $comment->is_from_abuser ) { $c->stash->{template} = 'tokens/abuse.html'; return; } + if ( $comment->state ne 'unconfirmed' ) { + my $report_uri = $c->cobrand->base_url_for_report( $comment->problem ) . $comment->problem->url; + $c->res->redirect($report_uri); + return; + } + if ( $data->{name} || $data->{password} ) { $comment->user->name( $data->{name} ) if $data->{name}; $comment->user->password( $data->{password}, 1 ) if $data->{password}; $comment->user->update; } + $c->authenticate( { email => $comment->user->email }, 'no_password' ); $c->set_session_cookie_expire(0); - if ( $comment->confirmed ) { - my $report_uri = $c->cobrand->base_url_for_report( $comment->problem ) . $comment->problem->url; - $c->res->redirect($report_uri); - } else { - $c->forward('/report/update/confirm'); - } + $c->forward('/report/update/confirm'); return 1; } @@ -212,6 +246,7 @@ sub load_questionnaire : Private { my $auth_token = $c->forward( 'load_auth_token', [ $token_code, 'questionnaire' ] ); $c->stash->{id} = $auth_token->data; $c->stash->{token} = $token_code; + $c->stash->{token_obj} = $auth_token; my $questionnaire = $c->model('DB::Questionnaire')->find( { id => $c->stash->{id} }, @@ -225,11 +260,43 @@ sub questionnaire : Path('/Q') : Args(1) { my ( $self, $c, $token_code ) = @_; $c->forward( 'load_questionnaire', [ $token_code ] ); - $c->authenticate( { email => $c->stash->{questionnaire}->problem->user->email }, 'no_password' ); - $c->set_session_cookie_expire(0); + $c->detach('token_too_old') if $c->stash->{token_obj}->created < DateTime->now->subtract( months => 1 ); + + my $questionnaire = $c->stash->{questionnaire}; + if (!$questionnaire->whenanswered) { + $c->authenticate( { email => $questionnaire->problem->user->email }, 'no_password' ); + $c->set_session_cookie_expire(0); + } $c->forward( '/questionnaire/show' ); } +=head2 alert_to_reporter + + /R/([0-9A-Za-z]{16,18}).*$ + +A link in an update alert to a problem reporter - show the "reopen report" +tickbox but don't log the person in. + +=cut + +sub alert_to_reporter : Path('/R') { + my ( $self, $c, $token_code ) = @_; + + my $auth_token = + $c->forward( 'load_auth_token', [ $token_code, 'alert_to_reporter' ] ); + my $data = $auth_token->data; + + my $problem_id = $data->{id}; + my $problem = $c->model('DB::Problem')->find( { id => $problem_id } ) + || $c->detach('token_error'); + + $c->detach('token_too_old') if $auth_token->created < DateTime->now->subtract( months => 1 ); + + $c->flash->{alert_to_reporter} = 1; + my $report_uri = $c->cobrand->base_url_for_report( $problem ) . $problem->url; + $c->res->redirect($report_uri); +} + =head2 load_auth_token my $auth_token = @@ -276,6 +343,12 @@ sub token_error : Private { $c->stash->{template} = 'tokens/error.html'; } +sub token_too_old : Private { + my ( $self, $c ) = @_; + $c->stash->{token_not_found} = 1; + $c->stash->{template} = 'auth/token.html'; +} + __PACKAGE__->meta->make_immutable; 1; diff --git a/perllib/FixMyStreet/App/View/Web.pm b/perllib/FixMyStreet/App/View/Web.pm index 033ad583f..da549ece8 100644 --- a/perllib/FixMyStreet/App/View/Web.pm +++ b/perllib/FixMyStreet/App/View/Web.pm @@ -7,7 +7,6 @@ use warnings; use mySociety::Locale; use mySociety::Web qw(ent); use FixMyStreet; -use CrossSell; use Utils; __PACKAGE__->config( @@ -18,7 +17,7 @@ __PACKAGE__->config( ENCODING => 'utf8', render_die => 1, expose_methods => [ - 'loc', 'nget', 'tprintf', 'display_crosssell_advert', 'prettify_dt', + 'loc', 'nget', 'tprintf', 'prettify_dt', 'add_links', 'version', 'decode', ], FILTERS => { @@ -79,19 +78,6 @@ sub tprintf { return sprintf $format, @args; } -=head2 display_crosssell_advert - - [% display_crosssell_advert( email, name ) %] - -Displays a crosssell advert (will be fixmystreet cobrand only). - -=cut - -sub display_crosssell_advert { - my ( $self, $c, $email, $name, %data ) = @_; - return CrossSell::display_advert( $c, $email, $name, %data ); -} - =head2 Utils::prettify_dt [% pretty = prettify_dt( $dt, $short_bool ) %] diff --git a/perllib/FixMyStreet/Cobrand/ArreglaMiBarrio.pm b/perllib/FixMyStreet/Cobrand/ArreglaMiBarrio.pm new file mode 100644 index 000000000..cc393f42e --- /dev/null +++ b/perllib/FixMyStreet/Cobrand/ArreglaMiBarrio.pm @@ -0,0 +1,10 @@ +package FixMyStreet::Cobrand::ArreglaMiBarrio; +use base 'FixMyStreet::Cobrand::Default'; + +use utf8; +use strict; +use warnings; + +sub language_override { 'es' } + +1; diff --git a/perllib/FixMyStreet/Cobrand/Base.pm b/perllib/FixMyStreet/Cobrand/Base.pm index 4941712b2..5a9842233 100644 --- a/perllib/FixMyStreet/Cobrand/Base.pm +++ b/perllib/FixMyStreet/Cobrand/Base.pm @@ -51,5 +51,8 @@ sub is_default { return $self->moniker eq 'default'; } +# NB: this Base class is for 'meta' features. To add base methods for all cobrands, +# you may want to look at FMS::Cobrand::Default instead! + 1; diff --git a/perllib/FixMyStreet/Cobrand/BellaVistaEnAccion.pm b/perllib/FixMyStreet/Cobrand/BellaVistaEnAccion.pm index df4d428e8..58bc6973d 100644 --- a/perllib/FixMyStreet/Cobrand/BellaVistaEnAccion.pm +++ b/perllib/FixMyStreet/Cobrand/BellaVistaEnAccion.pm @@ -12,7 +12,7 @@ sub example_places { return ( 'Dominica, Recoleta', 'Pio Nono' ); } -sub languages { [ 'es-cl,Castellano,es_CL', 'en-gb,English,en_GB' ] } +sub languages { [ 'es-cl,Castellano,es_CL' ] } sub disambiguate_location { return { diff --git a/perllib/FixMyStreet/Cobrand/Bromley.pm b/perllib/FixMyStreet/Cobrand/Bromley.pm index 99b38ca6a..9bee45128 100644 --- a/perllib/FixMyStreet/Cobrand/Bromley.pm +++ b/perllib/FixMyStreet/Cobrand/Bromley.pm @@ -20,14 +20,14 @@ sub disambiguate_location { my $town = 'Bromley'; - # Bing turns High St Bromley into Bromley High St which is in + # Bing turns High St Bromley into Bromley High St which is in # Bromley by Bow. $town .= ', BR1' if $string =~ /^high\s+st(reet)?$/i; # Disambiguations required for BR5 $town .= ', BR5' if $string =~ /^kelsey\s+r(?:oa)?d$/i; $town = 'BR5 Bromley' if $string =~ /^leith\s+hill$/i; # doesn't like appended BR5 for some reason - + # There has also been a road name change for a section of Ramsden Road # (BR5) between Church Hill and Court Road has changed to 'Old Priory # Avenue' - presently entering Old Priory Avenue simply takes the user to @@ -42,10 +42,14 @@ sub disambiguate_location { # and BR6 $town .= ', BR6' if $string =~ /^berrylands/i; - # White Horse Hill is on boundary with Greenwich, so need a + # White Horse Hill is on boundary with Greenwich, so need a # specific postcode $town = 'chislehurst, BR7 6DH' if $string =~ /^white\s+horse/i; + # Mottingham Lane is 90% inside Bromley, but goes outside too and Bing + # defaults to the top end of it. + $town = 'Mottingham Lane, SE9 4RW' if $string =~ /^mottingham\s+lane/i; + $town = '' if $string =~ /orpington/i; return { diff --git a/perllib/FixMyStreet/Cobrand/Default.pm b/perllib/FixMyStreet/Cobrand/Default.pm index 7f1fba67a..c3185ea05 100644 --- a/perllib/FixMyStreet/Cobrand/Default.pm +++ b/perllib/FixMyStreet/Cobrand/Default.pm @@ -7,6 +7,7 @@ use FixMyStreet; use FixMyStreet::Geocode::Bing; use DateTime; use Encode; +use List::MoreUtils 'none'; use URI; use Digest::MD5 qw(md5_hex); @@ -157,7 +158,9 @@ Set the language and domain of the site based on the cobrand and host. sub set_lang_and_domain { my ( $self, $lang, $unicode, $dir ) = @_; - my $languages = join('|', @{$self->languages}); + my @languages = @{$self->languages}; + push @languages, 'en-gb,English,en_GB' if none { /en-gb/ } @languages; + my $languages = join('|', @languages); my $lang_override = $self->language_override || $lang; my $lang_domain = $self->language_domain || 'FixMyStreet'; @@ -174,7 +177,7 @@ sub set_lang_and_domain { return $set_lang; } -sub languages { FixMyStreet->config('LANGUAGES') || [ 'en-gb,English,en_GB' ] } +sub languages { FixMyStreet->config('LANGUAGES') || [] } sub language_domain { } sub language_override { } @@ -337,6 +340,16 @@ sub reports_per_page { return FixMyStreet->config('ALL_REPORTS_PER_PAGE') || 100; } +=head2 reports_ordering + +The order_by clause to use for reports on all reports page + +=cut + +sub reports_ordering { + return { -desc => 'lastupdate' }; +} + =head2 on_map_list_limit Return the maximum number of items to be given in the list of reports on the map @@ -353,6 +366,14 @@ Return the default maximum age for pins. sub on_map_default_max_pin_age { return '6 months'; } +=head2 on_map_default_status + +Return the default ?status= query parameter to use for filter on map page. + +=cut + +sub on_map_default_status { return 'all'; } + =head2 allow_photo_upload Return a boolean indicating whether the cobrand allows photo uploads @@ -895,5 +916,9 @@ sub get_country_for_ip_address { return 0; } -1; +sub jurisdiction_id_example { + my $self = shift; + return $self->moniker; +} +1; diff --git a/perllib/FixMyStreet/Cobrand/EmptyHomes.pm b/perllib/FixMyStreet/Cobrand/EmptyHomes.pm index b87a1cf24..0b02f90c4 100644 --- a/perllib/FixMyStreet/Cobrand/EmptyHomes.pm +++ b/perllib/FixMyStreet/Cobrand/EmptyHomes.pm @@ -13,6 +13,12 @@ sub path_to_web_templates { return [ FixMyStreet->path_to( 'templates/web', $self->moniker )->stringify ]; } +sub _fallback_body_sender { + my ( $self, $body, $category ) = @_; + + return { method => 'EmptyHomes' }; +}; + =item Return the base url for this cobranded site @@ -132,7 +138,7 @@ sub process_extras { my $body_id = shift; my $extra = shift; - my $value = $ctx->request->params->{address} || ''; + my $value = $ctx->get_param('address') || ''; $ctx->stash->{field_errors}->{address} = _('This information is required') unless $value; $extra->{address} = $value; diff --git a/perllib/FixMyStreet/Cobrand/FiksGataMi.pm b/perllib/FixMyStreet/Cobrand/FiksGataMi.pm index 822a0c43b..7b175f371 100644 --- a/perllib/FixMyStreet/Cobrand/FiksGataMi.pm +++ b/perllib/FixMyStreet/Cobrand/FiksGataMi.pm @@ -12,7 +12,7 @@ sub country { return 'NO'; } -sub languages { [ 'en-gb,English,en_GB', 'nb,Norwegian,nb_NO' ] } +sub languages { [ 'nb,Norwegian,nb_NO' ] } sub language_override { 'nb' } sub enter_postcode_text { @@ -223,4 +223,8 @@ sub reports_body_check { } } +sub jurisdiction_id_example { + 'fiksgatami.no'; +} + 1; diff --git a/perllib/FixMyStreet/Cobrand/FixMindelo.pm b/perllib/FixMyStreet/Cobrand/FixMindelo.pm index 59debf157..60f69d589 100644 --- a/perllib/FixMyStreet/Cobrand/FixMindelo.pm +++ b/perllib/FixMyStreet/Cobrand/FixMindelo.pm @@ -8,7 +8,7 @@ sub country { return 'CV'; } -sub languages { [ 'pt-cv,Portuguese,pt_CV', 'en-gb,English,en_GB' ] } +sub languages { [ 'pt-cv,Portuguese,pt_CV' ] } sub language_override { 'pt-cv' } sub disambiguate_location { diff --git a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm index 9001ca5f7..f21d38ff8 100644 --- a/perllib/FixMyStreet/Cobrand/FixMyStreet.pm +++ b/perllib/FixMyStreet/Cobrand/FixMyStreet.pm @@ -40,12 +40,12 @@ sub extra_contact_validation { my %errors; - $c->stash->{dest} = $c->req->param('dest'); + $c->stash->{dest} = $c->get_param('dest'); $errors{dest} = "Please enter who your message is for" - unless $c->req->param('dest'); + unless $c->get_param('dest'); - if ( $c->req->param('dest') eq 'council' || $c->req->param('dest') eq 'update' ) { + if ( $c->get_param('dest') eq 'council' || $c->get_param('dest') eq 'update' ) { $errors{not_for_us} = 1; } diff --git a/perllib/FixMyStreet/Cobrand/FixaMinGata.pm b/perllib/FixMyStreet/Cobrand/FixaMinGata.pm index 60f98dd47..e6e54926f 100644 --- a/perllib/FixMyStreet/Cobrand/FixaMinGata.pm +++ b/perllib/FixMyStreet/Cobrand/FixaMinGata.pm @@ -13,7 +13,7 @@ sub country { return 'SE'; } -sub languages { [ 'en-gb,English,en_GB', 'sv,Swedish,sv_SE' ] } +sub languages { [ 'sv,Swedish,sv_SE' ] } sub language_override { 'sv' } sub enter_postcode_text { @@ -121,119 +121,13 @@ sub filter_all_council_ids_list { return @all_councils_ids; # Är detta rätt? //Rikard } -# Vad ska vi göra för svenska förhållanden här??? //Rikard -sub council_rss_alert_options { - my $self = shift; - my $all_councils = shift; - my $c = shift; - - my ( @options, @reported_to_options, $fylke, $kommune ); - - foreach ( values %$all_councils ) { - if ( $_->{type} eq 'NKO' ) { - $kommune = $_; - } - else { - $fylke = $_; - } - } - - if ( $fylke->{id} == 3 ) { # Oslo - my $short_name = $self->short_name($fylke, $all_councils); - ( my $id_name = $short_name ) =~ tr/+/_/; - - push @options, - { - type => 'council', - id => sprintf( 'council:%s:%s', $fylke->{id}, $id_name ), - rss_text => - sprintf( _('RSS feed of problems within %s'), $fylke->{name} ), - text => sprintf( _('Problems within %s'), $fylke->{name} ), - uri => $c->uri_for( '/rss/reports', $short_name ), - }; - } - else { - my $short_kommune_name = $self->short_name($kommune, $all_councils); - ( my $id_kommune_name = $short_kommune_name ) =~ tr/+/_/; - - my $short_fylke_name = $self->short_name($fylke, $all_councils); - ( my $id_fylke_name = $short_fylke_name ) =~ tr/+/_/; - - push @options, - { - type => 'area', - id => sprintf( 'area:%s:%s', $kommune->{id}, $id_kommune_name ), - rss_text => - sprintf( _('RSS feed of %s'), $kommune->{name} ), - text => $kommune->{name}, - uri => $c->uri_for( '/rss/area', $short_kommune_name ), - }, - { - type => 'area', - id => sprintf( 'area:%s:%s', $fylke->{id}, $id_fylke_name ), - rss_text => - sprintf( _('RSS feed of %s'), $fylke->{name} ), - text => $fylke->{name}, - uri => $c->uri_for( '/rss/area', $short_fylke_name ), - }; - - push @reported_to_options, - { - type => 'council', - id => sprintf( 'council:%s:%s', $kommune->{id}, $id_kommune_name ), - rss_text => - sprintf( _('RSS feed of %s'), $kommune->{name} ), - text => $kommune->{name}, - uri => $c->uri_for( '/rss/reports', $short_kommune_name ), - }, - { - type => 'council', - id => sprintf( 'council:%s:%s', $fylke->{id}, $id_fylke_name ), - rss_text => - sprintf( _('RSS feed of %s'), $fylke->{name} ), - text => $fylke->{name}, - uri => $c->uri_for( '/rss/reports/', $short_fylke_name ), - }; - } - - return ( - \@options, @reported_to_options - ? \@reported_to_options - : undef - ); - -} - -# Vad ska vi göra för svenska förhållanden här??? //Rikard -sub reports_council_check { - my ( $self, $c, $council ) = @_; - - if ($council eq 'Oslo') { - - # There are two Oslos (kommune and fylke), we only want one of them. - $c->stash->{council} = mySociety::MaPit::call('area', 3); - return 1; - - } elsif ($council =~ /,/) { - - # Some kommunes have the same name, use the fylke name to work out which. - my ($kommune, $fylke) = split /\s*,\s*/, $council; - my $area_types = $c->cobrand->area_types; - my $areas_k = mySociety::MaPit::call('areas', $kommune, type => $area_types); - my $areas_f = mySociety::MaPit::call('areas', $fylke, type => $area_types); - if (keys %$areas_f == 1) { - ($fylke) = values %$areas_f; - foreach (values %$areas_k) { - if ($_->{name} eq $kommune && $_->{parent_area} == $fylke->{id}) { - $c->stash->{council} = $_; - return 1; - } - } - } - # If we're here, we've been given a bad name. - $c->detach( 'redirect_index' ); - - } +# The pin is green is it's fixed, yellow if it's closed (but not fixed), and +# red otherwise. +sub pin_colour { + my ( $self, $p, $context ) = @_; + return 'green' if $p->is_fixed; + return 'yellow' if $p->is_closed; + return 'red'; } 1; diff --git a/perllib/FixMyStreet/Cobrand/Greenwich.pm b/perllib/FixMyStreet/Cobrand/Greenwich.pm new file mode 100644 index 000000000..18b0c2f5e --- /dev/null +++ b/perllib/FixMyStreet/Cobrand/Greenwich.pm @@ -0,0 +1,47 @@ +package FixMyStreet::Cobrand::Greenwich; +use parent 'FixMyStreet::Cobrand::UKCouncils'; + +use strict; +use warnings; + +sub council_id { return 2493; } +sub council_area { return 'Greenwich'; } +sub council_name { return 'Royal Borough of Greenwich'; } +sub council_url { return 'greenwich'; } + +sub example_places { + return ( 'SE18 6HQ', "Woolwich Road" ); +} + +sub enter_postcode_text { + my ($self) = @_; + return 'Enter a Royal Greenwich postcode, or street name and area'; +} + +sub disambiguate_location { + my $self = shift; + my $string = shift; + + my $town = 'Greenwich'; + + # as it's the requested example location, try to avoid a disambiguation page + $town .= ', SE10 0EF' if $string =~ /^\s*woolwich\s+r(?:oa)?d\s*(?:,\s*green\w+\s*)?$/i; + + return { + %{ $self->SUPER::disambiguate_location() }, + town => $town, + centre => '51.4743770385684,0.0555696523982184', + span => '0.089851200483885,0.150572372434415', + bounds => [ 51.423679096602, -0.0263872255863898, 51.5135302970859, 0.124185146848025 ], + }; +} + +sub pin_colour { + my ( $self, $p, $context ) = @_; + return 'grey' if $p->state eq 'not responsible'; + return 'green' if $p->is_fixed || $p->is_closed; + return 'red' if $p->state eq 'confirmed'; + return 'yellow'; +} + +1; diff --git a/perllib/FixMyStreet/Cobrand/Harrogate.pm b/perllib/FixMyStreet/Cobrand/Harrogate.pm index 6bcc2f227..afda52385 100644 --- a/perllib/FixMyStreet/Cobrand/Harrogate.pm +++ b/perllib/FixMyStreet/Cobrand/Harrogate.pm @@ -112,7 +112,9 @@ sub temp_update_contacts { } $contact->update({ - extra => [ { %default, %$field } ], + # XXX: we're just setting extra with the expected layout, + # this could be encapsulated more nicely + extra => { _fields => [ { %default, %$field } ] }, confirmed => 1, deleted => 0, editor => 'automated script', @@ -223,7 +225,7 @@ sub process_additional_metadata_for_email { my ($self, $problem, $h) = @_; my $additional = ''; - if (my $extra = $problem->extra) { + if (my $extra = $problem->get_extra_fields) { $additional = join "\n\n", map { if ($_->{name} eq 'INFO_TEXT') { (); @@ -238,5 +240,45 @@ sub process_additional_metadata_for_email { $h->{additional_information} = $additional; } +sub send_questionnaires { + return 0; +} + +sub munge_category_list { + my ($self, $categories_ref, $contacts_ref, $extras_ref) = @_; + + # we want to know which contacts *only* belong to NYCC + # that's because for shared responsibility, we don't expect + # the user to have to figure out which authority to contact. + + # so we start building up the list of both + my (%harrogate_contacts, %nycc_contacts); + + my $harrogate_id = $self->council_id; # XXX: note reference to council_id as body id! + for my $contact (@$contacts_ref) { + my $category = $contact->category; + if ($contact->body_id == $harrogate_id) { + $harrogate_contacts{$category} = 1; + } + else { + $nycc_contacts{$category}++; + } + } + + # and then remove any that also have Harrogate involvement + delete $nycc_contacts{$_} for keys %harrogate_contacts; + + # here, we simply *mark* the text with (NYCC) at the end, and + # the rest will get done in the template with javascript + my @categories = map { + $nycc_contacts{$_} ? + "$_ (NYCC)" + : $_ + } @$categories_ref; + + # replace the entire list with this transformed one + @$categories_ref = @categories; +} + 1; diff --git a/perllib/FixMyStreet/Cobrand/MakeMyIsland.pm b/perllib/FixMyStreet/Cobrand/MakeMyIsland.pm deleted file mode 100644 index f263df4cc..000000000 --- a/perllib/FixMyStreet/Cobrand/MakeMyIsland.pm +++ /dev/null @@ -1,12 +0,0 @@ -package FixMyStreet::Cobrand::MakeMyIsland; -use base 'FixMyStreet::Cobrand::Default'; - -use strict; -use warnings; - -sub country { - return 'MV'; -} - -1; - diff --git a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm index 44b3a0fa9..b9d48a95c 100644 --- a/perllib/FixMyStreet/Cobrand/Oxfordshire.pm +++ b/perllib/FixMyStreet/Cobrand/Oxfordshire.pm @@ -47,5 +47,60 @@ sub users_can_hide { return 1; } sub default_show_name { 0 } -1; +=head2 problem_response_days + +Returns the number of working days that are expected to elapse +between the problem being reported and it being responded to by +the council/body. + +=cut + +sub problem_response_days { + my $self = shift; + my $p = shift; + + return 10 if $p->category eq 'Bridges'; + return 10 if $p->category eq 'Carriageway Defect'; # phone if urgent + return 10 if $p->category eq 'Debris/Spillage'; + return 10 if $p->category eq 'Drainage'; + return 10 if $p->category eq 'Fences'; + return 10 if $p->category eq 'Flyposting'; + return 10 if $p->category eq 'Footpaths/ Rights of way (usually not tarmac)'; + return 10 if $p->category eq 'Gully and Catchpits'; + return 10 if $p->category eq 'Ice/Snow'; # phone if urgent + return 10 if $p->category eq 'Manhole'; + return 10 if $p->category eq 'Mud and Debris'; # phone if urgent + return 10 if $p->category eq 'Oil Spillage'; # phone if urgent + return 10 if $p->category eq 'Pavements'; + return 10 if $p->category eq 'Pothole'; # phone if urgent + return 10 if $p->category eq 'Property Damage'; + return 10 if $p->category eq 'Public rights of way'; + return 10 if $p->category eq 'Road Marking'; + return 10 if $p->category eq 'Road traffic signs'; + return 10 if $p->category eq 'Roads/highways'; + return 10 if $p->category eq 'Skips and scaffolding'; + return 10 if $p->category eq 'Street lighting'; + return 10 if $p->category eq 'Traffic lights'; # phone if urgent + return 10 if $p->category eq 'Traffic'; + return 10 if $p->category eq 'Trees'; + return 10 if $p->category eq 'Utilities'; + return 10 if $p->category eq 'Vegetation'; + + return undef; +} +sub reports_ordering { + return { -desc => 'confirmed' }; +} + +sub pin_colour { + my ( $self, $p, $context ) = @_; + return 'grey' if $p->state eq 'not responsible'; + return 'green' if $p->is_fixed || $p->is_closed; + return 'red' if $p->state eq 'confirmed'; + return 'yellow'; +} + +sub on_map_default_status { return 'open'; } + +1; diff --git a/perllib/FixMyStreet/Cobrand/SeeSomething.pm b/perllib/FixMyStreet/Cobrand/SeeSomething.pm index 775ba770b..75f1c32e8 100644 --- a/perllib/FixMyStreet/Cobrand/SeeSomething.pm +++ b/perllib/FixMyStreet/Cobrand/SeeSomething.pm @@ -99,22 +99,22 @@ sub admin_stats { $c->detach( '/page_error_404_not_found' ); } - if ( $c->req->param('category') ) { - $filters{category} = $c->req->param('category'); - $c->stash->{category} = $c->req->param('category'); + if ( $c->get_param('category') ) { + $filters{category} = $c->get_param('category'); + $c->stash->{category} = $c->get_param('category'); } - if ( $c->req->param('subcategory') ) { - $filters{subcategory} = $c->req->param('subcategory'); - $c->stash->{subcategory} = $c->req->param('subcategory'); + if ( $c->get_param('subcategory') ) { + $filters{subcategory} = $c->get_param('subcategory'); + $c->stash->{subcategory} = $c->get_param('subcategory'); } - if ( $c->req->param('service') ) { - $filters{service} = { -ilike => $c->req->param('service') }; - $c->stash->{service} = $c->req->param('service'); + if ( $c->get_param('service') ) { + $filters{service} = { -ilike => $c->get_param('service') }; + $c->stash->{service} = $c->get_param('service'); } - my $page = $c->req->params->{p} || 1; + my $page = $c->get_param('p') || 1; my $p = $c->model('DB::Problem')->search( { diff --git a/perllib/FixMyStreet/Cobrand/UK.pm b/perllib/FixMyStreet/Cobrand/UK.pm index 786b6038c..2473f386f 100644 --- a/perllib/FixMyStreet/Cobrand/UK.pm +++ b/perllib/FixMyStreet/Cobrand/UK.pm @@ -26,16 +26,6 @@ sub disambiguate_location { }; } -sub _fallback_body_sender { - my ( $self, $body, $category ) = @_; - - my $first_area = $body->body_areas->first->area_id; - my $area_info = mySociety::MaPit::call('area', $first_area); - return { method => 'London' } if $area_info->{type} eq 'LBO'; - return { method => 'NI' } if $area_info->{type} eq 'LGD'; - return { method => 'Email' }; -} - sub process_extras { my $self = shift; my $ctx = shift; @@ -47,7 +37,7 @@ sub process_extras { if ( $body_id eq '2482' ) { my @fields = ( 'fms_extra_title', @$fields ); for my $field ( @fields ) { - my $value = $ctx->request->param( $field ); + my $value = $ctx->get_param($field); if ( !$value ) { $ctx->stash->{field_errors}->{ $field } = _('This information is required'); @@ -59,8 +49,8 @@ sub process_extras { }; } - if ( $ctx->request->param('fms_extra_title') ) { - $ctx->stash->{fms_extra_title} = $ctx->request->param('fms_extra_title'); + if ( $ctx->get_param('fms_extra_title') ) { + $ctx->stash->{fms_extra_title} = $ctx->get_param('fms_extra_title'); $ctx->stash->{extra_name_info} = 1; } } @@ -312,5 +302,38 @@ sub council_rss_alert_options { return ( \@options, @reported_to_options ? \@reported_to_options : undef ); } +sub report_check_for_errors { + my $self = shift; + my $c = shift; + + my %errors = $self->next::method($c); + + my $report = $c->stash->{report}; + + if (!$errors{name} && (length($report->name) < 5 + || $report->name !~ m/\s/ + || $report->name =~ m/\ba\s*n+on+((y|o)mo?u?s)?(ly)?\b/i)) + { + $errors{name} = _( +'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' + ); + } + + # XXX Hardcoded body ID matching mapit area ID + if ( $report->bodies_str && $report->detail ) { + # Custom character limit: + # Bromley Council + if ( $report->bodies_str eq '2482' && length($report->detail) > 1750 ) { + $errors{detail} = sprintf( _('Reports are limited to %s characters in length. Please shorten your report'), 1750 ); + } + # Oxfordshire + if ( $report->bodies_str eq '2237' && length($report->detail) > 1700 ) { + $errors{detail} = sprintf( _('Reports are limited to %s characters in length. Please shorten your report'), 1700 ); + } + } + + return %errors; +} + 1; diff --git a/perllib/FixMyStreet/Cobrand/UKCouncils.pm b/perllib/FixMyStreet/Cobrand/UKCouncils.pm index 65930a092..e653ae522 100644 --- a/perllib/FixMyStreet/Cobrand/UKCouncils.pm +++ b/perllib/FixMyStreet/Cobrand/UKCouncils.pm @@ -85,11 +85,11 @@ sub area_check { } else { $url .= 'around'; } - $url .= '?pc=' . URI::Escape::uri_escape( $self->{c}->req->param('pc') ) - if $self->{c}->req->param('pc'); - $url .= '?latitude=' . URI::Escape::uri_escape( $self->{c}->req->param('latitude') ) - . '&longitude=' . URI::Escape::uri_escape( $self->{c}->req->param('longitude') ) - if $self->{c}->req->param('latitude'); + $url .= '?pc=' . URI::Escape::uri_escape( $self->{c}->get_param('pc') ) + if $self->{c}->get_param('pc'); + $url .= '?latitude=' . URI::Escape::uri_escape( $self->{c}->get_param('latitude') ) + . '&longitude=' . URI::Escape::uri_escape( $self->{c}->get_param('longitude') ) + if $self->{c}->get_param('latitude'); my $error_msg = "That location is not covered by " . $self->council_name . ". Please visit <a href=\"$url\">the main FixMyStreet site</a>."; return ( 0, $error_msg ); diff --git a/perllib/FixMyStreet/Cobrand/ZeroTB.pm b/perllib/FixMyStreet/Cobrand/ZeroTB.pm index cdf4e5ad4..ef1b0b1e1 100644 --- a/perllib/FixMyStreet/Cobrand/ZeroTB.pm +++ b/perllib/FixMyStreet/Cobrand/ZeroTB.pm @@ -10,9 +10,6 @@ sub country { return 'IN'; } -sub languages { [ 'en-gb,English,en_GB' ] } -sub language_override { 'en-gb' } - sub disambiguate_location { return { country => 'in', diff --git a/perllib/FixMyStreet/Cobrand/Zurich.pm b/perllib/FixMyStreet/Cobrand/Zurich.pm index 577da9dd5..c64fe1177 100644 --- a/perllib/FixMyStreet/Cobrand/Zurich.pm +++ b/perllib/FixMyStreet/Cobrand/Zurich.pm @@ -4,6 +4,7 @@ use base 'FixMyStreet::Cobrand::Default'; use DateTime; use POSIX qw(strcoll); use RABX; +use Scalar::Util 'blessed'; use strict; use warnings; @@ -76,7 +77,7 @@ sub example_places { return [ 'Langstrasse', 'Basteiplatz' ]; } -sub languages { [ 'de-ch,Deutsch,de_CH', 'en-gb,English,en_GB' ] } +sub languages { [ 'de-ch,Deutsch,de_CH' ] } sub language_override { 'de-ch' } # If lat/lon are in the URI, we must have zoom as well, otherwise OpenLayers defaults to 0. @@ -158,7 +159,8 @@ sub updates_as_hashref { $hashref->{update_pp} = $self->prettify_dt( $problem->lastupdate ); if ( $problem->state eq 'fixed - council' ) { - $hashref->{details} = FixMyStreet::App::View::Web->add_links( $ctx, $problem->extra ? $problem->extra->{public_response} : '' ); + $hashref->{details} = FixMyStreet::App::View::Web->add_links( + $ctx, $problem->get_extra_metadata('public_response') || '' ); } elsif ( $problem->state eq 'closed' ) { $hashref->{details} = sprintf( _('Assigned to %s'), $problem->body($ctx)->name ); } @@ -169,13 +171,16 @@ sub updates_as_hashref { sub allow_photo_display { my ( $self, $r ) = @_; - if (ref($r) ne 'HASH') { - return $r->extra && $r->extra->{publish_photo}; + if (blessed $r) { + return $r->get_extra_metadata( 'publish_photo' ); } + + # additional munging in case $r isn't an object, TODO see if we can remove this my $extra = $r->{extra}; utf8::encode($extra) if utf8::is_utf8($extra); my $h = new IO::String($extra); $extra = RABX::wire_rd($h); + return unless ref $extra eq 'HASH'; return $extra->{publish_photo}; } @@ -264,10 +269,9 @@ sub get_or_check_overdue { my ($self, $problem) = @_; # use the cached version is it exists (e.g. when called from template) - my $extra = $problem->extra; - if (exists $extra->{closed_overdue} and defined $extra->{closed_overdue}) { - return $extra->{closed_overdue} - } + my $overdue = $problem->get_extra_metadata('closed_overdue'); + return $overdue if defined $overdue; + return $self->overdue($problem); } @@ -338,8 +342,8 @@ sub admin { my @children = map { $_->id } $body->bodies->all; my @all = (@children, $body->id); - my $order = $c->req->params->{o} || 'created'; - my $dir = defined $c->req->params->{d} ? $c->req->params->{d} : 1; + my $order = $c->get_param('o') || 'created'; + my $dir = defined $c->get_param('d') ? $c->get_param('d') : 1; $c->stash->{order} = $order; $c->stash->{dir} = $dir; $order .= ' desc' if $dir; @@ -358,7 +362,7 @@ sub admin { order_by => $order, }); - my $page = $c->req->params->{p} || 1; + my $page = $c->get_param('p') || 1; $c->stash->{other} = $c->cobrand->problems->search({ state => { -not_in => [ 'unconfirmed', 'confirmed', 'planned' ] }, bodies_str => \@all, @@ -372,8 +376,8 @@ sub admin { my $body = $c->stash->{body}; - my $order = $c->req->params->{o} || 'created'; - my $dir = defined $c->req->params->{d} ? $c->req->params->{d} : 1; + my $order = $c->get_param('o') || 'created'; + my $dir = defined $c->get_param('d') ? $c->get_param('d') : 1; $c->stash->{order} = $order; $c->stash->{dir} = $dir; $order .= ' desc' if $dir; @@ -392,7 +396,7 @@ sub admin { order_by => $order } ); - my $page = $c->req->params->{p} || 1; + my $page = $c->get_param('p') || 1; $c->stash->{reports_published} = $c->cobrand->problems->search( { state => 'fixed - council', bodies_str => $body->parent->id, @@ -445,14 +449,14 @@ sub admin_report_edit { } # If super or sdm check that the token is correct before proceeding - if ( ($type eq 'super' || $type eq 'dm') && $c->req->param('submit') ) { + if ( ($type eq 'super' || $type eq 'dm') && $c->get_param('submit') ) { $c->forward('check_token'); } # All types of users can add internal notes - if ( ($type eq 'super' || $type eq 'dm' || $type eq 'sdm') && $c->req->param('submit') ) { + if ( ($type eq 'super' || $type eq 'dm' || $type eq 'sdm') && $c->get_param('submit') ) { # If there is a new note add it as a comment to the problem (with is_internal_note set true in extra). - if ( my $new_internal_note = $c->req->params->{new_internal_note} ) { + if ( my $new_internal_note = $c->get_param('new_internal_note') ) { $problem->add_to_comments( { text => $new_internal_note, user => $c->user->obj, @@ -465,13 +469,19 @@ sub admin_report_edit { } # Problem updates upon submission - if ( ($type eq 'super' || $type eq 'dm') && $c->req->param('submit') ) { - # Predefine the hash so it's there for lookups - my $extra = $problem->extra || {}; - $extra->{publish_photo} = $c->req->params->{publish_photo} || 0; - $extra->{third_personal} = $c->req->params->{third_personal} || 0; + if ( ($type eq 'super' || $type eq 'dm') && $c->get_param('submit') ) { + $problem->set_extra_metadata('publish_photo' => $c->get_param('publish_photo') || 0 ); + $problem->set_extra_metadata('third_personal' => $c->get_param('third_personal') || 0 ); + # Make sure we have a copy of the original detail field - $extra->{original_detail} = $problem->detail if !$extra->{original_detail} && $c->req->params->{detail} && $problem->detail ne $c->req->params->{detail}; + if (my $new_detail = $c->get_param('detail')) { + my $old_detail = $problem->detail; + if (! $problem->get_extra_metadata('original_detail') + && ($old_detail ne $new_detail)) + { + $problem->set_extra_metadata( original_detail => $old_detail ); + } + } # Some changes will be accompanied by an internal note, which if needed # should be stored in this variable. @@ -479,65 +489,62 @@ sub admin_report_edit { # Workflow things my $redirect = 0; - my $new_cat = $c->req->params->{category}; + my $new_cat = $c->get_param('category'); if ( $new_cat && $new_cat ne $problem->category ) { - my $cat = $c->model('DB::Contact')->search( { category => $c->req->params->{category} } )->first; + my $cat = $c->model('DB::Contact')->search( { category => $c->get_param('category') } )->first; my $old_cat = $problem->category; $problem->category( $new_cat ); $problem->external_body( undef ); $problem->bodies_str( $cat->body_id ); $problem->whensent( undef ); - $extra->{changed_category} = 1; + $problem->set_extra_metadata(changed_category => 1); $internal_note_text = "Weitergeleitet von $old_cat an $new_cat"; $redirect = 1 if $cat->body_id ne $body->id; - } elsif ( my $subdiv = $c->req->params->{body_subdivision} ) { - $extra->{moderated_overdue} //= $self->overdue( $problem ); + } elsif ( my $subdiv = $c->get_param('body_subdivision') ) { + $problem->set_extra_metadata_if_undefined( moderated_overdue => $self->overdue( $problem ) ); $self->set_problem_state($c, $problem, 'in progress'); $problem->external_body( undef ); $problem->bodies_str( $subdiv ); $problem->whensent( undef ); $redirect = 1; - } elsif ( my $external = $c->req->params->{body_external} ) { - $extra->{moderated_overdue} //= $self->overdue( $problem ); + } elsif ( my $external = $c->get_param('body_external') ) { + $problem->set_extra_metadata_if_undefined( moderated_overdue => $self->overdue( $problem ) ); $self->set_problem_state($c, $problem, 'closed'); - $extra->{closed_overdue} //= $self->overdue( $problem ); + $problem->set_extra_metadata_if_undefined( closed_overdue => $self->overdue( $problem ) ); $problem->external_body( $external ); $problem->whensent( undef ); _admin_send_email( $c, 'problem-external.txt', $problem ); $redirect = 1; } else { - if (my $state = $c->req->params->{state}) { + if (my $state = $c->get_param('state')) { if ($problem->state eq 'unconfirmed' and $state ne 'unconfirmed') { # only set this for the first state change - $extra->{moderated_overdue} //= $self->overdue( $problem ); + $problem->set_extra_metadata_if_undefined( moderated_overdue => $self->overdue( $problem ) ); } $self->set_problem_state($c, $problem, $state); if ($self->problem_is_closed($problem)) { - $extra->{closed_overdue} //= $self->overdue( $problem ); + $problem->set_extra_metadata_if_undefined( closed_overdue => $self->overdue( $problem ) ); } - if ( $state eq 'hidden' && $c->req->params->{send_rejected_email} ) { + if ( $state eq 'hidden' && $c->get_param('send_rejected_email') ) { _admin_send_email( $c, 'problem-rejected.txt', $problem ); } } } - $problem->extra( $extra ); - $problem->title( $c->req->param('title') ); - $problem->detail( $c->req->param('detail') ); - $problem->latitude( $c->req->param('latitude') ); - $problem->longitude( $c->req->param('longitude') ); + $problem->title( $c->get_param('title') ) if $c->get_param('title'); + $problem->detail( $c->get_param('detail') ) if $c->get_param('detail'); + $problem->latitude( $c->get_param('latitude') ); + $problem->longitude( $c->get_param('longitude') ); # Final, public, Update from DM - if (my $update = $c->req->param('status_update')) { - $extra->{public_response} = $update; - $problem->extra( $extra ); - if ($c->req->params->{publish_response}) { + if (my $update = $c->get_param('status_update')) { + $problem->set_extra_metadata(public_response => $update); + if ($c->get_param('publish_response')) { $self->set_problem_state($c, $problem, 'fixed - council'); - $extra->{closed_overdue} = $self->overdue( $problem ); - $problem->extra( { %$extra } ); + $problem->set_extra_metadata( closed_overdue => $self->overdue( $problem ) ); _admin_send_email( $c, 'problem-closed.txt', $problem ); } } @@ -581,7 +588,7 @@ sub admin_report_edit { # Has cut-down edit template for adding update and sending back up only $c->stash->{template} = 'admin/report_edit-sdm.html'; - if ($c->req->param('send_back')) { + if ($c->get_param('send_back')) { $c->forward('check_token'); $problem->bodies_str( $body->parent->id ); @@ -590,20 +597,20 @@ sub admin_report_edit { # log here $c->res->redirect( '/admin/summary' ); - } elsif ($c->req->param('submit')) { + } elsif ($c->get_param('submit')) { $c->forward('check_token'); my $db_update = 0; - if ( $c->req->param('latitude') != $problem->latitude || $c->req->param('longitude') != $problem->longitude ) { - $problem->latitude( $c->req->param('latitude') ); - $problem->longitude( $c->req->param('longitude') ); + if ( $c->get_param('latitude') != $problem->latitude || $c->get_param('longitude') != $problem->longitude ) { + $problem->latitude( $c->get_param('latitude') ); + $problem->longitude( $c->get_param('longitude') ); $db_update = 1; } $problem->update if $db_update; # Add new update from status_update - if (my $update = $c->req->param('status_update')) { + if (my $update = $c->get_param('status_update')) { FixMyStreet::App->model('DB::Comment')->create( { text => $update, user => $c->user->obj, @@ -618,10 +625,8 @@ sub admin_report_edit { $c->stash->{status_message} = '<p><em>' . _('Updated!') . '</em></p>'; # If they clicked the no more updates button, we're done. - if ($c->req->param('no_more_updates')) { - my $extra = $problem->extra || {}; - $extra->{subdiv_overdue} = $self->overdue( $problem ); - $problem->extra( $extra ); + if ($c->get_param('no_more_updates')) { + $problem->set_extra_metadata( subdiv_overdue => $self->overdue( $problem ) ); $problem->bodies_str( $body->parent->id ); $problem->whensent( undef ); $self->set_problem_state($c, $problem, 'planned'); @@ -645,7 +650,7 @@ sub admin_report_edit { sub _admin_send_email { my ( $c, $template, $problem ) = @_; - return unless $problem->extra && $problem->extra->{email_confirmed}; + return unless $problem->get_extra_metadata('email_confirmed'); my $to = $problem->name ? [ $problem->user->email, $problem->name ] @@ -707,7 +712,7 @@ sub admin_stats { my $c = $self->{c}; my %date_params; - my $ym = $c->req->params->{ym}; + my $ym = $c->get_param('ym'); my ($m, $y) = $ym ? ($ym =~ /^(\d+)\.(\d+)$/) : (); $c->stash->{ym} = $ym; if ($y && $m) { @@ -721,7 +726,7 @@ sub admin_stats { state => [ FixMyStreet::DB::Result::Problem->visible_states() ], ); - if ( $c->req->params->{export} ) { + if ( $c->get_param('export') ) { my $problems = $c->model('DB::Problem')->search( {%date_params}, { @@ -730,25 +735,55 @@ sub admin_stats { 'latitude', 'longitude', 'cobrand', 'category', 'state', 'user_id', - 'external_body' - ] + 'external_body', + 'title', 'detail', + 'photo', + 'whensent', 'lastupdate', + 'service', + 'extra', + ], } ); - my $body = "ID,Created,E,N,Category,Status,UserID,External Body\n"; + my $body = "Report ID,Created,Sent to Agency,Last Updated,E,N,Category,Status,UserID,External Body,Title,Detail,Media URL,Interface Used,Council Response\n"; + require Text::CSV; + my $csv = Text::CSV->new({ binary => 1 }); while ( my $report = $problems->next ) { my $external_body; my $body_name = ""; if ( $external_body = $report->body($c) ) { - $body_name = $external_body->name; + $body_name = $external_body->name || '[Unknown body]'; } - $body .= join( ',', - $report->id, $report->created, + + my $detail = $report->detail; + my $public_response = $report->get_extra_metadata('public_response') || ''; + + # replace newlines with HTML <br/> element + $detail =~ s{\r?\n}{ <br/> }g; + $public_response =~ s{\r?\n}{ <br/> }g; + + my @columns = ( + $report->id, + $report->created, + $report->whensent, + $report->lastupdate, $report->local_coords, $report->category, $report->state, $report->user_id, - "\"$body_name\"" ) - . "\n"; + $body_name, + $report->title, + $detail, + $c->cobrand->base_url . $report->get_photo_params->{url}, + $report->service || 'Web interface', + $public_response, + ); + if ($csv->combine(@columns)) { + $body .= $csv->string . "\n"; + } + else { + $body .= sprintf "{{error emitting CSV line: %s}}\n", $csv->error_diag; + } } $c->res->content_type('text/csv; charset=utf-8'); + $c->res->header('Content-Disposition' => 'attachment; filename=stats.csv'); $c->res->body($body); } diff --git a/perllib/FixMyStreet/DB/Result/Alert.pm b/perllib/FixMyStreet/DB/Result/Alert.pm index 4ce72f873..c64cb2ff4 100644 --- a/perllib/FixMyStreet/DB/Result/Alert.pm +++ b/perllib/FixMyStreet/DB/Result/Alert.pm @@ -69,24 +69,16 @@ __PACKAGE__->belongs_to( # You can replace this text with custom code or comments, and it will be preserved on regeneration -use DateTime::TimeZone; use Moose; use namespace::clean -except => [ 'meta' ]; with 'FixMyStreet::Roles::Abuser'; -my $tz = DateTime::TimeZone->new( name => "local" ); - -my $tz_f; -$tz_f = DateTime::TimeZone->new( name => FixMyStreet->config('TIME_ZONE') ) - if FixMyStreet->config('TIME_ZONE'); - my $stz = sub { my ( $orig, $self ) = ( shift, shift ); my $s = $self->$orig(@_); return $s unless $s && UNIVERSAL::isa($s, "DateTime"); - $s->set_time_zone($tz); - $s->set_time_zone($tz_f) if $tz_f; + FixMyStreet->set_time_zone($s); return $s; }; diff --git a/perllib/FixMyStreet/DB/Result/Comment.pm b/perllib/FixMyStreet/DB/Result/Comment.pm index 3fae6860a..836462ed5 100644 --- a/perllib/FixMyStreet/DB/Result/Comment.pm +++ b/perllib/FixMyStreet/DB/Result/Comment.pm @@ -95,25 +95,17 @@ __PACKAGE__->belongs_to( __PACKAGE__->load_components("+FixMyStreet::DB::RABXColumn"); __PACKAGE__->rabx_column('extra'); -use DateTime::TimeZone; use Image::Size; use Moose; use namespace::clean -except => [ 'meta' ]; with 'FixMyStreet::Roles::Abuser'; -my $tz = DateTime::TimeZone->new( name => "local" ); - -my $tz_f; -$tz_f = DateTime::TimeZone->new( name => FixMyStreet->config('TIME_ZONE') ) - if FixMyStreet->config('TIME_ZONE'); - my $stz = sub { my ( $orig, $self ) = ( shift, shift ); my $s = $self->$orig(@_); return $s unless $s && UNIVERSAL::isa($s, "DateTime"); - $s->set_time_zone($tz); - $s->set_time_zone($tz_f) if $tz_f; + FixMyStreet->set_time_zone($s); return $s; }; diff --git a/perllib/FixMyStreet/DB/Result/Contact.pm b/perllib/FixMyStreet/DB/Result/Contact.pm index eca028c9b..2fbb0716d 100644 --- a/perllib/FixMyStreet/DB/Result/Contact.pm +++ b/perllib/FixMyStreet/DB/Result/Contact.pm @@ -63,4 +63,12 @@ __PACKAGE__->belongs_to( __PACKAGE__->load_components("+FixMyStreet::DB::RABXColumn"); __PACKAGE__->rabx_column('extra'); +use Moose; +use namespace::clean -except => [ 'meta' ]; + +with 'FixMyStreet::Roles::Extra'; + +# we need the inline_constructor bit as we don't inherit from Moose +__PACKAGE__->meta->make_immutable( inline_constructor => 0 ); + 1; diff --git a/perllib/FixMyStreet/DB/Result/Problem.pm b/perllib/FixMyStreet/DB/Result/Problem.pm index 34d740912..bed2f160a 100644 --- a/perllib/FixMyStreet/DB/Result/Problem.pm +++ b/perllib/FixMyStreet/DB/Result/Problem.pm @@ -153,13 +153,13 @@ __PACKAGE__->load_components("+FixMyStreet::DB::RABXColumn"); __PACKAGE__->rabx_column('extra'); __PACKAGE__->rabx_column('geocode'); -use DateTime::TimeZone; use Image::Size; use Moose; use namespace::clean -except => [ 'meta' ]; use Utils; -with 'FixMyStreet::Roles::Abuser'; +with 'FixMyStreet::Roles::Abuser', + 'FixMyStreet::Roles::Extra'; =head2 @@ -228,38 +228,6 @@ sub closed_states { =head2 - @states = FixMyStreet::DB::Problem::visible_states(); - -Get a list of states that should be visible on the site. If called in -array context then returns an array of names, otherwise returns a -HASHREF. - -=cut - -my $visible_states = { - 'confirmed' => 1, - 'investigating' => 1, - 'in progress' => 1, - 'planned' => 1, - 'action scheduled' => 1, - 'fixed' => 1, - 'fixed - council' => 1, - 'fixed - user' => 1, - 'unable to fix' => 1, - 'not responsible' => 1, - 'duplicate' => 1, - 'closed' => 1, - 'internal referral' => 1, -}; -sub visible_states { - return wantarray ? keys %{$visible_states} : $visible_states; -} -sub visible_states_add_unconfirmed { - $visible_states->{unconfirmed} = 1; -} - -=head2 - @states = FixMyStreet::DB::Problem::all_states(); Get a list of all states that a problem can have. If called in @@ -293,6 +261,70 @@ sub all_states { =head2 + @visible_states = FixMyStreet::DB::Problem::visible_states(); + @hidden_states = FixMyStreet::DB::Problem::hidden_states(); + +Get a list of states that should be visible (or hidden) on the site. If called +in array context then returns an array of names, otherwise returns a HASHREF. + +=cut + +my $hidden_states = { + 'hidden' => 1, + 'partial' => 1, + 'unconfirmed' => 1, +}; + +my $visible_states = { + map { + $hidden_states->{$_} ? () : ($_ => 1) + } all_states() +}; + ## e.g.: + # 'confirmed' => 1, + # 'investigating' => 1, + # 'in progress' => 1, + # 'planned' => 1, + # 'action scheduled' => 1, + # 'fixed' => 1, + # 'fixed - council' => 1, + # 'fixed - user' => 1, + # 'unable to fix' => 1, + # 'not responsible' => 1, + # 'duplicate' => 1, + # 'closed' => 1, + # 'internal referral' => 1, + +sub hidden_states { + return wantarray ? keys %{$hidden_states} : $hidden_states; +} + +sub visible_states { + return wantarray ? keys %{$visible_states} : $visible_states; +} + +sub visible_states_add { + my ($self, @states) = @_; + for my $state (@states) { + delete $hidden_states->{$state}; + $visible_states->{$state} = 1; + } +} + +sub visible_states_remove { + my ($self, @states) = @_; + for my $state (@states) { + delete $visible_states->{$state}; + $hidden_states->{$state} = 1; + } +} + +sub visible_states_add_unconfirmed { + $_[0]->visible_states_add('unconfirmed') +} + +=head2 + @states = FixMyStreet::DB::Problem::council_states(); Get a list of states that are availble to council users. If called in @@ -316,18 +348,11 @@ sub council_states { return wantarray ? keys %{$states} : $states; } -my $tz = DateTime::TimeZone->new( name => "local" ); - -my $tz_f; -$tz_f = DateTime::TimeZone->new( name => FixMyStreet->config('TIME_ZONE') ) - if FixMyStreet->config('TIME_ZONE'); - my $stz = sub { my ( $orig, $self ) = ( shift, shift ); my $s = $self->$orig(@_); return $s unless $s && UNIVERSAL::isa($s, "DateTime"); - $s->set_time_zone($tz); - $s->set_time_zone($tz_f) if $tz_f; + FixMyStreet->set_time_zone($s); return $s; }; @@ -380,14 +405,6 @@ sub check_for_errors { if ( !$self->name || $self->name !~ m/\S/ ) { $errors{name} = _('Please enter your name'); } - elsif (length( $self->name ) < 5 - || $self->name !~ m/\s/ - || $self->name =~ m/\ba\s*n+on+((y|o)mo?u?s)?(ly)?\b/i ) - { - $errors{name} = _( -'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' - ) unless $self->cobrand eq 'emptyhomes'; - } if ( $self->category && $self->category eq _('-- Pick a category --') ) @@ -402,18 +419,6 @@ sub check_for_errors { $self->category(undef); } - if ( $self->bodies_str && $self->detail ) { - # Custom character limit: - # Bromley Council - if ( $self->bodies_str eq '2482' && length($self->detail) > 1750 ) { - $errors{detail} = sprintf( _('Reports are limited to %s characters in length. Please shorten your report'), 1750 ); - } - # Oxfordshire - if ( $self->bodies_str eq '2237' && length($self->detail) > 1700 ) { - $errors{detail} = sprintf( _('Reports are limited to %s characters in length. Please shorten your report'), 1700 ); - } - } - return \%errors; } @@ -662,14 +667,14 @@ sub processed_summary_string { } if ($problem->can_display_external_id) { if ($duration_clause) { - $external_ref_clause = sprintf(_('council ref: %s'), $problem->external_id); + $external_ref_clause = '<strong>' . sprintf(_('Council ref: %s'), $problem->external_id) . '.</strong>'; } else { - $external_ref_clause = sprintf(_('%s ref: %s'), $problem->external_body, $problem->external_id); + $external_ref_clause = '<strong>' . sprintf(_('%s ref: %s'), $problem->external_body, $problem->external_id) . '.</strong>'; } } if ($duration_clause and $external_ref_clause) { - return "$duration_clause, $external_ref_clause" - } else { + return "$duration_clause. $external_ref_clause" + } else { return $duration_clause || $external_ref_clause } } @@ -688,6 +693,10 @@ sub local_coords { my ($x, $y) = Geo::Coordinates::CH1903::from_latlon($self->latitude, $self->longitude); return ( int($x+0.5), int($y+0.5) ); } + else { + # return a dummy value until this function is implemented. useful for testing. + return (0, 0); + } } =head2 update_from_open311_service_request @@ -745,7 +754,7 @@ sub update_from_open311_service_request { # of course if local timezone is not the one that went into the data # base then we're also in trouble my $lastupdate = $self->lastupdate; - $lastupdate->set_time_zone( DateTime::TimeZone->new( name => 'local' ) ); + $lastupdate->set_time_zone( FixMyStreet->local_time_zone ); # update from open311 is older so skip if ( $req_time < $lastupdate ) { diff --git a/perllib/FixMyStreet/DB/Result/Questionnaire.pm b/perllib/FixMyStreet/DB/Result/Questionnaire.pm index 7f9c79d9a..6f2941546 100644 --- a/perllib/FixMyStreet/DB/Result/Questionnaire.pm +++ b/perllib/FixMyStreet/DB/Result/Questionnaire.pm @@ -43,22 +43,14 @@ __PACKAGE__->belongs_to( # Created by DBIx::Class::Schema::Loader v0.07035 @ 2013-09-10 17:11:54 # DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:oL1Hk4/bNG14CY74GA75SA -use DateTime::TimeZone; use Moose; use namespace::clean -except => [ 'meta' ]; -my $tz = DateTime::TimeZone->new( name => "local" ); - -my $tz_f; -$tz_f = DateTime::TimeZone->new( name => FixMyStreet->config('TIME_ZONE') ) - if FixMyStreet->config('TIME_ZONE'); - my $stz = sub { my ( $orig, $self ) = ( shift, shift ); my $s = $self->$orig(@_); return $s unless $s && UNIVERSAL::isa($s, "DateTime"); - $s->set_time_zone($tz); - $s->set_time_zone($tz_f) if $tz_f; + FixMyStreet->set_time_zone($s); return $s; }; diff --git a/perllib/FixMyStreet/DB/Result/User.pm b/perllib/FixMyStreet/DB/Result/User.pm index 6a93f97ec..f08b666c8 100644 --- a/perllib/FixMyStreet/DB/Result/User.pm +++ b/perllib/FixMyStreet/DB/Result/User.pm @@ -100,7 +100,7 @@ use mySociety::EmailUtil; =head2 check_for_errors - $error_hashref = $problem->check_for_errors(); + $error_hashref = $user->check_for_errors(); Look at all the fields and return a hashref with all errors found, keyed on the field name. This is intended to be passed back to the form to display the diff --git a/perllib/FixMyStreet/DB/ResultSet/AlertType.pm b/perllib/FixMyStreet/DB/ResultSet/AlertType.pm index b704fa7dd..0b430008a 100644 --- a/perllib/FixMyStreet/DB/ResultSet/AlertType.pm +++ b/perllib/FixMyStreet/DB/ResultSet/AlertType.pm @@ -103,36 +103,25 @@ sub email_alerts ($) { } ); $data{alert_email} = $user->email; my $token_obj = FixMyStreet::App->model('DB::Token')->create( { - scope => 'email_sign_in', + scope => 'alert_to_reporter', data => { - email => $user->email, - r => 'report/' . $row->{id}, + id => $row->{id}, } } ); - $data{problem_url} = $url . "/M/" . $token_obj->token; + $data{problem_url} = $url . "/R/" . $token_obj->token; } else { $data{problem_url} = $url . "/report/" . $row->{id}; } $data{data} .= $row->{item_name} . ' : ' if $row->{item_name} && !$row->{item_anonymous}; if ( $cobrand->include_time_in_update_alerts ) { - # this is basically recreating the code from the inflate wrapper - # in the database model. - my $tz; - if ( FixMyStreet->config('TIME_ZONE') ) { - $tz = FixMyStreet->config('TIME_ZONE'); - } - my $parser = DateTime::Format::Pg->new(); my $dt = $parser->parse_timestamp( $row->{item_confirmed} ); - my $l_tz = DateTime::TimeZone->new( name => "local" ); # We need to always set this otherwise we end up with the DateTime # object being in the floating timezone in which case applying a # subsequent timezone set will have no effect. - $dt->set_time_zone( $l_tz ); - if ( $tz ) { - my $tz_obj = DateTime::TimeZone->new( name => $tz ); - $dt->set_time_zone( $tz_obj ); - } + # this is basically recreating the code from the inflate wrapper + # in the database model. + FixMyStreet->set_time_zone($dt); $data{data} .= $cobrand->prettify_dt( $dt, 'alert' ) . "\n\n"; } $data{data} .= $row->{item_text} . "\n\n------\n\n"; diff --git a/perllib/FixMyStreet/DB/ResultSet/Nearby.pm b/perllib/FixMyStreet/DB/ResultSet/Nearby.pm index 91c44d5f4..a0ccb8a6d 100644 --- a/perllib/FixMyStreet/DB/ResultSet/Nearby.pm +++ b/perllib/FixMyStreet/DB/ResultSet/Nearby.pm @@ -5,11 +5,15 @@ use strict; use warnings; sub nearby { - my ( $rs, $c, $dist, $ids, $limit, $mid_lat, $mid_lon, $interval ) = @_; + my ( $rs, $c, $dist, $ids, $limit, $mid_lat, $mid_lon, $interval, $category, $states ) = @_; + + unless ( $states ) { + $states = FixMyStreet::DB::Result::Problem->visible_states(); + } my $params = { non_public => 0, - state => [ FixMyStreet::DB::Result::Problem::visible_states() ], + state => [ keys %$states ], }; $params->{'current_timestamp-lastupdate'} = { '<', \"'$interval'::interval" } if $interval; @@ -19,6 +23,7 @@ sub nearby { %{ $c->cobrand->problems_clause }, %$params } if $c->cobrand->problems_clause; + $params->{category} = $category if $category; my $attrs = { prefetch => 'problem', diff --git a/perllib/FixMyStreet/DB/ResultSet/Problem.pm b/perllib/FixMyStreet/DB/ResultSet/Problem.pm index a84a309ee..7885c28b3 100644 --- a/perllib/FixMyStreet/DB/ResultSet/Problem.pm +++ b/perllib/FixMyStreet/DB/ResultSet/Problem.pm @@ -131,20 +131,25 @@ sub _recent { # Problems around a location sub around_map { - my ( $rs, $min_lat, $max_lat, $min_lon, $max_lon, $interval, $limit ) = @_; + my ( $rs, $min_lat, $max_lat, $min_lon, $max_lon, $interval, $limit, $category, $states ) = @_; my $attr = { order_by => { -desc => 'created' }, }; $attr->{rows} = $limit if $limit; + unless ( $states ) { + $states = FixMyStreet::DB::Result::Problem->visible_states(); + } + my $q = { non_public => 0, - state => [ FixMyStreet::DB::Result::Problem->visible_states() ], + state => [ keys %$states ], latitude => { '>=', $min_lat, '<', $max_lat }, longitude => { '>=', $min_lon, '<', $max_lon }, }; $q->{'current_timestamp - lastupdate'} = { '<', \"'$interval'::interval" } if $interval; + $q->{category} = $category if $category; my @problems = mySociety::Locale::in_gb_locale { $rs->search( $q, $attr )->all }; return \@problems; @@ -295,19 +300,6 @@ sub send_reports { : _('The user could not locate the problem on a map, but to see the area around the location they entered'); $h{closest_address} = ''; - # If we are in the UK include eastings and northings, and nearest stuff - $h{easting_northing} = ''; - if ( $cobrand->country eq 'GB' ) { - - ( $h{easting}, $h{northing} ) = Utils::convert_latlon_to_en( $h{latitude}, $h{longitude} ); - - # email templates don't have conditionals so we need to farmat this here - $h{easting_northing} # - = "Easting: $h{easting}\n\n" # - . "Northing: $h{northing}\n\n"; - - } - if ( $row->used_map ) { $h{closest_address} = $cobrand->find_closest( $h{latitude}, $h{longitude}, $row ); } @@ -315,104 +307,106 @@ sub send_reports { if ( $cobrand->allow_anonymous_reports && $row->user->email eq $cobrand->anonymous_account->{'email'} ) { - $h{anonymous_report} = 1; - $h{user_details} = _('This report was submitted anonymously'); - } else { - $h{user_details} = sprintf(_('Name: %s'), $row->name) . "\n\n"; - $h{user_details} .= sprintf(_('Email: %s'), $row->user->email) . "\n\n"; - } + $h{anonymous_report} = 1; + $h{user_details} = _('This report was submitted anonymously'); + } else { + $h{user_details} = sprintf(_('Name: %s'), $row->name) . "\n\n"; + $h{user_details} .= sprintf(_('Email: %s'), $row->user->email) . "\n\n"; + } + + $h{easting_northing} = ''; if ($cobrand->can('process_additional_metadata_for_email')) { $cobrand->process_additional_metadata_for_email($row, \%h); } + # XXX Needs locks! + # XXX Only copes with at most one missing body + my ($bodies, $missing) = $row->bodies_str =~ /^([\d,]+)(?:\|(\d+))?/; + my @bodies = split(/,/, $bodies); + $bodies = FixMyStreet::App->model("DB::Body")->search( + { id => \@bodies }, + { order_by => 'name' }, + ); + $missing = FixMyStreet::App->model("DB::Body")->find($missing) if $missing; + + my @dear; my %reporters = (); - my ( $sender_count ); - if ($site eq 'emptyhomes') { + while (my $body = $bodies->next) { + my $sender_info = $cobrand->get_body_sender( $body, $row->category ); + my $sender = "FixMyStreet::SendReport::" . $sender_info->{method}; - my $body = $row->bodies_str; - $body = FixMyStreet::App->model("DB::Body")->find($body); - my $sender = "FixMyStreet::SendReport::EmptyHomes"; - $reporters{ $sender } = $sender->new() unless $reporters{$sender}; - $reporters{ $sender }->add_body( $body ); - $sender_count = 1; - - } else { - - # XXX Needs locks! - # XXX Only copes with at most one missing body - my ($bodies, $missing) = $row->bodies_str =~ /^([\d,]+)(?:\|(\d+))?/; - my @bodies = split(/,/, $bodies); - $bodies = FixMyStreet::App->model("DB::Body")->search( - { id => \@bodies }, - { order_by => 'name' }, - ); - $missing = FixMyStreet::App->model("DB::Body")->find($missing) if $missing; - my @dear; - - while (my $body = $bodies->next) { - my $sender_info = $cobrand->get_body_sender( $body, $row->category ); - my $sender = "FixMyStreet::SendReport::" . $sender_info->{method}; - - if ( ! exists $senders->{ $sender } ) { - warn "No such sender [ $sender ] for body $body->name ( $body->id )"; - next; - } - $reporters{ $sender } ||= $sender->new(); - - if ( $reporters{ $sender }->should_skip( $row ) ) { - debug_print("skipped by sender " . $sender_info->{method} . " (might be due to previous failed attempts?)", $row->id) if $debug_mode; - } else { - debug_print("OK, adding recipient body " . $body->id . ":" . $body->name . ", " . $body->send_method, $row->id) if $debug_mode; - push @dear, $body->name; - $reporters{ $sender }->add_body( $body, $sender_info->{config} ); - } + if ( ! exists $senders->{ $sender } ) { + warn "No such sender [ $sender ] for body $body->name ( $body->id )"; + next; } + $reporters{ $sender } ||= $sender->new(); - if ($h{category} eq _('Other')) { - $h{category_footer} = _('this type of local problem'); - $h{category_line} = ''; + if ( $reporters{ $sender }->should_skip( $row ) ) { + debug_print("skipped by sender " . $sender_info->{method} . " (might be due to previous failed attempts?)", $row->id) if $debug_mode; } else { - $h{category_footer} = "'" . $h{category} . "'"; - $h{category_line} = sprintf(_("Category: %s"), $h{category}) . "\n\n"; + debug_print("OK, adding recipient body " . $body->id . ":" . $body->name . ", " . $body->send_method, $row->id) if $debug_mode; + push @dear, $body->name; + $reporters{ $sender }->add_body( $body, $sender_info->{config} ); } - if ( $row->subcategory ) { - $h{subcategory_line} = sprintf(_("Subcategory: %s"), $row->subcategory) . "\n\n"; - } else { - $h{subcategory_line} = "\n\n"; - } + # If we are in the UK include eastings and northings, and nearest stuff + if ( $cobrand->country eq 'GB' && !$h{easting} ) { + my $coordsyst = 'G'; + my $first_area = $body->body_areas->first->area_id; + my $area_info = mySociety::MaPit::call('area', $first_area); + $coordsyst = 'I' if $area_info->{type} eq 'LGD'; - $h{bodies_name} = join(_(' and '), @dear); - if ($h{category} eq _('Other')) { - $h{multiple} = @dear>1 ? "[ " . _("This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system.") . " ]\n\n" - : ''; - } else { - $h{multiple} = @dear>1 ? "[ " . _("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.") . " ]\n\n" - : ''; - } - $h{missing} = ''; - if ($missing) { - $h{missing} = '[ ' - . sprintf(_('We realise this problem might be the responsibility of %s; however, we don\'t currently have any contact details for them. If you know of an appropriate contact address, please do get in touch.'), $missing->name) - . " ]\n\n"; - } + ( $h{easting}, $h{northing} ) = Utils::convert_latlon_to_en( $h{latitude}, $h{longitude}, $coordsyst ); - $sender_count = scalar @dear; + # email templates don't have conditionals so we need to format this here + $h{easting_northing} = "Easting/Northing"; + $h{easting_northing} .= " (IE)" if $coordsyst eq 'I'; + $h{easting_northing} .= ": $h{easting}/$h{northing}\n\n"; + } } unless ( keys %reporters ) { die 'Report not going anywhere for ID ' . $row->id . '!'; } - if (! $sender_count) { + unless (@dear) { debug_print("can't send because sender count is zero", $row->id) if $debug_mode; next; } + if ($h{category} eq _('Other')) { + $h{category_footer} = _('this type of local problem'); + $h{category_line} = ''; + } else { + $h{category_footer} = "'" . $h{category} . "'"; + $h{category_line} = sprintf(_("Category: %s"), $h{category}) . "\n\n"; + } + + if ( $row->subcategory ) { + $h{subcategory_line} = sprintf(_("Subcategory: %s"), $row->subcategory) . "\n\n"; + } else { + $h{subcategory_line} = "\n\n"; + } + + $h{bodies_name} = join(_(' and '), @dear); + if ($h{category} eq _('Other')) { + $h{multiple} = @dear>1 ? "[ " . _("This email has been sent to both councils covering the location of the problem, as the user did not categorise it; please ignore it if you're not the correct council to deal with the issue, or let us know what category of problem this is so we can add it to our system.") . " ]\n\n" + : ''; + } else { + $h{multiple} = @dear>1 ? "[ " . _("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.") . " ]\n\n" + : ''; + } + $h{missing} = ''; + if ($missing) { + $h{missing} = '[ ' + . sprintf(_('We realise this problem might be the responsibility of %s; however, we don\'t currently have any contact details for them. If you know of an appropriate contact address, please do get in touch.'), $missing->name) + . " ]\n\n"; + } + if (mySociety::Config::get('STAGING_SITE') && !mySociety::Config::get('SEND_REPORTS_ON_STAGING')) { # on a staging server send emails to ourselves rather than the bodies - %reporters = map { $_ => $reporters{$_} } grep { /FixMyStreet::SendReport::(Email|NI|EmptyHomes)/ } keys %reporters; + %reporters = map { $_ => $reporters{$_} } grep { /FixMyStreet::SendReport::(Email|EmptyHomes)/ } keys %reporters; unless (%reporters) { %reporters = ( 'FixMyStreet::SendReport::Email' => FixMyStreet::SendReport::Email->new() ); } diff --git a/perllib/FixMyStreet/Geocode.pm b/perllib/FixMyStreet/Geocode.pm index b5be152a8..aac52fbaa 100644 --- a/perllib/FixMyStreet/Geocode.pm +++ b/perllib/FixMyStreet/Geocode.pm @@ -7,11 +7,17 @@ package FixMyStreet::Geocode; use strict; +use Digest::MD5 qw(md5_hex); +use Encode; +use File::Slurp; +use File::Path (); +use LWP::Simple qw($ua); use URI::Escape; use FixMyStreet::Geocode::Bing; use FixMyStreet::Geocode::Google; use FixMyStreet::Geocode::OSM; use FixMyStreet::Geocode::Zurich; +use Utils; # lookup STRING CONTEXT # Given a user-inputted string, try and convert it into co-ordinates using either @@ -21,6 +27,11 @@ use FixMyStreet::Geocode::Zurich; sub lookup { my ($s, $c) = @_; my $data = $c->cobrand->geocode_postcode($s); + if (defined $data->{latitude}) { + ( $data->{latitude}, $data->{longitude} ) = + map { Utils::truncate_coordinate($_) } + ( $data->{latitude}, $data->{longitude} ); + } $data = string($s, $c) unless $data->{error} || defined $data->{latitude}; $data->{error} = _('Sorry, we could not find that location.') @@ -55,4 +66,25 @@ sub escape { return $s; } +sub cache { + my ($type, $url, $args, $re) = @_; + my $cache_dir = FixMyStreet->config('GEO_CACHE') . $type . '/'; + my $cache_file = $cache_dir . md5_hex($url); + my $js; + if (-s $cache_file && -M $cache_file <= 7) { + $js = File::Slurp::read_file($cache_file); + } else { + $url .= '&' . $args if $args; + $ua->timeout(15); + $js = LWP::Simple::get($url); + $js = encode_utf8($js) if utf8::is_utf8($js); + File::Path::mkpath($cache_dir); + if ($js && (!$re || $js !~ $re)) { + File::Slurp::write_file($cache_file, $js); + } + } + $js = JSON->new->utf8->allow_nonref->decode($js) if $js; + return $js; +} + 1; diff --git a/perllib/FixMyStreet/Geocode/Bing.pm b/perllib/FixMyStreet/Geocode/Bing.pm index 702e19814..d7db10ae6 100644 --- a/perllib/FixMyStreet/Geocode/Bing.pm +++ b/perllib/FixMyStreet/Geocode/Bing.pm @@ -7,13 +7,8 @@ package FixMyStreet::Geocode::Bing; use strict; -use Encode; -use File::Slurp; -use File::Path (); -use LWP::Simple; -use Digest::MD5 qw(md5_hex); -use mySociety::Locale; +use Utils; # string STRING CONTEXT # Looks up on Bing Maps API, and caches, a user-inputted location. @@ -34,24 +29,10 @@ sub string { $url .= '&userLocation=' . $params->{centre} if $params->{centre}; $url .= '&c=' . $params->{bing_culture} if $params->{bing_culture}; - my $cache_dir = FixMyStreet->config('GEO_CACHE') . 'bing/'; - my $cache_file = $cache_dir . md5_hex($url); - my $js; - if (-s $cache_file) { - $js = File::Slurp::read_file($cache_file); - } else { - $url .= '&key=' . FixMyStreet->config('BING_MAPS_API_KEY'); - $js = LWP::Simple::get($url); - $js = encode_utf8($js) if utf8::is_utf8($js); - File::Path::mkpath($cache_dir); - File::Slurp::write_file($cache_file, $js) if $js; - } - + my $js = FixMyStreet::Geocode::cache('bing', $url, 'key=' . FixMyStreet->config('BING_MAPS_API_KEY')); if (!$js) { return { error => _('Sorry, we could not parse that location. Please try again.') }; } - - $js = JSON->new->utf8->allow_nonref->decode($js); if ($js->{statusCode} ne '200') { return { error => _('Sorry, we could not find that location.') }; } @@ -71,15 +52,14 @@ sub string { || $valid_locations[-1]{address}{locality} eq $_->{address}{locality} ); - ( $latitude, $longitude ) = @{ $_->{point}->{coordinates} }; - # These co-ordinates are output as query parameters in a URL, make sure they have a "." - mySociety::Locale::in_gb_locale { - push (@$error, { - address => $address, - latitude => sprintf('%0.6f', $latitude), - longitude => sprintf('%0.6f', $longitude) - }); - }; + ( $latitude, $longitude ) = + map { Utils::truncate_coordinate($_) } + @{ $_->{point}->{coordinates} }; + push (@$error, { + address => $address, + latitude => $latitude, + longitude => $longitude + }); push (@valid_locations, $_); } @@ -88,33 +68,15 @@ sub string { } sub reverse { - my ( $latitude, $longitude, $bing_culture, $cache ) = @_; + my ( $latitude, $longitude, $bing_culture ) = @_; # Get nearest road-type thing from Bing my $key = mySociety::Config::get('BING_MAPS_API_KEY', ''); if ($key) { my $url = "http://dev.virtualearth.net/REST/v1/Locations/$latitude,$longitude?key=$key"; $url .= '&c=' . $bing_culture if $bing_culture; - my $j; - if ( $cache ) { - my $cache_dir = FixMyStreet->config('GEO_CACHE') . 'bing/'; - my $cache_file = $cache_dir . md5_hex($url); - - if (-s $cache_file) { - $j = File::Slurp::read_file($cache_file); - } else { - $j = LWP::Simple::get($url); - File::Path::mkpath($cache_dir); - File::Slurp::write_file($cache_file, $j) if $j; - } - } else { - $j = LWP::Simple::get($url); - } - - if ($j) { - $j = JSON->new->utf8->allow_nonref->decode($j); - return $j; - } + my $j = FixMyStreet::Geocode::cache('bing', $url); + return $j if $j; } return undef; diff --git a/perllib/FixMyStreet/Geocode/FixaMinGata.pm b/perllib/FixMyStreet/Geocode/FixaMinGata.pm index 2ea92c422..3ad98b148 100644 --- a/perllib/FixMyStreet/Geocode/FixaMinGata.pm +++ b/perllib/FixMyStreet/Geocode/FixaMinGata.pm @@ -14,16 +14,11 @@ package FixMyStreet::Geocode::FixaMinGata; use warnings; use strict; -use Data::Dumper; -use Digest::MD5 qw(md5_hex); -use Encode; -use File::Slurp; -use File::Path (); -use LWP::Simple qw($ua); +use LWP::Simple; use Memcached; use XML::Simple; -use mySociety::Locale; +use Utils; my $osmapibase = "http://www.openstreetmap.org/api/"; my $nominatimbase = "http://nominatim.openstreetmap.org/"; @@ -45,8 +40,8 @@ sub string { my %query_params = ( q => $s, format => 'json', - addressdetails => 1, - limit => 20, + addressdetails => 1, + limit => 20, #'accept-language' => '', email => 'info' . chr(64) . 'morus.se', ); @@ -56,53 +51,32 @@ sub string { if $params->{country}; $url .= join('&', map { "$_=$query_params{$_}" } keys %query_params); - my $cache_dir = FixMyStreet->config('GEO_CACHE') . 'osm/'; - my $cache_file = $cache_dir . md5_hex($url); - my $js; - if (-s $cache_file) { - $js = File::Slurp::read_file($cache_file); - } else { - $ua->timeout(15); - $js = LWP::Simple::get($url); - $js = encode_utf8($js) if utf8::is_utf8($js); - File::Path::mkpath($cache_dir); - File::Slurp::write_file($cache_file, $js) if $js; - } - + my $js = FixMyStreet::Geocode::cache('osm', $url); if (!$js) { return { error => _('Sorry, we could not find that location.') }; } - $js = JSON->new->utf8->allow_nonref->decode($js); - my ( %locations, $error, @valid_locations, $latitude, $longitude ); foreach (@$js) { - # These co-ordinates are output as query parameters in a URL, make sure they have a "." - next if $_->{class} eq "boundary"; - - my @s = split(/,/, $_->{display_name}); - - my $address = join(",", @s[0,1,2]); - + next if $_->{class} eq "boundary"; + my @s = split(/,/, $_->{display_name}); + my $address = join(",", @s[0,1,2]); $locations{$address} = [$_->{lat}, $_->{lon}]; } - my ($key) = keys %locations; - - return { latitude => $locations{$key}[0], longitude => $locations{$key}[1] } if scalar keys %locations == 1; - return { error => _('Sorry, we could not find that location.') } if scalar keys %locations == 0; - - foreach $key (keys %locations) { - ( $latitude, $longitude ) = ($locations{$key}[0], $locations{$key}[1]); - mySociety::Locale::in_gb_locale { - push (@$error, { - address => $key, - latitude => sprintf('%0.6f', $latitude), - longitude => sprintf('%0.6f', $longitude) - }); - }; + foreach my $key (keys %locations) { + ( $latitude, $longitude ) = + map { Utils::truncate_coordinate($_) } + ($locations{$key}[0], $locations{$key}[1]); + push (@$error, { + address => $key, + latitude => $latitude, + longitude => $longitude + }); + push (@valid_locations, $_); } + return { latitude => $latitude, longitude => $longitude } if scalar @valid_locations == 1; return { error => $error }; } diff --git a/perllib/FixMyStreet/Geocode/Google.pm b/perllib/FixMyStreet/Geocode/Google.pm index 11ff8ef80..35fcec36f 100644 --- a/perllib/FixMyStreet/Geocode/Google.pm +++ b/perllib/FixMyStreet/Geocode/Google.pm @@ -7,12 +7,7 @@ package FixMyStreet::Geocode::Google; use strict; -use Encode; -use File::Slurp; -use File::Path (); -use LWP::Simple; -use Digest::MD5 qw(md5_hex); -use mySociety::Locale; +use Utils; # string STRING CONTEXT # Looks up on Google Maps API, and caches, a user-inputted location. @@ -24,6 +19,13 @@ sub string { my $params = $c->cobrand->disambiguate_location($s); + # For some reason adding gl=uk is no longer sufficient to make google + # think we are in the UK for some locations so we explictly add UK to + # the address. + if ($c->cobrand->country eq 'GB' && $s !~ /, *UK/ && $s !~ /united *kingdom$/) { + $s .= ', UK'; + } + $s = FixMyStreet::Geocode::escape($s); my $url = 'http://maps.google.com/maps/geo?q=' . $s; @@ -36,38 +38,11 @@ sub string { } $url .= '&hl=' . $params->{lang} if $params->{lang}; - my $cache_dir = FixMyStreet->config('GEO_CACHE') . 'google/'; - my $cache_file = $cache_dir . md5_hex($url); - my $js; - if (-s $cache_file) { - $js = File::Slurp::read_file($cache_file); - } else { - # For some reason adding gl=uk is no longer sufficient to make google - # think we are in the UK for some locations so we explictly add UK to - # the address. We do it here so as not to invalidate existing cache - # entries - if ( $c->cobrand->country eq 'GB' - && $url !~ /,\+UK/ - && $url !~ /united\++kingdom$/ ) - { - if ( $url =~ /&/ ) { - $url =~ s/&/,+UK&/; - } else { - $url .= ',+UK'; - } - } - $url .= '&sensor=false&key=' . FixMyStreet->config('GOOGLE_MAPS_API_KEY'); - $js = LWP::Simple::get($url); - $js = encode_utf8($js) if utf8::is_utf8($js); - File::Path::mkpath($cache_dir); - File::Slurp::write_file($cache_file, $js) if $js && $js !~ /"code":6[12]0/; - } - + my $args = 'sensor=false&key=' . FixMyStreet->config('GOOGLE_MAPS_API_KEY'); + my $js = FixMyStreet::Geocode::cache('google', $url, $args, qr/"code":6[12]0/); if (!$js) { return { error => _('Sorry, we could not parse that location. Please try again.') }; } - - $js = JSON->new->utf8->allow_nonref->decode($js); if ($js->{Status}->{code} ne '200') { return { error => _('Sorry, we could not find that location.') }; } @@ -78,15 +53,14 @@ sub string { next unless $_->{AddressDetails}->{Accuracy} >= 4; my $address = $_->{address}; next unless $c->cobrand->geocoded_string_check( $address ); - ( $longitude, $latitude ) = @{ $_->{Point}->{coordinates} }; - # These co-ordinates are output as query parameters in a URL, make sure they have a "." - mySociety::Locale::in_gb_locale { - push (@$error, { - address => $address, - latitude => sprintf('%0.6f', $latitude), - longitude => sprintf('%0.6f', $longitude) - }); - }; + ( $longitude, $latitude ) = + map { Utils::truncate_coordinate($_) } + @{ $_->{Point}->{coordinates} }; + push (@$error, { + address => $address, + latitude => $latitude, + longitude => $longitude + }); push (@valid_locations, $_); } return { latitude => $latitude, longitude => $longitude } if scalar @valid_locations == 1; diff --git a/perllib/FixMyStreet/Geocode/OSM.pm b/perllib/FixMyStreet/Geocode/OSM.pm index 919940f78..f165963d7 100644 --- a/perllib/FixMyStreet/Geocode/OSM.pm +++ b/perllib/FixMyStreet/Geocode/OSM.pm @@ -9,14 +9,10 @@ package FixMyStreet::Geocode::OSM; use warnings; use strict; -use Digest::MD5 qw(md5_hex); -use Encode; -use File::Slurp; -use File::Path (); -use LWP::Simple qw($ua); +use LWP::Simple; use Memcached; use XML::Simple; -use mySociety::Locale; +use Utils; my $osmapibase = "http://www.openstreetmap.org/api/"; my $nominatimbase = "http://nominatim.openstreetmap.org/"; @@ -47,36 +43,21 @@ sub string { if $params->{country}; $url .= join('&', map { "$_=$query_params{$_}" } keys %query_params); - my $cache_dir = FixMyStreet->config('GEO_CACHE') . 'osm/'; - my $cache_file = $cache_dir . md5_hex($url); - my $js; - if (-s $cache_file) { - $js = File::Slurp::read_file($cache_file); - } else { - $ua->timeout(15); - $js = LWP::Simple::get($url); - $js = encode_utf8($js) if utf8::is_utf8($js); - File::Path::mkpath($cache_dir); - File::Slurp::write_file($cache_file, $js) if $js; - } - + my $js = FixMyStreet::Geocode::cache('osm', $url); if (!$js) { return { error => _('Sorry, we could not find that location.') }; } - $js = JSON->new->utf8->allow_nonref->decode($js); - my ( $error, @valid_locations, $latitude, $longitude ); foreach (@$js) { - # These co-ordinates are output as query parameters in a URL, make sure they have a "." - ( $latitude, $longitude ) = ( $_->{lat}, $_->{lon} ); - mySociety::Locale::in_gb_locale { - push (@$error, { - address => $_->{display_name}, - latitude => sprintf('%0.6f', $latitude), - longitude => sprintf('%0.6f', $longitude) - }); - }; + ( $latitude, $longitude ) = + map { Utils::truncate_coordinate($_) } + ( $_->{lat}, $_->{lon} ); + push (@$error, { + address => $_->{display_name}, + latitude => $latitude, + longitude => $longitude + }); push (@valid_locations, $_); } diff --git a/perllib/FixMyStreet/Geocode/Zurich.pm b/perllib/FixMyStreet/Geocode/Zurich.pm index 1f0b4fc16..aad918b0e 100644 --- a/perllib/FixMyStreet/Geocode/Zurich.pm +++ b/perllib/FixMyStreet/Geocode/Zurich.pm @@ -15,7 +15,7 @@ use Digest::MD5 qw(md5_hex); use File::Path (); use Geo::Coordinates::CH1903; use Storable; -use mySociety::Locale; +use Utils; my ($soap, $method, $security); @@ -66,7 +66,7 @@ sub string { my $cache_dir = FixMyStreet->config('GEO_CACHE') . 'zurich/'; my $cache_file = $cache_dir . md5_hex($s); my $result; - if (-s $cache_file) { + if (-s $cache_file && -M $cache_file <= 7) { $result = retrieve($cache_file); } else { my $search = SOAP::Data->name('search' => $s)->type(''); @@ -92,14 +92,14 @@ sub string { my ( $error, @valid_locations, $latitude, $longitude ); foreach (@$results) { - ($latitude, $longitude) = Geo::Coordinates::CH1903::to_latlon($_->{easting}, $_->{northing}); - mySociety::Locale::in_gb_locale { - push (@$error, { - address => $_->{text}, - latitude => sprintf('%0.6f', $latitude), - longitude => sprintf('%0.6f', $longitude) - }); - }; + ($latitude, $longitude) = + map { Utils::truncate_coordinate($_) } + Geo::Coordinates::CH1903::to_latlon($_->{easting}, $_->{northing}); + push (@$error, { + address => $_->{text}, + latitude => $latitude, + longitude => $longitude + }); push (@valid_locations, $_); last if lc($_->{text}) eq lc($s); } diff --git a/perllib/FixMyStreet/Map.pm b/perllib/FixMyStreet/Map.pm index 7d490fde3..b050592ba 100644 --- a/perllib/FixMyStreet/Map.pm +++ b/perllib/FixMyStreet/Map.pm @@ -55,7 +55,7 @@ sub display_map { } sub map_features { - my ( $c, $lat, $lon, $interval ) = @_; + my ( $c, $lat, $lon, $interval, $category, $states ) = @_; # TODO - be smarter about calculating the surrounding square # use deltas that are roughly 500m in the UK - so we get a 1 sq km search box @@ -65,12 +65,12 @@ sub map_features { $c, $lat, $lon, $lon - $lon_delta, $lat - $lat_delta, $lon + $lon_delta, $lat + $lat_delta, - $interval + $interval, $category, $states ); } sub map_features_bounds { - my ( $c, $min_lon, $min_lat, $max_lon, $max_lat, $interval ) = @_; + my ( $c, $min_lon, $min_lat, $max_lon, $max_lat, $interval, $category, $states ) = @_; my $lat = ( $max_lat + $min_lat ) / 2; my $lon = ( $max_lon + $min_lon ) / 2; @@ -78,20 +78,21 @@ sub map_features_bounds { $c, $lat, $lon, $min_lon, $min_lat, $max_lon, $max_lat, - $interval + $interval, $category, + $states ); } sub _map_features { - my ( $c, $lat, $lon, $min_lon, $min_lat, $max_lon, $max_lat, $interval ) = @_; + my ( $c, $lat, $lon, $min_lon, $min_lat, $max_lon, $max_lat, $interval, $category, $states ) = @_; # list of problems around map can be limited, but should show all pins my $around_limit = $c->cobrand->on_map_list_limit || undef; my @around_args = ( $min_lat, $max_lat, $min_lon, $max_lon, $interval ); - my $around_map = $c->cobrand->problems->around_map( @around_args, undef ); + my $around_map = $c->cobrand->problems->around_map( @around_args, undef, $category, $states ); my $around_map_list = $around_limit - ? $c->cobrand->problems->around_map( @around_args, $around_limit ) + ? $c->cobrand->problems->around_map( @around_args, $around_limit, $category, $states ) : $around_map; my $dist; @@ -105,7 +106,7 @@ sub _map_features { my $limit = 20; my @ids = map { $_->id } @$around_map_list; my $nearby = $c->model('DB::Nearby')->nearby( - $c, $dist, \@ids, $limit, $lat, $lon, $interval + $c, $dist, \@ids, $limit, $lat, $lon, $interval, $category, $states ); return ( $around_map, $around_map_list, $nearby, $dist ); @@ -114,11 +115,15 @@ sub _map_features { sub map_pins { my ($c, $interval) = @_; - my $bbox = $c->req->param('bbox'); + my $bbox = $c->get_param('bbox'); my ( $min_lon, $min_lat, $max_lon, $max_lat ) = split /,/, $bbox; + my $category = $c->get_param('filter_category'); + + $c->forward( '/reports/stash_report_filter_status' ); + my $states = $c->stash->{filter_problem_states}; my ( $around_map, $around_map_list, $nearby, $dist ) = - FixMyStreet::Map::map_features_bounds( $c, $min_lon, $min_lat, $max_lon, $max_lat, $interval ); + FixMyStreet::Map::map_features_bounds( $c, $min_lon, $min_lat, $max_lon, $max_lat, $interval, $category, $states ); # create a list of all the pins my @pins = map { diff --git a/perllib/FixMyStreet/Map/Bing.pm b/perllib/FixMyStreet/Map/Bing.pm index 09c951a5f..4c1887641 100644 --- a/perllib/FixMyStreet/Map/Bing.pm +++ b/perllib/FixMyStreet/Map/Bing.pm @@ -1,25 +1,45 @@ # FixMyStreet:Map::Bing -# Bing maps on FixMyStreet. -# -# Copyright (c) 2010 UK Citizens Online Democracy. All rights reserved. -# Email: matthew@mysociety.org; WWW: http://www.mysociety.org/ +# Bing maps on FixMyStreet, using OpenLayers. package FixMyStreet::Map::Bing; +use base 'FixMyStreet::Map::OSM'; use strict; -# display_map C PARAMS -# PARAMS include: -# latitude, longitude for the centre point of the map -# CLICKABLE is set if the map is clickable -# PINS is array of pins to show, location and colour -sub display_map { - my ($self, $c, %params) = @_; - $c->stash->{map} = { - %params, - type => 'bing', - key => mySociety::Config::get('BING_MAPS_API_KEY'), - }; +# Is set by the JavaScript +sub map_type { '""' } + +sub map_template { 'bing' } + +sub copyright { '' } + +sub get_quadkey { + my ($self, $x, $y, $z) = @_; + my $key = ''; + for (my $i = $z; $i > 0; $i--) { + my $digit = 0; + my $mask = 1 << ($i - 1); + $digit++ if ($x & $mask) != 0; + $digit += 2 if ($y & $mask) != 0; + $key .= $digit; + } + return $key; +} + +sub map_tile_base { + '', "//ecn.%s.tiles.virtualearth.net/tiles/r%s.png?g=3467"; +} + +sub map_tiles { + my ( $self, %params ) = @_; + my ( $x, $y, $z ) = ( $params{x_tile}, $params{y_tile}, $params{zoom_act} ); + my ($tile_sep, $tile_base) = $self->map_tile_base; + return [ + sprintf($tile_base, 't0', $self->get_quadkey($x-1, $y-1, $z)), + sprintf($tile_base, 't1', $self->get_quadkey($x, $y-1, $z)), + sprintf($tile_base, 't2', $self->get_quadkey($x-1, $y, $z)), + sprintf($tile_base, 't3', $self->get_quadkey($x, $y, $z)), + ]; } 1; diff --git a/perllib/FixMyStreet/Map/FMS.pm b/perllib/FixMyStreet/Map/FMS.pm index 96e265a4d..50a21c125 100644 --- a/perllib/FixMyStreet/Map/FMS.pm +++ b/perllib/FixMyStreet/Map/FMS.pm @@ -5,35 +5,11 @@ # Email: matthew@mysociety.org; WWW: http://www.mysociety.org/ package FixMyStreet::Map::FMS; -use base 'FixMyStreet::Map::OSM'; +use base 'FixMyStreet::Map::Bing'; use strict; -# Is set by the JavaScript -sub map_type { - return '""'; -} - -sub map_template { - return 'fms'; -} - -sub copyright { - return ''; -} - -sub get_quadkey { - my ($x, $y, $z) = @_; - my $key = ''; - for (my $i = $z; $i > 0; $i--) { - my $digit = 0; - my $mask = 1 << ($i - 1); - $digit++ if ($x & $mask) != 0; - $digit += 2 if ($y & $mask) != 0; - $key .= $digit; - } - return $key; -} +sub map_template { 'fms' } sub map_tile_base { '-', "//%stilma.mysociety.org/sv/%d/%d/%d.png"; @@ -52,13 +28,14 @@ sub map_tiles { sprintf($tile_base, '', $z, $x, $y), ]; } else { - my $url = "g=701"; - $url .= "&productSet=mmOS" if $z > 10 && !$ni; + my $key = FixMyStreet->config('BING_MAPS_API_KEY'); + my $url = "g=3467"; + $url .= "&productSet=mmOS&key=$key" if $z > 10 && !$ni; return [ - "//ecn.t0.tiles.virtualearth.net/tiles/r" . get_quadkey($x-1, $y-1, $z) . ".png?$url", - "//ecn.t1.tiles.virtualearth.net/tiles/r" . get_quadkey($x, $y-1, $z) . ".png?$url", - "//ecn.t2.tiles.virtualearth.net/tiles/r" . get_quadkey($x-1, $y, $z) . ".png?$url", - "//ecn.t3.tiles.virtualearth.net/tiles/r" . get_quadkey($x, $y, $z) . ".png?$url", + "//ecn.t0.tiles.virtualearth.net/tiles/r" . $self->get_quadkey($x-1, $y-1, $z) . ".png?$url", + "//ecn.t1.tiles.virtualearth.net/tiles/r" . $self->get_quadkey($x, $y-1, $z) . ".png?$url", + "//ecn.t2.tiles.virtualearth.net/tiles/r" . $self->get_quadkey($x-1, $y, $z) . ".png?$url", + "//ecn.t3.tiles.virtualearth.net/tiles/r" . $self->get_quadkey($x, $y, $z) . ".png?$url", ]; } } diff --git a/perllib/FixMyStreet/Map/Google.pm b/perllib/FixMyStreet/Map/Google.pm index 172d2d60e..46823f358 100644 --- a/perllib/FixMyStreet/Map/Google.pm +++ b/perllib/FixMyStreet/Map/Google.pm @@ -35,12 +35,12 @@ sub display_map { $default_zoom = $numZoomLevels - 3 if $dist < 10; # Map centre may be overridden in the query string - $params{latitude} = Utils::truncate_coordinate($c->req->params->{lat} + 0) - if defined $c->req->params->{lat}; - $params{longitude} = Utils::truncate_coordinate($c->req->params->{lon} + 0) - if defined $c->req->params->{lon}; + $params{latitude} = Utils::truncate_coordinate($c->get_param('lat') + 0) + if defined $c->get_param('lat'); + $params{longitude} = Utils::truncate_coordinate($c->get_param('lon') + 0) + if defined $c->get_param('lon'); - my $zoom = defined $c->req->params->{zoom} ? $c->req->params->{zoom} + 0 : $default_zoom; + my $zoom = defined $c->get_param('zoom') ? $c->get_param('zoom') + 0 : $default_zoom; $zoom = $numZoomLevels - 1 if $zoom >= $numZoomLevels; $zoom = 0 if $zoom < 0; $params{zoom_act} = $zoomOffset + $zoom; diff --git a/perllib/FixMyStreet/Map/OSM.pm b/perllib/FixMyStreet/Map/OSM.pm index df2d16b82..7d91a9ee7 100644 --- a/perllib/FixMyStreet/Map/OSM.pm +++ b/perllib/FixMyStreet/Map/OSM.pm @@ -39,7 +39,7 @@ sub base_tile_url { } sub copyright { - return _('Map © <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>'); + _('© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors'); } # display_map C PARAMS @@ -64,12 +64,12 @@ sub display_map { $default_zoom = $numZoomLevels - 3 if $dist < 10; # Map centre may be overridden in the query string - $params{latitude} = Utils::truncate_coordinate($c->req->params->{lat} + 0) - if defined $c->req->params->{lat}; - $params{longitude} = Utils::truncate_coordinate($c->req->params->{lon} + 0) - if defined $c->req->params->{lon}; + $params{latitude} = Utils::truncate_coordinate($c->get_param('lat') + 0) + if defined $c->get_param('lat'); + $params{longitude} = Utils::truncate_coordinate($c->get_param('lon') + 0) + if defined $c->get_param('lon'); - my $zoom = defined $c->req->params->{zoom} ? $c->req->params->{zoom} + 0 : $default_zoom; + my $zoom = defined $c->get_param('zoom') ? $c->get_param('zoom') + 0 : $default_zoom; $zoom = $numZoomLevels - 1 if $zoom >= $numZoomLevels; $zoom = 0 if $zoom < 0; $params{zoom_act} = $zoomOffset + $zoom; @@ -168,7 +168,7 @@ sub click_to_wgs84 { my ($self, $c, $pin_tile_x, $pin_x, $pin_tile_y, $pin_y) = @_; my $tile_x = click_to_tile($pin_tile_x, $pin_x); my $tile_y = click_to_tile($pin_tile_y, $pin_y); - my $zoom = MIN_ZOOM_LEVEL + (defined $c->req->params->{zoom} ? $c->req->params->{zoom} : 3); + my $zoom = MIN_ZOOM_LEVEL + (defined $c->get_param('zoom') ? $c->get_param('zoom') : 3); my ($lat, $lon) = tile_to_latlon($tile_x, $tile_y, $zoom); return ( $lat, $lon ); } diff --git a/perllib/FixMyStreet/Map/OSM/MapQuest.pm b/perllib/FixMyStreet/Map/OSM/MapQuest.pm index 2c3cbaf00..4fc8ba57d 100644 --- a/perllib/FixMyStreet/Map/OSM/MapQuest.pm +++ b/perllib/FixMyStreet/Map/OSM/MapQuest.pm @@ -33,4 +33,8 @@ sub base_tile_url { return 'mqcdn.com/tiles/1.0.0/map/'; } +sub copyright { + 'Data, imagery and map information provided by <a href="http://www.mapquest.com/">MapQuest</a> <img src="http://developer.mapquest.com/content/osm/mq_logo.png" />, <a href="http://openstreetmap.org/">OpenStreetMap</a> and contributors, <a href="http://opendatacommons.org/licenses/odbl/">ODbL</a>' +} + 1; diff --git a/perllib/FixMyStreet/Map/OSM/StreetView.pm b/perllib/FixMyStreet/Map/OSM/StreetView.pm index c70dd93aa..87c335dd6 100644 --- a/perllib/FixMyStreet/Map/OSM/StreetView.pm +++ b/perllib/FixMyStreet/Map/OSM/StreetView.pm @@ -22,6 +22,7 @@ sub base_tile_url { } sub copyright { + 'Contains OS data © Crown copyright and database right 2013'; } 1; diff --git a/perllib/FixMyStreet/Map/OSM/TonerLite.pm b/perllib/FixMyStreet/Map/OSM/TonerLite.pm new file mode 100644 index 000000000..543cd6002 --- /dev/null +++ b/perllib/FixMyStreet/Map/OSM/TonerLite.pm @@ -0,0 +1,38 @@ +#!/usr/bin/perl +# +# FixMyStreet:Map::OSM::TonerLite +# OSM TonerLite maps on FixMyStreet. +# +# Map tiles by <http://stamen.com> Stamen Design, +# under <http://creativecommons.org/licenses/by/3.0>CC BY 3.0. +# Data by <http://openstreetmap.org> OpenStreetMap, +# under <http://www.openstreetmap.org/copyright> ODbL. +# +# Copyright (c) 2014 UK Citizens Online Democracy. All rights reserved. +# Email: hakim@mysociety.org; WWW: http://www.mysociety.org/ + +package FixMyStreet::Map::OSM::TonerLite; +use base 'FixMyStreet::Map::OSM'; + +use strict; + +sub map_type { 'OpenLayers.Layer.Stamen' } + +sub map_template { 'osm-toner-lite' } + +sub copyright { + 'Map tiles by <a href="http://stamen.com">Stamen Design</a>, under <a href="http://creativecommons.org/licenses/by/3.0">CC BY 3.0</a>. Data by <a href="http://openstreetmap.org">OpenStreetMap</a>, under <a href="http://www.openstreetmap.org/copyright">ODbL</a>.' +} + +sub map_tiles { + my ( $self, %params ) = @_; + my ( $x, $y, $z ) = ( $params{x_tile}, $params{y_tile}, $params{zoom_act} ); + return [ + "https://stamen-tiles-a.a.ssl.fastly.net/toner-lite/$z/" . ($x - 1) . "/" . ($y - 1) . ".png", + "https://stamen-tiles-b.a.ssl.fastly.net/toner-lite/$z/$x/" . ($y - 1) . ".png", + "https://stamen-tiles-c.a.ssl.fastly.net/toner-lite/$z/" . ($x - 1) . "/$y.png", + "https://stamen-tiles-d.a.ssl.fastly.net/toner-lite/$z/$x/$y.png", + ]; +} + +1; diff --git a/perllib/FixMyStreet/Map/Zurich.pm b/perllib/FixMyStreet/Map/Zurich.pm index d667a4701..9b01f2978 100644 --- a/perllib/FixMyStreet/Map/Zurich.pm +++ b/perllib/FixMyStreet/Map/Zurich.pm @@ -45,13 +45,13 @@ sub display_map { my ($self, $c, %params) = @_; # Map centre may be overridden in the query string - $params{latitude} = Utils::truncate_coordinate($c->req->params->{lat} + 0) - if defined $c->req->params->{lat}; - $params{longitude} = Utils::truncate_coordinate($c->req->params->{lon} + 0) - if defined $c->req->params->{lon}; + $params{latitude} = Utils::truncate_coordinate($c->get_param('lat') + 0) + if defined $c->get_param('lat'); + $params{longitude} = Utils::truncate_coordinate($c->get_param('lon') + 0) + if defined $c->get_param('lon'); - my $zoom = defined $c->req->params->{zoom} - ? $c->req->params->{zoom} + 0 + my $zoom = defined $c->get_param('zoom') + ? $c->get_param('zoom') + 0 : $c->stash->{page} eq 'report' ? DEFAULT_ZOOM+1 : DEFAULT_ZOOM; @@ -159,7 +159,7 @@ sub click_to_wgs84 { my ($self, $c, $pin_tile_x, $pin_x, $pin_tile_y, $pin_y) = @_; my $tile_x = click_to_tile($pin_tile_x, $pin_x); my $tile_y = click_to_tile($pin_tile_y, $pin_y); - my $zoom = (defined $c->req->params->{zoom} ? $c->req->params->{zoom} : DEFAULT_ZOOM); + my $zoom = (defined $c->get_param('zoom') ? $c->get_param('zoom') : DEFAULT_ZOOM); my ($lat, $lon) = tile_to_latlon($tile_x, $tile_y, $zoom); return ( $lat, $lon ); } diff --git a/perllib/FixMyStreet/Roles/Extra.pm b/perllib/FixMyStreet/Roles/Extra.pm new file mode 100644 index 000000000..f815a3e9a --- /dev/null +++ b/perllib/FixMyStreet/Roles/Extra.pm @@ -0,0 +1,193 @@ +package FixMyStreet::Roles::Extra; +use Moose::Role; + +=head1 NAME + +FixMyStreet::Roles::Extra - role for accessing {extra} field + +=head1 SYNOPSIS + +This is to applied to a DB class like Problem or Contacts that has a rich {extra} field: + + use Moose; + with 'FixMyStreet::Roles::Extra'; + +(NB: there is actually a little more boilerplate, because DBIC doesn't actually +inherit from Moose, see ::Problem for an example.) + +Then: + + $contact->set_extra_fields( + { name => 'pothole_size', ... }, + { name => 'pothole_shape, ... } ); + my $metas = $contact->get_extra_fields(); + +And + + # e.g. for sites like Zurich (but handled gracefully otherwise) + $problem->set_extra_metadata( overdue => 1 ); + if ($problem->get_extra_metadata( 'overdue')) { ... } + +=head1 METHODS + +=head2 set_extra_metadata + + $problem->set_extra_metadata( overdue => 1); + +=cut + +sub set_extra_metadata { + my ($self, $key, $value) = @_; + my $extra = $self->get_extra(); + + $self->extra({ %$extra, $key => $value }); +}; + +=head2 set_extra_metadata_if_undefined + + $problem->set_extra_metadata_if_undefined( overdue => 1); + # as above, but won't set if, for example 'overdue' is already set to 0 + +=cut + +sub set_extra_metadata_if_undefined { + my ($self, $key, $value) = @_; + my $extra = $self->get_extra(); + + return if defined $extra->{$key}; + $self->extra({ %$extra, $key => $value }); +}; + +=head2 unset_extra_metadata + + $contact->unset_extra_metadata('photo_required'); + +=cut + +sub unset_extra_metadata { + my ($self, $key) = @_; + my $extra = $self->get_extra(); + + return 1 unless exists $extra->{$key}; + delete $extra->{$key}; + $self->extra($extra); +}; + +=head2 get_extra_metadata + + my $overdue = $problem->get_extra_metadata('overdue'); + +=cut + +sub get_extra_metadata { + my ($self, $key) = @_; + my $extra = $self->get_extra(); + + return $extra->{$key}; +}; + +=head2 get_extra_metadata_as_hashref + + my $hashref = $contact->get_extra_metadata_as_hashref(); + +=cut + +my $META_FIELD = '_fields'; + +sub get_extra_metadata_as_hashref { + my ($self) = @_; + my $extra = $self->get_extra(); + + my %extra = %$extra; + delete $extra{$META_FIELD}; + return \%extra; +} + +=head2 get_extra_fields + + my $metas = $problem->get_extra_fields(); + +=cut + +sub get_extra_fields { + my ($self) = @_; + my $extra = $self->get_extra(); + + return $extra->{$META_FIELD} ||= do { + my $metas = []; + $self->extra({ %$extra, $META_FIELD => $metas }); + $metas; + }; +} + +=head2 set_extra_fields + + $problem->set_extra_fields( { ... }, { ... } ); + +=cut + +sub set_extra_fields { + my ($self, @fields) = @_; + my $extra = $self->get_extra(); + + $self->extra({ %$extra, $META_FIELD => \@fields }); +} + +=head2 push_extra_fields + + $problem->push_extra_fields( { ... } ); + +like set_extra_fields, but pushes the new fields onto the end of the existing list. + +=cut + +sub push_extra_fields { + my ($self, @fields) = @_; + my $extra = $self->get_extra(); + + my $existing = $self->get_extra_fields; + + $self->extra({ %$extra, $META_FIELD => [ @$existing, @fields ] }); +} + +=head1 HELPER METHODS + +For internal use mostly. + +=head2 dirty_extra + +Set the extra field as dirty. (e.g. signalling that the DB object should be +updated). + +=cut + +sub dirty_extra { + my $self = shift; + $self->make_column_dirty('extra'); + return 1; +} + +=head2 get_extra + +Get the extra data. If this is not set, then returns a {} + +=cut + +sub get_extra { + my ($self) = @_; + my $extra = $self->extra or do { + my $extra = {}; + $self->extra({}); + return $extra; + }; + + if (ref $extra eq 'ARRAY') { + # upgrade layout transparently + $extra = { $META_FIELD => $extra }; + $self->extra($extra); + } + + return $extra; +} + +1; diff --git a/perllib/FixMyStreet/SendReport.pm b/perllib/FixMyStreet/SendReport.pm index 40e76ef72..9967b0663 100644 --- a/perllib/FixMyStreet/SendReport.pm +++ b/perllib/FixMyStreet/SendReport.pm @@ -23,8 +23,7 @@ sub should_skip { return 0 unless $row->send_fail_count; - my $tz = DateTime::TimeZone->new( name => 'local' ); - my $now = DateTime->now( time_zone => $tz ); + my $now = DateTime->now( time_zone => FixMyStreet->local_time_zone ); my $diff = $now - $row->send_fail_timestamp; my $backoff = $row->send_fail_count > 1 ? 30 : 5; diff --git a/perllib/FixMyStreet/SendReport/Email.pm b/perllib/FixMyStreet/SendReport/Email.pm index 4507091c7..fa4d437fb 100644 --- a/perllib/FixMyStreet/SendReport/Email.pm +++ b/perllib/FixMyStreet/SendReport/Email.pm @@ -18,9 +18,6 @@ sub build_recipient_list { my ($body_email, $confirmed, $note) = ( $contact->email, $contact->confirmed, $contact->note ); - $body_email = essex_contact($row->latitude, $row->longitude) if $body->areas->{2225}; - $body_email = oxfordshire_contact($row->latitude, $row->longitude) if $body->areas->{2237} && $body_email eq 'SPECIAL'; - unless ($confirmed) { $all_confirmed = 0; $note = 'Body ' . $row->bodies_str . ' deleted' @@ -112,30 +109,6 @@ sub send { return $result; } -# Essex has different contact addresses depending upon the district -# Might be easier if we start storing in the db all areas covered by a point -# Will do for now :) -sub essex_contact { - my $district = _get_district_for_contact(@_); - my $email; - $email = 'eastarea' if $district == 2315 || $district == 2312; - $email = 'midarea' if $district == 2317 || $district == 2314 || $district == 2316; - $email = 'southarea' if $district == 2319 || $district == 2320 || $district == 2310; - $email = 'westarea' if $district == 2309 || $district == 2311 || $district == 2318 || $district == 2313; - die "Returned district $district which is not in Essex!" unless $email; - return "highways.$email\@essexcc.gov.uk"; -} - -# Oxfordshire has different contact addresses depending upon the district -sub oxfordshire_contact { - my $district = _get_district_for_contact(@_); - my $email; - $email = 'northernarea' if $district == 2419 || $district == 2420 || $district == 2421; - $email = 'southernarea' if $district == 2417 || $district == 2418; - die "Returned district $district which is not in Oxfordshire!" unless $email; - return "$email\@oxfordshire.gov.uk"; -} - sub _get_district_for_contact { my ( $lat, $lon ) = @_; my $district = diff --git a/perllib/FixMyStreet/SendReport/London.pm b/perllib/FixMyStreet/SendReport/London.pm deleted file mode 100644 index 2a1ebc1c3..000000000 --- a/perllib/FixMyStreet/SendReport/London.pm +++ /dev/null @@ -1,113 +0,0 @@ -package FixMyStreet::SendReport::London; - -use Moose; - -BEGIN { extends 'FixMyStreet::SendReport'; } - -use Digest::MD5; -use FindBin; -use LWP::UserAgent; -use LWP::Simple; - -use Utils; - -sub construct_message { - my %h = @_; - return <<EOF, -A user of FixMyStreet has submitted the following report of a local -problem that they believe might require your attention. - -Subject: $h{title} - -Details: $h{detail} - -$h{fuzzy}, or to provide an update on the problem, please visit the -following link: - -$h{url} - -$h{closest_address} -Yours, -The FixMyStreet team -EOF -} - -sub send { - return if mySociety::Config::get('STAGING_SITE'); - my ( $self, $row, $h ) = @_; - - $h->{message} = construct_message( %$h ); - my $phone = $h->{phone}; - my $mobile = ''; - if ($phone && $phone =~ /^\s*07/) { - $mobile = $phone; - $phone = ''; - } - my ($first, $last) = $h->{name} =~ /^(\S*)(?: (.*))?$/; - my %params = ( - Key => mySociety::Config::get('LONDON_REPORTIT_KEY'), - Signature => Digest::MD5::md5_hex( $h->{confirmed} . mySociety::Config::get('LONDON_REPORTIT_SECRET') ), - Type => Utils::london_categories()->{$h->{category}}, - RequestDate => $h->{confirmed}, - RequestMethod => 'Web', - ExternalId => $h->{url}, - 'Customer.Title' => '', - 'Customer.FirstName' => $first, - 'Customer.Surname' => $last, - 'Customer.Email' => $h->{email}, - 'Customer.Phone' => $phone, - 'Customer.Mobile' => $mobile, - 'ProblemDescription' => $h->{message}, - ); - if ($h->{used_map}) { - $params{'Location.Latitude'} = $h->{latitude}; - $params{'Location.Longitude'} = $h->{longitude}; - } elsif (mySociety::PostcodeUtil::is_valid_postcode($h->{query})) { - # Didn't use map, and entered postcode, so use that. - $params{'Location.Postcode'} = $h->{query}; - } else { - # Otherwise, lat/lon is all we have, even if it's wrong. - $params{'Location.Latitude'} = $h->{latitude}; - $params{'Location.Longitude'} = $h->{longitude}; - } - if ($h->{has_photo}) { - $params{'Document1.Name'} = 'Photograph'; - $params{'Document1.MimeType'} = 'image/jpeg'; - $params{'Document1.URL'} = $h->{image_url}; - $params{'Document1.URLPublic'} = 'true'; - } - my $browser = LWP::UserAgent->new; - my $response = $browser->post( mySociety::Config::get('LONDON_REPORTIT_URL'), \%params ); - my $out = $response->content; - if ($response->code ne 200) { - $self->error( "Failed to post $h->{id} to London API, response was " . $response->code . " $out" ); - return 1; - } - my ($id) = $out =~ /<caseid>(.*?)<\/caseid>/; - my ($org) = $out =~ /<organisation>(.*?)<\/organisation>/; - my ($team) = $out =~ /<team>(.*?)<\/team>/; - - $org = london_lookup($org); - $row->external_id( $id ); - $row->external_body( $org ); - $row->external_team( $team ); - $self->success(1); - return 0; -} - -sub london_lookup { - my $org = shift || ''; - my $str = "Unknown ($org)"; - open(FP, "$FindBin::Bin/../data/dft.csv"); - while (<FP>) { - /^(.*?),(.*)/; - if ($org eq $1) { - $str = $2; - last; - } - } - close FP; - return $str; -} - -1; diff --git a/perllib/FixMyStreet/SendReport/NI.pm b/perllib/FixMyStreet/SendReport/NI.pm deleted file mode 100644 index c60643566..000000000 --- a/perllib/FixMyStreet/SendReport/NI.pm +++ /dev/null @@ -1,37 +0,0 @@ -package FixMyStreet::SendReport::NI; - -use Moose; - -BEGIN { extends 'FixMyStreet::SendReport::Email'; } - -sub build_recipient_list { - my ( $self, $row, $h ) = @_; - - my $all_confirmed = 1; - foreach my $body ( @{ $self->bodies } ) { - my $contact = FixMyStreet::App->model("DB::Contact")->find( { - deleted => 0, - body_id => $body->id, - category => $row->category - } ); - - my ($email, $confirmed, $note) = ( $contact->email, $contact->confirmed, $contact->note ); - - unless ($confirmed) { - $all_confirmed = 0; - $email = 'N/A' unless $email; - } - - my $name = $body->name; - if ( $email =~ /^roads.([^@]*)\@drdni/ ) { - $name = "Roads Service (\u$1)"; - $h->{bodies_name} = $name; - $row->external_body( 'Roads Service' ); - } - push @{ $self->to }, [ $email, $name ]; - } - - return $all_confirmed && @{$self->to}; -} - -1; diff --git a/perllib/FixMyStreet/SendReport/Open311.pm b/perllib/FixMyStreet/SendReport/Open311.pm index c064eeef5..fa216466e 100644 --- a/perllib/FixMyStreet/SendReport/Open311.pm +++ b/perllib/FixMyStreet/SendReport/Open311.pm @@ -13,6 +13,7 @@ use Readonly; Readonly::Scalar my $COUNCIL_ID_OXFORDSHIRE => 2237; Readonly::Scalar my $COUNCIL_ID_WARWICKSHIRE => 2243; +Readonly::Scalar my $COUNCIL_ID_GREENWICH => 2493; sub send { my $self = shift; @@ -37,7 +38,7 @@ sub send { $revert = 1; - my $extra = $row->extra; + my $extra = $row->get_extra_fields(); if ( $row->used_map || ( !$row->used_map && !$row->postcode ) ) { push @$extra, { name => 'northing', value => $h->{northing} }; push @$extra, { name => 'easting', value => $h->{easting} }; @@ -49,33 +50,31 @@ sub send { push @$extra, { name => 'email_alerts_requested', value => 'FALSE' }; # always false as can never request them push @$extra, { name => 'requested_datetime', value => DateTime::Format::W3CDTF->format_datetime($row->confirmed->set_nanosecond(0)) }; push @$extra, { name => 'email', value => $row->user->email }; - $row->extra( $extra ); - - $always_send_latlong = 0; - $send_notpinpointed = 1; - $use_service_as_deviceid = 0; - # make sure we have last_name attribute present in row's extra, so # it is passed correctly to Bromley as attribute[] if ( $row->cobrand ne 'bromley' ) { my ( $firstname, $lastname ) = ( $row->name =~ /(\w+)\.?\s+(.+)/ ); push @$extra, { name => 'last_name', value => $lastname }; } + $row->set_extra_fields( @$extra ); + $always_send_latlong = 0; + $send_notpinpointed = 1; + $use_service_as_deviceid = 0; $extended_desc = 0; } # extra Oxfordshire fields: send nearest street, postcode, northing and easting, and the FMS id if ( $row->bodies_str =~ /\b(?:$COUNCIL_ID_OXFORDSHIRE|$COUNCIL_ID_WARWICKSHIRE)\b/ ) { - my $extra = $row->extra; + my $extra = $row->get_extra_fields; push @$extra, { name => 'external_id', value => $row->id }; push @$extra, { name => 'closest_address', value => $h->{closest_address} } if $h->{closest_address}; if ( $row->used_map || ( !$row->used_map && !$row->postcode ) ) { push @$extra, { name => 'northing', value => $h->{northing} }; push @$extra, { name => 'easting', value => $h->{easting} }; } - $row->extra( $extra ); + $row->set_extra_fields( @$extra ); if ($row->bodies_str =~ /$COUNCIL_ID_OXFORDSHIRE/) { $extended_desc = 'oxfordshire'; @@ -129,9 +128,9 @@ sub send { $revert = 1; } - if ($row->cobrand eq 'fixmybarangay') { - # FixMyBarangay endpoints expect external_id as an attribute, as do Oxfordshire - $row->extra( [ { 'name' => 'external_id', 'value' => $row->id } ] ); + if ($row->cobrand eq 'fixmybarangay' || $row->bodies_str =~ /$COUNCIL_ID_GREENWICH/) { + # FixMyBarangay endpoints expect external_id as an attribute, as do Greenwich + $row->set_extra_fields( { 'name' => 'external_id', 'value' => $row->id } ); $revert = 1; } diff --git a/perllib/FixMyStreet/SendReport/Refused.pm b/perllib/FixMyStreet/SendReport/Refused.pm new file mode 100644 index 000000000..d71fc5c2c --- /dev/null +++ b/perllib/FixMyStreet/SendReport/Refused.pm @@ -0,0 +1,7 @@ +package FixMyStreet::SendReport::Refused; + +use Moose; + +BEGIN { extends 'FixMyStreet::SendReport::Noop'; } + +1; diff --git a/perllib/FixMyStreet/TestMech.pm b/perllib/FixMyStreet/TestMech.pm index 72a6810bc..bd2ca4096 100644 --- a/perllib/FixMyStreet/TestMech.pm +++ b/perllib/FixMyStreet/TestMech.pm @@ -151,23 +151,21 @@ sub delete_user { ->find( { email => $email_or_user } ); # If no user found we can't delete them - if ( !$user ) { - ok( 1, "No user found to delete" ); - return 1; - } + return 1 unless $user; + + $mech->get('/auth/sign_out'); - $mech->log_out_ok; for my $p ( $user->problems ) { - ok( $_->delete, "delete comment " . $_->text ) for $p->comments; - ok( $_->delete, "delete questionnaire " . $_->id ) for $p->questionnaires; - ok( $p->delete, "delete problem " . $p->title ); + $p->comments->delete; + $p->questionnaires->delete; + $p->delete; } for my $a ( $user->alerts ) { $a->alerts_sent->delete; - ok( $a->delete, "delete alert " . $a->alert_type ); + $a->delete; } - ok( $_->delete, "delete comment " . $_->text ) for $user->comments; - ok $user->delete, "delete test user " . $user->email; + $_->delete for $user->comments; + $user->delete; return 1; } @@ -322,6 +320,7 @@ sub extract_problem_meta { my $result = scraper { process 'div#side p em', 'meta', 'TEXT'; process '.problem-header p em', 'meta', 'TEXT'; + process '.problem-header p.report_meta_info', 'meta', 'TEXT'; } ->scrape( $mech->response ); @@ -559,6 +558,21 @@ sub delete_problems_for_body { } } +sub create_contact_ok { + my $self = shift; + my %contact_params = ( + confirmed => 1, + deleted => 0, + editor => 'Test', + whenedited => \'current_timestamp', + note => 'Created for test', + @_ + ); + my $contact = FixMyStreet::App->model('DB::Contact')->find_or_create( \%contact_params ); + ok $contact, 'found/created contact ' . $contact->category;; + return $contact; +} + sub create_body_ok { my $self = shift; my ( $area_id, $name, %extra ) = @_; diff --git a/perllib/Open311.pm b/perllib/Open311.pm index c02618725..58ae96bc2 100644 --- a/perllib/Open311.pm +++ b/perllib/Open311.pm @@ -150,19 +150,15 @@ sub _populate_service_request_params { $params->{deviceid} = $problem->service; } - if ( $problem->extra ) { - my $extras = $problem->extra; - - for my $attr ( @$extras ) { - my $attr_name = $attr->{name}; - if ( $attr_name eq 'first_name' || $attr_name eq 'last_name' ) { - $params->{$attr_name} = $attr->{value} if $attr->{value}; - next if $attr_name eq 'first_name'; - } - $attr_name =~ s/fms_extra_//; - my $name = sprintf( 'attribute[%s]', $attr_name ); - $params->{ $name } = $attr->{value}; + for my $attr ( @{$problem->get_extra_fields} ) { + my $attr_name = $attr->{name}; + if ( $attr_name eq 'first_name' || $attr_name eq 'last_name' ) { + $params->{$attr_name} = $attr->{value} if $attr->{value}; + next if $attr_name eq 'first_name'; } + $attr_name =~ s/fms_extra_//; + my $name = sprintf( 'attribute[%s]', $attr_name ); + $params->{ $name } = $attr->{value}; } return $params; diff --git a/perllib/Open311/PopulateServiceList.pm b/perllib/Open311/PopulateServiceList.pm index 0f6e32893..e4f0b8357 100644 --- a/perllib/Open311/PopulateServiceList.pm +++ b/perllib/Open311/PopulateServiceList.pm @@ -265,11 +265,7 @@ sub _add_meta_to_contact { @meta = grep { ! $ignore{ $_->{ code } } } @meta; } - if ( @meta ) { - $contact->extra( \@meta ); - } else { - $contact->extra( undef ); - } + $contact->set_extra_fields(@meta); $contact->update; } diff --git a/perllib/Utils.pm b/perllib/Utils.pm index 7f95d1f5a..21a7311f2 100644 --- a/perllib/Utils.pm +++ b/perllib/Utils.pm @@ -25,12 +25,13 @@ Takes the WGS84 latitude and longitude and returns OSGB36 easting and northing. =cut sub convert_latlon_to_en { - my ( $latitude, $longitude ) = @_; + my ( $latitude, $longitude, $coordsyst ) = @_; + $coordsyst ||= 'G'; local $SIG{__WARN__} = sub { die $_[0] }; my ( $easting, $northing ) = mySociety::Locale::in_gb_locale { - mySociety::GeoUtil::wgs84_to_national_grid( $latitude, $longitude, 'G' ); + mySociety::GeoUtil::wgs84_to_national_grid( $latitude, $longitude, $coordsyst ); }; return ( $easting, $northing ); @@ -90,35 +91,6 @@ sub truncate_coordinate { return $out; } -sub london_categories { - return { - 'Abandoned vehicle' => 'AbandonedVehicle', - 'Car parking' => 'Parking', - 'Dangerous structure' => 'DangerousStructure', - 'Dead animal' => 'DeadAnimal', - 'Dumped cylinder' => 'DumpedCylinder', - 'Dumped rubbish' => 'DumpedRubbish', - 'Flyposting' => 'FlyPosting', - 'Graffiti' => 'Graffiti', - 'Litter bin' => 'LitterBin', - 'Public toilet' => 'PublicToilet', - 'Refuse collection' => 'RefuseCollection', - 'Road or pavement defect' => 'Road', - 'Road or pavement obstruction' => 'Obstruction', - 'Skip problem' => 'Skip', - 'Street cleaning' => 'StreetCleaning', - 'Street drainage' => 'StreetDrainage', - 'Street furniture' => 'StreetFurniture', - 'Street needs gritting' => 'StreetGritting', - 'Street lighting' => 'StreetLighting', - 'Street sign' => 'StreetSign', - 'Traffic light' => 'TrafficLight', - 'Tree (dangerous)' => 'DangerousTree', - 'Tree (fallen branches)' => 'FallenTree', - 'Untaxed vehicle' => 'UntaxedVehicle', - }; -} - sub barnet_categories { # The values here are KBIDs from Barnet's system: see bin/send-reports for formatting. # They are no longer used since Barnet switched to email for delivery of problem reports. @@ -225,7 +197,7 @@ sub prettify_dt { $type ||= ''; $type = 'short' if $type eq '1'; - my $now = DateTime->now( time_zone => FixMyStreet->config('TIME_ZONE') || 'local' ); + my $now = DateTime->now( time_zone => FixMyStreet->time_zone || FixMyStreet->local_time_zone ); my $tt = ''; return "[unknown time]" unless ref $dt; diff --git a/t/MapIt.pm b/t/MapIt.pm new file mode 100644 index 000000000..ebef934e1 --- /dev/null +++ b/t/MapIt.pm @@ -0,0 +1,36 @@ +package t::MapIt; + +use JSON; +use Web::Simple; + +use mySociety::Locale; + +has json => ( + is => 'lazy', + default => sub { + JSON->new->pretty->allow_blessed->convert_blessed; + }, +); + +sub dispatch_request { + my $self = shift; + + sub (GET + /postcode/*) { + my ($self, $postcode) = @_; + my $response = $self->postcode($postcode); + # We must make sure we output correctly for testing purposes, we might + # be within a different locale here... + my $json = mySociety::Locale::in_gb_locale { + $self->json->encode($response) }; + return [ 200, [ 'Content-Type' => 'application/json' ], [ $json ] ]; + }, +} + +sub postcode { + my ($self, $postcode) = @_; + return { + wgs84_lat => 51.5, wgs84_lon => 2.1, postcode => $postcode, + }; +} + +__PACKAGE__->run_if_script; diff --git a/t/Nominatim.pm b/t/Nominatim.pm new file mode 100644 index 000000000..2041b4677 --- /dev/null +++ b/t/Nominatim.pm @@ -0,0 +1,37 @@ +package t::Nominatim; + +use JSON; +use Web::Simple; + +has json => ( + is => 'lazy', + default => sub { + JSON->new->pretty->allow_blessed->convert_blessed; + }, +); + +sub dispatch_request { + my $self = shift; + + sub (GET + /search + ?q=) { + my ($self, $q) = @_; + my $response = $self->query($q); + my $json = $self->json->encode($response); + return [ 200, [ 'Content-Type' => 'application/json' ], [ $json ] ]; + }, +} + +sub query { + my ($self, $q) = @_; + if ($q eq 'high street') { + return [ + {"osm_type"=>"way","osm_id"=>"4684282","lat"=>"55.9504009","lon"=>"-3.1858425","display_name"=>"High Street, Old Town, City of Edinburgh, Scotland, EH1 1SP, United Kingdom","class"=>"highway","type"=>"tertiary","importance"=>0.55892577838734}, + {"osm_type"=>"node","osm_id"=>"27424410","lat"=>"55.8596449","lon"=>"-4.240377","display_name"=>"High Street, Collegelands, Merchant City, Glasgow, Glasgow City, Scotland, G, United Kingdom","class"=>"railway","type"=>"station","importance"=>0.53074299592768} + ]; + } + return []; +} + + + +__PACKAGE__->run_if_script; diff --git a/t/app/controller/admin.t b/t/app/controller/admin.t index f63a72117..498f1cedc 100644 --- a/t/app/controller/admin.t +++ b/t/app/controller/admin.t @@ -568,7 +568,7 @@ foreach my $test ( $report->discard_changes; - if ( $report->state eq 'confirmed' ) { + if ($report->state eq 'confirmed' && $report->whensent) { $mech->content_contains( 'type="submit" name="resend"', 'resend button' ); } else { $mech->content_lacks( 'type="submit" name="resend"', 'no resend button' ); @@ -1083,7 +1083,7 @@ subtest 'report search' => sub { subtest 'search abuse' => sub { $mech->get_ok( '/admin/users?search=example' ); - $mech->content_like(qr{test4\@example.com.*</td>\s*<td>.*?</td>\s*<td>\(Email in abuse table}); + $mech->content_like(qr{test4\@example.com.*</td>\s*<td>.*?</td>\s*<td>\(Email in abuse table}s); }; subtest 'show flagged entries' => sub { diff --git a/t/app/controller/alert.t b/t/app/controller/alert.t index 9189f5e97..5bf2af428 100644 --- a/t/app/controller/alert.t +++ b/t/app/controller/alert.t @@ -1,10 +1,13 @@ use strict; use warnings; use Test::More; +use LWP::Protocol::PSGI; use FixMyStreet::TestMech; my $mech = FixMyStreet::TestMech->new; +use t::Nominatim; + # check that we can get the page $mech->get_ok('/alert'); $mech->title_like(qr/^Local RSS feeds and email alerts/); @@ -38,8 +41,11 @@ FixMyStreet::override_config { $mech->content_contains('council:2651:City_of_Edinburgh'); $mech->content_contains('ward:2651:20728:City_of_Edinburgh:City_Centre'); - $mech->get_ok('/alert/list?pc=High Street'); - $mech->content_contains('We found more than one match for that location'); + subtest "Test Nominatim lookup" => sub { + LWP::Protocol::PSGI->register(t::Nominatim->run_if_script, host => 'nominatim.openstreetmap.org'); + $mech->get_ok('/alert/list?pc=High Street'); + $mech->content_contains('We found more than one match for that location'); + }; $mech->get_ok('/alert/list?pc='); $mech->content_contains('To find out what local alerts we have for you'); diff --git a/t/app/controller/alert_new.t b/t/app/controller/alert_new.t index 115bb181a..ac2ec20ac 100644 --- a/t/app/controller/alert_new.t +++ b/t/app/controller/alert_new.t @@ -132,7 +132,7 @@ foreach my $test ( ok $token->data->{id} == $existing_id, 'subscribed to existing alert'; $mech->get_ok("/A/$url_token"); - $mech->content_contains('successfully confirmed'); + $mech->content_contains('alert created'); $alert = FixMyStreet::App->model('DB::Alert')->find( { id => $existing_id, } ); @@ -370,9 +370,9 @@ subtest "Test normal alert signups and that alerts are sent" => sub { my ( $url, $url_token ) = $email->body =~ m{http://\S+(/A/(\S+))}; my $token = FixMyStreet::App->model('DB::Token')->find( { token => $url_token, scope => 'alert' } ); $mech->get_ok( $url ); - $mech->content_contains('successfully confirmed'); + $mech->content_contains('alert created'); } else { - $mech->content_contains('successfully created'); + $mech->content_contains('alert created'); } } @@ -451,7 +451,7 @@ subtest "Test normal alert signups and that alerts are sent" => sub { my $count; for (@emails) { $count++ if $_->body =~ /The following updates have been left on this report:/; - $count++ if $_->body =~ /The following new FixMyStreet reports have been added in City of\s+Edinburgh\s+Council:/; + $count++ if $_->body =~ /The following new FixMyStreet reports have been added in the City of\s+Edinburgh\s+Council area:/; $count++ if $_->body =~ /The following FixMyStreet reports have been made within the area you\s+specified:/; $count++ if $_->body =~ /\s+-\s+Testing/; } @@ -461,19 +461,21 @@ subtest "Test normal alert signups and that alerts are sent" => sub { like $email->body, qr/Other User/, 'Update name given'; unlike $email->body, qr/Anonymous User/, 'Update name not given'; - # The update alert was to the problem reporter, so has a login update URL + # The update alert was to the problem reporter, so has a special update URL + $mech->log_out_ok; $mech->get_ok( "/report/$report_id" ); $mech->content_lacks( 'has not been fixed' ); - my ($url) = $email->body =~ m{(http://\S+/M/\S+)}; + my ($url) = $email->body =~ m{(http://\S+/R/\S+)}; ok $url, "extracted update url '$url'"; $mech->get_ok( $url ); is $mech->uri->path, "/report/" . $report_id, "redirected to report page"; $mech->content_contains( 'has not been fixed' ); - $mech->logged_in_ok; + $mech->not_logged_in_ok; ($url) = $emails[0]->body =~ m{http://\S+(/A/\S+)}; $mech->get_ok( $url ); - $mech->content_contains('successfully deleted'); + $mech->content_contains('alert deleted'); + $mech->not_logged_in_ok; $mech->delete_user($user1); $mech->delete_user($user2); diff --git a/t/app/controller/around.t b/t/app/controller/around.t index df4f18660..03bcebf96 100644 --- a/t/app/controller/around.t +++ b/t/app/controller/around.t @@ -127,4 +127,43 @@ subtest 'check non public reports are not displayed on around page' => sub { }; +subtest 'check category and status filtering works on /ajax' => sub { + my $categories = [ 'Pothole', 'Vegetation', 'Flytipping' ]; + my $params = { + postcode => 'OX1 1ND', + latitude => 51.7435918829363, + longitude => -1.23201966270446, + }; + my $bbox = ($params->{longitude} - 0.01) . ',' . ($params->{latitude} - 0.01) + . ',' . ($params->{longitude} + 0.01) . ',' . ($params->{latitude} + 0.01); + + # Create one open and one fixed report in each category + foreach my $category ( @$categories ) { + foreach my $state ( 'confirmed', 'fixed' ) { + my %report_params = ( + %$params, + category => $category, + state => $state, + ); + $mech->create_problems_for_body( 1, 2237, 'Around page', \%report_params ); + } + } + + my $json = $mech->get_ok_json( '/ajax?bbox=' . $bbox ); + my $pins = $json->{pins}; + is scalar @$pins, 6, 'correct number of reports when no filters'; + + $json = $mech->get_ok_json( '/ajax?filter_category=Pothole&bbox=' . $bbox ); + $pins = $json->{pins}; + is scalar @$pins, 2, 'correct number of Pothole reports'; + + $json = $mech->get_ok_json( '/ajax?status=open&bbox=' . $bbox ); + $pins = $json->{pins}; + is scalar @$pins, 3, 'correct number of open reports'; + + $json = $mech->get_ok_json( '/ajax?status=fixed&filter_category=Vegetation&bbox=' . $bbox ); + $pins = $json->{pins}; + is scalar @$pins, 1, 'correct number of fixed Vegetation reports'; +}; + done_testing(); diff --git a/t/app/controller/contact.t b/t/app/controller/contact.t index 89a1db5b2..cf8a3161b 100644 --- a/t/app/controller/contact.t +++ b/t/app/controller/contact.t @@ -259,7 +259,7 @@ for my $test ( $mech->get_ok('/contact'); } $mech->submit_form_ok( { with_fields => $test->{fields} } ); - $mech->content_contains('Thanks for your feedback'); + $mech->content_contains('Thank you for your feedback'); $mech->email_count_is(1); my $email = $mech->get_email; @@ -385,7 +385,7 @@ for my $test ( $mech->clear_emails_ok; $mech->get_ok('/contact'); $mech->submit_form_ok( { with_fields => $test->{fields} } ); - $mech->content_contains('Thanks for your feedback'); + $mech->content_contains('Thank you for your feedback'); $mech->email_count_is(1); } }; diff --git a/t/app/controller/my.t b/t/app/controller/my.t index da509e8ed..b723e537e 100644 --- a/t/app/controller/my.t +++ b/t/app/controller/my.t @@ -1,7 +1,7 @@ use strict; use warnings; -use Test::More tests => 11; +use Test::More; use FixMyStreet::TestMech; my $mech = FixMyStreet::TestMech->new; @@ -17,3 +17,4 @@ is $mech->uri->path, '/my', "stayed on '/my/' page"; # cleanup $mech->delete_user( $user ); +done_testing(); diff --git a/t/app/controller/questionnaire.t b/t/app/controller/questionnaire.t index 752dbb4cb..5938acc79 100644 --- a/t/app/controller/questionnaire.t +++ b/t/app/controller/questionnaire.t @@ -252,13 +252,13 @@ foreach my $test ( # Check the right HTML page has been returned $mech->content_like( qr/<title>[^<]*Questionnaire/m ); - $mech->content_contains( 'glad to hear it’s been fixed' ) + $mech->content_contains( 'Glad to hear' ) if $result =~ /fixed/; - $mech->content_lacks( 'glad to hear it’s been fixed' ) + $mech->content_lacks( 'Glad to hear' ) if $result !~ /fixed/; $mech->content_contains( 'get some more information about the status of your problem' ) if $result eq 'unknown'; - $mech->content_contains( "sorry to hear that" ) + $mech->content_contains( "sorry to hear" ) if $result eq 'confirmed' || $result eq 'closed'; # Check the database has the right information @@ -319,7 +319,7 @@ subtest 'Check updates are shown correctly on questionnaire page' => sub { $mech->content_contains( 'This is some update text' ); }; -for my $test ( +for my $test ( { state => 'confirmed', fixed => 0 diff --git a/t/app/controller/report_import.t b/t/app/controller/report_import.t index e5e9e2899..ff6508149 100644 --- a/t/app/controller/report_import.t +++ b/t/app/controller/report_import.t @@ -17,7 +17,17 @@ ok -e $sample_file, "sample file $sample_file exists"; FixMyStreet::App->log->disable('info'); END { FixMyStreet::App->log->enable('info'); } -$mech->create_body_ok(2504, 'Westminster City Council'); +my $body = $mech->create_body_ok(2504, 'Westminster City Council'); +$mech->create_contact_ok( + body_id => $body->id, + category => 'Street lighting', + email => 'streetlighting@example.com', +); +$mech->create_contact_ok( + body_id => $body->id, + category => 'Potholes', + email => 'highways@example.com', +); # submit an empty report to import - check we get all errors subtest "Test creating bad partial entries" => sub { @@ -372,3 +382,7 @@ subtest "Submit a correct entry (with location) to cobrand" => sub { }; done_testing(); + +END { + $mech->delete_body($body); +} diff --git a/t/app/controller/report_new.t b/t/app/controller/report_new.t index 67e899102..bd0001be8 100644 --- a/t/app/controller/report_new.t +++ b/t/app/controller/report_new.t @@ -2,7 +2,6 @@ use strict; use utf8; # sign in error message has – in it use warnings; use Test::More; -use utf8; use FixMyStreet::TestMech; use FixMyStreet::App; @@ -35,15 +34,8 @@ subtest "test that bare requests to /report/new get redirected" => sub { "pc correctly transferred"; }; -my %contact_params = ( - confirmed => 1, - deleted => 0, - editor => 'Test', - whenedited => \'current_timestamp', - note => 'Created for test', -); - my %body_ids; +my @bodies; for my $body ( { area_id => 2651, name => 'City of Edinburgh Council' }, { area_id => 2226, name => 'Gloucestershire County Council' }, @@ -56,62 +48,51 @@ for my $body ( { area_id => 2333, name => 'Hart Council', id => 2333 }, ) { my $body_obj = $mech->create_body_ok($body->{area_id}, $body->{name}, id => $body->{id}); + push @bodies, $body_obj; $body_ids{$body->{area_id}} = $body_obj->id; } # Let's make some contacts to send things to! -FixMyStreet::App->model('DB::Contact')->search( { - email => { 'like', '%example.com' }, -} )->delete; -my $contact1 = FixMyStreet::App->model('DB::Contact')->find_or_create( { - %contact_params, +my $contact1 = $mech->create_contact_ok( body_id => $body_ids{2651}, # Edinburgh category => 'Street lighting', email => 'highways@example.com', -} ); -my $contact2 = FixMyStreet::App->model('DB::Contact')->find_or_create( { - %contact_params, +); +my $contact2 = $mech->create_contact_ok( body_id => $body_ids{2226}, # Gloucestershire category => 'Potholes', email => 'potholes@example.com', -} ); -my $contact3 = FixMyStreet::App->model('DB::Contact')->find_or_create( { - %contact_params, +); +my $contact3 = $mech->create_contact_ok( body_id => $body_ids{2326}, # Cheltenham category => 'Trees', email => 'trees@example.com', -} ); -my $contact4 = FixMyStreet::App->model('DB::Contact')->find_or_create( { - %contact_params, +); +my $contact4 = $mech->create_contact_ok( body_id => $body_ids{2482}, # Bromley category => 'Trees', email => 'trees@example.com', -} ); -my $contact5 = FixMyStreet::App->model('DB::Contact')->find_or_create( { - %contact_params, +); +my $contact5 = $mech->create_contact_ok( body_id => $body_ids{2651}, # Edinburgh category => 'Trees', email => 'trees@example.com', -} ); -my $contact6 = FixMyStreet::App->model('DB::Contact')->find_or_create( { - %contact_params, +); +my $contact6 = $mech->create_contact_ok( body_id => $body_ids{2333}, # Hart category => 'Trees', email => 'trees@example.com', -} ); -my $contact7 = FixMyStreet::App->model('DB::Contact')->find_or_create( { - %contact_params, +); +my $contact7 = $mech->create_contact_ok( body_id => $body_ids{2227}, # Hampshire category => 'Street lighting', email => 'highways@example.com', -} ); -ok $contact1, "created test contact 1"; -ok $contact2, "created test contact 2"; -ok $contact3, "created test contact 3"; -ok $contact4, "created test contact 4"; -ok $contact5, "created test contact 5"; -ok $contact6, "created test contact 6"; -ok $contact7, "created test contact 7"; +); +my $contact8 = $mech->create_contact_ok( + body_id => $body_ids{2504}, + category => 'Street lighting', + email => 'highways@example.com' +); # test that the various bit of form get filled in and errors correctly # generated. @@ -481,7 +462,7 @@ foreach my $test ( }; # check that we got the errors expected - is_deeply $mech->page_errors, $test->{errors}, "check errors"; + is_deeply [ sort @{$mech->page_errors} ], [ sort @{$test->{errors}} ], "check errors"; # check that fields have changed as expected my $new_values = { @@ -750,8 +731,7 @@ subtest "test report creation for a user who is signing in as they report" => su my $report = $user->problems->first; ok $report, "Found the report"; - # check that we got redirected to /report/ - is $mech->uri->path, "/report/" . $report->id, "redirected to report page"; + $mech->content_contains('Thank you for reporting this issue'); # Check the report has been assigned appropriately is $report->bodies_str, $body_ids{2651}; @@ -852,8 +832,7 @@ foreach my $test ( # Check the report has been assigned appropriately is $report->bodies_str, $body_ids{$test->{council}}; - # check that we got redirected to /report/ - is $mech->uri->path, "/report/" . $report->id, "redirected to report page"; + $mech->content_contains('Thank you for reporting this issue'); # check that no emails have been sent $mech->email_count_is(0); @@ -1020,7 +999,7 @@ for my $test ( host => 'www.fixmystreet.com', postcode => 'EH99 1SP', fms_extra_title => '', - extra => undef, + extra => [], user_title => undef, }, { @@ -1148,7 +1127,7 @@ for my $test ( my $report = $user->problems->first; ok $report, "Found the report"; - my $extras = $report->extra; + my $extras = $report->get_extra_fields; is $user->title, $test->{'user_title'}, 'user title correct'; is_deeply $extras, $test->{extra}, 'extra contains correct values'; @@ -1227,18 +1206,18 @@ subtest "test Hart" => sub { button => 'submit_register', }, { - desc => 'confirm redirect for cobrand council in two tier cobrand redirects to cobrand site', + desc => 'confirmation page for cobrand council in two tier cobrand links to cobrand site', category => 'Trees', council => 2333, national => 0, - redirect => 1, + confirm => 1, }, { - desc => 'confirm redirect for non cobrand council in two tier cobrand redirect to national site', + desc => 'confirmation page for non cobrand council in two tier cobrand links to national site', category => 'Street Lighting', council => 2227, national => 1, - redirect => 1, + confirm => 1, }, ) { subtest $test->{ desc } => sub { @@ -1247,7 +1226,7 @@ subtest "test Hart" => sub { $mech->clear_emails_ok; $mech->log_out_ok; - my $user = $mech->log_in_ok($test_email) if $test->{redirect}; + my $user = $mech->log_in_ok($test_email) if $test->{confirm}; FixMyStreet::override_config { ALLOWED_COBRANDS => [ 'hart', 'fixmystreet' ], @@ -1258,13 +1237,13 @@ subtest "test Hart" => sub { $mech->content_contains( "Hart Council" ); $mech->submit_form_ok( { with_fields => { pc => 'GU51 4AE' } }, "submit location" ); $mech->follow_link_ok( { text_regex => qr/skip this step/i, }, "follow 'skip this step' link" ); - my %optional_fields = $test->{redirect} ? () : + my %optional_fields = $test->{confirm} ? () : ( email => $test_email, phone => '07903 123 456' ); # we do this as otherwise test::www::mechanize::catalyst # goes to the value set in ->host above irregardless and # that is a 404. It works but it is not pleasant. - $mech->clear_host if $test->{redirect} && $test->{national}; + $mech->clear_host if $test->{confirm} && $test->{national}; $mech->submit_form_ok( { button => $test->{button}, @@ -1295,11 +1274,11 @@ subtest "test Hart" => sub { # Check the report has been assigned appropriately is $report->bodies_str, $body_ids{$test->{council}}; - if ( $test->{redirect} ) { - is $mech->uri->path, "/report/" . $report->id, "redirected to report page"; + if ( $test->{confirm} ) { + is $mech->uri->path, "/report/new"; my $base = 'www.fixmystreet.com'; $base = "hart.fixmystreet.com" unless $test->{national}; - is $mech->uri->host, $base, 'redirected to correct site'; + $mech->content_contains("$base/report/" . $report->id, "links to correct site"); } else { # receive token my $email = $mech->get_email; @@ -1358,13 +1337,12 @@ subtest "test SeeSomething" => sub { my $cobrand = FixMyStreet::Cobrand::SeeSomething->new(); my $body_ss = $mech->create_body_ok(2535, 'Sandwell Borough Council', id => 2535); - my $bus_contact = FixMyStreet::App->model('DB::Contact')->find_or_create( { - %contact_params, + my $bus_contact = $mech->create_contact_ok( body_id => $body_ss->id, category => 'Bus', email => 'bus@example.com', non_public => 1, - } ); + ); for my $test ( { desc => 'report with no user details works', @@ -1454,12 +1432,8 @@ subtest "test SeeSomething" => sub { ok $report->confirmed, 'Report is confirmed automatically'; - if ( $test->{public} ) { - is $mech->uri->path, '/report/' . $report->id, 'redirects to report page'; - } else { - is $mech->uri->path, '/report/new', 'stays on report/new page'; - $mech->content_contains( 'Your report has been sent', 'use report created template' ); - } + is $mech->uri->path, '/report/new', 'stays on report/new page'; + $mech->content_contains( 'Your report has been sent', 'use report created template' ); $user->alerts->delete; $user->problems->delete; @@ -1488,6 +1462,104 @@ subtest "categories from deleted bodies shouldn't be visible for new reports" => }; }; +subtest "unresponsive body handling works" => sub { + FixMyStreet::override_config { + ALLOWED_COBRANDS => [ { fixmystreet => '.' } ], + MAPIT_URL => 'http://mapit.mysociety.org/', + }, sub { + # Test body-level send method + my $old_send = $contact1->body->send_method; + $contact1->body->update( { send_method => 'Refused' } ); + $mech->get_ok('/report/new/ajax?latitude=55.9&longitude=-3.2'); # Edinburgh + my $body_id = $contact1->body->id; + ok $mech->content_like( qr{Edinburgh.*accept reports.*/unresponsive\?body=$body_id} ); + + my $test_email = 'test-2@example.com'; + my $user = $mech->log_in_ok($test_email); + $mech->get_ok('/around'); + $mech->submit_form_ok( { with_fields => { pc => 'EH1 1BB', } }, "submit location" ); + $mech->follow_link_ok( { text_regex => qr/skip this step/i, }, "follow 'skip this step' link" ); + $mech->submit_form_ok( + { + with_fields => { + title => "Test Report at café", + detail => 'Test report details.', + photo => '', + name => 'Joe Bloggs', + may_show_name => '1', + phone => '07903 123 456', + category => 'Trees', + } + }, + "submit good details" + ); + + my $report = $user->problems->first; + ok $report, "Found the report"; + is $report->bodies_str, undef, "Report not going anywhere"; + + $user->problems->delete; + $contact1->body->update( { send_method => $old_send } ); + + # And test per-category refusing + my $old_email = $contact3->email; + $contact3->update( { email => 'REFUSED' } ); + $mech->get_ok('/report/new/category_extras?category=Trees&latitude=51.89&longitude=-2.09'); + ok $mech->content_like( qr/Cheltenham.*Trees.*unresponsive.*category=Trees/ ); + + $mech->get_ok('/around'); + $mech->submit_form_ok( { with_fields => { pc => 'GL50 2PR', } }, "submit location" ); + $mech->follow_link_ok( { text_regex => qr/skip this step/i, }, "follow 'skip this step' link" ); + $mech->submit_form_ok( + { + with_fields => { + title => "Test Report at café", + detail => 'Test report details.', + photo => '', + name => 'Joe Bloggs', + may_show_name => '1', + phone => '07903 123 456', + category => 'Trees', + } + }, + "submit good details" + ); + + $report = $user->problems->first; + ok $report, "Found the report"; + is $report->bodies_str, undef, "Report not going anywhere"; + + $contact3->update( { email => $old_email } ); + $mech->delete_user($user); + }; +}; + +subtest "unresponsive body page works" => sub { + FixMyStreet::override_config { + ALLOWED_COBRANDS => [ { fixmystreet => '.' } ], + MAPIT_URL => 'http://mapit.mysociety.org/', + }, sub { + my $old_send = $contact1->body->send_method; + my $body_id = $contact1->body->id; + my $url = "/unresponsive?body=$body_id"; + is $mech->get($url)->code, 404, "page not found"; + $contact1->body->update( { send_method => 'Refused' } ); + $mech->get_ok($url); + $mech->content_contains('Edinburgh'); + $contact1->body->update( { send_method => $old_send } ); + + my $old_email = $contact3->email; + $body_id = $contact3->body->id; + $url = "/unresponsive?body=$body_id;category=Trees"; + is $mech->get($url)->code, 404, "page not found"; + $contact3->update( { email => 'REFUSED' } ); + $mech->get_ok($url); + $mech->content_contains('Cheltenham'); + $mech->content_contains('Trees'); + $contact3->update( { email => $old_email } ); + }; +}; + subtest "extra google analytics code displayed on logged in problem creation" => sub { FixMyStreet::override_config { ALLOWED_COBRANDS => [ { fixmystreet => '.' } ], @@ -1537,9 +1609,6 @@ subtest "extra google analytics code displayed on logged in problem creation" => my $report = $user->problems->first; ok $report, "Found the report"; - # check that we got redirected to /report/ - is $mech->uri->path, "/report/" . $report->id, "redirected to report page"; - $mech->content_contains( "'id': 'report/" . $report->id . "'", 'extra google code present' ); # cleanup @@ -1606,12 +1675,8 @@ subtest "extra google analytics code displayed on email confirmation problem cre }; }; -$contact1->delete; -$contact2->delete; -$contact3->delete; -$contact4->delete; -$contact5->delete; -$contact6->delete; -$contact7->delete; - done_testing(); + +END { + $mech->delete_body($_) foreach @bodies; +} diff --git a/t/app/controller/report_new_open311.t b/t/app/controller/report_new_open311.t index a274d918b..d3ca93f0e 100644 --- a/t/app/controller/report_new_open311.t +++ b/t/app/controller/report_new_open311.t @@ -19,16 +19,8 @@ $body->update({ api_key => 'apikey', }); -my %contact_params = ( - confirmed => 1, - deleted => 0, - editor => 'Test', - whenedited => \'current_timestamp', - note => 'Created for test', -); # Let's make some contacts to send things to! -my $contact1 = FixMyStreet::App->model('DB::Contact')->find_or_create( { - %contact_params, +my $contact1 = $mech->create_contact_ok( body_id => $body->id, # Edinburgh category => 'Street lighting', email => '100', @@ -37,15 +29,12 @@ my $contact1 = FixMyStreet::App->model('DB::Contact')->find_or_create( { { value => [ { name => ['Gas'], key => ['old'] }, { name => [ 'Yellow' ], key => [ 'modern' ] } ] } } ], -} ); -my $contact2 = FixMyStreet::App->model('DB::Contact')->find_or_create( { - %contact_params, +); +my $contact2 = $mech->create_contact_ok( body_id => $body->id, # Edinburgh category => 'Graffiti Removal', email => '101', -} ); -ok $contact1, "created test contact 1"; -ok $contact2, "created test contact 2"; +); # test that the various bit of form get filled in and errors correctly # generated. @@ -71,9 +60,9 @@ foreach my $test ( type => 'old', }, errors => [ + 'This information is required', 'Please enter a subject', 'Please enter some details', - 'This information is required', 'Please enter your email', 'Please enter your name', ], @@ -169,14 +158,15 @@ foreach my $test ( my $prob = $user->problems->first; ok $prob, 'problem created'; - is_deeply $prob->extra, $test->{extra}, 'extra open311 data added to problem'; + is_deeply $prob->get_extra_fields, $test->{extra}, 'extra open311 data added to problem'; $user->problems->delete; $user->delete; }; } -$contact1->delete; -$contact2->delete; - done_testing(); + +END { + $mech->delete_body($body); +} diff --git a/t/app/controller/report_updates.t b/t/app/controller/report_updates.t index 64ed91ac0..fa6c44292 100644 --- a/t/app/controller/report_updates.t +++ b/t/app/controller/report_updates.t @@ -457,6 +457,8 @@ for my $test ( }, 'submit update' ); + $mech->content_contains("/report/$report_id"); + $mech->get_ok("/report/$report_id"); $mech->content_contains('Test 2'); $mech->content_contains('Update no email confirm'); @@ -690,6 +692,7 @@ for my $test ( }, 'submit update' ); + $mech->get_ok("/report/$report_id"); $report->discard_changes; my $update = $report->comments->first; @@ -786,6 +789,7 @@ subtest "check comment with no status change has not status in meta" => sub { }, 'submit update' ); + $mech->get_ok("/report/$report_id"); $report->discard_changes; my @updates = $report->comments->all; @@ -816,6 +820,7 @@ subtest "check comment with no status change has not status in meta" => sub { }, 'submit update' ); + $mech->get_ok("/report/$report_id"); $report->discard_changes; @updates = $report->comments->search(undef, { order_by => 'created' })->all;; @@ -971,7 +976,7 @@ for my $test ( "submit good details" ); - is $mech->uri->path, "/report/" . $report_id, "redirected to report page"; + $mech->content_contains('Thank you for updating this issue'); $mech->email_count_is(0); my $update = $report->comments->first; @@ -1201,7 +1206,9 @@ for my $test ( 'submit update' ); - is $mech->uri->path, "/report/" . $report_id, "redirected to report page"; + $mech->content_contains('Thank you for updating this issue'); + $mech->content_contains("/report/" . $report_id); + $mech->get_ok("/report/" . $report_id); if ( !defined( $test->{endstate_banner} ) ) { is $mech->extract_problem_banner->{text}, undef, 'endstate banner'; @@ -1255,7 +1262,6 @@ foreach my $test ( alert => 1, # we signed up for alerts before, do not unsign us anonymous => 0, answered => 0, - path => '/report/update', content => "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?", }, @@ -1282,7 +1288,6 @@ foreach my $test ( alert => 1, # we signed up for alerts before, do not unsign us anonymous => 0, answered => 0, - path => '/report/update', content => "Thanks, glad to hear it's been fixed! Could we just ask if you have ever reported a problem to a council before?", }, @@ -1310,7 +1315,6 @@ foreach my $test ( alert => 1, # we signed up for alerts before, do not unsign us anonymous => 0, answered => 1, - path => '/report/' . $report->id, content => $report->title, }, ) @@ -1363,7 +1367,7 @@ foreach my $test ( $mech->submit_form_ok( { with_fields => $test->{fields}, }, 'submit update' ); - is $mech->uri->path, $test->{path}, "page after submission"; + is $mech->uri->path, '/report/update', "page after submission"; $mech->content_contains( $test->{content} ); @@ -1393,7 +1397,8 @@ foreach my $test ( $mech->submit_form_ok( { with_fields => { reported => 'Yes' } } ); - $mech->content_contains( 'Thank you — you can' ); + $mech->content_contains( $report->title ); + $mech->content_contains( 'Thank you for updating this issue' ); $questionnaire = FixMyStreet::App->model( 'DB::Questionnaire' )->find( { problem_id => $report_id } @@ -1452,7 +1457,7 @@ for my $test ( anonymous => 0, answered => 1, path => '/report/update', - content => "You have successfully confirmed your update", + content => "Thank you for updating this issue", }, ) { @@ -1542,7 +1547,8 @@ for my $test ( $mech->submit_form_ok( { with_fields => { reported => 'Yes' } } ); - $mech->content_contains( 'Thank you — you can' ); + $mech->content_contains( $report->title ); + $mech->content_contains( 'Thank you for updating this issue' ); $questionnaire = FixMyStreet::App->model( 'DB::Questionnaire' )->find( { problem_id => $report_id } diff --git a/t/app/controller/token.t b/t/app/controller/token.t new file mode 100644 index 000000000..9ca8b905d --- /dev/null +++ b/t/app/controller/token.t @@ -0,0 +1,37 @@ +use strict; +use warnings; +use Test::More; +use utf8; + +use FixMyStreet::TestMech; +use FixMyStreet::App; + +my $user = FixMyStreet::App->model('DB::User')->find_or_create({ + name => 'Bob', email => 'bob@example.com', + }); +my $mech = FixMyStreet::TestMech->new; + +subtest 'Zurich special case for C::Tokens->problem_confirm' => sub { + FixMyStreet::override_config { + ALLOWED_COBRANDS => ['zurich'], + }, sub { + my $c = FixMyStreet::App->new; + my $zurich = $mech->create_body_ok( 1, 'Zurich' ); + my ($report) = $mech->create_problems_for_body( + 1, $zurich->id, + { + state => 'unconfirmed', + confirmed => undef, + cobrand => 'zurich', + }); + + is $report->get_extra_metadata('email_confirmed'), undef, 'email_confirmed not yet set (sanity)'; + my $token = $c->model('DB::Token')->create({ scope => 'problem', data => $report->id }); + + $mech->get_ok('/P/' . $token->token); + $report->discard_changes; + is $report->get_extra_metadata('email_confirmed'), 1, 'email_confirmed set by Zurich special case'; + }; +}; + +done_testing; diff --git a/t/app/model/alert_type.t b/t/app/model/alert_type.t index 5b7494a04..528c4d354 100644 --- a/t/app/model/alert_type.t +++ b/t/app/model/alert_type.t @@ -150,7 +150,7 @@ for my $test ( like $body, qr/$msg/, 'email says problem is ' . $test->{state}; if ($to eq $user->email) { - like $body, qr{/M/}, 'contains problem login url'; + like $body, qr{/R/}, 'contains problem login url'; } elsif ($to eq $user3->email) { like $body, qr{/report/$report_id}, 'contains problem url'; } diff --git a/t/app/model/extra.t b/t/app/model/extra.t new file mode 100644 index 000000000..21c37336e --- /dev/null +++ b/t/app/model/extra.t @@ -0,0 +1,111 @@ +use strict; +use warnings; +use Test::More; +use utf8; + +use FixMyStreet::App; +use Data::Dumper; +use DateTime; + +my $c = FixMyStreet::App->new; + +my $db = FixMyStreet::App->model('DB')->schema; +$db->txn_begin; + +my $body = $db->resultset('Body')->create({ name => 'ExtraTestingBody' }); + +my $serial = 1; +sub get_test_contact { + my $extra = shift; + my $contact = $db->resultset('Contact')->create({ + category => "Testing ${serial}", + body => $body, + email => 'test@example.com', + confirmed => 1, + deleted => 0, + editor => 'test script', + note => 'test script', + whenedited => DateTime->now(), + $extra ? ( extra => $extra ) : (), + }); + $serial++; + return $contact; +} + +subtest 'Old list layout transparently upgraded' => sub { + + subtest 'layout' => sub { + my $contact = get_test_contact([]); + + is_deeply $contact->get_extra(), { _fields => [] }, 'transparently upgraded to a hash'; + }; + + subtest 'extra fields' => sub { + my $contact = get_test_contact([]); + + is_deeply $contact->get_extra_fields(), [], 'No extra fields'; + + my @fields = ( { a => 1 }, { b => 2 } ); + $contact->set_extra_fields(@fields); + is_deeply $contact->extra, { _fields => \@fields }, 'extra fields set...'; + $contact->update; + $contact->discard_changes; + is_deeply $contact->extra, { _fields => \@fields }, '...and retrieved'; + is_deeply $contact->get_extra_fields(), \@fields, 'extra fields returned'; + }; + + subtest 'metadata' => sub { + my $contact = get_test_contact([]); + is_deeply $contact->get_extra_metadata_as_hashref(), {}, 'No extra metadata'; + + $contact->set_extra_metadata('foo' => 'bar'); + is $contact->get_extra_metadata('foo'), 'bar', 'extra metadata set...'; + $contact->update; + $contact->discard_changes; + is $contact->get_extra_metadata('foo'), 'bar', '... and retrieved'; + is_deeply $contact->get_extra_metadata_as_hashref(), { foo => 'bar' }, 'No extra metadata'; + }; +}; + +subtest 'Default hash layout' => sub { + subtest 'layout' => sub { + my $contact = get_test_contact(); + + is_deeply $contact->get_extra(), {}, 'default layout is hash'; + }; + + subtest 'extra fields' => sub { + my $contact = get_test_contact(); + + is_deeply $contact->get_extra_fields(), [], 'No extra fields'; + + my @fields = ( { a => 1 }, { b => 2 } ); + $contact->set_extra_fields(@fields); + is_deeply $contact->get_extra_fields, \@fields, 'extra fields set...'; + $contact->update; + $contact->discard_changes; + is_deeply $contact->get_extra_fields(), \@fields, '... and returned'; + is_deeply $contact->extra, { _fields => \@fields }, '(sanity check layout)'; + }; + + subtest 'metadata' => sub { + my $contact = get_test_contact(); + is_deeply $contact->get_extra_metadata_as_hashref(), {}, 'No extra metadata'; + + $contact->set_extra_metadata('foo' => 'bar'); + is $contact->get_extra_metadata('foo'), 'bar', 'extra metadata set...'; + $contact->update; + $contact->discard_changes; + is $contact->get_extra_metadata( 'foo'), 'bar', '... and retrieved'; + is_deeply $contact->get_extra_metadata_as_hashref(), { foo => 'bar' }, 'No extra metadata'; + + $contact->unset_extra_metadata('foo'); + is $contact->get_extra_metadata('foo'), undef, 'extra metadata now unset'; + $contact->update; + $contact->discard_changes; + is $contact->get_extra_metadata('foo'), undef, '... after retrieval'; + }; +}; + +$db->txn_rollback; +done_testing(); diff --git a/t/app/model/problem.t b/t/app/model/problem.t index c40e9e022..ad82a62a5 100644 --- a/t/app/model/problem.t +++ b/t/app/model/problem.t @@ -18,8 +18,8 @@ my $problem_rs = FixMyStreet::App->model('DB::Problem'); my $problem = $problem_rs->new( { postcode => 'EH99 1SP', - latitude => '51.5016605453401', - longitude => '-0.142497580865087', + latitude => '51.5', + longitude => '-0.1', areas => 1, title => '', detail => '', @@ -33,6 +33,23 @@ my $problem = $problem_rs->new( } ); +my $visible_states = $problem->visible_states; +is_deeply $visible_states, { + 'confirmed' => 1, + 'investigating' => 1, + 'in progress' => 1, + 'planned' => 1, + 'action scheduled' => 1, + 'fixed' => 1, + 'fixed - council' => 1, + 'fixed - user' => 1, + 'unable to fix' => 1, + 'not responsible' => 1, + 'duplicate' => 1, + 'closed' => 1, + 'internal referral' => 1, + }, 'visible_states is correct'; + is $problem->confirmed, undef, 'inflating null confirmed ok'; is $problem->whensent, undef, 'inflating null confirmed ok'; is $problem->lastupdate, undef, 'inflating null confirmed ok'; @@ -50,30 +67,6 @@ for my $test ( } }, { - desc => 'name too short', - changed => { - name => 'xx', - }, - errors => { - title => 'Please enter a subject', - detail => 'Please enter some details', - bodies => 'No council selected', - name => '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', - } - }, - { - desc => 'name is anonymous', - changed => { - name => 'anonymous', - }, - errors => { - title => 'Please enter a subject', - detail => 'Please enter some details', - bodies => 'No council selected', - name => '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', - } - }, - { desc => 'correct name', changed => { name => 'A User', @@ -369,15 +362,8 @@ for my $test ( my $mech = FixMyStreet::TestMech->new(); -my %contact_params = ( - confirmed => 1, - deleted => 0, - editor => 'Test', - whenedited => \'ms_current_timestamp()', - note => 'Created for test', -); - my %body_ids; +my @bodies; for my $body ( { area_id => 2651, name => 'City of Edinburgh Council' }, { area_id => 2226, name => 'Gloucestershire County Council' }, @@ -387,13 +373,19 @@ for my $body ( { area_id => 14279, name => 'Ballymoney Borough Council' }, { area_id => 2636, name => 'Isle of Wight Council' }, { area_id => 2649, name => 'Fife Council' }, + { area_id => 14279, name => 'TransportNI (Western)' }, ) { my $aid = $body->{area_id}; - $body_ids{$aid} = $mech->create_body_ok($aid, $body->{name}, id => $body->{id})->id; + my $body = $mech->create_body_ok($aid, $body->{name}); + if ($body_ids{$aid}) { + $body_ids{$aid} = [ $body_ids{$aid}, $body->id ]; + } else { + $body_ids{$aid} = $body->id; + } + push @bodies, $body; } # Let's make some contacts to send things to! -my @contacts; for my $contact ( { body_id => $body_ids{2651}, # Edinburgh category => 'potholes', @@ -415,11 +407,11 @@ for my $contact ( { category => 'potholes', email => 'highways@example.com', }, { - body_id => $body_ids{14279}, # Ballymoney + body_id => $body_ids{14279}[1], # TransportNI category => 'Street lighting', email => 'roads.western@drdni.example.org', }, { - body_id => $body_ids{14279}, # Ballymoney + body_id => $body_ids{14279}[0], # Ballymoney category => 'Graffiti', email => 'highways@example.com', }, { @@ -428,9 +420,7 @@ for my $contact ( { category => 'potholes', email => '2636@example.com', } ) { - my $new_contact = FixMyStreet::App->model('DB::Contact')->find_or_create( { %contact_params, %$contact } ); - ok $new_contact, "created test contact"; - push @contacts, $new_contact; + $mech->create_contact_ok( %$contact ); } my %common = ( @@ -496,17 +486,19 @@ foreach my $test ( { email_count => 1, dear => qr'Dear Ballymoney Borough Council', to => qr'Ballymoney Borough Council', - body => $body_ids{14279}, + body => $body_ids{14279}[0], category => 'Graffiti', + longitude => -9.5, }, { %common, desc => 'directs NI correctly, 2', unset_whendef => 1, email_count => 1, - dear => qr'Dear Roads Service \(Western\)', - to => qr'Roads Service \(Western\)" <roads', - body => $body_ids{14279}, + dear => qr'Dear TransportNI \(Western\)', + to => qr'TransportNI \(Western\)" <roads', + body => $body_ids{14279}[1], category => 'Street lighting', + longitude => -9.5, }, { %common, desc => 'does not send to unconfirmed contact', @@ -543,6 +535,7 @@ foreach my $test ( { category => $test->{ category } || 'potholes', name => $test->{ name }, cobrand => $test->{ cobrand } || 'fixmystreet', + longitude => $test->{longitude} || '-0.1', } ); FixMyStreet::override_config $override, sub { @@ -558,6 +551,11 @@ foreach my $test ( { like $email->body, qr/A user of FixMyStreet/, 'email body looks a bit like a report'; like $email->body, qr/Subject: A Title/, 'more email body checking'; like $email->body, $test->{ dear }, 'Salutation looks correct'; + if ($test->{longitude}) { + like $email->body, qr{Easting/Northing \(IE\): 95938/28531}; + } else { + like $email->body, qr{Easting/Northing: }; + } if ( $test->{multiple} ) { like $email->body, qr/This email has been sent to several councils /, 'multiple body text correct'; @@ -592,10 +590,7 @@ subtest 'check can set mutiple emails as a single contact' => sub { category => 'trees', email => '2636@example.com,2636-2@example.com', }; - my $new_contact = FixMyStreet::App->model('DB::Contact')->find_or_create( { - %contact_params, - %$contact } ); - ok $new_contact, "created multiple email test contact"; + $mech->create_contact_ok( %$contact ); $mech->clear_emails_ok; @@ -756,9 +751,7 @@ END { $problem->delete if $problem; $mech->delete_user( $user ) if $user; - foreach (@contacts) { - $_->delete; - } + $mech->delete_body($_) for @bodies; done_testing(); } diff --git a/t/app/sendreport/email.t b/t/app/sendreport/email.t index b2cab42ed..65cd7bfa8 100644 --- a/t/app/sendreport/email.t +++ b/t/app/sendreport/email.t @@ -7,11 +7,12 @@ use Test::More; use FixMyStreet; use FixMyStreet::App; -use FixMyStreet::DB::Result::Contact; use FixMyStreet::SendReport::Email; use FixMyStreet::TestMech; use mySociety::Locale; +ok( my $mech = FixMyStreet::TestMech->new, 'Created mech object' ); + my $e = FixMyStreet::SendReport::Email->new(); # area id 1000 @@ -19,14 +20,10 @@ my $params = { id => 1000, name => 'Council of the Thousand' }; my $body = FixMyStreet::App->model('DB::Body')->find_or_create($params); ok $body, "found/created body"; -my $contact = FixMyStreet::App->model('DB::Contact')->find_or_create( +my $contact = $mech->create_contact_ok( email => 'council@example.com', body_id => 1000, category => 'category', - confirmed => 1, - deleted => 0, - editor => 'test suite', - whenedited => DateTime->now, note => '', ); @@ -78,6 +75,8 @@ foreach my $test ( { }; } -$contact->delete; - done_testing(); + +END { + $mech->delete_body($body); +} diff --git a/t/cobrand/bromley.t b/t/cobrand/bromley.t index 6437ba3bd..fdded5606 100644 --- a/t/cobrand/bromley.t +++ b/t/cobrand/bromley.t @@ -8,6 +8,11 @@ my $mech = FixMyStreet::TestMech->new; # Create test data my $user = $mech->create_user_ok( 'bromley@example.com' ); my $body = $mech->create_body_ok( 2482, 'Bromley', id => 2482 ); +$mech->create_contact_ok( + body_id => $body->id, + category => 'Other', + email => 'LIGHT', +); my @reports = $mech->create_problems_for_body( 1, $body->id, 'Test', { cobrand => 'bromley', @@ -36,6 +41,21 @@ $mech->content_contains( 'marked as in progress' ); $mech->content_contains( 'marks it as unable to fix' ); $mech->content_contains( 'marked as no further action' ); +subtest 'testing special Open311 behaviour', sub { + $report->set_extra_fields(); + $report->update; + $body->update( { send_method => 'Open311', endpoint => 'http://bromley.endpoint.example.com', jurisdiction => 'FMS', api_key => 'test' } ); + FixMyStreet::override_config { + SEND_REPORTS_ON_STAGING => 1, + }, sub { + FixMyStreet::App->model('DB::Problem')->send_reports(); + }; + $report->discard_changes; + ok $report->whensent, 'Report marked as sent'; + is $report->send_method_used, 'Open311', 'Report sent via Open311'; + is $report->external_id, 248, 'Report has right external ID'; +}; + # Clean up $mech->delete_user($user); $mech->delete_problems_for_body( $body->id ); diff --git a/t/cobrand/fixamingata.t b/t/cobrand/fixamingata.t index 105847576..3c818474d 100644 --- a/t/cobrand/fixamingata.t +++ b/t/cobrand/fixamingata.t @@ -1,12 +1,16 @@ use strict; use warnings; use Test::More; +use LWP::Protocol::PSGI; BEGIN { use FixMyStreet; FixMyStreet->test_mode(1); } +use t::MapIt; +use mySociety::Locale; + use FixMyStreet::TestMech; my $mech = FixMyStreet::TestMech->new; @@ -21,16 +25,11 @@ FixMyStreet::override_config { $mech->content_like( qr/FixaMinGata/ ); my $body = $mech->create_body_ok( 1, 'Body' ); -FixMyStreet::App->model('DB::Contact')->find_or_create({ +$mech->create_contact_ok( body => $body, category => "Other", email => "other\@example.org", - confirmed => 1, - deleted => 0, - editor => "Editor", - whenedited => \'now()', - note => 'Note', -}); +); my @reports = $mech->create_problems_for_body( 1, $body->id, 'Test', { cobrand => 'fixamingata', @@ -96,6 +95,25 @@ like $email->header('Content-Type'), qr/iso-8859-1/, 'encoding looks okay'; like $email->body, qr/V=E4nligen,/, 'signature looks correct'; $mech->clear_emails_ok; +subtest "Test ajax decimal points" => sub { + # The following line is so we are definitely not in Swedish before + # requesting the page, so that the code performs a full switch to Swedish + mySociety::Locale::push('en-gb'); + + # A note to the future - the run_if_script line must be within a subtest + # otherwise it fails to work + LWP::Protocol::PSGI->register(t::MapIt->run_if_script, host => 'mapit.sweden'); + + FixMyStreet::override_config { + ALLOWED_COBRANDS => [ 'fixamingata' ], + MAPIT_URL => 'http://mapit.sweden/' + }, sub { + $mech->get_ok('/ajax/lookup_location?term=12345'); + # We want an actual decimal point in a JSON response... + $mech->content_contains('51.5'); + }; +}; + END { $mech->delete_problems_for_body(1); ok $mech->host("www.fixmystreet.com"), "change host back"; diff --git a/t/cobrand/fixmybarangay.t b/t/cobrand/fixmybarangay.t index edb14fe3d..316739dfa 100644 --- a/t/cobrand/fixmybarangay.t +++ b/t/cobrand/fixmybarangay.t @@ -37,28 +37,16 @@ FixMyStreet::App->model('DB::BodyArea')->find_or_create({ area_id => 2, body_id # TODO: log in as a Bgy user, and create a report using the front end, # testing that the drop-down has the right things in it, and so on. -my %contact_params = ( - confirmed => 1, - deleted => 0, - editor => 'Test', - whenedited => \'current_timestamp', - note => 'Created for test', -); -FixMyStreet::App->model('DB::Contact')->search( { - email => { 'like', '%example.com' }, -} )->delete; -my $contact1 = FixMyStreet::App->model('DB::Contact')->find_or_create( { - %contact_params, +$mech->create_contact_ok( body_id => $luz->id, category => 'Streetlight (BGY)', email => 'bgy@example.com', -} ); -my $contact2 = FixMyStreet::App->model('DB::Contact')->find_or_create( { - %contact_params, +); +$mech->create_contact_ok( body_id => $dps->id, category => 'Streetlight (DPS)', email => 'LIGHT', -} ); +); # Create a couple of reports diff --git a/t/cobrand/get_body_sender.t b/t/cobrand/get_body_sender.t index 964f5c0e4..a9ba49479 100644 --- a/t/cobrand/get_body_sender.t +++ b/t/cobrand/get_body_sender.t @@ -26,9 +26,8 @@ FixMyStreet::override_config { MAPIT_URL => 'http://mapit.mysociety.org/', }, sub { is_deeply $c->get_body_sender( $body ), { method => 'Email' }, 'defaults to email'; - $body_area->update({ area_id => 2481 }); # Croydon LBO - is_deeply $c->get_body_sender( $body ), { method => 'London' }, 'returns london report it if London borough'; + is_deeply $c->get_body_sender( $body ), { method => 'Email' }, 'still email if London borough'; }; $body->send_method( 'TestMethod' ); diff --git a/t/cobrand/oxfordshire.t b/t/cobrand/oxfordshire.t new file mode 100644 index 000000000..d9f880d07 --- /dev/null +++ b/t/cobrand/oxfordshire.t @@ -0,0 +1,50 @@ +use strict; +use warnings; +use Test::More; + +use FixMyStreet::TestMech; +my $mech = FixMyStreet::TestMech->new; + +subtest 'check /ajax defaults to open reports only' => sub { + my $categories = [ 'Bridges', 'Fences', 'Manhole' ]; + my $params = { + postcode => 'OX28 4DS', + latitude => 51.7847208192, + longitude => -1.49445264029, + }; + my $bbox = ($params->{longitude} - 0.01) . ',' . ($params->{latitude} - 0.01) + . ',' . ($params->{longitude} + 0.01) . ',' . ($params->{latitude} + 0.01); + + # Create one open and one fixed report in each category + foreach my $category ( @$categories ) { + foreach my $state ( 'confirmed', 'fixed' ) { + my %report_params = ( + %$params, + category => $category, + state => $state, + ); + $mech->create_problems_for_body( 1, 2237, 'Around page', \%report_params ); + } + } + + FixMyStreet::override_config { + ALLOWED_COBRANDS => [ { 'oxfordshire' => '.' } ], + MAPIT_URL => 'http://mapit.mysociety.org/', + }, sub { + my $json = $mech->get_ok_json( '/ajax?status=all&bbox=' . $bbox ); + my $pins = $json->{pins}; + is scalar @$pins, 6, 'correct number of reports created'; + + $json = $mech->get_ok_json( '/ajax?bbox=' . $bbox ); + $pins = $json->{pins}; + is scalar @$pins, 3, 'correct number of reports returned with no filters'; + + $json = $mech->get_ok_json( '/ajax?filter_category=Fences&bbox=' . $bbox ); + $pins = $json->{pins}; + is scalar @$pins, 1, 'only one Fences report by default'; + } +}; + +# Clean up +$mech->delete_problems_for_body( 2237 ); +done_testing(); diff --git a/t/cobrand/zurich.t b/t/cobrand/zurich.t index 8dbc43464..90a92fb44 100644 --- a/t/cobrand/zurich.t +++ b/t/cobrand/zurich.t @@ -17,13 +17,16 @@ use JSON; # commonlib/bin/gettext-makemo FixMyStreet use FixMyStreet; +my $c = FixMyStreet::App->new(); +my $cobrand = FixMyStreet::Cobrand::Zurich->new({ c => $c }); +$c->stash->{cobrand} = $cobrand; # This is a helper method that will send the reports but with the config # correctly set - notably SEND_REPORTS_ON_STAGING needs to be true. sub send_reports_for_zurich { FixMyStreet::override_config { SEND_REPORTS_ON_STAGING => 1 }, sub { # Actually send the report - FixMyStreet::App->model('DB::Problem')->send_reports('zurich'); + $c->model('DB::Problem')->send_reports('zurich'); }; } sub reset_report_state { @@ -137,16 +140,11 @@ $mech->content_contains( 'Erfasst' ); subtest "changing of categories" => sub { # create a few categories (which are actually contacts) foreach my $name ( qw/Cat1 Cat2/ ) { - FixMyStreet::App->model('DB::Contact')->find_or_create({ + $mech->create_contact_ok( body => $division, category => $name, email => "$name\@example.org", - confirmed => 1, - deleted => 0, - editor => "editor", - whenedited => DateTime->now(), - note => "note for $name", - }); + ); } # put report into known category @@ -290,9 +288,9 @@ subtest "report_edit" => sub { is ( $report->extra->{closed_overdue}, 0, 'Marking hidden from scratch also set closed_overdue' ); is get_moderated_count(), 1; - is (FixMyStreet::Cobrand::Zurich->new->get_or_check_overdue($report), 0, 'sanity check'); + is ($cobrand->get_or_check_overdue($report), 0, 'sanity check'); $report->update({ created => $created->clone->subtract(days => 10) }); - is (FixMyStreet::Cobrand::Zurich->new->get_or_check_overdue($report), 0, 'overdue call not increased'); + is ($cobrand->get_or_check_overdue($report), 0, 'overdue call not increased'); reset_report_state($report, $created); }; @@ -653,7 +651,7 @@ subtest "test stats" => sub { my $export_count = get_export_rows_count($mech); if (defined $export_count) { is $export_count - $EXISTING_REPORT_COUNT, 3, 'Correct number of reports'; - $mech->content_contains(',fixed - council,'); + $mech->content_contains('fixed - council'); $mech->content_contains(',hidden,'); } diff --git a/t/open311/endpoint/warwick.t b/t/open311/endpoint/warwick.t index e144b745a..b51c601f3 100644 --- a/t/open311/endpoint/warwick.t +++ b/t/open311/endpoint/warwick.t @@ -212,6 +212,7 @@ subtest "End to end" => sub { FixMyStreet::override_config { ALLOWED_COBRANDS => [ 'fixmystreet' ], SEND_REPORTS_ON_STAGING => 1, + MAPIT_URL => 'http://mapit.mysociety.org/', }, sub { ## we can't (yet) just do following due to ## https://github.com/mysociety/fixmystreet/issues/893 diff --git a/t/open311/populate-service-list.t b/t/open311/populate-service-list.t index b343b206d..99663030a 100644 --- a/t/open311/populate-service-list.t +++ b/t/open311/populate-service-list.t @@ -254,14 +254,14 @@ subtest 'check meta data population' => sub { $contact->discard_changes; - is_deeply $contact->extra, $extra, 'meta data saved'; + is_deeply $contact->get_extra_fields, $extra, 'meta data saved'; }; for my $test ( { desc => 'check meta data added to existing contact', has_meta => 1, - orig_meta => undef, + orig_meta => [], end_meta => [ { variable => 'true', code => 'type', @@ -332,7 +332,7 @@ for my $test ( { desc => 'check meta data removed', has_meta => 0, - end_meta => undef, + end_meta => [], orig_meta => [ { variable => 'true', code => 'type', @@ -363,8 +363,8 @@ for my $test ( { desc => 'check empty meta data handled', has_meta => 1, - orig_meta => undef, - end_meta => undef, + orig_meta => [], + end_meta => [], meta_xml => '<?xml version="1.0" encoding="utf-8"?> <service_definition> <service_code>100</service_code> @@ -408,7 +408,8 @@ for my $test ( } ); - $contact->update( { extra => $test->{orig_meta} } ); + $contact->set_extra_fields(@{$test->{orig_meta}}); + $contact->update; my $o = Open311->new( jurisdiction => 'mysociety', @@ -427,7 +428,7 @@ for my $test ( $contact->discard_changes; - is_deeply $contact->extra, $test->{end_meta}, 'meta data saved'; + is_deeply $contact->get_extra_fields, $test->{end_meta}, 'meta data saved'; }; } @@ -530,7 +531,7 @@ subtest 'check attribute ordering' => sub { $contact->discard_changes; - is_deeply $contact->extra, $extra, 'meta data re-ordered correctly'; + is_deeply $contact->get_extra_fields, $extra, 'meta data re-ordered correctly'; }; subtest 'check bromely skip code' => sub { @@ -610,7 +611,7 @@ subtest 'check bromely skip code' => sub { $contact->discard_changes; - is_deeply $contact->extra, $extra, 'only non std bromley meta data saved'; + is_deeply $contact->get_extra_fields, $extra, 'only non std bromley meta data saved'; $processor->_current_body( $body ); $processor->_add_meta_to_contact( $contact ); @@ -650,7 +651,7 @@ subtest 'check bromely skip code' => sub { $contact->discard_changes; - is_deeply $contact->extra, $extra, 'all meta data saved for non bromley'; + is_deeply $contact->get_extra_fields, $extra, 'all meta data saved for non bromley'; }; sub get_standard_xml { diff --git a/templates/email/arreglamibarrio/site-name.txt b/templates/email/arreglamibarrio/site-name.txt new file mode 100644 index 000000000..3b682b1b2 --- /dev/null +++ b/templates/email/arreglamibarrio/site-name.txt @@ -0,0 +1 @@ +ArreglaMiBarrio diff --git a/templates/email/default/alert-problem-area.txt b/templates/email/default/alert-problem-area.txt index 2bcf3fbfc..20550ec8e 100644 --- a/templates/email/default/alert-problem-area.txt +++ b/templates/email/default/alert-problem-area.txt @@ -1,7 +1,7 @@ Subject: New <?=$values['site_name']?> reports in <?=$values['area_name']?> The following new <?=$values['site_name']?> reports have been added in -<?=$values['area_name']?>: +the <?=$values['area_name']?> area: <?=$values['data']?> @@ -14,7 +14,7 @@ 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: +the <?=$values['area_name']?> area, please follow this link: <?=$values['unsubscribe_url']?> diff --git a/templates/email/default/submit-example.txt b/templates/email/default/submit-example.txt index b3853e1a5..7fa0a23da 100644 --- a/templates/email/default/submit-example.txt +++ b/templates/email/default/submit-example.txt @@ -27,9 +27,7 @@ you approach the junction along Bournville Lane from the east, which leads to vehicles rolling back as they fall in and out of it whilst waiting at the junction. -Easting: 404517 - -Northing: 280922 +Easting/Northing: 404517/280922 Latitude: 52.4262642791826 diff --git a/templates/email/fixamingata/submit-example.txt b/templates/email/fixamingata/submit-example.txt deleted file mode 100644 index c11d613ad..000000000 --- a/templates/email/fixamingata/submit-example.txt +++ /dev/null @@ -1,61 +0,0 @@ -Subject: Problem Report: Dangerous pothole - -Dear Birmingham City Council, - -A user of FixMyStreet has submitted the following report of a -local problem that they believe might require your attention. - -To view a map of the precise location of this issue, or to provide -an update on the problem, please visit the following link: - - http://www.fixmystreet.com/report/39092 - ----------- - -Name: Matthew Somerville - -Email: [...] - -Phone: [...] - -Category: Potholes - -Subject: Dangerous pothole - -Details: There is a large pothole almost on the give way line as -you approach the junction along Bournville Lane from the east, -which leads to vehicles rolling back as they fall in and out of it -whilst waiting at the junction. - -Easting: 404517 - -Northing: 280922 - -Latitude: 52.4262642791826 - -Longitude: -1.93500217285966 - -Nearest road to the pin placed on the map (automatically -generated by Bing Maps): Bournville Lane, Birmingham B30 1 - -Nearest postcode to the pin placed on the map (automatically -generated): B30 1LA (83m away) - ----------- - -Replies to this email will go to the user who submitted the problem. - -Yours, -The FixMyStreet team - -This message was sent via FixMyStreet, a project of UKCOD, -registered charity number 1076346. If there is a more appropriate -email address for messages about 'Potholes', please let us know by -visiting <http://www.fixmystreet.com/contact>. This will help -improve the service for local people. We also welcome any other -feedback you may have. - -FixMyStreet is now available for full integration into council -websites, making life easier for both you and your residents. -Read more here: https://www.fixmystreet.com/council - diff --git a/templates/web/arreglamibarrio/faq/faq-es.html b/templates/web/arreglamibarrio/faq/faq-es.html new file mode 100644 index 000000000..3d5397380 --- /dev/null +++ b/templates/web/arreglamibarrio/faq/faq-es.html @@ -0,0 +1,82 @@ +[% INCLUDE 'header.html', title = loc('Frequently Asked Questions'), bodyclass = 'twothirdswidthpage' %]
+<div class="sticky-sidebar">
+<aside>
+<ul class="plain-list">
+<li><strong>Preguntas frecuentes</strong></li>
+<li><a href="/privacy">Privacidad y cookies</a></li>
+<li><a href="/contact">Contacto [% PROCESS 'site-name.html' -%]</a></li>
+</ul>
+</aside>
+</div>
+<h1><a name="faq"></a>Preguntas frecuentes</h1>
+<dl>
+<dt>¿Qué es este sitio?</dt>
+<dd>[% PROCESS 'site-name.html' -%] es un sitio para ayudar a las personas a informar a su Administración local sobre averías o mal estado de nuestro espacio urgano, simplemente localizandolo en un mapa.</dd>
+<dt>¿Como puedo ponerme en contacto con [% PROCESS 'site-name.html' -%]?</dt>
+<dd>Esta es nuestra <a href="/contact">pagina de contacto</a>.</dd>
+<dt>¿Que tipo de problemas puedo notificar con [% PROCESS 'site-name.html' -%]?</dt>
+<dd>Esto depende de la finalidad de [% PROCESS 'site-name.html' -%];
+ en el Reino Unido, FixMyStreet es principalmente para informar cosas que están rotas o sucias o dañadas o desechadas y hay que arreglar, de limpieza o de compensación, tales como:
+ <dl>
+ <dt>- vehículos abandonados<br>
+ - falta de limpieza en las calles <br>
+ - pintadas o graffitis
+ <br>
+ - basura sin recoger o contenedores rotos<br>
+ -
+ farolas rotas o apagadas<br>
+ - Baches</dt>
+ <dd></dd>
+ </dl>
+ </dd>
+<dt>¿Para que NO es [% PROCESS 'site-name.html' -%] ?</dt>
+<dd> </dd>
+<dd>[% PROCESS 'site-name.html' -%] no debe usarse para ponerse en contacto con el Ayuntamiento para todas las incidencias - por favor utilice este sitio sólo para problemas como los anteriores. A menudo los informes de problemas siguen una burocracia y utilizar este sitio para asuntos urgentes pueden retrasarse en llegar al departamento correcto. Usted tendrá que ponerse en contacto con su autoridad directamente ante problemas como:
+ <ul>
+ <li>Comportamientos anti-sociales.
+<li>Cualquier problema de urgencia o emergencias
+<li>Contaminación acustica o ladridos de perros
+<li>Incendios o contaminación por humo u olores
+<li>Las propuestas de los reductores de velocidad / nuevos trazados urbanisticos / etc.
+
+<li>Quejarse de sus vecinos
+<li>Quejarse de las autoridades
+<li>Consumo de drotas, crueldad animal u otras actividades delictivas
+</ul>
+<p>Las autoridades tienen lineas directas para este tipo de notificaciones .</p>
+</dd>
+<dt>¿Como puedo usar esta web? </dt>
+<dd>Después de entrar en un lugar, se le presenta un mapa de esa zona. Puede ver los problemas ya informados en esa área, o reportar los de su propio haciendo clic en el mapa en la localización del problema.</dd>
+<dt>¿Cómo se resuelven los problemas?</dt>
+<dd>Según los informes, se envía un correo electrónico al departamento pertinente. A partir de ese momento puede resolver el problema como normalmente lo haría. Alternativamente, se puede discutir el problema en el sitio web con los demás, y luego juntos requerir al Ayuntamiento que lo arregle, o fijarlo directamente en la web.</dd>
+<dt>¿Es grátis? </dt>
+<dd>Efectivamente el sitio es de uso gratuito. La plataforma arreglamibarrio.org es mantenido por la Asociación Observatorio Ciudadano Municipal de Alcantarilla, asociación sin ánimo de lucro registrada, así que si usted desea hacer una contribución puede hacerla.</dd>
+<dt>¿Puedo usar [% PROCESS 'site-name.html' -%] con mi móvil?</dt>
+<dd>
+<p> [% PROCESS 'site-name.html' -%] la web funciona en su teléfono móvil, tiene un diseño "responsive" que se adapta al tamaño de su pantalla de forma automática.</p>
+</dd>
+</dl>
+<h2><a name="practical"></a>Cuestiones prácticas </h2>
+<dl>
+<dt>Pertenezco a un Ayuntamiento, ¿dónde envían sus incidencias?</dt>
+<dd>Usted puede crear una incidencia de prueba o contactarnos para saber dónde van los informes. Puede contactar con nosotros para actualizar la dirección o direcciones que utilizamos.</dd>
+<dt>Pertenezco a un Ayuntamiento, ¿podríamos tener [% PROCESS 'site-name.html' -%]
+en nuestra web?</dt>
+<dd>Es posible, pongase en contacto con nosotros y lo estudiaremos </dd>
+<dt>¿Eliminan contenido ilegal u ofensivo? </dt>
+<dd>[% PROCESS 'site-name.html' -%] no es responsable de el contenido o exactitud del material presentado por sus usuarios. Nos reservamos el derecho de editar o eliminar cualquier problema o actualizaciones que consideremos inadecuadas.</dd>
+<dt>¿Porque no puedo alejar más el zoom del mapa?</dt>
+<dd>Intentamos mantener a [% PROCESS 'site-name.html' -%] centrado en la localidad, por lo que restringimos el movimiento a las zonas cubiertas. El mapa le permitirá ver todos los informes que ha realizado, estén donde estén. Si usted es del Ayuntamiento, el correo electrónico de la incidencia también podría contener la ruta más cercana al pin en el mapa.</dd>
+<h2><a name="organisation"></a>Preguntas a la organización </h2>
+<dl>
+<dt>¿Quién hizo [% PROCESS 'site-name.html' -%]?</dt>
+<dd>La plataforma fue creada por mysociety.
+<dt>¿Necesita ayuda con el proyecto? </dt>
+<dd>Sí, toda ayuda, técnica o no técnica será bienvenida. Por favor, consulte nuestra página de participación.</dd>
+<dt> Me gustaría un sitio como este para mi propio lugar / ¿dónde está el "código fuente" de esta plataforma?</dt>
+<dd>
+El software que está detrás de este sitio es de código abierto, y se encuentra recogido bajo licencia de software GNU Affero GPL. Usted puede
+<a href="https://github.com/mysociety/fixmystreet">descargar el codigo fuente</a> y le ayudaremos a desarrollarlo. Le invitamos a utilizarlo en su propio proyecto, aunque también se debe poner a disposición el código fuente para otros proyectos. <a href="https://www.fixmystreet.com/">FixMyStreet.com</a> es el código original, en Reino Unido y
+<a href="http://www.fiksgatami.no/">Fiksgatami</a> es un ejemplo de código que se utiliza en Noruega.</dd>
+</dl>
+[% INCLUDE 'footer.html' pagefooter = 'yes' %]
diff --git a/templates/web/arreglamibarrio/site-name.html b/templates/web/arreglamibarrio/site-name.html new file mode 100644 index 000000000..3b682b1b2 --- /dev/null +++ b/templates/web/arreglamibarrio/site-name.html @@ -0,0 +1 @@ +ArreglaMiBarrio diff --git a/templates/web/barnet/header.html b/templates/web/barnet/header.html index 0e9bbfa42..101d444a7 100644 --- a/templates/web/barnet/header.html +++ b/templates/web/barnet/header.html @@ -15,7 +15,7 @@ <meta name="Keywords" content="fixmystreet barnet pothole streetlights report street problem" /> <meta name="Description" content="FixMyStreet Barnet: report problems in Barnet like graffiti, fly tipping, broken paving slabs, or street lighting" /> - <link rel="Shortcut Icon" type="image/x-icon" href="http://pledgebank.barnet.gov.uk/microsites/barnet/site/favicon.ico" /> + <link rel="Shortcut Icon" type="image/x-icon" href="/cobrands/barnet/img/favicon.ico" /> <link rel="stylesheet" href="[% version('/cobrands/barnet/base.css') %]"> <link rel="stylesheet" href="[% version('/cobrands/barnet/layout.css') %]" media="(min-width:48em)"> @@ -33,13 +33,15 @@ [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %] <script src="[% version('/js/fancybox/jquery.fancybox-1.3.4.pack.js') %]" charset="utf-8"></script> + [% PROCESS 'header_extra.html' %] + </head> <body class="[% bodyclass | html IF bodyclass %]"> <div id="barnet-wrapper"> <div id="ie_wrapper"> <div id="mast"> <div class="pseudoH1"> - <a href="http://www.barnet.gov.uk/"><span>London Borough of Barnet</span> <img src="http://pledgebank.barnet.gov.uk/microsites/barnet/site/images/blank.gif" alt="London Borough of Barnet logo" /></a> + <a href="http://www.barnet.gov.uk/"><span>London Borough of Barnet</span> <img src="/cobrands/barnet/img/blank.gif" alt="London Borough of Barnet logo" /></a> </div> <ul id="skip" class="hidden"> <li><a href="#content" rel="nofollow">Skip to content</a></li> diff --git a/templates/web/base/admin/bodies.html b/templates/web/base/admin/bodies.html index a039f8208..4c95423c0 100644 --- a/templates/web/base/admin/bodies.html +++ b/templates/web/base/admin/bodies.html @@ -35,13 +35,13 @@ [% IF c.cobrand.moniker == 'zurich' %] [% FILTER repeat(4*body.api_key) %] [% END %] [% IF admin_type == 'super' %] - <a href="[% c.uri_for( 'body', id ) %]">[% body.name %]</a> + <a href="[% c.uri_for( 'body', id ) %]">[% body.name | html %]</a> [% ELSE %] - [% body.name %] + [% body.name | html %] [% END %] [% ELSE %] [%# not Zurich: all bodies should be links %] - <a href="[% c.uri_for( 'body', id ) %]">[% body.name %]</a> - [%- ', ' _ body.parent.name IF body.parent -%] + <a href="[% c.uri_for( 'body', id ) %]">[% body.name | html%]</a> + [%- IF body.parent %], [% body.parent.name | html %][% END -%] [% END %] </td> [% IF c.cobrand.moniker == 'zurich' %] diff --git a/templates/web/base/admin/body-form.html b/templates/web/base/admin/body-form.html index 608a77dc2..6b103a7cf 100644 --- a/templates/web/base/admin/body-form.html +++ b/templates/web/base/admin/body-form.html @@ -16,7 +16,7 @@ </div> <p> <label for="name">[% loc('Name') %]</label> - <input type="text" name="name" id="name" value="[% body.name %]" size="50"> + <input type="text" name="name" id="name" value="[% body.name | html %]" size="50"> </p> <div class="admin-hint"> @@ -72,17 +72,21 @@ [% SET body_areas = body.areas %] [% FOR area IN areas %] [% SET aid = area.id %] - <option value="[% area.id %]"[% ' selected' IF body_areas.$aid %]>[% area.name %]</option> + <option value="[% area.id %]"[% ' selected' IF body_areas.$aid %]>[% area.name | html %]</option> [% END %] </select> </p> + <p> + <label for="external_url">[% loc('External URL') %]</label> + <input type="text" name="external_url" id="external_url" value="[% body.external_url | html %]" size="50"> + </p> <div class="admin-hint"> <p>[% loc( "You can mark a body as deleted if you do not want it to be active on the site." ) %]</p> </div> <p> - <label for="deleted">[% loc('Flag as deleted') %]</label> <input type="checkbox" name="deleted" id="deleted" value="1"[% ' checked' IF body.deleted %]> + <label for="deleted" class="inline">[% loc('Flag as deleted') %]</label> </p> <div class="admin-hint"> @@ -124,7 +128,7 @@ </div> <p> <label for="endpoint">[% loc('Endpoint') %]</label> - <input type="text" name="endpoint" id="endpoint" value="[% body.endpoint %]" size="50"> + <input type="text" name="endpoint" id="endpoint" value="[% body.endpoint | html %]" size="50"> </p> <div class="admin-hint"> @@ -137,7 +141,7 @@ </div> <p> <label for="jurisdiction">Open311 Jurisdiction</label> - <input type="text" name="jurisdiction" id="jurisdiction" value="[% body.jurisdiction %]" size="50"> + <input type="text" name="jurisdiction" id="jurisdiction" value="[% body.jurisdiction | html %]" size="50"> </p> <div class="admin-hint"> @@ -150,7 +154,7 @@ </div> <p> <label for="api_key">Open311 API Key</label> - <input type="text" name="api_key" id="api_key" value="[% body.api_key %]" size="25"> + <input type="text" name="api_key" id="api_key" value="[% body.api_key | html %]" size="25"> </p> <div class="admin-hint"> @@ -180,6 +184,9 @@ <p> <label for"comment_user_id">User ID to attribute fetched comments to</label> <input type="text" name="comment_user_id" value="[% body.comment_user_id %]"> + [% IF body.comment_user_id %] + <a href="[% c.uri_for('user_edit', body.comment_user_id) %]">[% loc('edit user') %]</a> + [% END %] </p> <div class="admin-hint"> diff --git a/templates/web/base/admin/body.html b/templates/web/base/admin/body.html index cd87a5af8..84ea6840c 100644 --- a/templates/web/base/admin/body.html +++ b/templates/web/base/admin/body.html @@ -13,14 +13,22 @@ [% IF example_pc %] <a href="[% c.uri_for_email( '/around', { pc => example_pc } ) %]" class="admin-offsite-link">[% tprintf( loc('Example postcode %s'), example_pc ) | html %]</a> | [% END %] - [% IF c.cobrand.moniker == 'emptyhomes' %] - <a href="[% c.uri_for( 'reports', search => 'body:' _ body_id ) %]">[% loc('List all reported problems' ) %]</a> | - [% ELSE %] + [% loc('Area covered') %]: + [% SET body_areas = body.areas %] + [% FOR area IN areas %] + [% SET aid = area.id %] + [% IF body_areas.$aid %] + <a href="[% c.config.MAPIT_URL %][% + '/' UNLESS c.config.MAPIT_URL.search('/$') + %]area/[% aid %].html" class="admin-offsite-link">[% area.name | html %]</a> + [% END %] + [% END %] +<br> <a href="[% c.uri_for_email( '/reports/' _ body_id ) %]" class="admin-offsite-link">[% loc('List all reported problems' ) %]</a> | - [% END %] - <a href="[% c.uri_for( 'body', body_id, { text => 1 } ) %]">[% loc('Text only version') %]</a> + <a href="[% c.uri_for( 'body', body_id, { text => 1 } ) %]">[% loc('Text only version') %]</a> </p> + [% IF body.send_method == 'Open311' %] <h2> Council contacts configured via Open311 @@ -65,7 +73,7 @@ </tr> [% WHILE ( cat = contacts.next ) %] <tr [% IF cat.deleted %]class="is-deleted"[% END %]> - <td class="contact-category"><a href="[% c.uri_for( 'body', body_id, cat.category ) %]">[% cat.category %]</a> + <td class="contact-category"><a href="[% c.uri_for( 'body', body_id, cat.category ) %]">[% cat.category | html %]</a> <br>[% cat.email | html %]</td> <td> [% loc('Confirmed') %]: @@ -79,10 +87,10 @@ <br>[% loc('Devolved') %]: [%- IF body.can_be_devolved AND cat.send_method %][% loc('Yes') %][% ELSE %][% loc('No') %][% END %] </td> - <td>[% cat.editor %] + <td>[% cat.editor | html %] <br><small>[% PROCESS format_time time=cat.whenedited %]</small></td> <td>[% cat.note | html %]</td> - <td><input type="checkbox" name="confirmed" value="[% cat.category %]"></td> + <td><input type="checkbox" name="confirmed" value="[% cat.category | html %]"></td> </tr> [% END %] </table> diff --git a/templates/web/base/admin/category_edit.html b/templates/web/base/admin/category_edit.html index ef7a0a11c..b827a4b6d 100644 --- a/templates/web/base/admin/category_edit.html +++ b/templates/web/base/admin/category_edit.html @@ -23,6 +23,11 @@ <p><strong>[% loc('Category:') %] </strong>[% contact.category | html %] <input type="hidden" name="category" value="[% contact.category | html %]" > <input type="hidden" name="token" value="[% token %]" > + [% IF contact.extra %] + <p><strong>[% loc('Extra data:') %] </strong> + [% USE Dumper %] + [% Dumper.dump(contact.extra) | html %]</p> + [% END %] <p><strong>[% loc('Email:') %] </strong> <input type="text" name="email" value="[% contact.email | html %]" size="30"> @@ -48,17 +53,17 @@ <form method="post" action="[% c.uri_for('body', body_id ) %]" enctype="application/x-www-form-urlencoded" accept-charset="utf-8"> <p> <label for="endpoint">Endpoint</label> - <input type="text" name="endpoint" id="endpoint" value="[% contact.endpoint %]" size="50"> + <input type="text" name="endpoint" id="endpoint" value="[% contact.endpoint | html %]" size="50"> </p> <p> <label for="jurisdiction">Jurisdiction</label> - <input type="text" name="jurisdiction" id="jurisdiction" value="[% contact.jurisdiction %]" size="50"> + <input type="text" name="jurisdiction" id="jurisdiction" value="[% contact.jurisdiction | html %]" size="50"> </p> <p> <label for="api_key">Api Key</label> - <input type="text" name="api_key" id="api_key" value="[% contact.api_key %]" size="25"> + <input type="text" name="api_key" id="api_key" value="[% contact.api_key | html %]" size="25"> </p> <p> @@ -93,7 +98,7 @@ <td>[% PROCESS highlightchanged old=prev new=contact value='email' %]</td> <td>[% PROCESS highlightchanged_yesno old=prev new=contact value='confirmed' %]</td> <td>[% PROCESS highlightchanged_yesno old=prev new=contact value='deleted' %]</td> - <td>[% contact.editor %]</td> + <td>[% contact.editor | html %]</td> <td>[% contact.note | html %]</td> </tr> [%- prev = contact %] diff --git a/templates/web/base/admin/config_page.html b/templates/web/base/admin/config_page.html index 211d41f31..7c9b5e317 100644 --- a/templates/web/base/admin/config_page.html +++ b/templates/web/base/admin/config_page.html @@ -37,6 +37,7 @@ running version <strong>[% git_version || 'unknown' %]</strong>. [% INCLUDE subsection heading="URLs" %] [% INCLUDE with_cobrand value="BASE_URL" cob=c.cobrand.base_url %] [% INCLUDE with_cobrand value="ADMIN_BASE_URL" cob=c.cobrand.admin_base_url %] +[% INCLUDE just_value value="SECURE_PROXY_SSL_HEADER" %] [% INCLUDE subsection heading="Display" %] <tr> @@ -84,10 +85,20 @@ running version <strong>[% git_version || 'unknown' %]</strong>. cob = discob %] [% INCLUDE subsection heading="MapIt" %] -[% INCLUDE just_value value="MAPIT_URL" %] +[% INCLUDE just_value value="MAPIT_URL" + conf = "<a href='" _ c.config.MAPIT_URL _ "'>" _ c.config.MAPIT_URL _ "</a>" %] [% INCLUDE with_cobrand value="MAPIT_TYPES" cob = c.cobrand.area_types %] -[% INCLUDE just_value value="MAPIT_ID_WHITELIST" %] +<tr> + <td>MAPIT_ID_WHITELIST</td> + <td colspan=2> + [% FOR id IN c.config.MAPIT_ID_WHITELIST %] + <a href="[% c.config.MAPIT_URL %][% + '/' UNLESS c.config.MAPIT_URL.search('/$') + %]area/[% id %].html">[% id %]</a>[% ',' UNLESS loop.last %] + [% END %] + </td> +</tr> [% INCLUDE just_value value="MAPIT_GENERATION" %] [% INCLUDE with_cobrand value="MAPIT_TYPES_CHILDREN" cob = c.cobrand.area_types_children %] diff --git a/templates/web/base/admin/header.html b/templates/web/base/admin/header.html index 9f3503e20..6282bf383 100644 --- a/templates/web/base/admin/header.html +++ b/templates/web/base/admin/header.html @@ -1,4 +1,4 @@ -[% INCLUDE 'header.html' admin = 1, bodyclass = 'fullwidthpage admin show-admin-notes' %] +[% INCLUDE 'header.html' admin = 1, bodyclass = 'fullwidthpage admin' %] <style type="text/css"> dt { clear: left; float: left; font-weight: bold; } dd { margin-left: 8em; } diff --git a/templates/web/base/admin/report_edit.html b/templates/web/base/admin/report_edit.html index 12560fdf3..d488dcadc 100644 --- a/templates/web/base/admin/report_edit.html +++ b/templates/web/base/admin/report_edit.html @@ -20,14 +20,27 @@ <li><label for='detail'>[% loc('Details:') %]</label> <textarea name='detail' id='detail' cols=60 rows=10>[% problem.detail | html %]</textarea></li> -<li>[% loc('Co-ordinates:') %] [% problem.latitude %], [% problem.longitude %] +<li>[% loc('Co-ordinates:') %] +<a href="[% c.config.MAPIT_URL %][% + '/' UNLESS c.config.MAPIT_URL.search('/$') +%]point/4326/[% problem.longitude %],[% problem.latitude %].html" +class="admin-offsite-link">[% problem.latitude %], [% problem.longitude %]</a> ( [% SET postcode_safe = problem.postcode | html; tprintf( loc('originally entered: “%s”'), postcode_safe ) %], [% IF problem.used_map %][% loc('used map') %][% ELSE %][% loc("didn't use map") %][% END %])</li> -<li>[% loc('For council(s):') %] [% IF problem.bodies_str %][% problem.bodies_str %][% ELSE %]<em>[% loc('None' ) %]</em>[% END %] ([% loc('other areas:') %] [% problem.areas | remove('^,') | remove( ',$' ) %])</li> +<li>[% loc('Body:') %] + [% IF problem.bodies_str %] + [% FOREACH body IN problem.bodies.values %] + <a href="[% c.uri_for('body', body.id) %]">[% body.name | html %]</a> + [%- ',' IF NOT loop.last %] + [% END %] + [% ELSE %] + <em>[% loc('None' ) %]</em> + [% END %] + ([% loc('other areas:') %] [% problem.areas | remove('^,') | remove( ',$' ) %])</li> [% IF problem.extra.address %] <li>[% loc('Property address:') %] [% problem.extra.address | html %]</li> [% END %] @@ -68,7 +81,10 @@ <li>[% loc('Phone:') %] [% problem.user.phone | html %]</li> <li>[% loc('Created:') %] [% PROCESS format_time time=problem.created %]</li> <li>[% loc('Confirmed:') %] [% PROCESS format_time time=problem.confirmed no_time='-' %]</li> -<li>[% loc('Sent:') %] [% PROCESS format_time time=problem.whensent %] [% IF problem.state == 'confirmed' %]<input onclick="return confirm('[% loc('You really want to resend?') %]')" type="submit" name="resend" value="[% loc('Resend report') %]">[% END %]</li> +<li>[% loc('Sent:') %] [% PROCESS format_time time=problem.whensent %] +[% IF problem.state == 'confirmed' AND problem.whensent %]<input onclick="return confirm('[% loc('You really want to resend?') %]')" type="submit" name="resend" value="[% loc('Resend report') %]">[% END %] +[% IF NOT problem.whensent %]<input type="submit" name="mark_sent" value="[% loc('Mark as sent') %]">[% END %] +</li> <li>[% loc('Last update:') %] [% PROCESS format_time time=problem.lastupdate %]</li> <li>[% loc('Service:') %] [% problem.service %]</li> <li>[% loc('Cobrand:') %] [% problem.cobrand %]</li> diff --git a/templates/web/base/admin/user-form.html b/templates/web/base/admin/user-form.html index 4a57b05a0..3956e8533 100644 --- a/templates/web/base/admin/user-form.html +++ b/templates/web/base/admin/user-form.html @@ -34,8 +34,9 @@ [% FOR body IN bodies %] <option value="[% body.id %]"[% ' selected' IF body.id == user.from_body.id %]>[% body.name %]</option> [% END %] - </li> </select> + [% IF user.from_body AND user.has_permission_to('moderate', user.from_body.id) %]*[% END %] + </li> [% IF c.cobrand.moniker != 'zurich' %] <li> <div class="admin-hint"> diff --git a/templates/web/base/admin/users.html b/templates/web/base/admin/users.html index db97c7d59..19a3de03c 100644 --- a/templates/web/base/admin/users.html +++ b/templates/web/base/admin/users.html @@ -24,7 +24,9 @@ <tr> <td>[% PROCESS value_or_nbsp value=user.name %]</td> <td><a href="[% c.uri_for( 'reports', search => user.email ) %]">[% PROCESS value_or_nbsp value=user.email %]</a></td> - <td>[% PROCESS value_or_nbsp value=user.from_body.name %]</td> + <td>[% PROCESS value_or_nbsp value=user.from_body.name %] + [% IF user.from_body AND user.has_permission_to('moderate', user.from_body.id) %] * [% END %] + </td> [% IF c.cobrand.moniker != 'zurich' %] <td>[% user.flagged == 2 ? loc('(Email in abuse table)') : user.flagged ? loc('Yes') : ' ' %]</td> [% END %] diff --git a/templates/web/base/alert/index.html b/templates/web/base/alert/index.html index e3dead34a..314008846 100644 --- a/templates/web/base/alert/index.html +++ b/templates/web/base/alert/index.html @@ -1,4 +1,4 @@ -[% INCLUDE 'header.html', title = loc('Local RSS feeds and email alerts'), bodyclass = 'twothirdswidthpage alertindex' %] +[% INCLUDE 'header.html', title = loc('Local RSS feeds and email alerts'), bodyclass = 'twothirdswidthpage' %] <h1>[% loc('Local RSS feeds and email alerts') %]</h1> @@ -37,7 +37,7 @@ To find out what local alerts we have for you, please enter your [% c.cobrand.co </form> [% IF photos.size %] -<div class="sticky-sidebar" id="alert_recent"> +<div id="alert_recent"> <aside> <h2>[% loc('Some photos of recent reports') %]</h2> [% FOREACH p IN photos; diff --git a/templates/web/base/alert/list.html b/templates/web/base/alert/list.html index 447bfcd76..7b262f9e7 100644 --- a/templates/web/base/alert/list.html +++ b/templates/web/base/alert/list.html @@ -21,7 +21,7 @@ <form id="alerts" name="alerts" method="post" action="/alert/subscribe"> [% IF photos.size %] - <div id="alert_photos" class="sticky-sidebar"> + <div id="alert_photos"> <aside> <h2>[% loc('Photos of recent nearby reports') %]</h2> [% FOREACH p IN photos; diff --git a/templates/web/base/around/display_location.html b/templates/web/base/around/display_location.html index 804be9603..3f4ec8881 100755 --- a/templates/web/base/around/display_location.html +++ b/templates/web/base/around/display_location.html @@ -6,14 +6,14 @@ rss_url = pc ? c.uri_for( "/rss/pc", pc ) - : c.uri_for( "/rss/l/$short_latitude,$short_longitude" ); + : c.uri_for( "/rss/l/$latitude,$longitude" ); email_url = c.uri_for( '/alert/list', { - lat => short_latitude, - lon => short_longitude, - feed => "local:$short_latitude:$short_longitude", + lat => latitude, + lon => longitude, + feed => "local:$latitude:$longitude", } ); @@ -21,8 +21,8 @@ '/report/new', { pc => pc - latitude => short_latitude, - longitude => short_longitude, + latitude => latitude, + longitude => longitude, skipped => 1, } ); @@ -45,8 +45,8 @@ [% END %] <input type="hidden" name="pc" value="[% pc | html %]"> - <input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% short_latitude | html %]"> - <input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% short_longitude | html %]"> + <input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% latitude | html %]"> + <input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% longitude | html %]"> [% END %] [% map_html %] diff --git a/templates/web/base/auth/sign_out.html b/templates/web/base/auth/sign_out.html index 571e13f9f..c95efacf5 100644 --- a/templates/web/base/auth/sign_out.html +++ b/templates/web/base/auth/sign_out.html @@ -1,7 +1,10 @@ [% INCLUDE 'header.html', title = loc('Sign out'), bodyclass = 'fullwidthpage' %] -<h1>[% loc('You have been signed out') %]</h1> +<div class="confirmation-header"> + <h1>[% loc('You have been signed out') %]</h1> + <p>[% tprintf( loc('Please feel free to <a href="%s">sign in again</a>, or go back to the <a href="/">front page</a>.'), c.uri_for('/auth') ) %]</p> +</div> -<p>[% tprintf( loc('Please feel free to <a href="%s">sign in again</a>, or go back to the <a href="/">front page</a>.'), c.uri_for('/auth') ) %]</p> +[% INCLUDE next_steps.html %] [% INCLUDE 'footer.html' %] diff --git a/templates/web/base/contact/submit.html b/templates/web/base/contact/submit.html index fc416c2d7..5adb87e2d 100644 --- a/templates/web/base/contact/submit.html +++ b/templates/web/base/contact/submit.html @@ -1,20 +1,21 @@ -[% INCLUDE 'header.html', title = loc('Contact Us'), bodyclass = 'fullwidthpage' %] +[% INCLUDE 'header.html', bodyclass = 'fullwidthpage', title = loc('Contact Us') %] -<h1>[% loc('Contact the team') %]</h1> - [% IF success %] - <p> - [% loc("Thanks for your feedback. We'll get back to you as soon as we can!") %] - </p> - [% display_crosssell_advert( em, form_name, 'emailunvalidated', 1 ) %] + <div class="confirmation-header"> + <h1>[% loc('Thank you for your feedback') %]</h1> + <p>[% loc('We’ll get back to you as soon as we can.') %]</p> + </div> [% ELSE %] - <p> - [% tprintf( loc('Failed to send message. Please try again, or <a href="mailto:%s">email us</a>.'), contact_email ) %] - </p> + <div class="confirmation-header confirmation-header--failure"> + <h1>[% loc('Failed to send message') %]</h1> + <p>[% loc('Try emailing us directly:') %] <a href="mailto:[% contact_email %]">[% contact_email %]</a></p> + </div> [% END %] +[% INCLUDE next_steps.html %] + [% INCLUDE 'footer.html' %] diff --git a/templates/web/base/index-steps.html b/templates/web/base/index-steps.html index fac84faba..431791c20 100644 --- a/templates/web/base/index-steps.html +++ b/templates/web/base/index-steps.html @@ -21,15 +21,8 @@ <li>Or visit the Barangay Center in person</li> <li>Staff? <a href="/auth">Sign in</a> and click on the map! [% ELSE %] - [% IF c.cobrand.moniker == 'makemyisland' %] - <li> - Locate the problem on the - <a href="/around?pc=Fonadhoo">map of the island</a> - </li> - [% ELSE %] - <li>[% question %]</li> - <li>[% loc('Locate the problem on a map of the area') %]</li> - [% END %] + <li>[% question %]</li> + <li>[% loc('Locate the problem on a map of the area') %]</li> <li>[% loc('Enter details of the problem') %]</li> [% IF c.cobrand.is_council %] <li>Confirm the report and [% c.cobrand.council_name %] will investigate</li> diff --git a/templates/web/base/maps/bing.html b/templates/web/base/maps/bing.html new file mode 100644 index 000000000..1747f1bbe --- /dev/null +++ b/templates/web/base/maps/bing.html @@ -0,0 +1,12 @@ +[% map_js = BLOCK %] +<!-- <script type="text/javascript" src="http://ecn.dev.virtualearth.net/mapcontrol/mapcontrol.ashx?v=7.0&mkt=en-GB"></script> --> +<script type="text/javascript" src="[% version('/js/OpenLayers.fixmystreet.js') %]"></script> +<script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script> +<script type="text/javascript" src="[% version('/js/map-bing-ol.js') %]"></script> +<script type="text/javascript" src="[% version('/js/jquery.ba-hashchange.min.js') %]"></script> +<!--[if lte IE 6]> + <link rel="stylesheet" href="/js/OpenLayers-2.13.1/theme/default/ie6-style.css" type="text/css"> +<![endif]--> +[% END %] + +[% map_html = INCLUDE maps/openlayers.html %] diff --git a/templates/web/base/maps/fms.html b/templates/web/base/maps/fms.html index 1cdfc0b35..31e050ba1 100644 --- a/templates/web/base/maps/fms.html +++ b/templates/web/base/maps/fms.html @@ -3,13 +3,11 @@ <script type="text/javascript" src="[% version('/js/OpenLayers.fixmystreet.js') %]"></script> <script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script> <script type="text/javascript" src="[% version('/js/map-bing-ol.js') %]"></script> +<script type="text/javascript" src="[% version('/js/map-fms.js') %]"></script> <script type="text/javascript" src="[% version('/js/jquery.ba-hashchange.min.js') %]"></script> <!--[if lte IE 6]> <link rel="stylesheet" href="/js/OpenLayers-2.13.1/theme/default/ie6-style.css" type="text/css"> <![endif]--> [% END %] -[% map_html = BLOCK %] -[% INCLUDE maps/openlayers.html %] -[% END %] - +[% map_html = INCLUDE maps/openlayers.html include_key = 1 %] diff --git a/templates/web/base/maps/google-ol.html b/templates/web/base/maps/google-ol.html index 919ae073f..ce22fc94c 100644 --- a/templates/web/base/maps/google-ol.html +++ b/templates/web/base/maps/google-ol.html @@ -10,7 +10,7 @@ [% END %] [% map_sub_links = BLOCK %] -<a class="hidden-nojs" id="map_layer_toggle" href="">[% loc('Satellite') %]</a> +<a class="hidden-nojs" id="map_layer_toggle" href="">[% loc('Map') %]</a> [% END %] [% map_html = BLOCK %] diff --git a/templates/web/base/maps/mapquest-attribution.html b/templates/web/base/maps/mapquest-attribution.html index 60aa1b000..804710ad1 100644 --- a/templates/web/base/maps/mapquest-attribution.html +++ b/templates/web/base/maps/mapquest-attribution.html @@ -10,5 +10,4 @@ [% map_html = BLOCK %] [% INCLUDE maps/openlayers.html %] -<div class="olControlAttribution" style="position: absolute;">Data, imagery and map information provided by <a href="http://www.mapquest.com/">MapQuest</a> <img src="http://developer.mapquest.com/content/osm/mq_logo.png" />, <a href="http://openstreetmap.org/">Open Street Map</a> and contributors, <a href="http://opendatacommons.org/licenses/odbl/">ODbL</a></div> [% END %] diff --git a/templates/web/base/maps/openlayers.html b/templates/web/base/maps/openlayers.html index d01e98138..27c71f42f 100644 --- a/templates/web/base/maps/openlayers.html +++ b/templates/web/base/maps/openlayers.html @@ -22,6 +22,9 @@ var fixmystreet = { 'numZoomLevels': [% map.numZoomLevels %], 'zoomOffset': [% map.zoomOffset %], 'map_type': [% map.map_type %], +[% IF include_key -%] + 'key': '[% c.config.BING_MAPS_API_KEY %]', +[%- END %] 'pins': [% INCLUDE maps/pins_js.html %] } </script> @@ -49,7 +52,7 @@ var fixmystreet = { [% INCLUDE compass %] </noscript></div> [% IF map.copyright %] - <p id="copyright">[% map.copyright %]</p> + <div class="olControlAttribution" style="position: absolute;">[% map.copyright %]</div> [% END %] diff --git a/templates/web/base/maps/osm-toner-lite.html b/templates/web/base/maps/osm-toner-lite.html new file mode 100644 index 000000000..64fa91937 --- /dev/null +++ b/templates/web/base/maps/osm-toner-lite.html @@ -0,0 +1,14 @@ +[% map_js = BLOCK %] +<script type="text/javascript" src="[% version('/js/OpenLayers.fixmystreet.js') %]"></script> +<script type="text/javascript" src="https://stamen-maps.a.ssl.fastly.net/js/tile.stamen.js?v1.3.0"></script> +<script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script> +<script type="text/javascript" src="[% version('/js/map-toner-lite.js') %]"></script> +<script type="text/javascript" src="[% version('/js/jquery.ba-hashchange.min.js') %]"></script> +<!--[if lte IE 6]> + <link rel="stylesheet" href="/js/OpenLayers-2.13.1/theme/default/ie6-style.css" type="text/css"> +<![endif]--> +[% END %] + +[% map_html = BLOCK %] +[% INCLUDE maps/openlayers.html %] +[% END %] diff --git a/templates/web/base/maps/osm.html b/templates/web/base/maps/osm.html index 3e1e1aec8..0b2db1a53 100644 --- a/templates/web/base/maps/osm.html +++ b/templates/web/base/maps/osm.html @@ -10,5 +10,4 @@ [% map_html = BLOCK %] [% INCLUDE maps/openlayers.html %] -<div class="olControlAttribution" style="position: absolute;">© <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors</div> [% END %] diff --git a/templates/web/base/next_steps.html b/templates/web/base/next_steps.html new file mode 100644 index 000000000..9d5b22c80 --- /dev/null +++ b/templates/web/base/next_steps.html @@ -0,0 +1,5 @@ +[%# +Override this file in your cobrand to show promotions or suggested next steps +to your users after they perform major interactions like confirming or updating +problem reports, setting up local area alerts, or signing out. +%] diff --git a/templates/web/base/open311/index.html b/templates/web/base/open311/index.html index df36bcfc9..502b1a69a 100644 --- a/templates/web/base/open311/index.html +++ b/templates/web/base/open311/index.html @@ -95,7 +95,7 @@ for council problem-reporting systems.</p> <ul> -[% jurisdiction_id = 'fiksgatami.no' %] +[% jurisdiction_id = c.cobrand.jurisdiction_id_example %] [% examples = [ { url = c.cobrand.base_url _ "/open311/v2/discovery.xml?jurisdiction_id=$jurisdiction_id", diff --git a/templates/web/base/questionnaire/completed-open.html b/templates/web/base/questionnaire/completed-open.html index c860b7341..0be40ac86 100644 --- a/templates/web/base/questionnaire/completed-open.html +++ b/templates/web/base/questionnaire/completed-open.html @@ -1,11 +1,3 @@ -[% IF c.cobrand.is_council %] -<p style="font-size: 150%"> -Thank you very much for filling in our questionnaire. -</p> -[% ELSE %] -[% loc('<p style="font-size:150%">We’re sorry to hear that. We have two -suggestions: why not try writing to your local representatives or, if -it’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>') %] +[% IF ! c.cobrand.is_council %] + <p>[% loc('We’re sorry to hear the problem’s not fixed. Why not try writing to your local representatives?') %]</p> [% END %] diff --git a/templates/web/base/questionnaire/completed.html b/templates/web/base/questionnaire/completed.html index 4d848a63c..32aa8bd68 100644 --- a/templates/web/base/questionnaire/completed.html +++ b/templates/web/base/questionnaire/completed.html @@ -1,28 +1,21 @@ -[% - INCLUDE 'header.html', title = loc('Questionnaire') -%] +[% INCLUDE 'header.html', bodyclass = 'fullwidthpage', title = loc('Questionnaire') %] -[% advert_outcome = 1 %] +<div class="confirmation-header"> -[% IF been_fixed == 'Unknown' %] + <h1>[% loc('Thank you for your feedback') %]</h1> -[% loc('<p>Thank you very much for filling in our questionnaire; if you -get some more information about the status of your problem, please come back to the -site and leave an update.</p>') %] + [% IF been_fixed == 'Unknown' %] + <p>[% loc('If you get some more information about the status of your problem, please come back to the site and leave an update.') %]</p> -[% ELSIF new_state == 'confirmed' OR (!new_state AND problem.is_open) OR (!new_state AND problem.is_closed) %] + [% ELSIF new_state == 'confirmed' OR (!new_state AND problem.is_open) OR (!new_state AND problem.is_closed) %] + [% INCLUDE 'questionnaire/completed-open.html' %] -[% INCLUDE 'questionnaire/completed-open.html' %] -[% advert_outcome = 0 %] + [% ELSIF been_fixed == 'Yes' %] + <p>[% loc('Glad to hear it’s been fixed!') %]</p> -[% ELSIF been_fixed == 'Yes' %] + [% END %] -[% loc('<p style="font-size:150%">Thank you very much for filling in our questionnaire; glad to hear it’s been fixed.</p>') %] - -[% END %] - -[% IF advert_outcome %] - [% display_crosssell_advert( problem.user.email, problem.name, 'council', problem.bodies_str ) %] -[% END %] +</div> +[% INCLUDE next_steps.html %] [% INCLUDE 'footer.html' %] diff --git a/templates/web/base/report/_council_sent_info.html b/templates/web/base/report/_council_sent_info.html index 958562dc2..4496611e0 100644 --- a/templates/web/base/report/_council_sent_info.html +++ b/templates/web/base/report/_council_sent_info.html @@ -1,5 +1,5 @@ [% IF problem.whensent || problem.can_display_external_id %] - <small class="council_sent_info"><br> + <p class="council_sent_info"> [% problem.processed_summary_string(c) %] - </small> + </p> [% END %] diff --git a/templates/web/base/report/_main.html b/templates/web/base/report/_main.html index 00b0188af..a7aafb6d0 100644 --- a/templates/web/base/report/_main.html +++ b/templates/web/base/report/_main.html @@ -52,18 +52,19 @@ </div> [% END %] - <p><em> - [% problem.meta_line(c) | html %] - [%- IF !problem.used_map AND c.cobrand.moniker != 'emptyhomes' %]; <strong>[% loc('there is no pin shown as the user did not use the map') %]</strong>[% END %] + <p class="report_meta_info"> + [% problem.meta_line(c) | html %] + [%- IF !problem.used_map AND c.cobrand.moniker != 'emptyhomes' %]; <strong>([% loc('there is no pin shown as the user did not use the map') %])</strong>[% END %] + </p> [% IF problem.bodies_str %] [% INCLUDE 'report/_council_sent_info.html' %] [% ELSE %] - <br><small>[% loc('Not reported to council') %]</small> + <p class="council_sent_info">[% loc('Not reported to council') %]</p> [% END %] [% mlog = problem.latest_moderation_log_entry(); IF mlog %] - <br /> Moderated by [% mlog.user.from_body.name %] at [% prettify_dt(mlog.whenedited) %] + <p>Moderated by [% mlog.user.from_body.name %] at [% prettify_dt(mlog.whenedited) %]</p> [% END %] - </em></p> + [% INCLUDE 'report/_support.html' %] [% INCLUDE 'report/photo.html' object=problem %] diff --git a/templates/web/base/report/display.html b/templates/web/base/report/display.html index a7181942f..0731d9f0e 100644 --- a/templates/web/base/report/display.html +++ b/templates/web/base/report/display.html @@ -31,7 +31,7 @@ [% IF c.cobrand.moniker != 'emptyhomes' %] <p style="padding-bottom: 0.5em; border-bottom: dotted 1px #999999;" align="right"> - <a href="[% c.uri_for( '/around', { lat => short_latitude, lon => short_longitude } ) %]">[% loc( 'More problems nearby' ) %]</a> + <a href="[% c.uri_for( '/around', { lat => latitude, lon => longitude } ) %]">[% loc( 'More problems nearby' ) %]</a> </p> <div id="alert_links"> diff --git a/templates/web/base/report/new/category.html b/templates/web/base/report/new/category.html index ee47adc9e..f640c548c 100644 --- a/templates/web/base/report/new/category.html +++ b/templates/web/base/report/new/category.html @@ -9,7 +9,7 @@ [%- ELSE %] [%- loc('Category') %] [%- END -%]</label> - <select name='category' id='form_category'[% ' onchange="form_category_onchange()"' IF category_extras.size %]> + <select name='category' id='form_category'> [% FOREACH cat_op IN category_options %] [% cat_op_lc = cat_op | lower %] <option value='[% cat_op | html %]'[% ' selected' IF report.category == cat_op || category == cat_op_lc || (category_options.size == 2 AND loop.last) -%] diff --git a/templates/web/base/report/new/category_extras.html b/templates/web/base/report/new/category_extras.html index 6b15cbef9..c0f6a7bae 100644 --- a/templates/web/base/report/new/category_extras.html +++ b/templates/web/base/report/new/category_extras.html @@ -1,28 +1,30 @@ <div id="category_meta"> + [%- category = report.category -%] + + [%- IF unresponsive.$category %] + [% INCLUDE "report/new/unresponsive_body.html" body_id = unresponsive.$category %] + [%- END %] + [%- IF report_meta %] - [%- category = report.category %] <h4>Additional Information</h4> [%- FOR meta IN category_extras.$category %] [%- meta_name = meta.code -%] -[% IF field_errors.$meta_name %] - <div class='form-error'>[% field_errors.$meta_name %]</div> -[% END -%] - - <div class="form-field"> - <label for="form_[% meta_name %]">[% meta.description _ ':' %]</label> - [% IF meta.variable != 'false' %] - [% IF meta.exists('values') - <select name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]> - [% FOR option IN meta.values.value.value %] - <option value="[% option.key.0 %]"[% IF option.key.0 == report_meta.$meta_name.value %] selected[% END %]>[% option.name.0 %]</option> + <label for="form_[% meta_name %]">[% meta.description _ ':' %]</label> + [% IF field_errors.$meta_name %] + <p class='form-error'>[% field_errors.$meta_name %]</p> + [% END -%] + [% IF meta.variable != 'false' %] + [% IF meta.exists('values') %] + <select name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]> + [% FOR option IN meta.values.value %] + <option value="[% option.key.0 %]"[% IF option.key.0 == report_meta.$meta_name.value %] selected[% END %]>[% option.name.0 %]</option> + [% END %] + </select> + [% ELSE %] + <input type="text" value="[% report_meta.$meta_name.value | html %]" name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]> [% END %] - </select> - [% ELSE %] - <input type="text" value="[% report_meta.$meta_name | html %]" name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]> [% END %] - [% END %] - </div> [%- END %] [%- END %] </div> diff --git a/templates/web/base/report/new/category_wrapper.html b/templates/web/base/report/new/category_wrapper.html new file mode 100644 index 000000000..f6bb618f0 --- /dev/null +++ b/templates/web/base/report/new/category_wrapper.html @@ -0,0 +1,17 @@ +[% IF js %] + <div id="form_category_row"> + <label for="form_category">[% loc('Category') %]</label> + <select name="category" id="form_category" required><option>[% loc('Loading...') %]</option></select> + </div> +[% ELSE %] + [% IF category_options.size %] + [% IF field_errors.category %] + <p class='form-error'>[% field_errors.category %]</p> + [% END %] + [% PROCESS "report/new/category.html" %] + [% END %] +[% END %] + +[%- IF category_extras %] + [% PROCESS "report/new/category_extras.html" %] +[%- END %] diff --git a/templates/web/base/report/new/councils_text.html b/templates/web/base/report/new/councils_text.html index f526beb28..65e41f0d1 100644 --- a/templates/web/base/report/new/councils_text.html +++ b/templates/web/base/report/new/councils_text.html @@ -1,5 +1,7 @@ [% FILTER collapse %] -[% IF bodies_to_list.size == 0 %] +[% IF unresponsive.ALL %] + [% PROCESS 'report/new/unresponsive_body.html' body_id = unresponsive.ALL %] +[% ELSIF bodies_to_list.size == 0 %] [% PROCESS 'report/new/councils_text_none.html' %] [% ELSIF bodies_to_list.size == bodies.size %] [% PROCESS 'report/new/councils_text_all.html' %] diff --git a/templates/web/base/report/new/councils_text_all.html b/templates/web/base/report/new/councils_text_all.html index e9a008e90..9947625a5 100644 --- a/templates/web/base/report/new/councils_text_all.html +++ b/templates/web/base/report/new/councils_text_all.html @@ -1,27 +1,10 @@ -[%# XXX The below type checking is assuming that a body ID can be used to look up a mapit type. %] <p> -[% IF bodies_to_list.0 != 2489 && bodies_to_list.0 != 2482 && all_areas.${bodies_to_list.0}.type == 'LBO' %] -[% - tprintf( - loc('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.'), - all_body_names.join( '</strong>' _ loc(' or ') _ '<strong>' ) - ); -%] -[% ELSIF all_areas.${bodies_to_list.0}.type == 'LGD' %] -[% - tprintf( - loc('All the information you provide here will be sent to <strong>%s</strong> or <strong>Roads Service</strong>.'), - all_body_names.join( '</strong>' _ loc(' or ') _ '<strong>' ) - ); -%] -[% ELSE %] [% tprintf( loc('All the information you provide here will be sent to <strong>%s</strong>.'), all_body_names.join( '</strong>' _ loc(' or ') _ '<strong>' ) ); %] -[% END %] [% INCLUDE 'report/new/councils_extra_text.html' %] </p> diff --git a/templates/web/base/report/new/councils_text_none.html b/templates/web/base/report/new/councils_text_none.html index 9293c03a7..684879590 100644 --- a/templates/web/base/report/new/councils_text_none.html +++ b/templates/web/base/report/new/councils_text_none.html @@ -1,28 +1,16 @@ -<p>[% +<p> +[% nget( "We do not yet have details for the council that covers this location.", "We do not yet have details for the councils that cover this location.", missing_details_bodies.size || all_areas.size ); -%] -[% loc("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."); -%] -[% IF c.cobrand.moniker == 'fixamingata' AND all_body_names.size == 1 %] -[% - tprintf( - "Du kan istället kontakta %s via <a href='%s'>deras webbsida</a>.", - all_body_names.first, all_body_urls.first); -%] -[% ELSE %] -[% tprintf( loc("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>."), missing_details_body_names.join( loc(' or ') ) || all_area_names.join( loc(' or ') ), c.cobrand.contact_email, c.cobrand.contact_email ); - %] -[% END %] </p> diff --git a/templates/web/base/report/new/fill_in_details.html b/templates/web/base/report/new/fill_in_details.html index 1b8a866fc..9d3f52041 100644 --- a/templates/web/base/report/new/fill_in_details.html +++ b/templates/web/base/report/new/fill_in_details.html @@ -22,8 +22,8 @@ [% END %] - <input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% short_latitude | html %]"> - <input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% short_longitude | html %]"> + <input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% latitude | html %]"> + <input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% longitude | html %]"> [% IF report.used_map %] [% map_html %] diff --git a/templates/web/base/report/new/fill_in_details_form.html b/templates/web/base/report/new/fill_in_details_form.html index cee0244c7..d1431ffd3 100644 --- a/templates/web/base/report/new/fill_in_details_form.html +++ b/templates/web/base/report/new/fill_in_details_form.html @@ -63,26 +63,7 @@ <textarea name="detail" id="form_detail" rows="7" cols="26" required>[% report.detail | html %]</textarea> </div> -[% IF js %] - <div class="form-field" id="form_category_row"> - <label for="form_category">[% loc('Category:') %]</label> - <select name="category" id="form_category" required><option>[% loc('Loading...') %]</option></select> - </div> -[% ELSE %] - [% IF category_options.size %] - [% IF field_errors.category %] - <div class='form-error'>[% field_errors.category %]</div> - [% END %] - - <div class="form-field"> - [% PROCESS "report/new/category.html" %] - </div> - [% END %] -[% END %] - -[%- IF category_extras %] -[% PROCESS "report/new/category_extras.html" %] -[%- END %] +[% PROCESS "report/new/category_wrapper.html" %] [% IF c.cobrand.allow_photo_upload %] [% IF field_errors.photo %] diff --git a/templates/web/base/report/update-form.html b/templates/web/base/report/update-form.html index 50bc2906c..4e762a9a5 100644 --- a/templates/web/base/report/update-form.html +++ b/templates/web/base/report/update-form.html @@ -37,7 +37,7 @@ </select> </div> [% ELSE %] - [% IF problem.is_fixed AND c.user_exists AND c.user.id == problem.user_id %] + [% IF problem.is_fixed AND ((c.user_exists AND c.user.id == problem.user_id) OR alert_to_reporter) %] <div class="checkbox"> <input type="checkbox" name="reopen" id="form_reopen" value="1"[% ' checked' IF update.mark_open %]> <label class="inline" for="form_reopen">[% loc('This problem has not been fixed') %]</label> diff --git a/templates/web/base/report/update.html b/templates/web/base/report/update.html index 048968eae..a5fd97870 100644 --- a/templates/web/base/report/update.html +++ b/templates/web/base/report/update.html @@ -6,17 +6,19 @@ [% INCLUDE meta_line %] </em></p></div> [% IF NOT update.whenanswered %] + + [% INCLUDE 'report/photo.html' object=update %] + <div class="update-text"> [% add_links( update.text ) | html_para %] - [% INCLUDE 'report/photo.html' object=update %] - [% IF c.cobrand.allow_update_reporting %] <p align="right"> <small><a rel="nofollow" class="unsuitable-problem" href="[% c.uri_for( '/contact', { id => update.problem_id, update_id => update.id } ) %]">[% loc('Offensive? Unsuitable? Tell us') %]</a></small> </p> [% END %] </div> + [% END %] </div> [% '</div>' IF loop.last %] diff --git a/templates/web/base/report_created.html b/templates/web/base/report_created.html deleted file mode 100644 index 81083654b..000000000 --- a/templates/web/base/report_created.html +++ /dev/null @@ -1,9 +0,0 @@ -[% INCLUDE 'header.html', title => loc('Report created') %] - -<h1>[% loc("Report created") %]</h1> - -<p> -[% loc('Your report has been created and will shortly be sent.') %] -</p> - -[% INCLUDE 'footer.html' %] diff --git a/templates/web/makemyisland/front/footer-marketing.html b/templates/web/base/reports/_list-filters.html index e69de29bb..e69de29bb 100644 --- a/templates/web/makemyisland/front/footer-marketing.html +++ b/templates/web/base/reports/_list-filters.html diff --git a/templates/web/base/reports/_problem-list.html b/templates/web/base/reports/_problem-list.html new file mode 100644 index 000000000..45746e309 --- /dev/null +++ b/templates/web/base/reports/_problem-list.html @@ -0,0 +1,19 @@ +<section class="full-width"> + [% INCLUDE column + problems = problems.${body.id} + %] +</section> + +[% BLOCK column %] + <ul class="issue-list-a"> + [% IF problems %] + [% FOREACH problem IN problems %] + [% INCLUDE 'reports/_list-entry.html' %] + [% END %] + [% ELSE %] + <li class="empty"> + <p>[% loc('There are no reports to show.') %]</p> + </li> + [% END %] + </ul> +[% END %] diff --git a/templates/web/base/reports/body.html b/templates/web/base/reports/body.html index e1d1b359e..b98c5bec6 100755 --- a/templates/web/base/reports/body.html +++ b/templates/web/base/reports/body.html @@ -43,32 +43,8 @@ [% INCLUDE '_hart_hants_note.html' %] [% END %] -[% IF NOT body.areas.size AND c.cobrand.country == 'GB' %] - <p id="unknown" class="alert">This council no longer exists. - [% IF body.name.match('Penwith|Kerrier|Carrick|Restormel|Caradon|North Cornwall') %] - Its area is now covered by <a href="/reports/Cornwall">Cornwall Council</a>. - [% ELSIF body.name.match('Durham|Easington|Sedgefield|Teesdale|Wear Valley|Derwentside|Chester le Street') %] - Its area is now covered by <a href="/reports/Durham+County">Durham County Council</a>. - [% ELSIF body.name.match('Blyth Valley|Wansbeck|Castle Morpeth|Tynedale|Alnwick|Berwick upon Tweed') %] - Its area is now covered by <a href="/reports/Northumberland">Northumberland County Council</a>. - [% ELSIF body.name.match('North Shropshire|Oswestry|Shrewsbury and Atcham|South Shropshire|Bridgnorth') %] - Its area is now covered by <a href="/reports/Shropshire">Shropshire Council</a>. - [% ELSIF body.name.match('Salisbury|West Wiltshire|Kennet|North Wiltshire') %] - Its area is now covered by <a href="/reports/Wiltshire">Wiltshire Council</a>. - [% ELSIF body.name.match('Ellesmere Port and Neston|Vale Royal|Chester') %] - Its area is now covered by <a href="/reports/Cheshire+West+and+Chester">Cheshire West and Chester Council</a>. - [% ELSIF body.name.match('Macclesfield|Congleton|Crewe and Nantwich') %] - Its area is now covered by <a href="/reports/Cheshire+East">Cheshire East Council</a>. - [% ELSIF body.name.match('Mid Bedfordshire|South Bedfordshire') %] - Its area is now covered by <a href="/reports/Central+Bedfordshire">Central Bedfordshire Council</a>. - [% ELSIF body.name.match('Cheshire') %] - Its area is now covered by <a href="/reports/Cheshire+West+and+Chester">Cheshire West and Chester Council</a> or - <a href="/reports/Cheshire+East">Cheshire East Council</a>. - [% ELSIF body.name.match('Bedfordshire') %] - Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a> or - <a href="/reports/Central+Bedfordshire">Central Bedfordshire Council</a>. - [% END %] - </p> +[% IF NOT body.areas.size AND c.cobrand.moniker == 'fixmystreet' %] + [% INCLUDE 'reports/_body_gone.html' %] [% ELSE %] [% INCLUDE 'reports/_rss.html' %] [% END %] @@ -84,28 +60,13 @@ </p> [% END %] +[% INCLUDE "reports/_list-filters.html", use_section_wrapper = 1 %] + [% INCLUDE 'pagination.html', param = 'p' %] -<section class="full-width"> - [% INCLUDE column - problems = problems.${body.id} - %] -</section> +[% INCLUDE 'reports/_problem-list.html' %] [% INCLUDE 'pagination.html', param = 'p' %] </div> [% INCLUDE 'footer.html' %] - -[% BLOCK column %] -[% IF problems %] - -<ul class="issue-list-a"> -[% FOREACH problem IN problems %] - [% INCLUDE 'reports/_list-entry.html' %] -[% END %] -</ul> - -[% END %] -[% END %] - diff --git a/templates/web/base/reports/index.html b/templates/web/base/reports/index.html index 7f8d7fbf6..4b8c27b92 100755 --- a/templates/web/base/reports/index.html +++ b/templates/web/base/reports/index.html @@ -18,11 +18,11 @@ <thead> <tr> <th class="title">[% loc('Name') %]</th> -<th class="data">[% loc('New <br>problems') %]</th> -<th class="data">[% loc('Older <br>problems') %]</th> -<th class="data">[% loc('Old / unknown <br>problems') %]</th> -<th class="data">[% loc('Recently <br>fixed') %]</th> -<th class="data">[% loc('Older <br>fixed') %]</th> +<th title="[% loc('Reported within the last four weeks') %]" class="data">[% loc('New <br>problems') %]</th> +<th title="[% loc('Open for more than four weeks, with an update within the past eight weeks') %]" class="data">[% loc('Older <br>problems') %]</th> +<th title="[% loc('Open, but not had any update in eight weeks') %]" class="data">[% loc('Old / unknown <br>problems') %]</th> +<th title="[% loc('Marked fixed/closed in the past eight weeks') %]" class="data">[% loc('Recently <br>fixed') %]</th> +<th title="[% loc('Marked fixed/closed more than eight weeks ago') %]" class="data">[% loc('Older <br>fixed') %]</th> </tr> </thead> @@ -44,4 +44,11 @@ </tbody> </table> +<script type="text/javascript" src="[% version('/js/jquery.fixedthead.js') %]"></script> +<script type="text/javascript"> +$(function(){ + $('.nicetable thead').fixedThead(); +}); +</script> + [% INCLUDE 'footer.html', pagefooter = 'yes' %] diff --git a/templates/web/base/tokens/confirm_alert.html b/templates/web/base/tokens/confirm_alert.html index a33f7e92a..f0ad12ff8 100644 --- a/templates/web/base/tokens/confirm_alert.html +++ b/templates/web/base/tokens/confirm_alert.html @@ -1,20 +1,19 @@ [% INCLUDE 'header.html', bodyclass = 'fullwidthpage', title => loc('Local RSS feeds and email alerts') %] <div class="confirmation-header"> - <h1>[% loc('Local RSS feeds and email alerts') %]</h1> -<p> -[% IF confirm_type == 'subscribe' %] - [% loc('You have successfully confirmed your alert.') %] -[% ELSIF confirm_type == 'unsubscribe' %] - [% loc('You have successfully deleted your alert.') %] -[% ELSIF confirm_type == 'created' %] - [% loc('You have successfully created your alert.') %] -[% END %] -</p> + [% IF confirm_type == 'subscribe' || confirm_type == 'created' %] + <h1>[% loc('Email alert created') %]</h1> + <p>[% loc('Why stop there? <a href="/alert">Set up more alerts</a> for free.') %]</p> + + [% ELSIF confirm_type == 'unsubscribe' %] + <h1>[% loc('Email alert deleted') %]</h1> + <p>[% loc('Inbox zero, here we come!') %]</p> + + [% END %] </div> -[% display_crosssell_advert( alert.user.email, alert.user.name ) %] +[% INCLUDE next_steps.html %] [% INCLUDE 'footer.html' %] diff --git a/templates/web/base/tokens/confirm_problem.html b/templates/web/base/tokens/confirm_problem.html index 217fb0a72..5892d0f9e 100644 --- a/templates/web/base/tokens/confirm_problem.html +++ b/templates/web/base/tokens/confirm_problem.html @@ -1,38 +1,30 @@ [% INCLUDE 'header.html', bodyclass = 'fullwidthpage', title = loc('Confirmation') %] <div class="confirmation-header"> - <h1>[% loc('Your problem has been confirmed!') %]</h1> -[% IF c.cobrand.is_council %] + <h1><a href="[% c.cobrand.base_url_for_report( report ) %][% report.url %]">[% report.title %]</a></h1> - <p> - Thank you. You have successfully confirmed your report - and this will now be investigated by the council. - You can <a href="[% c.cobrand.base_url_for_report( problem ) %][% problem.url %]">view the problem on this site</a>. - </p> - <p>Your reference for this problem is [% problem.id %], please quote it in any enquiries.</p> + [% IF c.cobrand.is_council %] + <h2>Your issue is on its way to the council.</h2> + <p>Your reference for this report is [% report.id %], please quote it in any enquiries.</p> -[% ELSE %] + [% ELSE %] + <h2>[% loc('Thank you for reporting this issue!') %]</h2> + [% IF report.bodies_str %] + <p>[% loc('It’s on its way to the council right now.') %]</p> + [% END %] - <p> - [% loc('Thank you for reporting this issue') %]. - [% IF problem.bodies_str; - loc('<strong>We will now send it to the council</strong>.'); - END; %] - </p> + [% END %] - <p> - [% tprintf( - loc( 'You can <a href="%s%s">view the problem on this site</a>.' ), - c.cobrand.base_url_for_report( problem ), - problem.url - ); %] - </p> - -[% END %] +[% TRY %][% INCLUDE 'tokens/_extras_confirm.html' %][% CATCH file %][% END %] </div> -[% display_crosssell_advert( problem.user.email, problem.name ) %] +[% INCLUDE + next_steps.html, + just_interacted = 1, + share_url = c.cobrand.base_url_for_report(report) _ report.url, + twitter_comment = loc('I just reported a problem on @fixmystreet') +%] [% INCLUDE 'footer.html' %] diff --git a/templates/web/base/tokens/confirm_update.html b/templates/web/base/tokens/confirm_update.html index 21fcfc4ff..01ac992ab 100644 --- a/templates/web/base/tokens/confirm_update.html +++ b/templates/web/base/tokens/confirm_update.html @@ -1,24 +1,26 @@ -[% INCLUDE 'header.html', bodyclass = 'fullwidthpage', title => loc('Confirmation') %] +[% INCLUDE 'header.html', bodyclass = 'fullwidthpage', title = loc('Confirmation'); -<div class="confirmation-header"> - <h1>[% loc('Your update has been confirmed!') %]</h1> +DEFAULT problem = update.problem; +SET problem_url = c.uri_for('/report', problem.id); +IF update; + problem_url = problem_url _ '#update_' _ update.id; +END; -<p class="confirmed"> -[% IF creator_fixed %] -[% - tprintf(loc('Thank you — you can <a href="%s">view your updated problem</a> on the site.'), - c.uri_for( '/report', problem_id ) ); -%] -[% ELSE %] -[% - tprintf( loc('You have successfully confirmed your update and you can now <a href="%s">view it on the site</a>.'), - c.uri_for( '/report', update.problem.id ) _ '#update_' _ update.id ); %] -[% END %] -</p> + +<div class="confirmation-header"> + + <h1><a href="[% problem_url %]">[% problem.title %]</a></h1> + + <h2>[% loc('Thank you for updating this issue!') %]</h2> </div> -[% display_crosssell_advert( update.user.email, update.name ) %] +[% INCLUDE + next_steps.html, + just_interacted = 1, + share_url = c.cobrand.base_url_for_report(problem) _ problem.url, + twitter_comment = loc('I just updated a problem on @fixmystreet') +%] [% INCLUDE 'footer.html' %] diff --git a/templates/web/bromley/front/pre-steps.html b/templates/web/bromley/front/pre-steps.html new file mode 100644 index 000000000..a5523c862 --- /dev/null +++ b/templates/web/bromley/front/pre-steps.html @@ -0,0 +1,5 @@ +<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> diff --git a/templates/web/bromley/header.html b/templates/web/bromley/header.html index 4f885f513..9559592ff 100644 --- a/templates/web/bromley/header.html +++ b/templates/web/bromley/header.html @@ -40,6 +40,8 @@ <link rel="Shortcut Icon" type="image/x-icon" href="/cobrands/bromley/favicon.ico"> + [% PROCESS 'header_extra.html' %] + </head> <body class="[% bodyclass | html IF bodyclass %]"> [%# ie_wrapper is to prevent a horizontal scrollbar in IE7, it appears (from Bromley site) %] diff --git a/templates/web/bromley/report/display.html b/templates/web/bromley/report/display.html index f30b4b86d..75b7700a5 100644 --- a/templates/web/bromley/report/display.html +++ b/templates/web/bromley/report/display.html @@ -25,7 +25,7 @@ <ul id="key-tools"> <li><a rel="nofollow" id="key-tool-report-abuse" class="abuse" href="[% c.uri_for( '/contact', { id => problem.id } ) %]">[% loc('Report abuse') %]</a></li> <li><a rel="nofollow" id="key-tool-report-updates" class="feed" href="[% c.uri_for( '/alert/subscribe', { id => problem.id } ) %]">[% loc('Get updates' ) %]</a></li> - <li><a class="chevron" id="key-tool-problems-nearby" href="[% c.uri_for( '/around', { lat => short_latitude, lon => short_longitude } ) %]">[% loc( 'Problems nearby' ) %]</a></li> + <li><a class="chevron" id="key-tool-problems-nearby" href="[% c.uri_for( '/around', { lat => latitude, lon => longitude } ) %]">[% loc( 'Problems nearby' ) %]</a></li> </ul> <div id="report-updates-data" class="hidden-js"> diff --git a/templates/web/bromley/report/new/fill_in_details_form.html b/templates/web/bromley/report/new/fill_in_details_form.html index e5c920eae..6bf077322 100644 --- a/templates/web/bromley/report/new/fill_in_details_form.html +++ b/templates/web/bromley/report/new/fill_in_details_form.html @@ -60,24 +60,7 @@ [% END %] <textarea rows="7" cols="26" name="detail" id="form_detail" placeholder="[% loc('Please describe the exact location of the report. Example: “2 dumped mattresses outside Number 19 Stockwell Close”') %]" required>[% report.detail | html %]</textarea> - [% IF js %] - <div id="form_category_row"> - <label for="form_category">[% loc('Category') %]</label> - <select name="category" id="form_category" required><option>[% loc('Loading...') %]</option></select> - </div> - [% ELSE %] - [% IF category_options.size %] - [% IF field_errors.category %] - <p class='form-error'>[% field_errors.category %]</p> - [% END %] - - [% PROCESS "report/new/category.html" %] - [% END %] - [% END %] - - [%- IF category_extras %] - [% PROCESS "report/new/category_extras.html" %] - [%- END %] + [% PROCESS "report/new/category_wrapper.html" %] [% IF c.cobrand.allow_photo_upload %] [% IF field_errors.photo %] diff --git a/templates/web/eastsussex/report/new/category.html b/templates/web/eastsussex/report/new/category.html index 1759f450f..e4a7ed456 100644 --- a/templates/web/eastsussex/report/new/category.html +++ b/templates/web/eastsussex/report/new/category.html @@ -6,7 +6,7 @@ <label for='form_category' id="form_category_label"> Type </label> - <select name='category' id='form_category'[% ' onchange="form_category_onchange()"' IF category_extras.size %]> + <select name='category' id='form_category'> [% FOREACH cat_op IN category_options %] [% cat_op_lc = cat_op | lower %] [% IF loop.first; cat_op = '-- Pick a type --'; END %] diff --git a/templates/web/eastsussex/report/update-form.html b/templates/web/eastsussex/report/update-form.html index e4314b81d..af966f417 100644 --- a/templates/web/eastsussex/report/update-form.html +++ b/templates/web/eastsussex/report/update-form.html @@ -82,7 +82,7 @@ [% END %] </select> [% ELSE %] - [% IF problem.is_fixed AND c.user_exists AND c.user.id == problem.user_id %] + [% IF problem.is_fixed AND ((c.user_exists AND c.user.id == problem.user_id) OR alert_to_reporter) %] <input type="checkbox" name="reopen" id="form_reopen" value="1"[% ' checked' IF update.mark_open %]> <label class="inline" for="form_reopen">[% loc('This problem has not been fixed') %]</label> diff --git a/templates/web/emptyhomes/report/new/fill_in_details_form.html b/templates/web/emptyhomes/report/new/fill_in_details_form.html index e6ddd56a0..20b0b6842 100644 --- a/templates/web/emptyhomes/report/new/fill_in_details_form.html +++ b/templates/web/emptyhomes/report/new/fill_in_details_form.html @@ -45,22 +45,7 @@ <p>[% loc('Please do not give address or personal information in this section.') %]</p> -[% IF js %] - <div class="form-field" id="form_category_row"> - <label for="form_category">[% loc('Category:') %]</label> - <select name="category" id="form_category" required><option>[% loc('Loading...') %]</option></select> - </div> -[% ELSE %] - [% IF category_options.size %] - [% IF field_errors.category %] - <div class='form-error'>[% field_errors.category %]</div> - [% END %] - - <div class="form-field"> - [% PROCESS "report/new/category.html" %] - </div> - [% END %] -[% END %] +[% PROCESS "report/new/category_wrapper.html" %] [% IF field_errors.title %] <div class='form-error'>[% field_errors.title %]</div> diff --git a/templates/web/emptyhomes/tokens/confirm_problem.html b/templates/web/emptyhomes/tokens/confirm_problem.html index 5e77ca59f..a8a025058 100644 --- a/templates/web/emptyhomes/tokens/confirm_problem.html +++ b/templates/web/emptyhomes/tokens/confirm_problem.html @@ -2,7 +2,7 @@ <h1>[% loc('Confirmation') %]</h1> -[% IF problem.bodies_str %] +[% IF report.bodies_str %] <p>[% loc( '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.' @@ -36,7 +36,7 @@ as possible will be covered.') [% END %] <p> - <a href="[% c.uri_for( '/report', problem.id ) | html %]">[% loc('View your report') %]</a>. + <a href="[% c.uri_for( '/report', report.id ) | html %]">[% loc('View your report') %]</a>. </p> [% INCLUDE 'footer.html' %] diff --git a/templates/web/fiksgatami/footer.html b/templates/web/fiksgatami/footer.html index bd0921e0b..e9fbeb716 100644 --- a/templates/web/fiksgatami/footer.html +++ b/templates/web/fiksgatami/footer.html @@ -1,5 +1,5 @@ [% IF pagefooter %] - <footer role="content-info"> + <footer role="contentinfo"> [% INCLUDE 'front/footer-marketing.html' %] </footer> [% END %] diff --git a/templates/web/fiksgatami/nn/footer.html b/templates/web/fiksgatami/nn/footer.html index 3d17e37fb..cfef66bc9 100644 --- a/templates/web/fiksgatami/nn/footer.html +++ b/templates/web/fiksgatami/nn/footer.html @@ -1,5 +1,5 @@ [% IF pagefooter %] - <footer role="content-info"> + <footer role="contentinfo"> [% INCLUDE 'front/footer-marketing.html' %] </footer> [% END %] diff --git a/templates/web/fiksgatami/questionnaire/completed-open.html b/templates/web/fiksgatami/questionnaire/completed-open.html deleted file mode 100644 index 72fa507b2..000000000 --- a/templates/web/fiksgatami/questionnaire/completed-open.html +++ /dev/null @@ -1,6 +0,0 @@ -[% loc('<p style="font-size:150%">We’re sorry to hear that. We have two -suggestions: why not try <a href="http://www.norge.no/styresmakter/">writing -direct to your councillor(s)</a> or, if it’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>') %] diff --git a/templates/web/fixamingata/faq/faq-sv.html b/templates/web/fixamingata/faq/faq-sv.html index c21b3b45a..05ffdaddc 100755 --- a/templates/web/fixamingata/faq/faq-sv.html +++ b/templates/web/fixamingata/faq/faq-sv.html @@ -31,7 +31,7 @@ till exempel: <ul><li>Övergivna bilar och cyklar <li>Graffiti - <li>Netskräpning + <li>Nedskräpning <li>Gatustädning, exempelvis trasigt glas på en cykelbana <li>Trasiga gatulysen <li>Hål i vägar och gångbanor diff --git a/templates/web/fixamingata/footer.html b/templates/web/fixamingata/footer.html index 697248b82..c6f49cb79 100644 --- a/templates/web/fixamingata/footer.html +++ b/templates/web/fixamingata/footer.html @@ -1,26 +1,6 @@ [% IF pagefooter %] - <footer role="content-info"> - <div class="tablewrapper bordered"> - <div id="footer-mobileapps"> - </div> - <div id="footer-help"> - - <ul> - <li> - <h4>Sekretess och kakor</h4> - <p>Vill du veta mer om det juridiska? Läs vår information <a href="/privacy">om sekretess och kakor</a></p> - </li> - <li> - <h4>[% loc('Are you a developer?') %]</h4> - <p>[% loc('Would you like to contribute to FixMyStreet? Our code is open source and <a href="http://github.com/mysociety/fixmystreet">available on GitHub</a>.') %]</p> - </li> - <li> - <h4>[% loc('Are you from a council?') %]</h4> - <p>Vill du veta mer om FixaMinGata eller hur det kan fungera för er kommun? <a href="/kommun">Läs mer om FixaMinGata för kommuner</a>.</p> - </li> - </ul> - </div> - </div> + <footer role="contentinfo"> + [% INCLUDE 'front/footer-marketing.html' %] </footer> [% END %] </div><!-- .content role=main --> diff --git a/templates/web/fixamingata/front/footer-marketing.html b/templates/web/fixamingata/front/footer-marketing.html new file mode 100644 index 000000000..bc82aa5f1 --- /dev/null +++ b/templates/web/fixamingata/front/footer-marketing.html @@ -0,0 +1,26 @@ + <div class="tablewrapper bordered"> + <div id="footer-mobileapps"> + <!-- + <h4></h4> + <p> + </p> + --> + </div> + + <div id="footer-help"> + <ul> + <li> + <h4>Sekretess och kakor</h4> + <p>Vill du veta mer om det juridiska? Läs vår information <a href="/privacy">om sekretess och kakor</a></p> + </li> + <li> + <h4>[% loc('Are you a developer?') %]</h4> + <p>[% loc('Would you like to contribute to FixMyStreet? Our code is open source and <a href="http://fixmystreet.org">available at fixmystreet.org</a>.') %]</p> + </li> + <li> + <h4>Är du anställd i en kommun?</h4> + <p>Vill du veta mer om FixaMinGata eller hur det kan fungera för er kommun? <a href="/kommun">Läs mer om FixaMinGata för kommuner</a>.</p> + </li> + </ul> + </div> + </div> diff --git a/templates/web/fixamingata/front/recent.html b/templates/web/fixamingata/front/recent.html index 04873f144..bfe35832e 100644 --- a/templates/web/fixamingata/front/recent.html +++ b/templates/web/fixamingata/front/recent.html @@ -13,6 +13,7 @@ }(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> <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> + <div style="padding-bottom: 14px;"><a href="https://play.google.com/store/apps/details?id=se.sambruk.fixamingata"><img alt="FixaMin Gata på Google Play" style="height: 45px; width: 129px;" src="/cobrands/fixmystreet/images/google_play_logo.png" /></a></div> [% IF recent_photos.size %] <h2> [% loc('Recently reported problems') %] diff --git a/templates/web/fixamingata/front/tips.html b/templates/web/fixamingata/front/tips.html index 6b423ed5e..fd309708f 100644 --- a/templates/web/fixamingata/front/tips.html +++ b/templates/web/fixamingata/front/tips.html @@ -1 +1 @@ -<div style="height: 329px; padding-top: 20px;"><div style="position: absolute; width: 581px;"><iframe width="581" height="329" src="//www.youtube.com/embed/H5knzdalYI0" frameborder="0" allowfullscreen></iframe></div></div> +<div style="height: 329px; padding-top: 20px;"><iframe width="100%" height="329" src="//www.youtube.com/embed/H5knzdalYI0" frameborder="0" allowfullscreen></iframe></div> diff --git a/templates/web/fixamingata/report/new/councils_text_none.html b/templates/web/fixamingata/report/new/councils_text_none.html new file mode 100644 index 000000000..cdad54f18 --- /dev/null +++ b/templates/web/fixamingata/report/new/councils_text_none.html @@ -0,0 +1,22 @@ +<p> +[% IF all_body_names.size == 1 %] +[% + tprintf( + "%s har valt att inte ta emot rapporter från FixaMinGata, utan hänvisar fel- & synpunktsrapportering till <a href='%s'>kommunens egen webbplats</a>.", + all_body_names.first, all_body_urls.first); +%] +[% END %] +[% + loc("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."); +%] +[% IF all_body_names.size != 1 %] +[% + tprintf( + loc("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>."), + missing_details_body_names.join( loc(' or ') ) || all_area_names.join( loc(' or ') ), + c.cobrand.contact_email, + c.cobrand.contact_email + ); +%] +[% END %] +</p> diff --git a/templates/web/fixamingata/report/new/fill_in_details_form.html b/templates/web/fixamingata/report/new/fill_in_details_form.html deleted file mode 100644 index 63c4e8788..000000000 --- a/templates/web/fixamingata/report/new/fill_in_details_form.html +++ /dev/null @@ -1,217 +0,0 @@ -<div id="report-a-problem-main"> - <h1>[% loc('Report your problem') %]</h1> - - [% IF report.used_map %] - <p class="change_location">[% loc('Wrong location? Just click again on the map.') %]</p> - [% END %] - - [% IF js %] - <p id="councils_text"> - [% - tprintf( - loc('All the information you provide here will be sent to <strong>%s</strong>.'), - loc('the local council') - ); - %] - [% loc('The subject and details of the problem will be public, plus your name if you give us permission.') %] - </p> - [% ELSE %] - [% PROCESS 'report/new/councils_text.html' %] - [% END %] - - <div id="report-a-problem-sidebar"> - <div class="sidebar-tips"> - [% IF report.used_map %] - [% IF partial_token %] - <p id="unknown">[% loc('Please note your report has <strong>not yet been sent</strong>. Choose a category and add further information below, then submit.') %]</p> - [% END %] - [% END %] - - <p> - [% IF report.used_map %] - [% INCLUDE 'report/new/fill_in_details_text.html' %] - [% ELSE %] - [% loc('Please fill in the form below with details of the problem, and describe the location as precisely as possible in the details box.') %] - [% END %] - </p> - </div> - - <div class="sidebar-notes"> - [% INCLUDE 'report/new/notes.html' %] - </div> - - </div> - - [% INCLUDE 'errors.html' %] - <fieldset> - <div id="problem_form"> - - [% INCLUDE 'report/new/form_heading.html' %] - - - [% IF field_errors.council %] - <p class='form-error'>[% field_errors.council %]</p> - [% END %] - - - - <label for="form_title">[% loc('Subject') %]</label> - [% IF field_errors.title %] - <p class='form-error'>[% field_errors.title %]</p> - [% END %] - <input type="text" value="[% report.title | html %]" name="title" id="form_title" placeholder="[% loc('Provide a title') %]" required> - - <label for="form_detail">[% loc('Details') %]</label> - [% IF field_errors.detail %] - <p class='form-error'>[% field_errors.detail %]</p> - [% END %] - <textarea rows="7" cols="26" name="detail" id="form_detail" placeholder="[% loc('Please fill in details of the problem.') %]" required>[% report.detail | html %]</textarea> - - [% IF js %] - <div id="form_category_row"> - <label for="form_category">[% loc('Category') %]</label> - <select name="category" id="form_category" required><option>[% loc('Loading...') %]</option></select> - </div> - [% ELSE %] - [% IF category_options.size %] - [% IF field_errors.category %] - <p class='form-error'>[% field_errors.category %]</p> - [% END %] - - [% PROCESS "report/new/category.html" %] - [% END %] - [% END %] - - [%- IF category_extras %] - [% PROCESS "report/new/category_extras.html" %] - [%- END %] - - [% IF c.cobrand.allow_photo_upload %] - [% IF field_errors.photo %] - <p class='form-error'>[% field_errors.photo %]</p> - [% END %] - - - [% IF upload_fileid || report.photo %] - [% IF upload_fileid %] - <img align="right" src="/photo/[% upload_fileid %].temp.jpeg" alt=""> - <input type="hidden" name="upload_fileid" value="[% upload_fileid %]"> - [% END %] - - <p>[% loc('You have already attached a photo to this report, attaching another one will replace it.') %]</p> - - [% IF report.photo %] - <img align="right" src="/photo/[% report.id %].jpeg"> - [% END %] - [% END %] - - <label for="form_photo">[% loc('Photo') %]</label> - <input type="file" name="photo" id="form_photo"> - [% END %] - - [% IF c.user_exists %] - <div class="form-box"> - - [% INCLUDE 'report/new/extra_name.html' %] - - <label for="form_name">[% loc('Name') %]</label> - [% IF field_errors.name %] - <p class='form-error'>[% field_errors.name %]</p> - [% END %] - <input type="text" class="validName" value="[% report.name | html %]" name="name" id="form_name" placeholder="[% loc('Your name') %]"> - - [%# if there is nothing in the name field then set check box as default on form %] - <div class="checkbox-group"> - <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' IF !report.anonymous %]> - <label class="inline" for="form_may_show_name">[% loc('Show my name publicly') %]</label> - </div> - - <label for="form_phone">[% loc('Phone number (optional)') %]</label> - <input class="" type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number') %]"> - - <div class="general-notes"> - <p>[% loc('We never show your email address or phone number.') %]</p> - </div> - - <div class="form-txt-submit-box"> - <input class="green-btn" type="submit" id="submit_register" name="submit_register" value="[% loc('Submit') %]"> - </div> - </div> - [% ELSE %] - - <label for="form_email">[% loc('Your email') %]</label> - [% IF field_errors.email %] - <p class='form-error'>[% field_errors.email %]</p> - [% END %] - <input type="email" value="[% report.user.email | html %]" name="email" id="form_email" placeholder="[% loc('Please enter your email address') %]" required> - - <div id="form_sign_in"> - <h3>[% loc("Now to submit your report…") %]</h3> - - <div id="form_sign_in_no" class="form-box"> - <h5>Om du inte har ett lösenord fyller du i ditt namn och eventuellt telefonnummer och nytt lösenord (valfria) här. När du skickar din rapport får du epost med en länk som du måste klicka på för att bekräfta rapporten. Om du redan har ett lösenord fyller du i detta längre ner på sidan och behöver då inte bekräfta rapporten.</h5> - - [% INCLUDE 'report/new/extra_name.html' %] - - <label for="form_name">[% loc('Name') %]</label> - [% IF field_errors.name %] - <p class='form-error'>[% field_errors.name %]</p> - [% END %] - - <input type="text" class="form-focus-trigger validName" value="[% report.name | html %]" name="name" id="form_name" placeholder="[% loc('Your name') %]"> - - [%# if there is nothing in the name field then set check box as default on form %] - <div class="checkbox-group"> - <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' IF !report.anonymous %]> - <label class="inline" for="form_may_show_name">[% loc('Show my name publicly') %]</label> - </div> - - <label for="form_phone">[% loc('Phone number (optional)') %]</label> - <input type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number') %]"> - - <div class="general-notes form-focus-hidden"> - <p>[% loc('We never show your email address or phone number.') %]</p> - </div> - - <label for="password_register">[% loc('Password (optional)') %]</label> - - <div class="general-notes form-focus-hidden"> - <p>[% loc('Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.') %]</p> - </div> - - <div class="form-txt-submit-box"> - <input type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]"> - <input class="green-btn" type="submit" id="submit_register" name="submit_register" value="[% loc('Submit') %]"> - </div> - </div> - <div id="form_sign_in_yes" class="form-box"> - - <h5>Jag har ett lösenord sedan tidigare:</h5> - - <label class="hidden-js n" for="password_sign_in">[% loc('Yes I have a password') %]</label> - <div class="form-txt-submit-box"> - [% IF field_errors.password %] - <p class='form-error'>[% field_errors.password %]</p> - [% END %] - <input type="password" name="password_sign_in" id="password_sign_in" placeholder="[% loc('Your password') %]" value=""> - <input class="green-btn" type="submit" id="submit_sign_in" name="submit_sign_in" value="[% loc('Submit') %]"> - </div> - - <div class="checkbox-group"> - <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]> - <label class="n inline" for="remember_me">[% loc('Keep me signed in on this computer') %]</label> - </div> - </div> - - </div> - - [% END %] - </div> - </fieldset> - - [% IF partial_token %] - <input type="hidden" name="partial" value="[% partial_token.token %]"> - [% END %] - - <input type="hidden" name="submit_problem" value="1"> -</div> diff --git a/templates/web/fixamingata/report/new/form_user_loggedout.html b/templates/web/fixamingata/report/new/form_user_loggedout.html new file mode 100644 index 000000000..36e7d95f4 --- /dev/null +++ b/templates/web/fixamingata/report/new/form_user_loggedout.html @@ -0,0 +1,66 @@ +<label for="form_email">[% loc('Your email') %]</label> +[% IF field_errors.email %] + <p class='form-error'>[% field_errors.email %]</p> +[% END %] +<input type="email" value="[% report.user.email | html %]" name="email" id="form_email" placeholder="[% loc('Please enter your email address') %]" required> + +<div id="form_sign_in"> + <h3>[% loc("Now to submit your report…") %]</h3> + + <div id="form_sign_in_no" class="form-box"> + <h5>Om du inte har ett lösenord fyller du i ditt namn och eventuellt telefonnummer och nytt lösenord (valfria) här. När du skickar din rapport får du epost med en länk som du måste klicka på för att bekräfta rapporten. Om du redan har ett lösenord fyller du i detta längre ner på sidan och behöver då inte bekräfta rapporten.</h5> + + [% INCLUDE 'report/new/extra_name.html' %] + + [% name_public = report.anonymous==0 OR (c.cobrand.default_show_name AND report.anonymous=='') %] + <label for="form_name">[% loc('Name') %]</label> + [% IF field_errors.name %] + <p class='form-error'>[% field_errors.name %]</p> + [% END %] + + <input type="text" class="form-focus-trigger validName" value="[% report.name | html %]" name="name" id="form_name" placeholder="[% loc('Your name') %]"> + + [%# if there is nothing in the name field then set check box as default on form %] + <div class="checkbox-group"> + <input type="checkbox" name="may_show_name" id="form_may_show_name" value="1"[% ' checked' IF name_public %]> + <label class="inline" for="form_may_show_name">[% loc('Show my name publicly') %]</label> + </div> + + <label for="form_phone">[% loc('Phone number (optional)') %]</label> + <input type="text" value="[% report.user.phone | html %]" name="phone" id="form_phone" placeholder="[% loc('Your phone number') %]"> + + <div class="general-notes form-focus-hidden"> + <p>[% loc('We never show your email address or phone number.') %]</p> + </div> + + <label for="password_register">[% loc('Password (optional)') %]</label> + + <div class="general-notes form-focus-hidden"> + <p>[% loc('Providing a password is optional, but doing so will allow you to more easily report problems, leave updates and manage your reports.') %]</p> + </div> + + <div class="form-txt-submit-box"> + <input type="password" name="password_register" id="password_register" value="" placeholder="[% loc('Enter a password') %]"> + <input class="green-btn" type="submit" id="submit_register" name="submit_register" value="[% loc('Submit') %]"> + </div> + </div> + <div id="form_sign_in_yes" class="form-box"> + + <h5>Jag har ett lösenord sedan tidigare:</h5> + + <label class="hidden-js n" for="password_sign_in">[% loc('Yes I have a password') %]</label> + <div class="form-txt-submit-box"> + [% IF field_errors.password %] + <p class='form-error'>[% field_errors.password %]</p> + [% END %] + <input type="password" name="password_sign_in" id="password_sign_in" placeholder="[% loc('Your password') %]" value=""> + <input class="green-btn" type="submit" id="submit_sign_in" name="submit_sign_in" value="[% loc('Submit') %]"> + </div> + + <div class="checkbox-group"> + <input type="checkbox" id="remember_me" name="remember_me" value='1'[% ' checked' IF remember_me %]> + <label class="n inline" for="remember_me">[% loc('Keep me signed in on this computer') %]</label> + </div> + </div> + +</div> diff --git a/templates/web/fixamingata/report/new/inline-tips.html b/templates/web/fixamingata/report/new/inline-tips.html new file mode 100644 index 000000000..90bb4f975 --- /dev/null +++ b/templates/web/fixamingata/report/new/inline-tips.html @@ -0,0 +1,12 @@ +<div class="description_tips"> + <h4>Tips för bra rapporter:</h4> + <ul class="do"> + <li>Var trevlig</li> + <li>Ange platser noggrant</li> + <li>Skriv hur gammalt problemet är</li> + </ul> + <ul class="dont"> + <li>Använd inte FixaMinGata för rena synpunkter och förslag</li> + <li>Inkludera inte privata kontaktdetaljer i beskrivningen</li> + </ul> +</div> diff --git a/templates/web/fixamingata/static/council.html b/templates/web/fixamingata/static/council.html index ffa302691..8d968f695 100755 --- a/templates/web/fixamingata/static/council.html +++ b/templates/web/fixamingata/static/council.html @@ -59,7 +59,7 @@ Vaggeryd, Vetlanda och Värnamo. <p> <ul> <li>FixaMinGata använder - <a href="http://www.openstreetmap.org/">Open Street Map</a> för sin + <a href="http://www.openstreetmap.org/">OpenStreetMap</a> för sin kartinformation. Verifiera så att de kartor som finns för kommunen är relevanta. Om det finns fel i kartinformationen går detta att korrigera, av kommunen själva eller i samarbete med invånarna.</li> diff --git a/templates/web/fixmindelo/footer.html b/templates/web/fixmindelo/footer.html index 0af813439..e11b81827 100644 --- a/templates/web/fixmindelo/footer.html +++ b/templates/web/fixmindelo/footer.html @@ -1,5 +1,5 @@ [% IF pagefooter %] - <footer role="content-info"> + <footer role="contentinfo"> <div id="footer-help"> <ul> <li> diff --git a/templates/web/fixmybarangay/alert/index.html b/templates/web/fixmybarangay/alert/index.html index 58c4080e8..c168fa41b 100644 --- a/templates/web/fixmybarangay/alert/index.html +++ b/templates/web/fixmybarangay/alert/index.html @@ -27,7 +27,7 @@ FixMyBarangay has a RSS feeds and email alerts for local problems. <form id="alerts" name="alerts" method="post" action="/alert/subscribe"> [% IF photos.size %] -<div class="sticky-sidebar" id="alert_recent"> +<div id="alert_recent"> <aside> <h2>[% loc('Some photos of recent reports') %]</h2> [% FOREACH p IN photos; diff --git a/templates/web/fixmystreet-uk-councils/header_extra.html b/templates/web/fixmystreet-uk-councils/header_extra.html new file mode 100644 index 000000000..9e614f177 --- /dev/null +++ b/templates/web/fixmystreet-uk-councils/header_extra.html @@ -0,0 +1 @@ +<script src="[% start %][% version('/cobrands/fixmystreet-uk-councils/js.js') %]"></script> diff --git a/templates/web/fixmystreet-uk-councils/static/privacy.html b/templates/web/fixmystreet-uk-councils/static/privacy.html index addce1e2d..ba1745978 100644 --- a/templates/web/fixmystreet-uk-councils/static/privacy.html +++ b/templates/web/fixmystreet-uk-councils/static/privacy.html @@ -32,9 +32,7 @@ other companies, you can adjust your usage or install opt-out browser plugins. <dt>Who gets to see my email address?</dt> <dd>If you submit a problem, we pass on your details, and details of the problem, to the council contact or contacts responsible for the area where -you located the problem, or other relevant body (for example, in most of London -we send reports via the central London Report-It service, who may also publish -the public details of your report). Other than the council, who obviously get +you located the problem, or other relevant body. Other than the council, who obviously get your email address, only people we authorise to view the FixMyStreet administration interface will be able to see your email address and they will never use it for anything other than to help administer FixMyStreet. Similarly diff --git a/templates/web/fixmystreet.com/faq/faq-en-gb.html b/templates/web/fixmystreet.com/faq/faq-en-gb.html index 92991fb0a..c295fd430 100755 --- a/templates/web/fixmystreet.com/faq/faq-en-gb.html +++ b/templates/web/fixmystreet.com/faq/faq-en-gb.html @@ -89,7 +89,8 @@ like graffiti, dog fouling, potholes or street lights that don't work. <dd> <p><strong>Urgent issues:</strong> For problems that might put people in immediate danger, like gas leaks or falling trees, please contact your council -directly – by phone if possible. +or the appropriate utility company or emergency service directly – by phone if +possible. <p>We often route problem reports via cleansing services or highways maintenance departments, so using FixMyStreet for urgent matters may result in a delay in your report getting to the right department. @@ -261,8 +262,8 @@ category for your report. If your problem is very near a council boundary, it is easy to place the pin on the wrong side of it by mistake. Similarly, choosing the wrong category can mean that your report is sent to one council when it should have gone to another. -<p>At the moment, FixMyStreet does not send reports to the Highways Agency -(except within London), but we are working on that. +<p>At the moment, FixMyStreet does not send reports to the Highways Agency, +but we are working on that. <p>If the above two paragraphs do not apply, please <a href="/contact">drop us a line</a> and we'll try to get to the bottom of why your report has been misrouted. Please include the URL (web address) of your FixMyStreet report. diff --git a/templates/web/fixmystreet.com/footer-nav.html b/templates/web/fixmystreet.com/footer-nav.html index 1732acf00..c85d1ea1e 100644 --- a/templates/web/fixmystreet.com/footer-nav.html +++ b/templates/web/fixmystreet.com/footer-nav.html @@ -2,7 +2,7 @@ <div class="tablewrapper"> <ul id="footer-main-nav"> <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" - %]>[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% + >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/reports"[% END diff --git a/templates/web/fixmystreet.com/footer_extra.html b/templates/web/fixmystreet.com/footer_extra.html new file mode 100644 index 000000000..ba32a5534 --- /dev/null +++ b/templates/web/fixmystreet.com/footer_extra.html @@ -0,0 +1,3 @@ +<script type="text/javascript"> + (function(){var e=0.6;var t=null;var n=document.cookie.split(";");for(var r=0;r<n.length;r++){var i=n[r];while(i.charAt(0)==" "){i=i.substring(1,i.length)}if(i.indexOf("ms_srv_t=")==0){var t=i.substring("ms_srv_t=".length,i.length)}if(i.indexOf("ms_srv_r=")==0){var s=i.substring("ms_srv_r=".length,i.length)}}if(t==null){if(Math.random()<e){var o=Math.round((new Date).getTime()/1e3);document.cookie="ms_srv_t="+o+"; path=/";document.cookie="ms_srv_r="+document.referrer+"; path=/";t=o;s=document.referrer}else{document.cookie="ms_srv_t=X; path=/";t="X"}}if(t!="X"&&!!document.getElementById("ms_srv_wrapper")){var u=Math.round((new Date).getTime()/1e3)-t;var a=!!document.getElementById("user-meta");var f=document.getElementById("ms_srv_link");data={ms_time:u,ms_referrer:s||null,ms_registered:a,ms_transaction:f.getAttribute("data-transaction")};var l=[];for(var c in data){l.push(encodeURIComponent(c)+"="+encodeURIComponent(data[c]))}f.href=f.href+"?"+l.join("&");document.getElementById("ms_srv_wrapper").style.display=""}})() +</script> diff --git a/templates/web/fixmystreet.com/front/javascript.html b/templates/web/fixmystreet.com/front/javascript.html new file mode 100644 index 000000000..0ccaa0870 --- /dev/null +++ b/templates/web/fixmystreet.com/front/javascript.html @@ -0,0 +1,15 @@ +<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/map-fms.js') %]", + "preload![% version('/js/jquery.ba-hashchange.min.js') %]" + ] +}); +</script> diff --git a/templates/web/fixmystreet.com/header_extra.html b/templates/web/fixmystreet.com/header_extra.html index 27ffc12a1..6d3474c23 100644 --- a/templates/web/fixmystreet.com/header_extra.html +++ b/templates/web/fixmystreet.com/header_extra.html @@ -1,3 +1,6 @@ -<script src="[% start %][% version('/js/jquery.cookie.min.js') %]" type="text/javascript" charset="utf-8"></script> +<link rel="Shortcut Icon" type="image/x-icon" href="/cobrands/fixmystreet.com/favicon.ico"> + +<script src="[% start %][% version('/js/jquery.cookie.min.js') %]"></script> +<script src="[% start %][% version('/cobrands/fixmystreet.com/js.js') %]"></script> [% INCLUDE 'tracking_code.html' %] diff --git a/templates/web/fixmystreet.com/next_steps.html b/templates/web/fixmystreet.com/next_steps.html new file mode 100644 index 000000000..5a26a67fe --- /dev/null +++ b/templates/web/fixmystreet.com/next_steps.html @@ -0,0 +1,42 @@ +[%# A trio of suggested steps, shown on completion pages across FMS.com %] + +[% DEFAULT share_url = c.cobrand.base_url %] +[% DEFAULT twitter_comment = 'I just used @fixmystreet, you should try it!' %] + +<div class="next-steps"> + <div class="next-steps__step next-steps__step--apps"> + [% IF just_interacted %] + <h2>[% loc('Next time, try our mobile app!') %]</h2> + [% ELSE %] + <h2>[% loc('Have you tried our mobile app?') %]</h2> + [% END %] + <p>[% loc('Download it now, and it’ll be ready to use when you next pick up your phone.') %]</p> + <p class="next-steps__step__cta"> + <a href="https://itunes.apple.com/gb/app/fixmystreet/id297456545"><img src="/cobrands/fixmystreet.com/images/next-step-apple.png" alt="Download on the App Store" width="120" height="37"></a> + <a href="https://play.google.com/store/apps/details?id=org.mysociety.FixMyStreet"><img src="/cobrands/fixmystreet.com/images/next-step-google.png" alt="Android app on Google Play" width="120" height="37"></a> + </p> + </div> + <div class="next-steps__step next-steps__step--social"> + [% IF just_interacted %] + <h2>[% loc('Great work. Now spread the word!') %]</h2> + <p>[% loc('Share your report on Twitter and Facebook, and let your friends join the conversation.') %]</p> + [% ELSE %] + <h2>[% loc('Spread the word about FixMyStreet!') %]</h2> + <p>[% loc('You know how to get things fixed - now make sure your friends do too.') %]</p> + [% END %] + <p class="next-steps__step__cta"> + <a href="https://twitter.com/intent/tweet?text=[% twitter_comment | uri %]&url=[% share_url | uri %]&related=fixmystreet,mysociety"><img src="/cobrands/fixmystreet.com/images/next-step-twitter.png" alt="Tweet it" width="120" height="37"></a> + <a href="https://www.facebook.com/sharer/sharer.php?u=[% share_url | uri %]"><img src="/cobrands/fixmystreet.com/images/next-step-facebook.png" alt="Share on Facebook" width="120" height="37"></a> + </p> + </div> + <div class="next-steps__step next-steps__step--goodies"> + <h2>[% loc('Free FixMyStreet goodies for you!') %]</h2> + <a href="/posters"> + <img src="/cobrands/fixmystreet.com/images/next-step-goodies.png" alt="" width="105" height="125" class="goodies-preview"> + </a> + <p>[% loc('Perfect for civic groups, clubs, and schools.') %]</p> + <p class="next-steps__step__cta"> + <a href="/posters"><img src="/cobrands/fixmystreet.com/images/next-step-download.png" alt="Download" width="120" height="37"></a> + </p> + </div> +</div> diff --git a/templates/web/fixmystreet.com/questionnaire/completed-open.html b/templates/web/fixmystreet.com/questionnaire/completed-open.html index df8e2d271..073fb0438 100644 --- a/templates/web/fixmystreet.com/questionnaire/completed-open.html +++ b/templates/web/fixmystreet.com/questionnaire/completed-open.html @@ -1,23 +1,19 @@ -[% IF c.cobrand.is_council %] - <p style="font-size: 150%"> - Thank you very much for filling in our questionnaire. - </p> -[% ELSE %] - <p style="font-size:150%">We’re sorry to hear that your problem hasn't been fixed.</p> +[% IF ! c.cobrand.is_council %] + <h2>We’re sorry to hear that your problem hasn’t been fixed.</h2> <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 + 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 + 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 + You can do this on <a href="https://www.writetothem.com/">WriteToThem</a>, another useful mySociety website. </p> [% END %] diff --git a/templates/web/fixmystreet.com/report/new/category_at_top.html b/templates/web/fixmystreet.com/report/new/category_at_top.html new file mode 100644 index 000000000..f131f37a1 --- /dev/null +++ b/templates/web/fixmystreet.com/report/new/category_at_top.html @@ -0,0 +1 @@ +[% PROCESS "report/new/category_wrapper.html" %] diff --git a/templates/web/fixmystreet.com/report/new/unresponsive_body.html b/templates/web/fixmystreet.com/report/new/unresponsive_body.html new file mode 100644 index 000000000..a1b41aaf5 --- /dev/null +++ b/templates/web/fixmystreet.com/report/new/unresponsive_body.html @@ -0,0 +1,12 @@ +<div class="unresponsive-council-warning"> + <h1>Important message</h1> + <p> + <span class="unresponsive-council">[% bodies.$body_id.name %]</span> doesn’t accept + [% IF category %] + <span class="refused-category">[% category | html %]</span> + [% END %] + reports. + </p> + <p>We can make your report public, but we can’t send it to the council.</p> + <a href="/unresponsive?body=[% body_id %][% IF category %];category=[% category | uri %][% END %]">What can I do instead?</a> +</div> diff --git a/templates/web/fixmystreet.com/reports/_body_gone.html b/templates/web/fixmystreet.com/reports/_body_gone.html new file mode 100755 index 000000000..5a8232110 --- /dev/null +++ b/templates/web/fixmystreet.com/reports/_body_gone.html @@ -0,0 +1,45 @@ +<p id="unknown" class="alert">This council no longer exists. + [% IF body.name.match('Antrim|Newtownabbey') %] + Its area is now covered by <a href="/reports/Antrim+and+Newtownabbey">Antrim and Newtownabbey Borough Council</a>. + [% ELSIF body.name.match('Ards|North Down') %] + Its area is now covered by <a href="/reports/Ards+and+North+Down">Ards and North Down Borough Council</a>. + [% ELSIF body.name.match('Armagh|Banbridge|Craigavon') %] + Its area is now covered by <a href="/reports/Armagh+City%2C+Banbridge+and+Craigavon">Armagh City, Banbridge and Craigavon Borough Council</a>. + [% ELSIF body.name.match('Coleraine|Ballymoney|Moyle|Limavady') %] + Its area is now covered by <a href="/reports/Causeway+Coast+and+Glens">Causeway Coast and Glens District Council</a>. + [% ELSIF body.name.match('Derry|Strabane') %] + Its area is now covered by <a href="/reports/Derry+City+and+Strabane">Derry City and Strabane District Council</a>. + [% ELSIF body.name.match('Fermanagh|Omagh') %] + Its area is now covered by <a href="/reports/Fermanagh+and+Omagh">Fermanagh and Omagh District Council</a>. + [% ELSIF body.name.match('Lisburn|Castlereagh') %] + Its area is now covered by <a href="/reports/Lisburn+and+Castlereagh">Lisburn and Castlereagh City Council</a>. + [% ELSIF body.name.match('Carrickfergus|Larne|Ballymena') %] + Its area is now covered by <a href="/reports/Mid+and+East+Antrim">Mid and East Antrim Borough Council</a>. + [% ELSIF body.name.match('Dungannon|Cookstown|Magherafelt') %] + Its area is now covered by <a href="/reports/Mid+Ulster">Mid Ulster District Council</a>. + [% ELSIF body.name.match('Newry|Down') %] + Its area is now covered by <a href="/reports/Newry%2C+Mourne+and+Down">Newry, Mourne and Down District Council</a>. + [% ELSIF body.name.match('Penwith|Kerrier|Carrick|Restormel|Caradon|North Cornwall') %] + Its area is now covered by <a href="/reports/Cornwall">Cornwall Council</a>. + [% ELSIF body.name.match('Durham|Easington|Sedgefield|Teesdale|Wear Valley|Derwentside|Chester le Street') %] + Its area is now covered by <a href="/reports/Durham+County">Durham County Council</a>. + [% ELSIF body.name.match('Blyth Valley|Wansbeck|Castle Morpeth|Tynedale|Alnwick|Berwick upon Tweed') %] + Its area is now covered by <a href="/reports/Northumberland">Northumberland County Council</a>. + [% ELSIF body.name.match('North Shropshire|Oswestry|Shrewsbury and Atcham|South Shropshire|Bridgnorth') %] + Its area is now covered by <a href="/reports/Shropshire">Shropshire Council</a>. + [% ELSIF body.name.match('Salisbury|West Wiltshire|Kennet|North Wiltshire') %] + Its area is now covered by <a href="/reports/Wiltshire">Wiltshire Council</a>. + [% ELSIF body.name.match('Ellesmere Port and Neston|Vale Royal|Chester') %] + Its area is now covered by <a href="/reports/Cheshire+West+and+Chester">Cheshire West and Chester Council</a>. + [% ELSIF body.name.match('Macclesfield|Congleton|Crewe and Nantwich') %] + Its area is now covered by <a href="/reports/Cheshire+East">Cheshire East Council</a>. + [% ELSIF body.name.match('Mid Bedfordshire|South Bedfordshire') %] + Its area is now covered by <a href="/reports/Central+Bedfordshire">Central Bedfordshire Council</a>. + [% ELSIF body.name.match('Cheshire') %] + Its area is now covered by <a href="/reports/Cheshire+West+and+Chester">Cheshire West and Chester Council</a> or + <a href="/reports/Cheshire+East">Cheshire East Council</a>. + [% ELSIF body.name.match('Bedfordshire') %] + Its area is now covered by <a href="/reports/Bedford">Bedford Borough Council</a> or + <a href="/reports/Central+Bedfordshire">Central Bedfordshire Council</a>. + [% END %] +</p> diff --git a/templates/web/fixmystreet.com/reports/_extras.html b/templates/web/fixmystreet.com/reports/_extras.html index 77a46493b..ff2a67dc2 100755 --- a/templates/web/fixmystreet.com/reports/_extras.html +++ b/templates/web/fixmystreet.com/reports/_extras.html @@ -5,7 +5,8 @@ 'East Sussex County Council' = 'eastsussex.fixmystreet.com' 'Hart District Council' = 'hart.fixmystreet.com' 'Oxfordshire County Council' = 'fixmystreet.oxfordshire.gov.uk' - 'Stevenage Borough Council' = 'stevenage.fixmystreet.com' + 'Stevenage Borough Council' = 'stevenage.fixmystreet.com', + 'Royal Borough of Greenwich' = 'fix.royalgreenwich.gov.uk' } secure = { 'fix.bromley.gov.uk' = 's' diff --git a/templates/web/fixmystreet.com/research/survey_link.html b/templates/web/fixmystreet.com/research/survey_link.html new file mode 100644 index 000000000..7357249d8 --- /dev/null +++ b/templates/web/fixmystreet.com/research/survey_link.html @@ -0,0 +1,3 @@ +<div id="ms_srv_wrapper" style="display:none"> + <p><a href="https://www.surveygizmo.co.uk/s3/1907419/FMS-2014" id="ms_srv_link" data-transaction="report">We’re running a short survey to help us understand how well FixMyStreet works. If you’d like to take it, click here.</a></p> +</div> diff --git a/templates/web/fixmystreet.com/static/council.html b/templates/web/fixmystreet.com/static/council.html index f8eecb0d0..6327c8bab 100644 --- a/templates/web/fixmystreet.com/static/council.html +++ b/templates/web/fixmystreet.com/static/council.html @@ -31,10 +31,11 @@ <div class="councils-section"> <div class="fixed-container"> <div class="section-content"> - <h2>Channel shift</h2> - <p>Every council wants it. There are plenty of ideas on how to achieve it - but FixMyStreet for Councils will actually deliver the holy grail of channel shift.</p> - <p>It’s a tried and tested catalyst for shifting citizen contact online - our existing client councils have reported a shift of up to 300% from phone to online reporting. Why? Because when online reporting systems are this easy, phone contact plummets. </p> - <p>With installation costs from £4,500, FixMyStreet starts paying for itself within weeks - and, most importantly, frees up your staff for more important tasks.</p> + <H2>A real money saver</H2> +<p>FixMyStreet for Councils has brought our clients proven savings in staffing costs and a 50% reduction in average call-handling times. </P> +<p>Every council knows about channel shift - and FixMyStreet is a tried and tested catalyst for shifting citizen contact online.</p> +<p>Existing client councils have reported a shift of up to 300% from phone to online reporting. Why? Because when online reporting systems are this easy, phone contact plummets.</p> +<p>With installation costs from £4,500, FixMyStreet starts paying for itself within weeks - and, most importantly, frees up your staff for more important tasks.</P> </div> </div> </div> @@ -100,7 +101,7 @@ <div class="fixed-container"> <div class="section-content"> <h2>Who's using FixMyStreet for councils?</h2> - <p>Our UK client councils include <a href="http://fixmystreet.stevenage.gov.uk/">Stevenage</a>, <a href="http://fix.bromley.gov.uk/">Bromley</a>, <a href="http://barnet.fixmystreet.com/">Barnet</a>, <a href="http://fixmystreet.oxfordshire.gov.uk/">Oxfordshire</a>, <a href="http://hart.fixmystreet.com/">Hart</a>, <a href="http://eastsussex.fixmystreet.com/">East Sussex County Council</a>, and (soon to launch) Warwickshire County Council.</p> + <p>Our UK client councils include <a href="http://fixmystreet.stevenage.gov.uk/">Stevenage</a>, <a href="http://fix.bromley.gov.uk/">Bromley</a>, <a href="http://barnet.fixmystreet.com/">Barnet</a>, <a href="http://fixmystreet.oxfordshire.gov.uk/">Oxfordshire</a>, <a href="http://hart.fixmystreet.com/">Hart</a>, <a href="http://eastsussex.fixmystreet.com/">East Sussex County Council</a>, <a href="http://fix.royalgreenwich.gov.uk/">Greenwich</a>, and (soon to launch) Warwickshire County Council.</p> <p>FixMyStreet for Councils is also in use outside the UK, in the city of <a href="https://www.zueriwieneu.ch/">Zurich</a>, Switzerland.</p> <h3>Case studies</h3> <p>For the insider view, and to understand the integration process, read these councils’ stories.</p> diff --git a/templates/web/fixmystreet.com/static/posters.html b/templates/web/fixmystreet.com/static/posters.html index 2e26ad40e..bcf235fa4 100644 --- a/templates/web/fixmystreet.com/static/posters.html +++ b/templates/web/fixmystreet.com/static/posters.html @@ -1,5 +1,5 @@ [% extra_css = BLOCK %] - <link rel="stylesheet" href="[% version('/cobrands/fixmystreet/posters.css') %]"> + <link rel="stylesheet" href="[% version('/cobrands/fixmystreet.com/posters.css') %]"> [% END %] [% INCLUDE header.html @@ -11,6 +11,27 @@ badge = '<a href="https://www.fixmystreet.com/"> <img src="https://www.fixmystreet.com/i/fms-badge.jpeg" alt="FixMyStreet - report, view or discuss local problems" border="0"></a>' %] +<script> + +$("[data-goodielink]").on(click, function(e){ + var url = $(this).attr('href') + var name = $(this).attr('data-goodielink') + var callback = function(){ + window.location.href = url + } + if(e.metaKey || e.ctrlKey){ + callback = function(){} + } else { + e.preventDefault() + } + ga('send', 'event', 'goodie', 'download', name, { + 'hitCallback': callback + }) + setTimeout(callback, 2000); +}); + +</script> + <div class="sticky-sidebar"> <aside> <ul class="plain-list"> @@ -33,7 +54,7 @@ <h2 id="activist-pack">The FMS Activist Pack</h2> -<img src="/cobrands/fixmystreet/images/pack-general.jpg" class="pack-preview"> +<img src="/cobrands/fixmystreet.com/images/pack-general.jpg" class="pack-preview" alt=""> <p>Everything you need to help spread the word about FixMyStreet. Includes:</p> @@ -45,11 +66,11 @@ <li>Ideas for letting more people know about FixMyStreet</li> </ul> -<a href="/cobrands/fixmystreet/posters/activist-pack.zip" class="download-button">Download ZIP file</a> +<a href="/cobrands/fixmystreet.com/posters/activist-pack.zip" data-goodielink="activist-pack" class="download-button">Download ZIP file</a> <h2 id="school-pack">Activity Pack for Schools, Brownies, and Scouts</h2> -<img src="/cobrands/fixmystreet/images/pack-schools.jpg" class="pack-preview"> +<img src="/cobrands/fixmystreet.com/images/pack-schools.jpg" class="pack-preview" alt=""> <p>A special pack with activities suitable for groups of children. Includes:</p> @@ -59,11 +80,11 @@ <li>Ideas for activities</li> </ul> -<a href="/cobrands/fixmystreet/posters/schools-clubs-pack.zip" class="download-button">Download ZIP file</a> +<a href="/cobrands/fixmystreet.com/posters/schools-clubs-pack.zip" data-goodielink="schools-clubs-pack" class="download-button">Download ZIP file</a> <h2 id="community-pack">Community Group Pack</h2> -<img src="/cobrands/fixmystreet/images/pack-community.jpg" class="pack-preview"> +<img src="/cobrands/fixmystreet.com/images/pack-community.jpg" class="pack-preview" alt=""> <p>Materials for groups of adults who have a particular interest in their local community. Includes:</p> @@ -75,7 +96,7 @@ <li>Instructions for including a feed of local FixMyStreet reports on your site or blog</li> </ul> -<a href="/cobrands/fixmystreet/posters/community-group-pack.zip" class="download-button">Download ZIP file</a> +<a href="/cobrands/fixmystreet.com/posters/community-group-pack.zip" data-goodielink="community-group-pack" class="download-button">Download ZIP file</a> <h2 id="web">Website Badge</h2> @@ -88,22 +109,26 @@ <h2 id="print">Printed Materials</h2> <ul class="downloads"> - <li><a href="/cobrands/fixmystreet/posters/fixmystreet-poster-a4.pdf"> - <img src="/cobrands/fixmystreet/images/a4-poster.png"> + <li><a href="/cobrands/fixmystreet.com/posters/fixmystreet-poster-a4.pdf" data-goodielink="fixmystreet-poster-a4"> + <img src="/cobrands/fixmystreet.com/images/a4-poster.png" alt=""> <strong>A4 poster</strong> Ideal for a noticeboard at work, in the library, corner shop… wherever your community will see it. </a></li> - <li><a href="/cobrands/fixmystreet/posters/fixmystreet-flyers-a5.pdf"> - <img src="/cobrands/fixmystreet/images/a5-flyers.png"> + <li><a href="/cobrands/fixmystreet.com/posters/fixmystreet-flyers-a5.pdf" data-goodielink="fixmystreet-flyers-a5"> + <img src="/cobrands/fixmystreet.com/images/a5-flyers.png" alt=""> <strong>A5 flyers (2 to a sheet)</strong> Perfect for handing out to friends or posting to subscribers. </a></li> - <li><a href="/cobrands/fixmystreet/posters/fixmystreet-flyers-a6.pdf"> - <img src="/cobrands/fixmystreet/images/a6-flyers.png"> + <li><a href="/cobrands/fixmystreet.com/posters/fixmystreet-flyers-a6.pdf" data-goodielink="fixmystreet-flyers-a6"> + <img src="/cobrands/fixmystreet.com/images/a6-flyers.png" alt=""> <strong>A6 flyers (4 to a sheet)</strong> Great for cafés, pubs, or meetings. </a></li> - <li><a href="/cobrands/fixmystreet/posters/fixmystreet-poop-flags.pdf"> - <img src="/cobrands/fixmystreet/images/dog-poop-flags.png"> + <li><a href="/cobrands/fixmystreet.com/posters/fixmystreet-poop-flags.pdf" data-goodielink="fixmystreet-poop-flags"> + <img src="/cobrands/fixmystreet.com/images/dog-poop-flags.png" alt=""> <strong>Doggy poop flags (4 to a sheet)</strong> Take a stand against dog-fouling with our home-made flags. Some assembly required! </a></li> + <li><a href="/cobrands/fixmystreet.com/posters/fixmystreet-poop-poster.pdf" data-goodielink="fixmystreet-poop-poster"> + <img src="/cobrands/fixmystreet.com/images/dog-poop-poster.png" alt=""> + <strong>A4 “We love our street’ dog poop poster</strong> + </a></li> </ul> <h2 id="adverts">Pre-made Adverts</h2> @@ -111,16 +136,16 @@ <p>Ideal for promoting FixMyStreet in your community newsletter or local magazine. Specially designed to stand out, and get your message across!</p> <ul class="downloads"> - <li><a href="/cobrands/fixmystreet/posters/fixmystreet-advert-90x130.pdf"> - <img src="/cobrands/fixmystreet/images/advert-90x130.png"> + <li><a href="/cobrands/fixmystreet.com/posters/fixmystreet-promote-90x130.pdf" data-goodielink="fixmystreet-advert-90x130"> + <img src="/cobrands/fixmystreet.com/images/promote-90x130.png" alt=""> <strong>Quarter page advert</strong> (9cm wide, 13cm high) </a></li> - <li><a href="/cobrands/fixmystreet/posters/fixmystreet-advert-90x60.pdf"> - <img src="/cobrands/fixmystreet/images/advert-90x60.png"> + <li><a href="/cobrands/fixmystreet.com/posters/fixmystreet-promote-90x60.pdf" data-goodielink="fixmystreet-advert-90x60"> + <img src="/cobrands/fixmystreet.com/images/promote-90x60.png" alt=""> <strong>One-eighth page advert</strong> (9cm wide, 6cm high) </a></li> - <li><a href="/cobrands/fixmystreet/posters/fixmystreet-advert-40x60.pdf"> - <img src="/cobrands/fixmystreet/images/advert-40x60.png"> + <li><a href="/cobrands/fixmystreet.com/posters/fixmystreet-promote-40x60.pdf" data-goodielink="fixmystreet-advert-40x60"> + <img src="/cobrands/fixmystreet.com/images/promote-40x60.png" alt=""> <strong>One-sixteenth page advert</strong> (4cm wide, 6cm high) </a></li> </ul> diff --git a/templates/web/fixmystreet.com/static/privacy.html b/templates/web/fixmystreet.com/static/privacy.html index addce1e2d..ba1745978 100755 --- a/templates/web/fixmystreet.com/static/privacy.html +++ b/templates/web/fixmystreet.com/static/privacy.html @@ -32,9 +32,7 @@ other companies, you can adjust your usage or install opt-out browser plugins. <dt>Who gets to see my email address?</dt> <dd>If you submit a problem, we pass on your details, and details of the problem, to the council contact or contacts responsible for the area where -you located the problem, or other relevant body (for example, in most of London -we send reports via the central London Report-It service, who may also publish -the public details of your report). Other than the council, who obviously get +you located the problem, or other relevant body. Other than the council, who obviously get your email address, only people we authorise to view the FixMyStreet administration interface will be able to see your email address and they will never use it for anything other than to help administer FixMyStreet. Similarly diff --git a/templates/web/fixmystreet.com/static/unresponsive.html b/templates/web/fixmystreet.com/static/unresponsive.html new file mode 100644 index 000000000..be8a3c6e1 --- /dev/null +++ b/templates/web/fixmystreet.com/static/unresponsive.html @@ -0,0 +1,38 @@ +[% INCLUDE header.html + title = 'Unresponsive councils: What you can do', bodyclass = 'unresponsive-council fullwidthpage' +%] + +<div class="unresponsive-council__header"> + <h1>Bad news :(</h1> + <p><strong class="unresponsive-council-name">[% body.name %]</strong> no + longer accepts [% IF category %][% category | html %][% END %] + reports from FixMyStreet.</p> +</div> + +<div class="unresponsive-council__body"> + <p><strong class="unresponsive-council-name">[% body.name %]</strong> is one + of only <strong>2%</strong> of councils that don’t accept reports from + FixMyStreet. We’re sad about it too, but here are some things you can do now:</p> + + [% IF body.external_url %] + <a href="[% body.external_url %]" class="unresponsive-council-cta unresponsive-council-cta--primary"> + <strong>Report your issue directly</strong> to <span class="unresponsive-council-name">[% body.name %]</span> on their website + </a> + [% ELSE %] + <a href="https://www.google.co.uk/search?q=report+[% body.name | uri %]" class="unresponsive-council-cta unresponsive-council-cta--primary"> + Find the website of <span class="unresponsive-council-name">[% body.name %]</span> and <strong>report your issue directly</strong> + </a> + [% END %] + + <h2>If you’d prefer to use FixMyStreet next time:</h2> + + <a href="https://www.writetothem.com/" class="unresponsive-council-cta"> + <strong>Write to your MP or local councillors</strong> to let them know this isn’t okay + </a> + + <a href="https://twitter.com/intent/tweet?via=fixmystreet" class="unresponsive-council-cta"> + <strong>Tweet</strong> to let <span class="unresponsive-council-name">[% body.name %]</span></strong> know you’d rather use FixMyStreet + </a> +</div> + +[% INCLUDE footer.html %] diff --git a/templates/web/fixmystreet.com/tokens/_extras_confirm.html b/templates/web/fixmystreet.com/tokens/_extras_confirm.html new file mode 100644 index 000000000..c27383f42 --- /dev/null +++ b/templates/web/fixmystreet.com/tokens/_extras_confirm.html @@ -0,0 +1 @@ +[% INCLUDE 'research/survey_link.html' %] diff --git a/templates/web/fixmystreet.com/tracking_code.html b/templates/web/fixmystreet.com/tracking_code.html index 23bd8d992..3b163f516 100644 --- a/templates/web/fixmystreet.com/tracking_code.html +++ b/templates/web/fixmystreet.com/tracking_code.html @@ -20,7 +20,7 @@ ga(function(tracker) { tracker.set('location', page + extra); }); ga('ecommerce:addItem', { - 'id': 'report/[% problem.id %]', + 'id': 'report/[% report.id %]', 'quantity': '1', 'name': 'Report' }); diff --git a/templates/web/fixmystreet/footer.html b/templates/web/fixmystreet/footer.html index 71e87ddfb..810708919 100644 --- a/templates/web/fixmystreet/footer.html +++ b/templates/web/fixmystreet/footer.html @@ -1,5 +1,5 @@ [% IF pagefooter %] - <footer role="content-info"> + <footer role="contentinfo"> [% INCLUDE 'front/footer-marketing.html' %] </footer> [% END %] @@ -37,5 +37,8 @@ <!-- [% INCLUDE 'debug_footer.html' %] --> </div> <!-- .wrapper --> + + [% TRY %][% PROCESS 'footer_extra.html' %][% CATCH file %][% END %] + </body> </html> diff --git a/templates/web/fixmystreet/front/javascript.html b/templates/web/fixmystreet/front/javascript.html new file mode 100644 index 000000000..13aa5216c --- /dev/null +++ b/templates/web/fixmystreet/front/javascript.html @@ -0,0 +1,15 @@ +[%# Assume using OpenStreetMap maps %] +<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-OpenStreetMap.js') %]", + "preload![% version('/js/jquery.ba-hashchange.min.js') %]" + ] +}); +</script> diff --git a/templates/web/fixmystreet/header.html b/templates/web/fixmystreet/header.html index a1c0ba38a..4fde56e94 100644 --- a/templates/web/fixmystreet/header.html +++ b/templates/web/fixmystreet/header.html @@ -12,14 +12,20 @@ <meta name="mobileoptimized" content="0"> [% INCLUDE 'header_opengraph.html' %] + [% SET start = c.config.ADMIN_BASE_URL IF admin; -[% SET start = c.config.ADMIN_BASE_URL IF admin %] - - <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/base.css') %]"> - <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]" media="(min-width:48em)"> + # For clarity, the 'fixmystreet' moniker (for fixmystreet.com) puts + # it stylesheets under fixmystreet.com + IF c.cobrand.moniker == 'fixmystreet'; + SET css_dir = 'fixmystreet.com'; + ELSE; + SET css_dir = c.cobrand.moniker; + END %] + <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ css_dir _ '/base.css') %]"> + <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ css_dir _ '/layout.css') %]" media="(min-width:48em)"> [% extra_css %] <!--[if (lt IE 9) & (!IEMobile)]> - <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ c.cobrand.moniker _ '/layout.css') %]"> + <link rel="stylesheet" href="[% start %][% version('/cobrands/' _ css_dir _ '/layout.css') %]"> <![endif]--> <script src="[% start %][% version('/js/modernizr.custom.js') %]" charset="utf-8"></script> diff --git a/templates/web/fixmystreet/header_logo.html b/templates/web/fixmystreet/header_logo.html index 6e4ad9e21..3ae706730 100644 --- a/templates/web/fixmystreet/header_logo.html +++ b/templates/web/fixmystreet/header_logo.html @@ -1 +1,2 @@ <a href="/" id="site-logo">[%- PROCESS 'site-name.html' -%]</a> + <a href="/" id="report-cta" title="[%- loc('Report a problem') -%]">[%- loc('Report') -%]</a> diff --git a/templates/web/fixmystreet/index.html b/templates/web/fixmystreet/index.html index f92518022..0441b3efb 100644 --- a/templates/web/fixmystreet/index.html +++ b/templates/web/fixmystreet/index.html @@ -1,20 +1,4 @@ -[%# 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 %] +[% map_js = PROCESS 'front/javascript.html' %] [% pre_container_extra = PROCESS 'around/postcode_form.html' %] [% INCLUDE 'header.html', title = '', bodyclass = 'frontpage fullwidthpage' %] @@ -23,13 +7,7 @@ Modernizr.load({ <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 %] +[% TRY %][% PROCESS 'front/pre-steps.html' %][% CATCH file %][% END %] <div class="tablewrapper"> <div id="front-howto"> diff --git a/templates/web/fixmystreet/my/_problem-list.html b/templates/web/fixmystreet/my/_problem-list.html new file mode 100644 index 000000000..1a891de80 --- /dev/null +++ b/templates/web/fixmystreet/my/_problem-list.html @@ -0,0 +1,27 @@ +[% FOREACH p = problems.confirmed %] + [% IF loop.first %]<h2>[% loc('Open reports') %]</h2>[% END %] + [% INCLUDE problem %] +[% END %] + +[% FOREACH p = problems.fixed %] + [% IF loop.first %]<h2>[% loc('Fixed reports') %]</h2>[% END %] + [% INCLUDE problem %] +[% END %] + +[% FOREACH p = problems.closed %] + [% IF loop.first %]<h2>[% loc('Closed reports') %]</h2>[% END %] + [% INCLUDE problem %] +[% END %] + +[%# FOREACH p = problems.unconfirmed; + IF loop.first; + '<h2>' _ loc('Unconfirmed reports') _ '</h2>'; + END; + INCLUDE problem; +END %] + +[% BLOCK problem %] + [% "<ul class='issue-list-a full-width'>" IF loop.first %] + [% INCLUDE 'report/_item.html', problem = p, no_fixed =1 %] + [% "</ul>" IF loop.last %] +[% END %] diff --git a/templates/web/fixmystreet/my/my.html b/templates/web/fixmystreet/my/my.html index 3944c2b1c..16779e503 100644 --- a/templates/web/fixmystreet/my/my.html +++ b/templates/web/fixmystreet/my/my.html @@ -27,32 +27,14 @@ [% INCLUDE '_hart_hants_note.html' %] [% END %] +[% INCLUDE "reports/_list-filters.html", use_section_wrapper = 1 %] + [% INCLUDE 'pagination.html', pager = problems_pager, param = 'p' %] -[% FOREACH p = problems.confirmed %] - [% IF loop.first %]<h2>[% loc('Open reports') %]</h2>[% END %] - [% INCLUDE problem %] -[% END %] - -[% FOREACH p = problems.fixed %] - [% IF loop.first %]<h2>[% loc('Fixed reports') %]</h2>[% END %] - [% INCLUDE problem %] -[% END %] - -[% FOREACH p = problems.closed %] - [% IF loop.first %]<h2>[% loc('Closed reports') %]</h2>[% END %] - [% INCLUDE problem %] -[% END %] - -[%# FOREACH p = problems.unconfirmed; - IF loop.first; - '<h2>' _ loc('Unconfirmed reports') _ '</h2>'; - END; - INCLUDE problem; -END %] +[% INCLUDE 'my/_problem-list.html' %] [% FOREACH u IN updates %] [% IF loop.first %] @@ -76,9 +58,3 @@ END %] </div> [% INCLUDE 'footer.html' %] - -[% BLOCK problem %] - [% "<ul class='issue-list-a full-width'>" IF loop.first %] - [% INCLUDE 'report/_item.html', problem = p, no_fixed =1 %] - [% "</ul>" IF loop.last %] -[% END %] diff --git a/templates/web/fixmystreet/report/display.html b/templates/web/fixmystreet/report/display.html index 4f4e7a2a6..0006241c3 100644 --- a/templates/web/fixmystreet/report/display.html +++ b/templates/web/fixmystreet/report/display.html @@ -38,9 +38,9 @@ <li><a rel="nofollow" id="key-tool-report-share" class="share" href="#report-share">[% loc('Share') %]</a></li> [% END %] [% IF c.cobrand.moniker == 'zurich' %] - <li><a class="chevron" id="key-tool-problems-nearby" href="[% c.uri_for( '/around', { lat => short_latitude, lon => short_longitude } ) %]">[% loc( 'Problems on the map' ) %]</a></li> + <li><a class="chevron" id="key-tool-problems-nearby" href="[% c.uri_for( '/around', { lat => latitude, lon => longitude } ) %]">[% loc( 'Problems on the map' ) %]</a></li> [% ELSE %] - <li><a class="chevron" id="key-tool-problems-nearby" href="[% c.uri_for( '/around', { lat => short_latitude, lon => short_longitude } ) %]">[% loc( 'Problems nearby' ) %]</a></li> + <li><a class="chevron" id="key-tool-problems-nearby" href="[% c.uri_for( '/around', { lat => latitude, lon => longitude } ) %]">[% loc( 'Problems nearby' ) %]</a></li> [% END %] </ul> @@ -72,6 +72,7 @@ </div> +[% TRY %][% INCLUDE 'report/sharing.html' %][% CATCH file %][% END %] [% INCLUDE 'report/updates.html' %] [% INCLUDE 'report/update-form.html' %] [% INCLUDE 'footer.html' %] diff --git a/templates/web/fixmystreet/report/new/category_extras.html b/templates/web/fixmystreet/report/new/category_extras.html deleted file mode 100644 index 48a38435d..000000000 --- a/templates/web/fixmystreet/report/new/category_extras.html +++ /dev/null @@ -1,26 +0,0 @@ -<div id="category_meta"> - [%- IF report_meta %] - [%- category = report.category %] - <h4>Additional Information</h4> - [%- FOR meta IN category_extras.$category %] - [%- meta_name = meta.code -%] - - <label for="form_[% meta_name %]">[% meta.description _ ':' %]</label> - [% IF field_errors.$meta_name %] - <p class='form-error'>[% field_errors.$meta_name %]</p> - [% END -%] - [% IF meta.variable != 'false' %] - [% IF meta.exists('values') %] - <select name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]> - [% FOR option IN meta.values.value %] - <option value="[% option.key.0 %]"[% IF option.key.0 == report_meta.$meta_name.value %] selected[% END %]>[% option.name.0 %]</option> - [% END %] - </select> - [% ELSE %] - <input type="text" value="[% report_meta.$meta_name.value | html %]" name="[% meta_name %]" id="form_[% meta_name %]"[% meta.required == 'true' ? ' required' : '' %]> - [% END %] - [% END %] - - [%- END %] - [%- END %] -</div> diff --git a/templates/web/fixmystreet/report/new/fill_in_details_form.html b/templates/web/fixmystreet/report/new/fill_in_details_form.html index 75e11c74f..82b1097b7 100644 --- a/templates/web/fixmystreet/report/new/fill_in_details_form.html +++ b/templates/web/fixmystreet/report/new/fill_in_details_form.html @@ -34,6 +34,14 @@ <p class='form-error'>[% field_errors.bodies %]</p> [% END %] + [% TRY %] + [%# Useful for amending form contents based on category selection %] + [% PROCESS 'report/new/category_at_top.html' %] + [% need_to_show_category_selector = 0 %] + [% CATCH file %] + [% need_to_show_category_selector = 1 %] + [% END %] + <label for="form_title">[% loc('One-line summary') %] [% INCLUDE 'report/public_label.html' %]</label> [% IF field_errors.title %] <p class='form-error'>[% field_errors.title %]</p> @@ -48,24 +56,10 @@ [% TRY %][% PROCESS 'report/new/inline-tips.html' %][% CATCH file %][% END %] - [% IF js %] - <div id="form_category_row"> - <label for="form_category">[% loc('Category') %]</label> - <select name="category" id="form_category" required><option>[% loc('Loading...') %]</option></select> - </div> - [% ELSE %] - [% IF category_options.size %] - [% IF field_errors.category %] - <p class='form-error'>[% field_errors.category %]</p> - [% END %] - [% PROCESS "report/new/category.html" %] - [% END %] + [% IF need_to_show_category_selector %] + [% PROCESS "report/new/category_wrapper.html" %] [% END %] - [%- IF category_extras %] - [% PROCESS "report/new/category_extras.html" %] - [%- END %] - [% TRY %][% PROCESS 'report/new/after_category.html' %][% CATCH file %][% END %] [% IF c.cobrand.allow_photo_upload %] diff --git a/templates/web/fixmystreet/report/update-form.html b/templates/web/fixmystreet/report/update-form.html index bde2c84e2..f5dca4669 100644 --- a/templates/web/fixmystreet/report/update-form.html +++ b/templates/web/fixmystreet/report/update-form.html @@ -34,7 +34,7 @@ [% END %] </select> [% ELSE %] - [% IF problem.is_fixed AND c.user_exists AND c.user.id == problem.user_id %] + [% IF problem.is_fixed AND ((c.user_exists AND c.user.id == problem.user_id) OR alert_to_reporter) %] <input type="checkbox" name="reopen" id="form_reopen" value="1"[% ' checked' IF update.mark_open %]> <label class="inline" for="form_reopen">[% loc('This problem has not been fixed') %]</label> diff --git a/templates/web/fixmystreet/report/update.html b/templates/web/fixmystreet/report/update.html index a400b2416..847277dfd 100644 --- a/templates/web/fixmystreet/report/update.html +++ b/templates/web/fixmystreet/report/update.html @@ -28,6 +28,7 @@ <p class="meta-2"> [% INCLUDE meta_line %] </p> </div> [% ELSE %] + [% INCLUDE 'report/photo.html' object=update %] <div class="update-text"> <div class="moderate-display"> [% add_links( update.text ) | html_para %] @@ -50,7 +51,6 @@ [% END %] </p> </div> - [% INCLUDE 'report/photo.html' object=update %] [% END %] </div> [% IF moderating %] diff --git a/templates/web/greenwich/around/_report_banner.html b/templates/web/greenwich/around/_report_banner.html new file mode 100644 index 000000000..52a869262 --- /dev/null +++ b/templates/web/greenwich/around/_report_banner.html @@ -0,0 +1,10 @@ +<h1 class="big-green-banner"> + [% loc( 'Click map to report a problem' ) %] +</h1> +<div class="click-the-map"> + <h2>[% loc( 'Have you found a problem here?' ) %]</h2> + <p>Click on the map to report it</p> +</div> +<a id="skip-this-step" href="[% url_skip %]" rel="nofollow"> + [% loc("Can't see the map? <em>Skip this step</em>") %] +</a> diff --git a/templates/web/greenwich/around/around_map_list_items.html b/templates/web/greenwich/around/around_map_list_items.html new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/templates/web/greenwich/around/around_map_list_items.html diff --git a/templates/web/greenwich/around/intro.html b/templates/web/greenwich/around/intro.html new file mode 100644 index 000000000..81c0b55df --- /dev/null +++ b/templates/web/greenwich/around/intro.html @@ -0,0 +1,7 @@ +<h1>[% loc('Report a street cleaning or parks issue in Royal Greenwich') %]</h1> +<p> + Use this form for reporting cleaning problems on streets and parks in Greenwich, such as littering, flytipping, graffiti or overflowing bins. +</p> +<p> + To report other kinds of road and street problems like potholes, blocked drains, faulty street lamps or cracks in the pavement, please pick from our list of additional <a href="http://www.royalgreenwich.gov.uk/reportaproblem">reporting forms</a>. +</p> diff --git a/templates/web/greenwich/around/on_map_list_items.html b/templates/web/greenwich/around/on_map_list_items.html new file mode 100644 index 000000000..893f5c698 --- /dev/null +++ b/templates/web/greenwich/around/on_map_list_items.html @@ -0,0 +1,11 @@ +[% all_reports = on_map.merge(around_map) %] +[% IF all_reports.size %] + [% FOREACH problem IN all_reports %] + [% UNLESS problem.title; problem = problem.problem; END %] + [% INCLUDE "reports/_list-entry.html" %] + [% END %] +[% ELSE %] + <li class="empty"> + <p>[% loc('There are no reports to show.') %]</p> + </li> +[% END %] diff --git a/templates/web/greenwich/around/tabbed_lists.html b/templates/web/greenwich/around/tabbed_lists.html new file mode 100644 index 000000000..0d7dfddfc --- /dev/null +++ b/templates/web/greenwich/around/tabbed_lists.html @@ -0,0 +1,5 @@ +[% INCLUDE "reports/_list-filters.html" %] + +<ul class="report-list" id="current"> + [% INCLUDE "around/on_map_list_items.html" %] +</ul> diff --git a/templates/web/greenwich/faq/faq-en-gb.html b/templates/web/greenwich/faq/faq-en-gb.html new file mode 100644 index 000000000..f143581d6 --- /dev/null +++ b/templates/web/greenwich/faq/faq-en-gb.html @@ -0,0 +1,134 @@ +[% INCLUDE 'header.html', title = 'Help', bodyclass = 'twothirdswidthpage' %] + +<div class="sticky-sidebar"> + <aside> + <ul class="plain-list"> + <li><a href="#faq">Frequently Asked Questions</a></li> + <li><a href="/privacy">Privacy and cookies</a></li> + <li><a href="/contact">Contact FixMyStreet</a></li> + </ul> + </aside> +</div> + +<h1> Frequently Asked Questions </h1> + +<p>These pages are for reporting things which are broken, dirty, damaged or +dumped, and need fixing, cleaning or clearing: </p> +<ul> + <li>graffiti + <li>flytipping + <li>broken playground equipment + <li>street lighting + <li>potholes + </ul> + <p> + Note that though most of these services are provided by the Royal Borough of Greenwich, + FixMyStreet will forward some categories of issue to Transport for London (TfL). + </p> + +<dl> + <dt><a name="emergencies"></a>Reporting emergencies (Out of Hours)</dt> + <dd> + <p> Please do not report problems which present an immediate risk to life, + for example missing manhole covers or a fallen lamp column. </p> + <p> Issues reported via the website are only actioned during office hours. + If you require an Out of Hours service please ring our main number + 020 8854 8888 and a message will direct you to the relevant Out of Hours + service. </p> + + </dd> + + <dt>How do I report a problem here?</dt> + <dd>After entering a postcode or location, you are shown +a map of that area. You can view problems already reported in that area, +or report ones of your own by clicking on the map at the location of +the problem.</dd> + <dt>How are the problems solved?</dt> + <dd>They are reported directly to us so we can then resolve the problem. + You can also discuss the problem on the website with others if you wish.</dd> + + <dt>Do you remove silly or illegal content?</dt> + <dd>Royal Borough of Greenwich and FixMyStreet are not responsible for the content and accuracy +of material submitted by its users. We reserve the right to edit or remove any +problems or updates which we consider to be inappropriate upon being informed +by a user of the site.</dd> + + <dt>Can I use FixMyStreet on my mobile?</dt> + <dd> + <p>The FixMyStreet website will already work on your mobile phone, adapting to + the size of your screen automatically. Using an app has some advantages, though + — for example, you can create a report even when you have no network + connection. + <ul> + <li> + <a href="https://itunes.apple.com/gb/app/fixmystreet/id297456545">FixMyStreet app for iPhone</a> + <li> + <a href="https://play.google.com/store/apps/details?id=org.mysociety.FixMyStreet">FixMyStreet app for Android</a> + <li><em>Nokia:</em> A volunteer, Thomas Forth, has written an app available from the + <a href="http://store.ovi.com/content/107557">Ovi Store</a>. + </ul> + </dd> + + <dt>Can I use these pages to report problems outside of the Royal Borough of Greenwich district?</dd> + <dd>Yes, if you enter a postcode or address outside the borough you will be re-directed to the main FixMyStreet site that will enable you to report problems elsewhere. FixMyStreet will forward these on to the relevant council.</dd> + + <dt>The site is powered by FixMyStreet, who are they?</dt> + <dd>FixMyStreet was built by <a href="http://www.mysociety.org/">mySociety</a>, in conjunction with the <a href="http://www.youngfoundation.org.uk/">Young Foundation</a>. +mySociety is the project of a registered charity which has grown out of the community of +volunteers who built sites like <a href="http://www.theyworkforyou.com/">TheyWorkForYou</a>. +mySociety’s primary mission is to build Internet projects which give people simple, tangible +benefits in the civic and community aspects of their lives. +The charity is called UK Citizens Online Democracy and is charity number 1076346. mySociety +can be contacted by email at <a href="mailto:hello@mysociety.org">hello@mysociety.org</a>, +or by post at mySociety, 483 Green Lanes, London, N13 4BS.</dd> + + <dt>Why does the site use kilometres for measurements?</dt> + <dd>The British national + grid reference system, devised by Ordnance Survey (the British national + mapping agency) around the time of the second world war, uses eastings and + northings measured in metres and kilometres; the maps we use are from + Ordnance Survey and so this is what we use to display distances. + There you have it: not everything British is in miles!</dd> + + <dt>Why can’t I zoom out more on the reporting map?</dt> + <dd>We want to keep reports locally focused, so we restrict the ability to + move radically between areas. The map on <a href="/my">Your Reports</a> will let you see all + the reports you’ve made, wherever they are.</dd> + + <dt>I’d like a site like this for my own location/ where’s the "source code" to this site?</dt> + <dd> +The mySociety software behind this site is open source, and available +under the GNU Affero GPL software license. You can <a +href="http://github.com/mysociety/fixmystreet">download the +source code</a> and help mySociety develop it. +You’re welcome to use it in your own projects, although you must also +make available the source code to any such projects. +<a href="http://www.fiksgatami.no/">Fiksgatami</a> is an example of our code +being used in a Norwegian version of this site. +</dd> + +</dl> + + <h2><a name="privacy"></a>Privacy Questions</h2> + + <dl> + <dt>Who gets to see my email address?</dt> + <dd> +<p>If you submit a problem, your details, and details of the problem, will be +submitted to the Royal Borough of Greenwich, or TfL, as +appropriate. Other than the council, only people we authorise to view the +FixMyStreet administration interface will be able to see your email address and +they will never use it for anything other than to help administer +FixMyStreet.</p> +<p>We will never give or sell your email address to anyone else, unless we are +obliged to by law. Your name will not be published anywhere unless you let us.</p> +</dd> + + <dt>What emails will you send to me?</dt> + <dd>We will email you when we have received your report, and when it has + been investigated and actioned. We will only send you emails that + relate to an issue you have reported.</dd> + + </dl> + +[% INCLUDE 'footer.html' pagefooter = 'yes' %] diff --git a/templates/web/makemyisland/footer.html b/templates/web/greenwich/footer.html index d2687a3a1..31ab35f52 100644 --- a/templates/web/makemyisland/footer.html +++ b/templates/web/greenwich/footer.html @@ -1,33 +1,44 @@ [% IF pagefooter %] - <footer role="content-info"> + <footer role="contentinfo"> [% INCLUDE 'front/footer-marketing.html' %] </footer> [% END %] </div><!-- .content role=main --> </div><!-- .container --> + [% IF c.cobrand.moniker == 'fixmystreet' AND bodyclass != 'mappage' %] + [% INCLUDE 'footer-nav.html' %] + [% END %] </div><!-- .table-cell --> <div class="nav-wrapper"> <div class="nav-wrapper-2"> <div id="main-nav" role="navigation"> + <ul id="mysoc-menu"> + <li><a id="mysoc-logo" href="https://www.mysociety.org/">mySociety</a></li> + </ul> + <ul id="main-menu"> - <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="[% c.config.BASE_URL %]/"[% END %] class="report-a-problem-btn" + <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="[% c.config.BASE_URL %]/my"[% END + %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="[% c.config.BASE_URL %]/reports"[% END + %]<li><[% IF c.req.uri.path == '/reports/Royal+Borough+of+Greenwich' %]span[% ELSE %]a href="/reports"[% END %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="[% c.config.BASE_URL %]/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END + %]<li><[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[% - %]<li><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="[% c.config.BASE_URL %]/faq"[% END + %]<li><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li>[% - %]<li id="top-nav-privacy"><[% IF c.req.uri.path == '/privacy' %]span[% ELSE %]a href="[% c.config.BASE_URL %]/privacy"[% END + %]<li id="top-nav-privacy"><[% IF c.req.uri.path == '/privacy' %]span[% ELSE %]a href="/privacy"[% END %]>[% loc("Privacy") %]</[% c.req.uri.path == '/privacy' ? 'span' : 'a' %]></li> </ul> </div> </div> </div> +<!-- [% INCLUDE 'debug_footer.html' %] --> </div> <!-- .wrapper --> + + [% TRY %][% PROCESS 'footer_extra.html' %][% CATCH file %][% END %] + </body> </html> diff --git a/templates/web/greenwich/front/footer-marketing.html b/templates/web/greenwich/front/footer-marketing.html new file mode 100644 index 000000000..66a75b5cc --- /dev/null +++ b/templates/web/greenwich/front/footer-marketing.html @@ -0,0 +1,31 @@ +<hr /> +<div class="tablewrapper"> + <div id="footer-mobileapps"> + <p> + <a href="https://itunes.apple.com/gb/app/fixmystreet/id297456545"> + <img alt="FixMyStreet app on the App Store" src="/cobrands/fixmystreet/images/itunes_store_logo.png" /> + </a> + <a href="https://play.google.com/store/apps/details?id=org.mysociety.FixMyStreet"> + <img alt="FixMyStreet Android app on Google Play" src="/cobrands/fixmystreet/images/google_play_logo.png" /> + </a> + </p> + </div> + + <div id="footer-help"> + <p> + Powered by <a class="platform-logo" href="https://fixmystreet.com/council">FixMyStreet Platform</a> + </p> + </div> +</div> + +<div class="footer-nav"> + <ul> + <li><a href="http://www.royalgreenwich.gov.uk/contact" rel="nofollow">Contact us</a></li> + <li><a href="http://www.royalgreenwich.gov.uk/location" rel="nofollow">Location map</a></li> + <li><a href="http://www.royalgreenwich.gov.uk/terms" rel="nofollow">Terms & disclaimer</a></li> + <li><a href="http://www.royalgreenwich.gov.uk/accessibility" rel="nofollow">Accessibility statement</a></li> + <li><a href="http://www.royalgreenwich.gov.uk/statistics" rel="nofollow">Website statistics</a></li> + <li>© 2015 Royal Borough of Greenwich</li> + <li class="last"><a href="http://www.royalgreenwich.gov.uk/cookies">Cookies</a></li> + </ul> +</div> diff --git a/templates/web/greenwich/header_logo.html b/templates/web/greenwich/header_logo.html new file mode 100644 index 000000000..fa279bdc4 --- /dev/null +++ b/templates/web/greenwich/header_logo.html @@ -0,0 +1,29 @@ + <a href="http://www.royalgreenwich.gov.uk/" id="site-logo">[%- PROCESS 'site-name.html' -%]</a> +</div> +<div class="container main-menu-container"> + <ul id="greenwich-menu-desktop"> + <li><a href="http://www.royalgreenwich.gov.uk/pay">Make a payment</a></li> + <li><a href="http://www.royalgreenwich.gov.uk/apply">Apply for it</a></li> + <li><a href="/">Report a problem</a></li> + <li><a href="http://www.royalgreenwich.gov.uk/a_to_z">A to Z of services</a></li> + <li><a href="http://www.royalgreenwich.gov.uk/contact">Contact us</a></li> + <li><a href="http://www.royalgreenwich.gov.uk/about">About us</a></li> + </ul> + + <ul id="greenwich-breadcrumb"> + <li><a class="bc_arrow" href="http://www.royalgreenwich.gov.uk/">Home</a></li> + <li><a href="/">FixMyStreet</a></li> + </ul> + + <ul id="fms-menu-desktop"> + <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" + >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END + %]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/reports"[% END + %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END + %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]></li>[% + %]<li><[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END + %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]></li> + </ul> diff --git a/templates/web/greenwich/my/_problem-list.html b/templates/web/greenwich/my/_problem-list.html new file mode 100644 index 000000000..1ff69f9fb --- /dev/null +++ b/templates/web/greenwich/my/_problem-list.html @@ -0,0 +1,25 @@ +<ul class='issue-list-a full-width'> + [% IF problems.all %] + [% FOREACH p = problems.all %] + [% INCLUDE 'reports/_list-entry.html', problem = p, no_fixed =1 %] + [% END %] + [% ELSE %] + <li class="empty"> + <p>[% loc('There are no reports to show.') %]</p> + </li> + [% END %] +</ul> + +[% IF ! problems.size %] +<!-- Preserve behaviour of map filters despite map not being shown --> +<script type="text/javascript"> + (function($) { + $(function() { + $(".report-list-filters [type=submit]").hide(); + $(".report-list-filters select").change(function() { + $(this).closest("form").submit(); + }); + }) + })(window.jQuery); +</script> +[% END %] diff --git a/templates/web/greenwich/reports/_list-entry.html b/templates/web/greenwich/reports/_list-entry.html new file mode 100644 index 000000000..cd70410d3 --- /dev/null +++ b/templates/web/greenwich/reports/_list-entry.html @@ -0,0 +1,6 @@ +<li class="[% c.cobrand.pin_colour(problem) %]"> + <a href="[% c.uri_for('/report', problem.id ) %]" class="[% problem.category %]"> + <h3>[% problem.title | html %]</h3> + <p>Reported [%- prettify_dt( problem.confirmed, 1 ) %]</p> + </a> +</li> diff --git a/templates/web/greenwich/reports/_list-filters.html b/templates/web/greenwich/reports/_list-filters.html new file mode 100644 index 000000000..5d610261b --- /dev/null +++ b/templates/web/greenwich/reports/_list-filters.html @@ -0,0 +1,32 @@ +[% IF use_section_wrapper %] +<section class="full-width"> + <form method="get" action=""> +[% END %] + + <p class="report-list-filters"> + <label> + Show + <select name="status" id="statuses"> + <option value="all"[% ' selected' IF filter_status == 'all' %]>all reports</option> + <option value="open"[% ' selected' IF filter_status == 'open' %]>unfixed reports</option> + <option value="fixed"[% ' selected' IF filter_status == 'fixed' %]>fixed reports</option> + </select> + </label> + <label> + about + <select name="filter_category" id="filter_categories"> + <option value="">Everything</option> + [% FOR category IN filter_categories %] + <option value="[% category | html %]"[% ' selected' IF filter_category == category %]> + [% category | html %] + </option> + [% END %] + </select> + </label> + <input type=submit value="Go" /> + </p> + +[% IF use_section_wrapper %] + </form> +</section> +[% END %] diff --git a/templates/web/greenwich/reports/_problem-list.html b/templates/web/greenwich/reports/_problem-list.html new file mode 100644 index 000000000..45746e309 --- /dev/null +++ b/templates/web/greenwich/reports/_problem-list.html @@ -0,0 +1,19 @@ +<section class="full-width"> + [% INCLUDE column + problems = problems.${body.id} + %] +</section> + +[% BLOCK column %] + <ul class="issue-list-a"> + [% IF problems %] + [% FOREACH problem IN problems %] + [% INCLUDE 'reports/_list-entry.html' %] + [% END %] + [% ELSE %] + <li class="empty"> + <p>[% loc('There are no reports to show.') %]</p> + </li> + [% END %] + </ul> +[% END %] diff --git a/templates/web/harrogate/footer.html b/templates/web/harrogate/footer.html index 116b318a3..4558b2381 100644 --- a/templates/web/harrogate/footer.html +++ b/templates/web/harrogate/footer.html @@ -1,5 +1,5 @@ [% IF pagefooter %] - <footer role="content-info"> + <footer role="contentinfo"> [% INCLUDE 'front/footer-marketing.html' %] </footer> [% END %] diff --git a/templates/web/harrogate/header.html b/templates/web/harrogate/header.html index a1c0ba38a..e40a38d94 100644 --- a/templates/web/harrogate/header.html +++ b/templates/web/harrogate/header.html @@ -31,7 +31,7 @@ <link rel="canonical" href="https://www.fixmystreet.com[% c.req.uri.path_query %]"> [% END %] - [% TRY %][% PROCESS 'header_extra.html' %][% CATCH file %][% END %] + [% PROCESS 'header_extra.html' %] </head> [% TRY %][% PROCESS 'set_body_class.html' %][% CATCH file %][% END %] diff --git a/templates/web/harrogate/report/new/after_category.html b/templates/web/harrogate/report/new/after_category.html new file mode 100644 index 000000000..b67019353 --- /dev/null +++ b/templates/web/harrogate/report/new/after_category.html @@ -0,0 +1,48 @@ +<script> + // we link to the informational articles rather than the forms, because in some + // cases the former have more information or links to track progress of faults + // etc.. + var links = { + 'Bus stops': 'http://www.northyorks.gov.uk/article/25853/Bus-stops-and-shelters', + // Pavements/footpaths (multiple options) + 'Potholes': 'http://www.northyorks.gov.uk/article/25215/Roads---potholes', + // Roads/highways (multiple options) + 'Road traffic signs': 'http://www.northyorks.gov.uk/article/25667/Road-signs-and-bollards', + // Street lighting (not considered, as also a Harrogate category) + 'Traffic lights': 'http://www.northyorks.gov.uk/article/25626/Traffic-lights', + 'default': 'http://www.northyorks.gov.uk/article/28237/Report-it-online' + }; + $(function () { + var notice = $('.nycc-notice'); + $("#problem_form").on("change.category", "select#form_category", function(){ + var cat = $(this).val(); + if (cat.search(/NYCC/) > 0) { + cat = cat.replace(' (NYCC)', ''); + var link = links[cat] || links ['default']; + notice.find('a').attr({ href: link }); + notice.show(); + } + else { + notice.hide(); + } + + }); + }); +</script> +<noscript> + <p class="nycc-notice"> + Please report issues for categories labelled <b>(NYCC)</b> directly to + <a href="http://www.northyorks.gov.uk/article/28237/Report-it-online"> + North Yorkshire County Council. + </a> + </p> +</noscript> + +<p class="nycc-notice" style="display:none"> + Please report issues for <b>NYCC</b> managed categories directly to + <a href="http://www.northyorks.gov.uk/article/28237/Report-it-online"> + North Yorkshire County Council. + </a> +</p> + +<p><small>[% loc("Remember that FixMyStreet is primarily for reporting physical problems that can be fixed. If your problem is not appropriate for submission via this site remember that you can contact your council directly using their own website.") %]</small></p> diff --git a/templates/web/hart/header.html b/templates/web/hart/header.html index dcc202b5a..c2d363010 100644 --- a/templates/web/hart/header.html +++ b/templates/web/hart/header.html @@ -42,6 +42,8 @@ <link rel="Shortcut Icon" type="image/x-icon" href="/cobrands/hart/favicon.ico"> + [% PROCESS 'header_extra.html' %] + </head> [% TRY %][% PROCESS 'set_body_class.html' %][% CATCH file %][% END %] <body class="[% bodyclass | html IF bodyclass %]"> diff --git a/templates/web/hart/tokens/confirm_problem.html b/templates/web/hart/tokens/confirm_problem.html index 117d2d1bc..68223e92b 100644 --- a/templates/web/hart/tokens/confirm_problem.html +++ b/templates/web/hart/tokens/confirm_problem.html @@ -4,18 +4,16 @@ <p class="confirmed"> Thank you. You have successfully confirmed your report -[% IF c.cobrand.owns_problem( problem ) %] +[% IF c.cobrand.owns_problem( report ) %] and this will now be investigated by the council. -You can <a href="[% c.cobrand.base_url_for_report( problem ) %][% problem.url %]">view the problem on this site</a>. +You can <a href="[% c.cobrand.base_url_for_report( report ) %][% report.url %]">view the report on this site</a>. [% ELSE %] and this has now been passed on to [%# TODO make this generic %] <b>Hampshire County Council</b> to investigate. -Note that Hart District Council is not responsible for this type of problem. However you can continue to view your problem on the <a href="[% c.cobrand.base_url_for_report( problem ) %][% problem.url %]"><i>fixmystreet.com</i> website</a>. +Note that Hart District Council is not responsible for this type of problem. However you can continue to view your report on the <a href="[% c.cobrand.base_url_for_report( report ) %][% report.url %]"><i>fixmystreet.com</i> website</a>. [% END %] </p> -<p>Your reference for this problem is [% problem.id %], please quote it in any enquiries. +<p>Your reference for this report is [% report.id %], please quote it in any enquiries. </p> -[% display_crosssell_advert( problem.user.email, problem.name ) %] - [% INCLUDE 'footer.html' %] diff --git a/templates/web/makemyisland/_location_buttons.html b/templates/web/makemyisland/_location_buttons.html deleted file mode 100644 index 3604c466f..000000000 --- a/templates/web/makemyisland/_location_buttons.html +++ /dev/null @@ -1,15 +0,0 @@ -<div id="location-buttons"> - <!-- - Fonadhoo (the island) - Barasil (northern most) - Medhuavah (in the middle) - Kurigam (south) - --> - <div class="island-button"> - <a href="/around?pc=Fonadhoo" class="front-page-button">Fonadhoo island</a> - </div> - <a href="/around?latitude=1.846;longitude=73.510" class="front-page-button">Barasil</a> - <a href="/around?latitude=1.833;longitude=73.501" class="front-page-button">Medhuavah</a> - <a href="/around?latitude=1.822;longitude=73.488" class="front-page-button">Kurigam</a> - -</div> diff --git a/templates/web/makemyisland/around/postcode_form.html b/templates/web/makemyisland/around/postcode_form.html deleted file mode 100644 index 81cf948ef..000000000 --- a/templates/web/makemyisland/around/postcode_form.html +++ /dev/null @@ -1,8 +0,0 @@ -<div id="front-main"> - <div id="front-main-container"> - <h1>Report, view, or discuss local problems</h1> - <h2>(dumping waste, street lighting, erosion)</h2> - [% INCLUDE '_location_buttons.html' %] - </div> -</div> - diff --git a/templates/web/makemyisland/header_logo.html b/templates/web/makemyisland/header_logo.html deleted file mode 100644 index 5d8b285dc..000000000 --- a/templates/web/makemyisland/header_logo.html +++ /dev/null @@ -1,2 +0,0 @@ - <a href="http://www.undp.org/" id="united-nations-dp-logo">UNDP</a> - <a href="[% c.config.BASE_URL %]/" id="site-logo">[% PROCESS 'site-name.html -%]</a> diff --git a/templates/web/makemyisland/site-name.html b/templates/web/makemyisland/site-name.html deleted file mode 100644 index 3eb903cd1..000000000 --- a/templates/web/makemyisland/site-name.html +++ /dev/null @@ -1 +0,0 @@ -MakeMyIsland diff --git a/templates/web/oxfordshire/around/_report_banner.html b/templates/web/oxfordshire/around/_report_banner.html new file mode 100644 index 000000000..52a869262 --- /dev/null +++ b/templates/web/oxfordshire/around/_report_banner.html @@ -0,0 +1,10 @@ +<h1 class="big-green-banner"> + [% loc( 'Click map to report a problem' ) %] +</h1> +<div class="click-the-map"> + <h2>[% loc( 'Have you found a problem here?' ) %]</h2> + <p>Click on the map to report it</p> +</div> +<a id="skip-this-step" href="[% url_skip %]" rel="nofollow"> + [% loc("Can't see the map? <em>Skip this step</em>") %] +</a> diff --git a/templates/web/oxfordshire/around/around_map_list_items.html b/templates/web/oxfordshire/around/around_map_list_items.html new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/templates/web/oxfordshire/around/around_map_list_items.html diff --git a/templates/web/oxfordshire/around/extra_text.html b/templates/web/oxfordshire/around/extra_text.html index 439bf00a2..107d3324f 100644 --- a/templates/web/oxfordshire/around/extra_text.html +++ b/templates/web/oxfordshire/around/extra_text.html @@ -1,5 +1,3 @@ <div class="extra-text"> <p>Please do not use this form for reporting <a href="/faq#pothole" target="_blank">emergencies and urgent problems</a>.</p> - - <p><img src="/i/pin-yellow.png" class="extra-text__image" width="48" height="64" /> - <b>these are problems that have already been reported</b>.<br>Click them to see more details.</p> </div> diff --git a/templates/web/oxfordshire/around/on_map_list_items.html b/templates/web/oxfordshire/around/on_map_list_items.html new file mode 100644 index 000000000..893f5c698 --- /dev/null +++ b/templates/web/oxfordshire/around/on_map_list_items.html @@ -0,0 +1,11 @@ +[% all_reports = on_map.merge(around_map) %] +[% IF all_reports.size %] + [% FOREACH problem IN all_reports %] + [% UNLESS problem.title; problem = problem.problem; END %] + [% INCLUDE "reports/_list-entry.html" %] + [% END %] +[% ELSE %] + <li class="empty"> + <p>[% loc('There are no reports to show.') %]</p> + </li> +[% END %] diff --git a/templates/web/oxfordshire/around/tabbed_lists.html b/templates/web/oxfordshire/around/tabbed_lists.html new file mode 100644 index 000000000..0d7dfddfc --- /dev/null +++ b/templates/web/oxfordshire/around/tabbed_lists.html @@ -0,0 +1,5 @@ +[% INCLUDE "reports/_list-filters.html" %] + +<ul class="report-list" id="current"> + [% INCLUDE "around/on_map_list_items.html" %] +</ul> diff --git a/templates/web/oxfordshire/faq/faq-en-gb.html b/templates/web/oxfordshire/faq/faq-en-gb.html index ddf3fc44d..b85943e0d 100755 --- a/templates/web/oxfordshire/faq/faq-en-gb.html +++ b/templates/web/oxfordshire/faq/faq-en-gb.html @@ -28,7 +28,7 @@ </p> <p> If you are reporting an emergency please do not report it online, but ring our - Customer Service Centre on <strong>0845 310 111</strong>. + Customer Service Centre on <strong>0845 310 1111</strong>. </p> <p> Here is a <a href="http://vimeo.com/65813425">short video</a> diff --git a/templates/web/oxfordshire/footer.html b/templates/web/oxfordshire/footer.html index e654889dd..ed84c0ad6 100644 --- a/templates/web/oxfordshire/footer.html +++ b/templates/web/oxfordshire/footer.html @@ -1,5 +1,5 @@ [% IF pagefooter %] - <footer role="content-info"> + <footer role="contentinfo"> <p><a href="/privacy">Privacy and cookies</a></p> </footer> [% END %] diff --git a/templates/web/oxfordshire/header.html b/templates/web/oxfordshire/header.html index 19bb23374..bc52a0720 100644 --- a/templates/web/oxfordshire/header.html +++ b/templates/web/oxfordshire/header.html @@ -24,73 +24,60 @@ <script src="[% start %][% version('/cobrands/oxfordshire/position_map.js') %]" charset="utf-8"></script> [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %] [% extra_js %] - + [% INCLUDE 'tracking_code.html' %] + [% PROCESS 'header_extra.html' %] </head> <body class="[% bodyclass | html IF bodyclass %]"> <div id="oxford-wrapper"> - <div id="oxford-header" class="desk-only oxford-left"> - <a href="http://www.oxfordshire.gov.uk/" title="Home" class="logo">Oxfordshire County Council<span></span></a> - <span id="oxford-links"> - <a href="http://www.oxfordshire.gov.uk/" title="">Oxfordshire County Council home</a> - </span> - <div style="clear:both"></div> - <span class="header"><a href="/">Report a road or street problem</a></span> - <div class="oxford-user"> - <p> - [% IF c.user_exists %] - [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] - <a href="/auth/sign_out">[% loc('sign out') %]</a> - [% END %] - </p> - </div> - - - <div id="navigation"> - <div class="menubar"> - <div class="menu-inner"> - <ul class="menu"> - <li> - <[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %]>[% "Report" %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]> - </li> - <li> - <[% IF c.req.uri.path == '/my' OR ( c.req.uri.path == '/auth' AND c.req.params.r == 'my' ) %]span[% ELSE %]a href="/my"[% END - %]>[% loc("Your reports") %]</[% ( c.req.uri.path == '/my' OR ( c.req.uri.path == '/auth' AND c.req.params.r == 'my' ) ) ? 'span' : 'a' %]> - </li> - <li> - <[% IF c.req.uri.path == '/reports/Oxfordshire' %]span[% ELSE %]a href="/reports/Oxfordshire"[% END - %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]> - </li> - <li> - <[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END - %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]> - </li> - <li> - <[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END - %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]> - </li> - </ul> - </div> + <div id="oxford-header" class="desk-only oxford-left"> + <a href="http://www.oxfordshire.gov.uk/" title="Home" class="logo">Oxfordshire County Council<span></span></a> + <span id="oxford-links"> + <a href="http://www.oxfordshire.gov.uk/" title="">Oxfordshire County Council home</a> + </span> + <div style="clear:both"></div> + <span class="header"><a href="/">Report a road or street problem</a></span> + + [% IF c.user_exists %] + <div class="oxford-user"> + <p> + [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] + <a href="/auth/sign_out">[% loc('Sign out') %]</a> + </p> + </div> + [% END %] + + <div id="navigation"> + <div class="menubar"> + <div class="menu-inner"> + <ul class="menu"> + <li> + <[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %]>[% "Report" %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]> + </li> + <li> + <[% IF c.req.uri.path == '/my' OR ( c.req.uri.path == '/auth' AND c.req.params.r == 'my' ) %]span[% ELSE %]a href="/my"[% END + %]>[% loc("Your reports") %]</[% ( c.req.uri.path == '/my' OR ( c.req.uri.path == '/auth' AND c.req.params.r == 'my' ) ) ? 'span' : 'a' %]> + </li> + <li> + <[% IF c.req.uri.path == '/reports/Oxfordshire' %]span[% ELSE %]a href="/reports/Oxfordshire"[% END + %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]> + </li> + <li> + <[% IF c.req.uri.path == '/alert' %]span[% ELSE %]a href="/alert[% pc ? '/list?pc=' : '' %][% pc | uri %]"[% END + %]>[% loc("Local alerts") %]</[% c.req.uri.path == '/alert' ? 'span' : 'a' %]> + </li> + <li> + <[% IF c.req.uri.path == '/faq' %]span[% ELSE %]a href="/faq"[% END + %]>[% loc("Help") %]</[% c.req.uri.path == '/faq' ? 'span' : 'a' %]> + </li> + </ul> + </div> </div> </div> - - - - - </div> <!-- end of oxford header --> -<!-- - <div id="oxford-main-menu" class="desk-only"> - <ul class="tabs"> - <li class="home first"></li>[% - %]<li></li>[% - %]<li></li>[% - %]<li></li>[% - %]<li class="last"></li> - </ul> - </div> ---> - + + </div> <!-- end of oxford header --> + <div class="wrapper"> <div class="table-cell"> @@ -104,7 +91,7 @@ [% IF c.user_exists %] <div id="user-meta"> <p> - [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] + [% tprintf(loc('Hi %s'), c.user.name || c.user.email) %] <a href="/auth/sign_out">[% loc('sign out') %]</a> </p> </div> diff --git a/templates/web/oxfordshire/js/translation_strings.html b/templates/web/oxfordshire/js/translation_strings.html deleted file mode 100644 index e326da0a8..000000000 --- a/templates/web/oxfordshire/js/translation_strings.html +++ /dev/null @@ -1,40 +0,0 @@ - translation_strings = { - update: '[% loc('Please enter a message') | replace("'", "\\'") %]', - title: '[% loc('Please enter a subject') | replace("'", "\\'") %]', - detail: '[% loc('Please enter some details') | replace("'", "\\'") %]', - name: { - required: '[% loc('Please enter your name') | replace("'", "\\'") %]', - validName: '[% loc('Please enter your full name, councils need this information – if you do not wish your name to be shown on the site, untick the box below') | replace("'", "\\'") %]' - }, - category: '[% loc('Please choose a category') | replace("'", "\\'") %]', - rznvy: { - required: '[% loc('Please enter your email') | replace("'", "\\'") %]', - email: '[% loc('Please enter a valid email') | replace("'", "\\'") %]' - }, - email: { - required: '[% loc('Please enter your email') | replace("'", "\\'") %]', - email: '[% loc('Please enter a valid email') | replace("'", "\\'") %]' - }, - fms_extra_title: '[% loc('Please enter your title') | replace("'", "\\'") %]', - first_name: '[% loc('Please enter your first name') | replace("'", "\\'") %]', - last_name: '[% loc('Please enter your second name') | replace("'", "\\'") %]', - geolocate: '[% loc('or locate me automatically') | replace("'", "\\'") %]', - right_place: '[% loc('Right place?') | replace("'", "\\'") %]', - try_again: '[% loc('Try again') | replace("'", "\\'") %]', - place_pin_on_map: '[% loc('Place pin on map') | replace("'", "\\'") %]', - home: '[% loc('Home') | replace("'", "\\'") %]', - back: '[% loc('Back') | replace("'", "\\'") %]', - how_to_send: '[% loc('How to send successful reports') | replace("'", "\\'") %]', - more_details: '[% loc('Details') | replace("'", "\\'") %]', - - geolocation_declined: '[% loc('You declined; please fill in the box above') | replace("'", "\\'") %]', - geolocation_no_position: '[% loc('Could not look up location') | replace("'", "\\'") %]', - geolocation_no_result: '[% loc('No result returned') | replace("'", "\\'") %]', - geolocation_unknown: '[% loc('Unknown error') | replace("'", "\\'") %]', - - reporting_a_problem: '[% loc('Reporting a problem') | replace("'", "\\'") %]', - ok: '[% loc('OK') | replace("'", "\\'") %]', - map: '[% loc('MAP') | replace("'", "\\'") %]', - - report_problem_heading: '[% loc('Click on the map to report a problem') | replace("'", "\\'") %]' - }; diff --git a/templates/web/oxfordshire/my/_problem-list.html b/templates/web/oxfordshire/my/_problem-list.html new file mode 100644 index 000000000..1ff69f9fb --- /dev/null +++ b/templates/web/oxfordshire/my/_problem-list.html @@ -0,0 +1,25 @@ +<ul class='issue-list-a full-width'> + [% IF problems.all %] + [% FOREACH p = problems.all %] + [% INCLUDE 'reports/_list-entry.html', problem = p, no_fixed =1 %] + [% END %] + [% ELSE %] + <li class="empty"> + <p>[% loc('There are no reports to show.') %]</p> + </li> + [% END %] +</ul> + +[% IF ! problems.size %] +<!-- Preserve behaviour of map filters despite map not being shown --> +<script type="text/javascript"> + (function($) { + $(function() { + $(".report-list-filters [type=submit]").hide(); + $(".report-list-filters select").change(function() { + $(this).closest("form").submit(); + }); + }) + })(window.jQuery); +</script> +[% END %] diff --git a/templates/web/oxfordshire/report/_council_sent_info.html b/templates/web/oxfordshire/report/_council_sent_info.html index 464c10256..499fd4637 100644 --- a/templates/web/oxfordshire/report/_council_sent_info.html +++ b/templates/web/oxfordshire/report/_council_sent_info.html @@ -1,16 +1,24 @@ [% IF problem.whensent || problem.can_display_external_id %] - <small class="council_sent_info"><br> - [% IF problem.whensent %] - [% problem.duration_string(c) %]<br> - [% END %] - <strong> - [% IF problem.can_display_external_id %] - [% IF problem.whensent %] - Council ref: [% problem.external_id %] - [% ELSE %] - [% problem.external_body %] ref: [% problem.external_id %] - [% END %] - [% END %] - </strong> - </small> + <div class="council_info_box"> + [% IF problem.can_display_external_id %] + <h3> + [% IF problem.whensent %] + Council ref: [% problem.external_id %] + [% ELSE %] + [% problem.external_body %] ref: [% problem.external_id %] + [% END %] + </h3> + [% END %] + + [% IF c.cobrand.problem_response_days(problem) > 0 %] + <p> + Problems in the + [% problem.category %] + category are generally responded to within + [% c.cobrand.problem_response_days(problem) %] + working days. + </p> + [% END %] + + </div> [% END %] diff --git a/templates/web/oxfordshire/report/_main.html b/templates/web/oxfordshire/report/_main.html new file mode 100644 index 000000000..3bb786141 --- /dev/null +++ b/templates/web/oxfordshire/report/_main.html @@ -0,0 +1,98 @@ +[% moderating = c.user && c.user.has_permission_to('moderate', problem.bodies_str) %] + +[% IF moderating %] +[%# TODO: extract stylesheet! %] +<style> + .moderate-edit label { + display: inline-block; + height: 1em; + margin-top: 0; + } + + .moderate-edit input { + display: inline-block; + } + + .moderate-edit { display: none } + .moderate-edit :disabled { + background: #ddd; + } + br { + line-height: 0.5em; + } +</style> +[% END %] + +<div class="problem-header cf" problem-id="[% problem.id %]"> + [% IF moderating %] + [% original = problem.moderation_original_data %] + <form method="post" action="/moderate/report/[% problem.id %]"> + <input type="button" class="btn moderate moderate-display" value="moderate"> + <div class="moderate-edit"> + <input type="checkbox" class="hide-document" name="problem_hide"> + <label for="problem_hide">Hide report completely?</label> + <br /> + <input type="checkbox" name="problem_show_name" [% problem.anonymous ? '' : 'checked' %]> + <label for="problem_show_name">Show name publicly?</label> + [% IF problem.photo or original.photo %] + <br /> + <input type="checkbox" name="problem_show_photo" [% problem.photo ? 'checked' : '' %]> + <label for="problem_show_photo">Show Photo?</label> + [% END %] + </div> + [% END %] + <h1 class="moderate-display">[% problem.title | html %]</h1> + [% IF moderating %] + <div class="moderate-edit"> + [% IF problem.title != original.title %] + <input type="checkbox" name="problem_revert_title" class="revert-title"> + <label for="problem_revert_title">Revert to original title</label> + [% END %] + <h1><input type="text" name="problem_title" value="[% problem.title | html %]"></h1> + </div> + [% END %] + + <p class="report_meta_info"> + [% problem.meta_line(c) | html %] + [%- IF !problem.used_map AND c.cobrand.moniker != 'emptyhomes' %]; <strong>([% loc('there is no pin shown as the user did not use the map') %])</strong>[% END %] + </p> + [% IF problem.whensent %] + <p class="council_sent_info">[% problem.duration_string(c) %]</p> + [% END %] + [% mlog = problem.latest_moderation_log_entry(); IF mlog %] + <p>Moderated by [% mlog.user.from_body.name %] at [% prettify_dt(mlog.whenedited) %]</p> + [% END %] + + [% INCLUDE 'report/_support.html' %] + + [% INCLUDE 'report/photo.html' object=problem %] + <div class="moderate-display"> + [% add_links( problem.detail ) | html_para %] + </div> + + [% IF moderating %] + <div class="moderate-edit"> + [% IF problem.detail != original.detail %] + <input type="checkbox" name="problem_revert_detail" class="revert-textarea"> + <label for="problem_revert_detail">Revert to original text</label> + [% END %] + <textarea name="problem_detail">[% add_links( problem.detail ) %]</textarea> + </div> + + <div class="moderate-edit"> + <label for="moderation_reason">Moderation reason:</label> + <input type="text" name="moderation_reason" placeholder="Describe why you are moderating this"> + <input type="submit" class="red-btn" value="Moderate it"> + <input type="button" class="btn cancel" value="cancel"> + </div> + </form> + [% END %] + + [% IF problem.bodies_str %] + [% INCLUDE 'report/_council_sent_info.html' %] + [% ELSE %] + <div class="council_info_box"> + <p>[% loc('Not reported to council') %]</p> + </div> + [% END %] +</div> diff --git a/templates/web/oxfordshire/reports/_list-entry.html b/templates/web/oxfordshire/reports/_list-entry.html new file mode 100644 index 000000000..cd70410d3 --- /dev/null +++ b/templates/web/oxfordshire/reports/_list-entry.html @@ -0,0 +1,6 @@ +<li class="[% c.cobrand.pin_colour(problem) %]"> + <a href="[% c.uri_for('/report', problem.id ) %]" class="[% problem.category %]"> + <h3>[% problem.title | html %]</h3> + <p>Reported [%- prettify_dt( problem.confirmed, 1 ) %]</p> + </a> +</li> diff --git a/templates/web/oxfordshire/reports/_list-filters.html b/templates/web/oxfordshire/reports/_list-filters.html new file mode 100644 index 000000000..5d610261b --- /dev/null +++ b/templates/web/oxfordshire/reports/_list-filters.html @@ -0,0 +1,32 @@ +[% IF use_section_wrapper %] +<section class="full-width"> + <form method="get" action=""> +[% END %] + + <p class="report-list-filters"> + <label> + Show + <select name="status" id="statuses"> + <option value="all"[% ' selected' IF filter_status == 'all' %]>all reports</option> + <option value="open"[% ' selected' IF filter_status == 'open' %]>unfixed reports</option> + <option value="fixed"[% ' selected' IF filter_status == 'fixed' %]>fixed reports</option> + </select> + </label> + <label> + about + <select name="filter_category" id="filter_categories"> + <option value="">Everything</option> + [% FOR category IN filter_categories %] + <option value="[% category | html %]"[% ' selected' IF filter_category == category %]> + [% category | html %] + </option> + [% END %] + </select> + </label> + <input type=submit value="Go" /> + </p> + +[% IF use_section_wrapper %] + </form> +</section> +[% END %] diff --git a/templates/web/seesomething/around/display_location.html b/templates/web/seesomething/around/display_location.html index ea0a499f7..b54311264 100644 --- a/templates/web/seesomething/around/display_location.html +++ b/templates/web/seesomething/around/display_location.html @@ -4,8 +4,8 @@ '/report/new', { pc => pc - latitude => short_latitude, - longitude => short_longitude, + latitude => latitude, + longitude => longitude, skipped => 1, } ); @@ -25,8 +25,8 @@ [% END %] <input type="hidden" name="pc" value="[% pc | html %]"> - <input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% short_latitude | html %]"> - <input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% short_longitude | html %]"> + <input type="hidden" name="latitude" id="fixmystreet.latitude" value="[% latitude | html %]"> + <input type="hidden" name="longitude" id="fixmystreet.longitude" value="[% longitude | html %]"> [% map_html %] diff --git a/templates/web/seesomething/report/new/category.html b/templates/web/seesomething/report/new/category.html index 8c837a047..691c38497 100644 --- a/templates/web/seesomething/report/new/category.html +++ b/templates/web/seesomething/report/new/category.html @@ -4,7 +4,7 @@ category = category | lower; END; %] <label for='form_category' class="select">[% loc('Category') %]</label> - <select name='category' data-theme="c" id='form_category'[% ' onchange="form_category_onchange()"' IF category_extras.size %]> + <select name='category' data-theme="c" id='form_category'> [% FOREACH cat_op IN category_options %] [% cat_op_lc = cat_op | lower %] <option value='[% cat_op | html %]'[% ' selected' IF report.category == cat_op || category == cat_op_lc %]>[% cat_op | html %]</option> diff --git a/templates/web/seesomething/report_created.html b/templates/web/seesomething/tokens/confirm_problem.html index 4a11d14b4..4a11d14b4 100644 --- a/templates/web/seesomething/report_created.html +++ b/templates/web/seesomething/tokens/confirm_problem.html diff --git a/templates/web/stevenage/footer.html b/templates/web/stevenage/footer.html index 955b86356..454da2bd9 100644 --- a/templates/web/stevenage/footer.html +++ b/templates/web/stevenage/footer.html @@ -1,5 +1,5 @@ [% IF pagefooter %] - <footer role="content-info"> + <footer role="contentinfo"> <div class="tablewrapper bordered"> <div id="footer-mobileapps"> <h4>Mobile apps</h4> diff --git a/templates/web/stevenage/header.html b/templates/web/stevenage/header.html index dbcc37866..155b35b64 100644 --- a/templates/web/stevenage/header.html +++ b/templates/web/stevenage/header.html @@ -23,6 +23,8 @@ [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %] [% extra_js %] + [% INCLUDE 'tracking_code.html' %] + [% PROCESS 'header_extra.html' %] </head> <body class="[% bodyclass | html IF bodyclass %]"> diff --git a/templates/web/stevenage/tracking_code.html b/templates/web/stevenage/tracking_code.html new file mode 100644 index 000000000..e7c2bafd6 --- /dev/null +++ b/templates/web/stevenage/tracking_code.html @@ -0,0 +1,16 @@ +[% IF c.config.BASE_URL == "https://www.fixmystreet.com" %] + +<script> + (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ + (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), + m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) + })(window,document,'script','//www.google-analytics.com/analytics.js','ga'); + + ga('create', 'UA-21613820-7', 'auto'); + ga('send', 'pageview'); + +</script> + +[% ELSE %] +<!-- Tracking code not inserted as "[% c.config.BASE_URL %]" not "https://www.fixmystreet.com" --> +[% END %] diff --git a/templates/web/trinidadtobago/footer.html b/templates/web/trinidadtobago/footer.html index 4a8144ccf..4ef368c0d 100644 --- a/templates/web/trinidadtobago/footer.html +++ b/templates/web/trinidadtobago/footer.html @@ -1,5 +1,5 @@ [% IF pagefooter %] - <footer role="content-info"> + <footer role="contentinfo"> <p><a href="/privacy">Privacy and cookies</a></p> </footer> [% END %] diff --git a/templates/web/trinidadtobago/header_logo.html b/templates/web/trinidadtobago/header_logo.html new file mode 100644 index 000000000..d5da7e6b2 --- /dev/null +++ b/templates/web/trinidadtobago/header_logo.html @@ -0,0 +1 @@ + <a href="[% c.config.BASE_URL %]/" id="site-logo">[% PROCESS 'site-name.html' -%]</a> diff --git a/templates/web/trinidadtobago/site-name.html b/templates/web/trinidadtobago/site-name.html new file mode 100644 index 000000000..d9c3f19c7 --- /dev/null +++ b/templates/web/trinidadtobago/site-name.html @@ -0,0 +1 @@ +FixMyStreeTT diff --git a/templates/web/warwickshire/header.html b/templates/web/warwickshire/header.html index 1d52b5546..274a78ce7 100644 --- a/templates/web/warwickshire/header.html +++ b/templates/web/warwickshire/header.html @@ -32,6 +32,7 @@ [% INCLUDE 'common_header_tags.html', js_override = '/cobrands/fixmystreet/fixmystreet.js' %] [% extra_js %] + [% PROCESS 'header_extra.html' %] </head> [% TRY %][% PROCESS 'set_body_class.html' %][% CATCH file %][% END %] diff --git a/templates/web/zerotb/index.html b/templates/web/zerotb/index.html index 754dcbabc..4d0d6555c 100644 --- a/templates/web/zerotb/index.html +++ b/templates/web/zerotb/index.html @@ -9,7 +9,7 @@ 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/map-OpenStreetMap.js') %]", "preload![% version('/js/jquery.ba-hashchange.min.js') %]" ] }); diff --git a/templates/web/zerotb/report/display.html b/templates/web/zerotb/report/display.html index 9161fb586..9848c89db 100644 --- a/templates/web/zerotb/report/display.html +++ b/templates/web/zerotb/report/display.html @@ -15,17 +15,11 @@ [% INCLUDE 'report/banner.html' %] -[% IF c.flash.comment_created %] -<p> -[% loc('Your report has been sent') %] -</p> -[% END %] - [% INCLUDE 'report/_main.html' %] <div class="shadow-wrap"> <ul id="key-tools"> - <li><a class="chevron" id="key-tool-problems-nearby" href="[% c.uri_for( '/around', { lat => short_latitude, lon => short_longitude } ) %]">[% loc( 'Clinics nearby' ) %]</a></li> + <li><a class="chevron" id="key-tool-problems-nearby" href="[% c.uri_for( '/around', { lat => latitude, lon => longitude } ) %]">[% loc( 'Clinics nearby' ) %]</a></li> </ul> </div> diff --git a/templates/web/zurich/report/new/fill_in_details_form.html b/templates/web/zurich/report/new/fill_in_details_form.html index 67471867a..28d9ebe68 100644 --- a/templates/web/zurich/report/new/fill_in_details_form.html +++ b/templates/web/zurich/report/new/fill_in_details_form.html @@ -45,24 +45,7 @@ [% END %] <textarea rows="7" cols="26" name="detail" id="form_detail" placeholder="[% loc('Please fill in details of the problem.') %]" required>[% report.detail | html %]</textarea> - [% IF js %] - <div id="form_category_row"> - <label for="form_category">[% loc('Category') %]</label> - <select name="category" id="form_category" required><option>[% loc('Loading...') %]</option></select> - </div> - [% ELSE %] - [% IF category_options.size %] - [% IF field_errors.category %] - <p class='form-error'>[% field_errors.category %]</p> - [% END %] - - [% PROCESS "report/new/category.html" %] - [% END %] - [% END %] - - [%- IF category_extras %] - [% PROCESS "report/new/category_extras.html" %] - [%- END %] + [% PROCESS "report/new/category_wrapper.html" %] [% IF c.cobrand.allow_photo_upload %] <label for="form_photo">[% loc('Photo') %]</label> diff --git a/templates/web/zurich/tokens/confirm_problem.html b/templates/web/zurich/tokens/confirm_problem.html index d61cf3ffa..d2025f124 100644 --- a/templates/web/zurich/tokens/confirm_problem.html +++ b/templates/web/zurich/tokens/confirm_problem.html @@ -6,8 +6,8 @@ loc('You have successfully confirmed your email address.'); tprintf( loc( 'You can <a href="%s%s">view the problem on this site</a>.' ), - c.cobrand.base_url_for_report( problem ), - problem.url + c.cobrand.base_url_for_report( report ), + report.url ); %] </p> diff --git a/web/cobrands/arreglamibarrio/_colours.scss b/web/cobrands/arreglamibarrio/_colours.scss new file mode 100644 index 000000000..cb7013db2 --- /dev/null +++ b/web/cobrands/arreglamibarrio/_colours.scss @@ -0,0 +1,22 @@ +/* COLOURS */ + +$primary: #FFD000; +$primary_b: #F3B11E; // For the box around the front page postcode form only +$primary_text: #222; + +// Tiled main body background +$base_bg: #1A1A1A; +$base_fg: #fff; + +$map_nav_bg: #222; +$nav_fg: #fff; +$nav_fg_hover: #444; + +// The "Click map" box on /around +$col_click_map: #00BD08; +$col_click_map_dark: #4B8304; + +// The "fixed" message on a report page +$col_fixed_label: #00BD08; +$col_fixed_label_dark: #4B8304; + diff --git a/web/cobrands/arreglamibarrio/base.scss b/web/cobrands/arreglamibarrio/base.scss new file mode 100644 index 000000000..28fc5a940 --- /dev/null +++ b/web/cobrands/arreglamibarrio/base.scss @@ -0,0 +1,13 @@ +@import "../sass/h5bp"; +@import "./_colours"; +@import "../sass/mixins"; +@import "compass"; + +@import "../sass/base"; + +#site-logo { + width: 175px; + height: 45px; + background: url(logo_sm.png); + background-repeat: no-repeat; +} diff --git a/web/cobrands/makemyisland/config.rb b/web/cobrands/arreglamibarrio/config.rb index cab97b18f..cab97b18f 100644 --- a/web/cobrands/makemyisland/config.rb +++ b/web/cobrands/arreglamibarrio/config.rb diff --git a/web/cobrands/arreglamibarrio/layout.scss b/web/cobrands/arreglamibarrio/layout.scss new file mode 100644 index 000000000..2f02522b5 --- /dev/null +++ b/web/cobrands/arreglamibarrio/layout.scss @@ -0,0 +1,14 @@ +@import "_colours"; +@import "../sass/layout"; + +body.frontpage { + #site-header{ + height: 10em; + } + #site-logo { + top: 2em; + width: 300px; + height: 111px; + background: url(logo.png); + } +} diff --git a/web/cobrands/arreglamibarrio/logo.jpeg b/web/cobrands/arreglamibarrio/logo.jpeg Binary files differnew file mode 100644 index 000000000..d26cef7bd --- /dev/null +++ b/web/cobrands/arreglamibarrio/logo.jpeg diff --git a/web/cobrands/arreglamibarrio/logo.png b/web/cobrands/arreglamibarrio/logo.png Binary files differnew file mode 100644 index 000000000..61f196cad --- /dev/null +++ b/web/cobrands/arreglamibarrio/logo.png diff --git a/web/cobrands/arreglamibarrio/logo_sm.png b/web/cobrands/arreglamibarrio/logo_sm.png Binary files differnew file mode 100644 index 000000000..29b3ff7ba --- /dev/null +++ b/web/cobrands/arreglamibarrio/logo_sm.png diff --git a/web/cobrands/barnet/base.scss b/web/cobrands/barnet/base.scss index bc1642e22..aff4a1e6c 100644 --- a/web/cobrands/barnet/base.scss +++ b/web/cobrands/barnet/base.scss @@ -18,12 +18,14 @@ background-color: white; } #site-logo { - width: 235px; - background: url('/cobrands/barnet/img/barnet-logo.gif') -3px -3px no-repeat; + width: 240px; + background: url('/cobrands/barnet/img/barnet-logo.gif') 0 0 no-repeat; + top: 0.6em; + left: 0.5em; } #nav-link { - right: 1em; - background: url('/cobrands/barnet/img/barnet-skipnav.png') no-repeat; + background-image: url(/cobrands/fixmystreet/images/menu-black.png); + background-image: url(/cobrands/fixmystreet/images/menu-black.svg), none; } #front-main #postcodeForm div input#sub, diff --git a/web/cobrands/barnet/img/blank.gif b/web/cobrands/barnet/img/blank.gif Binary files differnew file mode 100644 index 000000000..4bcc753a1 --- /dev/null +++ b/web/cobrands/barnet/img/blank.gif diff --git a/web/cobrands/barnet/img/favicon.ico b/web/cobrands/barnet/img/favicon.ico Binary files differnew file mode 100644 index 000000000..03553e500 --- /dev/null +++ b/web/cobrands/barnet/img/favicon.ico diff --git a/web/cobrands/bromley/base.scss b/web/cobrands/bromley/base.scss index 7975197ff..9b1e787df 100644 --- a/web/cobrands/bromley/base.scss +++ b/web/cobrands/bromley/base.scss @@ -26,9 +26,9 @@ h1.main { // Colour tab to match colour scheme #nav-link { - width: 50px; - height: 48px; - background: url('/cobrands/bromley/tab-blue.png') 0 0 no-repeat; + height: 4em; // to match #site-header + background-image: url(/cobrands/fixmystreet/images/menu-black.png); + background-image: url(/cobrands/fixmystreet/images/menu-black.svg), none; } // Change logo to logo of council diff --git a/web/cobrands/eastsussex/base.scss b/web/cobrands/eastsussex/base.scss index 7e9c57b06..5a6b5295f 100644 --- a/web/cobrands/eastsussex/base.scss +++ b/web/cobrands/eastsussex/base.scss @@ -69,6 +69,17 @@ h1.main { height: 48px; } +#report-cta { + top: 24px; // height of header + margin-top: -0.7em; + font-size: 1em; + border-color: mix(#fff, $primary, 20%); + + &:hover, &:focus { + background-color: mix(#fff, $primary, 10%); + } +} + #breadcrumb_breadcrumbTrail ol li { list-style: none; } diff --git a/web/cobrands/eastsussex/layout.scss b/web/cobrands/eastsussex/layout.scss index dad118198..9e818f0a5 100644 --- a/web/cobrands/eastsussex/layout.scss +++ b/web/cobrands/eastsussex/layout.scss @@ -108,10 +108,6 @@ body.mappage { line-height: 14px; } -body.twothirdswidthpage.alertindex .content .sticky-sidebar aside { - top: -17em; -} - body.twothirdswidthpage .content .sticky-sidebar aside { top: 0; position: absolute; diff --git a/web/cobrands/eastsussex/report-form.js b/web/cobrands/eastsussex/report-form.js index 4e01572f7..e61d48b9a 100644 --- a/web/cobrands/eastsussex/report-form.js +++ b/web/cobrands/eastsussex/report-form.js @@ -1,11 +1,3 @@ -$(function () { - setup_anonymous_checkbox( $('#form_sign_in_no') ); - setup_anonymous_checkbox( $('#form-box--logged-in-name') ); - setup_anonymous_checkbox( $('#update_form') ); - - $('.public-warning').attr({ 'title': 'This information will be be visible to the public on the report' }); -}); - function setup_anonymous_checkbox (div) { var label = div.find( '.name-warning' ); checkbox = div.find('input[type=checkbox]'); @@ -20,3 +12,11 @@ function setup_anonymous_checkbox (div) { } }); } + +$(function () { + setup_anonymous_checkbox( $('#form_sign_in_no') ); + setup_anonymous_checkbox( $('#form-box--logged-in-name') ); + setup_anonymous_checkbox( $('#update_form') ); + + $('.public-warning').attr({ 'title': 'This information will be be visible to the public on the report' }); +}); diff --git a/web/cobrands/fixamingata/base.scss b/web/cobrands/fixamingata/base.scss index 73ef7ea13..01aa46c71 100644 --- a/web/cobrands/fixamingata/base.scss +++ b/web/cobrands/fixamingata/base.scss @@ -23,9 +23,32 @@ $image-sprite: '/cobrands/fixamingata/images/sprite.png'; margin-left: 10px; background: url('/cobrands/fixamingata/images/fms-logo.png') no-repeat; } +#nav-link { + background-image: url(/cobrands/fixmystreet/images/menu-black.png); + background-image: url(/cobrands/fixmystreet/images/menu-black.svg), none; +} + +#report-cta { + font-size: 0.8em; + margin-top: -0.25em; + border-color: #999; + color: #000; + padding-bottom: 0.2em; + padding-top: 0.5em; + + &:hover, &:focus { + background-color: #bbb; + } +} #front-main { a#geolocate_link { font-size: 0.9em; } } + +.description_tips { + h4 { + margin: 1em 0 0.5em; /* Jon added some margin-top here! */ + } +} diff --git a/web/cobrands/fixamingata/images/google_play_logo.png b/web/cobrands/fixamingata/images/google_play_logo.png Binary files differnew file mode 100644 index 000000000..9891cbbd3 --- /dev/null +++ b/web/cobrands/fixamingata/images/google_play_logo.png diff --git a/web/cobrands/fixamingata/layout.scss b/web/cobrands/fixamingata/layout.scss index 133fedc78..e8cbdab5e 100644 --- a/web/cobrands/fixamingata/layout.scss +++ b/web/cobrands/fixamingata/layout.scss @@ -2,55 +2,55 @@ $image-sprite: '/cobrands/fixamingata/images/sprite.png'; @font-face { font-family: 'MuseoSans'; - src: url('../fixmystreet/fonts/MuseoSans_300-webfont.eot'); - src: url('../fixmystreet/fonts/MuseoSans_300-webfont.eot?#iefix') format('embedded-opentype'), - url('../fixmystreet/fonts/MuseoSans_300-webfont.woff') format('woff'), - url('../fixmystreet/fonts/MuseoSans_300-webfont.ttf') format('truetype'), - url('../fixmystreet/fonts/MuseoSans_300-webfont.svg#MuseoSans300') format('svg'); + src: url('../fixmystreet.com/fonts/MuseoSans_300-webfont.eot'); + src: url('../fixmystreet.com/fonts/MuseoSans_300-webfont.eot?#iefix') format('embedded-opentype'), + url('../fixmystreet.com/fonts/MuseoSans_300-webfont.woff') format('woff'), + url('../fixmystreet.com/fonts/MuseoSans_300-webfont.ttf') format('truetype'), + url('../fixmystreet.com/fonts/MuseoSans_300-webfont.svg#MuseoSans300') format('svg'); font-weight: normal; font-style: normal; } @font-face { font-family: 'MuseoSans'; - src: url('../fixmystreet/fonts/MuseoSans_300_Italic-webfont.eot'); - src: url('../fixmystreet/fonts/MuseoSans_300_Italic-webfont.eot?#iefix') format('embedded-opentype'), - url('../fixmystreet/fonts/MuseoSans_300_Italic-webfont.woff') format('woff'), - url('../fixmystreet/fonts/MuseoSans_300_Italic-webfont.ttf') format('truetype'), - url('../fixmystreet/fonts/MuseoSans_300_Italic-webfont.svg#MuseoSans300Italic') format('svg'); + src: url('../fixmystreet.com/fonts/MuseoSans_300_Italic-webfont.eot'); + src: url('../fixmystreet.com/fonts/MuseoSans_300_Italic-webfont.eot?#iefix') format('embedded-opentype'), + url('../fixmystreet.com/fonts/MuseoSans_300_Italic-webfont.woff') format('woff'), + url('../fixmystreet.com/fonts/MuseoSans_300_Italic-webfont.ttf') format('truetype'), + url('../fixmystreet.com/fonts/MuseoSans_300_Italic-webfont.svg#MuseoSans300Italic') format('svg'); font-weight: normal; font-style: italic; } @font-face { font-family: 'MuseoSans'; - src: url('../fixmystreet/fonts/MuseoSans_500-webfont.eot'); - src: url('../fixmystreet/fonts/MuseoSans_500-webfont.eot?#iefix') format('embedded-opentype'), - url('../fixmystreet/fonts/MuseoSans_500-webfont.woff') format('woff'), - url('../fixmystreet/fonts/MuseoSans_500-webfont.ttf') format('truetype'), - url('../fixmystreet/fonts/MuseoSans_500-webfont.svg#MuseoSans500') format('svg'); + src: url('../fixmystreet.com/fonts/MuseoSans_500-webfont.eot'); + src: url('../fixmystreet.com/fonts/MuseoSans_500-webfont.eot?#iefix') format('embedded-opentype'), + url('../fixmystreet.com/fonts/MuseoSans_500-webfont.woff') format('woff'), + url('../fixmystreet.com/fonts/MuseoSans_500-webfont.ttf') format('truetype'), + url('../fixmystreet.com/fonts/MuseoSans_500-webfont.svg#MuseoSans500') format('svg'); font-weight: bold; font-style: normal; } @font-face { font-family: 'MuseoSans'; - src: url('../fixmystreet/fonts/MuseoSans_500_Italic-webfont.eot'); - src: url('../fixmystreet/fonts/MuseoSans_500_Italic-webfont.eot?#iefix') format('embedded-opentype'), - url('../fixmystreet/fonts/MuseoSans_500_Italic-webfont.woff') format('woff'), - url('../fixmystreet/fonts/MuseoSans_500_Italic-webfont.ttf') format('truetype'), - url('../fixmystreet/fonts/MuseoSans_500_Italic-webfont.svg#MuseoSans500Italic') format('svg'); + src: url('../fixmystreet.com/fonts/MuseoSans_500_Italic-webfont.eot'); + src: url('../fixmystreet.com/fonts/MuseoSans_500_Italic-webfont.eot?#iefix') format('embedded-opentype'), + url('../fixmystreet.com/fonts/MuseoSans_500_Italic-webfont.woff') format('woff'), + url('../fixmystreet.com/fonts/MuseoSans_500_Italic-webfont.ttf') format('truetype'), + url('../fixmystreet.com/fonts/MuseoSans_500_Italic-webfont.svg#MuseoSans500Italic') format('svg'); font-weight: bold; font-style: italic; } @font-face { font-family: 'Museo300-display'; - src: url('../fixmystreet/fonts/Museo300-Regular-webfont.eot'); - src: url('../fixmystreet/fonts/Museo300-Regular-webfont.eot?#iefix') format('embedded-opentype'), - url('../fixmystreet/fonts/Museo300-Regular-webfont.woff') format('woff'), - url('../fixmystreet/fonts/Museo300-Regular-webfont.ttf') format('truetype'), - url('../fixmystreet/fonts/Museo300-Regular-webfont.svg#Museo300') format('svg'); + src: url('../fixmystreet.com/fonts/Museo300-Regular-webfont.eot'); + src: url('../fixmystreet.com/fonts/Museo300-Regular-webfont.eot?#iefix') format('embedded-opentype'), + url('../fixmystreet.com/fonts/Museo300-Regular-webfont.woff') format('woff'), + url('../fixmystreet.com/fonts/Museo300-Regular-webfont.ttf') format('truetype'), + url('../fixmystreet.com/fonts/Museo300-Regular-webfont.svg#Museo300') format('svg'); font-weight: normal; font-style: normal; } @@ -113,3 +113,5 @@ h3, h4 { } #postcodeForm { margin-left: -1em !important; margin-right: -1em !important; } + +body.fullwidthpage .container .content footer .tablewrapper { background: #fff; } diff --git a/web/cobrands/fixmindelo/base.scss b/web/cobrands/fixmindelo/base.scss index 4d3a53f0a..486c66672 100644 --- a/web/cobrands/fixmindelo/base.scss +++ b/web/cobrands/fixmindelo/base.scss @@ -28,6 +28,10 @@ $image-sprite: 'images/sprite.png'; background: url('images/sprite.png') -8px -915px no-repeat; } +#report-cta { + display: none; +} + #footer-help ul li { padding-right: 3em; a { diff --git a/web/cobrands/fixmystreet-uk-councils/js.js b/web/cobrands/fixmystreet-uk-councils/js.js new file mode 100644 index 000000000..3abba8e33 --- /dev/null +++ b/web/cobrands/fixmystreet-uk-councils/js.js @@ -0,0 +1,3 @@ +jQuery.validator.addMethod('validName', function(value, element) { + var validNamePat = /\ba\s*n+on+((y|o)mo?u?s)?(ly)?\b/i; + return this.optional(element) || value.length > 5 && value.match( /\S/ ) && value.match( /\s/ ) && !value.match( validNamePat ); }, translation_strings.category ); diff --git a/web/cobrands/fixmystreet/_colours.scss b/web/cobrands/fixmystreet.com/_colours.scss index 29b18be1f..29b18be1f 100644 --- a/web/cobrands/fixmystreet/_colours.scss +++ b/web/cobrands/fixmystreet.com/_colours.scss diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet.com/base.scss index 57eadc435..485f0ffc2 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet.com/base.scss @@ -21,10 +21,6 @@ #message_close { float: right; } } -#nav-link { - background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAAwCAMAAABkKdmIAAAACW9GRnMAAAAFAAADlACdjNY6AAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAF5AAAQZgCwCYXlAAABEVBMVEUAAAAiIiIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAsJAAAAABPQAAAAAAlHgBnVAAAAACSdwAAAAAAAAAaFQAAAAAAAAAAAAAAAACRdgCqigAAAAAAAABHOgDCnwAAAACriwCAaAApIQDOqABIOwCgggBqVwB8ZQDVrgCwkADjuQCafgDftgDetQCqigDrwADHogDGoQDFoAD1yADzxgDyxQDwxAD/0AD///+ZbHkYAAAAWXRSTlMAAAECAwQFBgkLDA0OEBESExQVFxgeHyEkJSkqMTI2Oj0/Q0RHSEpOT1FSVVtmZmxsdX6Kj5ebnp+goaenqKmru7y9vsTY3uPk5OTl5+zs7e7x9PX3+Pr7/fI8qpUAAAABYktHRFoDu6WiAAABMklEQVRIx+3T2VLCMBSA4ZjU1hhpUKgWlaq0VSuutYg7IJuIogKKvv+LSM2AelNOuHCGGf77b7KcBKGwT2AzYej/CIYSPCBEhRKVCILVBJQkVCwIS0NJmglCYhkoycSIINyBEocPiAsl7ljkeypTMhHko9tpD+t0QavUSjcX+bDzy9vSPYj0zg523LDtvaNCD3aWh11ziXMeT64fP0OPX1xbmCVEXdyqwm/sNEWJMr96LXHJb4fLczR1IjWXx83kyv6r3CiLG05VdvpXd9IP5n36XyaStGCiNSS6XYaRsq0LgpnlNyGi6VsMC6IZXlAfLeqBZ2iCIELNbFBpvLQjempUgqxJxb76KdT0/Fw+spzvmVRB6McYlu24ETm2ZfwW/b1pTOeR6Uwj6E8YkxFhjMbuC8zPYpEN6mT7AAAAJXRFWHRkYXRlOmNyZWF0ZQAyMDEyLTA1LTAyVDE5OjQ2OjUxKzAxOjAwHHW0eAAAACV0RVh0ZGF0ZTptb2RpZnkAMjAxMi0wNS0wMlQxOTo0Njo1MSswMTowMG0oDMQAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAAElFTkSuQmCC') no-repeat; -} - #site-logo { background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAK8AAAAoCAYAAACIJ6oVAAAACW9GRnMAAAADAAAAAwB3k5ejAAAACXBIWXMAAABIAAAASABGyWs+AAAACXZwQWcAAAF5AAAQZgCwCYXlAAAABmJLR0QA/wD/AP+gvaeTAAAag0lEQVR42u1cB1RWx7YeBBW7YAOViL0bNSomdsWADVsQbEHFiAUUMYmiokEUWzQiiQ0VNSC2gFiJmthbiF1jwxaNGr0pKra8t1be3r/frLc99/zwo7nv3rzFWWuv/z9zZs6ZM/PtPd/eM3OUyj1yj9wj98g9co/cI/fIPXKP3MPaYQfJY6Po/LlH7vFvBa09ST6SIiROJM7ZiBPy5kPZXBDnHv8W0OYHGCuSeJB4kniReFsRL+TxQBkngDhPbpPmHv8XRx4AjoFXiaQFSUDXrl2XxMfHp585c+b2nyZHZmbmM742b968gx4eHvO5DElzkgokhXKtcO7xrz7sAbQKAF7AoEGDEk+ePPnznzk8tm3bdhUg7kFSE5QiJ1bY7jXkrxyB/pX5/4o2yD0EcKuQdHdzc5t14MCBm3++5rFy5cqjdL9AKMMbJAWzAbB0DLlODlmIPeSvdBrNnFNr97LmyL4OsOQ97bNoA/nuf1eA/yX1zCOA69uxY8eEhw8f/mEGxrt37z5OS0vLWLZs2QmS4yzr168/d/Xq1V+sAfjKlSu/kjLMpHv7AMD5TCprJ7h2XvDtAqgXS2EhOq0g8jgiv5Z8ooNtbRj5fAfcI5+VexkBlhf5XvXZRsXVz3fEOxrbQL+7I/LlNVFio2Lb/YeBNqt62uXkRvlAFboDuP9lQgOudenSZRmsqI+Js+bj6en58erVq/cT/31uLH/p0qUHAHALUAj7LJzEQuDcpUlcScqRlBfC52VJypCUElEOluIkRdG5OYl4GJ9fVNyrENKlpcsD0DgiulIczy+G/DmNtkjFLYj7lCRxsfL+Lnh3JwC6gEGBHYVS531FZfpXWVppoMzqabOy2aMBmjNHNVrcCxcuPPL29l4D0LYkqQzQlICUhJSB5W5ZtWrV4KNHj14xs8C4T010cB4rIbkycBbrkLyF6EVTIU1IGpHUJ6lFUg31qowoR3nUqbCNIJLALQqleQP3egPnRXHdwQAyZ4CpEp5fAfmLCMDb2QjcfKgzg9Id79YQ7/82yTv49UC71EWblxdALo46lUT/FLeifLZSjFelIXZZjFTaQBQX+HFGGxdA22YLYDvciBs+4NSpUy85ZhcvXnxUtmzZhXTNTzhdjrh5ATxMx3eLocNKIK9fbGzsXiOAU1JSTsKJqyDogx1AUQgdX33RRDX84EqV8G2cWrdzkfpqx0KVzML/dy5WX1H6+n3LVdKsUPUR5W/DFn3BeBV8ap2KS5hmUZBK6NBC2TSGUXHY0tc4s0EtObFWLW3R0HLvGkgvIqhBQbwrP6dB0gwVfixJLY+brIYivwuAmF1H2IkITxGU4/LvvPnmm73IZ1hAo9axe/fu3dBtyP8vX76cnpSUFPPWW291pbyNAXStwNXQBzWggC7oH0dh3ewNw7Y138HeRPKYgNnOCl+3N3B3R9TFBW3H9ayNOruhTQvZAmBtdVtOnz59i9HiAri+JFVFRxhjv+1I2nIHwmLqYZTL+JoBGFGI5riPvei8orB0jffHq9V/nlR/2iLV3dUQKtNrz1K1ls/TE9UKWGU3aLcjGi6PlUbOJxWHFUHfmxUEI051XC8M4DrBOjauV035PU9XmSJ/M1jEElByBxM+Z2diccsAhG0GDx4c/vTp0yfZOcTPnj17PGnSpEjE2LmeLVJTU2fytT/++OPR2rVrxwIc5dAWBcVQbSb5BdfXfkdBIVnxbAcDHSggRPP34qhL7QEDBrz3+PHju1xXUsY0KGEVWOKCot2scl0GYYDkqcx5GzZsuAoWVwL3pTAaNfCqmJiY/dOmTdtepUqVkRjGCgsrymX9jBSCoxiIA1cUw1l+vJgltuzdTI0a5quWaBD17ahS+3dWyQFd1PoAH7V2YFeV9Mte9RtfG9lbxVKZYUsi1PKbX6sf1sxU8zDEVhVDfgHhTDkYnKLCAFpF0BJf/dzf96t/QIGbAqzOqCdb4noknbZ+rjbr/Fti1Rb4BA0wnBcXzzZyZiNVYOvTysvLa/QTOnIS1RkzZswcKtufhQGt02/dunUOxqUOlLm0GKpL4rlaSor3K442KQUr6WrCsx0NQC8oRuNSUMYy4t6l0CZcl3a7du3aIN/Bx8cnCLSokhjlTWlXHjyo6cyZM1PlTRYvXnxWcFMJXEsYjfNLsGdkZPzm7u4+AR1WWHQM/6/JjpzRiYP19YCV1p1YHABi5ehHMlGDgv4vImFQstMXTTLtYqq6xtdG+CkeIUJJRpAMIunJIEAjVUCjlxDOV0HhlDmjgSvAWncK7afmScv+ebj6ktOhnOVxvyp6AufXfS+UiOXgCnUcINLWuhyeXUTwOQfh7GmOXVkrzqFDh743gvO77777nQzFtfnz51/ZvXv3P8Xdjx07dpHKch9EyHTqmwy0ZRu8n6YTtdA+daGEdZFWHe9WFXnrgXc3wm8dXC8HQBaDOKNdKkAJ6+J59fFfP/dNKFP/DRs27JJ1DQkJ+ZzxBT5fDm2W18z62kMTOh0+fPiatLrly5efi8Z3FhaKh/NuNCQdN/Dih+XKlfuCrnVFHkcxdORHx7XcsmXLd7Icz8RhKtlJOEBFAI5GAOAYAd5Z3DEkYSRs5UcBsKMgnBZM8gFGjHehHPXQcFVQP1eA1RXnVdBpDdDB/Yf0VMv5mZmH1XP+ZQtP6e8DrDVQhvN3mT/2Bb3ReS9sVDcofTjA7mHo7BIiMqCpRzncsyksdsiNGzfuybaaM2fObUrn9tpFso1kO1naMzIP9eF1Sud+WCTTf/jhBx7lPibpizq9O3r06BHdu3dn49SN/Y8uXboMjYyMjECaN/qlPeevXbt2/wkTJkSNHz9+6sSJE6d07dr1A1xvjHatiBGpGoDavH79+j2nTJkykekMCyxqJ1CbzlDu8BUrVqTLugYEBKxD27VHm5REW9mbOWqs7YPkDQhk12F1KyNPHoCqyZAhQ5YbeHEm8eI4QS+KoHNc8ELa4lRh6yvL8lQyGspZEPoCsEK1AL4PBHiZuzG37Q1g98RzuSEGX9umLl3dqi6nr1aH331bjYFT6H1vtzpJVOJAYrTFKjUBmGvDAniwk8V5yNFLpvP3GDxMS/iZqTHq1t1v1GP+/8lQtRwK2hSWgYH+/i+wultj1XX+/SFFMVj4+X1C+6pgvvf5FLUWHasjNU5oG1aeeuMDVeC5ZPXt9e2KrecUo1Ul0Nyi9H0kTEk2QFK++OKLi3rka9u27ba4uLhT1mjF7du3f2Jg7N279xudRqBMSEtLO2Ri/UIqVqw4jhTie7N7Xbt27RJhYSzA2Bwc35OBfvz48QNWYv0Z/v7+bIBC33777bnEdZ+Z5SO29DQiIiISylFeWN+XwMuJHrxmwVD5HdCSUoKjcWN7Hjly5KoB6GxlhsG6FMMQyB3Uvm7dur0BwqLoMJ+ff/75kVwLIcCrCb/kvdwofQV4QxgQJB0x7LSBBejC6XKY3xRjsU4DjenEoT/Eu/FzO++Gg8fCXBlKGx7zsdrPafR7Lay/Osv/iaKwUg+G5eBO8x3ZR8XytZ+/VY/oPJn/39+jHtD/8axo4YFqmr7/jkUW2uMhvGp3KJDn5c0qXbxnjNl0/DfffHM/Ojr6LLXrJsqTSLKahEOYrBjsJGY7jc90S57L/tDH8uXLvyfOvd4auCTIevfuPR2+S0CbNm0mZOdg8j3p3mup3Las8q2hg+7ZGlgqjpH/Jb5rAWTfvn1TDaQ5DtalqAAVA8ybAWcSt+0HE18WYPWdPXt2CvG2Y2JCgs1/B+OiHhPwaurgho7uJTo1FEO3D0DbCuIFCxw8O+wFgDZ8qr4BleCw1fBdi9VeTv9tv/oFvHhonw7UkZT29Kh60ruDmg6rzkNWRPwU9T3Ay4DdTdY3E+BfAgBzPYZf2vSCc48frA7R+TpR14mgMcNH9VHzOe3BQXUfitZU8MG27Jjy9SdH1dNypVUMpS0MDw8/klXn3r17N5PXjgwdOnQv5Wc+vpLF19f3W+K+L810Mg08ceLEPZ4JpTyLs7rvo0eP/qhVq9aeS5cuPZTp5PQ9Jyucyb8y/dy5czwicNtFG6kO5X1Gxu4R0ZYnxsmqUqVK7SJl/IfxfkxB2UBWqlTpI1CHqsBpfiN4LYAkLdhqANRwkHZHEX8tExwcHGpFm9nK9AJ/GkpcZ6fgWu2FV+vNDZgFePWzCoMHNpZeP1mnK0wN2ELe3qXOkLU7xUMy7sHgHTm4u1rFedfMVNypH4EDM4gnEhe1DOuJ09UBOp9B97nL53GTLVZ6NMDLYJ+wYor6jq9FjVAXmGdGh6gzfL47TrEjO4mt8wc91ApOozo8BHhWCfBGCD4+lhy6Xzn9owEW3t4FSsejhy+PEnxtzzJ1hs4/ZctLsiwxMTHDligDWc9MomSpXAZA3iyvp6en/waawbQn3lj+/Pnzj4lrniOjdYKu7xk1atRlQ2TomZOTE1M8ph03k5KSXrLWrVu33kUU4qBMO3v2LJfhUZkxcHP16tUvlSHacJrSj82aNeu+TO/Wrdt3lB6LfmiTleW1Bbw6YlCLONV4s8a7fPny79u3b88g/nRw+vTppw2TEZ5iFs57xIgRu3II3l7ZxXhxDw5lhQQCvEkzLPyQKUIQGiK8UW21+PER9Yyvpy1Qly38NNnSuJPxzv0wBH6Ynqgy+HqPdhagby7trLZoh6xBDZVAaZ+TNb/A58sjFY8wbJEXE2e9z2lvuKhpAC5TnbEzQ9VGTj+9wQLQQeDWrPBBGtidW6p4Op9KEgUQx/fo0eMQ04XsAMyRnPbt26dwGZL1higEh/o47LmAJM5YFqBlLr2RncHk5OS78vrmzZufR0VFPWGZOnXqk4SEhKfyOjlkNzZs2HDfUOYZ5X3M+Vm+/PLLpyYO6AkC70vWumfPnvvZsMCPaYoR+J84r1Xa4OHhEYuCxcRkgx87ZmZrHqwd48aNW4uhX8/RdyAivs8G8BYCBWkkLS/9j4Q11U6bDyy7J8Irwwf3UCuF5R2l4574P2POGHVU34/B2LCmZTIjHKDtBiUI5ogB5+n1rtoJbpm0eOIL7rv1c3WtbhW1Rd/DtaQFMBz2m8fOGqcHvWexgiOhOKPdXNT0J0fUU77WvIFlmGXqEhwx5IWy/UijADtqJOPwjmy5OeLD9UvhYXbAgAFn4uPjf6LDlIsePHjwBqxvgkwnHnwPwGWFiDUZOdkqL0UoMsFIO7I7ZsyY8Ss9O0cxaQIvW/H0Tz/99I5M79Wr1y5Qru5wrMsgKmNvk8M2cuTINPDI8rDAvjzTxjNutlbu9OnTd8ELK+LhFodt3bp1P2ThsJmBt6ch2sBg8IfT1RoTEc1wPuSDnjQsUt61s9QeWNNeiEow4KM8PdQmfT/msRiixiCfFxTiA81l+3VSKTr85FJCJT06pJ6T/EFD/U1QjpMY5hmQM86nqB85fUhPC6BDYGXZoR2/ef4Lpwy0hYE65ViSushp00daLN8ETTWaNWs2kxc4YaIoHg7aWljHHdWrVz9u5JIAIoN3hUw7deoU98VnHBdnhTApswD14RFoHoM9J0D8+OOPf2NqkZMykydPvkrP2j937txbMt3f3387RswOwF4JEfHKPlTGAINlY1D4M3B5jYOtFeOlke7u7hGYKXECeDnOGZiRkfG7lVCZGXg5IN5NgDcIw20bALsO4oz1YX0H6fgswDsM+bshijDl6lb1C19/SADk35VR6qgBvMxHA/VQjg7/BMP5fLrveWm5yeouxzUG3ifMW/nauEGWKEAwrD5b9dAmddQXfI2pCysD0w9xPgWdFtKiRYso2Z59+vTZzJQEws9bzzy8Y8eOF02A+E+8FuCdBwX7zKTMVCgajwafkOF5yRrSkK8pQCZ+Lf+jo6MfBgUFsRN6hSzvU0OZ56JM5rRp0zj/A+a4zKlpJGGHOi0mJua6LMdRCPSHF6IyzmbgtTpJwR4nhugxrq6uy2y1uBwGWbNmzV6yCkMBXBfEbS2TFLycMotJCiN4XTEJ4CPA2xtOTj1YdL1MsBomVAJouF4qwDsCjhxTgSCmEnzt+Br1j5qV1F62onze09NiOd8XtCFIPPMjPcTzcEY0I15f+2qOhb9OR2NbuO3qGS9CbKAtwXj+e1CeieeS1S2+Hh6ojiyJeAH01HmWGTkdnQg2zjoxn61fv34SLORCOGXbiGteN+aD5V1mQhsWA8ALTcA7DgrGijaGOO9LsWIC3iM4axxZuEWO2E9jx479NTw8nO/LjteJuLi4+4YyPKrdRpmbVOZHzk+08UcGLRRwQ2xsbIbB8qahPp0RuSopfC/bpod59oa0Ywd5opnWwMr8t1+/filhYWFzQkJCRoF/yo2XeoEOW8dAXg+cxfSwnQl4LVO1AkjdkF+vFtNz7+5Qlr5Dfckh+V/wcARhAIufl5oFa/msThW1lWOys0LVMU67tUPdAfgGIgw2WjxT0xRfXP+IhvjNidHqYNN6lqF4JIDPMlIriADve6A0DOLRYf1VKl/fu0zdvoPJD3YkoQD87KE8cWDmkPEGgKVLl57kqXuz6WFymq+Cty42hr849IaIRKIJeEdj5OFJnaCBAwcmGfOQI/5b48aNf/Lz87vLkQSdHhkZeZnK7CSak25WpnLlyjepzB1ZhrB2AkoWv3DhwvPGrWODBw9eWbNmzYGYCHIFHhyyXJjDIRd9kwcPHvy3fKAZcDt06JCITqklZo2KiEXFhbWzxyDPYmGO2bJIF1hYbwGkjrDG5eAE6kUgOjLhN9xPLcJs11FwZLaaI27vVD9x+vyxlijEIkQHFmlLuG62+panUJvVVzPIKiZx2u1dFqsRAP7VGjN+vrCiQbjWA9d55m3wp2HqK1j3C6P6Wix6Tyh1Z0xbR/OEhn6nQ6ssceRIMaXNEY8xHGbMCYdkgMI68+Kcz+7du2c6WrZq1Wq3CXiHgy55QVF5Zu26Lc/FGhgOE65OSEi4aksZcjq/Rz1jrM0IkqJuxCSVO/o4b46WRNoAXLlU0sGwLE4D1+LsGaMU7CQalkQqAd6CmCLmKdx2ArztkFZGLK4uhHOeqeqqJwREmbCNn6k0/n8pVV0Dt5wEbz6SeaiOAnRppZbqYZ+Fp5phkVpAkd6E5W+NurTCeSP89wv2f8FrxfN7gKO3BzAj5n6oDuvroX0tjloYLHR7WGm2Op8QfThrS3/cuXPncfv27ZOxWIlj7pM2btx43Cxvy5Yt93F+fX7z5s07GJ084fwygAe5ubnNJh77Y3a+TaNGjZYitMfPXrB169ZrWZUhpXrYpEmTzxHhmUQOabzZrhu6z2a0sekkhU2L0c2A6+XltQ4aWh2W1sGwQt5ZL0Y3c/asLEaXi8IdQQe44m8f+VKtYgE1qCrWyOYTnLo6+PD7q6aq5OS5ageDlukATwIQr9zu722ZIBgq+B0P06ETBqsEGub3MB0Y1E0lcoyYZ+j6d7YAvROsvd6dUQHOZzWxa6MygM0dP2DlVJWS8pn6evsXKhUWWYPdYtW83nkxJY3JjSkAT1sMk01gyblukQ0aNEhYsmTJaZ4h41k1uYpv//79t4hiHECYbiIc1AGIrIyLior6+tChQze4T3mkGzZsGFOZhHbt2m2h9Ovp6emXaUifjb7wELtWvDESRJGzuIWfw7F8rSh8v8mTJ+/mDbqgTYNQX6Y+M8jp2sIgNpYhH+cAlZmB0VDXM5wNIQcJOA878VT2KO/EQZtkCd5stwFJKsGai0o2Ewu9C8O0l0JHsvMUyFuHbt++/dTGbUByR0F+0AI3TKN6QOoirZjYjqMXsLshOuENkASAh/bDaqo+GCk6wRK2BA14D40fgvf6EJZwCIb8ZmJNcHE828mwZ64UQNwI1KYPnu2H83aoF9dlPCnVCQZv7DiLUxkm1v7qXRD1Ubf3cT0SK+rmCJmNSMh4gMEfz2gL8PfGO0UgX7SYAIkUDqI/Ro2aYtuTfP4YKNhsPHcWyoehjTujPdviPQaiDbMq0wWWXrfVSNQzCr8jhEJVQJvne60NmGvWrHmAEEckXlqvKHoLvwyMQBoWFhidMxs3YCpBOwrC03wD4KmK/3qFfV6xraQA7ueul+QBMJ5il0crWO76WIdRFZZGfwXIB0D2FTz2HXSq3v5j3KGcXyxkL4nRqyEsrTc6pyM6mOnHcDcXNVPP8vF/dHZLWHO9SLw8/Agdv9bKOAiKHwjL1QdOrCcsdm28W13UXc889jUosb9Q5OZil4Xek2jt+QOFUuqy9TAKVcPo0wLva61MC7HvsB7q2QH16YN8nZFeQ1BEh9fe+s7Wd9OmTTd5Kphn5tgzDQoKWsa/c+fOPbxv376fXmPru3E/WSGAsjTE2bArVy7mkRshK4NG1IBUB1h1eK0UOkkvQK8uFly/BStYB2B0Mdl4adzbpeuqlzjWBpjadG+rAu/vUdenBatFHMb7MU39LNYxhGEmqQHi2kXFAvnSOdiAWRWAKy12PbiLGHgjOLSN8V+/Y23xjsXENh+z5zcRG18bIr2iWORfAv8r2lCmrNgVbqxnQyttb/93+uiIvdhpIPdO5TX5foJxC7qTYVdzCbG1pbDYU6WBUkI0ptlWl+x23UoFchKWq/mCCS9WrklhAL/hahkiB8BKVzVsbM33Clvfi4hvWBRC2RJi0X1Zw/uVMXnHvIKKGZ9fVnxuwEXsoCgk9r4VsqFMcbEH0KyeLugLY9vbvA3+3/25JzvDxzekmH2Uwvjxj/xWNhbmEx1kb9jDVkA0aEHxDQRbvndgBLDeC8cWx4ccv8iv5qidHPudGWpx4sLh4HTEUOtq2GWc04+O5M/Be0kpYPKthOyeb/zYiYNhZ7AtZfKa7CEskEW9cvStif+UD+3l5NNFdla+wmKfxRdZrH1S6VW+NGPcvu6K4a8N+O4QTFoMA//sgOG7AqxRfisjyqt+7slaG2TXJsqG59v6XFvK2NJXr/Rlk7/rJ07tXhH4r/uNLxnqc9JbfOCQdRA7MHTcuAJGI7013i6Hdcuujn/FRwn/6ue+rpF6pQ7J/bi07dZXR0D05soqcI7qiA2LLmJLvIP6z/uW2P+7jsn9rL/tAJYOpLP4LoLx80u5wLXx+B+cTUKEm3GYQAAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAxMi0wNS0wMlQxOTo0Njo1MSswMTowMBx1tHgAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMTItMDUtMDJUMTk6NDY6NTErMDE6MDBtKAzEAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAABJRU5ErkJggg==') no-repeat; } @@ -32,70 +28,135 @@ background: url($image-sprite) -3px -3px no-repeat; } -.confirmation-header { - padding: 2em 1em; +.next-steps { + margin: 0 -1em; // counteract padding on parent + background-color: #faf7e2; +} + +.next-steps__step { + box-sizing: border-box; + padding: 1em; - @media only screen and (min-width: 48em) { - padding: 3em 0; - text-align: center; + & + .next-steps__step { + border-top: 1px solid #ede8c9; } - h1 { + h2 { margin-top: 0; } p { - font-size: 1.3em; - line-height: 1.4em; + color: #666666; margin-bottom: 0; } - - p + p { - margin-top: 0.5em; - } } -.advert-mobile-apps { - margin: 0 -1em; // counteract padding on parent - background-color: #fff9cc; - padding: 2em; +.next-steps__step__cta { + @include pie-clearfix; + padding-top: 0.4em; // extra padding between buttons and previous paragraph - @media only screen and (min-width: 48em) { - padding-left: 37%; - background: #fff9cc url(/cobrands/fixmystreet/images/advert-app-watercolour.jpg) 7% 50% no-repeat; + a { + float: left; + margin: 1em 0.6em 0 0; + + &:last-child { + margin-right: 0; + } } - h1 { - margin-top: 0; + .next-steps__step--goodies { + min-height: 37px; // stop absolutely positioned img overlapping bottom of parent element + + img { + // absolute positioning to overlap floated goodies image to the right + position: absolute; + max-width: none; + } } +} - p { - font-size: 1.3em; - line-height: 1.4em; +.next-steps__step--goodies { + @include pie-clearfix; + + .goodies-preview { + float: right; + margin-left: 1em; + margin-right: -0.5em; } +} - .app-links { - @include clearfix; - margin-bottom: 1em; +.unresponsive-council-warning { + margin: 1em -1em; + padding: 2em 2em; + background-color: mix(#fff, $primary, 70%); + + h1 { + font-size: 1.4em; + } + + p { + margin-bottom: 0.5em; + } a { - float: left; - margin-right: 1em; + display: inline-block; + margin-top: 0.5em; + padding: 0.5em 1em; + background-color: #000; + color: #fff; + border-radius: 0.3em; + + &:hover, + &:focus { + text-decoration: none; + background-color: mix(#000, $primary, 70%); + } } +} - a[href*="itunes.apple.com"] { - margin-top: 3px; // compensate for slightly smaller itunes button +.unresponsive-council__header { + padding-bottom: 1em; + border-bottom: 1px solid #ccc; + margin-bottom: 1em; + + p { + font-size: 1.2em; + margin-bottom: 0; } - } +} - .desktop-advice { - clear: left; - font-size: 1em; - line-height: 1.2em; - color: #745D17; // brown +.unresponsive-council-cta { + display: block; + padding: 1em; + margin: 1em 0; + background-color: #555; + border-radius: 0.2em; + color: #fff; - @media only screen and (min-width: 48em) { - width: 28em; // break line at a nice point + &:visited { + color: #fff; + } + + &:hover, + &:focus { + text-decoration: none; + background-color: #777; + color: #fff; } - } } + +.unresponsive-council-cta--primary { + background-color: $primary; + color: #000; + + &:visited { + color: #000; + } + + &:hover, + &:focus { + background-color: mix(#fff, $primary, 30%); + color: #000; + } +} + diff --git a/web/cobrands/fixmystreet/config.rb b/web/cobrands/fixmystreet.com/config.rb index 471b4b008..471b4b008 100644 --- a/web/cobrands/fixmystreet/config.rb +++ b/web/cobrands/fixmystreet.com/config.rb diff --git a/web/cobrands/fixmystreet.com/favicon.ico b/web/cobrands/fixmystreet.com/favicon.ico Binary files differnew file mode 100644 index 000000000..65b59218e --- /dev/null +++ b/web/cobrands/fixmystreet.com/favicon.ico diff --git a/web/cobrands/fixmystreet/fonts/Museo300-Regular-webfont.eot b/web/cobrands/fixmystreet.com/fonts/Museo300-Regular-webfont.eot Binary files differindex 15be4441c..15be4441c 100755 --- a/web/cobrands/fixmystreet/fonts/Museo300-Regular-webfont.eot +++ b/web/cobrands/fixmystreet.com/fonts/Museo300-Regular-webfont.eot diff --git a/web/cobrands/fixmystreet/fonts/Museo300-Regular-webfont.svg b/web/cobrands/fixmystreet.com/fonts/Museo300-Regular-webfont.svg index 71109b80b..71109b80b 100755 --- a/web/cobrands/fixmystreet/fonts/Museo300-Regular-webfont.svg +++ b/web/cobrands/fixmystreet.com/fonts/Museo300-Regular-webfont.svg diff --git a/web/cobrands/fixmystreet/fonts/Museo300-Regular-webfont.ttf b/web/cobrands/fixmystreet.com/fonts/Museo300-Regular-webfont.ttf Binary files differindex 072e9a4e0..072e9a4e0 100755 --- a/web/cobrands/fixmystreet/fonts/Museo300-Regular-webfont.ttf +++ b/web/cobrands/fixmystreet.com/fonts/Museo300-Regular-webfont.ttf diff --git a/web/cobrands/fixmystreet/fonts/Museo300-Regular-webfont.woff b/web/cobrands/fixmystreet.com/fonts/Museo300-Regular-webfont.woff Binary files differindex f8a9dff96..f8a9dff96 100755 --- a/web/cobrands/fixmystreet/fonts/Museo300-Regular-webfont.woff +++ b/web/cobrands/fixmystreet.com/fonts/Museo300-Regular-webfont.woff diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_300-webfont.eot b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300-webfont.eot Binary files differindex 5287827df..5287827df 100755 --- a/web/cobrands/fixmystreet/fonts/MuseoSans_300-webfont.eot +++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300-webfont.eot diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_300-webfont.svg b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300-webfont.svg index 9a04e92bc..9a04e92bc 100755 --- a/web/cobrands/fixmystreet/fonts/MuseoSans_300-webfont.svg +++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300-webfont.svg diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_300-webfont.ttf b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300-webfont.ttf Binary files differindex 0a4444b76..0a4444b76 100755 --- a/web/cobrands/fixmystreet/fonts/MuseoSans_300-webfont.ttf +++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300-webfont.ttf diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_300-webfont.woff b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300-webfont.woff Binary files differindex 22110a14e..22110a14e 100755 --- a/web/cobrands/fixmystreet/fonts/MuseoSans_300-webfont.woff +++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300-webfont.woff diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_300_Italic-webfont.eot b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300_Italic-webfont.eot Binary files differindex 3a35076a1..3a35076a1 100755 --- a/web/cobrands/fixmystreet/fonts/MuseoSans_300_Italic-webfont.eot +++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300_Italic-webfont.eot diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_300_Italic-webfont.svg b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300_Italic-webfont.svg index b848d3756..b848d3756 100755 --- a/web/cobrands/fixmystreet/fonts/MuseoSans_300_Italic-webfont.svg +++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300_Italic-webfont.svg diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_300_Italic-webfont.ttf b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300_Italic-webfont.ttf Binary files differindex 58241a2e9..58241a2e9 100755 --- a/web/cobrands/fixmystreet/fonts/MuseoSans_300_Italic-webfont.ttf +++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300_Italic-webfont.ttf diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_300_Italic-webfont.woff b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300_Italic-webfont.woff Binary files differindex 95c94194f..95c94194f 100755 --- a/web/cobrands/fixmystreet/fonts/MuseoSans_300_Italic-webfont.woff +++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_300_Italic-webfont.woff diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_500-webfont.eot b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500-webfont.eot Binary files differindex 2731833c7..2731833c7 100755 --- a/web/cobrands/fixmystreet/fonts/MuseoSans_500-webfont.eot +++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500-webfont.eot diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_500-webfont.svg b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500-webfont.svg index dd240b802..dd240b802 100755 --- a/web/cobrands/fixmystreet/fonts/MuseoSans_500-webfont.svg +++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500-webfont.svg diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_500-webfont.ttf b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500-webfont.ttf Binary files differindex d23f991ce..d23f991ce 100755 --- a/web/cobrands/fixmystreet/fonts/MuseoSans_500-webfont.ttf +++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500-webfont.ttf diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_500-webfont.woff b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500-webfont.woff Binary files differindex c1f85a061..c1f85a061 100755 --- a/web/cobrands/fixmystreet/fonts/MuseoSans_500-webfont.woff +++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500-webfont.woff diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_500_Italic-webfont.eot b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500_Italic-webfont.eot Binary files differindex e60c7e02e..e60c7e02e 100755 --- a/web/cobrands/fixmystreet/fonts/MuseoSans_500_Italic-webfont.eot +++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500_Italic-webfont.eot diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_500_Italic-webfont.svg b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500_Italic-webfont.svg index 28df57c2f..28df57c2f 100755 --- a/web/cobrands/fixmystreet/fonts/MuseoSans_500_Italic-webfont.svg +++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500_Italic-webfont.svg diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_500_Italic-webfont.ttf b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500_Italic-webfont.ttf Binary files differindex 445af3ac1..445af3ac1 100755 --- a/web/cobrands/fixmystreet/fonts/MuseoSans_500_Italic-webfont.ttf +++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500_Italic-webfont.ttf diff --git a/web/cobrands/fixmystreet/fonts/MuseoSans_500_Italic-webfont.woff b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500_Italic-webfont.woff Binary files differindex 453194a98..453194a98 100755 --- a/web/cobrands/fixmystreet/fonts/MuseoSans_500_Italic-webfont.woff +++ b/web/cobrands/fixmystreet.com/fonts/MuseoSans_500_Italic-webfont.woff diff --git a/web/cobrands/fixmystreet/images/a4-poster.png b/web/cobrands/fixmystreet.com/images/a4-poster.png Binary files differindex 45d3c1f84..45d3c1f84 100644 --- a/web/cobrands/fixmystreet/images/a4-poster.png +++ b/web/cobrands/fixmystreet.com/images/a4-poster.png diff --git a/web/cobrands/fixmystreet/images/a5-flyers.png b/web/cobrands/fixmystreet.com/images/a5-flyers.png Binary files differindex 111f0bc45..111f0bc45 100644 --- a/web/cobrands/fixmystreet/images/a5-flyers.png +++ b/web/cobrands/fixmystreet.com/images/a5-flyers.png diff --git a/web/cobrands/fixmystreet/images/a6-flyers.png b/web/cobrands/fixmystreet.com/images/a6-flyers.png Binary files differindex cde4593e6..cde4593e6 100644 --- a/web/cobrands/fixmystreet/images/a6-flyers.png +++ b/web/cobrands/fixmystreet.com/images/a6-flyers.png diff --git a/web/cobrands/fixmystreet/images/arrow-down-16px-16px.png b/web/cobrands/fixmystreet.com/images/arrow-down-16px-16px.png Binary files differindex 8223a4e69..8223a4e69 100755 --- a/web/cobrands/fixmystreet/images/arrow-down-16px-16px.png +++ b/web/cobrands/fixmystreet.com/images/arrow-down-16px-16px.png diff --git a/web/cobrands/fixmystreet/images/dog-poop-flags.png b/web/cobrands/fixmystreet.com/images/dog-poop-flags.png Binary files differindex 581318d10..581318d10 100644 --- a/web/cobrands/fixmystreet/images/dog-poop-flags.png +++ b/web/cobrands/fixmystreet.com/images/dog-poop-flags.png diff --git a/web/cobrands/fixmystreet.com/images/dog-poop-poster.png b/web/cobrands/fixmystreet.com/images/dog-poop-poster.png Binary files differnew file mode 100644 index 000000000..bd508dee8 --- /dev/null +++ b/web/cobrands/fixmystreet.com/images/dog-poop-poster.png diff --git a/web/cobrands/fixmystreet/images/locate-me.png b/web/cobrands/fixmystreet.com/images/locate-me.png Binary files differindex 47a0eef20..47a0eef20 100644 --- a/web/cobrands/fixmystreet/images/locate-me.png +++ b/web/cobrands/fixmystreet.com/images/locate-me.png diff --git a/web/cobrands/fixmystreet/images/locate-me@2.png b/web/cobrands/fixmystreet.com/images/locate-me@2.png Binary files differindex df920fadb..df920fadb 100644 --- a/web/cobrands/fixmystreet/images/locate-me@2.png +++ b/web/cobrands/fixmystreet.com/images/locate-me@2.png diff --git a/web/cobrands/fixmystreet.com/images/next-step-apple.png b/web/cobrands/fixmystreet.com/images/next-step-apple.png Binary files differnew file mode 100644 index 000000000..79476f552 --- /dev/null +++ b/web/cobrands/fixmystreet.com/images/next-step-apple.png diff --git a/web/cobrands/fixmystreet.com/images/next-step-download.png b/web/cobrands/fixmystreet.com/images/next-step-download.png Binary files differnew file mode 100644 index 000000000..525c27d1f --- /dev/null +++ b/web/cobrands/fixmystreet.com/images/next-step-download.png diff --git a/web/cobrands/fixmystreet.com/images/next-step-facebook.png b/web/cobrands/fixmystreet.com/images/next-step-facebook.png Binary files differnew file mode 100644 index 000000000..c01fa6ced --- /dev/null +++ b/web/cobrands/fixmystreet.com/images/next-step-facebook.png diff --git a/web/cobrands/fixmystreet.com/images/next-step-goodies.png b/web/cobrands/fixmystreet.com/images/next-step-goodies.png Binary files differnew file mode 100644 index 000000000..27fe702c3 --- /dev/null +++ b/web/cobrands/fixmystreet.com/images/next-step-goodies.png diff --git a/web/cobrands/fixmystreet.com/images/next-step-google.png b/web/cobrands/fixmystreet.com/images/next-step-google.png Binary files differnew file mode 100644 index 000000000..6b2244c44 --- /dev/null +++ b/web/cobrands/fixmystreet.com/images/next-step-google.png diff --git a/web/cobrands/fixmystreet.com/images/next-step-twitter.png b/web/cobrands/fixmystreet.com/images/next-step-twitter.png Binary files differnew file mode 100644 index 000000000..e79255bd6 --- /dev/null +++ b/web/cobrands/fixmystreet.com/images/next-step-twitter.png diff --git a/web/cobrands/fixmystreet/images/pack-community.jpg b/web/cobrands/fixmystreet.com/images/pack-community.jpg Binary files differindex 710a34651..710a34651 100644 --- a/web/cobrands/fixmystreet/images/pack-community.jpg +++ b/web/cobrands/fixmystreet.com/images/pack-community.jpg diff --git a/web/cobrands/fixmystreet/images/pack-general.jpg b/web/cobrands/fixmystreet.com/images/pack-general.jpg Binary files differindex 336e80a9c..336e80a9c 100644 --- a/web/cobrands/fixmystreet/images/pack-general.jpg +++ b/web/cobrands/fixmystreet.com/images/pack-general.jpg diff --git a/web/cobrands/fixmystreet/images/pack-schools.jpg b/web/cobrands/fixmystreet.com/images/pack-schools.jpg Binary files differindex 3c3292d6d..3c3292d6d 100644 --- a/web/cobrands/fixmystreet/images/pack-schools.jpg +++ b/web/cobrands/fixmystreet.com/images/pack-schools.jpg diff --git a/web/cobrands/fixmystreet/images/advert-40x60.png b/web/cobrands/fixmystreet.com/images/promote-40x60.png Binary files differindex 43b6ba53b..43b6ba53b 100644 --- a/web/cobrands/fixmystreet/images/advert-40x60.png +++ b/web/cobrands/fixmystreet.com/images/promote-40x60.png diff --git a/web/cobrands/fixmystreet/images/advert-90x130.png b/web/cobrands/fixmystreet.com/images/promote-90x130.png Binary files differindex b30f1e3ff..b30f1e3ff 100644 --- a/web/cobrands/fixmystreet/images/advert-90x130.png +++ b/web/cobrands/fixmystreet.com/images/promote-90x130.png diff --git a/web/cobrands/fixmystreet/images/advert-90x60.png b/web/cobrands/fixmystreet.com/images/promote-90x60.png Binary files differindex 46e21f10b..46e21f10b 100644 --- a/web/cobrands/fixmystreet/images/advert-90x60.png +++ b/web/cobrands/fixmystreet.com/images/promote-90x60.png diff --git a/web/cobrands/fixmystreet/images/tile-y-border.jpg b/web/cobrands/fixmystreet.com/images/tile-y-border.jpg Binary files differindex 04c75a9de..04c75a9de 100644 --- a/web/cobrands/fixmystreet/images/tile-y-border.jpg +++ b/web/cobrands/fixmystreet.com/images/tile-y-border.jpg diff --git a/web/cobrands/fixmystreet/images/tile-y.jpg b/web/cobrands/fixmystreet.com/images/tile-y.jpg Binary files differindex 63682f1c4..63682f1c4 100644 --- a/web/cobrands/fixmystreet/images/tile-y.jpg +++ b/web/cobrands/fixmystreet.com/images/tile-y.jpg diff --git a/web/cobrands/fixmystreet/images/tile.jpg b/web/cobrands/fixmystreet.com/images/tile.jpg Binary files differindex b412774e4..b412774e4 100644 --- a/web/cobrands/fixmystreet/images/tile.jpg +++ b/web/cobrands/fixmystreet.com/images/tile.jpg diff --git a/web/cobrands/fixmystreet.com/images/unresponsive-council-cta-arrow.png b/web/cobrands/fixmystreet.com/images/unresponsive-council-cta-arrow.png Binary files differnew file mode 100644 index 000000000..664721830 --- /dev/null +++ b/web/cobrands/fixmystreet.com/images/unresponsive-council-cta-arrow.png diff --git a/web/cobrands/fixmystreet.com/images/unresponsive-council-cta-arrow@2.png b/web/cobrands/fixmystreet.com/images/unresponsive-council-cta-arrow@2.png Binary files differnew file mode 100644 index 000000000..181d8402b --- /dev/null +++ b/web/cobrands/fixmystreet.com/images/unresponsive-council-cta-arrow@2.png diff --git a/web/cobrands/fixmystreet.com/js.js b/web/cobrands/fixmystreet.com/js.js new file mode 100644 index 000000000..3abba8e33 --- /dev/null +++ b/web/cobrands/fixmystreet.com/js.js @@ -0,0 +1,3 @@ +jQuery.validator.addMethod('validName', function(value, element) { + var validNamePat = /\ba\s*n+on+((y|o)mo?u?s)?(ly)?\b/i; + return this.optional(element) || value.length > 5 && value.match( /\S/ ) && value.match( /\s/ ) && !value.match( validNamePat ); }, translation_strings.category ); diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet.com/layout.scss index ded1ed911..23f3c575d 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet.com/layout.scss @@ -249,10 +249,80 @@ body.twothirdswidthpage { } } -/* hide the footer on the alert page as the interaction with the - * photo sidebar is awkward to fix */ -body.alertindex { - #footer-nav { - display: none; +.next-steps { + @include clearfix; + margin-bottom: 2em; // add some space between this and the footer +} + +.next-steps__step { + font-family: MuseoSans,Helmet,Freesans,sans-serif; + float: left; + width: 33%; + padding: 1.8em; + + & + .next-steps__step { + border-top: none; + border-left: 1px solid #ede8c9; + } + + h2 { + font-family: inherit; + font-weight: bold; + line-height: 1.2em; + } + + p { + line-height: 1.4em; } } + +body.unresponsive-council { + .container .content { + padding: 0; + margin-bottom: 4em; + } + + h1, h2 { + font-family: inherit; + font-weight: bold; + } +} + +.unresponsive-council__header, +.unresponsive-council__body { + padding: 1.5em; + font-size: 1.3em; +} + +.unresponsive-council__header { + background-color: $primary; + + border-bottom: none; + margin-bottom: 0; + + h1 { + font-size: 2.5em; + line-height: 1em; + margin-bottom: 0.2em; + } +} + +.unresponsive-council__body { + p { + max-width: 26em; + } +} + +.unresponsive-council-cta { + margin: 1.5em 0; + max-width: 20em; + padding-right: 6em; + background-image: url(images/unresponsive-council-cta-arrow.png); + background-position: right center; + background-repeat: no-repeat; + + @media (-webkit-min-device-pixel-ratio: 2), (min-resolution: 192dpi) { + background-image: url(images/unresponsive-council-cta-arrow@2.png); + background-size: 60px; + } +} diff --git a/web/cobrands/fixmystreet/posters.scss b/web/cobrands/fixmystreet.com/posters.scss index 029180784..8c4f0c1ed 100644 --- a/web/cobrands/fixmystreet/posters.scss +++ b/web/cobrands/fixmystreet.com/posters.scss @@ -42,7 +42,7 @@ body.goodies { display: inline-block; width: 16px; height: 16px; - background: transparent url(/cobrands/fixmystreet/images/arrow-down-16px-16px.png) 0 0 no-repeat; + background: transparent url(images/arrow-down-16px-16px.png) 0 0 no-repeat; margin-right: 0.5em; vertical-align: -0.1em; } diff --git a/web/cobrands/fixmystreet/posters/activist-pack.zip b/web/cobrands/fixmystreet.com/posters/activist-pack.zip Binary files differindex 1d836345b..1d836345b 100644 --- a/web/cobrands/fixmystreet/posters/activist-pack.zip +++ b/web/cobrands/fixmystreet.com/posters/activist-pack.zip diff --git a/web/cobrands/fixmystreet/posters/community-group-pack.zip b/web/cobrands/fixmystreet.com/posters/community-group-pack.zip Binary files differindex 8dafc8b50..8dafc8b50 100644 --- a/web/cobrands/fixmystreet/posters/community-group-pack.zip +++ b/web/cobrands/fixmystreet.com/posters/community-group-pack.zip diff --git a/web/cobrands/fixmystreet/posters/fixmystreet-flyers-a5.pdf b/web/cobrands/fixmystreet.com/posters/fixmystreet-flyers-a5.pdf Binary files differindex 04de4b95b..04de4b95b 100644 --- a/web/cobrands/fixmystreet/posters/fixmystreet-flyers-a5.pdf +++ b/web/cobrands/fixmystreet.com/posters/fixmystreet-flyers-a5.pdf diff --git a/web/cobrands/fixmystreet/posters/fixmystreet-flyers-a6.pdf b/web/cobrands/fixmystreet.com/posters/fixmystreet-flyers-a6.pdf Binary files differindex 2e65bffb1..2e65bffb1 100644 --- a/web/cobrands/fixmystreet/posters/fixmystreet-flyers-a6.pdf +++ b/web/cobrands/fixmystreet.com/posters/fixmystreet-flyers-a6.pdf diff --git a/web/cobrands/fixmystreet/posters/fixmystreet-poop-flags.pdf b/web/cobrands/fixmystreet.com/posters/fixmystreet-poop-flags.pdf Binary files differindex b2100a49b..b2100a49b 100644 --- a/web/cobrands/fixmystreet/posters/fixmystreet-poop-flags.pdf +++ b/web/cobrands/fixmystreet.com/posters/fixmystreet-poop-flags.pdf diff --git a/web/cobrands/fixmystreet.com/posters/fixmystreet-poop-poster.pdf b/web/cobrands/fixmystreet.com/posters/fixmystreet-poop-poster.pdf new file mode 100644 index 000000000..4e2c3166b --- /dev/null +++ b/web/cobrands/fixmystreet.com/posters/fixmystreet-poop-poster.pdf @@ -0,0 +1,2174 @@ +%PDF-1.3
%
+1 0 obj
<</Metadata 2 0 R/OutputIntents[<</DestOutputProfile 6 0 R/Info(Coated FOGRA39 \(ISO 12647-2:2004\))/OutputCondition()/OutputConditionIdentifier(Custom)/RegistryName()/S/GTS_PDFX/Type/OutputIntent>>]/Pages 3 0 R/Type/Catalog>>
endobj
2 0 obj
<</Length 28193/Subtype/XML/Type/Metadata>>stream
+<?xpacket begin="" id="W5M0MpCehiHzreSzNTczkc9d"?> +<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="Adobe XMP Core 5.3-c011 66.145661, 2012/02/06-14:56:27 "> + <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <rdf:Description rdf:about="" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + <dc:format>application/pdf</dc:format> + <dc:title> + <rdf:Alt> + <rdf:li xml:lang="x-default">poop-poster</rdf:li> + </rdf:Alt> + </dc:title> + </rdf:Description> + <rdf:Description rdf:about="" + xmlns:xmp="http://ns.adobe.com/xap/1.0/" + xmlns:xmpGImg="http://ns.adobe.com/xap/1.0/g/img/"> + <xmp:MetadataDate>2015-04-21T16:14:24+01:00</xmp:MetadataDate> + <xmp:ModifyDate>2015-04-21T16:14:24+01:00</xmp:ModifyDate> + <xmp:CreateDate>2015-04-21T16:14:24+01:00</xmp:CreateDate> + <xmp:CreatorTool>Adobe Illustrator CS6 (Macintosh)</xmp:CreatorTool> + <xmp:Thumbnails> + <rdf:Alt> + <rdf:li rdf:parseType="Resource"> + <xmpGImg:width>184</xmpGImg:width> + <xmpGImg:height>256</xmpGImg:height> + <xmpGImg:format>JPEG</xmpGImg:format> + <xmpGImg:image>/9j/4AAQSkZJRgABAgEASABIAAD/7QAsUGhvdG9zaG9wIDMuMAA4QklNA+0AAAAAABAASAAAAAEA
AQBIAAAAAQAB/+4ADkFkb2JlAGTAAAAAAf/bAIQABgQEBAUEBgUFBgkGBQYJCwgGBggLDAoKCwoK
DBAMDAwMDAwQDA4PEA8ODBMTFBQTExwbGxscHx8fHx8fHx8fHwEHBwcNDA0YEBAYGhURFRofHx8f
Hx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8fHx8f/8AAEQgBAAC4AwER
AAIRAQMRAf/EAaIAAAAHAQEBAQEAAAAAAAAAAAQFAwIGAQAHCAkKCwEAAgIDAQEBAQEAAAAAAAAA
AQACAwQFBgcICQoLEAACAQMDAgQCBgcDBAIGAnMBAgMRBAAFIRIxQVEGE2EicYEUMpGhBxWxQiPB
UtHhMxZi8CRygvElQzRTkqKyY3PCNUQnk6OzNhdUZHTD0uIIJoMJChgZhJRFRqS0VtNVKBry4/PE
1OT0ZXWFlaW1xdXl9WZ2hpamtsbW5vY3R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo+Ck5SVlpeYmZ
qbnJ2en5KjpKWmp6ipqqusra6voRAAICAQIDBQUEBQYECAMDbQEAAhEDBCESMUEFURNhIgZxgZEy
obHwFMHR4SNCFVJicvEzJDRDghaSUyWiY7LCB3PSNeJEgxdUkwgJChgZJjZFGidkdFU38qOzwygp
0+PzhJSktMTU5PRldYWVpbXF1eX1RlZmdoaWprbG1ub2R1dnd4eXp7fH1+f3OEhYaHiImKi4yNjo
+DlJWWl5iZmpucnZ6fkqOkpaanqKmqq6ytrq+v/aAAwDAQACEQMRAD8A9U4q7FXYq7FXYq7FXYq7
FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FVO4uLe2t5bi4lSG3hRpJppGCIiIKszMaAAA
VJOKoPR/MOga3DJNoup2mpwxNwlks547hVYivFjGzAGmKtar5l8uaRNbwatqtnp892SLWK6uIoXl
IIBEayMpbdh0xVMcVSvR/NXljW5JY9G1iy1OSAAzpZ3MVwyAmgLiNm41p3xVNMVdiqndXVtaW011
dTJb2tujSzzysEjjjQcmd2agVVAqScVQuj67oetWzXWjajbanao5ieezmjnjEgAYoWjLAMAwNPfF
UdirsVdirsVdirsVdirsVdirsVdirsVdirsVU7q2huraW2mXlDOjRyr4q44sPuOKvm7/AJxcnl0H
zz5x8lXLn1ISXRW2q1lM0EhHarCVT9GBWJ/85P6vda1+ZNzaWZZ7fyxYQi449EeWRWdwR73MSn5Y
q+gr7z6r/klL5yRgJpNGM61NKXTxcAtf+M5phV59/wA4sWOn+X/y41nzXqksdnb3lyTJdykKotrR
eIJY/wDFjyCmKp5N/wA5XflXHqAtUGozQE0+vpbKIR13o8iTf8k8VeqaB5g0bzBpNvq+jXSXunXQ
5Qzx1oaGhBBoVYEUIIqMVSr8zv8AyWvmz/tjah/1CyYq8z/5xC/8lrqX/bZn/wCoW2xVkHm7/nJD
8svLWoS6e9zcapdwMUnTTo1lVHBoVMkjxRkjvxY4qnnkL84fInnh2g0S9K36KXfT7lfSn4DqyrUq
4Fd+LGnfFVHyR+cfljzf5k1Py5ZW17ZarpQkNzDepElfSl9GTh6csteDkVrTFV/5k/nB5X/L+XTo
dXgvLq41P1Pq8FjHHI4EZUEsJJIqVL0Wla4qivO/5qeTvJVlbXHmG5a2uLteVvp6L6ty22/wISAF
6Fi3GvfFWN+T/wDnJH8tPM+qRaZFLdaZeXDiK2TUIkjWR22VVeJ5kBY7DkRU4q9SxV2KuxV2KuxV
2KuxV2KuxV81a8U8mf8AOVtjqDuILDX0RpC2yn61E1sRX/mIiDYFQ35S+XX/ADCX80vMU61fXkms
dOduqtMWnC/JCsH3YqwuTz43/Qty+V2JF0mtfVGjJoRbCt7yp/xm2pirJfzwtr3yp+TXkHyjGGii
uUe51IJspnjRJWRj3/e3TEeNK4qyKw8x+YbbyinleP8AJS5fSDb+g6+vUyclo0pY2hJdj8XKta74
VTn/AJxa0HzpoGk69pfmHTLnTrYTwXFgtyrJyeVXSbgD4elHX54q9N/M7/yWvmz/ALY2of8AULJi
r57/ACv1nUdH/wCcYPOt/pxZbtdRliR02ZBPFZwu6kdCqSFq4FZz/wA4x+Q/Ka/l5a+YZbKC81jU
pLgT3EyLK8SRTNEsScgeAKoGNOtd+2FWF/8AOQuiaX5F/MHyr5m8qQJYandSSTT2lqBGrSW8kdGC
LsPWErIwpRqe5wKjfOkY/L7/AJyX0nzAgMWk+Yyv1kinCtx/o1xX/VfjMfn9GKrdVQfmJ/zlHDZb
SaV5W4ibeopYN6jggbb3cnpt7fdirGNR1vU9R/5yH17UZfLE3m+fSZ54bTR+fAIlo4gjlp6cwKL9
oDj1bliqZ/m0vn3z/Z2Ig/K690XU7GXmuoxsZXaIqaxELBCftcWB5bUO2+KvpnypNqc3lfR5tVja
HVJLG2e/ikrzS4aFTKrV3qHqDhVNMVdirsVdirsVdirsVdirxL/nJH8rvNPm86DqXlaz+t6lp7Sx
zqJYYSI34vG/KZ4x8Loeh74qy38ivI9/5N/Luz0vU4BbatNLNdahErI9JJH4qC8ZZWIiRBscVeIa
p/zjr56uPzTmePTQ3k241cXUlw1xb8BayS+pJ+59T1CVRmQfBU4Fe+fmv+WenfmD5YbSbiU2t5A/
1jTrwDl6cwUr8Q/aRgaMPp7YVeU6Xpf/ADlj5btU0OxFnqtjABDbX0sls/pxqKLRpmhlYDtzVjir
1f8AK3RfzB0vQ51886tHquq3M5nQxjaFGUD0uYEakfDWioAKnrirI9f0iHWdB1LR52KQ6lazWkrj
qFnjaNiPobFXiH5QflV+Yvl2XW/Jnme1t7jyHqkM7y3EUkTc7iQRwgpuJ05RrXdKAgb16qpdYfll
+fX5a3d3b+QLuDWtBuXMiWk7QqQTsGdJ2iVXCgAmN6N3HYKpn5R/JPz3r/nW386fmlfxz3FkyvZ6
VEyuA0bc41b0wIkjRt+K15HqetVWT/8AORH5a6r528pWn6Dt/rOu6ZciW1i5xxl4pRwmUPKyKOiv
9r9nFUB/zjx+WfmbywNf1vzbbfV/MGr3AFGlimb0hWR35QtIv7yWQ13r8OKob8zvyV81S+cB59/L
rUV0/wAwtQ3ls7BFkYKE5xlg0fxqKOjjieuKpalj/wA5Z68Y9Pvbiz8vWwYetqEbWxdlHUj0Wnf3
oAtflir3yBZlhjWZg8wUCV1XirNT4iFJagJ7VxVfirsVdirsVdirsVdirsVdirsVdirsVdirsVdi
rsVdiqWf4n8tfpr9Bfpay/Tf/Vr+sRfWv7v1f7jl6n938f2fs79MVTPFXYq7FXYq7FXYqll95n8t
WGpW+l32rWVpqd3w+q2M9xFHPL6jmNPTidg7cnBVaDc7YqhvO/nDTfJ3li88x6nFPNY2PpetHbKj
Sn1pVhXiJHjX7Ugr8WKu8k+b9N84+WLLzHpkU0Njfer6MdyqLKPRleFuQRpF+1GaUbpiqeYq7FXY
q4mm56Yq8I8wf85Ga7qXmOfy/wDln5f/AMQT2xYSX8gkeFuJoWVIzHSMHbmzgHt2qq7y9/zkXrun
eY4PL35meX/8P3FyVWO/jEiQryNAzJKX/d125rIQO/eiqc/mL+b/AJk8tfm55Y8nWFtZS6Xrf1H6
1NOkrTr9bvXt39NklRBREBWqHfxxVl/5t+b9S8nfl9qvmPTIoZr6x+r+jHcq7RH1rmKFuQRo2+zI
aUbrirEP+Vv+Zf8AoXz/AJWN9Wsv03/yz8Jfqv8Ax0vqf2PV9T+73/vPte22KsXtf+ckvNur2mi2
Plvy+mr6/PGk2uyW0NxNbWweUrwWKJmkr6YqWZ6A+O9FX0Nirxz8z/zz1rQ/OMfkjyboq6z5kZFa
US82RGeP1VRYoyjMRH8bHmAB+CqYflh+Y35ma35in0Hzl5TOkSQ2xuf0hEJI4TRwoULIZQ3Ll+zI
enTwVfP/APj7zb/yv3/Fv+FLr/EP/Ur8ZvrH/HO+r/Z9L1f7r97/AHfT23wK9i/ML89POXlrRfJe
ofoe20y58xG6/SljqaTmS2EEkKLT4rYr8MpY818MKpp5J/OjzD5z/MD6hpGgunkdPrCHXpIZm9R4
VJRhKOMMYZh9lqmngcVSfVvz/wDN2u+Y73Q/yu8uprosP7/UrgsYWoaEqqvAFUkEIWk+LsMVTX8u
Pzx1bVPNzeSfO2jDQfM3EmDgWEMrqvMpxcsVLJ8SEOwbx6VVUfO/58axH5vk8mfl9og8wa7b81u5
pC3oRSJ9tOKlKhDs7F1AO2Kobyv+fPmyy832XlT8yvL6aHe6kVW0vYCyw8pG4x8ld5gVZvh5rIaH
qOtFXlX5xebvMU/57aXqEvl+eG80K6gt9KsWWXnqMVnqErwSxAxhiLhvhXgGHhXAr1D8y/NOveZv
+cdfMWpa5oU3l699e2i/R9wJFfgl9bFZKSpE1Gqf2cKsp/5xu/8AJL+Xf+jz/qOnxV6XirsVdiqU
ecYL+48o65Bp1f0hNp91HZ06+s0LCOn+ypirxH/nD6/0RfL2uacGRNd+uCaaM0EjWvpIsdK7lUk9
SvhX3xV3/OYN/ojeXtD04sj679cM0MYoZFtfSdZK03CvJ6dPGntirFPzDjvbH83/AMpxqxKXVtp2
gLfSPsBLFev6xJPgeuBXqv8AzlBrum2P5UX+mzzKt7q0ttDZwV+NjFcRzuwXrxVYtz7jxwqwT/1y
7/P/AKvuBWf/APOMOlWVn+UWmXkEarcalLdT3cgA5O0dxJAtT3okQphV6virxz80vyd/xJ5vXzJ5
Q15NF882cMcssXOnqIAY4pG9OskfJVMfLiysBSnXFUD+Vn5t+dx+YE35befooZNaiVxb38HEFnjh
9fi4j/dkPDVwwC06EeCrF55I7f8A5zNSSdhFHIVVGf4QxfRfTQAnryc8R74FX/8AOZv/AEx//bx/
7FcSr3LWtFbTfy61HRtAiEctrpNxbaZEgoPUW3ZYth3LUwq+ZP8AnH3T/wAytR0vU7byT5rsdEdJ
xJeafcQRTTuOACzAvDM3DquxoD88Cs+X8mfzLuvzJ8veaPM/mzTbzUrCe3ZUSMW801tbSmWSNEii
iVzwZxUjp1NMKvNvybsfzGn86eYtP0DzHZ+XvMhdhfx3kMcr3DRyv6qxerFN/dvuwFOvtgVnnnT8
k/ze8y3OmXHmfzppc1zZSFNMlaJbZhJKynipihi5sWjWgNfbqcKoT89pI7f/AJyL8h3U7CK2jGlM
8z7IAmpysxLHb4RucCvbfzX8sX/mn8vdZ0HT0je9vo41t1lbinNJkkBLb0pwrhVr8p/K9/5W/L3R
tB1BES9so5BcLE3NOckzyEhtq151xVluKuxV2KuxV4953/5xq8s69rUmu6HqNx5b1aZzJLJaqHhM
jdZFjDRMjNvXi4B8MVd5I/5xq8s6DrUeu65qNx5k1aFxJFJdKEhEi9JGjLSs7LtTk5A8MVZB+bP5
M6D+Y1vaNd3MthqVjyW2vYgH+B92SSNiOS1FRuCPHFWHW/8AzizpJ0m+j1LzBc6prdzbi2s9Tuo+
cdqvIEtHAZCSaArvLtXbFWT/APKmf+QL/wDKs/0x/wBvb6t/y/fXf7j1f9h/ee/tirJvy38mf4K8
l6d5Z+ufX/qHrf6X6fo8/Wnkn/u+clKepT7WKslxV5L+Yn/OPem+a/MUvmXT9dvdE1ucKss6Ezx0
RQg4rzidPhHRXp7Yqi/yu/IbQ/I2qza5NqE+ta9MjRm9nURqoc1kZI+Tnk/dmc/rqqqfmn+RPlvz
/eQ6pJdTaXrUEYiW9gAdXRSSokjNKlSdiGB/CirH/NP/ADjjdeYfKXljQbrzVIZ/Lv17nqMtoZnu
frsyyiqtcAp6YTiPiavtir2vFXjfnX/nGXyzretya5oWpT+W9TmcyyG2QSQ+o3V0QNEyEnrxenti
qv5C/wCcd9N8t+ZLbzLquv32u61Z1+rTSEwotVK7jnLI3wsRQycd9xiqJ/Mj/nHnyp5z1Q63Bcza
LrbkGa7tlVklZejvGSvxin2lYe9cVSby5/zjHZ2mt2Wr+YvNGoa9cadKs1oh5W4V0YMtWMs8mzAH
4WXFWZ/ml+UHlv8AMSztk1KSW0v7Ll9TvoKclD05I6sKOp4g06jsetVUm0/8k9Qs/wArdW8inzRP
NLqN0lxBq7wtzt442gYQrH69StLcjZx9rp4qsx/LzylN5R8n6f5em1BtUksvW5XzoY2k9Wd5hVC8
tOPqcftHpirIsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdi
qhfG8FsxswGnqOIbpSu/XFUr9TzV/vqL71/rirvU81f76i+9f64q71PNX++ovvX+uKu9TzV/vqL7
1/rirvU81f76i+9f64q71PNX++ovvX+uKu9TzV/vqL71/rirvU81f76i+9f64q71PNX++ovvX+uK
u9TzV/vqL71/rirvU81f76i+9f64q71PNX++ovvX+uKu9TzV/vqL71/rirvU81f76i+9f64q71PN
X++ovvX+uKu9TzV/vqL71/rirvU81f76i+9f64q71PNX++ovvX+uKoiwfXTcAXiRrBQ1K0rXt0Jx
VM8VdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirsVdirz38/9U1LS
/wApNevtMu5rG+h+qejdW0jwypyvYUbi6FWFVYg0PTFWI3tprXkHzR5Kaw82axri+Y76Ky1HR9Xu
xeVglX4p4gVVkEJarEe2+Ku/LL8z7zS/yh8vXeo/XPMfmTWr25s9NtHmMlxcSidx8c0xbikajdj0
GKsy0j8z9Rnl1zTNV8t3Fj5n0S1W+Oi288d2bmB68Gt5lEYY1FCCooT3xVD6V+b0yvrtr5q0Cfy9
qehacdYexFxFemayHIF0eLiOVVoVPSvXFUT5L/MzVNc0y41rWfLkmg+X1sm1K11Z7uC6iltlHIlx
HRonC1Yqw2piqB0H85LnUNQ0Q6j5cn0rQfM0hh0DVpLiKVpX4loxPAg5Q+oB8HxNXFWQfmB5+h8p
WtikVhLq2s6tP9V0nSoGVHmlpVqu1QiKPtNQ0xV57pH5heYp/wA6JR5ktbvyzY6b5aludR0ea6Fx
aK8U5ka6Uwn0pP3TU58a7EdsVTaD89p1htNb1Lyre6d5Iv5UhtPMkssTU9RuKSzWq/vIomPRyT7Y
qidY/OHWoPOmv+UdE8pXGuanoqW8yGG5SJJY5oFmkaRpE4xcOYVVBYuegxVX0nzTe+btN8ufmHo5
u00azttSOpeXoGZ7i5mPGKNFjBSKVo3hYpzI+1tSpxVr8jfzG1rzt5VW81ixmivYy/O/EKxWU49V
1C25DszMgWj1A3xV6RirsVdirsVdirsVdirsVdirsVYP+dvlvWvMv5Y6zomiW/1vU7v6t9Xt+ccf
L07uKV/jlZEFEQnc4q35N/Jz8u/Kt1Dqek6JHa6ssYU3LyzXDIxWj8PWklCE1IJWmKvKrP8AJTzy
vlDRtOnsIZL/AMnajdvYRG9eCPU7O9IeRlltmWW3kUqAvJh3r7qptB+Xvnl9H1/UdC8sr5O80XFi
tlYXcuuXGp3jp9YjlliEju8UQZI/hatQ3hUkKr/JvkHzzpvnfUvMC+XVs4bny3NZW1tqWqHUud8b
hHEdzKzSPSQIWIjHDj3DE4q7yf8AlZ5smvPM9vdaUnk3y1relS2D6LBei+ie9l2+uQqvwwrxJ+D6
Pkqo+SPys8wWWpaFY635NgddBngmHmJtdvJIGa2NY5rew5sEccR8LKE7UA2xVnH5q+VfMt/f+W/N
Hli3ivdb8r3M0senTyCFbiC5jCTRrI3wq/wLxLbdcVYs3kXz95u893useadJi0XTNV8t3OiiO3uo
7p7UyyckEjDhzkq7v8C8KUFcVQ115M/N3XPJll+WOq6ZZWWhWotba88zxXSyetZWbo0aw2vH1Elp
ElS+x+nFWZeUPKetaZ+a/nbW57X0dG1WHTI9LuPUjb1PqtqIpBwDNIvFhT4wK9sVX/kX5X13yv8A
ltp2ja7bfU9SgkuGlg5xy0Ek7uvxRM6GqsOhxVCfkr5c84eUdKuPKOsadGul6bJLJpmtxXCOLpZp
Wfi0H242UHqcVek4q7FXYq8f/M/8yfOegfmLYaX5Yhi1KKHTGvtW0mWi+ohn4J6cgFUloDTeh7g7
Yqz3yJ590Hzpo36S0p2R42MV7YzDjcW0w6xyp2PgehxVkeKuxV2KuxV2KpB56866V5L8tXHmHVIp
5rK2aNJI7VUeUmVxGtA7xr1bf4sVT/FUDe67o9jqNhpt3dxwX+qGRdPtnNHmMKhpOA78QwJxVHYq
7FXYq7FXYq7FUg84eddK8qQ6XLqMU8q6tqMGlWwt1Ris9yGKM/N46IPTNSKn2xVP8VdirsVdirsV
eOfmJ+YXn5PP03k/y7PZ6PHDZR3n6QuYjcTzLKxUtAhPp0RtviHUYqkWgeWxpk95qF5eTaprepMH
1DVLmnqSFdlVVGyIo6KP6UVQxnbyv+ZXlrzBpzek2u30Oh6xbLQLcJdfDFIw/miYA169Bir6JxV2
KuxV2KuxV5Z/zk3/AOSd1b/jNaf9RMeKsP8ANP1nzX+bvmXSNV0K68xWOk2lqmjafb30FksImiEj
3irNPbiR+bbOteOwPbFUkl8teYrnWPylh826nf2mq3H6TsLi4ttQBMa21Pq7wzwvIiSyowSRgxL0
AO4wK9q/NvyafNP5d6npMPJ7+GIXOmvWsn1m2+OOjdeT0KV/ysKvDdb87635whuvPOlVafyX5ctw
roP7rVdTZY7qVCRQ+jBzb2KjvgVO/OXlPyr5M8gad568oarcHzdI9m9rqH1uad9WkldFkjliLsrg
ozMVVe1MKst8ganZ2H5q/mvd6jKlpHCNJuJ/UcAJHHayGRq9wvIVOKvJPKWjtrOi/k9pYuprNbu6
8wxy3Fu5jlERdDIEcfZLJVa++BX0dr9t/g/8sdUh8uRsjaNpdwdNRmMjK0UTMhq1WYqd/fCrwPUv
KHlaw8p/lj5msb2a41zXNZ0ybVpJbqSb6zM4LzO8bsy8reX92GAB3Nak4FZj5d8r+XvzF8y+dLvz
3cTTajouqz2en6YbqW3SwsoKejcRrG6Cr7/GfhNK98KsWstZ1PzFovlDyvrup3Fx5QvPMWo6bLqz
TFGvrOzRDZRyyrxJWZ5HTr+z4gYFZZ5D8t6B5c/5yL1XSNCkc2Fv5b+G1eZ7j6sxurcmFWkZ3C0o
/EnblhV7nirEvzX833HlHyBq+u2ih72CNY7MEVHrzyLDGxB2IRn5Ee2KvHtH8iWUF7BrerXFzqvm
Zfjn1WeeYsXYHkqoHCcByICkdMVZRilJvMXlLStfNs98Z1lsyXtJYJniaOQ0/eLxNOQpsT0xQyn8
lfM/mBtQ1rybrt2+pTaKsE+m6nLvNLaXHIBJm/aeNlpyO5xV6tirsVdirsVQOuaHpOu6Vc6Tq9sl
5p12oS4t3rxYAhhuCCCGAIINQcVY3q35Oflpq1jp9lqGhQzwaXCltYsXmWVIY/sRmZXWV1Hg7HFU
Zqn5Z+QtU8u23ly90W3fRbM8rS0QNEImNasjxlHUtyPIht++KovzFc67o+gqfLOjrrF5B6cUGnNc
JbAxD4SfWl5D4R49cVSD8qPIMvlnyvdwavDAdV1u6nv9XgiHOBWuDT0FrsyIlF8OuKq2j/kz+WGj
6yNZ07y/bwairCSOWsjrG46NHE7tHGR2KqMVRetflb+X+ua/F5g1bRILvVoeNLl+dG4ABfUjDCOT
iAAOanFWtL/K/wAi6V+hPqGmej/h17mTRv39w3oNef35+ORufOn7dadqYqyllVlKsAysKMp3BB7H
FWE2v5J/lZaXJurXy/BBP9YivFkjeZSs0Dc4ylH+BQ2/BaKe4xVFeaPym/LvzTqK6lruiQ3d8vGt
wGlhduOyiQwvH6gA2o9cVQ3n7ytbP5Ji0TSvKdpr9jA6KmhvMtiixKrfFDNT93IDSh26nfFWMflF
+WOo6J5pvPNF5otr5YgewXTNO0C1n+uOkZlWaSW4uf8AdkjOgoanb5Yq9dxV4R+Z/n6889Wes+Sf
K2mw3elhha6jr97IyW4midX42yx/FI0bqDy6VHQilVUqt9O87w2enu19azahbRvBeRuJBbzqaenL
sOSyLx32oanpiqvLZebraGwktLyG/uYkkS/iuqwRStKQwkRo0kZPTIooofhPjviqZaZb6jbaZHFe
Ti8v1VmlmI4KzsS1BQGiivEbdMUsc8peYvNX5f8AmLWPMnmPSI9VsdW9Fby902VmksreCoUJDIqF
0HKrfKtcUPozS9UsNV0221LT5luLG8jWa2nT7LI4qDiqKxV2KuxVhv5ueddQ8l+R7vzDYQxT3FrL
br6U4ZkKSzLG+yNGa8WNN+uKsf8A+Vh/mJoPmPQ4PO2k6ZaaJ5kuBZ2ctjPK89ncOlY4rppQsblm
2qgA67+KqWD82/zG1DQ7zzzomg2E3kSyaZhHPNKmp3NtbMVluYqD0UVeDEqwrscVTrWfzS1jU9T0
XQvy/s7W+1bWNNXWmutSaRLW1spCAjSrF+8ZmY8eK7jbxxVJtX/OrzLpnknzfLeabaWnnXyfLZx3
loxkmspUvZo0jnjo0cnF43JA5VG1etMVTCD8xvzD0rzHoEfm7SNOtfL/AJpnW0057KaWS6tJ5V5Q
xXRekbs52/dgDrv2KqG/5yGubq1TyLdWlsby6g8zWUsFmrBWmkTkyRhjsC5HGuKo3RfzL83ad5x1
Ly557s9Ptvq2kSa9b3elvM6LaxPwdJPWoS44tuABt03riqU6P+dPmeSfy5q2rWulxeWvNF6lhaWt
tNI+o2jTlhbyXFT6bK/D4uKjjiqI8v8A5reeNU8w+ZYpNNsIvLXlTVL6HVdUJkVxY2nPgscZduc9
IyzNstO2KofR/wA6fM8k/lzVtWtdLi8teaL1LC0tbaaR9RtGnLC3kuKn02V+HxcVHHFXs2KuxVA6
/wDXf0FqP1D/AHu+qzfVaV/vfTbh0/yqYq+ffyu+o/4D0j6nT0/SPqU/37yPq1/2dcVTPXNK1XUp
beGDUn0/Txya7+rALcyHbgqymvpr/MQK4pQA8tazplzBc6NqtzcKJFF5Y6lO9xFJETRijuGkjdRu
KGh6EYoZNilp1RkZXAZGBDKdwQeoNcVTf/nHJn/5Vx6aktp8Oo30elk7g2onJWh8OZbFD1DFXYq7
FXln/OTf/kndW/4zWn/UTHircf5d/mFrnmLRZ/O+q6beaJ5bmW6sYbGGVJru5jXjHNdCUsiFTvRC
RiqWD8pPzG0/Q7zyNomvWEPkS9aZRJPDK+p21tcsWltoqH0XVubAsxrucVTrWfyt1jTNT0XXfy/v
LWx1bR9NXRWtdSWR7W6soyCiytF+8VlYcuS7nbwxVhX5neRNT0H8ovPmva/fR6j5n8wy6dJqM8CG
OCNILyBIYIVb4uKKaVO52r0xVlOl/l9+YOtav5bufOOrafdaH5aeO902OxhljuLq4RAIpbsSEojI
d/3ZpirI/wAx/JWq+ZrrypLYSwRLoWuWmq3YnZ1LQW5JdY+CPVz2BoPfFUJrn5b3WsfmZL5gunhb
QLry5LoF1b8nFwWnmd3IXhw4enJSvOte2KsX8o/kv5k0LUNPtJbfyrdaPpsySR6u+lBtYlSN+QV3
NI1fsJAxbvucVZR5O/Le606088WOtPDPZebNV1C8RLdnJFpfDjwk5InF+JNeNR74qxfyj+S/mTQt
Q0+0lt/Kt1o+mzJJHq76UG1iVI35BXc0jV+wkDFu+5xV7PirsVQ17LexqDbQiX+appT6NsVeKa5+
Vvm7TtZvdW8lzQ2sWoSm4vNDvo5TZ+s325IXj5PHy/l6fRQBVBHRPzrHXT9FH/PW6/5oxVr9HfnK
vwnQ9Mcjq63UgU+4BSuKuGn/AJynpoGnH/o6f/mjFXP5G/N3zCPqOoC10HS5Rxu5bMyXF26H7Sxl
lVE5Dbl1Hvir2nyppMWi6NaaPaWa2enWMSxWyBiTRfGpJJO5JJ3OKpzirsVdiq2SKKVCkiK6HqrA
EfccVXYq7FXYqtkjjkQpIodD1VgCDTfocVXAU2HTFXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7F
XYq7FXYqoXt0bW3aYRtKVIHBepqaYqlv+In/AOWCb7v7MVd/iJ/+WCb7v7MVd/iJ/wDlgm+7+zFX
f4if/lgm+7+zFXf4if8A5YJvu/sxV3+In/5YJvu/sxV3+In/AOWCb7v7MVd/iJ/+WCb7v7MVd/iJ
/wDlgm+7+zFXf4if/lgm+7+zFXf4if8A5YJvu/sxV3+In/5YJvu/sxV3+In/AOWCb7v7MVd/iJ/+
WCb7v7MVd/iJ/wDlgm+7+zFXf4if/lgm+7+zFXf4if8A5YJvu/sxV3+In/5YJvu/sxVEWOsNdXAh
NrJECCebjbb6MVTHFXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7FXYq7
FXYqwP8APPUtR038r9XvdOuprK8ikshHc28jRSqHvoEbi6FWHJWKnfocVQX5l/mdqnl3zDYeXtJi
gW8ubSS/mvLu2vbyJY0cRpGsNgrSlnatWNFX3qMVY3pPnD8wfOfnFNJRv0BY6v5Ua4mtmaWO5s55
J5bVrqIcEczJMvwAuo4UaobbFWTeV/O/mh/P915T1qK2srS3WSPS/XS5F5fx26r/AKXFOeVvKGqS
6A8k713xViOvfmrq/lv8y/OOk28zXVzLc6Z+j7a79aW0trWLTTdXzxoHjUOyoeMasC7kdd8VWWn/
ADkRr8GnSaxqOkJdadPp8t7bR2ltfw/VZhxMMFzc3MYhmWQP/eQ7CnQ7Yq6X88/PkU9pYJp1jcXV
/e2Fta372mpWVkBeM8bwSfWwknqRtwPqLVStfhxVnflfz9rTP5u0/wAzW1t+k/KIjmupdM9QwTwT
27XEfppKWdZAqEMpPWmKsV1D83fP2k+W9N806nYaU2j+YYXbSbe1e4kureWS1kubb6xy4pKlI6S8
OPHFUZ5g/N3zDp2h+U72CCye513y5qOt3sbpKQk9npiXkSxgSgrG0rMGDEkqNiDviqe6X5s/MKb8
sbjzTcaTZ3OtXFsl7o+kWTSnlDLFGyLKX3aSrM3BO1FFW3xViFh+ZHnvV/NnkaC0vNMli1GXVINV
toRdWyF7OONpI54biN5opYY35IlfiY7njQ4qhbT88vPb6Bo+pXlhptv/AIiubi10yaOK+uQgsnlF
zPNbwepKwPFVSNDX7TFgNsVWz/8AOQfmgpDp0Gjxxa7Db3N3dCaz1J4rpIJvShW0hSP14/rPUPN8
KdGxVlP5c+cPOOv/AJh+ZYrxY4tBhtNKurexlZxPam9tjKiBTGtWbf1uR+FgAtd8VeoYq7FXYq7F
XYq7FXYq7FUt8x+XNG8yaNcaLrVv9a0264evBzki5elIsqfHEyOKOgOxxVjf/Kl/y2MXpvpUkhDc
0mkvL2SZDShEczzNKisPtKrAHviqbxeQvKMV5pN7DpyRXehxmDTJkeRWjiIIMZKsPUX4iaSchXfr
irVj5A8oWHmObzHa6ckes3BkaS6LyNRpjWVkjZjHG0n7RRQT3xVT1L8uvJup3Go3N7pwluNVmtbm
9l9WZWaaxXhbSIUdTE0a7Vj4171xVIfLflP8nX13WNN0SxgmvrONrXVbQfWJbaJLioeEJIWtlLU+
NI9x3AxVDeYPyH8nXtnY2el2qWVvFqVpe6gkrz3AmtrUvytl9SRvTVxIQONAPDFWZ+W/J/lvy1ZS
2Wi2S2sFw5luKs80krsKFpJZmkkc02+JjiqVab+U35dabqD6hZ6Fbx3DrKgDF5I0WcESiKF2aKMO
CQeCjbFULa/kp+WNrUwaIqMYLi15+vclvQu4mgmi5GUtwMbsFWtFrVaHFWR3PljQrny6PLk9oJNF
WCO1FozOQIogBGvPlzqvAUblXvWuKpTD+VvkKCxsbKHSESHTbo39m4km9ZLliC0pn5+q5fiOXJjy
AANRiqo35aeR38t23lt9KR9Gs5HntIGklLxSySPIzxzF/WVi0jbh+9OmKoe4/KX8vLiwtbGXR1MF
kXNuwmnWUeqayBplkErq5+0rsQe+KprB5O8tW+uxa9b2KQ6rFbCyW5jZ0rAoAVHRWCPxAopZSR2x
VOcVdirsVdirsVdirsVdiryz/nIURt5c8uLJBNdRP5j05ZLW1JWeZG9QNFEVZCHcHitGG/fFWBx+
VNdFzcXFv5f1hPyqbVElfymBNHfugtGR5Vt2kWb0PrXFzFXfrTFVT/CvmD1I55dB1dvyq/Sbyf4R
PqtfiE2gRZGtxIZTb/WuT+jWvfjiqW3+kXNrqfke08z6NqV5oc175jk0/wAvj1J7+LSmjt2t4JUR
zI/AjkY+RPHbelMVej+QvLP5jL5Qig0/VW8sWwv76Ww0/UrP6/cx6dLIDZwyc54zG0ahtiT9odKY
qwHSPyokuvPNrDfaRqUekXPmXzEL+QtepG1gsCtaF5C1BHO1V9Sv73oS22Kqej+T/wAzIfNK1tp7
LzPDeXbnXVsriSOeFxII45L03Rtvq3ErwjEQZKDbY1VTn8mvLXm6w842E+oWN3pk8FpPFr8j2dwi
XsrAcXuLyW6niuJFlHJHiTpXoNgq9/xV2KuxV2KuxV2KuxV2KvNfOf52aT5Q8+ReXtXs5Tpb2MN3
Pq0AaQWzyzSRfv4wP7uiL8Q336HFXolle2d9aQ3llOlzaXCiSCeJg6OrbhlYVBGKq2KuxV2KuxV2
KoTUdI0zUhbC/to7kWc8d3aiRQ3p3EJJjlWvRlrscVReKuxVCXOkaZc6hZ6jcW0ct/p4lFlcsoLx
CdQsvBu3NVAOKovFXYq7FXYq7FXYq7FXYq7FXlf/ADkXcebB5O0vTvK1zNb6rq+r29gn1eUQSSB4
Z5BGJSycOTxLvyHvtirLvy00zzTpfkbSbDzVdfXNdgjZbucv6rbyMY1aT9tkjKqW7kdT1xVi3m/8
6pNM8w3/AJb8u+X7nXdW04Ri8kMkdtaxPMnNA0j8ifhNTsPnirCdJ0nV7vU9U8w+aXhudb1oLHcW
8QJtoLaMcUt4w9ain2q9T95VRn5bahdeSPPVt5YSRpPKfmUynTrdiWFlfRqZGRCekcy12/m+klV7
vKXWN2jXm4BKJWlTTYVxV4r+SP5pfmL5l85azoPnCwFmYLY3lvGYGt3h4zLF6dG3dTyNGNfs9cVe
2Yq7FXYqxb8y7nzbb+VXbymsh1p7m0ii9FY2cRyXCJKf3sc6KBGWq7RsFHxU2xV5hJ+cf5uQXtlY
S+VZI57kGOJ7nTrpPrE0dpJOqQ8Jj8Vw0W9VH1cE8+VCcVTzUfP35yiymbTfLETXiux4zWt3wjKW
9zM9ttIvrsrW8SLcIRG7SBVFRiqI81/mX59sPMU+naFoH6Vjg0y1vp4Ibe4kmie69YFyzNbhhGYQ
FgZUkkqaFeJxVLdX/MH85zoMt1a+XTbXU6NHb2kVhdT3cUn6NhuOdWb0aC5nZAXXYxleEjGgVUG/
NP8AOqC1uZG8mPdlFT6s0NneIzOJHWT925BZP7tOR4NuZFjdAQqrJPLnnL8zbrzxb6Zq+gx2/l66
jvH+vLbXcbwtDczw28byEyxM0kVsJakIpEi0NeIdVI/Lv5nfmvrOh22qw6BC0EtpLdeutpd8ZRS0
C+jGZeZ9M3UzcakzrCfTpyBCqFbz/wDnfz1OVPLs80cMtpcWsCWckLNAr2YljjaYNUXSSTsUNZIK
EM3SiqJT8yvzols4rqLyn6YFu0klvNY3izPIn11wAolPp80sok4HkVaZd22DKo+9/MH817fy1Bqk
Hlg3t8b24trmxjtLqNhDEqypLGsj+qU4LLGHZF5vxooBHJVKrTzh+fVz5kj06TSksraWe3l+tyWM
8sEatpjSXFuSvANElzwAYzK/P4QWWoRV655dvr7UPL+mX+oWxsr+7tIJ7uzYMphmkjV5IiG+IFGJ
XffFWHfnMTb6b5a1Y0EGj+Y9Mu7pj0ETu1s5+j6xiqe/mH5zg8neUr3XZITdSw8Y7S0U0MtxMwSJ
K9gWbc+GKvFNI0TzZceZ5/N2v6lCdT1KJI7/AE61t1jgCotIl58uTNHSnNqmm1aYqynFLHPMmg+Y
bvWdI1rRtShs7vRHee0gngMkbzOONZGDjbjt9nxxQ9T/ACr/ADBuPN+lXialarY+YNHn+qataRkt
HzpySWImp9OQbrX369SqhbWk/wCfN/Km62Plq3gkP8rz30soG3iqA74q9AxV2KuxVD6jqNjpthca
hfzLb2VpG01xO5oqRoKsx+QxVg4/NwNZ/paPyprr+Xz8Q1YW8VDD/v8AFuZfrJjp8VfT+zvTFWba
dqum6lp1vqVjcx3FhdIstvcofgdGFQQcjKYiLJoJAJRKujfZYN32NcYzjLkbUghuoqRXcdcNhFOB
BFRuD0OINqgbbXdEupJ4rbULaeW23uUjmjdo96fGFJ47+OFUdirsVaV1dQyEMrbhgagjFW8Vdirs
VSbzn5ZtfNHlXVNAujxi1G3eESUrwfrHJT/IcBvoxV4D56/MweZfIFt5UayvLr8w9Hu4fr1tbwNJ
DHdafN6byyy1VeEqqxFK7n6cVTWTXNYksbBrPSX/AEjehvUt7pjFHb8BVzLKqy99lovxYpUF8x67
cQ20dlox+vyGcXUdzK0UEJtnCMPWWN+fqE/u6LuN+2KE0sNVNzpC6hJazQPwZpbQqWlV4yVZAoFW
PJTSnXFKWfk75+8vaJ5p8z3PmppvL+oeYriAWMd/C8MJgsomSM+sRwDtzNQTTpQmuKHov5RxTao2
v+eriNoz5qvA+nK9Qw02zX0LQlT9kuOUlP8AKBxV6HirsVdirCfzksri68g3npW7XsNrPaXl9ZIK
tNaWt1HNcRhf2qxI3w98VeXeTvOfmXXfN+r/AJi/XtP0TyRJLDbCTVJed3FZWRBkjtIgeCG6ZTzq
K1Pw1KjFXpP5UafdReQYibZrO3vb+5vtOsZF4tBZ3N600CFO37tuVPfMPXYzPHQ58UPsnE/Y2YjR
+B+5llxHexyOtts7LGYyFAj5cnMnLrtSn05qtTi1OOUo4PqIhw7VDi4pmfF5VR/rGxuS3wlAgGXn
7+lLFtLmZ3kUugkCxTerszR8QSdv2gaj6cqjos2WRmOKPGIwlxbEwoEnb+IHiiKobk9AyOWMRR6b
iu/9Sl/pi26WaKzkwfFECFYeivEqCenqHiAfmcOjOaBxYASBwxvvj4e0h/n+mvLiIPJcgieKXn87
/Vu+a0/K7zWnl/WbHS/Ll5HENKdY2u7e2gvorn61FIbaO6tipvkZVY8nQbDan2T0jhMx1zS/zmTT
r6+sLzWlgfW1giseSyXKaQkSyJIioebM0rcZCr8tvCuFVHTLD895fNOjW2qX+qxab6VgPrEUSBPR
IP1sXnGUosw3UtVm6MN8VTryhonn6z/Kny/oMGmalb3FrI761GLqK0uXgjnZTa2srSq8Rk5rIjAq
vFGHJSwqq35x8ufm7dWd6uh/pOK9ks4E0WVdVjRLVViC3UN2pdfXuZTy9OYBuJZTzTjUqpro/lH8
wtO8yWtydQ1K50+HVLcMl1fiaNrCTSz9bd42f4j9foFBFV/YAWpxV6niqRefdXu9G8ka/qtmP9Ls
dPubi3PhJHEzK30EVxV4r5A0u1sPKmnGE+pNeQpd3dyTyaaadRI7sx3bdtie2Ko3zRNrUOgXs2iI
smqRx87aN15hipBZQtRUla098UsA8h/mF5/1zXY9PvtKiW0SpvLkRTQmIAHqWZl5E0AFMCHqeFKX
6/odhrmk3GmX0YeCdSASKlG/ZdfBlO4xVnH5Eazeav8AlToNxeENcQRyWRkHRltJXgRge/wRjfxx
Qz7FXYq7FXYqxxvy38gNqv6Wby7px1Ln6huTbRFvUrXn9mnKu/LrirI8VdirsVaCqGLAAM3U9zTI
iABJA3KbbySHYq7FXYq7FXYq7FUDrLae9hNaX8ZmtbuN4ZoqVDo68XU/MNir54Sw82+RGfSv0Vd+
YvLULH9FX1iqy3ccJNRDPACCSlftDb9QVVB+YBXabyz5gt27LJpzgkeOxOKu/wCVgwf9WDXP+4fL
irj+YVsBV9C1tFG7M2ny0A7k4qo3Gu+afMsL6Z5W0S9tnuR6cms6jEbW3gRtjInL4pGp0AHvir3T
yFpWkaD5a0/y7pnM2+mwiMPIoUu1eTyNxqtXdix+eKsjxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV
2KuxV2KuIr1xVSaztH+1ChPiVGKqZ02wP+6E+6mKtfovT/8AfC/jirY0ywH+6E+7FV62VmpqsEYP
jxGKqwAAoBQeAxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2KuxV2
Kv8A/9k=</xmpGImg:image> + </rdf:li> + </rdf:Alt> + </xmp:Thumbnails> + </rdf:Description> + <rdf:Description rdf:about="" + xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/" + xmlns:stRef="http://ns.adobe.com/xap/1.0/sType/ResourceRef#" + xmlns:stEvt="http://ns.adobe.com/xap/1.0/sType/ResourceEvent#"> + <xmpMM:InstanceID>uuid:e8129840-49ae-734c-8da6-b2cd6fab19fa</xmpMM:InstanceID> + <xmpMM:DocumentID>xmp.did:01801174072068118083E224187294EC</xmpMM:DocumentID> + <xmpMM:OriginalDocumentID>uuid:5D20892493BFDB11914A8590D31508C8</xmpMM:OriginalDocumentID> + <xmpMM:RenditionClass>proof:pdf</xmpMM:RenditionClass> + <xmpMM:VersionID>1</xmpMM:VersionID> + <xmpMM:DerivedFrom rdf:parseType="Resource"> + <stRef:instanceID>uuid:de9f5bf9-3e10-c744-ba5e-c21ee332488e</stRef:instanceID> + <stRef:documentID>xmp.did:976b5e2f-fe80-48db-96c3-5df6497c4ee5</stRef:documentID> + <stRef:originalDocumentID>uuid:5D20892493BFDB11914A8590D31508C8</stRef:originalDocumentID> + <stRef:renditionClass>proof:pdf</stRef:renditionClass> + </xmpMM:DerivedFrom> + <xmpMM:History> + <rdf:Seq> + <rdf:li rdf:parseType="Resource"> + <stEvt:action>saved</stEvt:action> + <stEvt:instanceID>xmp.iid:976b5e2f-fe80-48db-96c3-5df6497c4ee5</stEvt:instanceID> + <stEvt:when>2015-02-26T19:01:55Z</stEvt:when> + <stEvt:softwareAgent>Adobe Illustrator CC 2014 (Macintosh)</stEvt:softwareAgent> + <stEvt:changed>/</stEvt:changed> + </rdf:li> + <rdf:li rdf:parseType="Resource"> + <stEvt:action>saved</stEvt:action> + <stEvt:instanceID>xmp.iid:01801174072068118083E224187294EC</stEvt:instanceID> + <stEvt:when>2015-04-21T16:14:09+01:00</stEvt:when> + <stEvt:softwareAgent>Adobe Illustrator CS6 (Macintosh)</stEvt:softwareAgent> + <stEvt:changed>/</stEvt:changed> + </rdf:li> + </rdf:Seq> + </xmpMM:History> + </rdf:Description> + <rdf:Description rdf:about="" + xmlns:illustrator="http://ns.adobe.com/illustrator/1.0/"> + <illustrator:StartupProfile>Print</illustrator:StartupProfile> + </rdf:Description> + <rdf:Description rdf:about="" + xmlns:xmpTPg="http://ns.adobe.com/xap/1.0/t/pg/" + xmlns:stDim="http://ns.adobe.com/xap/1.0/sType/Dimensions#" + xmlns:stFnt="http://ns.adobe.com/xap/1.0/sType/Font#" + xmlns:xmpG="http://ns.adobe.com/xap/1.0/g/"> + <xmpTPg:HasVisibleOverprint>False</xmpTPg:HasVisibleOverprint> + <xmpTPg:HasVisibleTransparency>True</xmpTPg:HasVisibleTransparency> + <xmpTPg:NPages>1</xmpTPg:NPages> + <xmpTPg:MaxPageSize rdf:parseType="Resource"> + <stDim:w>612.288086</stDim:w> + <stDim:h>858.897949</stDim:h> + <stDim:unit>Points</stDim:unit> + </xmpTPg:MaxPageSize> + <xmpTPg:Fonts> + <rdf:Bag> + <rdf:li rdf:parseType="Resource"> + <stFnt:fontName>MuseoSans-700</stFnt:fontName> + <stFnt:fontFamily>Museo Sans</stFnt:fontFamily> + <stFnt:fontFace>700</stFnt:fontFace> + <stFnt:fontType>Open Type</stFnt:fontType> + <stFnt:versionString>1.000</stFnt:versionString> + <stFnt:composite>False</stFnt:composite> + <stFnt:fontFileName>MuseoSans_700.otf</stFnt:fontFileName> + </rdf:li> + </rdf:Bag> + </xmpTPg:Fonts> + <xmpTPg:PlateNames> + <rdf:Seq> + <rdf:li>Cyan</rdf:li> + <rdf:li>Magenta</rdf:li> + <rdf:li>Yellow</rdf:li> + <rdf:li>Black</rdf:li> + </rdf:Seq> + </xmpTPg:PlateNames> + <xmpTPg:SwatchGroups> + <rdf:Seq> + <rdf:li rdf:parseType="Resource"> + <xmpG:groupName>Default Swatch Group</xmpG:groupName> + <xmpG:groupType>0</xmpG:groupType> + </rdf:li> + </rdf:Seq> + </xmpTPg:SwatchGroups> + </rdf:Description> + <rdf:Description rdf:about="" + xmlns:pdf="http://ns.adobe.com/pdf/1.3/"> + <pdf:Producer>Adobe PDF library 10.01</pdf:Producer> + <pdf:Trapped>False</pdf:Trapped> + </rdf:Description> + <rdf:Description rdf:about="" + xmlns:pdfxid="http://www.npes.org/pdfx/ns/id/"> + <pdfxid:GTS_PDFXVersion>PDF/X-1:2001</pdfxid:GTS_PDFXVersion> + </rdf:Description> + <rdf:Description rdf:about="" + xmlns:pdfx="http://ns.adobe.com/pdfx/1.3/"> + <pdfx:GTS_PDFXVersion>PDF/X-1:2001</pdfx:GTS_PDFXVersion> + <pdfx:GTS_PDFXConformance>PDF/X-1a:2001</pdfx:GTS_PDFXConformance> + </rdf:Description> + </rdf:RDF> +</x:xmpmeta> + + + + + + + + + + + + + + + + + + + + + +<?xpacket end="w"?>
endstream
endobj
3 0 obj
<</Count 1/Kids[7 0 R]/Type/Pages>>
endobj
7 0 obj
<</BleedBox[0.0 0.0 612.288 858.898]/Contents 8 0 R/MediaBox[0.0 0.0 612.288 858.898]/Parent 3 0 R/Resources<</ExtGState<</GS0 9 0 R>>/Font<</T1_0 5 0 R>>/ProcSet[/PDF/Text]>>/Thumb 10 0 R/TrimBox[0.0 0.0 612.288 858.898]/Type/Page>>
endobj
8 0 obj
<</Filter/FlateDecode/Length 9948>>stream
+HWɎ+LJs_ _4aF5e /d53ɗoA:{o?/~ c֖z[z|io<s]
TK_k[-O w__ۺ8ʝw8l87oqs)έr~:Ng_<,`~ S!)FmlFwg~䷞\ZSk[W?Oxa!M:`?ds><64$/B>g~k.F{\Xop(/^%Ҙ_F :QpHɅ<^%a#^kY"-N0ū7S 'v .e1=Lْ'oDDzT.rEk\+-"KWNm^]j?/Z[>̀W#>7g)/:m~-^89jg~K9rUqvt\zk~٣Qoj +1p^[A_ %7@<_qX Y~Z;O7^aCv(杇ӑޕ%,vna.˰J B:{H % +a@
5pjȇ"x_CR `/Y`8dPOr\aï *hn3芹f`}AZbrM
MQU5TqyT4wr ջ,SuP+tfU+4S +esDk͌h~@D2N2QI'ed(9@H XT}) d1mI`' :1*BS /95#3+x% tى攘*{ q|оʦr9Ld謍h6LQ7H)("
P5.əi 1m+i0h#pOy0<&0Pz蛥s%2X͎ jݬp:]wXWEc&bno%:ѝ11bQK6Q: R@%0@U;H8wa8DzesF Y +9֭Ix v0g\. 4z! J۵Hv+ލ̐ LL 7YɾMWAJcec*"up뀜EN5ChTd]Q_{tqɻɍd:1Hc cEekJDOaSڗ5~tt/pƾv00aMmYGϲUC.yP(B2L&qw@T 7:utA*&A:Mfdrޕć}J賸_]5xe/rEf$q#*`TvDϢ)^ +qUH\־y˶r" mY 0ěxb5Z5MSAAڲa0I`4Tnʃ5!Zg;mg8)_;OckjhCՏhddBZu\aV'J#as)гQS&A9e14܉'&DFkct +N=©SH1>NF9/(hM+ Y3M!"yx 1$?l̈*(R5bUf3qxS o +,OۚɷyW/ڿvb]c]źƫwM/c{di^:.VؗԼw sMZh]ŻW{-'{ O:k?{x5d^{<z5K浞kqH9ȴtï[KtOx!mbLj۫+js懌 L9}
$p'r:rWICS"$4S/bD7-pinKhik ŶCءoShRU!a$U>PP6m_+a]]n{[LixCٵˎ
+ku&2
\"BމB)6"k#^ 1oStA۠i1K}[֜a<%hSJd
K-{+54 *+Q C\Ul K Jp^AQ-˲'C϶ +=RdR-)LJL/[0 +ƛeDeUh{E&<݂L j )>T%M: y=PNM"qϾVtH!opNSY1,T=f@XGZ2caƵ;y@ ծB![vcAZ'!d;(X٩Gdkh2$W!Pݦ5"ʊ^ AdGg#6])
٢4lZjbVV8OA ZN6JqY3 PrV+Q &PT[ZZUCFTG];
zuۂP-+|WPUȉ}À Φ3 &ݥDVH{]29"v>"=C#X)N,}]ʐ0D '֛B4С@Z_L$o܃`>eӞ7 hMi ^hau9&U 7^Cr4Pw1m˂TKj
ޙ +OTj2I.UTL#VOe-搓n̘37Uh0tDUay'kP*za2$*Ո&4
8|Hx.Inj+naQTj0 2vuwر=5# Wjn+JI6_-/go KTX9R\iz};5Xg\K9iW& $CvqF4g"^tl Uh pK-^a==dh .L'QXIjfl{%ݲчbyκ,'aG2ǽzaeǘ}_i%ѤviU(X;#|a H"KP妇۲UvlcsPJh}@Hˑ궩r:QYQoW{jkę< +27E:Ee 'MLD\ƧpKS*0sOd|'ԙ )i=/4qK!Z̙}w:S9ktvWt|SB˶X H
Xx5 a=U+VL> +;]#q:+_&$Gy| NZТt{̓`K]
46U ȯQ"]"WwU],bfTu2ؤgLz[S 9q<Q$ +R 'J>Y1tƑdث?)ִVfs@ku 1dj_h^^:v~e S5Fk.GdGޘ`>.&x%z#|'u#J;DDp p]~ 7 7 x x`x X~c)9Oև yvR r +eR9٨- +N|صHy ,#|si̬0~)c K8m8r<(2=xVrN9q o/ov?zU5F +i0)-
7I<7pYAP,@ tij 4(a5GuBd7DCDgˉf>+ua9ˊj {tF ^G +23khp +-C fo^(z +f/:K +;S(ac _ ~ж?]F<Ai[6np]4Ti *5mZ$?g$EɎv; <"yT.'uӉk0la,"FjdirV_"Pr0M)D Di(p,JXyyG
/<y!@ +<\ =P
β&f.\,s^1Z&OYZ4~R Iٜū]DoBʐ0-<Gu>! Yv^5s'OmI^/ ئJXQ(L*
iYUug'#O1 e/- (iI4"/R"q + q}cmK7rf]-'Scj('́Y3<mN$
KALOw|CZM +>UL6q ĝh -UK )@B#A1h#)+Kh¸rxKt6Ka +&I19q49P# pvpK dC + Y:А vUŦJ]Mvh[zAѝd-
bSD*il5 +iriz.ٓ|^[`T@9a) st䋫+-xqwkHd<xATpɣӥͫiȖ#2{&%/(m>N${ϘjX]e7Ȧ<(C |uK`{ *"=E%%A{9Bɘ4)*]?* PV* +I>QFHXuIe֚w'CV_pzj$
SEX,d(ecZ=f𱋫̜?- UZ} )K %,'*'ETvpC + dXxil/rePwSL9aUF-) gg +MF(mxn0-HەW (帾asBF{ =U33@ P WcC`
"J-ad7.%;5g){E0&/k@9Jkka3.R,8' +LͷЎV;7bntW$.{yU66M"9 +- [Nl<CIEE=JRQ㵱朷x6uOcn4MշmP#TM.N[vH +RJ `:/Q {㿁 + H2>ۊRo+*(lo1{!G'E +J +8;Z\79=!S#%+K_%PWm=X3/UejE1J`IKD=/?;O'1ZU6HZ,7^O*XRM`g5)[rZ_Fo?AN +faDMnY(%4QTrP0^]#ps,(A3ar5f,uG(nGt;?9l4JlCV*E4QZZMgXHrYG`InPNjj[q +g!UYn[eN2QND35h!J8A$/R4FJo!:g60=-r#\M=VEU,$n$`K`bRT2stt(5?:?%&O!8 +m6@j'(W7kf;Z0a_>o\,PT)e[P5`W/j,6V5)]HX1YqK/[+$b9ZqQHA%e%?i43/'Tk8 +JjD2\X?h7UETL8*2&9#_]rY"8MBc)fTQ1,klY0,+6\D7sGL[6^Slo9%2$6lPp%j?H +pgdWXmAF05dCcMEa7B\ja#Nk79r1J>0IWL%b)5,qeMUuqVQY@o.[dT/WAESI9qi1u +-YPu/;Q`N^m>X0*gL7/dXf]3/5dC_kHX,G%m#s9\X+%-Hh9imQn$jM?/m71S$_tAK +p>38*5[2mX!1)+ck+m'`4DeS0)Ga5i9E'iKE)W&f"\.$\W4\bm4K:<dkG"F\2)1s^ +@S7Jj7$eE3Vrl0h$DntNWggB!4L9N)krt1d(PZ`X3:>LXPhB*B2-0dTf5jW:Jje/n +bqL)rB29a&QgVK.rQ4kM7Z(M^%A]nK2od7PI@P$d2;'E7J`^3i&ln:T>$#i+\[9m6 +WaN(aR+dKYpqWEi9AU:O+cpD`^?U]lEBGCLSGD%s;#:4GVsU%TmsV?f^"Jf(cBf!O +_Xo_<M:BJ0V@;$]d*67gbAn6;aY,m30CO[Xh=;hXgUQgB-kDbA>ulAW^V!-#^!GmG +6tk#Z8ss7_=`mc=8pOI1^j<.1oQR6M#@+hY[:<%%R)YEZO]VD'_*lh%DB$@R.^E[L +SN2#PFj$%a;6)Hf^:Ij215j/7WchEEeN;b-kGAfJAha$c,PSFrEeWCd):1u)Serq' +dt]%(o"*kO`P:?*bE%>OfH2j9q-IO@)o@`Hp#du2EI0FDTfQ/s[ps3,C>\.Do7h!r +4`cn@C/Lh8[23)>&QF]/%']j[46L^ib0sj-dB;XkS&=!;ZEPUAmWo5AO=RrD5!miA +5.4cr1.<F;mGmna!2fHKMZ~>
endstream
endobj
11 0 obj
[/Indexed/DeviceRGB 255 12 0 R]
endobj
12 0 obj
<</Filter[/ASCII85Decode/FlateDecode]/Length 428>>stream
+8;X]O>EqN@%''O_@%e@?J;%+8(9e>X=MR6S?i^YgA3=].HDXF.R$lIL@"pJ+EP(%0 +b]6ajmNZn*!='OQZeQ^Y*,=]?C.B+\Ulg9dhD*"iC[;*=3`oP1[!S^)?1)IZ4dup` +E1r!/,*0[*9.aFIR2&b-C#s<Xl5FH@[<=!#6V)uDBXnIr.F>oRZ7Dl%MLY\.?d>Mn +6%Q2oYfNRF$$+ON<+]RUJmC0I<jlL.oXisZ;SYU[/7#<&37rclQKqeJe#,UF7Rgb1 +VNWFKf>nDZ4OTs0S!saG>GGKUlQ*Q?45:CI&4J'_2j<etJICj7e7nPMb=O6S7UOH< +PO7r\I.Hu&e0d&E<.')fERr/l+*W,)q^D*ai5<uuLX.7g/>$XKrcYp0n+Xl_nU*O( +l[$6Nn+Z_Nq0]s7hs]`XX1nZ8&94a\~>
endstream
endobj
5 0 obj
<</BaseFont/BRTLYT+MuseoSans-700/Encoding/WinAnsiEncoding/FirstChar 32/FontDescriptor 13 0 R/LastChar 121/Subtype/Type1/Type/Font/Widths[243 328 0 0 0 0 0 208 0 0 0 0 0 457 257 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 539 0 0 0 614 0 658 0 0 0 0 966 0 0 0 0 0 0 0 0 0 534 611 545 611 554 347 604 613 267 0 552 284 913 613 625 611 0 393 452 377 609 519 821 0 521]>>
endobj
13 0 obj
<</Ascent 902/CapHeight 700/CharSet(/space/exclam/quotesingle/hyphen/period/L/P/R/W/a/b/c/d/e/f/g/h/i/k/l/m/n/o/p/r/s/t/u/v/w/y)/Descent -210/Flags 32/FontBBox[-125 -210 1126 902]/FontFamily(Museo Sans 700)/FontFile3 14 0 R/FontName/BRTLYT+MuseoSans-700/FontStretch/Normal/FontWeight 600/ItalicAngle 0/StemV 128/Type/FontDescriptor/XHeight 510>>
endobj
14 0 obj
<</Filter/FlateDecode/Length 2177/Subtype/Type1C>>stream
+HlUkTWfG#6gg +$B(FQA%kpEDE!3# AyX1 A]D +h(!<]c5h<] OM~ǜWu) EӴ0,hIؘ
I1QMT
F@+#ʨ!":᪗/_p m:JCS}Cf'&Y lz/}iE) >a9f&߸8'ɔhY9>4fCRbL1(&)QDDQgO1T(CST,Em* +P#6; b.GM6Z{B{qd|jVÆb96^cd_o;\Syu:M@ ;3nMxAep0 mo<IA# :JM4@Cv;lޫp a:+l
}5w`zNj2t&g@@-2h'1<yUy"_,5 +dy+ #n arD|!WGVuﲥ3PL +p@"={MY'2NKU pgVgϑ o)?\uE+lvvӍ|bڳt[r Ԗ $?8ې +e&> + &mA'#]{L<)s#'zc|:N6|&`tE7'h'EFj' 69V= ~v 0<{k(!+K$zGǁH_5s>m¹ܕ-i@|>N8 P8|`ԭ>u?d誒5+_<A* +i.Z-)&CQdnSg6MZ4yV ˗ L5>*SCJp T\#O +wn?0r@ԙg m9+,҃az XD bޚMUF cK͊kβ OHK(@" +w,c%(N7tڀӤ FU +;I*
Ä1 ̧-7 0F6lpOI+m9,Vx*G7ݧ:LqT Sպ9MgFqY" DIΪKqh#_Or +,}P6G$Աµ0$
,`yFKjfI 8 3 | +
+ +
vj_UJA7+ { f!S"B#2$$%&
''()*+,-./012x3c4L566 7 789:;<=>?@AzBuCrDqEqFrGuHzIJKLMNOPQRSTUVWXZ [\!]-^4_;`BaHbOcVd]edfkgrhyijklmnopqrstuvwxy{ |}%~1<IXgy҈ -Pvڑ2Qoʚ :Uoҥ1Jb{ʰ =\}м 0EZoŅƚǰ "'+.134555431/-*'%! kN1dF( yaJ6% + + +
nP2w\3 u Q /
!"#r$T%6&&'()*+,{-k.\/O071 2 23456789:};r<e=V>H?<@0A%BCD +EEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abdef%g0h<iIjWkflvmnopqrtu v9wSxnyz{|~"Ceх @Qcv͐5RpҚ>dۣ/Zߪ
;iǯ0Nlɸ +,Os>lś Hq̙4WxԘշ 5I[lzy`F+qO, uO)lF!gD! + V
#
g;^0{N" q E !"#p$G% %&'()j*L+/,,-./012p3\4J586(7889:;<=>?@AB~CoDaETFGG<H1I'J KL
MMNOPQRSTUVWXYZ[\]^_`abde +fgh#i-j7kAlMmYneorpqrstuvwyz%{;|Q}h~ς +)Jkԋ Diܔ*Rz˚ Hsɡ El 4]ڱ0[=lŽ Kx¦ + ^ %
zA _'Hk4 T q!9" +*+,-i.D/ /0123f4A5 56789^:8;;<=>x?R@,AABCDqEMF)GGHIJ|K[L;M MNOPQRuS\TEU0VWWXYZ[\]^_`valbacXdNeEf<g3h)i jkllmnopqrstuvwxyxzq{k|e}a~^\[\^bhoyÌ4Oj×"BcƠ'Ffé ?]|۳ @eݼ 8jMČRɖ!gέ9~ Qט'pܺP:16Nu>d( +i|Gw|8a|ݕK}4}0{|y{:A{FT*{TL{h{R{ޢv,|,a||KG|4<|ʔ|/`{ z{{ߞ{Gr{!uT{Ҥ `_| \J|U3|g{zpۣzpƝzzh{{At{"_{Jp{쟗3| +z٧zfĬzCzPzűzؾ*sR{^{'I{E3n{pzɑc@}YL}3{}~TtW~~vdTaK +``IJx3(Ã7Ɓ{=1h6d"'҂ t@و_>Id2t/9f >?sUqY+(eő+]pLr3^2HՊx1ԀDpZ@{Ҡ*oc*ەq]@NHS/1Y$ljK89ԀcpӀ3\nGg 1
PzﲔB _D݃o͜[=F0;<~|f%kME쫻o rD[PFo 0w~ՖU} +zo֪g U + S{rkJզZ̋I 8iY%ea+wԚī^?a +8 4%7l8K- `E {/ʑGyiˍEY&H7ݢ%(e8yy z{i{p{F{kD|Zr}2IC}7E~#Aae e.{ סNҚ^z QOjWY:gH6"V .(+ߝJBaVy
i## XGݐg@69[ +" R KvTaׇ֙Ox hBX,GB5ȍۈP"yz\ ӊ,ܙew%>jwgaWCSFm5`Z"N܋
XyߟTƜLٙv5(fVDF 5ۏ_"29x
] $@˞iXsuCڜe˓MUCE4m"
7&ۢR; Ș? tbe(UJE#A"4\ !/)
ڇL]'4!RskZd-TH+D4!Õ +~آ!6ȗr.DclS +D 3h!i2Hˠw0iڻ>qߕ +bВV&Suج}Cz 3p+X! Rꉯkz |ztzG {Yr#{b|S[|}&C3}268~ +%pL%^?&?r +[bܬOJ 7cEVM͆p` an]RWKB 1h v +s +>0/;+}g5nu_WPZA q0 +d +Vߦ/ܚ|xLmӜ
_1P&@J0wk! }z WЇy{6jS{m(^O<@?'06 w k_ݗ<2jLz͞lRd]4O.?ӒJO/K kZ Y_U&h(y؞zdks#] Nqܟ?] /. V #Lj5yFǖKxP(j\rM䔕E>/hܜW Bu QPT3DžEdˡJxO.:j[rMq\>l+/3 2/j wm?z^్z zwn{RiB{[||Lt`}*=K}-G~1gltװсYvh*ZZK<Sk,`rM6 un%gYGKz"<~,ޓSǑ
pD u-ыgAYT7J< 5t,}.9ГJݎx֞jߐ&ق>t`N frXRJu ;,DԒ .5< +;!뚍د~NqKcơVS$H{:P/+zb; +{Ȳi^~1(pŮcUا/H +9+IU8 +9/RñS} o酪^b UC(G騭9e?+" +=6 +ىV{7{X{P{mE{`|vSJw}E]}7H~(+Pjřv$JӇi|zK:mS` Rץ<E)|6ց'~ΘXw툳=zlŭӆE_fRfrDʡE6/G'Ι҅֗ņ1Hz
y`茵l56}_ϊQDkr"6k'0ޖx;-ݶjIx]wk^B]Qy#D 6%F'$)!g7)ow+j/]&PoCU +5s'nW*B6núowcj\ě8]qQPCSܕ5'YQ4R0jf9Tv.if\P qBjB5n~'C͔qՏ\0&v iz\M\O$B5/
p',Q9= Lr{wuhhxˬ[æ=O*̥B@4'C =?촺t毃4g[TN͡JAW4˙^M'cZ +aU IrÚ=! 0KN"0qq(ynmi]a PU>?IG<բ038|"5|;"yh!lYf`TڧHϦݤ<30 ŝ)#ae^ڼxภl`ST_'HF<{ڤ0iN#({-~~r}f}Z}OGD~
C~7H+) Ѥ݁j~n +rI;fS炜ZKO^?Cm]7{+E ܣՄ'd+т~@( rf"Zv&NܶCG67^4+( >0N?~/m r7if+ZegN͵ҊC:Y;7R5*g ^W}̪qwen"Z/NPCF7>n*H 2HSՃU}qhʙfe{/Yڹ=NZWBђF7#I*Ɛ 3D.r݃},kq;e-,3YVN B'E7 * Xxi<|pķ]dྠZYHMmB}6S+f fOBT;|rp8dX0M@Bp#6+@ |r|`p;˯dNSXMpEBPg~6-+-6j uG ֎>|ɰosdKXONMEB66㦿l+=ŝ' +| ڄ|z]R|z}&{T5}{~}|}}xw~3}b~n~L~~u4~~~.U{{vɧ{݃.|V|̌|w}Hka}7Kz}3}2}y㎅z[džzыD{E0{%{| 5u|oN`n|͆pJ} 3,}K|ux=yrŢy듂yzPoMz{5ti{?_^|I|u52|q|I.x)0xy'yzFzs@{a^g{} H{2|OW{ +h[ysFyȢC0z +|Q -#|,o{"~ wg&ax$ +Ixأy zH~^{$k*9{Wj|B0}},ʃ~u~K?+71~pXza|ihV^B|,7&Zr ^p0>"؆t{1hуSUi@ARf+BKPL¢V"ʅynčЌ!pzr*g +T@B+>&-҈u.ߗ2$@y>f{S@*Yq=ԇY4ŭbƃxq-eĂRa?;K*ʍm +vЪ)SK2ւw dRK8? ϓ*]MZ]/I(]өȂ4v.d'4Q՚;>g*$ܔc~ʌЅVQDq˃NR8D|uEKce٣_Qv5>4)s~M˞( *
i;J
݁t}Rb7P$n=)R}ʑ2ͦ҂]n%m +Tʌ(Nwru cP=CR(A 4&\DoKPɅ Bsڈb +݄fO<'݅fʃ`~Ԑ͍H)؍@frÈCa@NS<x('ӆIݎ-[=#~>قΑqH`-N+̌;~'9: +Μ9<~zrUp:_I?aMyTH;ou&~v`aݧ NJk*hoњ +nfN}y^}œvv}.~t֕~belM~Un'D,n3s / +NJoq柉X$|67sɔ胸dTKD>'3Ӄ' Ƀ ?pǍ ؛!
rՔ= c SSC2Cn % 3DŽխ60aܘd qۓb̑=S9nC {2R x u_Μ\͚]ʕp=a +)RXB +%HܞV[R{u+)KgVBnYpK4Ř7<m8- +ek6rFtA䦟fIX˕ Jl-;ۚ,izˋc +,Tԡ\T%۱Ksr5e̗hX)ԥJ v;,p. +ɆKx1 +;cKuvfxw+rwdvxVٞyHRz9ϘM{* |}DI| |~} q<}acQ}V<~5H"~9n<)$À{G}קǃ pwcU+G邢9₾)D,6_4 | oiDbdU G+P8HD)63x=0z|n֍a]ToF8d)VAG%Gt]{B n _9`S֛}$F0?8,)&bWte1҅ z mr`bwSR
Eŗ͒7S(ې`iRÓu6b:yjAlO_RŚ[ERe'7dIU(̑arq ΉY@~ک$x٥$kSZ_šXR&LDЗ7(El dž &x +ak1^c~:Q D\(6(]e <O?轫7Ĺkwb<j߱%]ߝEYQ'Cn6fF(3C`{ dZvP wu`dwhx[ߨy]O
zIAŠS{:3ל|5%}E֘~Iʸ}N}Et}whE}[W7~ NC~}Af +LԠ?2o$?9a s}DZ4qlse -X"Lk-?pr2i@$~Ó2Mʉii }ppʬdsƝX3K?P20l,$i|d%|_^pc˧jWSKS>P1$Nݎ/M,{ oi{c6 W +': Ғ1)Xtjwi|Ȱ^T5=SV,H?> V3Bs(Ț 1V6IȋybtPyuz_v֯zwA{<xK{yr|#z^|{yH}|E1T}I|} }=w'Gx9"x3yvz8zxq{"\{G|*0|p|$^v4 vۈ1w>bxDdx^y4pYz8[zՄ
F{\/{ F{GSt$uv/w4`w&xo)yiZzQEz$/hz0 z[sӜJt0uN +v[w(wn xYyiE&y.zM +x)Y x;Dyy.y%y},r 8sѸBtdHu+gv|vۜxl*wXgxjDy.TyCDxMܽr+sstWBu~zvjkSw:lWwpCx.xД ^x`qwrԾ(stc9u7 }rv j~vդ6W&wC3x G-xaLuw%(qBrnjgsjat Rt|uiv5Vw,Bw-xw@ qDrq(ts9Zsâ=t%{u~i/v8YV9vު9Bwf-wvstиuugvՓ`w [ylpzXzC{-|}
ڷ~/}cȴ~'}~$}~+}k~=~1~~S~kd~}~W~%C ~i,~~|ƻ|҆<|S}
}7y}W}dj;}V}RB>~,e~/~ d{<{{9|َ||Q||i'|݈U}+{A}i+}~}Pz˙={FV{6 <{S{z{.h |6qT|@|̊A+|݉|gzzU˯z՝zzcy{Qg {sT
|(@X|F+:|I{Ոy0<y˨iuzz0&z|xzҚfF{4xS`{?{ё*{Ȑ{5{Ѕy,y^!+yOyyz
qwzc}exzŜR{" ?n{_*{Pcz?x
y y3yd qylvzdz_YR)z ? +zX*zMz9 xȠlxxmyyeuyWd +*,tFu_vpw_a xM>\y:Uz%^{
T}
zLzd{h{ŀK|Do|^KI}WL]}9~Q%:~
ƋL0܊ ܟljk2~ nyE]RK߁9F$ہ
*ҾJQ*]$(}؆Rmv \t׆kJބ980$6
Ԃtʼ{NÈkeφv*|lha[>J*8$e4ǫ@Zpw{q#kYdZI{#7r$/ꋬ;݇swIp7+o0My=zejoYMoH䂱 79 %$ +F}MД>yvXzɐz=zwQ{g|0W|FZ}R4O}!D~ 1X J:|HO vx|f VÉԁ#E+4sE! tʢM%ƍOurfb U*E` 4 T ̃ G{~ lt\VeNj3U3Dv3k& I +O{ڂSsAd HATfD$35 2 -(XU Ύj"@|rK!cGؕSSC2ۅai q^ coU +Q[ ŀ7q]bvsSACN2|L Iؐw ҈вf ,ǧTpleaTRRB2] a N%yܶ%~DYoB`ǦIQpBf12 o ׀ሮlܚ ![}Gnް`XoQ6OA"z1l띆 ǂ| Gp?QrCs4tpdrua}uw;Q⏠x`Ayy0z U{}訾xӚ˙Ayz }픘zo={A`}{Q|@3}10 } :,~ .T;<׀|n6À_PO @j/% "] Uׁ˙C^Ê-{vmK^Ǐ-Ov?߄/nxn Y1ZzDslUa^]aNf?bJ/ڇ ;%2=yƒbk\]:N@`>ۊČf.ĉFh ) +,\=YbʝxxWWjs'\]M>fON.zŎ чE +l ȗ,NwX uw|i[?%M =q.)P q +1ƗD5΄ԨuvhՎZ㞤Li+=k-͇e w\ +ЃrPڗ+YtubhqZ>bKڊڠ<0-{g r +i
XϻO +(ۧ;}ͣqle}Y`ԣM2Ƞ@q*3,,%D\rφH G}$q :ZeX䙖dLȖE@2%A8
2b*q[zrosbtVԤvJdwX=x0, y!zڗ|YwvXx7zOxnvywb`z VKzJ-{=f4|[//}.!~ ^T8~ym2aȦ?Uɣ6{I=a*/řW!́;TrOSE[ xĭAm̈́a7UJcEIR"</!Ztrr&^Dx%pl``GT Hޞ-w<h/a؇!.q hwSqk"_爐T-Hf<
F/'0*!mro3I5vnk __0SUG
;.!vƍ ZljŃuꟼujlQ^ˣS/ )Gi;kA. !b1x>؋ǯ]uG_i?M^.ZRbG *I;Ҙh.}h!BQ0bPEYBtZi+m]xR)^FПf:s.C?!%8^k gbztٱh]3YQǟbFc:y'.!ܖYi3s{Wrp?sBe
t`Y|u]NZLvB@w6}x*@ z1 y{l
<1}8${ +uxoy<dyYazPN_{BW{6â|*.} M~
zbon&dF@YNMũvByo6T* & @
ܘ=
ynLn쵗 cްXbMy1B=6o* D> ӚR PgMyiniƊc]*,X;߉aMAI6:)p hgz<όۂx葿mݴ bʯeW9.L2A\58)ݛ? h<x]]mU6bLW@LAAHoj5ʞi)ț + ǍH}w w̷lϳ aЮ|Vͪ&Kߥ,@蔬5g)s< {)@bRwH lKaP VV+Kx!@mW5Z)` {}T],˃v3k̲]`᭯FUCK D@`;5($)xq !-v_tcOv jkZ(`cUJפå@&4̞)c #䊇o}s|e*pt+ZzitOnuEfv:ۮ x-/yh#z.{ '~ +oVye1OyZPz"O`zEe{B:ܭ|/Ȩ|$}l +W[n o%e +meߏDo dپZCOƴ;JEP$:תۄ /զ:$Aҟ8$ K0B oD0d Y#OPE :)/ʥ$Q +$ ^$nyRd+dYfO$Dέь:!/ċ$^{HI ^# nncǻ,Y9ÓNѱ D*:Pv/9$i|6] )Ebn cn X+NODJ5:$ؔ/l$t@sg; Z.ZڋmͿtc#
XN9D9Dy/xі$ ۚ k!mp1dbֺ%XU"M1C۫r9צƜ/jN$8 ϔɈ[ym֮rbǫHX YMȯƥCX9aN/_䜄$" FuoPvqw_rxsғxu*yYvmAzwYJzxD{Qz.{z{{Sܢsy>tz2uzv{'1wR{Qx |Mlx|X4y}PCzZ}-ez~ z~-qԃ s-t;£9u(iv1}w +v|rdsR9t?Buy*uԘXuˍHlLмzmʌnYp B[q0XurQ~csbQtYB? +||?J}}U)}J}Z}~$]x|Mxfyq6y zWw:zʀd{IR {ʀ>|7)X|p]|Yw0ǻpwɉŪ]xVљ +xӇyX.v yކwczoQKz#={s({_{ʁv#vϒ7wkwCxwtybyP}zKo=Xzň@(zZz{ JuV!v 0v* w>wؓsxubyOy<z2 (SzRzfOPtDuhv
vwBrw=a/xOy5<Yy(yĎUylj t4rNt߫uv +vqwe`gxN{x;y4'yAy@Ĥstp7Xu
͒u|vJOpv0_w<MxB;x/'xƔm
x͋zsutEtuCuKp v^w7Mfw٠;3xO'{x^%xpxs)ːsgt]bt܀uhowv8^qv㪶Lw:wH'Wx 7x%+m_o[qҁrvҁSsruh`vNx ;qyW&nzA
{V?vƴ1wހrxa"DyO yqbz_{iM|):|&
}Y
~ E}ȲKU2p0~^L"::$8b%;uEW~>~0֠~%-~ \~ o~ ?]~;L~aQ9~}%f~}$~}Kj}F}D}F~p}Rn}`\}K]}9}Շ% }džO}Äν|x#`||i|}8|l|\|PJ}$8}@C$} ^}{ۢ{ :{6:{t|)|l|4k[M|jJ
|8'|$||[T>{^{f5{o{yT{%{ k!{Z{Ix|*M7|B${|{Ήzyz{{ +z${$j?{@Y{yjH{7X{ʗ?$G{J{Vz`zz|zyEzī|i{zݧ#Y.{He{M7 +Mv}wvx4zy +j}yYxzH6{6-.|U">| ~U~*L~UK~y~xτ~iX FG|5i"4 ܁gz߆G2w/g1WRFӂ58?!ҁz" m݄$qsvzkefkVځxF)\4Á!o O2[o͗eO̓BuTϐ/ecVE̋4Qzv!l h%1T?:Ã}ItVDeޓUJDM3 !Au ~!BXk8sa̛dCh0T Dcؔ 3{!~鏩 ~)up2`q[ӥrleUcmSCg3!A ~i
}ˬF/-ˁ&4pqbSCR CR2~ +qbr\rcҊ%twSuC\$w@1bx r'y {۫ᏒtԎ%u{v|w{qƊPxcb2yWS 1z<BK{1{ T;| v~B;6|Ɯ>}}`hp}pY}aňM~AR:]~B~1 R 9f ̈́ +H@DB +Nۊ|n_醼FP~@$0cp4 +`~ Ɨh=@{ψ mr!^-DOX@Q/։ ߃*` +Vښ݈mzȇ8l2^0COEݐi?΄/Od * +Ԁ ɕiĈGQyɇ%k,]j>sNl?J/Lґ: `qDԔbuxȆȣ+jˠ \ڝM >8|.^7 jo '߇ي Wӱmw{izR[M]]>AۜR. ? FvˉĽs\j$w3;iV8[i?Lc=݂.>A `!l.iDn֔"oxВDqRjr\fthMcVu=w7-xJy"| tu@vMw)w)ix[{yLrz = &z,Ŋ{J|n&~{|E@|v&|h}`Z}K~=<Y~,|L(JφG ʃO7ɃL*um<gYˌ+KG҂{<%h,;tJ +#Q\Ӑ$tX{fXwkJ&;;+A8 +r횆@zZQ
sL䎡eŌ``X(6I;%b+Cg1kԅk[ؘQzrd_dޒWtl +qd+m5VÉHLj:@m+ +5 -z55u}@pcX V
YH+C9*=脑x ZS.±SѮ |čoÌ@dbUn@G9O+*[[/Ƅ ~k=|\|
ob v?TG4*8X * [ .ѠCl-]xm|oogq*bN rTtGFՑu7.w"(5x|y&G}*s0/t{unNvakwT2xF:y7Ez({3|= *z{zt{mP|U`'|Sx}SE&}7-p~\'ۍ ~RRڑ휩 Ě&y`li_IR8EZ6э'E1m``Ή`MxRCk^蒎R +D
6l'}ӏzwQO\j˔$^ QY C46fo'FމڈF Ä* vsʔvj]kv*PrC|X52'HzO>uZi8y\mP&~B%5Ag,&҉mf]Ekt4ha[ OBnr4Ί&Ij؎х; sԔgb[RHN?
Aaq4h&7╭R[_WޙGpڲs+vg + ZːN~Ai4O4%? mO6lB~mro}fspZrM7t$@eu2_w
#expy%}EsS}tZq֠u\evXYewfM8x?y2z#Y{7p|y2zP|zp㟚{Edܜ{X|=LwK|?}s1ؒ~#N~sMw $ {od
X +vqQ,w|Ex9Sy,T1z `9{{}l}rzr}zgdj{%\ {P|$E0|9}s,1:~* p+ʓ-7|ǀq ft[r P D 8F,
W ~;%}ʂ\{Ы p1eVZСPODKU8d &+ XqMxނ{ sp9eEZ1O +u/CؚS8u+Ո {lCzKodnGYNCuč7Ö+8E uы!y/nզvd YNbC
C#7r_+J b1Gю܇sIxթn#
c_X|MꘫB̖7e+- >qx%Mbm} bŢ"W5MB6g6Õ*Ȓ *rHgw[lZubI֨WcL0UA6,*il +̙+{S +t^yuSvHw>-xx2!y&.z_| 7~ir zhz^ +<YgʆJ]LSۅNI?+6 + ɟyA윈h kiIa"g=]9SF
&Ilz?_ +Buf\aRHTq?9X5x+! +``ĉ܁f3\@wR`HK>Z5x +!KVӘЍ ++B eq~[8R tH^ 6>ͧȚ5R*+p!$ +ɑK<ł0e9P[}Q-H.>R254$+a_!8F +feh`Nrj3.s%l5Vt#n#bu oJuqzvs[gzwtTaxv@vyww*yxfzyoѾotK*puH|r/v@sPw0thx"xuzyfPvyS_wz?xd{* x|fy|`m~o#~"p~8q~_Is~wt6~e<u`~Ruvw'>wfI)wNgxE|k݇%mêo +gpqlqńvPsjd:tRQuu>Dv}))vgẃ~j +OlJrmo^pƋQu!r$ c9svPt=u(v'w8i^kdmin<psqpbBrˍP +t ?= u(uwjvWc hӣ$j&lL%mښ̈́o[!rpѕalr4Oasy<tu(Ltu?ƪh, iTkm7nr p=c`q7Nr4<>sx(tOg +~pl~rr[~t$J
~u7w:##NxH yh|qī#|s |t;|uR{} vrkl}CwZ}xI4}y6~z"~H{k ~|Uzz){!{{Z{n{{z@{|RjG|#|Y|}}XHq|}6t}1~P"}Y~ }y{ayyу=z(ˈzy zQi;{-,X{G|5|`"[| 9}"MxS x y &]y.wyVh1zSWz̆G{F 5{~"#{ p|^f wQIwϒLxGRxvy+?g0yWz FhzE5z,!z {Sv(w Ԕwx +!9xv
@ytsu uv `r2vcGwkSw)Cx.;3BxG!x].
WyQh!jQhIlcJnGu +ypk*r%ׂsqقZts +uduvTx"Cay?2EzF K{ |߂y/yɐ8WzZvzr{oci| S|CDx}52g} `~! +D~* +_{,b%>qXӁ1bl0R0B218 C +Xrޛ{Q*K/m~
p5~ap~Ն`R ~B +~>1N~ ~ +~Ń~~y~dP}~Ko ~9`}~({Q>~3WAl~DG0~>d } +~ +}Xg0}Hmz}/ۉ}G{}mC} =^}O} @[}10'}" ;| 5|ɇ +Fr: K'=]/ms?seтXHXDϔ1J b3;hg,Ќ z~h +8F8(醋dcG ) +zzmt`NS.fF+B 7Іx(ǃh\/Ñ֍ˍHΌKyl`S!"E^7VՇ(_N_{QZHvxHl _Q ,RuD6E( vXq 5jwk5|^QΆ}Dn6}'ԃ玅E ā@+vR+jR(]ȇJQ$ C܅#6H'zc%n}_~ʫhSuÈiʢ]#P^C\5ߘs'*wj5uh}Y\j +P]Bn5?;&肔3큀3Ågș3iuŖkiYm\oP#qjBks'4't$5vSuw{<nptqhks6[tOJuAގvw.3 xi$ y#)z6}v,kbw!sQwgxxx[yNzbAVx{33`)|$&|Y +K^r@>NJ1#zki<7Py)瞟mߏb\4cVNJĊQ>Cx1+?#]ŌmWXXxGym +pkG_qp_ƙrT t*HW:u;-v.Znx. +yntz~~UIuuivhjW4w?^x
SnpxGƔ(y;S%z.%i{ |`}:-W|3t^|ic|^"}BRi}G+#~/:,~-|( %G_~!Zsbh|-]WւRFK:wY- B91H˂};yr
gqq\Q_؇\F +:-cb s\%]|LSqE;f̎([xPӓ<(E L9-#U ʋz>!&{bOpٙwf0=[U}P@ E9C,Ռȍ !sNzPzםoBe]ÚZg*O1dD8Ύ7,uI \ tybo,آZd]*YOśD8g, ޕ x(#HyxΚny}d + +PYpNmHCI8YU+ q k wyiglj +vnlA`pa!qyV2rK\t'@u51+v(xA y {t~uҨwu3kx v$`wVMwK{Ax@y4z({-n| iA~Z.tT{j|`:|U|J5}a@ v}4~y(pM] b3ztY
iԣ _ TJ^P +?*4Q-R(L]_%
ɈHsRxZi >^֟-xTiZIܙ?@߆Y4v'(!O$`y
:Ӆ &[!r~ˎho^BS盳Il+>C~3։'aj
jކuVq7g]US^ H_>3qE'ʑ rR
`傄qg
x\d RǚhHtӔ>,3T'|#.eO
C3TpT/fc\aRAH[ =[2ɒL'J9 +<
: ݂oWe̟[圐QՙUG7=h\<2'v
?E}lhobjWXl*Nl8mD+o9աq.sH"Μ{t +vpy +/1(i2_V JLE0Bc8~u-"ٔ' +{ jh +
<kсhcH^ۨU>K~Ab7--:K"ɕ
+.d!g뫮^Y}TO"KA]t7]-q"
^ g|g[]٧Z9TLěJlA 8S7g-> g"W Ŏ . fê&]cSTJ]@Ŝȝ57/R-"q蔻H D=F7a_iGW¸RjN56l?D9m;EQo1qz'@sE wtbxvјz +s1KuY'v xLϞyX | +5,~^ +pirl(s7n;sGt\pBa|ur0O-vt<wu&xv
ywxƹk^nm px2nq;p sQ+qxtrru`ctw+N<uMxS;GvUy[&Zvz +%u}:
w{}f}g i8k2 lYzn;op"^mqLs:t-%tw
ve{>Hg;i؉Ck\/m^no ]~pKr<9vsI%Jsuւtd6wfxhҐCjP}l{mn8W\oފK%q\8rN%rUWu'3cA.e#g蘟 iՖL|klm}[o.Jp8q$r1tb}d壉g lif{jklҗ[nIp^85qJ +$q@t2ua߯媧d@fx\hozjX)jl2ZjmSI|o'7pN$qDsfaDceWgziͧj)kYmkIn7p;$}psN/`Jc0EeyO:gnoyii[ik8Y^l@Hn7fo՜u$ep&+sAt1dK#uf2ui`vk}wAmm wo[xqJOys7z?uc#Azv ~|wqmì+rojjspMtrz|uskv{uGZwivIqxPw7)yx"yry { zoav/pwɚqxs +yCztyju zYv,{`Hw-|6x|"xS| z}lmQopqQqyr̀is Yu)Gv'36w4"RwM yB۵l 䦓m*\o,vptxKq.hr셓X/t#G@uDo5v("val 0x{$jᑨl4n*Άo|w pЌ7grWWs\Ft5#uk!u vwƄ<ifkCmD.vn/v p@fq]ZVrFs4tŋS!tV w+#i%-Yjeslbmu'oQoepUryEs@54gt*6!t=| vh$jBPkڥWWmEt8nepUDqnE +"{rsCutu9q vkb7w%ZRwB{x1yD< yR +e{ +zFѧpǗkqs}s ot\`suQ0vz0AWwL0w wĉ +yup Ҙq3jrA|s)n(tN_tPuّ@v0vwDU bw y FoKpXqc{rjmCsv^tVOuC@Xv 0!v @v Fx0o͖p Tq zr Sl}r^;sӟOYtF?uK/v1r !u> jxN@nWoQpHyq<kr9]sgDNtW~?u5 /uə u x˧ Yc^ReVhw|jncyl_SoP1Hq@Pr.dtubx]K~kޗm ok{pm ru^sOKut?W/v.Jxix{a}t:}EuG3}uvDz/}w*k}x]}yNz}y>~#z..~I{~T|!~}v{j|xV{|݆|}4x|A}uj|q}\|~ M|~m>2},~-}a~}}[%p~zzfgz w{'i{hw[{8L{=|R-|g|mq}Svx㌊[yzyvzDhz
Zz߈<L<{>q={-"{̆M{ |nwx y uy{gyZz/:Kz<z,{$6zψ A{wLw蚒xltxЖ^fy4YYKycJy<z^,}znz u{d`väw[#wޟsxCf%x]Xy Jaytw;yГH,'yy zvOvwirwΣeox5yWxoIx;/yU+yt x zu vt1wr!wn2dwզW|x4Isx:xu+y xc zAtac ehtC jUfylXnJfp: +r*dtDuexԆ k8<mY nspUetqWŃs~IQ@t:&vf* wςx{m Ws%tF~uWq˃,vPdgwPVނrxTH'yM9z;)܁{ށ{o}{ +D[;PCKE.x9Uu,ڄx| njo zycp,%eregZiOel&DnX7ɑpY*r1 fs u{Dy|io=ikd<mYӖ2o.N3pCCr7ft1*u@u }fw ڍ x}"xapn3qcʖs;Y tcNuB v7lx *Iy. *zK
+{ +~w[w\m2x#bؕxX2yMVzUB]{%6T{*| }t
r~q<v8~l2~~Va~Wm~L!Aώ~64b)3
hX҅9u:wkMia-7VLAP 5Ҍ)F (%
؈R+[$tMjs`~ԉV&(K0@n5}ꇟ)n^ _x
ewXsti _˒&}UMlK
l@sό~5$M). ctnrahv_ cT珳J@ +1H| +~Qhl`t} +ˋJ(kl-b$Ѓ4XN/ND:\ /_9$v!8 ǃ\́fjHa}X +vNG.D[䇋:^4/$f߆.Y ?Յ a +jΏg`ڛDWyύMʖyC6&:r/v$A.* f +9\ݔ.ޓ#܌iB
fhS_dU+LnȜB͒9qn.r9#ŏ` '2 +)eS}c\eRhHj&?0lB5Wnf*bph rC\s{w +osP>j _kbӝmSewnhJ} p#jl{qm[|roZItAq~7u\si#ut Ixufihkjmlo]{n&qkForZsqStKIru6sw"t_w ewmxd's@ftEhuNEjv\zFl[wXj'n#xNYoy4HGqmz 6Arz"?s{ vk{a|adj|vf|h}1y +j}~i l}Xn~ Gp4~D5q~i!q~U u~P`~Dbe,sg^wiyhkTWmnFo&59pz+!p tγ^}aR<ic f8vhkgjVlF;nG4o!oȅ4 &tP]Er<`&t!bԓe2ugyf0iKV4kEm4vn!{o ps}\FW_-a)dOtfGechUjE3lΏ4(n2!cnP r[wH^da csedh/TjKDl)03m!Om rZ7]h`{bs eJMcgTni4Dek3m !?m.
r;֭Z" ])J_Rbbg rodȩcugTi<sDk)3l!2lÓ~
4qp +_Sq bMTr)e/s"gvLt&jdfu+lV:v8oEFw<q63uxs! xtX B{uGlhnjjolIqntrBpfe]str#U:tsDxuuZ2vv 9ww zyx"jrql&rmt0o)uTspvkdEqw~TQs@xCty}2\uzR uz x{ʭ$h\zj:{4k{im{rho |lcEp|S|q}BCsX}1te} t} x~CQfgh(jxl"q@mĂtbIo\?RpBtrR1yse swI +wNe g>LiB ~k;p&lbaWngQpAqv1rE ~r +qvAcߔ<f h/U}io1kˎL`mQ:o7nAYp 0qˈ iq. +vbe-܊gE|i!unMjW_lȒAPn}C@pe0yq Uq J +u b$djf {hgXmtjD_ lPmѕb@to\06p{ Bpe + .uqaXcʪe觚zgˤDli^lk}Om=@nΗ/o 2oېS Yta cG:ef +zEgK"l#i,>]jbO!lğ?n[F/od $ok( |tqĨv`^暡vavwnd}wgo5xi`Uy$lmPyn@`zp/.{ r{ssT}av]ssgǘtPiu)k|bummvo_(wqOxVs>?y%t.yvPz w$|NyNq +pwr)qĉs:s +zt6tDlu#uu^vvNvw?wx.PxyxzO{[{o +xEpRyqz/yrzk{s{M]*t{N"u|k>qv|-w}Wmw}y0z~7mPfn[/pKxhqK2jdrr$\=sM`t=u +jY1p\Jq;rԑ,ds +}9v~ywoO%xp&y#rrysce]ztWzuIG{w%:,{xI*6{yJ {yU}| Quwlvx5~wzxqxyd^xzIVy9zHy{9zi|6)z|
z||~,tPj,u>}vpvcYwsUxGxǀ92yl,)y݀; yD{7 r-s|7tZokubXv{`U"w0G8w섂8x)Yy +~!|9" >Rԁv(v$k@4 _TnHu<SN/<0!K9sv!utjRD%_,ySH%E;.p@!!7M~҅~˃5~Ƒ8t JivwE^lR S*G~;h~.~ ~}V~I~9_}Gs7~h~͕]~Rz~tG~e:~I.<~"M }Ѝ U}g52}|~qrh~ag~@] ~ Q~F}:}ɔ+-} };Q|ڊ^}Y{~q}|ga}͢-\}Q}UFZ}~:[}_-}*= [|$N|i}}G^frzaSgd\ǍfQai EЋ~k9Bm+҉o Sq
st'y]{eqbgf/j[،lP mE o81q+s} WHu +tdȊuZvN6wĊWx7цy+ z _{w
ׄ|u~xzn{3c̈{Y%|<N: |C.9}L7\}*υ~? R~ӂ!vvUDmzqb⇦XZ܁MBO6ꄵ*5 7,/Ԃ<-RuDl%zbJWL<kB 6*Cow 텐QxyYtfkIaW W0:Lg~]A͊6*>* +@C5?>)A ]txyB~͂rҙk^sia8^cTfdJ1h?;kg3jLm&_oǎqw +s +x]w +Ɉz" +,vy[w(mz + Hj v|Fa]w>X瓕FPEAG_&>@?5 -+T qOe 膇
e`ÔʜqXk +XhPHt@ N 7 a.% ֍.+:>X RP:U H(?˕7O.ȑo%[3ύ^D<LHj>`S*7_&JapBc:%f1hu)j \m+;o: "Lr 㒐wP +n pr Uu*Zy +W|0q}(~4 ~s 3ڋx +8'ړX0E!(jk ,
pd: +{Bl{1pni| KnU|0 ~t|ɪZל`\č_Ubupeag{RiAk1m8 &m sR%XQ[Y،t^I~aoqc`fTSQRhA`j&0l< l' +-sVhkY8\{|_؍6n}b_eMPg}@iՈW0fk]K kV +rDUd4X [Ε{^ɓma_'db/Pf`@zi0)j& j +rN0TU*W Z|{]l`˘m^ycOf@ hPC/iF j q:SnEV2KZ#zH]+l `]bᛨO eu?g/iWq iM FqDbR$VJ;Yjy\k_~]pbOJNd일?g6m/h
i#B ppPkZ{ +YrxwzRbu]Sdv:fwyhwkbjx]lyMnz\>Fp%{ -q]{-qR{w |ա3`~ b~1 e~]xUg6~jJiJ~\kQ~M9m>=n4-fp3Dp)%<v?4^pIa?cow&e݄iAh[;j3(Ll3=.mS-o6o7uc3]N̐_ލbVv djh\f^Zzi5WKkFW<me,nWng +t@\"^aa>u-cgfIYhQK\jp<TlF,mZm @txכ[h]ȝ,`]tJb̘fe2mY(g8Ji;k ,hlގmm ~t .ZUǍ] _1sb`f"dXfڙJqi +";j,?lHtl sY;\pĀ_ XraecX0fLDJh;rjt , k͕l4 skqZ5r] sJ`vYt+ch\ufZ7viaKCvk;wnc*xpyq|[tnyboe^~pgtqjgs +lGYt%noJ\uIpz:v_rb*w8t w_t{>wkkmm'nenslopneq%qXrlsIsu:Stvb*=uwux"*zCzi.sMjt]l^ur3mvdolwW2pxHrHy9szc)t{t{Ooye|Ig)| h|{~ +FenP8 +l%u+`vQEU@waI~w<xn/y!yPy}|(рrk.vsbktUU_uBTwvHvՅ <tw/ix$_!xk4y{[qRztrUj2sW_*tVSu9HDv < +|1}IvfxlxTbqyVXyЉMcz7EBz6z*{1o {4?{ąa}upwƒkx axWyyLyyB&y⍁6z>p*dzy ]zm{ Q|twjweva w֗VxZ~LxxړAyPm6Xy*,yݏ ;yÍmz2|)svQj[vɞ`wGVwΛL"xX!Axٗ;6 y4m)y^X y9z)W{ڂu?YkA] a`6VcKe@Xh4k/'mpo] +q +ԅ,t +mJ o?e
qV3s'Ftu w +0zdbOZZ QJH`?т۔6`,jڒd!Ca +5&~`Z X^])O`Fhb=Le3xhj(ߑj Em osj +oSVZ-Nҡ=]"F_=b5?eu,]h/"$jOl oit ++@{")t|F3}
~HqA + + v?vz +yI̋| +Fp|:'a~ +~J< +́#ӈ] +hx-ijkkl^m1nQnpCpUrC5qs%ru?t uyByLZc1n%egpivg|qjTias"]k2tdPluBnv4p7w%dq5xryx^{`wc.wueuxi7gyf\i}zOkfzB_m={N4.n{%.o|Gq|l5w}#^~Oa]"tZcUh-eq[hO'j Al 3m%n?pv\!_UsRbXgGdpZf܄NhAUj3}l$mbao vKlj[xw~^arfaf{cwZLeĊMg@j3:k$lo*Ou˃LZP,}*]Dq``ebxYdҐBMg@i&Q3j$knvu^qYb|]\[ p_"e+aY5dM#fN@Ohk 2j2R$k:n
uX{['pS^hd`Xc^|Le@gӖ2i$jm:tsUf~tSY"ru\fu_Zv~cMmw?f ?xh1xk"&y|mzoc}~tG"o]}Mq%`qZrJc`e6sGeXtCh|Lbu;j?v4mG0woj!wq>y.rG|\wOle{nHgoojcpl Wr+mK}sSo>btuq0uvsH!v twuv?{\yimzBko5nmkpbnr Vp8svJqt=rv0+sw%!txvxz{{Ƅ>gucxivdm~kqwQam +x V nxJoy=Dqdzf/r{ +!{sJ{un{y}e|wg}HlZi}`k}U0m0~-IVn~p<p0~/xqh~!^r<tw]fxcRvfA'k\hc` j<Ttk`Hm <Ho /-p\!EqcsYxeeb}udj}g#P_Li}Sj戲H:l;n,7.oo!0p/r whaW tcҒif^hSKi@GkÍ;mZ.n! oA
rSMLwu~`_sbie;Q^ gBRi3Gyk +;Wlp.m!njqӉ=w}_sKb&hd]fMRhG3jr;#l.omb !n +o +ۀr +u Zu+ x+vGzǂ7m&Uc)Y Y؆\O߅_Eb; *e/hy#%jtlp( +
|}:Gcve"[|wRwIx @x71y ,yaa" +,{~a|hcMuZvPkRwv;IwV@dwߒ7xh,xː!x'x +D{;|cyUZY
Q\WHe_p>Պb56e*9h: _jSl8p +m+sZ + P3ksm +npv> +?fd7 h/j'YLl D=o:p +s爈x +v5F{ +6 Us.y7& s T ma0 +o>.p''rM fdsTumw9\(z}q +.}'~Z V$玠 Zq% +`e l/n' + &LQm ؆;bՂJ +[e +f~PZ7hlp] jc8_lUhbnGep8g0rG(8hss_jtzvew]P ldSn'|W2ooZIqIb8]UrT`Ht FLbuG7pe<ve'fwwS2iwvz#6Lu oPv({TwnWwaA[6xS^^y[Ea7z +moRpQpy tِ Yb\e?w _9gjaai]iclPJf@nBwhxp3jaq$kxsR>ntZxwǎIV-k4Yfmu\\ni8^p]\kaqOsdsFAfyt3uh|u$Tiv-mwHx:zZS&sVttyYuh \v[}_vwNb5xsA2dy63fy$&gzwKlhzw|ʋ.P{XT^|(sZW|g Z|Z]}3N`}w@cI}2eo}$ f~ks~8{v Ne~7R[}rbUPfBY+Y\HMs_Ig@Mb +{NYpR +X +#L [V?^R2T`ǒ$qb,9hPat& hDQ~iUrxk&Xfly\Yvm_Lo/cY? pf~0qia!rkumGW| rncY}e\pg_difbXMkeKlh_>[n[j0<omT!4poX%t#p{`ut ` a{]bWdmodfc}fiW?h|kEJj^mg=l;oi/mqC nr3rszx+\jy_6kn9amb`co\VIf!pJ h?rq=jIs/Hlu. lvE?qkvezCzYrx\sXm_KtaVauUgdvIRfhwu<yhxX.j^y( k>ympKzMy|ՂsW ywAZ]zhk]Xz`f_{sTbu{Hd|P< g |.h} i}koS}Cx~-Tav'Xloj[k_^ULS`0H.c;e׀.g hnx ÀS!u1Vuj)Z +^\8S`_GbO;cdb.cf g.mȃwN Qdt]UP|isXx^L[HR^$Gka: ;1c.We fψ{jm)KJw~MPlsT$rhW]Z=R]G'`P ; bَ.PdH f l`v}OyRsS0>hbV ]kYR:\F_:b).KdCK el= vW݁nyQuoUj\pX^q\VRr_Fsc9tf*,4uh ovUkV
yBm ~Cs+jAY+tLk\bhmh_v]bnbVQoe"Eq+g9+rmjv+sl Ft6n
7wpV}wv}farhcgpj[f\'kh[PmtjDnl8p]n+Mqp "r?r;
dv>s|x|Pc+hqWejfLgl[%inn_Ok-pDAlq7nus*ot{ psu
tvI|$zz`Wppbqe6eBs*Z2gDtLNi0ubCkvr7lwq*n*x[ ny
sz +{p|y]wn`xd3cNy^YUeyyN@gzC
i}{ 7 kI{*l|0 +mw|r}s$z~xa[2m^_cTaXcMfBh 6i*Yks lH!Sriz
wMZnl]0b`Wbo:M dB-fc6h *>jX 'kHq[yvdXl6[Ɍa^Wna-Lc*AeۉO6Zg܈*0ig >jtpU y uWYkZa_]<W +I|mJ +zp{ +ys + x^v>}{qgdogi|p]{k\qS"ls HnbtQ=ou~2qv&hr wNrx} Uw@z}3} pevfg_v\ikwR[k!xGlyE=tn8y27oz&Hp{\kqh{ vD}F||~ogc}eew}\[g}Qi}Ggk>~!=l~b1nD~&-oZp:i umq{{nia@dcӃ[f$Q hSFi<k1m &n:o; ti{[m_֊dbvBZ{dӉPf҈FhH<lj1l#+&mGni St z l^caNYcPJeuFOgb<7id1qkR&l~m |sR9z.lg]c `UYbϕZOdۓFf><
h1Xj%kێm5 s<dzDKn{{wQ:d|{U#Zo{XPI|\BE|S_;-|b/}#e# }hJ~pjm + wG +FvDž(|Zucdʕ3[rfݔRhIj@@nkf6mzX,n̎p"ob\qc +ivaR|eBQa[&U+RXI\)?S_u5Wb*be u'hMUj߂n +w}ax~l{x +Nf$Gi%ۄk{jmhr +O}lG}n?H}p 6~ q-~7s&$L~pt~u;wyP{1 +{|>|~} +$x.Dx}z+|q +k drp +nRs +jy0lv(j]np K+pS>1r p1t\+yI +} ~!=~ +Hg k +{2D0 +NqT +7 +w +! +UăTY"vHWh\riaZN_\K]bO_eA=bNh2dokW#e]m;ksnysM^0P*aRtSVch
Vfr['YhN\kC@p_mu2/aou# bq)iryv/HgXLiVsgOkEfS%m Z=VnMQYp?\r!1_Rs"`thu\IxxDo~1Hq2r)LryePEsYaTtLWu?BZv1L]8w"^xj(gyxx{A~x|ExqIyNdMyXQzjLUz>Y{Z1 [{"]| f|iDw~O>{CKpGd K WP KS>Ws0Z"\ievE"(<i zA ~o4EcnJ @W]NhK)R>WV\0XӃ"[tw?d!,uO:uz?LnDbHVM^JQK7>ST%1!Wψ/#DZsdGte8藞yw=͖n
BubpGdVK +]^q[L_f]b[=_e ObYgCdj7rfl\*-hnu jp4 qtq} w"{1TeVpXW{g\e^Z i\Z/\kTN_rm7C2bo 6dfp)fDrVh:s p.t|yyQ7m(oT.ndAW!p +Y:Z
qlM\rB_t6cbEu3)d3vLfw7
o x\{{xRN/tmQ|ucETvfXdWw:MMZxB]x6`|y)tbwz7 eEz
vn{z}w-K|+lO|lbjR|WU|LY}4A\+}v5^})e`~ -d ~Z
m=pz0vDISlLFaPWTLEWqwAZZ;5])m_ dc%"lyfuGJkjKa Nω_VRsKUA,YZ05\S)^ bUxkN y +tEjI`MRVEQVKT'A +X@5[W)]. a\k^`_xt[D^'jZH;N`?LUOKS&@WY5Z2)\ &a&(j xDwiLljPak TVlKXwKrm\*@n_3p6c(&qof1xrh wkU +vBn +Gtq +vst~.yq!WkfZmI\]nR=_p7Gb
q<dar1f~tJ%[hu}Fjv} +ruxI}q{pUseWs[ZtQ]ZuG_v<bvw1Ndx{%\fFyTiz ,qx{|}nRiz0e Uqz}[
XkzP[S{?F^ {<6`|1 c +|%]d}h]} p~e{nP#;dESQZjVqPeY~F6\p;_:1a%kcYg_) o:{],mPN1.cQzYTPWچnEZ;]{0`p$%bFCf #oO z߂
lL#c OYrS:OVtEY;\ʊ,0_tt%aie' dnхsFzw7lUKD +oF!KnCpq2rXVvu, +dUk[X +RZ˄I]qa@`6b,\d!fSk + +;r>|5cRS[ +UAXRXI +Z֎?]6W`,Yb!d͋k;i[ +jq m{灤eulMd\uQ Rxv_THvX~?wd\4x_)xb ye{h(~"l +o `FpIc^=q}e3Wrhj(sj ntlwn2{"r +.w{ +L9`Cb:e&1gG(i j$o6u~6\Z{T@]K_GyCPa:c҇w1f$(h iʇ oMu .F}ڀ\/Y\S[K^C `N:cb1e!X(g+ ian*{t{r}\|2M}S|IQ#J|WTB|ZXm8|[/X}_n$}b~|e}
hIڀm} +yr|v +h{=je{5il|o,m|#n}pL~p>t}xp +AMjK͂QCT;S+X92[)Ԃ:_, bZ-Re( +_hZQn +6kq +l! +LoPt +:{
@}}G +zځ|܁ +z!|W +_ be
=h/mm +!~ +%lxq +^oQt +rs w +~j A~7h~~|( ~z0~6Z% +
vj_UJA7+ { f!S"B#2$$%&
''()*+,-./012x3c4L566 7 789:;<=>?@AzBuCrDqEqFrGuHzIJKLMNOPQRSTUVWXZ [\!]-^4_;`BaHbOcVd]edfkgrhyijklmnopqrstuvwxy{ |}%~1<IXgy҈ -Pvڑ2Qoʚ :Uoҥ1Jb{ʰ =\}м 0EZoŅƚǰ "'+.134555431/-*'%! kN1dF( yaJ6% + + +
nP2w\3 u Q /
!"#r$T%6&&'()*+,{-k.\/O071 2 23456789:};r<e=V>H?<@0A%BCD +EEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abdef%g0h<iIjWkflvmnopqrtu v9wSxnyz{|~"Ceх @Qcv͐5RpҚ>dۣ/Zߪ
;iǯ0Nlɸ +,Os>lś Hq̙4WxԘշ 5I[lzy`F+qO, uO)lF!gD! + V
#
g;^0{N" q E !"#p$G% %&'()j*L+/,,-./012p3\4J586(7889:;<=>?@AB~CoDaETFGG<H1I'J KL
MMNOPQRSTUVWXYZ[\]^_`abde +fgh#i-j7kAlMmYneorpqrstuvwyz%{;|Q}h~ς +)Jkԋ Diܔ*Rz˚ Hsɡ El 4]ڱ0[=lŽ Kx¦ + ^ %
zA _'Hk4 T q!9" +*+,-i.D/ /0123f4A5 56789^:8;;<=>x?R@,AABCDqEMF)GGHIJ|K[L;M MNOPQRuS\TEU0VWWXYZ[\]^_`valbacXdNeEf<g3h)i jkllmnopqrstuvwxyxzq{k|e}a~^\[\^bhoyÌ4Oj×"BcƠ'Ffé ?]|۳ @eݼ 8jMČRɖ!gέ9~ Qט'pܺP:16Nu>d( +;F~*-~[y4"7oc R6JfI~q~^~L~`o;*~Yp*5~1#v|8s|uӋ2||ۙ9}L}s~n`~M;(e܍ +k{6HF.
rz_)MRu:y#( !ͱ(B?$D;%'0(q][7^̈́LL^΅X: R(t'<%xuډ ڧ +ނ"pFӋz]KV'9j(YɄܒԠw7dJ݈9Tbd =oDW]$tK+9e0([^8UgĈue$$M^n\5\p9J9,Ȋ(t ٯF` B +~\Fmm{[ւޔJI*8n(KE-]ֳхͫ[ +֦q~wlփ4[FIד>8́ t(5T 4-ȸ9F }l NZ;I8Ґ?(<
1݈Ɩd2*^|ԃj5kZH IEBx8~(*l
Ǎ>v2|78JkpYꁿJI 8a`?(j{'{{wK{ۡt|'!|~}Dlw}[-~hI~7&儖Guhr` O}WZ0kӉڂZFjH׆7|&ҬlQ߈ۍVH|)jщIBYtvH;z7# &ڃ8<o{ *icXfGa6Ԅ&փENϚnW\ӭlk'yhHX^G4#6I&҅8!𢚫$Dljx<h'ݒW^Fȅ16fډ'Uf7 WJx ܚgpV҆/(FkՏr6>z' ˣ#}v:hiVj wAhf/VHߖ{F6&'6~Kc 5JHnԩv\Lme)UE95ۏC'IBa85Y)6֖KMΉwuae\CUBZEf5Ȃ'Y]IQP&}2 t d؆ T) E&ǘ5k'eы)qzwpzۨ1{>){|0v|f7\}mUI~E59~4ÈBa%/1M sĶәV|sÒ.ue<ӁvTߋpDr4z%@ŕ_Չѥ /ȇte(dYMxT*>D%2%4:C%N/ %ȕX!{*sҊcljrSĈC4 +A-`p)?S`:(Qb=BK53r2%ڂp疱Cn~/oI`Pو&A13MT%h♙{͖ٓT} +UnԦ_`ĠP`)Ae3+&Y˘֖'侠E?|챉m⌭ ^݊}OAhV3s&#J(z[zp{2Ԛ{~b|)o|_B}nPG~A~1ˊr#݀+Pƛ#P}I>>n'p@^⑶GOU@an1䁗#GKd֪ЈӜuus|FNmF䅯^%1O@+1id#цÃwݟ-ӎHeԌ{TYlsX]vN
?Ћos1@T#N7բ((RWRkzbqk\ɐ9N?{1"z%$ +ɅWŠzDחf +d +1V`ݏZH;8."Lߥ\Vɡ`~p6cuҕU}H~+;cԌ.#'"0c,ڋ!}ap@Nb֖|Uh&H"Ӓo;/x.4_#RWŘm})kopb#.TےԙG1:#.v܌#v\F
ޱ +8ow&j.]PdDb،>82Ί",A !·,7yUˬˠ4vmʙi]?P~D r8d,Jxz" ^YO%çguzhMO\,P Cԓ@7,N":t2 iN맸t5hG[ћOC7,L"dLDZI+t9g [hO7pC<f47U,Ic "CΛ ".msͭg#<ZEN/C%T7,G#"7{>6h{~l{qì|1eY)|Y2_}WM +~A~5MC)ǀg :f\Êwm}G+q1>dާoXʢLH@ǙC5))Ɛ ދwIaҵ͇x}/pdgȅLXd LbX|@05 )ˏy ܃pں܉(,`|p%c3W{L·@S!4u)ώ 4LS;48{[GodlcmWJKD@T4֒)Z r5^Դ'{Dtnb%W!hKh?4Ò_)ć E:˞z}nj}boVAK H?4狈*D!˓M "z&m٩ aOVZJҚۓ~?1X4z<*&Ҋ<!<
pխхDyiޥm6šabU #J~rc?Tɒ4*4mP!k鸝Csxѭl|7`䣜UǝvJ3 ?'q4x*?B!ZqMhߴxUsl1@t`~YqU,Iϛ?)4xw*HՍ !Ќ0|Eɾ|xtָ|i%|]}pR_8~G8~<Gub1 'bÀ qm$nHtThX]7wRsF< 1U+'v[ ҌIн s/hL \/yQ˦ąFġj;g1 'Y rqsHsg\Q*FӇ;ڛ{1'Å 4f\ Ғs)g[\HsQIFa7;&1{'"k z,hV~}Hr[g ǓR[[=P>F*M;Ec1߉' ъ ~ ؝,r7MfGx[הPf]E;w1X( + }vWqĴufKқ[0\{PptE͞w;sD1(,x Y53Yh} qFeӮbZ̨ P$nE
;`Α1l(I |άpس.ejZsOEss;Pjh1 m(b U >|+^p~neqZ,1O(EQa;C1(ui9 ڈsZ~v0}jr}` +}U~BKg~ATdi76. %B dfu +jl_&U`K5A0.7ueg.&*%; ɂ9˂u;jx#_TQU:&K=Aτ7i.,q_%[7 )̏#uEmjg؋_U-t|K +BA%7d.1͆ +%w* Ere u`È|j1 {_r厱U"J@pO7bS.C %V Ņ$Wu ܗQiݼs_%2TǰJéЎ@飹7c._m6%4p ڀ2͟ tN i^ⵗ^TgJ/w@֣$7d.xՊ&i AwPGtsˠiMVD^T]җJ}9@Ȣk7kv.J&GN ֩Mt2MSiѡq^YuT&?MJ]@7zp.ˍ>&t# qok)shź_i^2SKJA@~7{ .Օ_c&A @sh
]곗USѭ\J+#@ 7 f. Y&o |zo|z̑}3{i\}| )}|~
}/{~K}gn~~*S,~~>~*(~{,x{o{ta|k`|ǂg}zX}lJfB}ł R:~>L~dp*~5yOAzrYzC{b{͈ڌ|4y|e/}Qa}x=}܃*\~;;yTyg}z zs z{f=w{xd4|gP|=4}a*&}׃lxE؋xΞAyJ"y!z5j>zv{M*cQ{܍O|i<|\*}rhwTx(3xy(NRyƉz@HuzՔb{nyOl|<|*(}VwՅwx'ex|,y< yНtzm}a{
<N{<H|;*8|vʾ$w@w)-xJxިyrLt'z*aFzN{N<{*E|t7v/wCwyMxx$y'sby`zVN9z;{*P|76^vѾѬvʏ'wEqwϼux^Oxꮫryw`EzMz;{]*Y|mvAGvdAwˆwû<x/x!r2y>+_yȤ!Mz_;{'*`{ދ眃txyvz+9zқ{ˁ|?ur|bAI}O ~?;ހ~)lẃ< +D# ;큊ZtLsa1dN/xN;SY (5eڋȀ!Fvh$l醹s!`8"MnN:փh(Ăk
t{S'6?2r9Y_SILW::g`(`EmVw~ј=~~z~/p~^~ŌL,~݊2:~(~)6~˹~y@~HA~"ޔ~Y~ zp~5`]~XGK~u!9~(~ܮ~FF~K}Ч奎}f}_}o>}ϗ]%}K=~9~1(~/F}}}pa}MW}JՀq}Qn{}rB\}J}9m}ߍ(}}%ǯ}pHj})v:}L| }}m} \ +}E9J}i9C}(}}cƝ}=ڴ_|Q=|̸ϐf|²d~|m |֥b[|J?} 9 }P(}h }xղž}i|q|Ǐ|~~ | l|[9|J|ݚu9}(}<Gڍw6xG9x=KyCuzxU{Zo*|2\B}Jʃ}8~'JDW%p{BU^|n![J8Pg':Àֲ@˳ ҡZU3~ƃlq[ VIho7 +~:%B˶`)],YNjSuwxy$gVƀEE5]}t%Id}ȇHRUȉwXtfM
U1Em5%҂ QR +d!ŐtSD>4r%uՍ `w"KŞG slnclcuSv`"CT4NE& 汯eR\Iѩ 6pĂO=rb }R +fChJ4(E&Oº. ' .-TWqɡbRiC4&.`/bܠZB+zpYalyQvBj3ށ^m&> 5pЯ5ĖD/Af̷ɆjpcU`BfQ?B2%3)&KSyJuv̡\gwPxʐPysr!Vzgb6y{LR>|0Bm} 2.~ #fO8~@B~TÓ~i~~~q +|A>_}A/ԉ[~R"l}$}ԕ~
~/xF~xiϒ~[ 'LrM=/["v8ۅ6؛͔b݄ZƖPwH߃hr<ZlK錽=kx/9K"3̞D'ĕvb8h+؇YȎKo9=V/v "܅qW~SYw .uvg_R
Y"J= tc/`A#{X!-40t;f^X,J}L<Ĉ/O#8[ ˣ4QܝY˔@Gsٗfe}W2J</AUP#b↕z'rKe7&WdڕDI<F>7//#{tt'HQ퓯r>Qd{؝#VʌI9?;c/C#$5R
y qVAcՎ^VCEeHՉ_;b/ +m` SsFS O9,F!Qu)ҡR~֕kz'/l&_-R둎+E'9J-,Q!{ {6yb5WlK%_m Rv(yE19 5A,M",<c diȝ-xᝇk͚A^ԓ× Q˓EFӐ8ՍH,0"Vχ-<= +賶À!̟tthr]RGbH<z2(v P =pn~VsĩhL=] R?EGb <2Wf(1 ~C-~9s(dg¤Ģ\VQߛG<U2u( hͲ~* r)fgR\H:QFW.<m
2h0(Ɋt & =wzxDo_xd1yYKzN{wD|v9}~/~%ʑ q2}z-}n"~c֮~;X~NmCޟ9̀/%Ł' ׁAynH&c|-X'N1 C9h/& _ay!ԉn w3c(h]XohM`Ce9Ri/ct&*m T漸x'mƍ*bXMCYg9;R/F&PƅJ քfy6x4m 7bI W\MgC%%9#$/ &} *2=wĶ#la㫚 WZM#B9/& 8nGwJlJI ay /W +dsAZp|EPGP!>+5n+,$ˆW $ ymÃ=nd8AZ-P}G*E=5 ҋ,"$ď1U fyAndEc"_YLPGG=65C,vy$= +Kx nc}YBPDF$]=ٟpu5 ,% 2 ވx|mռ*cr#dYl>Ow=Fɤ=ў5)I),%Bω F$x2mJc?ĤY<٠OFJ=ʞH52쑂-1%_c . +òz|wkzwٝ#{bx؉{yvx|[zc|{O}i|<C}}x)7~^~Zw+x[&y yzz6>nz}u6{ja| N|;}<) }v(ҿw w͇xw8y'yڄt zY`{GM{;4|S(}Qt咈uؐvӫ"wp(hx8yNryЈ` zMM{]:| (|t tSBuؖv9wvxTqy-_6zaLz։':i{(|rt sdydtTu6 vFv8awƕ4px7^wy7L-zg-:'{?2(| ޝrήsctnuyQv^pfwIpx6]y Kz9zM({)4rdtʝsU\t:Su gwupvoRwϛY]<xKXy9zQ({jNr/Es
sIgtVutvnws\x]vKyI9zBD({+Oکr=rļs=QtyƑZuYvv@mw%\8x + Jx9qy)z+٥qԜ r`s ptDؐu!~vgmQv[wơwJx9UyȒ)zΊssˢu +Tu9!^vGwo{ۃIxjryXzG3|6X}%Ձu~D%{/n|<r|nC|ԋu}?z]}iX
~1X ~Fꁇ5;g%ڀ݄ݼw@YȂךCYybhZLW? DFU5%߀lIOύׂB@EƊeňxṘguVEр^5d3%|K+u; +6"@k}w=-f UhEWއ5(%H鷝<~X%f1v+eZU-Dmt4K&Sm٧z5j{Tou>=d(~T OD 4~&+~ + ܤoBSt_~כd7~ŗT~D3~4~&A~VʀGóӣL[~(Z~ps~zc~gS~b$C~UG4~Ay&S~
µ(ˢ +Un~~bCr~+b~ S ~mC~4_} +&a}щIıUó~Խ~i-~$r8}ꪄbv}դR}ѝkCZ}ɖ4E}Őb&m}vq=sOЊtuvtx,d7y[SʅzC{3m|$6~9zTzۋ {{{,|msZ}c7}S~B ~3.L $Tm /ʡÂu ρrFbRRPQBn2āG$o(td'UvJՆ oqR3asQ +Pⅷ~coW 5_mPyAN2q[\$ŀJ&^A=ЌÅD}un|_5O]@2P2$3XN"zݤ|/mP^Ot8@P2-$8'w̅ {lڂe]߂JNz@Q2H%qbԅKE[zۃpDl'#]KNZ@>1 % 1ܵEĞ* N jz33ki\ԁN% `?ʀt>1̏N%.~{ɕqb(rĚXt=1uD|2vmDw^by +Nz??i{0|"~Myz*ΐzӎF{)z{l/ |n] } N4}? ~L0lh~"ۃŴOȁrZDcyҋ߁k8b +\UMj>10J݁ +#v!ڑ *هuxڋ Ij`[XLM>h0,b#-`mq.+ӍmLwӊi} EZ̈L[~>-;0#UV;ӎ
ovNJhZ2UKӆ =/h#}ٮG bKuu߉gш;)YK^=wO#/݂#פּl8KECt6gڗX;JE=,t/1#$欃oiYd6SO1t .fM)XR6Jk<ك/K#Ԁчr;XuGׁ< +sW[e6Wƅ뛽I<U/#耍rf wC2үr]NeWT%Iie<U/k͎D#ViqrDt !u;tlvf*BwW)yIzU;{-Έ.}!3>~>:y +f-z"[OoqˢlJdQz*mɎ)`Ȍ6SQFm9͆-i"~p(N~z١lԝ`ݚ3S
bF9(-R@"4fPچsܫyK$lJ_YREɕ29Gސ-<?" ؖ/Д"lx^jkQW_S:R*mEl9X-+O"ȁq r2lsy xu"lvn_"wQ yDozg7{+,S}B և~xyB vyx +zk {:^` |Q[]|DY}7~R+/5 !>]Ő߄ +w0&> eO|pe裟#[ +&A ^{Q{KBpNeTZO
AEB-n:N0k&ދ3 ԃ +zOoldV]YfOyDe: 0Ն& +$m *8},rh]/c^S냰J1Ny@WC6'-{$ q|Xr7L,gfP]fS&I@, + L֪CH];62}*` " sHiމ_DzUѯ'Lχ5C٤i;2?*_" ߃rh&}^ UzlLfCw:_\2 D*7#6J< >(ar<ەhH|
^ &U0ˏZL+uC8:2n *Ɠ #k> q<g䗒^G6T1KސC_~:ܝ02ފ*~#%) Lj qg^]JTKLC=:Ϝ"2V+ ++Iy1a8 zS'u{tJnÕp8qՠPrs}tu" + +{$u}A"
vjwʥoxGByFzuzd{T+|C}^3Ā ~$~2ɳY8"s cSo<3C`ZP3tS$]N~Gd~;F~2k~. ~3}r~;b~`ZR~B~,3M~|$}Z<}W}X }`f}r5q}b +@|E2b|%E|݈zz zz$zl{zmz^{=O,{@|2H|d +z~| ~m%S]VNf?0#IB[vA혠$^ȃzNl4]1 xN'?[b0́#n rt8T3ƊyԂKk@\j}M.r>ۅL0## P8̕ۂއK*x jQJY[M>b0 #8V ':ẃ3biϑ[ + 8S+) ԃ`1`{-wЍ=k +Ҝmɐ/vҍ-j"?]P߈wD4 +7ޅ+фJ!;K6Be uib\P]
C؆7 +Ƀ!d
8Ӡ!ٝu =Rh\VOۇYCw47n+;c!ߙ7=;t?gI}[4ORFC
o7(\+!J97F =ύXs|g7/[!j=Nۆ,B 6 +!MO4A rߋT.fZ(N{6BdCc6ː+~U!рLJ֗ޟRlݜrnpNsG!qfꔨsZ6u<N(vAx5TCz?)X#| ~t/u-~vDrZw>fxOZLynMzAA{51|)lg~ JaN{{}|-qp|eP} Y[r}M"5~ @~5>)~ Z ł h$|p9d큷XLy@X48)+ QYr{ۇo~cȑ9aXL*ׅ#@T|4҈)U ؑ<цQzExnҒ"c WtpKP?9I4 ) f9y͔
ne#bi+VVKBۋ?ĉ4%)t BaՏ_F}КxSmY&aďV`bJӋp?cZ4R< ) k z*xIlAaXGU'KJ[
:? 4ی) ["->wRkߑB<`}UNҙ
IQ>3ㆉ)~pA EOh +!vo kP +t {iJ{^|S}3Gܒ}<6~y1Ԍa+'I :ȉi~=
s h]uR'G|O'<y;1͋['g cֈǢ}џnr֜Y|g͙R\ӖbbR
uGs<>1!'r( Dž݇Ҏ|njr g\9ˉQ䈫F;U1'ل ׇ L`|1@q[5f-a[GQ e>Fd;njډ1'V >)暠{fјxpJeޗ[)ёPF -;kz1jY'T l sVzx9oܚ_e-NZh&P-vEƐ;:1<?"'~ 9yҝ%o,dxZ +8O0EGn:1ꌾ'+ iǟحy-٩`n̥dYƝOd#D' :k0!'g ̃(mpwu^o"lapbArNWsMxFuBwc8$y .qz$*| u~;&svͩ%u lPEv aw#WKxDMVywBz8g?{.}}-$O~w ۈ׀t +800.Aa%Gだ ~#tHSjO`SUޛbKՄAg!8.b%m: ͆~9bs륙i_uIUcK:A·7h+.L% ?}sҒsD $i R^"T6K=JAkI7Ǐo.u% + Q|\QruhԔ^u8sT~J8A)ь7l.~% 1C| q#gca]TAZJƑ@ޒa\7k.gV%ƈ$ Ʌ{iqYàgY]i[ Sܘ J+d +@7<.P3%̇ˈ ҄tXz̧)lpӣof柸] SPmI@e97T.>%ч 0wMn'mocqPY訉rPJ=tmFv%=vw4 ~y+0B{d"
} |~wtAm.OuWcavcYw_P@xFy=Zz4 |=+OM}"ߎ"~ v~zRl1zb{oYA{O¢K|F}>=<}4 ~+kt# RM IWu벼;l.-\bqX᥋uOuWFQ= 42+q#Q ubІ
kKbQXwO ~FL/<04+J# tk(a4XN'E˛_<̗4s+T #7X <BtGgja dWjNt@Ed< 3+#݊| ~wsٖIj*e` WGڐN# EQ_<s3^+Î?%# )s:Xiz`9CVߢNM̞,E `<R3ґ+ÍƉ${ 兼ri9q8_ѦVMDҙ0<(b3{+`$'LM cr8whҪ_}rV:t(MBZDD<7e3' +$6 ) rlԾ]o_c`[pZ&QqQ:@sAH4t@<"v7x]/z%'{ }%,lucF+uZ3vQ,*wH(x@<!y7{@/ؚ|(0} 5@lkzc{Y {_Q{H{!|@7 }E7~/~(^!/nd:l-]bܵ9Y*P:Hbg@- 70)5(4!pKljkbۅ=YPXH7'@$7<0Xb(m3! + kb;Y.1PkU Gfc?g7뛁0)h(ڑ!τ2 r6k7+aZmX鮃P-GϤ?џÉr7X06C(8"%08 ]j|aXܑOCG ?+ 7֚K0Ak )"S& j癜aWJX_8OZGo~?7Ǚ0G)4"y) +tp_dr`Tt yDu5wj`&y<giYWkB
lnt
pHdqCT9sDu`4w"&x܈w`gNii"ejdLllFn>vsuokcqISsZDTu4v菊&x0$xcixkרy=myo݇zIqw zsf^{quSU| wE|x4g}zh$~L|2v3s0vtVwuvjx2vxwuyxeTzWyT{&zDk{{4||$}}tU|du(|
u|v}6w}txu}dbyZ~QTzH~C{63| ?$}rۅC/s˄^t9nu҃{vuswcx|SaygCkz3{$|q!pr͡stoBuXrvBbw/Rx؆By3fz$|qopدq̔KrstqvHaw&}RxLByo3:z%{ٽosvq
r'珊s;QtUpuq6a vQwэ B3x3z % {8oO+plqqrsÚ|ot+`mv Qw^Ax)2y%7z;Qnװooq +o
p1qN|rxms^t Ov>IAwj2x莔%gz2l~i.b~k^'~mt~o`~qCp~s(`~tPvAI?x1zT#|;~|r +|sTw|t }u~}Avoi}px_}yHP:~z|@~t{1~|#?5}v{ z{A{!{{{|}i||~nV|d}^|}O}E~ @Z}~1T~.~#d~kyMy +S^xyzyZksz
\z=M{[?5| 0|^#}.v̜BwNؖ*wҗpxY
yxjyw|[z&9MIz>{0|2E#|ńұv9qYv\w6Gw3x'xW4ix5[Ry8Lzn3>{*"0{҉$|kduĬ(v7v4wCww:wڝixu
Zy3MLSz +{v{g|OY~|Kg}<ހR~4.@~" -X݀\p*U/tց gXJ<."N +@PzђCk7],9!~+LLi`uht\x,PzICV7g+9!~ރ +ob?tth).\O3vCN̔7ea/+~!~~h6ۑ~jluniBp\rO݉tBVv6Qx)z 넛|ƙ|oڍqucFrtt;hYru[wOCxeB|y6$<{8*| D~<Zw51x0*y
sԋygugz[8{XN|'B.|5}*i~ I)~㍃~~ rȊ:fokZz-N$ Aօ5J* Ԁ Ղ͕M"ĉ}ы 1qƉۄeLYjMXAvV 5O*!BY .WrЋ|hpԉ-dއ +Y ӈMɇAˆ5sŅ* C*댨ˇl*m{ЉʐpDd(pXrOLLy@R5DM?*= n 2 ̆nzFo5cuLW܅ِLڍ@b㋖5
Y* ҇0 Ջo>=yۜnabWCp-KsE?|S4̂|h)s [`䥉y']mMb 0VK'?%4&H)$ ʀLÉx~=maVTϛJӗw?aݓ'4b) ևݚhR6jy)lmxnaʑpV@}rJXt>lv2Ӊx'z 2} oqx4urlosaqu^UtvIߌxJ>%y2{E'$| o~^vVvww&NxekUy-`Fgz T{zIk{=|2!}'̆p~ `nj'}Y0X}v=~j̐T~T_~p~TZHY=$2x'Ҁv .8huYi{}^@SɃ
H=X|2قZ'7- 탓NJ.t,ki ̈^ S$/H )= Y2`H( +ħorF0<h^ĒU{Kt[ A!8.؆& lF 3ezƩhpܥk f7m\oS q IyWs ?/u-5w@,=ya##{}yodp0dpf_ra\ysRuNI Iv?V+xq5z ,W{#g}Py5uot*vew[뜝xR;tyHŖHz? 7{5/|,n(}#1~ UU$xR{n|Od|[O}.Qv}HbN~:>M~5\R,h#| )wm!dTсZQ@H}>5e,$˂ %vףmAXWcZ4 +{\|{S\|J}|B~~9~1sU)!*҇Dn<,2e-D\4&NSQsKJ\B@y9ΕB1) +"3n &/mLdCL[^RퟰfJR +m d5([]IRWJ TxAЗ91c)ą3"#p l2cZR>e=IA 9koG1wه)<"} 2nl"P`cDOZpQܝő*Iq#[AX~9@ꋾ1`W)닿&"Lj's Ąk{bΤÙ^Z-Q:I*A Y9x1K鋭)Ul"هŇG ;jrk1pbbKYȠyQ?ɘIH6@8 +pf(vWsUwu Dyw 4Qzkx$x{zǐko=1mpǦo:rFVpsr#uusvqe%uwTvyDQxz\3y{${(|cizxʵ(ky_mnyo +zp{4t}rE{d5s|iSu|Cw4}3x}$z~phgYiˁRkՁvVmLYo[-sqqcVr߀S7tCCvj3mx&U$y|fhcjlo nK+rdp&PbzrtRsᄒBu39w$yhdԓgL @iSkmy q`ohtaqVQsD>Bku/3w$x :cɮfd2hhj9lpn`p%QfrBt^2v$x`c,DeBgTj +~lon'`Gp1nPr:IAtB2vG%xHbBeMgV[Nior~knm_oPyqAs؎2u%2xaګ d}8fӭoh}>kXn:m _!o<PqZ.ALs|U2ux%GwˇarDSdfgh:|jml]^nߞOq7A s32ul%Xw;tqdįuKgdv iHvlNwnpxpayhrQ3z]tAu{Xw1|[x#
}r{ qns oƞCt qeu r+v tdowu` x/wPPoyNx@zoz'1{{i#+||Ǻow)q!wrjxč1sy}tz>nu{ +xڀ*1$z0
#\{l"n9\o4zq {r{lsۅ-]uINv?x30yH#{f=ke/m*nˎ<7p8zqqzks \tMv#X?Jw0y l#zճjwDlEhm; om y{pjrs\3tMuu>w,0xf#z- nik m7>nhxpIj.qړ[sxM +hCpsZ
r(Ksꗉ> +u@0mwm$2y$ҳzdKn{g{Ti@{ky~{n'j|Bpe[|rL}>t=}v/?~]x! +<qzł.{"V|=r$sOpot^>uEsv.ewWx Iy/h< z93.{3"|&Fq3rjȎHs怓t{ruu%e3vrPWNw{Ilx;y.z
"{ܨpq 2rЙsϖqtӔud{uۑVvcHx*;yN5.~z^"{ap +y*^{+ Z_|4st߃quugvh܂w\n8xOzB{&6G|=*g}F ~b{'s{$|"tR|gv|[&}|O }B~e6b~*njA 8 sSFeos>ǂ6gZFN&B16-e*mց3 "W֊P9~75r5fʆZ"8MqA|5j*eK U"Jq#}1tqOI eT%Yy_Mg~Af~5~!*_~Ԅ ~lK~ژ]~ߖ|;~Ԕpv~d~X~~L~|{A ~h5~|Y*S~j] ~ImE~Jc~Z{M~Vo~5c~ iXI~ Lp~ @~I5F~*B~ }MA}a}z}n}ϝ^cL} W}L}n@W}5}*1}3 } +N}X$}y}3n`}{mb}jWd}\K}^@}f_4}mI*$}|T }xcŇ7f{{i +ok^cmW刌pK|rV?t{t3v'yD ˃{ȑ(kHꋭmRzso6nvpbшmrW#ht`K sv?w3my({a '}DLr1sy?%uAm,vXa=w{VlRxJxy>Ʉ{3R|4(+}` xX~TyكOzx {Cl{a |UUE|J}>~~3:&~(?u> ߍ*wс;k +li+n_ {p[U =r7KIt A u6w-Cy#{ }{qYrrhKlt^f;uDTvJΎw@ΌyU6݊z-P|#$ } g'zwqXxgj/yZ]zSߏzJL{@z|6}t-\ ~S$IE; .yd~.p"=~pf!~\~SH:Iӌ@&6<&-[hy$m +dkIG[iSg fJYB4G:cԍ27v*y# -lG]Scϛ[?SJ<BԒ::xK2 *n# p I?liea gyXmiOl!Gon?tp7&sk.#u'<x_ ڌ_z:}-i :j`lX,nOpGS&r?Et|7Uv|/ +x'lz +Z|zUI~ahp`rXWsOGSuG v{?w6=y{/{ +'| st~ vxgLv_wW/mxN'yFzq>זs{m64|o/ +UGMњELV>D6焂/&Ʉ(!N[ey']/hUM̉E>m6N/!3(%:!r l &7e/ő?]){ U)?M+E_*=ӊ6`n/(,!g TʄPd!=\ݔT̛Lޘ}.E"fb=O6A>/.(/$!-? yqd' +\UXT&LDF= +6)ٍ.̋L(2ȉ !܆ */_jeWigOj!Gѧdlb@Z"n93qK2s+wva$fKx {; R}z_EkW@ m#OanGp@Fr91t2fv+*>x$ z t |W~^yq VrAO s~Gt@,v[9(^w2 =y+M"{5$| ƌ~G|^} vVFwRNۧix)GMoy @Vz%9/{62$ |T+i }y%$~
AW^ {VB"|7NI|GY}/?I}9+~]2*)+3%HHM Stu]ԬV!N`QFl?h8VF21Y|+g%{ BI]UϨ:FN.zF|?88ꘝ27+%׃^ ̉)A]N +Z ty-K{v?zN=w{e.y}|Y!{"}Yhzj{7rl{=ni|)up|gq}Y_s}JuK}<w~U.x~!z~gBQiZkSm tnOfpXrJ`ty<`vY;.x*"&ye5erhj0lsmfoWqӅIs˅<u.w"^yܩd&g4|i-k"rm EeEo!WWq(Ins2V;u8.w/"y +qcǜf ghS`jVr lcdnu]VpIr;t5.uvȆ"xʄU=c +*eg7_g=~i<qQk8cmڕ*VDoHr);ctP.ivn"xZ;br3dѨ|g~i Kpk8cVmWUoH\q ;7s.^v"#"xE7kadVĊfl}nhpjȢblUwo"H qd;s$.Vuz# xv_w0bwex\haryk +vwPUBxxGry9y9zj{ ,{|3 |}Ymoy,Wpyˊ*r'zg|sYzovt{b.u|1Tv|FxN}b9y},z~] |%~Тm[o`Opʁ={r#nrsbaTtSvF{w9\x퀵,zD!{ElzB]n"ozqmyrtY`sمSCuSFvׄ(9xS_,}y!J{ kQ#mnnTyp)lq_s %RtEv@R8wͅ,tyDl!zzjnl3hmޔxodkp쐶_)rwR0tE>ut8wTP,jxۆ1!zVi̠kpm3hwnkpP^q@QsuDu;8rv劻,_x!z + +i9Ejlw n:yjvoΛ^qcQIs'DtА8Fv,Ux1\!y˅ޛhNj{قl2vqmˣioc]pPrDZty68"v;,Mw!ym|_\}bm}5e\y}Vhk}j_ }mdQ~oDY~ar7E~u*2w z,zOg1zi愉{7l w{n j{p ^|]rP|t C}Pv7}w*~\y P~{қxoxq8 ytrvnysizuY].{vPK{xCf|Tyv6|z*}| ~D}YJv?wwx{wy>uWxyhy5z\ky{iOz|!C{m|6|6}*|~ }~touvt>wVgx[x߀OyBz$6g{,*|W) }"&0s\Et~Hus*v`wfw:ZxnN~yB)yN6+z삷*|{ʂ C|rFgs{V~7t7r;uf&vtZ/wcMxcAyiO5zf*x{Q u|/qkr(}>s˒jq`tːejuɎYvƍM{wҋ)AqxI5yj*qz慗 {Ѓ̓pŝ)r|Us*pt2@du8Yv=aM wQA xjH5y~*gz/ {p8e'qz{rosd(tXu˕Lv\@x5dy *]z9 {>omqzr9oYsKct\9X+unpL[v@w5Axԍ*Uy { +._@<bH}/e0q"sge"jYmJLo@#wrw4Vu(<Ew Ӂ>zf)g"ih{ހkomcoX!qKys?lu3ހew(Rmy .z{Rn҆5p`zFqnCsNcHtWZQv;K]`w?cuy&3z(f{ }}r}Vv\}wHyh}x)m}xb4}yV~zJ~P{?~|_3~}1(w} 8~Ȏ{}s|*~x?|t~Zl|~aX|~U}JU}lS>}3y~ (~d ~ -z{/{w{rPk{`{| U@|VLI|>Z} 3H}&(}Ӂ @~ jyv z
vz0jz:_{MKT{\IJ|a>|b3 |h(}Vx s}xyCu0y͐j.z=_zT{nH{=| +32|(| }Bw xtYy2ity^tz SzHu{S=h{2|(|| |zwp~IxAsxhy+]yVS,z&H z=%{.2{(u|5 |:w + =.{Z"zq{xhM |^3|TJ}K +R<m9IoyA^ q8ǎt0Kvb(>mx A{d?}Oj|lbnaZ,p'QuqI>,sAuf8w60Ey
(^oz ׇ[|n~zj raїsY|Pu6Q$voHw@y8bzO0;{({|!
~?i?xaMybXޔz4PzHW{@Y|83}W00~!(~!@^hna~1`j3~XU~P IG@8 :0$( !n!1ZgY_ٔ>Wޒ/O/rG*G?" 760T(o!{Ȃig#w7_OhWgb6O\iGaq?yI7É0 +(?! M*f^ȒVꐨNGƊ?iމ7E/0(\!ȃ Hf ^GV} +5NF͌4?5[7u/݆(E!ك- l[e~^]בw#V$>NZGF@? /7X$/ˆW(z!ކ} Lb`[@ctS+ f:K9hCmk;nz4(qJ,t %mv y?P|^bnfZehRȞQk"JߛnmUC&ro;lq4tV,v%y {dZ}aŢlVZn/R@oJzqBۗs;&ug4NwP,y?%͋{( =| ~a49rYuMspQqtJv Bwu;Gx33z<,{{%} z)~h\`wXxQN8yIzeB@{E;|-3ُ:},Ȍ~&~ ` _|Xi}P.~Ic~oB~:T3̎g,ԋǀ<&?/ $[__$XEPFTI JAғH:ѐPK3J,ߋH&^L T:Ăb^으;WPDnHڔ܆A?:93,vC&t F|iqC^8W3@O喡HAf:.3e5,މ܆7&`H ej^+ V͘ +OHPbA4A:ca3܉x,ىX&憔 }Gł/]Vs1OP`H ԐA ^ :G]3ulq,Ԉ& C9YfaOQcJflC`Qi<~xk5뛔n/Kq(ݔt"ѐ]wz
z*`|X[fQhJSCkC8mR<fo5"r/^kt)w# y g{c}XlwQ/&nJoC1q<Hsf5ޘuY/k'wa),yp#N{k }9`~XqP̥s +}0 ~WwPtVwI{xBy<z5x{/{|)k}#"~ ?WVa|P?0|sII|Bw}v;~
5~/L)#P WJWAP (I BV;ژ?15Ɓg/S)$ w-ZVʤ?O̡3$HB0̄;oI5/)ɍ<$Dc +ӄ)Vk_OLaH&B;f5H/)ٌe$c^ _V +O6}oH|\]Aܙ%P;L5J/P')${ۅ 4*_U˒N͑-HQA@;oU5{ z/ԉ)Y$q NIgfz[hJ^ҖjbkeExmh5j!ok[=qmLasp=us/ +wv !wz xPbde g[gXi=ilwknJimpsZ\p"rKrgt=.tv.vx!yIz_nHbto0dq>girvgitFhl?uYnw K q+x<sy.v{!x|T]Iw` wƑbxeyQuNh2zg,jzXms{Jvp|:<Yr|.ouB}i!w}L[.؞9^2Ő5a&Adt9ffGiXl`Io!<q.Wt!wOYq\_с b0s0eekhWmk4Itn[;q8.Qt +"1v݁ WݛZ[IO^Հ +:Ep8s*,^u!cxJ]Z? `h\bȒxedkh +_j +R m^)E1p@8rR,]u;h!wy\h
_:ea@wdkgUD^j Qlď#Do~8ur5,]tއ)!wy[А^уaRw djxfw^i{9QQlADo 8WqՌ ,\t!w>c[&|O]`ȥvxc5ifAU]iaQkזYDun?8>q ,\tT !w rD[s^isaytdlug_zvjR x mDy^p7_zs}*{v2 }Syo cp-f FqchxFrkkMsmV^suFoQ>vqDx t?7yv*{x <|z̜lRl:mmo?oovpq&j0rDr]st|PuYv&Cvw6xyk*wz2z t{|h it:ku<HmXv@uo
wHi4pxK\rbyPOt&zNCu{G6w|8*nyt} {'}Jh |>,i|k|tm}Wh@og}[q9~OOs"~eBu~6bv~*lx- z_fphqjnoslf)gXnX[1pLNrNQBFtW6-vW*ox<8 &zϖweg,~iErkYfmhZoz N9qAs5uń*rw `yScHf }hM.qjuel YnvMpAs +5uC*swS yQ:\c
͈eK|gqice2k/Yqn M_pWAVrD5tЈ*sv y9lbY.d| fpji$dk\&Y +(xN z<Whx~jslZin!m^:oߙ@SzqHesN=]u62v(xo~ +}y &~Sz j~|}wq|xFrrKxt9g{yuv\z/vQzwF{y4;|<zi0|{&}| ~?}.ux{vyq5wdzSfx-z[x{Q(y|QF?z|;a{_}0|0~ &|~ }ItYz~uE +pv0)ew?ZwXP{xҀqEy|; z0{&|X ?} sydt_o u dv%hZAwOx kEKy:zO0z&{ւA y|Ȃrxls nCt6duRYv\Ohw`iDxiB:yr0|zs&{d |CсqAkwrZmsytcctY!u-Ovό|Dw⊳:Ex0[y&{W {pvq lrܗbt Xu4NvX\DWwr:xw0=y&z {{ o࡞v=q lcr][bqsX]tǖNiuD!w9x00&yK&zl {sqZx/^im2ac^dXԃegNi jCm8p.?[s$E7v!y߂bYv܂melgbSj+WlMo(C sq8p[t.<Iv$qBx D{diuXkk;ma]7oW 3qlM1s[B7uE87Cw/.9Sy $hz r|~ ~pta~|rj~ys`~tVo~v5Lz~wB: x8Cz8.6y{$| ~,||w}sO|xri|yT_}@zU}~zK}{A~
|t7~d}/.)~}$~~ 7r{{W~!rJ{~h{~^|-!U +|aKZ|Aj}=7}.~ +6$~Zo L~zzqRz_gzR^){9Tp{J|gA| +7V}.}wQ%}ӂ ~&yy2poygg yى]zeSz
Jv{`,@{<7"|sF-|[%}] }xx:oxof`y>\ySyz@xJ z@|{_z6{-|x[%| }bx
wnw8ex|\ySyIzT@Cz팅6{Q-|+% |! }Hwavߝniwhe[wz\%xRyFIy@z<6{'q-{%$|X( #|߄xC[:o@^eÉa\"dRuhH+k">`n!4q +ot,"hFwDփzrw]b3n*ddԇg[E&jQklHQo#>q4̄jt++|v"GyH8{v
hlkc̆m#ZozoQqGńNs >/u 4Mw"+y+"e{, ++#Z q$hS_W"0NLEr<m33ly+~_#o<2 pGQg_N~V~M~㊹EY~܉<~A3~+n~#}~τ} +~qo~g8~oW^~UVD~MYM~UE ~`<R~k3~r/+_~uW#~s -~kn}_f}ݘ^f}іU}͔vM]}HD} <-~ 3~(+T~ #~* J~-o[fc^]aUBeLFh#CLkM:nX1jqb(·ft .w zn$be d](gNTiniK lvC&o :9q1XdtK(?v &yl&|<mhrd@j\ElSnK pBdr9Kt1E@w)9y@!+<{_ÃT}{knctpS[pMqR?syJ.uB< v9&xC109y)P{m!\m}~ktbv
Zw$R\x7JyOAׅzk9m"{w1Q|)+}!~\j>zb-{Z|*QԆ|I}]A}98D~1 )3!6LimPagYQ`Ɂ%I7?A@/X9 +a0߁i);2{!ցshH`߆m2XP酁H/ Av8߂ل80قD)<F! Khk`JtXyP$H} @Ȃڈ 8F0)6 " FRgw_Ą萎X /eP<~ HU猿@XV8̉0> )/" ( kf_RP^WOH!n@r58wi0މ))T"!ӆ Wje []˗_4Uٕrb\MɓtejEƑkh=dk5э~n-ċq&.u x/NV{Fdb%]+ldUHhguMCjEWl=oX5r +~-[~&Ӆ +CyL<KG4-&[8 ]
~2ށ`vosY;fQyKJ- C:܃< 4نCk- &Ă hd_XÌ +QQJAZ8B;܆4-kA&6| 6_{XSFQ+&IBˇw +c WLPđJ@CFU=L7"0Y*І%Bh >U
S]LF_EBb?e8ěi 2Ř<le,o&ّr!Ytv. Ey1}{RybLKdEf.gt>+j 8l2o,̓ar';up!$x8 o zv|}'RD_gKiiEql>ynC8Qp2 r,ڑuY'+w!z! |Cц~5Qˢm=K,nDp>qrc8ct>2v ,ߐx'Iz" { 5} (QKr_JԞ5sD|ct>Fvc8Kw2y?,z'p|7"B} A\~oQ wmJx9DR#y >)ez#8>{)2|3- +}?'~I"~"F -_PŞ[|.Jk|D.
}>c}84~O2~- 'Ë,"f
HŁPu4J.D=i,8$i2-/ 'X"ۇ& UK9CpP4%I晖C̖=͔n8 ˄2 b-5] '" ;iՃOț/I C=7o2k-8.(j# ?] |O7IsӌCtc=7a +u,/uwD 9xWyZi-]kC:`mI|co7ofq
aiJrSl#tFRovd9qx ,ty Ww{^Wq&[Ss<^t{xaundv`gwS?jyEmz8p{+s| rv}UkzY{ l\{zL_|mc|_fP|Ri}VEXl}8io~+s"~[ vB~1S\%WH$Zy/^eJl#aʂ _1e1R hDk48?oF+r uЀ9QBUFYQx8] ckS`q^d3zQgDk,8n+r!CupP"XT\X[w]\wj_]cS(Q%f~Dfj8n&,q!}u ✊N=SJ7W_v[ i^ג;]|bPf?D9i!7m,qGY!tڃN
Ro<V\uZ^kio^%m]aaPePDio57m6,'p!tMpqQ#U㣋urYi]C\aePSe5Ci 7l ,4pV!tvh VviZi:kk^ xm akne^phPQ>rkCtn6vq*Ext zwd'_fSbyhreZwj~h jlj]nm\PupoCYs'rv6utt*.wwP yyv`h.crjdelv;h2niijpo\lrZOoVt=Bqv 6Ct\w*vy Ny6{r^p$`r csuf(thnhv[kOwCO mxyB^py5s`z*u{ vx}[x^yTazhsdnzg~g.{["i| Nl|Ao},5r}*u?~# w~Y\]*`/rc +feZohNk܀An׀5q̀h*tC ww )XɊ.[-~'^ˇra͆edچYgDMkAXn 5q.**t*6 JwwVZ8I}:]q:`e2c,YOgM-jDSA mu5upp*;s vUy"Y,N|^\op_ےidc]XfUJLi/@l 5lp&*Ls[ vsTPXT.{[ߚo_ dbfXX{eLi@ld5fo#*\s S v8>SW{
[9oe^Oca֙X-e/Lhh@k5aok*hrˈ v X-mVo Zd~qp_^rqaerdYetJh;Luk|@-wtn3y q(-zt |x#)jI_ kb |mdpo4gdpjZXtrqmLt9o?vrL3wt(,ywZ {y@g&gQZi)i{qk ko{m +th(Ov y>^jaxvdAkfЅ +`+i]TkIjnr=q.2sǂU(bvF VxL ]'́`7uc jeNJ_hpqTsk IImЇ=p2s;(tuԃ xOt$\/_5u2b+j!d-_giT j`Hm)=o2r +(ur7 xvB[<(l^btabid/^f+SiÐHlB=wo}2rY+(u" wńP|Z ~]^t`i c^2flSliBH[l)`=\o/2r(t wqtVtZ[vfu^ jvav_`w^dSxJh+H+yUko<ezun1{q&$|u ~ xUp^Qqats dit=gR^?ucjSvlG~wos;y&r"0z}t&<{wb }+zmf~o6hspkhrr&m)]Fso>R=tqWFvlsn;wu0yxw&Pzy S|f{ejn:}llorunq}g}p=r\xqtpQsnuFqu w^;Zvx0xzB&bz*{ {}hu|&jvqZlwfnx[pbyPr'zbEt +tcjIY3ltOnDp^:=s$0RuV0&w| y6bwad m9gF$c
iXkڐNn"D^ph: rm0Ht4&w+ + y>aTyvdlfxbhX|kR#NzmmD3o:rN0@t&v5 y +zeVyzZoni{/^c{}avY {dN|Xh4C|k|8}n.2~-r $6~uLxw;^KwxaWmxdFbyZg XziMzlC{qoU8_|;r.'}
t$`}w ~zEWtSevuth+kvzjuawYlW+x<nLy#pBzs%8 {uT. | w$}y h}{ +6vF-wj%'y~+ zxi5ohkFfm3u\nS0pIro@Pt#+6uщ;-wR%5y*y zx"hnnjel}\RnY)Rp*Iqp@+s6usp-w,%@x熒 7z{lzTVpZfÀp^`\NaSCe IQEh?5`k5$o+rp"q uρXy-x}^oE}aBe~dF[~7gR)~jiH~l>~oy4@rF+u"w2mzwoze5m{mgd{j'Z|Fl]Qb|nG}p>N}s4~u_+~w"y| vxllyBn cyoZ.zwqP{ sSGz{u=|Kv4|x`+}z"~M{~}jtvrkwbtabx*uYlxvP ywFzay={.z34i|{P+||r# }} "~E~stysjuzYav{ Xw{Ox|SFyW|=Wz?}4B{-~ +|~#D|W o}rsQj tp6a ukXvzOw|F%xn=yn4!zs+{p#d|\ }5qr@i@sB`utoWu:NvEwG<x4yЃJ+z߂#{k |˂q6pohrI_sWtN;uωEv<x3y@+z`#{w |rp~p gq{c_crÐ VsMu(EYvd<w3xɈ:+y#{ ;|)ook`gtpӖ^r$VgsWMtE-u<iw.3xhJ+y #z؆ Y{7qPW-hZ_#^V!`aMeQD.Rh:l1og(Lr Ƀv:yo΄R^ +KrBt9vp1\x>)1 z!cA{h}lO}qd}sE[}tS~uJ~Gw;B=~tx9~y1D~{ )?A|R!}U~kx{wc9|-xZ|yR|zJ} {fA}d|.9y}|1/~#})L~~z!~H jzU~ buz~ZM{H~R ++<s$zv y {]^dV02fNi5Gk@xan9y p2Ks'+Au$xG Xzd}\_iUv3lN]n4G.p+@r)9/t02&v:+CxG$ĄzQ |I~%[|oTЊoqsMՉisFot?pv"8sw2y9+Lz$ꃸ|Q Ȃ}38[u=TEvMewFi$x?~@y8Ѕ\z2|+Z}'%~; /GHBZmczSć{wM|7F |?H6}s8j~1~+gW%17 5+Y܇/SOoOLEڄ?C8,1T+p8z%L _Ym&Rj LNE>b8xȄR1,+w%bB X)RL +4GR.u!(̄Ł #n^ 3o1~QFK׃$Eu[?&U9M4;E.z\)(# \`Q;uK߇tEH?E9ԇs40.o(}#f6 } Q> +n%m>ppt3 ssW'vgv yxߒ`[Tc~j^Yf zra;hnocjbgfmEVi{oJclqq>]ozt2rvK'uhxk &xBzXkԄ[mmy!^omYaq6a~drUgtkIju=n/w2qly#'tz Tw|.U4syXu7w\fvZlT_wQ`bxAUf0y0ILiz=m{2kp}{'s| v}ƍR{CV|SvZ|ke]} _an}nT|d}Hh~ =il$~V2do~'s(~ vuSYPԃn0URuX j\_4`0uSc Hg=8kUv2^o )(
r Dv9O!:Sw9u#Wei[On^_vSb|HFf
=j2dnu(0r0 u@ME]R/teViiHZD^-^'{S?bHfD=i2ym(Uq̈́z usyL~Q%sUvhYeu]]^BRa_ Geh=ix2m9(uq{ +cnfffp\[hrPksEnfu}:q>w40 +t +x%vz oy2|9[r{^spau fdxv9[gIwMPTj&xaEPm yt:gp&z/s {&u| x}<YHz +b^h!Xa8NoeiKD hS9lU0%p#Y&sk +n`b`p:dWqgMKsXj&Bum17vp=-xsK$$zv=|Ry9gb"v6idklgba@miVol>LqnBsq!7us-wv
$@yxl O{z`ditg=kjim`SkoV mq_Kos2Aru7\tdv-vx$Yxzz z|D~b&q2sdrigts_uiu*USlv`K^niwA4px7)sOz +-u{H$~x| z'}|_xErbyhey^h;ztTj{Jm6{@o|j7r_}-t}$w^~y ?y){^<qa?igd5]fT"iJyl(@n6q-t;$vрA y5nz\wp_Džg)b߅=]jeShq5J#k:@jn96pڂ-sP$vY xׁy[ p&^fa\dSPgIjk@EmV6pA-s$%uz xyZHo]f
`Ɛi\cSf Ii@(l6o&-rz%4u #xH\xY o\e_{\<bCRfIi2@lI6o\h-rg,%Ju_ +{MuwRqv]Vfw#Z\w^KRxaIyVe>zRiQ4{gl+H|p"D}t6~wyuqZ5ozs&]etP`[uJcQvZfHAwwj >^xm"4yp?+D{Osa"t|vo }ywnzan p(dFdKqfZs +:}i1~nmZ( q txppx(Z gx]^y`UtzcLdzg C{gj1:l|,mW1q}p(}s ~vYyota%frvc]vwfTwi0KxkBynS: zp1G{s(|v?! }x~{kn9r"gelszj<\tllSunlKvpmB{xru9yIt~1&zv) +i|S_`W\X[:P!t^GOb?t>fT6Kj.nm&q ?uAD(xhG~Z_~]tW`OEcF;g>jjJ6m.np&Zt }wE+zsg{`^|!cV|fSN|hF\}Kk>m}n:6O~,p.W~s&7vr y(M{exg(]yiUzXkMzmE{p> | r+6|tT.E}v&~4x ~zG}dvm] wogUEx`q+MKy$rEeyt_=zv +pIG~9r@~ls9~u2~wV+6y%%z |+~r\T{xrFUj{sNl|eu GK|vb@<}w9j}gx2w}zP+~?{%@~} $~VB[ywTzexMzyF{fz?{{`9E|S|82k|}+}j}%d}~ K~ZxL}cTQy}My~]Fz3~?z9'{^r2c|+|B%}W x}~pZgwSwЂM;xFoy?yʂ9z2_{E+| +%|̂m }J~,0Yu߇S}vLJLwlF;x-?xY8y˅2[z;+{%|X })[}݂Yt S.uHLvƋoFwkw?fxG8y62Yz%}+{g%{S |܄>7}UX[%T-Q{XJ[Ce_<؊=c_6-&g,/^!j(*n"Dr tv\yWZPՋ]J
`C;d+<w'gs5Fj/Fon$(Ʌq"t Hx,x{BV`P fcIyeBÆh< <k~5nW//q@(ՄFt2"߃w 2?yɂ|tU冚eOrh}HjBQm8;Ƅ}o5{q/tQ(߃ v#y" iU{k}U'_kNۄmHzoADq;s{5Uu`/<wM(y=#2{$ ~|]Z~T\qN\4rHt\Au;Vw.5?Wx/ z ){#f} 逾~pSv\M逨wGŀxApry;.Zz5,D{/*|),}# ~ !%Sm@{MJ|]GwJ}A:<}; @~)5 I~/ LS)ER#d{ R)pS~M&~G-~ vA +~:~95~b/&~)^~#~ς | XI$R|߅vL}F}@}#S:}Y +5
}/.}քd)s~ +1rj'n *s^@N}EmrJugO\T QYRF_;dC1ihU'nf vsc>}/Cr\IgsN`p\S QY +M_\?RΎQX?F]<=c +2hi (.m? ry< *|FA~q}FmfL\RMQWF] 1<Yb2/h (Xmn roC^MՀZ`RtbVPheZ]Jg^QjbF?lf:p j/s!n%uv0ra y/v-YV~\?Ys^]uga`\;ddRPggEjk:QnIna/qq%ttt x0x +UO_|XEaq[Tdf^gB[IaiP:eQlDhoL9lq/Upat%ssw/
wOydž)Qug7{WTiQpxX;kfe[msZt_mosOcBqrDsg5sm9k9ui/"o2wl%qryh Av{cN o'z Qpo_UrdYZszY]_tNav'D ew|9Lix/n-z7%r*{ u}^KDvxONwnnS_xdcW}y&Y[yN{`zCd{Y94h|/.mY|%q} us~OH~6xM~fmQi~cU~XvZO~N^~Ccr9 h,/Ala&q NugFw4K% lObpT](XY M]ă%C_b9!gK5/cl&8p t9DȌv}IlKNRaS WWM\ԇmCZaU9=f@/kz2&pp(8 tvNCUuH>kM(|aRWpW !M\
qC\a9[f /k \&oՄ t=9aB1JudG0k_L2aHQ9W=VNRMg[kC^`9se{/j6&o .tgdtN'xeeRRmugVybiZWk^M!mbB@pEf7rj-Aun#xMrzvu_VxvaYl&c]MawfR`Vhd LakegAnAj7 qDnW-tDq#w#tyxB[F^ub]aAj`~c`jcPfUf8iKi4lCA)lio6oq,st#vw? -y + XwWpCO gKSB^tWqU[wM _Dc̋c;g3l +pw#sȄ }w$lrxp,Ohq>R_+rGVUsDZLt{^Cuc:GwZg1yk(jzo* b|zs'~ w pkV[g7mtY]n\Tpa`rKqcBsg`9uj0wtna(nyiq {Tu`7}xo%h ]ei`X\kcSmeJohBqk9Asn0vq(qx7t zNww|8zQmdddff[hiRk;kZJmmAoo8r?rG0ptt(sw$w
ygyl{r{lakcdm<ZfnR*ipIkrYA1n.t8pu0dsw(v%y!1x{^Bz}!k^rEcasIZAdtt`Qg:uI%j +\jX_=PbуHTf)o@ii8llۂ0p$)4sVL"vg cyhW4`[#:Xa^e@PEaHH.e3i@Th8kl80o)Vr#":vK xׂh|V`;Z +dX]lP`̌YHdk@Ch8jkZ0o8)pr"Yu҄_ x5j&v4Oua4vSiXuwhWeOw[iGsx_n? yc}6zg./|k&R}Yo ~s%whr1Vp_s+YWTt*]*Nu/`Fv^d >jwg6 y +k'.zn&c|rW E}|u~yPgYnT][^o`&VHq bNreEth=uk5w\n-yq&qzt z|sw}zf3k d +]lf\UnfhMQp0k
EArmk=rso5ur@-wt&~yw< {y6}&|eh j\jliTlnALnpDp(q=$rBs5]tmu-vw&xy z{|x}ed:ep\6gr&T;is{LHlFtDynv$<pw5Ls5x-uzh&w{ +y}T{~cgcv[ewSh4xKjySD.m)z)<o{5>r%{-t|' +#d|{ }}z~TqEsNr_tH5svAtw=;ivExr5Uwy/3y{);ze|Z#{} }~~. TCo{y'NpyGrzAsz{N;Iu +y]PV|JZDfy]>7a58d2!h,,NlB&h p
!sނwYzP0\aI_Cꁠb=́e7h1l, o^&zr!.u y +9{O,1b.I[dCug=nKj;7~l1o,rn&Nu?!Vw Sz~D|N}|wgH|j&C|lk=$}Dn7N}p1~;s, ~ui&w!z |&ʀ~MzmHcztoBzp<{r71|(tz1|vO,5}jx5&}z !~{ M}+M}xrOH +xsB{y5u:<yv7zw1{yR,H|Wz'}|I"}} ~~`W MvQwfGvx}B=wy<xzh7y|{[1zz|U,^{_}a'-|=~l":}!b T~6~Lt|RGhu{}#Bv=}<|w*~V6xG~1ymm,yz}'X{"n| }_~|LTs.G#t6Au<cv6w?(1xL,yo'}zꂆ"| }6a~+DLrTFs"At <OuQ6vh1wЄ,y&'zo0"{ |6}IPDNXU>ÌY,93]D3ag.Ve)xi$ +U};G#afBIi=Pyl8(LnM3 +0p.*s)Ju$w {zL|gU~FF +r13t$.7v )nx.$ɀz6 [| }LFn~pA~r<~t]7~u2-wh.Cnx)z$|@ } 4
\1F }:uA}8w <}Lxf7}}y2}z.R~I{)~}%+~~B ~T mz5 E{zSAJ{{<{|~7| }C2|~.g}1~)}%a}J!~_ ~KO{Ezh~Azl<zT7z2{$.z|B)|ʁ%}I!!B}ۂG ~<v'6ECy.?@yO<ly7y2z.{*|(%|Ń!l}qp ~=~䂫A˗Q*=U_8_Y3].<a*Vf9%j!n r2vdžz<@ⓗV<ZV85^3>a.e*Ti}&(ml!RqS u xg{k@zS[<R_O8 +3D|.} + ~'H#D ̀E8܀e>>|;}7 q~3
k/+='v́D# +ւ(? ;V7a3 [/+U8' !# 2 ,! #~ ˂ +
!"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~ +
!""#$$%&&'())*+,--./01223456789:;<=>?@BCDEFHIJLMOPRSUWXZ\^`bdfhjmoqtvy|~ +
!""#$$%&&'())*+,--./01223456789:;<=>?@BCDEFHIJLMOPRSUWXZ\^`bdfhjmoqtvy|~D"L<SW]tbcef߳hڳnղtұyϰ}ͯʮȭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭD"L<SW]tbcef߳hڳnղtұyϰ}ͯʮȭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭD"L<SW]tbcef߳hڳnղtұyϰ}ͯʮȭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭD"L<SW]tbcef߳hڳnղtұyϰ}ͯʮȭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭD"L<SW]tbcef߳hڳnղtұyϰ}ͯʮȭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭD"L<SW]tbcef߳hڳnղtұyϰ}ͯʮȭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭD"L<SW]tbcef߳hڳnղtұyϰ}ͯʮȭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭD"L<SW]tbcef߳hڳnղtұyϰ}ͯʮȭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭD"L<SW]tbcef߳hڳnղtұyϰ}ͯʮȭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭD"L<SW]tbcef߳hڳnղtұyϰ}ͯʮȭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭD"L<SW]tbcef߳hڳnղtұyϰ}ͯʮȭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭD"L<SW]tbcef߳hڳnղtұyϰ}ͯʮȭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭD"L<SW]tbcef߳hڳnղtұyϰ}ͯʮȭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭD"L<SW]tbcef߳hڳnղtұyϰ}ͯʮȭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭD"L<SW]tbcef߳hڳnղtұyϰ}ͯʮȭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭD"L<SW]tbcef߳hڳnղtұyϰ}ͯʮȭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭD"L<SW]tbcef߳hڳnղtұyϰ}ͯʮȭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭE"L<SW]tabcdf۷joԶtѶxз|̵~ƱE"L;SW\t`aabcݽeٿjoнsʹyƵòE"L;SW\t__``abfnʼtƹ{öﱱE"K;RW\t]]^^_^gożv¹|鹴F"K;RW[t\[[\Z]hq½x}㿸粶}맴|||||||||||||||||F!K;QW[tZYYZQ^jsyܾ~᷹}嬷z袶z뢶z뢶z뢶z뢶z뢶z뢶z뢶z뢶z뢶z뢶z뢶z뢶z뢶z뢶z뢶z뢶zG!K;QWYrWVWOR`lϿtֽzڻ}ްy⦹w垷w螷w螷w螷w螷w螷w螷w螷w螷w螷w螷w螷w螷w螷w螷w螷w螷wG!K:PVWpU|SRDTbžmμuԻzسxܪuߠt♹u䙹u䙹u䙹u䙹u䙹u䙹u䙹u䙹u䙹u䙹u䙹u䙹u䙹u䙹u䙹u䙹uF J:PVTmQwQ}BFVdûo˺vѴvիtأrܛqޕrrrrrrrrrrrrrrrrrF J9OVPhNoF|AIYfpȱqͪpѣoԜnוnڐoېoېoېoېoېoېoېoېoېoېoېoېoېoېoېoېoE I9MUL`Ia=CM\hkĦjɟj̙iϓiҏjԋlՋlՋlՋlՋlՋlՋlՋlՋlՋlՋlՋlՋlՋlՋlՋlՋlD H8KQFQ8f?HQ^ccccƎcȊdˆēg̈́g̈́g̈́g̈́g̈́g̈́g̈́g̈́g̈́g̈́g̈́g̈́g̈́g̈́g̈́g̈́gB F6EC2K:jCMVZZ[\\]^~`|b|b|b|b|b|b|b|b|b|b|b|b|b|b|b|b|b@D4813P>kHRSRSTU~V{WyYvZt\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\=9",77RCiMzNMLL}NxOuPrQpSnUlWlWlWlWlWlWlWlWlWlWlWlWlWlWlWlWlW8! /:<QHdHsGGGyHsIoJlLjNhPfReTeTeTeTeTeTeTeTeTeTeTeTeTeTeTeTeT; G5RN\ic|ehkosުzکקԠҘѐЏɓĖĖĖĖĖĖĖĖĖĖĖĖĖĖĖ; G5RN\ic|ehkosުzکקԠҘѐЏɓĖĖĖĖĖĖĖĖĖĖĖĖĖĖĖ; G5RN\ic|ehkosުzکקԠҘѐЏɓĖĖĖĖĖĖĖĖĖĖĖĖĖĖĖ; G5RN\ic|ehkosުzکקԠҘѐЏɓĖĖĖĖĖĖĖĖĖĖĖĖĖĖĖ; G5RN\ic|ehkosުzکקԠҘѐЏɓĖĖĖĖĖĖĖĖĖĖĖĖĖĖĖ; G5RN\ic|ehkosުzکקԠҘѐЏɓĖĖĖĖĖĖĖĖĖĖĖĖĖĖĖ; G5RN\ic|ehkosުzکקԠҘѐЏɓĖĖĖĖĖĖĖĖĖĖĖĖĖĖĖ; G5RN\ic|ehkosުzکקԠҘѐЏɓĖĖĖĖĖĖĖĖĖĖĖĖĖĖĖ; G5RN\ic|ehkosުzکקԠҘѐЏɓĖĖĖĖĖĖĖĖĖĖĖĖĖĖĖ; G5RN\ic|ehkosުzکקԠҘѐЏɓĖĖĖĖĖĖĖĖĖĖĖĖĖĖĖ; G5RN\ic|ehkosުzکקԠҘѐЏɓĖĖĖĖĖĖĖĖĖĖĖĖĖĖĖ; G5RN\ic|ehkosުzکקԠҘѐЏɓĖĖĖĖĖĖĖĖĖĖĖĖĖĖĖ; G5RN\ic|ehkosުzکקԠҘѐЏɓĖĖĖĖĖĖĖĖĖĖĖĖĖĖĖ; G4RN]ib{dgjmpޭw۫|تէҟЕϐĖ忘忘忘忘忘忘忘忘忘忘忘忘忘忘忘; H4RN]ia{cehkn߰sܯy٭~֫ӨМΒ羙繙繙繙繙繙繙繙繙繙繙繙繙繙繙繙; H4RN]i`zbdfiloݴvڳ{زկѥ鶚겚鲚鲚鲚鲚鲚鲚鲚鲚鲚鲚鲚鲚鲚鲚; H4SN]i_yacegjnsݽyڽպȯಟ쩚멚멚멚멚멚멚멚멚멚멚멚멚멚멚< H4SN]i^x_acfimrx{}־ߨ雤힞힞힞힞힞힞힞힞힞힞힞힞힞힞힞< H4SN]i]w^`bdhmuw{~ָ~ޞ~蔵뚨ꚨꚨꚨꚨꚨꚨꚨꚨꚨꚨꚨꚨꚨꚨ< I4SN\h\v]^`chnrx{~ճ}ޙz疸疶疶疶疶疶疶疶疶疶疶疶疶疶疶疶< I4SN[g[u[\^chhouzμ}խzݘx䘹䘺㘺㘺㘺㘺㘺㘺㘺㘺㘺㘺㘺㘺㘺㘺<I3SNZfYsYZ]d^dmsȼxϸ|֦wݖv╻◻ᗻᗻᗻᗻᗻᗻᗻᗻᗻᗻᗻᗻᗻᗻ=J3RMYeXqW|X][ZclsɸxЯw֠tۓt~ߔߔߔߔߔߔߔߔߔߔߔߔߔߔ=J3RMWcUnUxW~XQXclsɲvϨs՛qّrݏ{ݐܐܐܐܐܐܐܐܐܐܐܐܐܐܐ>K3QMT`RjSqVsKOXdmrȩpΟoӕnpٌwڌ}ٌ}ٌ}ٌ}ٌ}ٌ}ٌ}ٌ}ٌ}ٌ}ٌ}ٌ}ٌ}ٌ}ٌ}>K2PMQ\PdPgFxJOZemlǟk̗kАkӊnՈsֈyՈyՈyՈyՈyՈyՈyՈyՈyՈyՈyՈyՈyՈyՈy?J2OLNVLYFbD|JQ\ggfÕfȏfˉg΅jЃoЃsЃsЃsЃsЃsЃsЃsЃsЃsЃsЃsЃsЃsЃsЃs@J1MIJLFJ?hELT_`aaaÇbƂcf~j}n}n}n}n}n}n}n}n}n}n}n}n}n}n}nBH0I?C;8P@kHPXXYZ[\]{_yawewhwhwhwhwhwhwhwhwhwhwhwhwhwhwhCG.A/189UCmLTRQST~UzVwXtZr\q_pbpbpbpbpbpbpbpbpbpbpbpbpbpbpbAA$+ 2=<WGlO{MLLMzNuPqQoSmUkWiYi\i\i\i\i\i\i\i\i\i\i\i\i\i\i\=0*'5@AVJhGvGG~GvHpIlKiMgNfPdRcTbVbVbVbVbVbVbVbVbVbVbVbVbVbVbV3 + .*:?DRAbAnAy|AtCmDhEdGbH`J_L]N\P\R\R\R\R\R\R\R\R\R\R\R\R\R\R\R2?-JFU_]qdjnrty~ݏۈكӇ̋ʌʌʌʌʌʌʌʌʌʌʌʌʌ2?-JFU_]qdjnrty~ݏۈكӇ̋ʌʌʌʌʌʌʌʌʌʌʌʌʌ2?-JFU_]qdjnrty~ݏۈكӇ̋ʌʌʌʌʌʌʌʌʌʌʌʌʌ2?-JFU_]qdjnrty~ݏۈكӇ̋ʌʌʌʌʌʌʌʌʌʌʌʌʌ2?-JFU_]qdjnrty~ݏۈكӇ̋ʌʌʌʌʌʌʌʌʌʌʌʌʌ2?-JFU_]qdjnrty~ݏۈكӇ̋ʌʌʌʌʌʌʌʌʌʌʌʌʌ2?-JFU_]qdjnrty~ݏۈكӇ̋ʌʌʌʌʌʌʌʌʌʌʌʌʌ2?-JFU_]qdjnrty~ݏۈكӇ̋ʌʌʌʌʌʌʌʌʌʌʌʌʌ2?-JFU_]qdjnrty~ݏۈكӇ̋ʌʌʌʌʌʌʌʌʌʌʌʌʌ2?-JFU_]qdjnrty~ݏۈكӇ̋ʌʌʌʌʌʌʌʌʌʌʌʌʌ2?-JFU_]pe~hlpty}ݔینׄ׆ΊȎƎƎƎƎƎƎƎƎƎƎƎƎƎ2@-KEU_^od}gjnrv|ޛۓ؋օօщɎֿֿֿֿֿֿֿֿֿֿֿֿֿ3@-KEU_^nb|ehlptzߢۚؑֈՆˌػععععععععععععع3@-KEU__ma{dgjnrw}ܢ٘ӌ͈Íۻڵڳ۳۳۳۳۳۳۳۳۳۳۳۳3@-KEV_^l`ybeilpt{ޫ֠ʔܹݳݮݭܭܭܭܭܭܭܭܭܭܭܭܭ3@-KEV^]k_xadgkosy۱}Χ״ݮߪߨߧާާާާާާާާާާާާ3A-KEV]]j^w`bfjnsuԷyǭκ֬ޢ⠔᠓ࠓࠓࠓࠓࠓࠓࠓࠓࠓࠓࠓࠓࠓ3A,KEV]\j]v^adinqqͽv|ͳդݖ㕘㗕☕ᘕᘕᘕᘕᘕᘕᘕᘕᘕᘕᘕᘕ3A,KEV\[i[u]`cipmmsùy̬}՝㋡㐚3A,KEV[ZgZs\~^cjmilp²u̥yԕ}܇ᅮጣ4A,LEWZXfYqZ{^clgimpr˝uӍxڃށ݊݊݊݊݊݊݊݊݊݊݊݊݊݊4B,LEWYWdWnYw]|d~eejnrrʙr҉sقۄچههههههههههههه4B,LDVWUaVkXq\t^|]ahnrqɔpЈrֆ}ֈՉÚԇՇՇՇՇՇՇՇՇՇՇՇՇ4B+LDTTS^TeVhYmUY]elmlȎlφo҄xӅĄ҇őчŕЇŕЇŕЇŕЇŕЇŕЇŕЇŕЇŕЇŕЇŕЇŕЇŕ5C+MDQQQXR\U[NsRV\dihhljh̃lρsρ}ƈ̓Nj̓Nj̓Nj̓Nj̓Nj̓Nj̓Nj̓Nj̓Nj̓Nj̓Nj̓Nj̓Nj6D+NDOLNPNOGaKwPV]bccdăeh}n}v~ɀ~Ƀ~Ƀ~Ƀ~Ƀ~Ƀ~Ƀ~Ƀ~Ƀ~Ƀ~Ƀ~Ƀ~Ƀ~Ƀ6E*N@LDJC?MEgK{QW\]^_`~azexjxpxxyzyzyzyzyzyzyzyzyzyzyzyzyz7G)K9G8?7>SEkL~SWVWXZ|[x^uasesjsqssssssssssssssssssssssssss9I(F.=%7>>XGmO~SQPRSyUuWrYo\n_mdlilklklklklklklklklklklklklk;F#< -(8CAZJmN{LLL|MvOqQnRkUiWhZg^fbfcfcfcfcfcfcfcfcfcfcfcfcfc>< 1.:EEYIjGwGG{HsHmJiLfNePcRbUaX`[`]`]`]`]`]`]`]`]`]`]`]`]`]= '40>DBVAeAqAzyBqCjEfFbH`J^L]N\P[RZUZVZVZVZVZVZVZVZVZVZVZVZVZV! , 70;A:P:^;hx<qo=xh?}cA_B\DZFYHXJWKVNVPUQUQUQUQUQUQUQUQUQUQUQUQUQ*8&D>OUWf^tcimqv|あzwwwxz|Ӏσσσσσσσσσσσσ*8&D>OUWf^tcimqv|あzwwwxz|Ӏσσσσσσσσσσσσ*8&D>OUWf^tcimqv|あzwwwxz|Ӏσσσσσσσσσσσσ*8&D>OUWf^tcimqv|あzwwwxz|Ӏσσσσσσσσσσσσ*8&D>OUWf^tcimqv|あzwwwxz|Ӏσσσσσσσσσσσσ*8&D>OUWf^tcimqv|あzwwwxz|Ӏσσσσσσσσσσσσ*8&D>OUWf^tcimqv|あzwwwxz|Ӏσσσσσσσσσσσσ*8&D>OUWf^tcimqv|あzwwwxz|Ӏσσσσσσσσσσσσ*8&D>OUWe^sdimpu{ㅁ}yxxz{σ˅˅˅˅˅˅˅˅˅˅˅˅*9&D=OUWd^qd~impsz㋀|yz{τȇÇÇÇÇÇÇÇÇÇÇÇÇ*9&D=OUWc^pe}hlqsx~ހ{{}ЃȈ˽˽˽˽˽˽˽˽˽˽˽˽*9&D=OUWb_oc{fjosv}Ꮓޅ}}ҁȆͺͷͷͷͷͷͷͷͷͷͷͷͷ+9&D=OTWa_mbyeimquz◂ٍЃˁɃкϴбббббббббббб+9&D=OSX`^l`xcgkosyݠєNJҾҸҳҮҬҬҬҬҬҬҬҬҬҬҬҬ+9&E=OSX_]k_vbeinsy֥~˛ͷӳԬԩԧӧӧӧӧӧӧӧӧӧӧӧ+:%E=ORX^\j^u`dinsݳvѪ{šù̯ө֧֤֢աաաաաաաաաաաա+:%E=OQX][h]s`}dhnpظr̯x~ǫ́ԟ؛؛כ֛֛֛֛֛֛֛֛֛֛֛+:%E=OQX\Zg\q_zcholҽpƵv{ˡӕِڑڒٔؔؔؔؔؔؔؔؔؔؔؔ+:%E=OPX[Ye[o^wb~hkhmsx}ʚӌن܆ۊڌٌٌٌٌٌٌٌٌٌٌٌ+:%E=OOWYXcZl]sbxi{eejptyɒ}҅ڀن؇؇؇؇؇؇؇؇؇؇؇؇+:%E=OMUWW`Yh\nbqex^bglptȊx~{zՃԃՃՃՃՃՃՃՃՃՃՃՃ,;%E<PLTUV]Xc\fce^w_adgknǂry{wvâ~,;$F<PISQTXV\[[Zf^xabdghi|mwwwƆxǗyȩzzzzzzzzzzzz,;$F<QFRMRQTQSXUlY~\_deff{kytzʀ{ˎ|˝y˥y˥y˥y˥y˥y˥y˥y˥y˥y˥y˥y˥-<$F<PBOFOFNGM^RrVZ]_`acxgvovyẅ́x͐yΙyΙyΙyΙyΙyΙyΙyΙyΙyΙyΙyΙ-=#H8N<K<J7EMKdOwTYY[\]z_udsjrrs{tЅtЍtЍtЍtЍtЍtЍtЍtЍtЍtЍtЍtЍ.>"L2J3E.=;DSIhOzUVTVW{Yu\q`oenknso|oӂoӂoӂoӂoӂoӂoӂoӂoӂoӂoӂoӂ/?"I)C%3'<ACXJkQ{RQPRzStUoXl[j`ieikirixixixixixixixixixixixix0
A B 14.=FD[LlMzLLLyMrOmQiTgWe[d_dddjdndndndndndndndndndndndn2 B1 )63?HH[GjFwFGxHpIjKfMcPbS`V_Y_]^b^e^e^e^e^e^e^e^e^e^e^e^e4 +2 . 95BHAY@fArB{vCnDhEcG`I^L\N[QZSYWY[Y]Y]Y]Y]Y]Y]Y]Y]Y]Y]Y]Y]1 #2";5:E9T:`~<ju=rl>yf@}aB]DZFYHWJVLVNUQTTTVTVTVTVTVTVTVTVTVTVTVTV +6 F#F!>9)B@HUMgRvPPP{QsSlWg[ebdidpeyeۃfیfیfیfیfیfیfیfیfیfیfی& 8F;-:0BEHXMiKwKK|LsMlPgSdWb]abahaoaxaaaaaaaaaaa':; +1 ;5CHHZFiFuF|GsHkJeLbO_S^W]\\a\f\m\t\t\t\t\t\t\t\t\t\t\t(:$4#>8AI@Y@fAq|BzsCkDeF`I]L[OYSXVXZW^WdWiWiWiWiWiWiWiWiWiWiWi' + +*70CCKNQZWf]rb}gnzvrkgggikos«vêx«y¬y¬y¬y¬y¬y¬y¬y¬y¬y¬ +*70CBJMQYWd\pa{fltw}nighjnrvyz{{{{{{{{{{ +*8/CAJKPWVb\nayfkr|{smkmoquy{||||||||||| +*8/B@JJPUW`\kavfkpy{spprsw{}~~~~~~~~~~~ +*8/B?IIQSX^]ibsf}kpxۄzutuwz} +*8/B>JGQQX\^fcpgzkpޖxՋ~́zxyz| ++8/B=JFROYY_cdlhvlp؛vϒ|ň||~ ++8/B<KDSMZW_`cifqkyݩnӡsɘz +8/B;KCTK[T^]aefliuحjΦqĞw} +8/B:LATIZQ]Y``efdtӲhɪouzÔĒđĐÑ +8/B8L@UGYN\U_Zd_ڽ`s϶fįmsx}ĉLJdžƇƈĉÉÉÉÉÉÉÉÉÉ +8.C7M>VDXJZP^S_^]qʻdjpuy~}{}ǀƂłłłłłłłłł +8.C5N<UAVFYI^JW][pbhmrvz~vtsvy{{{{{{{{{{ ,8-D3O9S=U@WAZEQ[Yn_einruxzponptvvvvvvvvvv ,9+E1P5Q8R9V6PCPYVm\}afim|pqvlkjjpqqqqqqqqqq ,9)F-P0O1O.S)PARWTjX{]adgskjsgffeökllllllllll -:&G)M*K'K J.R@VTWhWyY[]v`jedob~aЏaҠ`ԳefĿfĿfĿfĿfĿfĿfĿfĿfĿfĿ -;"I#H!D?!H5OGSZVkVyUUyVlYd`alazbۈbܖcܥcݷaĨaĨaĨaĨaĨaĨaĨaĨaĨaĨ -< HA2?'G;LNQ`QoP|O}PqRhVb\_f_q_|`އ`ߔaࢢaaaaaaaaaa .=@/4?.FAKSMcKqJ}KuLkNdR_X]_\h\q\{\⅞]㑝]㛜]㛜]㛜]㛜]㛜]㛜]㛜]㛜]㛜]㛜 /> -% 6 @3FEGVEeEqF{wGmIeK_O\TZZYaXhXpXxY悖Y犕Y犕Y犕Y犕Y犕Y犕Y犕Y犕Y犕Y犕 ./+9$A7BG@W@dAoxBxnCfE`H[LYPWUVZU`UfTlTuT|T|T|T|T|T|T|T|T|T| ! +')%)3+?u.Ik0Rc3Y\5_W8cS;fP=hN@jMCkKFlJIlILlHOlHRmGVlFZlFZlFZlFZlFZlFZlFZlFZlFZlFZl + !~!-s$7i'@a*HZ-NT0RP3VM6XK9ZI;[G>\F@]EC^DF^CH^BK^AN^AQ^AQ^AQ^AQ^AQ^AQ^AQ^AQ^AQ^AQ^ +#}2*x@>~GIMUTbzZmsbxmket`~\ZZZ[[\]Õ`ǔcɔf˓iΓkГkГkГkГkГkГkГkГkГ +#}2*x@>~GIMUTbzZmsbxmket`~\ZZZ[[\]Õ`ǔcɔf˓iΓkГkГkГkГkГkГkГkГkГ +#}2*x@>~GIMUTbzZmsbxmket`~\ZZZ[[\]Õ`ǔcɔf˓iΓkГkГkГkГkГkГkГkГkГ +#}2*x@>~GIMUTbzZmsbxmket`~\ZZZ[[\]Õ`ǔcɔf˓iΓkГkГkГkГkГkГkГkГkГ +#~2*z?=FHMTS`~Ylw`wpjisb|][Z[[\]^Ėbǖeɖh̕kϔlѕlѕlѕlѕlѕlѕlѕlѕlѕ +#2*~><EGLRR^Xj}_uvgnpfy`]\\]]^břeǘiʘl͗nИnИnИnИnИnИnИnИnИnИ #2*>;EEKPQ\Wh]s{d~smkwc_]]^_`eśițl̚oϚpΛq͜q͜q͜q͜q͜q͜q͜q͜q͜ #2*=9DCKNQZWe]qb|ykptg~a__`bdhƝlʝo͜q̝r̞s˟s˟s˟s˟s˟s˟s˟s˟s˟ #2*<8CBKLQWWc]nbyiwrn{fccefhkȟo˟r˟sʠuʡuɢuɢuɢuɢuɢuɢuɢuɢuɢ #2)<7D@LJRUX`]kbvg~puymhhijkmɢrɢuɢvȣwǤwǤwǤwǤwǤwǤwǤwǤwǤwǤ$2);5D>LHRRX]]hbrg}o~wunllnopĦtƦwƦxƦyŧyŧyŧyŧyŧyŧyŧyŧyŧyŧ$2);4E=LFSOXY]dbngyn݇w}}uqpqstvĩyĩzĩ{ê{ê{ê{ê{ê{ê{ê{ê{ê{ê$2);3E;MCSLYV^`bjgtߘo~֎u΅{|vtuvwy¬{¬|¬}}¬}¬}¬}¬}¬}¬}¬}¬}¬$2)<1E9MATIZR_[cegnڝl|єsȌy~|yyz{|~~$2)<0F7N?TGZN`Wd_ުfjբjz̚qÒw|~}}~$1(</F6N=UC\J_QcXۮbhѦhyǟouz$1'=-F4O:V@ZF]L`Tֲ_g̫fw¤msx|$1&=,F2O7W=YA\EݻZRҶ]eȯdvkpvz~$1%=*G0P4U8W;[=TQκ[dôbuhnsw{|zxwy|~~~~~~~~~$1#=(G-Q0S3U4U:QOɿYb`sfkptx}}tqportvvvvvvvvv$2">&H)Q,Q,S+K8OMW`]qchlptvymkjjmoppppppppp%2 >#I%N%N$O D6MKT^Zo`~dhlzoouhgffgklllllllll%3 > J J H@ D4KHQ\Wm\|`c}fqjhqc}bbaa«f¬ggggggggg%3?ID? DJ1MEOYSjWyZ]t`idam_{^Nj]ɜ]ʬ\¤`ǤbƦbƦbƦbƦbƦbƦbƦbƦbƦ%3?B8 7C!L3QETVRgSvUvWjY`_\jZyZوYڙYܩYݽ[͜\̝\̝\̝\̝\̝\̝\̝\̝\̝&3? 5&8C(J:NKN[MjMwxNlOaRZYWdVrV倘W掖W睕W笔WX˓X˓X˓X˓X˓X˓X˓X˓X˓% 1 6+ : C.I?HPH_Gk{HvoHdJ]OXUU^ThTtTTꋐT똏T릍T챍T챍T챍T챍T챍T챍T챍T챍T챍#*
+v s-%|60>9FCMNSYYex`ppizgs`}\[\]^`aˍeӍhj؎k֏mmՐmՐmՐmՐmՐmՐmՐmՐz +x u-%5.?7FAMKSVYa_lwgwnpfza_`acdeɐgԐkmՑnԓoӔpӔpӔpӔpӔpӔpӔpӔpӔ{ +y v-$5-?5G>MHSRY]^i~etwn~nwhddefghĕjҔnҔpҕqіrїrїrїrїrїrїrїrїrї| +z x,#5+?3G;NESNYY^ddomzxuo}jhijklmϙpЙrϙsϚtΚuΚuΚuΚuΚuΚuΚuΚuΚ} { {+"5)?1G9NATJYT^_cj݉luրswzpmmnopqȜs͜u͝v̝w̝w̝w̝w̝w̝w̝w̝w̝w̝} { }*!6(?/G6N>TFYO^YddؐkrЇqxw~sqrstuvʠxʠxʠyʠyʠyʠyʠyʠyʠyʠyʠyʠ~ | * 6&@-G3N;TBYJ^Sܞc`Ӗipʎo~u{yvvvwxyȣzȣ{ȣ{ȣ|ȣ|ȣ|ȣ|ȣ|ȣ|ȣ|ȣ|ȣ } * 6%@+H1N7T>YE^Lآ`^Λhnœn}sy{yz{{|Ƨ}Ƨ}Ʀ}Ʀ}ǥ}ǥ}ǥ}ǥ}ǥ}ǥ}ǥ}ǥ ~ * 6#@(H.O4U9Z?ݭZIӧ^\ʠfml{rw|}}~~ªĪĩŨŨŨŨŨŨŨŨŨ~ * 6!@&H+O0U4Y8ٱUHϪ\[Ťdkjypuy¬êêêêêêêêê *6 @$H(O+U.V2մRFˮ[Ybihxnsw|~¬¬¬¬¬¬¬¬ *6 @!H$P&R(ܼO1ѸQDdzYW`hfvlquy~zwvttvyzzzzzzzz *6 @ H O O F/ͽOC·WU^fduinrv{zrnmllnqrrrrrrrr *6@HKID-MAUS[dasfkostwkhggfi¬k¬k¬k¬k¬k¬k¬k¬k¬k¬ *6?HE9B*K>RQYb^pc}gjxnmsf}ccbbeƦfŨgŨgŨgŨgŨgŨgŨgŨgŨ *5?B
;3?(H;ONU_Zn^{b{fpifpa{__^^`ˠbɢbɢbɢbɢbɢbɢbɢbɢbɢ *4
= +7!4>$E8LKR\VkZx~]r`gd_l\x[[ZYºZИ]Ϛ]Λ]Λ]Λ]Λ]Λ]Λ]Λ]Λ ) +26 +o}$/9 A#G(M.S4ڢVAЛ]SȔeckqp~v{|wvwwxxyΛyΚyϚyϙyϙyϙyϙyϙyϙyϙyϙu +p$/8 @ G$M(ߪR-֦S?̠\QÙcaion|ty|zzzz{{̞{̞{͝{͜{͜{͜{͜{͜{͜{͜{͜u +q$.8@ F L#ܮM*ҩR=ȤZOa_hnmzrv|~}}}~~ɡ~ʡ}ˠ}̞}̞}̞}̞}̞}̞}̞}̞v +r#.8?FK ٲG(έP;ĨXM`]fllypty~|{ä{Ȥ}ɢ~ʡ~ʡ~ʡ~ʡ~ʡ~ʡ~ʡ~ʡw +s#.7>DߵIԵE'ʱN:WK^[djiwnrv{xusrpqƦtǤvɢvɢvɢvɢvɢvɢvɢvɢx v#-6=Bۺ@йC%ƵM8UI\YbhgulptyxpkjihiǥkǤnȣnȣnȣnȣnȣnȣnȣnȣx y
"
-5; > +5˾A"K5SGYW_fdsim}qrui|eddcdʡeɡgɡgɡgɡgɡgɡgɡgɡgɡz } " + 3 742? H3PDWT\cape|ivmkrdza``__͛a͜c̝c̝c̝c̝c̝c̝c̝c̝{ +!)/. / < F0MATQY`]nayydnhen_x]\\[[˔\ҕ^ї^ї^ї^ї^ї^ї^ї^ї} %% +9B,J>PNU]Yj|\vq_fc^jZvYXXWWʌWٌY֏Y֏Y֏Y֏Y֏Y֏Y֏Y֏ + +rh^ #V *N#1H&5C*9>-<;1>96?7:@4?A2DA1IA/OA.UA,[A+b@)k@)k@)k@)k@)k@)k@)k@)k@ +"'(ڶ"ϸ1 +Ķ>H+P;WK]Ybfgrk}{opsgycaa``ǖ`іbіcіcіcіcіcіcіcіo +| ! + +8?)E8|IFrLSgP_^ShVYoRbrPnrO{qNЊpNњoMҫmLӾlLkKlLnLnLnLnLnLnLn +|#r( h+)_.2V19O4?I8DE=HABJ=HK:NL8VL6_K4iK3uJ1I/H/H.G.G.G.G.G.G.Gǯ +of ]#$U'+N*1H.6B2:>6<;;>8@?5E@2L@0S@.[@-d?+n?)x>'>&=&=&=&=&=&=&= +cZR L "E"'@&+;*.7.0421272/<3,A3*G4(M3&U3$\3"d2 m2 t2 t2 t2 t2 t2 t2 t2 +XP HB< 7 !3 "0#$-'$++%)0%&4%#9&!?& E& K&Q%X%^%^%^%^%^%^%^%MD"<- A0"F8*GB5EL>AVE=aK:nN8zP7P7P7P8P9P9O:O;O<N<N=M>M?LBLDKGKGKGKGKGKGKGKNE"?+ E."I6*K@4JK=EUFA_L=kP;xQ:R:R:R;R<R<Q=Q>P?P?P@OAOBNEMGMINININININININOF!B) H-!N5)P?3NI=ISEE]LAiQ>uS=T=T=T>T?S?S@SARBRBQCQDPEPHOJOKQLQLQLQLQLQLQQG!E( L+ S4'U>1SG;OREI[MEfRBrUA~V@V@VAVBUCUCUDTETFSGSHRHQKQLRNTOTOTOTOTOTOTRH I& Q) Y3%[=/YF9UOCOYLIcSFoWDzXDYDYEXFXGWGWHVIVJUKULTMTNUPVRXRXRXRXRXRXRXSJ N$W( `2#c;-aD7\MAVWKP`SKkXIw[H\H[I[J[KZLZMYNXOXOWPWQWRYT[U\V\V\V\V\V\V\UK S!]'f1 j:)iC3dK=^THW]RQhYNr]M}^M^N^O]P]Q\R\R[SZTZUYT\V^X_YaZaZaZaZaZaZaVM X d&m0 q9&pA/mI9fQD_[OXdXSo^RyaRaRaS`T`U_V_V_W_W_Y_XaZc[d]e]e]e]e]e]e]eWO ] i%r/w8"x@*uG4oO?gXJaaU[k^WucVdWeWeXeXeYeZeZe[e\e\f^h_i`jajajajajajajXS b o$x.}7 ~>%|F/xM9rVDk_Pdh[^qd[zh[j[j\j\j]j^j^j_j`j`kbmcmdndndndndndndnZWg s#}-5=!D)L3{U=u]JleYfmdauk`~n`o`o`oaobobocpcpdpeqfrgrgrgrgrgrgrgr[[k w#+4< C#J,ڄT7|[GucVnjchqlezqdsdtdtetetftftguhuiuivjvjvjvjvjvjvjv\^o {" *3:A ݎI$ԉR4̃ZD|aSug`onkkuri}vhxhyiyiyjyjykykylzlzmymymymymymymy\br ~" ) 18?ٔG ЎP1ljXA_P|f^vljqrsnyyl{l}l}m}m}m}n}n~n~o}o}o}o}o}o}o}o}]eu ! ( +/ 6ޚ=E ̓O/ÎW?^Nd\}jhworsvyq}~poppppÂqq၌q။qဋqqqqqq^g
x + &- 3 +۞8
ћD ȗN-V=\KbYhf}mpysyuysrrssss҆sޅs߄s߃ssssss_j { %+/آ5 ͟BěL+U;[IaWfdko~pxzuw}uuvv~v}v͊|vۉ}v܇}u݆~u݆~u݆~u݆~u݆~u݆~u݆`m } "'ޣ*ԥ3 +ɣ@K(S8ZG`Ueajmnws{y}yzyxyvyuyszȍszٌtyڊvxۉvx܈vx܈vx܈vx܈vx܈vx܈a
p + "ۧ!Ш1 Ŧ?I&R6YE_Rd_hklup{ut~}p}n}m~k~j~ďil}ٍn|ڋn|ڋn|ڋn|ڋn|ڋn|ڋn|ڋb
s + +<E'K6QCUPvY\m]fcbo\hvWqyU}zTyTwSvRuRsQtRvRwRwRwRwRwRwx +m d%\*#T.*M21G66B;9>A<;G=8N>6V>4_=3j=1w</;.:.9-9-8-8-8-8-8-8¯ +bY R! K&#E*(@.,;3/8915>22D20K3.R3,[2*e2(p1&|0%0#/#/#/#/#/#/#/ + +WOHB =! 8%"4)#1.$.3%,8&)>&'E&%L&#T&!]% f% o$z$}#}#}#}#}#}# +LE >
840 , )" '' $+ !0 5 ; B I Q X `cccccc@7%5, 9/ ;5$=@+;K49V:6b=5o?3{@3@3@3@4@5@5?6?6?7>7>8>9=:<:<;;<;<<<<<<<<<<<<A8$8* <, >3#A>+?I4<T:9`?7lA6xB5B5B6B7B7A8A8A9@:@:?;?<><>==>===????????????B9$;( @* C2"E=+DH4@R;=]@;jB9vD9D8D9D:C:C;C;B<B=A=A>@?@@?@?@?@@BABABABABABAC:#?% D( H1!J;)IF3FP;B[A?gD=sF<~F<F=F=E>E?E?D@DACACBBCBDADACBDDFEFEFEFEFEFED;#C#I' O/ Q9'OD1LN:GXACcFAoH@zI@IAHBHBHCGDGDFEFFEGEGDHCHEGGHHJIJIJIJIJIJIE>!G!Q%V. Y8%WA.SK8NUAI_GFkJEvLELEKFKGJHJHIIIJHKHLGLFLGLJKKMMNNNNNNNNNNNNGC M W$]-a6!_?+[H5UR>P\GLfLJrNJ}OJNKNLMMMMLNKOKPJPJQJQLPOPQRRSSSSSSSSSSSSHG S^#e+h4 h=&dF0^O:WXDRbLOmPOxRORPQQPQPQPRPRPSPSPTQURTTUVVWWXWXWXWXWXWXJKYd"k*o2p;!mC*gL5aV@[_JViQTtTT~VTVTVUVUVVVVVWWWWXWYXXZY[Z\[\[\[\[\[\[\KP_j!q(v1w9 uA$pI/kT:d]E^eQZoXXx[X\X\Y\Y\Z\Z][][]\]]]]_]`^a_a_a_a_a_a_aMUdo
w'
|/~7}? yH'uR3mZBfbOajY^s^]|a]b]b]b^b^b_b_b`c`c`daebececececececeNYh t {& ,
5=ۂG |P0uX?n`MhgXdo`bweafagagbgbgchchchdhdieifififififififiO\l +x $* +2
ߊ:ևD N,|V<v^JpdVkk`gsgf{jekelflflflgmgmgmhmhmhmhmhmhmhmhmhmP`
p { "(/ ۏ7 ҌCɇM*U9|\GwbTqh_mogkvli~oipiqiqiqjqjqjrjrkqkqkpkpkpkpkpkpQc s~ !%+ؓ4 +͐AŌK'S6ZD}`Qxf]slgpsnmzrltlululululvmvmvmumtmtmtmtmtmtmtTf +v "ޕ&ӗ3 ʔ@J%R4YB_O~e[yjetonqvto~woxoyoyozozozozpyoxowowowowowowVi x ڙ К1Ƙ?I"Q2X@^McY~hczmmvrtsyyr|q}~r}}r~{r~yr~xr~yr|yr{zrzzrzzrzzrzzrzzrzY
l{ + + +?H$O2U?ZK_Wxcboglfku^r{Z|~Y}X|X{WyVxUxVyWzWzWzWzWzWzl~ +^ +VO H!B& <* 8/"55$2;%/A%-H%+Q%)Z%(e$&q#$~#""!!!!!!!!!!!!!! +aiiiiii3 *)-*0- 04 1?$0K(0W,/c/.o0-{1,1-1-1.1.0/0/00/1/1/2.2.3-4,4,4,3-3.3.3.3.3.4 *(0(3+ 43 5=$4I)3U.2a11m20y3/3030212222231314040505/6.7.7-6.6060606060605 ,'3&7( :1 ;<$9G)8R/6^35j44v5353544545463637372829191:0;0;0:19393939393936 0$8#<%@. A9#@D*=O0;[49g68s78~7878796:6:6;5;5<4<4=3>3>2?2>4=5=7=7=7=7=7=785!= C$G- H6!FA)CL0@W6>c9=o:=z:=:=9>9?8?8@8@7A7B6B5C5D4C6B8B:A;B;B;B;B;B;9: B J#O+P4 N>&KI/GS6D^;Bj=Av=B=B<C<D;D;E:F9F9G8H8H7H8G;G=F?F@G@G@G@G@G@;?GR!W)X2W;#RE,NP5JZ<Gf?Fq@G|@G?H>I>J=J=K<K<K<L<L<M>L@KBKDLELELELELELE<COY _(`0_9 \B'VL2QV:Ma@LlCLwCMBMBMBNBNBNBOBOCOCPCQCPFPHPIQJQJQJQJQJQJ=HV` f&h.h6e?"_I,ZT7U]?RhEQrGQ{HQHQHRIRISISISITITIUJULTMTNUOVOVOVOVOVO?N\
f l% o+p3n<jG%dQ0^Z=YcFVlLUvNU~NVOVOVOWOWOWOXOXPYPYQYSYSZTZTZTZTZTZTCRa k r# v) w1v9sE mO,gW:a_F\hNZpRZyTZTZUZU[U[U[U\U\V\V]W]X]X^Y^Y^Y^Y^Y^YGV f pw!{'}- +}7zCuM)oU7i]DcdN`lU_tX^|Z^Z^Z_Z_[_[`[`[`\a\a]a]a]a]a]a]a]a]JZ jt{ $*ك4 +πA{K&uS4pZAkaMfhUdp[cx^b_b_c`c`c`c`cacadadadadadadadadadaM^ mw އ%ԇ2ʅ?I#|Q1vX>q_JmeTil\gs`f{cfdfdfefefefeffffffgegegegegegegeP
b
pzڋ + + +k x
+{ + +>F!L-xQ9pUChZM`^VYd]TlbQvcPbOaO_N^N\M[L]J_K_K_K_K_K_y + +1
, +($! "'-4 < EOXb +bg! j' +i/f8cD ]N)XW5T`<Sj@RsAR|BRBSBSBSBTBTCTCTCUDUDUFUGUGUHUHUHUHUHBP ^gm p$p+ o5
kBfL&`T3[\=XeCWnFWvGW~HWHWHWHXHXIXIYIYJYJYKYLYLZLZLZLZLZLEU clru v&v2 r?nI#hR0cZ<_aD\iI[qL[yM[N[N[N\N\N\O\O]O]P]Q]Q]Q]Q]Q]Q]Q]QI
Y gpvy{ {0y=tH oP-jW9f^CbeK`mO_tQ_|S_S_S_T_T_T_U_U_U`V`V`U`U`U`U`U`UL ] +j
sy +` m v
+AJ"Q.}W:y\EuaNqfWnl]lsb|k{ezjfxjgvjgtjgsjhqjhpjgpkfqkdqjcqjcqjcqjcqjcWiu +AI O,T7xYAq]KiaTae]ZlcVtgTgSfSeRcQbQaPaNbOcOcOcOcOcl + +J,D3?:;A 8I 7S 6] 5h 5u 4 3221000000 +9
4!0&-,*3'9$A"J T ` n}
+ + + + + + +#
"
(
+/
8 B + +Y.U7RD NO%KY+Jc.Jm/Jv0J~0K0K0K0L0L0L1L1L1M2M2M4M6L7L7L8L8L8L8<G + +U]b c"a*_5
[AWK#SU-P^2Og5Op6Oy6O6O6P7P7P7P7Q7Q8Q8R8Q:Q;Q<R<R<R<R<R<@
N [cgi h$g2d>_H ZQ,WZ4Ub9Tk;Ss<T{<T<T=T=T=U=U=U>U>U?V@UAUAUAUAUAUAUAC S_ gl +Wc k +y@uI qP,mV7i\@fbGciLbpOawPaQaRaRaSaSaT~aT}aT|aS|aS{aR{aR{aR{aR{aRQ +AH O)T4}X>v~]Go{aPhxfXbvl_^ttc[t~dYtdXtcWtbWtaVu`Ut`Ut_Vr^Wr^Wr^Wr^Wr^b + +2,
/3,;*C)L'W&b%p
$ # " +! +'' $. !5
= F P \ +j z +& +- +5 +> +HTb + + + + + + + + + + +&#"%.:GT`lv
+ + + +
# " , 7 D P ]is}
! " ! " +! +! !!!!!! !% ()'4%@$M#Y#e#p#y$$%%&&''(
(
) ) ) )((((((( $'. 1&01.<,H+U+a+l+v,~,---../00011000/////#*18:#9,784C2P2\2g3r3{4455666677787776 6 6 6 6 )1; B D C)@3<>9J8W9b:m;w;;<<<<====>>> = = =!="="="="/7 + C JM L% I.D9AE@R@] @g Aq Ay A B B B B C C C C C D D#C%C&C'C'C'C'C'4
> J
RUT!Q) N4KAHL GW"Fa#Fk$Gs$G{%G%G%G%H%H%H%H&H&I&I'I)I+H,H,I-I-I-I-9 EQ X[[ X#W1 T>QH NR$L\(Le*Kn+Lu+L}+L+L+L,M,M,M,M-M-M.N/N0N1M2M2M2M2M2= +KW] ` +}@zH wN'tS1qX:{m]AukbHqhhNmgoRjfxThfUffVdfVcfVafV`fV_fU`fS`fRafQafQafQafQY + +0C /L -V -a ,m ++| *)؝(ذ&%$#### +'# ! '/8ALX f +v + +"%/;H
U + +ER
^ j +t} + +
*6BO[ g q z ' 2 >KW
c n +w + ')#(/%:#G"S"_
"j "s +#| $ $%%&&'''(((( ) )
((((( $
* 1 3!
1*.5,B*N*Z+e
,o ,x - +. +. . . / / +0 +0 +0 +0 +1 11000000$+ 5 ;< ;& 704<2H2U3`4k5t5{6667777888888877777* + 3 > DFD!@* +;5
:C;P;[<e<n<v=}==>>>>>>>??>> > > > > > 0 +;F LMKG$F1 D>BJBUB_BhBpCxC~CCCDDD D D D E D D!D"D#D#D#D#5BLQ +Z?WH TP$RX(R`+Qh,Qo-Qv-Q}-Q.Q.Q.Q/Q/Q0Q0P1P1P2P2P2P2P2P2C + +n?kG hM%dS-aX4_^9}]d=z\k?x\sAv\{Bu\Cs\Cq\Do\Dn\Dl\Ek[Ek\Ck\Bk\Ak\Ak\Ak\AQ +~@|FyzL#sxQ,muU4gsZ<ap_C\neIXmmMUlvOTlOSlNRlMQmLPmKOmJOlJOkIOkIOkIOkIOkI^ +q@kFeK!_P)YU1SZ7N`<Kh>Is?H~>H=G;F:F9E7D8C:B;B;B;B;o + +^?XESK NP$IV)F^,Dg-Bq-A},A*@)?'?&>%=%<':):):):)| +, * )( ' ' ' ' + + + +
+( 4 @ +MYdox +
% 0 = I V
a
k
t| +Q]gqy !!!
$ ) * (( +%3 #? +"L"X"c#m$u$}%%&&''((())*** +) ) ) ) ) $/ +341".- +9 *F+S-^.h.p/x/~000111122 2 2 +2 211111% /8<
<: 5&334A 5M 6X 6b 7k 7r 8y
8
8
8
8
9
9
999999999999+ +^?[GXN"VT'T[*Sb,Si-Rp.Rw/R/R0~R0}R1{R1yR2xR2vR3vR2uR2uR1uR1uR1uR1G +o?lE|jK!wgP)qeU0lbZ6ha`;e_g>b_oA`_xB^_B]_B[_BZ_BY^BW^BW^AX^?X^>Y^>Y^>Y^>T +u}@o{FjyK!dwP)^uT0YsY7Tq_=Ppg@MpqBLo|AKp@Jp?Jp>Ip=Hp<Ho<Gn<Gm=Gm=Gm=Gm=c + +;D
8K6S4[3f2q1~0
/ / - +, ++ * *
*
*
+Q + + + + + + ".;GS^hq + + )6C
OZdm + !! %0=JU_i +3 3
3
333% +8Y 8a 9i 9p 9v 9| 9 9 9 : : : :
:
::::9999, +`>]E~ZK zXQ$wVV(tU\+qTc-oTj/mTr0lT{1jT1hT2gT2eT3cT3bT4aT3aT2aT0aS0aS0aS0K +e|@_{EZzJ UxO$PwT*Lu[/Iub1Ftl2Etv2Dt1Dt/Ct.Bt-Bt,At+@r-?q.?p.?p.?p.g +>E;L8S6\5e4p3}211
0 . . -
,,, +/W +.a +-l ,y+*('&%$### + + + + + + + + +
'3@ +F +4 3 3 3 3 ' +9X +9` +9g +9m +:s +:y +: : : : : : : :
:
::9999- +P?NFLMKSJZ }J` {Jg yJn xJu vJ} uJ sJ rJ!pJ!nJ"mJ"kI#kI"jI!jI!jI jI A + +hk?ciE^gJ YfO#UdT)QbZ-Nab1Kak2Jau2Ia2Ha1Ga0Fa/Ea.Ea-D`-D_-D^-D^-D^-\ +JBFGBM?T<\;e:p9|8766543~3}2}2}s +@D
<K9R7Z6c5n4z3211
0 / .---z +3O 1W 0a /k .w +- ,+*(('&& & + + + + + +4 +4 +3 +3 +& +9p +9v +9} +9 +9 +: : : : :
:
}9}9|9|9|9. +|N?yLEuJLsIRpIXoH^mHekHm jHu hI~ fI eI cI aI `H ^H ^H ^H ^H ^H ^H F +jZ>fXDaWI^UN ZTT"WS[%USb'SSk(RSu)PS)OS)NS)MS)KS)JR)JR(KR&KQ%KQ%KQ%S + +4N 2V 1_ 0i /u . +- ,+*)(( ' +' +x + + + +e +k + +{9 +y9 +x9 v9 u9 s9 r9
p9
o8
o8
n8
n8
5 +=I ~=P |=V z<\
y<b
w<i
v=p
t=ws=q=o=n=l=k=i=h=g<g<g<g<; +nK>jJDgIJdHPbGV`G]^Gd]Gm[GvZG XH WH UG TG SG RG RFRFSFSFJ + +Od@KcEGbKDaQAaX ?`a =`k <`v ;a ;a:a9`8`8`7^6]6\6\` +5zL 3yT 1y\ 0yg /yr .y +-y ,x+x*x*w)u(t (s (s o +3 + + + + + + + + +j8 +h8 g8 e8 d8 b8 b7 a7 a7 a7 : +o;M m;S k;Y j;` h;g g;o
e<w
d<b<a<_<]<\<[;Z;Z;Z;Z:@ +j@C h?I
f?Od?Ub?\a?c_?k^?t\?~[@Y@W@V?U?T?S>S>T>T>E +dD@
aDF^CL\BR[BXYB`XChVCqUC{SCRCPCOCNCMBMBMAMAMAI +RS>NRDKQJHPPFOWDO_BOiAPt@P?P>P=P<P;O;N;N;M;MU +E^A
B^F?]M<]T:\]8\f7]q7]~6]5]4\4\3\2Z1Y1X1X] +=eE
:dK7dS6d[4de3dp2d}2d1d0d
0c /c .a
-`,_,_` +-l ,l+k*k)j)i(g 'f 'f d + + +R + + + + + + + + +[7 +Z7 X7 W7 U6 U6 U6 U5 U5 ? +^:Q ]:W [:^ Z:f X:o
W;y
U;
T;R;Q;O;N:N:N9N9N8C +Y>G W>M
U=TT=[R>cQ>lP>vN>M?K?J>I>H>G=H=H<H<F +IM?
FLECLLAKS?K[=Ke<Lo;L{:L9L8L7L6K6K6J6I6IO +2`N 0`W /`` .`k +-`x +,` +`+_*_)^(](\ '[ +'Z Y +j + + + + +R +X +] +c +h + +M6 +K6 +J6 I5 H5 H4 H4 I4 +; + +N8V M9^ K9g J9q I:| G: F:
D:
C:
B9
B9
B8
B8
B7 ? +.N +-M ,M ,K +J +I
J +0TT +.T] +-Uh ,Ut ,U+U*T)T(S(S'Q&P &O +N +{! + + +3 +=9i +<9u +:: +9: +89 +79 +69 +59 +58 +67 +67 +: +9=T 8>] 7>g 5>s 4> +3> +2> +2> 1> 0= 0< +0< 0; = +2C[ +1Cf +0Cq +/D~ .D .D-C,C+C+B +@ ++@ +A + +e +m0 + + + + + + + + + + + + + +X +S +`7 +l + + +v + + +L +G + + + + + +S +[ +Aw +F1 + + + + + + + +C + + +5d + +:' +H +L +Q + + + + + +: +$ +)T +- +: + + + + + +) +0 + + + : + +! +( +, + +h + + + + +
+ +& +. +, + + +! + +
!"$%&()*+-./02346789;<=>@ABDEFGIJKMNOPRSTUWXY[\]^`abcefgijklnopqstuwxyz|}~ +
!"$%&()*+-./02346789;<=>@ABDEFGIJKMNOPRSTUWXY[\]^`abcefgijklnopqstuwxyz|}~ +
!"$%&()*+-./02346789;<=>@ABDEFGIJKMNOPRSTUWXY[\]^`abcefgijklnopqstuwxyz|}~ +
!"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~mft1 +
!"#$%&'()**+,-./0123456789:;;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~ +
!""#$$%&&'())*+,--./01223456789:;<=>?@BCDEFHIJLMOPRSUWXZ\^`bdfhjmoqtvy|~ +
!""#$$%&&'())*+,--./01223456789:;<=>?@BCDEFHIJLMOPRSUWXZ\^`bdfhjmoqtvy|~6; ?=EcJMϱjȮǮǮǮƮƮƮŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭ6; ?=EcJMϱjȮǮǮǮƮƮƮŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭ6; ?=EcJMϱjȮǮǮǮƮƮƮŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭ6; ?=EcJMϱjȮǮǮǮƮƮƮŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭ6; ?=EcJMϱjȮǮǮǮƮƮƮŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭ6; ?=EcJMϱjȮǮǮǮƮƮƮŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭ6; ?=EcJMϱjȮǮǮǮƮƮƮŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭ6; ?=EcJMϱjȮǮǮǮƮƮƮŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭ6; ?=EcJMϱjȮǮǮǮƮƮƮŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭ6; ?=EcJMϱjȮǮǮǮƮƮƮŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭ6; ?=EcJMϱjȮǮǮǮƮƮƮŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭ6; ?=EcJMϱjȮǮǮǮƮƮƮŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭ6; ?=EcJMϱjȮǮǮǮƮƮƮŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭ6; ?=EcJMϱjȮǮǮǮƮƮƮŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭ6; ?=EcJMϱjȮǮǮǮƮƮƮŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭ6; ?=EcJMϱjȮǮǮǮƮƮƮŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭ6; ?=EcJMϱjȮǮǮǮƮƮƮŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭ5: ?=DcILϱjȮǮǮǮƮƮƮŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭ5: ><DbIKαjȮǮǮƮƮƮƮŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭ49 ><CbHJαiȮǮǮƮƮƮƮŮŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭ49 =<CaGHͱjȮǮǮƮƮƮƮŮŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭ38 =;B`FFͱkȮǯǯƯƮƮƮŮŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭ38<:A_EḎkȯǯǯƯƮƮŮŮŮŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭ27;:@^CA˱lȯǯƯƯƮŮŮŮŮŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭ16:9?]@=ʱlȯǰƯƯŮŮŮŮŮŮŮŮŮŮŮŮŮŮŮŮŮŮŮŮŮŮ0597<^<8ʱmǰ}ƯůůŮŮŮŮŮŮŮŮŮŮŮŮŮŮŮŮŮŮŮŮŮŮ.3768a51ʵaưůůůŮŮŮŮŮŮŮŮŮŮŮŮŮŮŮŮŮŮŮŮŮŮ+0271d+5ȽZİįįįĮĮĮĮĮĮĮĮĮĮĮĮĮĮĮĮĮĮĮĮĮĮ',*;'i$7W»oµ~ñð¯ "#?(m*8T½hнuؽ|y㭹w姸w磷w頶x韶zꟶ|韶|韶|韶|韶|韶|韶|韶|韶|韶|韶|韶|韶|韶|韶|韶|韶|$D*q4?QdoȬnϤmӛlוlّmڏoێsۏvۏvۏvۏvۏvۏvۏvۏvۏvۏvۏvۏvۏvۏvۏvۏvۏv &J1i<GR^``aƉbɅd˃f́íḿq́q́q́q́q́q́q́q́q́q́q́q́q́q́q́q́q
&*G6_BtMSQSUWzZw]uatdthtmtmtmtmtmtmtmtmtmtmtmtmtmtmtmtmtm0@E6KYT}\dԬvȬǬƭƭƭƭƭƭƭƭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭ0@E6KYT}\dԬvȬǬƭƭƭƭƭƭƭƭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭ0@E6KYT}\dԬvȬǬƭƭƭƭƭƭƭƭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭ0@E6KYT}\dԬvȬǬƭƭƭƭƭƭƭƭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭ0@E6KYT}\dԬvȬǬƭƭƭƭƭƭƭƭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭ0@E6KYT}\dԬvȬǬƭƭƭƭƭƭƭƭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭ0@E6KYT}\dԬvȬǬƭƭƭƭƭƭƭƭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭ0@E6KYT}\dԬvȬǬƭƭƭƭƭƭƭƭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭ0@E6KYT}\dԬvȬǬƭƭƭƭƭƭƭƭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭ0@E6KYT}\dԬvȬǬƭƭƭƭƭƭƭƭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭ0@E6KYT}\dԬvȬǬƭƭƭƭƭƭƭƭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭ0@E6KYT}\dԬvȬǬƭƭƭƭƭƭƭƭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭ0@E6JYS}\dӬvȬǬƭƭƭƭƭƭƭƭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭ0@E6JYS}[cӬvǬǬƭƭƭƭƭƭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭ0?D6IXR}[bҬvǬǬǭƭƭƭƭƭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭ0?D5IXR}ZaҬvǬǭǭƭƭƭƭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭ0?D5IXQ}YaѬvǬǭǭƭƭƭƭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭ0?C5HXQ|Y`ѭvǬǭǭǮƮƮƮŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭ0>C5HWP|X_ѭtǬǭǮǮƮƮƮŮŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭ0>C4GWP|X^ѮrǭǭǮǮƮƮƮŮŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭŭ1>B4GWO|W߳]ѯoȭȮǯǯƯƮŮŮŭŭŮŮŮŮŮŮŮŮŮŮŮŮŮŮŮ1=B3FVN|Vߴ\ѰkȭǯǯƯƯŮŮŮŮŮŮŮŮŮŮŮŮŮŮŮŮŮŮŮŮ1=B3FVN{UYӳcȮ~ǰƯůůŮŮŮŮŮŮŮŮŮŮŮŮŮŮŮŮŮŮŮŮ1<A2EUM{STԹVȯxưůůůŮŮŮŮŮŮŮŮŮŮŮŮŮŮŮŮŮŮŮŮ1;@1DTKzRLIƲuŰįįĮĮĮĮĮĮĮĮĮĮĮĮĮĮĮĮĮĮĮĮĮ1:?0CSJyM=PĸnñįįĮĮĮĮĮĮ29=/BQHwA5Ukx辶븵쳴}}|荒}勉~勉勉勉勉勉勉勉勉勉勉勉勉勉勉勉16;,?NCr,;Wüiμtպyڲvޫuॺt⡹s䝹t囹u暸x暹{嚹{嚹{嚹{嚹{嚹{嚹{嚹{嚹{嚹{嚹{嚹{嚹{嚹{嚹{-37);J+s5BWfoɭnϥmӞm֘lؔlڑnۏpۏsۏvۏvۏvۏvۏvۏvۏvۏvۏvۏvۏvۏvۏvۏvۏv' +;!:5.T9rDNXYZ[[\]_}a{dzgzkzozozozozozozozozozozozozo +F!J>Q\OiNrJAIYgĹq̵vӨrpܔrߒwߒ~ޔݕܐݐݐݐݐݐݐݐݐݐݐݐ +E J>LVK_Hg=CL\hoȨnΞmӔlnٌsٌyٍ؎ՏՏՏՏՏՏՏՏՏՏՏ
+ +4 B9NSYl`glrx~|ywwxyz{|Ԃӂӂӂӂӂӂӂӂӂӂ " +4 B9NSYl`glrx~|ywwxyz{|Ԃӂӂӂӂӂӂӂӂӂӂ " +4 B9NSYl`glrx~|ywwxyz{|Ԃӂӂӂӂӂӂӂӂӂӂ " +4 B9NSYl`glrx~|ywwxyz{|Ԃӂӂӂӂӂӂӂӂӂӂ " +4 B9NSYl`glrx~|ywwxyz{|Ԃӂӂӂӂӂӂӂӂӂӂ " +4 B9NSYl`glrx~|ywwxyz{|Ԃӂӂӂӂӂӂӂӂӂӂ " +4 B9NSYla~glqw|၂|zzz|}~ڀԃ΅ͅͅͅͅͅͅͅͅͅͅ " +5 B9OSYla~glpv{ށ}|}ۀڂӅΈȈLjLjLjLjLjLjLjLjLjLj + + + + +)91FIQ_Yn_|fznuvo}kiiijkllmpruvvvvvvvvv +)91FIQ_Yn_|fznuvo}kiiijkllmpruvvvvvvvvv +)91FIQ_Yn_|fznuvo}kiiijkllmpruvvvvvvvvv +)91FIQ_Yn_|fznuvo}kiiijkllmpruvvvvvvvvv +)91FIQ_Xn_|f{nuup}kiiijklmnpsvvvvvvvvvv +*91FHQ^Xm_{el{su{olkklmnoqtwyyyyyyyyyy +*91GHP\Xl^zdjqzytommnpqrux{|||||||||| +*90GHP[Xk^ydjowy~spoprsvy|}~~~~~~~~~~ *:0GHPZXi^xdinu~|wrqrsuy}Ȁ +:0GHPYXh^vdimsz|ussux}ǁ +:0GHPWXf^udimqy悀ytuw|ǃ +:0GGPVXe^sdimqw~~vvzρƄÿĺĶIJñññññññññ +:/GFPTXc_qe~impt|⅄yxDžƾǸǴǰǭƬƬƬƬƬƬƬƬƬ +:/GEOSXa_nc{glptz⎃׀|Ȃʽʶʱʮʫɨȧȧȧȧȧȧȧȧȧ ,:/GCPQY_^laxeimryښˋͼγ̥ͮͪͧˣʣʣʣʣʣʣʣʣʣ,:/FBPOY]\i_ucglrޮvУ}IJϬѨѤТРϟ̝͞˝˝˝˝˝˝˝˝ +0 ;6BIEZDiDuEzFqGhIbL_R]X\^[f[n[v[\劘\匘\匘\匘\匘\匘\匘\匘\匘\匘 + $w!0m%:c)C\,JU/PP2UL6XI:ZG?\EC]CH^BL^@Q^?W^>\^=c^<l]<l]<l]<l]<l]<l]<l]<l]<l]ɹ +T"M)H /D"3@'7<+9:/;83<67=5;>3??2D?1H?/M?.R?-Y?-Z?-Z?-Z?-Z?-Z?-Z?-Z?-Z?vs l g.&_>9cFEbOR`X_[bjUlrRuyO|N~MMNOOPPR~V~Y}\}_|a{a{a{a{a{a{a{a{vs l g.&_>9cFEbOR`X_[bjUlrRuyO|N~MMNOOPPR~V~Y}\}_|a{a{a{a{a{a{a{a{ws l g.&`=8dFEdNRaX_]ajWksSuyP}ONNNOPPQȀSWZ~]~_}a}a}a}a}a}a}a}a}xt n i.%e<7jDDjMQgU^b_j\isVs{S|QPPPQQRS˃VσZ҂^Ձ`cۀc݁c݁c݁c݁c݁c݁c݁c݁yu o k-%j;6oCBoKOlS]g\iafs[p|VzSRRRSSTŬZφ^҅aՄdeۄf݅f݅f݅f݅f݅f݅f݅f݅zv +pl-%n94tBAuJNrR[mZhgds_n|YxUTSTTUVÊYˉ]Ήa҈eՇfهgۉhۉhۉhۉhۉhۉhۉhۉhۉ{w +rn-%s83yA?zILxPYsXflarek|^uXVUUVWXƍ]ˌaόeӋhiٌj؍k؍k؍k؍k؍k؍k؍k؍k؍|x +tp-$x71~?=GIOWzVds^plh{dr]}XWWWX[ǐaːeϏiԎklՑmՑnԒnԒnԒnԒnԒnԒnԒnԒ}z uq,$}5/>:GGNTUa{\mseykoby\XXZ\_Ȕe̓jђlӓnҔoҕpҖqіqіqіqіqіqіqіqі~{ vu+#4-?8GDNQU^[j|bvsljvb^^`bdǗjΖnіoИqϙrϚsϚsϚsϚsϚsϚsϚsϚsϚsϚ~| xy*!4*?5HAOMUZ[gas|i~tsk}edegiěmΛqΛs͝t̝u̞v̞v̝v̝v̝v̝v̝v̝v̝v̝}y}) 4(?3H>OJVV[bangz~quzmijkmpˠtˠvʡwɡxɡxʡyʡyʡyʡyʡyʡyʡyʡyʡ~z( 5&@0I;PFVQ\]aiguߊp׀xvpoprtǤxǤyǥzǥzǥ{Ǥ{ȣ{ȣ{ȣ{ȣ{ȣ{ȣ{ȣ{ȣ{( 5$@.I8PBVM\Xacgnْo}ωu|wtuvxĨ{Ũ|Ĩ|Ũ}Ũ}ŧ}Ʀ}Ʀ}Ʀ}Ʀ}Ʀ}Ʀ}Ʀ}Ʀ|(5"@+I4Q>WG]Qa[ۢejҙl{ȑszzy{|~¬~¬«ëĩĨĨĨĨĨĨĨĨ}(5 @(J1R9XB^JaT֧bh̠jyqw}~¬êêêêêêêê~(5 @%J-R4X;\B۳YRЭ`fƦgwnuz¬¬¬¬¬¬¬¬(5A"K(S/V4X:չUP˲]deulrx}~(5A K#Q(S+O8оSNŸ[bbsioty}usruxz|~~~~~~~~(5AL M P G6PKX`_qekput|lkjnprtvvvvvvvv
(5AIHB E3NIV]\ob~gk{pmxgfeiklnoooooooo ' 4@B> 7B0KFRZXl]{bfrjftba`cŧfĩgëi¬j¬j¬j¬j¬j¬j¬j¬j¬& 2 =5-=E-IBNVThXx\w_ie`q]\Ě\Ʋ]˟`ɢbȤdǥeƦeƦeƦeƦeƦeƦeƦeƦ$.01 +@J+O>ORPdSt{UmX`_ZnXӂXWرWіZИ\Λ^͝`̞`̞`̞`̞`̞`̞`̞`̞ + + + bX M,!M9/QC;QMFNWQIaZElaBxeAg@h?h?i@i@iAhAhAhDhHgLgPfReUeVdVdVdVdVdVdVdi + bX N,!N9/RB;RLFOVQJ`[FlaCweAh@i?i@i@iAiAiAiBiEhIhMgQgSfVeWeWeWeWeWeWeWej +cZ O,!S7.V@:VJETTQO^[JicFthCjBlAlAmBmBmClClDlHkMkQjTjWiXiYjYjYjYjYjYjYjk e[ Q+!W6-\?8[HDXRPS\[NfdIrjF}mDoCoCpCpDoEoEoGoLnPnTmWlZl[m[n[n[n[n[n[n[nl f\ S+!\4+a=7aFC]POXZ[RdeLokH{pFrErEsEsFsFrGrJqOqTpXp[o\p]q^q^q^q^q^q^q^qm g
^ W* b2*g;5gDAdMM^WZWadQlmLwrHuGvFvGvGvIvJuNuStXt[s^s_t`uavavavavavavavni
` \( h0'n93oC?lKKfTX_^cWimPttLxJyJzKzLzNyOyRxWw\w_waxbyczdzdzdzdzdzdzdzoj
a b& n.%t90vB<tJHoRUh[a`elXpuR|zP}O~Q~R}T}U|W|\{azb|d}e~fgggggggpk c g$t.#{8-~B9}JExQQqX^jbjamtZw|VUVXY[]a~dfgi߃j߄j߄j߄j߄j߄j߄j߄j߄ql el"y- 8*A5IAPM{WZs_fkirbt{][\]_aaуe߃hޅi݇k܈l܈m܈m܈m܈m܈m܈m܈m܈m܈rn fq!~- 8'A1I=PHWU}]bugnlqye{aabcdf̉hۉkڊmٌnٌoٍpٌpٌpٌpٌpٌpٌpٌpٌso hu!-8#A-I8PCVO\\fhxouowhgghijďl֏o֏pՐqՑrՑsՐssssssstp iy ,7 A)I4P>VI\U܋fbԁmrxtq|mlmnopӔrӔtҕtҕuҔuӔuӓuӓuӓuӓuӓuӓuӓtq +l} ,7 A%I/P8VBߙ\M֒c_͉kpŁq~yxsqqrst˙vϙwϙwИxИxїxіxіxіxіxіxіxіuq +o +7A!H)O2U;ڟZIјb]Ǒimo|v{}wvwwxĝy̝z͝z͜zΛzϚyϙyϙyϙyϙyϙyϙyϙvr +r +7@ H$O+ߪT3դWG˞`Zgkmzsy}zz{||ɡ|ʠ|˟|̞{͜{Λ{Λ{Λ{Λ{Λ{Λ{Λvs u
*6?G N$ڮM1ЩUEƣ^Xeilxqw}~ǥȤ~ɢ~ʠ}˟}̞}̞}̞}̞}̞}̞}̞wt x +*
5>F߳LճI/ˮSC[Vcgivoty}{zĩ|Ƨ~ǥȣʡʠʠʠʠʠʠʠxu { + ) 4
=D۹CѸG,ƳQAYT`egtmrv||tqonêqĨtƧvǥxȣyɢyɢyɢyɢyɢyɢyɢyv
'2 +: ? +9̽E*O>WQ^bdrinstyjhgf§iƧkƦnǥpȤqȣqȣqȣqȣqȣqȣqȣzw
%.426C'L;TN[`aof}jzoludcbadɢfɢgȣiɢjɢjɢjɢjɢjɢjɢjɢ{x !'߾% 3@$I8QKW\]laz~fqjer_^^]_Λa͜b̝d̞d̞d̞d̞d̞d̞d̞d̞|z +9 B/IBNSScyVqlZ~`_YkV{VƎUȣTɼT݇VڊXٌYZ֏Z֏Z֏Z֏Z֏Z֏Z֏ + +1 . + ( &"!$&!!+! 0! 6 < B I P U U U U U U U Y PE#:0!=6%A@0AJ:>UC;`I8mM6zP4Q2R2R2R2R3R3R3R3R4Q9Q=PAPDOGNINININININININZ
QF"=.!A3%E=0EH:ARC>^K:jO8wR6T4U4U4U4U4U5U6U6T8T<TASERHRJQLRLRLRLRLRLRLR[
SG"A, E1$H</HF:EQDA[L=hR:tU8W6X5X6X7X7X8X9W:W;W@VDVHUKTMTNVNVNVNVNVNVNV\
TI!E* I0#M9.MD9JODDYM@eS<rW:Z9[9[:[:[;[<[=Z>Z?YDYHXLXOWPXQZRZRZRZRZRZRZ] UJ!I( O-"S7-SA8PLCJWMDbUAnZ?{]=^=^>_?^@^A^B^C]D]H\L[P[R\S]U^U^U^U^U^U^U^_ +WL N% U+ [6*[@6XJASTLL_VGk]Dw`CbBbCcDbEbFbGaHaI`M`Q_T_VaWbYcYdYdYdYdYdYd` +XN T#\* c4(d?3aH?[RKU\UNg^JscHfGfHgIfJfKfMeNeOdRcVcXeZg[h]i]i]i]i]i]i]ia + ZP Z d(k3$m=0jF;eOG^YSWc^QneNziMjMkOjPjQiSiThUhXgZi\k^l_m`nananananananc + \T ` k'r2!u<,tE7oMChVPa`\YjeTvkSnSoTnVnWmYlZl[l\m_o`qbrcrdsdsdsdsdsdsdsd ]Xf q&y1 |;'|D3yL>rTKj]Wbgc\rlY}qYrZr[r[r\r]r^s`scudvewfwgwgwgwgwgwgwgwe ^]l v%0:#C.K9|REu[Rne_fnj`xs^w^x_y`yaybycydyfzh{i|j|j|j|j|j|j|j|j|f`bp {$/9 B(J3Q>ZKycYpkhitte}{c~d~eefghjkဨlဥmဣm•mmmmmmgafu
$
.8A#I,P7ۊZD҂aVzifrpslx}iiijklÄlۄnޅoޅpޅp߄p߃p߃p߃p߃p߃p߃p߃hb
j
x # -7@ H&ޖO/ՐWẢ_SĂgcznqtu}o}nnnoppԉrۉrۉr܈r܈r݆r݆r݆r݆r݆r݆r݆hc
m | " ,
6?F ڜM+ЖV?Ǐ^Pealo|r|vysrsstt͎u؎u؍uٌuڋtۊtۉtۉtۉtۉtۉtۉid
p * +4<ޣCՠJ)˛T<]Nd_jmpz}vy}vvvwwǓwԒwՑw֏w؎vٌvٌvٌvٌvٌvٌvٌje s )1 +9
ڨ=ХH'ǠS:[Lb\hknxs~y{yzz{zіzҕzԓyՑy֏y֏y֏y֏y֏y֏y֏kf v &.4֬9̩G$¥Q8YI`Zgilvqv}}~z~x~wv~Κx}Иy|Җz|Ӕ|{Ԓ|{Ց|{Ց|{Ց|{Ց|{Ց|{Ցlg y "(ۯ,Ѱ7ǮE"O5WG^Wefjtnszyromkk͜nϚpИrіt~Ӕt~Ӕt~Ӕt~Ӕt~Ӕt~Ӕt~Ӕmk +} + + +;51 - )" &( #-! 3! : B K U _ j
x
y
y
y
y
y
y +#! $*07 ? GOYZZZZZZI@5&2/ 44"2=%2H-0S4-`8+n;*{=)>(?)?*?+?+?,?-?->.>/>0=2<6<9;;;<<<<<<<<<<<<JA6&5- 72!6;%5E.3Q51^:/k=-y?,@,A,A-A.A/A/A0A1@2@3@3?6?9><=>>????????????LA7%8* :/!:8%:C.8O65[<3h@1vB0C/C0D1D2D2D3C4C5C6B6B7A9A=@?@ABBCBCBCBCBCBCMC8%<( ?, ?5$@A.>L7:X>8eB6rE5F4G5G5G6G7G8G9F9F:E;E<D>DBCCEEFGGGGGGGGGGGGND;$B%E) G3#H>.FJ7AU?>aE;nH:{J9K:K;K;K<J=J>J?I@IAHBHCGFHHJJKKLKLKLKLKLKLP
E@!G"L' O1!P<,MG6IR@E]GAjL@vN?O?O@OAOBNCNDNEMFMGLHKHLKNNPOQPRPRPRPRPRPRQ
GE M U&X/ Y:)VD4RO?LZHHeNFqRE}SESFSGSHSIRJRKQLPMPMPNSQUSVTWUWUWUWUWUWUWS IJT \$a.c8%`B0[L<UWFOaOLmUKyWKXLXMWNWOVPVQURTSTRWTYV[X\Y]Z]Z]Z]Z]Z]Z]T
KP[d#i,l6 j@+eI7_SCX]NShVQt[P\Q\R[T[T[U[U[V[W[W]Y`[a\b]b^c^c^c^c^c^cU
MUbk"p*t5s>&pG2iP>c[J\eUXp]V{`VaWbXbXbYbZbZb\c\d^f_g`gahbhbhbhbhbhbhW OZh
q!
w({3|= yE+tN7nYDgbQak]]ud\g\h\i]i^i^i_i`iajblcldlelelelelelelelX P_
m v }' 1;D$~M0yW=q`Njh\dpgazlanaobobococpdpepfqgqhqhqipipipipipipY Tc q { % /8A ڇL(сU:z^KseZlmghuof~sfufuguguhuhuiujvkvkukuktktktktktktZ +Wg +u $, +6ސ?ՍJ%̈T8Á\H{cXtjeoqplyvjyjzkzk{l{l{m{mzmzmymxmwmwmwmwmwmw[ + +Z
ky!)2 +ږ<ВH#ǍR5ZFaU|hcvnoruxp~}onoooppp~p}p|o{o{o{o{o{o{\ + +] n| %ߚ-՚9˗G Q2YC`Sfa}lnxrxtyrrrrrsфs߃rrငrq~q~q~q~q~q~] + +` +q
۟&П7
ǜE P0XA^Pe_jlowzuv~uuu~v}vˉ|v܇}uޅ}u߃~t~t~t~t~t~t~t^ c u + +AL+T;\KaYfgksp~xuq~m~k~igg؍j}ڋl|ۉnz݇oyޅoyޅoyޅoyޅoyޅoyޅ` j{ + +<E(K7}PEsURiY^_^iWfpSrrRqQpPnPmOkMmOpQrRsRsRsRsRsRsp + IB<6 1$ .* *1 '7 $? !H S _ m | +2 +l q$ +s,s6q@ mL+gV9`_G[hQYrVY|XYYYZZZZZ[Z[Z\Z][]\]]^^_^`]`]`]`]`]`]IN\
+irw"z) +{3z=wJ$qT5j\DdeQ`mY^w^^`^`^a_a_a`a`aaaabbccccbcbcbcbcbcbcbK
R
a nv| &/ +ڃ<~H!yR2rZBlbOgiZdrac{ecfcgcgdgdgdgegehfhfgfgffffffffffffL
U e rz "߈*Ո9̅F ÀP/zX?t_MofYknchvhgkglglhmhmhmhmhmimilikhjhjhjhjhjhjM
Y i +u~ ڍ%Ѝ7 NJDN,W<{^JvdXrkcnrjlzokqkrkrkrkrkrkrkqkpkokmkmkmkmkmkmN
\l x
+CM)U9\H}bUxhatokpvrnunvnwnwnwnwnwnunsnrmpmpmpmpmpmpO
_o| + + + ev +AJ'Q5WB~\Oua[lfgbkp[svWxVwVuUsTrSrTsUtVtVtVtVtVtVtd +g4^: U@+NF4HN:EX<Ce<Bs;Bڃ:A۔9Aܨ7@6?5<89;8>8?8?8?8?8?֍ +\+T1 L7$E>+@F/=P1;[2:h1:w09/8.7,7+6*4+1.1/1/1/1/1/̘ +HA ;%5+22 .9 +B )L 'W %d#t! +" +d*
b3^> ZK'VV3R`;Pk@PuBPCQCQCRDRDSDSDSETETFTHSITJUJVJVJVJVJVJ:G T + `hk m&k0
i<eH!`S1Z\=WeDVoHVyJVKVKWKWKWLXLXLXLYMXNXOZOZO[O[O[O[O[O=L Z fmqs"s+s9nF iP.cY;_aF\jL[sP[|Q[R[R\S\S\S\S]S]T]U]U^U^T^T^T^T^T^T@P _j qvx z&z7 vDqN*lV9g^EcfN`nT`wW_X`Y`Y`YaYaZaZaZaZaZaYaYaXaXaXaXaXC
Scn u +}BxL'sT6n\CjcNgjVes[d{^d_d_d_d_d`d`d`d`d_d^d]d\d\d\d\d\G Wgq +^ +CK%R3X?]K}bWtfblkld}rs_|}v]|v\|u[}tZ}rY}qY{p[yo]wn^vm^vm^vm^vm^vmZ +- ($ !' .6@KX h
z + + +
%
+,
6 A + +
+ + + +
'%',5BP
^
k w
$ " #)2?M[ht ! " # !$"0 < I W d p { !!"##$%&&&%$$$####"" ()+!,,*8(E'R'_'l'w(()**+,,-../.-- - - - - - - $(/27 7(542@ 0M /[ /g 0s 0} 1 2 3 345567776 6 6"5#5$5$5$5$5$%.6<A B%?0<<8H 7U 7b 8n!9y!9 : ; < < = > > > ? ?!>%='=)<*<+<+<+<+<+(5=
E K L#J,E7AC ?P">]$?i%@t%A~$B$B%B%C%C&D&D&D'E'E)E,D.C0C1C1D1D1D1D1.;
C +NTU T)
P2K>HK"FW'Fc*Gn,Gx-H-H.I.I.I/J/J/J0J0K1J3J5J6I7J7J7J7J7J73@ KV
\^ ]%Z.
V;SH OS)M]0Mh3Mr5M{5N6N6N7O7O7O7O8P8P8P:O<O=O=Q=Q=Q=Q=Q=8D R\ bde c)a8]EYO)UY3Sb9Rl;Ru=S~=S>S>T>T?T?T?T?U@UAUBUBUBUBUBUBUBUB< IWag +Q +BK#R0}W<y]GubQ|rgZvonarmvenmgllgjmghmgfmfdlfemdflagk_hj]hj]hj]hj]hj]S +BJ!}P-uU8mZCe^M]dVWk\Su_Q_Q]P[OZOXMXKZLZM[M[M[M[M[c + + +" ! + +l ~ +GTd + ' + + +LYe
q | + +
+ + + + + "-:HUan
x +
# $*!6 C Q ] i u ~
! ! " # # $ % % +% +% %%%$$$$$ #'*. .&,2)>'L'Y'e'p)z**+,,-.//
/
0/./..----!)/ 6 : 9"7-390F0T0`1l3v34566677889887 7 6 6 6 6 6 &0 7 +@DD +A(
=49@8N9[:g;r<{<==>>????@ @ ?!?#>$>%=%=%=%=%,6 +@I MNK$F.
C;AIAU Ba Bk Cu C}!D!D!E"E"E"E#F#F#F$F&F(E*E*E+E+E+E+E+1 <GQUVT P(O7
LDIP I[%Ie'Io(Ix)J)J*J*K+K+K+K+L,L,L-K/K0K1K1K1K1K1K16 A +VARL!PV)O_-Oi0Or1Oz1O2P2P2P3P3Q3Q4Q4Q5Q6P7P7P6P6P6P6P6: E + + +b?[F UL$OR,JY1Fb4Dm4Cy3C2B0A/@-@,>.<1:394949494y +*ҳ )( & $#### + + + +8
E S +_ku~ + + +
(4A N [ gr{ + + + +
# & %#
"/ <
I V b m w !"##$$%%&&'' +' '
&%%%% $ ' / 1 0 +-* *7
'D
'Q (^ )i ++s ,| --. . / / 0 +0 +1 +1 +2
1000////#
+ 2: +<;7$30 0>
0L
2Y 4d
5n6w7788999::::99988888) 1 +EADMDXDb Ek Et F{ F F G G G G G!G!H!G$G%F%F&E&E&E&E&3 +d@aI ^Q)[Y1Z`6Xg8Xo:Xw;X;W<X<W<W=W=W=~V=}V<|V;|V:{V9{V9{V9{V9A +d@^GXM"RR*LY0Ha4Fk5Ew4D3C1C0B.A-@-=0<2:3:3:3:3q +9C6K4U3`2l1z10
/ - - +)(((( + + + +
) + +% 1?LYdnw + +) ( ( ( ( +$ +4 +3
3222222%* + +-[ +,f ,t+*('&$# " +! +! +! + +M +[ + + + + + + + + " + + + ++ ++ ++ + +6 5 544333% +9R :[ ;d
;l
<s
<z<<=======<<;::::( +YBTHOM JS$F[(Cc*Bn*Az)@'?&>$=#=!;~#9}$8{&7z&7z&7z&i +- , +*)' +& % % % + + + + + + + + + +e + +7 +6 6 5
5
4 4 4 +<R <Z <b
=i
=p
=w=~=======<<;;:::% +BD
BMBUB]BdBkBrByBCCBBBB~A}A{@{@z?z?z?* +Zy@UxFPvL KuR"GtX&Dsa)Bsk)Asv(@s'?s%>s$=s"<s ;r!9p"8n#8m#7m#7m#b +8I
5R4[2e1q1
0 / . +, + * ) (((x + + + + +7 +7 +7 +6 ~6 }5 }5 |4 |4 +<Q <Y =`
=g
=m
=t=|====}={<z<w<v;u;t:t:t:) +BEBMBTB[BbBiBp}Bx|BzBxBwBuAsAq@o@n@m?l?l?l?0 +HAGI~FP|FWzF^yFewFluFttF|rFpFnFlEjEhDfDeDeCeCeCeC7 +m]?h[EdYK `XP"\VV&YU])WUe+TTn,STy,QT,OT+MT+LT*JS)IS(IR&IR$JQ#JQ"JQ"L +:I
7P5Y4c3o2|1
0 / . +- +} *|
)z)z)zp + + + + + +e +k +x7 +v7 +t7 +r6 p6 o5 o5 +n4 +n4 +) +<P ~<W }<]
{=d
z=k
x=sv={u=s=q=o<m<k;i;h;g:f:f9f91 +{BE
yALwASuAYsA`rAgpAonAwmAkAiAgAe@c@a?`?_>_>_=_=8 +pL?lKEiJLgJRdIYbI`aIg _Ip ]Iz [I YH WH UH SG RF QFQFQEQEQEB + +^\?ZZDVYJRWP NVV"KV^$IUg%GUq%FU}$EU#CU"BU!@U ?U >T >S >R >Q >Q R +Og@KeFGdLDcS AcZ ?cd =cn <c{ ;c:c9c8c6b5`4_3^3]3]\ +,p *n
)m(l(lh +.|^ +-|j ,|v+|*|){({&{%y$w#v "u +"u +o + + + + + + + + + +: + +l7 +j7 +h7 +f6 d6 b5 a5 a4 +`4 +`3 +1 +q<N p<U n<[
l<b
k<j
i<rg<{e<d<b<_;];[:Z:Y9Y8Y8
Y8
8 +mAD
jAKhAQf@Xe@_c@fa@o_@x^@\@Z@X?V?T>S>R=R<R<R<> +gFAdEGaEN_ET]D[[DcZDkXDuVDTDRDPCNCLBLALAL@L?L?C +aK>^JE[JKXIQVHXTH_RHhPHrOH}MHKGIGGGEFEFEEEDEDECH + +FaAB`H?_N<_V:__8_j7_v6_5_4_3^2^0]/[.Y-X-X\ +<gE
9gM7gU5g^4gh3gt2g0g
/f .f -e +,d +*b )a(_(_a +1oR /o\ .og +-os ,o+o)n(n'm&l$j#h "g +"g +g + + + + +u +| + +^7 +\7 +Z6 +X6 +V5 U5 T4 +S3 +S2 +S2 +9 +c;M a;S _;Z
^;a
\;j
Z;s
X;}V;T;R;P:N9M9M8
M7
M6
M6 > +^@C \@IZ@PX@WV?^T?fS?pQ?zO?M?K?I>G=F=F<F;F:F:C +XE@
VEFSDMQDSOD[MCcKCmJCxHCFCDCBB@B?A?@?@??@>H +,Z +Y )W (V (T
'TW +2bP 0bY /cd +-co +,b| +b*b(b'a&`$^#\ "[ +"[ +[ +! + +> + +O6 +M6 +K5 +I5 +G4 +G3 +G2 +G1 G1 ; +T;K R;R Q;Y O:a
M:k
K;u
I:
H:
F:
C9
B9
@8 @7 @7 @6 @5 ? +BJC
?JJ=IQ;IY9Ic7In6I{4I3I
2I 0I /H +.G -E
-D
-CI +-O ,O*N)M (K 'J 'I L +2VN +0WV .W` +-Wl ,Wx+W)V(V&U$U#S"Q"P !O +P +h +vG + + + + + + + + + +D:R B:Z @:c >:m <:y :: 8: +7: +59 39 38 37 +36 +35 +; +@?G =?O ;?W 9?` 8?k 6?w 4? 3? +1? 0> .>-= -; +-: +-: +> +7EM 5EU 3E_ 2Ei 0Ev +/E .E,E+D)D(B'A'@ '? +A + +h] + + + + +J +P + + + + + + + + + + + +& + +Or +V6 +] +k + + + +; +9 + + + + + +9 +? + +, +7j +>: +D +K + + + + + +$ + + + + +37 + +Q +_ + + + + + + + + + + +!U + + + + +s + + + +l +( + + + + + + + + + + J +V +s + + +# + + + + +< +D +
!"$%&()*+-./02346789;<=>@ABDEFGIJKMNOPRSTUWXY[\]^`abcefgijklnopqstuwxyz|}~ +
!"$%&()*+-./02346789;<=>@ABDEFGIJKMNOPRSTUWXY[\]^`abcefgijklnopqstuwxyz|}~ +
!"$%&()*+-./02346789;<=>@ABDEFGIJKMNOPRSTUWXY[\]^`abcefgijklnopqstuwxyz|}~ +
!"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~mft1 +
!"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~ +
!""#$$%&&'())*+,--./01223456789:;<=>?@BCDEFHIJLMOPRSUWXZ\^`bdfhjmoqtvy|~ +
!""#$$%&&'())*+,--./01223456789:;<=>?@BCDEFHIJLMOPRSUWXZ\^`bdfhjmoqtvy|~ ( +2<&D7LHT]\sbhlo߽rٹuӵzͰƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭ ( +2<&D7LHT]\sbhlo߽rٹuӵzͰƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭ ( +2<&D7LHT]\sbhlo߽rٹuӵzͰƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭ ( +2<&D7LHT]\sbhlo߽rٹuӵzͰƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭ ( +2<&D7LHT]\sbhlo߽rٹuӵzͰƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭ ( +2<&D7LHT]\sbhlo߽rٹuӵzͰƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭ ( +2<&D7LHT]\sbhlo߽rٹuӵzͰƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭ ( +2<&D7LHT]\sbhlo߽rٹuӵzͰƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭ ( +2<&D7LHT]\sbhlo߽rٹuӵzͰƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭ ( +2<&D7LHT]\sbhlo߽rٹuӵzͰƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭ ( +2<&D7LHT]\sbhlo߽rٹuӵzͰƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭ ( +2<&D7LHT]\sbhlo߽rٹuӵzͰƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭ ( +2<&D7LHT]\sbhlo߽rٹuӵzͰƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭ ( +2<&D7LHT]\sbhlo߽rٹuӵzͰƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭ ( +2<&D7LHT]\sbhlo߽rٹuӵzͰƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭ ( +2<&D7LHT]\sbhlo߽rٹuӵzͰƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭ ( +2<&D7LHT]\sbhlo߽rٹuӵzͰƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭƭ ( +2<&D6KHS]Zs`ehjlmʽrݽx誱 ( +2<&D6KGR]Ys^bcehkѺoڭs䛴zzzzzzzzzzzzzzzzz ( +2<%D5JGQ\Ws\^`cfŹiήlסpu鐷u鐷u鐷u鐷u鐷u鐷u鐷u鐷u鐷u鐷u鐷u鐷u鐷u鐷u鐷u鐷u ( 2<%C4JFP[VrY\_bd¯gˤjӗm܈q䈺q䈺q䈺q䈺q䈺q䈺q䈺q䈺q䈺q䈺q䈺q䈺q䈺q䈺q䈺q䈺q ( 2;%C3IEOZTrV[^aceǛhϏjׂnނnނnނnނnނnނnނnނnނnނnނnނnނnނnނnނn ( 2;$C2ICNYQqTZ]_acÓeˇg}l}l}l}l}l}l}l}l}l}l}l}l}l}l}l}l}l ( 2;#C0IAMWOpSX\^`abƁexjxjxjxjxjxjxjxjxjxjxjxjxjxjxjxjxj (2;!C.H?JVMoRWZ\^_`{bshshshshshshshshshshshshshshshshsh (2; B+H;IVLnPUY[\\~^u`nenenenenenenenenenenenenenenenene(2; B&D<HVJlN}SWXYZv[o^icicicicicicicicicicicicicicicicic(2;?"C=EUHhKxQTVWxXpYi\c`c`c`c`c`c`c`c`c`c`c`c`c`c`c`c`c`'29<$A=BREcHrM~QSwTpVjWdZ`^`^`^`^`^`^`^`^`^`^`^`^`^`^`^`^`^ +)*#,/1;{5Fq9Ph=Xa@^\DbYGeWJgUMiSQjRTkRTkRTkRTkRTkRTkRTkRTkRTkRTkRTkRTkRTkRTkRTkRTkRTk% +/:$C3JBTU]if|ov~圄܍؈ֆ{شrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴr% +/:$C3JBTU]if|ov~圄܍؈ֆ{شrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴr% +/:$C3JBTU]if|ov~圄܍؈ֆ{شrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴr% +/:$C3JBTU]if|ov~圄܍؈ֆ{شrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴr% +/:$C3JBTU]if|ov~圄܍؈ֆ{شrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴr% +/:$C3JBTU]if|ov~圄܍؈ֆ{شrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴr% +/:$C3JBTU]if|ov~圄܍؈ֆ{شrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴr% +/:$C3JBTU]if|ov~圄܍؈ֆ{شrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴr% +/:$C3JBTU]if|ov~圄܍؈ֆ{شrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴr% +/:$C3JBTU]if|ov~圄܍؈ֆ{شrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴr% +/:$C3JBTU]if|ov~圄܍؈ֆ{شrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴr% +/:$C3JBTU]if|ov~圄܍؈ֆ{شrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴr% +/:$C3JBTU]if|ov~圄܍؈ֆ{شrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴrٴr% +/9$B2JAST\hd|ltz䣀ޜږՎҊzvޫvޫvޫvޫvޫvޫvޫvޫvޫvޫvޫvޫvޫvޫv% +/9$B1JART[hc|jqv|ݥ؟Җ͏}{{{{{{{{{{{{{{{% +/9$B1I@QSZha}hnrwۮ{֩ѣ馇ꛂ囂囂囂囂囂囂囂囂囂囂囂囂囂囂% +/9#A0I?PSXh_}ejnqںuչ}ȯಟꞒ쒉蒉蒉蒉蒉蒉蒉蒉蒉蒉蒉蒉蒉蒉蒉% +/9#A/H?PRWh^}cgilrx־ߨ阢틓ꋓꋓꋓꋓꋓꋓꋓꋓꋓꋓꋓꋓꋓꋓ% /9#A.H>OQVg\}`ceinͼrְxޞ~蔵뇢臢臢臢臢臢臢臢臢臢臢臢臢臢臢% /9"A.H=NQUgZ}^_bfºi̯mբqޑv牸煳关关关关关关关关关关关关关关% /9!A-G<MPTfX|Z^adfʤiӖkۆo䀺% /8 @+G;MOReU|Y]`bdƛfώh׀l{}yyyyyyyyyyyyyyy% /8 @*G:LMPcR{X\_abdʆf{jvxuuuuuuuuuuuuuuu%/8 @(F8KJMbPzV[]_`bcvhqtpĀpĀpĀpĀpĀpĀpĀpĀpĀpĀpĀpĀpĀpĀpĀ%/8 @&F4JGLbOxUY[]^_yapflpkzkzkzkzkzkzkzkzkzkzkzkzkzkzkz%/8?"E0GHJaMvRWY[[z\r_kdhmfufufufufufufufufufufufufufufu$/7? A/FHH_KrPTWX{YsZk\facibqbqbqbqbqbqbqbqbqbqbqbqbqbqbq$.7;@1CHE\HmM{QT|UtWlXf[a_^e]k]k]k]k]k]k]k]k]k]k]k]k]k]k]k$- 4 8>2@EBWEfIsN~|QtSlTgVbY^]\bZgZgZgZgZgZgZgZgZgZgZgZgZgZgZg +6 :1;A>QB_Ej|ItsM{kOfRaT^W[[Y_XcXcXcXcXcXcXcXcXcXcXcXcXcXcXc +,6"@/I=TM^_hqqz뇉灐|zzztljjjjjjjjjjjjj" +,6"@/I=TM^_hqqz뇉灐|zzztljjjjjjjjjjjjj" +,6"@/I=TM^_hqqz뇉灐|zzztljjjjjjjjjjjjj" +,6"@/I=TM^_hqqz뇉灐|zzztljjjjjjjjjjjjj" +,6"@/I=TM^_hqqz뇉灐|zzztljjjjjjjjjjjjj" +,6"@/I=TM^_hqqz뇉灐|zzztljjjjjjjjjjjjj" +,6"@/I=TM^_hqqz뇉灐|zzztljjjjjjjjjjjjj" +,6"@/I=TM^_hqqz뇉灐|zzztljjjjjjjjjjjjj" +,6"@/I=TM^_hqqz뇉灐|zzztljjjjjjjjjjjjj" +,6"@/I=TM^_hqqz뇉灐|zzztljjjjjjjjjjjjj" +,6"@.I<RL\_fqpxꍇ冎―}|{rȺjɸkȸkȸkȸkȸkȸkȸkȸkȸkȸkȸkȸkȸk" +,6"@-H;QKZ^dqmv~蕄㍊߆܁ۀzϼpѱnίo̯o̯o̯o̯o̯o̯o̯o̯o̯o̯o̯o̯o" +,6"?,G:PKY^bqjsz瞂ᖇ܍نքyرqةsѧsϧsϧsϧsϧsϧsϧsϧsϧsϧsϧsϧsϧs" +,6!?+G9OJX^`qhpw}ڕԌ͈ۼ۪wڢwԠwҠwҠwҠwҠwҠwҠwҠwҠwҠwҠwҠwҠw" ,6!?+F8NIW]_qfmtyަ֠ʔܵݣ}ݚ{י{ՙ{ՙ{ՙ{ՙ{ՙ{ՙ{ՙ{ՙ{ՙ{ՙ{ՙ{ՙ{" ,6 >*F8MIV]]qdkpu۰|Χ״ݮߜߓڒגגגגגגגגגגגג" ,6 >)F7MHU\\qbhlrԷyǭκ֬ޢ┋ዃ܋ڋڋڋڋڋڋڋڋڋڋڋڋ" ,6 >(F6LGT\[qaejpͽv|ͳդݖ㍓ㄉ߄܄܄܄܄܄܄܄܄܄܄܄܄" ,6 >(E6LGS[Yp^bgmsùx̬}՝㇟~~~~~~~~~~~~~~" ,5 >'E5KFRZXp\`ejp²u̥yԕ}܇ᅮ{zzzzzzzzzzzzz" ,5 =&E3KDQYVoY]bgkp˝tӍxڃށyxxxxxxxxxxxxx",5 =$D2JCOWTnV[_cfiʐl҃p|}yvuuuuuuuuuuuuu"+5=#D0JANUPlTZ]_abȂcwhsuqoÜqĤqĤqĤqĤqĤqĤqĤqĤqĤqĤqĤqĤqĤ"+5= D-I=KSNkRX[]__{aqemqkƀjǒiǗiǗiǗiǗiǗiǗiǗiǗiǗiǗiǗiǗiǗ"+4< C)G9JSMjP~VY[\~]t_ldhmgzf̉e̎e̎e̎e̎e̎e̎e̎e̎e̎e̎e̎e̎e̎!+4<B"D:HRKhNzSWYZv[m]gbdjbua҂a҆a҆a҆a҆a҆a҆a҆a҆a҆a҆a҆a҆a҆!+
3;="C;FQHdKuQTVxWoYh[c`_f^p]{\\\\\\\\\\\\\!* 2 1<%A;BNE_HnM{QzSpUiWcZ_^\c[kYtYwYwYwYwYwYwYwYwYwYwYwYwYw +)3!=,F8PF[Wfhpxz|wttttsnieeeeeeeeeeee +)3!=,F8PF[Wfhpxz|wttttsnieeeeeeeeeeee +)3!=,F8PF[Wfhpxz|wttttsnieeeeeeeeeeee +)3!=,F8PF[Wfhpxz|wttttsnieeeeeeeeeeee +)3!=,F8PF[Wfhpxz|wttttsnieeeeeeeeeeee +)3!=,F8PF[Wfhpxz|wttttsnieeeeeeeeeeee +)3!=,F8PF[Wfhpxz|wttttsnieeeeeeeeeeee +)3!=,F8PF[Wfhpxz|wttttsnieeeeeeeeeeee +)3!=+F7PEZVegoxxzwvuusngffffffffffff +)3 <*E6ODYUcgmxv~遍{yxxslhjjjjjjjjjjjj +)3 <(E4MCWTagkxt|푃牊げ|{yqǺhɳl°nnnnnnnnnnnn )3 <'D3LBVT_fhyqz왁摇݀}{tͲn̫pƩrrrrrrrrrrrr )3 <&D2KATS]ffynv~䙄ڌЃˁɃиzϫsϤtɢuĢuĢuĢuĢuĢuĢuĢuĢuĢuĢuĢu (2 <&D2K@SR\fdylszݞҔNJѾұҤxҝw̛xǛxǛxǛxǛxǛxǛxǛxǛxǛxǛxǛx (2 ;%C1J@SR[ebyjpvץ}˛ͷӳԫԝ}Ԗzϕ{ʕ{ʕ{ʕ{ʕ{ʕ{ʕ{ʕ{ʕ{ʕ{ʕ{ʕ{ (2 ;$C0J?RQZeaygmݲtѪ{šú̯ө֤֗}я~̏~̏~̏~̏~̏~̏~̏~̏~̏~̏~̏~ (2 ;#C/J>QPXd_xekظr̰x~³̨ԟ؏؉Ԉψψψψψψψψψψψ (2;"B.I=POWd]xciӾpƵv{ˡӕِڈځցссссссссссс (2:!B-I<ONVc[x`gmsx}ʚӌن܁zzzzzzzzzzzzz (2: B,H;NMTaYw^djotyɒ}҅}uuuuuuuuuuuuu (2: A*H9MKR`Vu[aglptȊw~{zsrrrrrrrrrrrr (1: A(G7LHP]StY^cgknǁry{wvģooooooooooooo (19A%G3KDM\QsVZ^acfwjqunDŽmǗkȬkkkkkkkkkkkk (19@"F/HCL[OqSX[\]w^lchmf{eˋd̞eͬeͬeͬeͬeͬeͬeͬeͬeͬeͬeͬeͬ (08? B+GCJZMnQVXZ|[p\hbdjcvbуaє`ҟ`ҟ`ҟ`ҟ`ҟ`ҟ`ҟ`ҟ`ҟ`ҟ`ҟ`ҟ ' 0
7=A,ECHXJkN{SVWtYj[c``g^q^}]؋\ٕ\ٕ\ٕ\ٕ\ٕ\ٕ\ٕ\ٕ\ٕ\ٕ\ٕ\ٕ ' . 4 8@.CCEUGfKtPSwUmWeZ`^]d[lZvY߂YYYYYYYYYYYY %))8=/?AAQD`GmLxxOoRgUaX]\ZbYhWpWzV联V联V联V联V联V联V联V联V联V联V联V联 +%0 :(C2L?WNa_lnv}zurqqqpl§hŨbĩdƦdƦdƦdƦdƦdƦdƦdƦdƦdƦdƦ +%0 9&B1K>VM`^jnt~}zvttsplffhêhêhêhêhêhêhêhêhêhêhê +%0 9%B/J=UL_]hnr~{퀋zvvupifilllllllllll +%/ 9$B.J;TK]\gnpxꇈ~xuvrmjmooooooooooo %/ 8#A-I:RJ[\ennv~㌄ۀyxzxºr¯mprrrrrrrrrrr %/8"A,H9PIZ[bmkt{ܑ҇~|}ſ}ųwĨqĤsuuuuuuuuuuu %/8!@+H8OHXZamiqw֙~̎
»ǸǷǬ|ǡvǝwxxxxxxxxxxx %/8 @*G7OGWY_mgnۧuО|ƕ²ȮʭʥʚzɖyÔzzzzzzzzzzz %/8 @)G6NFVX]ldk֭sˤyɥ̣̝̒~̎|Ǝ}}}}}}}}}}} %/7 ?'G5METW\kbܹiѱqũw|ɛΘϕϊ·ɇÇÇÇÇÇÇÇÇÇÇ %/7 ?&F4LCSVZj`~ؿg˶ntz~ɒύыт~ %.7 ?%F2LBRTXi^}eƼlqv{ȉЂӀ{vxxxxxxxxxxx %.7>#E0K@PRVg\|cinsw{ǁzyvqqqqqqqqqqqq %.6>!E.J=NOSfYz`fjosvz|utrmmmmmmmmmmmm %.6= D*I9LLQdWy]bfjm~qsxponjjjjjjjjjjjj %-5=C&H4KJObTwY]adfukmukDŽjʖjͫffffffffffff %-5<B E3JJMaQtUXZ\v^jceod}cьbѝaҲaʻaʻaʻaʻaʻaʻaʻaʻaʻaʻaʻ $ , 4
:< D4HJJ_MqRUWzXmZd``j_v^փ]ג\ؤ[ش[ش[ش[ش[ش[ش[ش[ش[ش[ش[ش$+12 < B5EIG\JlNzR~UrVhYa_]g[qZ|YވXޘXߥXߥXߥXߥXߥXߥXߥXߥXߥXߥXߥ"''2;"?5BGDWGfKsO~uRkTcX]]ZdYmXvW倘V捗V晖V晖V晖V晖V晖V晖V晖V晖V晖V晖V晖
+#& *){.4p1=g4E_8LX<QS?TOCWMHYKLZJQZIU[HZ[G_[GeZGjZGjZGjZGjZGjZGjZGjZGjZGjZGjZGjZӸ + z#%o&.d*6\.<V2AQ6EM:HJ=JHAKFELEHLCLMCOMBSMAXM@]L@]L@]L@]L@]L@]L@]L@]L@]L@]L@]L +yn!c )Z#/S'4N,8J0;F3=D6?B:?@=@?@@>BA=EA<IA:MA:PA:PA:PA:PA:PA:PA:PA:PA:PA:PA:PA #w.!|8(A2J=VK}bYwofq{qlyj~iijjjĄjͅhІe҆cՇ`؈]ۉ]ۉ]ۉ]ۉ]ۉ]ۉ]ۉ]ۉ]ۉ]ۉ #w.!|8(A2J=VK}bYwofq{qlyj~iijjjĄjͅhІe҆cՇ`؈]ۉ]ۉ]ۉ]ۉ]ۉ]ۉ]ۉ]ۉ]ۉ]ۉ #w.!|8(A2J=VK}bYwofq{qlyj~iijjjĄjͅhІe҆cՇ`؈]ۉ]ۉ]ۉ]ۉ]ۉ]ۉ]ۉ]ۉ]ۉ]ۉ #w.!|8(A2J=VK}bYwofq{qlyj~iijjjĄjͅhІe҆cՇ`؈]ۉ]ۉ]ۉ]ۉ]ۉ]ۉ]ۉ]ۉ]ۉ]ۉ #w.!|8(A2J=VK}bYwofq{qlyj~iijjjĄjͅhІe҆cՇ`؈]ۉ]ۉ]ۉ]ۉ]ۉ]ۉ]ۉ]ۉ]ۉ]ۉ #x.!7'A1J<UJaX{mfuyro|lkkkkkÉkˊheЌbӍ_֎]؎]؎]؎]؎]؎]؎]؎]؎]؎]؎ #z- 7&@/I;TH_Wjf|utvqnmmmmlȔhʕe͖bЗ_Иaӓaӓaӓaӓaӓaӓaӓaӓaӓaӓ #~- 6$?-H9SG]Vhfrt}}wrpooomĞiǟeʠ`ɡb͜dИdИdИdИdИdИdИdИdИdИ "- 6"?+G7QE\Ufeptz|vrpppmhĨcĩcƧfʡg͜g͜g͜g͜g͜g͜g͜g͜g͜g͜ ", 5!>*G6QD[TeenuwztponmiefëiǤkˠkˠkˠkˠkˠkˠkˠkˠkˠkˠ +",5 >)G5PCZScdluu}uppqsnjjlŨnȣnȣnȣnȣnȣnȣnȣnȣnȣnȣ +",5 >'F3OAXRbcktsz݄yttuwtomp¬qƧqƧqƧqƧqƧqƧqƧqƧqƧqƧ +",5 >&E2M@VP_bitqߔw~́zxyzytqstêtêtêtêtêtêtêtêtêtê +"+4 =$E0L>UO]bftnٛuВ|ƈ||~xtvwwwwwwwwww +"+4=#D/K=SN\`dsݨkԡsʙz}xyyyyyyyyyyy "+4<"D-K<RLZ_bsٮiϦqĞw}{||||||||||| "+4< C,J:PKX^߸`qԲgʫouzÔĒĎĆÅ "+3; C*I8OIW\۾^pϷeŰlrx}ĉLJDž}}~~~~~~~~~~ "+3; B(H6NFUZ\oʼcjpuy~|{utvvvvvvvvvv "*3;A%H3MCRYZmagmqvz~vtsonoooooooooo"*2:A"G/K?OWWl^}dimquwzponlijjjjjjjjjj!*29@ F)F=NUUj[{`eil|ppvkjjifffffffffff
!
) 18>C"G:LRRgWy\`cfrjisffeãdŸbbbbbbbbbbb
! +( +0 +6
;@#G:JOOdSvWZ\u_idcoaaҐ`Ԣ_ַ]]ê]ê]ê]ê]ê]ê]ê]ê]ê]ê
!'-16@%E;HNKaOrRUxVkYa_]j[yZ܇YݖYݦWXɢXɢXɢXɢXɢXɢXɢXɢXɢXɢ
#%$7>'B:ELG]KlOy|RpTfX^^ZgYsXW䌛V䚚U嫙T庘T庘T庘T庘T庘T庘T庘T庘T庘T庘 +37(:7=D@Q}B]sFgjJobOv\TzXZ}Ua~Si~Rq~R{}Q|Q{PzPzPzPzPzPzPzPzPzPz + + vj`!W'P ,J%0F)3B-5?07=48;78:;98>97A96D95H94L93P93P93P93P93P93P93P93P93P93P9}
yr"i."p5't?0tI:tTFobShp^d|fbkbmbnbocpcpdqdqcrbr`s^s\tZtZtZtZtZtZtZtZtZt}
yr"i."p5't?0tI:tTFobShp^d|fbkbmbnbocpcpdqdqcrbr`s^s\tZtZtZtZtZtZtZtZtZt}
yr"i."p5't?0tI:tTFobShp^d|fbkbmbnbocpcpdqdqcrbr`s^s\tZtZtZtZtZtZtZtZtZt}
yr"i."p5't?0tI:tTFobShp^d|fbkbmbnbocpcpdqdqcrbr`s^s\tZtZtZtZtZtZtZtZtZt~ zs!l-!s5&w>/yH9xSEs`Rmm^hzhendqdsdtdueuevfwdwbx`x^y[zZyZyZyZyZyZyZyZyZy {
u!p, x4$}>-G7QDz^Qtj_nvjisgxf{f|g}g~ggeԀcׁ`ڂ]݃\]~]~]~]~]~]~]~]~]~ |
v!t* }4#=+F6PB\P{g^urko~vj}ihhhhhˈfщcԊ_\ٌ^݇_߃_߃_߃_߃_߃_߃_߃_߃_߃ }
w x* 3!<)E4N@ZOe^{pltzxnkjiiiiǑf͒bє^ҕ_Ցbڋb܈b܈b܈b܈b܈b܈b܈b܈b܈ ~ x {*3 <'D2M?XMc]ml{wztnkjiihfʜa̞`ΛcҖefٌfٌfٌfٌfٌfٌfٌfٌfٌ y ~)2 ;%D0L=WLa\kltzz}rljiijjɢfɢdʠfΚhӔiՐiՐiՐiՐiՐiՐiՐiՐiՐ z )2 ;$C.K;VJ`Zikr{zvnklmnpƥkǥhǤj˟lЙlҕlҕlҕlҕlҕlҕlҕlҕlҕ { )1:"C,K9UH^Ygjp{އv}}uppqrspĩlĩmȣo͝pЙpЙpЙpЙpЙpЙpЙpЙpЙ | (1: B*J7SF]Xfim{؎tυ{|vtuvwu¬p¬qŧrʠs͜s͜s͜s͜s͜s͜s͜s͜s͜ } (1: B(I5QEZVchkzҕrɌx~|yyz{zutëuȤvʠvʠvʠvʠvʠvʠvʠvʠvʠ } (09 A&H3OCXTag֢iy͚qÒw|~|}~ywxŧxȣxȣxȣxȣxȣxȣxȣxȣxȣ '09@$G1N@WRܮ_fҧgwȠnuz}z{ë{Ʀ{Ʀ{Ʀ{Ʀ{Ʀ{Ʀ{Ʀ{Ʀ{Ʀ + '08@"G/M>VOس]dͫevålsx|}}}ĩ}ĩ}ĩ}ĩ}ĩ}ĩ}ĩ}ĩ}ĩ + '07? F,L;TNӷ\cȰctjpuz~z||¬|¬|¬|¬|¬|¬|¬|¬|¬ + '/7> E)K7QLϼZaõashnsw{|yxvqsttttttttt + &.6=D%I4OJX__qekptx}}sppojlmmmmmmmmm
& .
5<B E2MHU]\obglptuymkjjfgggggggggg & +- 4;@A/KFS[Ym_|dhkyonuhffecc¬cĩcĩcĩcĩcĩcĩcĩcĩcĩ %+2 +7 8@,ICPXVj[z_b}fpigqc~baa_ê_ŧ_Ǥ_Ǥ_Ǥ_Ǥ_Ǥ_Ǥ_Ǥ_Ǥ_Ǥ + #(-.:C)G@MURgVwY\s_gd`m^|]Ɍ]˞\ͯ[ȣZʠZ̞Z̞Z̞Z̞Z̞Z̞Z̞Z̞Z̞ + " ,;B+E>IQMcPsRuUhX_^[jYyX܊XݛW߬VUИVҕVҕVҕVҕVҕVҕVҕVҕVҕ + +9?,B=ENH^LlyOxmRcV\]XhVvUꄐUT뢎S볍ŘQыQыQыQыQыQыQыQыQы +w
x $-6>!F,M:WJޝ`]Ԗhnˎo}Æu~{xvvvwxvȣsɢtΛtҕtԒtԒtԒtԒtԒtԒtԒtԒ{ +x z $-5= E*L8VH٣^[МgmƔm|sy~{yz{{{ƦvƦv˟vИvіvіvіvіvіvіvіvі| +x | $,5< D'K4߭TEը]Yˠeklzrw|}}~~êyĪyȣy͜yϙyϙyϙyϙyϙyϙyϙyϙ| +y $,4;C$J1۱RCѬ[Wƥcijxpuy}|Ƨ|˟{̝{̝{̝{̝{̝{̝{̝{̝} z #
+3;B H-PA̰YVªahhwnsw|~zyêzȣzʠzʠzʠzʠzʠzʠzʠzʠ~ z # * 29@ F*ӺO@ȴWT_ffukquy~zwutqp¬rǥrȣrȣrȣrȣrȣrȣrȣrȣ~ { # +* +1 8?C(οM>ùUR]dcsinrv{zqmlkji¬jƦkȤkȤkȤkȤkȤkȤkȤkȤ| +")/ +6
<@&K<SOZb`qfjnrswkhgff¬dĩeȤeɢeɢeɢeɢeɢeɢeɢeɢ} +!',23>#H9QMW_]ob|fjxnlse}cbba`Ǥ`˟a̞a̞a̞a̞a̞a̞a̞a̞ + $'(, ; E6MJT\Yl]ya{eoieo`{_^^]\̞\Ϛ\И\И\И\И\И\И\И\И + + ~$t)%j,.`06X3<Q7BK;EGAHDGJBNK@UK?]K>fJ=pI<zI;H:G:F:F:F:F:F:F:F:Fή +}r h !^$(V(/O,4I08D4;A9=>?>;D>9J?7P?6W>5^>4f=3o<1{;1;1;1;1;1;1;1;1;Ÿ +pf\ S#L (F$,A'/<+19037535943>41C4/I4.N4-T3,[3*c2*f2*f2*f2*f2*f2*f2*f2*f2 +dZ#f%n. r7$rA.qJ8mVDgbPbn[^zb\f[h\i\j\k\k]l]m]n\oYoZk\g]c]c]c]c]c]c]c]cl +e_!k$s- x6"y?+xI6uSBp_Oik\cvf_l^p]q]s]t]u]v]w]xZz\v]q^m_h_h_h_h_h_h_h_hm
+fc o#x,}5 >(G3~Q@x]Nqg\jrhd{r`w_{^|^~]^_ƀ`^_|`warbmbmbmbmbmbmbmbmn
hg t#},4 =%F0O=ZKze[rniiwvc``abcddхcޅbc}dxerererererererern ij x"+4<"E-M:XIbYzkiprxizeeefghiɊiڊf܈gh}hwhwhwhwhwhwhwhwo jn|"*3; D*L7WF`VقhgypvqwljjjklmnՏj؎k܇kl|l|l|l|l|l|l|l|p kq!*2; C&K4VBܑ_TӉgeˁntyts{onnopqqΓnԓoٌo݇oလoလoလoလoလoလoလoq kt!)1:B#J0U?ח^QΏecňlrrzxurrsttuȗrїrՑrڋrބrބrބrބrބrބrބrބq lw!
(19A I,ܢS<Ҝ\Oɕdajpp}u{|wvwwxxvΚuҖu֏tۈt܈t܈t܈t܈t܈t܈t܈r my
! ( 08? G(اQ:ΡZMĚb_inn{sy|zzzz{z̞wϚwӔwٌwٌwٌwٌwٌwٌwٌwٌs n| +' /
6>ޯF#ԫO8ʥYK`]glmzrv|~}}}~~ɡ{̞zЗyՐyyyyyyys +o~ ' - 5<۳C!ЯN7ƩWJ_[ekkxpty}|zŤw~ɢx}Λx|Ӕx|Ӕx|Ӕx|Ӕx|Ӕx|Ӕx|Ӕx|Ӕt +p
+ &, 3 :ַA ̳L5UH]Yciivnrv{xusqpnǤo̞pїpіpіpіpіpіpіpіu +r $*06 Ҽ? ǷJ2SE[WaggtkptyxokjihfȤg̞hИhЗhЗhЗhЗhЗhЗhЗv u "&+. =½H0QCXT^ddrh~l}qrui}edccaʠbΛbҖbҖbҖbҖbҖbҖbҖbҖw y ):E-N@UQ[a`oe{ivmkrc{``__^Κ^і^Ց^Ց^Ց^Ց^Ց^Ց^Ց^Ցx~ + + +y oe[ S#&L'+F+/A02=54::67@64F73M61T60\5.e5-o4,y3+2+2+2+2+2+2+2+2 +VMF ?
9 4!1". #+$$)(%',%%1%#6% ;% @$ F$L#S"S"S"S"S"S"S"S"YOE' F-!I3%I<+GH2EU8Cc<Cr=D=D=E=F=G<H<H<I<I;J;J;K;K:L:L:M:M:M:M:M:M:M:M:YPE' H, K2%K;+JF2GS8Ea=Ep?E~?F?G?H?I?I>J>J>K>K=L=L=M=M=N=N=N=N=N=N=N=N=N=ZQF& L* P0#Q:*OD1LQ9I^>HmBH{CICJCKCLCLCMCMBNBNBOBOBPBPBPBPBQAQAQAQAQAQAQA[RH& P( U."W8(UC0QN9N\@KjDLxFLGMGNHNGOGOGPGPGQGQHRHRHRHRHRFSDSDSDSDSDSDSD\
SL$U' Z- \7&[A/VL8SY@PgGOtJOLPMPMQMQMRMRMSMSNTNTNTOTOTNUKUIUIUIUIUIUIUI^
TP"Y%`, c6$b@-_J6ZV@VcISpNS}QSSSSTTTTTTUUUUUVVVVWVWVWWSXPXNXNXNXNXNXNXN_
VU _"g+ j4!j>*gH4bS?]_IYlRWxWVZV[V\V\W]W^W^W_X`XaWaY]ZZZV[S[S[S[S[S[S[S` WY d!m*q3 q<'oF1lP=f\I`hT[s\Y~aXcXeXfXgXhXiXjXkXlZh[d\`]\^Y^Y^Y^Y^Y^Y^Ya X^ j s)w2 x;#xD.uN:oYGhdTbn`]yg[lZnYpYqZq[q\q]q]q]o_j`f`ba_a_a_a_a_a_a_b Zbo x(}1: C*~K6yWDraRjkabsl]}t]v]w^w_w_w`wawawavbqclcgddddddddddddddc [gt }'09 A&J2U@{_Psg`jomdxvbza|b|c|c|d|e|f|e|ewfrfmgigigigigigigid ]jx &/7@"I.T<ۃ]L{e]smlltvh|}ffghhij́jၪi|iwjrjnjnjnjnjnjnjne ^n{
&
.6? G*ޑS8Պ\J͂c[{jitqunx~kkkllmmƅnچmm|mwlslslslslslslsf
+aq
% -5=F%ڗR5АZGljbXhg{otuu~q|ooopqqrԊp݇pၔo{owowowowowowowg
+dt +$ ++ 4<ߟE ՜P3̕YE`Vgemr|r}wytsssttuΎsٌsޅrq{q{q{q{q{q{q{g
+fw + #* 2
:ۤC ѠN0ǚXC_Teckpp{}vy|wvvwwwȒvՐuۊt߄ttttttth +i
z ")0 +7بAͤL.ÞVA^Rdainnzs~yzyyyzzÖyҕ~x؎~w܈}v߃}v߃}v߃}v߃}v߃}v߃}v߃i +k |!'-ެ4 +Ӭ?ɨK,T?\Oc_hlmxqv|}}|{}y}w~u}ϙu|Ԓv{ًuy݇uy݇uy݇uy݇uy݇uy݇uy݇j n $)۱.ϰ=ŬI*R<ZMa]gjkvos}xvrpomlΛlҕmm~ۊm~ۊm~ۊm~ۊm~ۊm~ۊm~ۊj q "ֶ*˴;G(P:XK_Zdhitmqvum|igfed̚eҕe֏fڋfڋfڋfڋfڋfڋfڋk t +x +} +
+;E,L=QLVZxZgn]rcb{[iWtVUUTS~S|TyTwTwTwTwTwTwTwu ++{0 q5+f96]<?TAGNGMJOPGYRFcREpQD~PDNCMCLBKAIAIAIAIAIAIAIAIڙ +J +" +) 1:D ؊O/σXA|`Qug_onjjurh~vhxhxhxixixjyjykwkqkmjhjfjfjfjfjfjfZ
_o +{!( / 8ݔCӏN,ʉW>^N|e]vkiqrrnyxl{l|l}m}m}m}n}n}nwmqmllklklklklklk[
b r &- 5
ٙAΔL*ŎU<]LcZ}igworsvyq}~ooopppŁpۂp{pvoqoooooooooooo\ e u $+ߝ2 ԝ?ʘK(T9[IbXhe~mpyryuysrrssssֆs rzquqsqsqsqsqsqs\ g
+x !'ۣ-С=ƝI%S7ZGaVfckn~pxzuw}uuvv~v}vъ|vބ{u~ztyzswzswzswzswzswzsw] j z !צ*̥;¡H#Q5YE_Seailnws{y}yzyxyvytzszˍsz܈sxrw|rv{rv{rv{rv{rv{rv{^ m +} + + x +> +qy ~& +.
7A |M*uW;n_JhfWcn_awd`f`fagagbgbgcgcgcgfbg]gYfUfUfUfUfUfUMZ i u} $+ 4ۈ@уL'|U8v\HodUjk_gsfe{jekekelflflflglgligibi^hZhZhZhZhZhZN]
lx"(0 ֍>̈J%ÂS6|[EwbSqh^mogjvlioipipipiqjqjqjqkmkgkcj_j_j_j_j_j_O` +p{ %ܓ,ё<ǍH"R3YB}`Pxf\slfpsnmzrltlululululumvnrnlmhldldldldldldRc s
ؗ)͕;ÒG P0X@^N~dZyjetonqvto~woxoyoyoyozozpwpqolnhnhnhnhnhnhT
fv + +BM)T8[F`Sd_ijmsx}r|qzymykyizhzfzf{g{{gyvgwrgwrgwrgwrgwrgwr] o +>F&L4{RArVLiZX`_aYfhTolR{lQkQjPhOgOeOcOaP_P_P_P_P_P_v +i+`1 W6&O</IB5DJ9AT;@_;?k:>y8>7=6=4<3;2;1:1:1:1:1:1:1ϙ +>8 2.*& #& + 18AJU` k w +-5> +j +m&
m.k8gB!bN-\X:WbDTlITvLTLTMUMUMVMVMVMWNWNWNYIZF[C]@]?]?]?]?]?AP
] ho s$ u+ t5q@lL'eV7_^D[gLYpQYzRYSYSYTZTZT[T[T[T[U]P_LaIaEaDaDaDaDaDDT b muy!{({1 z>tJ$nS4h[BccM_lT^tW]}Y]Y^Y^Z^Z_Z_Z_Z`[aWcRdNdKdJdJdJdJdJHX +f qy~ $ނ-Ԁ<{H!vQ1pY?j`KfhTcpZbx]b^b_b_b_c_c`c`c`d^fXgTfPfOfOfOfOfOK
[j +u| ه)υ:ŁF |P.wW<q^ImeTil\gs`f{cedededfefefefefdh^iYhUhThThThThTN ^m x
+ +ds~ +R$K*D0 >7!:>$7G%5Q%4\$3i#2w"1!0 / / . ...... +IB!;'6-24 /; ,D *M )X 'd%s$#"!!!!!!! +)%" !&-4= GS_l +$ + + + + + +$ '#'$)!0 9 F T ao| !!!
!
! ! ! ! ! ! ! % !%%$''%-!7 D Q _ m y !!"##$%&&&&&&&&&&&& $")!+#*))4 &A %N $\ $j $v $%&&''())++,,,,-,,,,,,' ( . 0 0&11 .> ,K!+X!*f *r +~ , --../001223333333333( -479#:.8: 4G"2T$2a#2n"2z!3 4 4 5 6 6 7 8 8 9 99:::;;;;;;* 3:?C!C+A7 =C#:O&9\'9i&9u&:%;$;$<#<#=#=">"?"?"?"?"@!A A B B B B B B -9AGL M)J3F>!BJ'?W*?d+?p+@{*A*B*B*B*C*C*C*D*D+D+E*F)G'G%H$H#H#H#H#H#2?GP
V V&T0P: KF%GR,F^/Ek1Fv1F1G1G1H1H2H2I2I2I3J3J3K0L.M,M*N)N)N)N)N)7CN X +] +_%
^-Z7TA!PN*MY2Ke6Kp8Kz8L9L9M9M9M9N:N:N:O:O;P8Q5R3S1S/S/S/S/S/<I T _eg" g* d3`?[K%VU2R_:Qj=Qs?Q|@Q@Q@R@R@RASASASASBT?V<W9Y7Y5Y5Y5Y5Y5@N +Z +ekn n&l/ j=eI!_R0Z[;WdAVnDVwFVFVGVGWGWGWGWHXHXHXF[B\?\<]:]:]:]:]:C
R`jpst!t*r:mF gP-bX9^`C[iHZqKZzLZM[M[M[M[N\N\N\N\M^I_E_B`@`@`@`@`@G Udn tx +Y + +zCvL&qT4l[@hbJeiPcpTbxVbWbXbXbYbYbYbZbZcTePeLeIeIeIeIeIN ] +k;cA [G(TL1NR8IZ<Fc>Eo=D|<D;C9B8B7A5@5@5?5?5?5?5?5ֆ +3 +.
* &#") 09BMZi
y + + + +
!
'
/
9 D + + + + +z +
+ + $# # %+5CQ^lx
+ + # " "! ' 3 @M[hu
! +! +! +! +! +! +! +! +! +! + "# '( '$(0%<#J"W!d!q!|"#$$%&&'(())
)
)
)
)
*
*
*
*
*
! (-/1!1,/9,E *S *`)l*x+,,--.//0111121222222%/59< <)945A 2N 2[ 2h 2s 3}4556677888999:::::::*5<B
G F&C0?< ;I 9V!9b!:n ;y ; < = = = > > > ? ? ? @ A A A AAAAA0;B + K +P P$M,H7CC @P#@]$Ai$Bt$B}$B$C%C%D%D%D&E&E&E&E'F&G$G#H!H H H H H 6@ + J TXY W)
R3M?JL"HX'Gc*Gn+Hw,H,I-I-I-J-J-J.J.K.K/K-L+M)M'O&O&O&O&O&;
F Q[`a `%\. X<TH PS)N]/Mg2Mq3My4N4N4N4O5O5O5O5O6P6P5Q2S0T.T,T+T+T+T+? + KWa fhg d*b9^E YO)UX2Sb7Rk9Rt:R|;S;S;S;T<T<T<T<T=T=V9W6W4X2X1X1X1X1B +O + +BJ"}Q.yV8v[Br`KyoeStlkYpks]mj|_kj`ij`gj`fj`dj`ck_elYflUglQglPglPglPglPX + +$ +# ! +! +! +! +! + +)* %2
#;
E
P ] m +~ ++ +4 +>
I +Vew +"*4 + + + + + + + + + + + + " %1>LZ f r
}
+ " .;HVcoy
+ + #'&* )+&7#D!Q!^ j u!"#
$ $ % & & +' +( +( ( ( +( +) * ) ) ) ) ) "*.25 4&13-?+L*Y*f+q+{,-..//011
1
1222222222(1
6 + = @ ?#;-7:3G2T3a4l5v66777889999:::;;::::.7 > FJI +E)@4<A:N;[<g=q=z>>>???@@@@ A ABBBBBBB3
= FO RR O% J/
F<DICV Ca Ck Dt!D|!E!E!E"E"F"F"F#F#F#G#G"H I J I I I I 9 B + +uAqI mP+jV5f\=cbBahF~`oI|`wKz`Ly`Lw`Mu`Ms`Nq_Np_OpaIqaErbBrb@rb@rb@rb@P + +6?
3H2R0]0j/x
.Έ -Ι ,ϭ + +* ( '
&&&& + +"$ +! + +#0=K
X +a + +l +w
" ) 5BO\ h +s | $
& + + - ,$(0$="J!W
!c "n +#x $%%&&''((()*** * * * +* +* +* +%+ / 78 7 3+.8,E+R+^
-j .t /} +/ +0 +0 +1 +1 2 2 2 3 3 3
4
3433
3
3
3
+ + 2 :A +CA =& +81
4?4L5Y6e7n8w899:::;;;;;;<;;<<<<1 +8 + +vApGjM$cQ,]V5W[<R~bAN}jDL}uEK}DJ~CI~AI~@H~>G~=G};G|:G|9G|9G|9G|9h +dA^GXM"RR)MX/I`3Fi4Et4D2C1C/B.A,@+?+?+>+>+>+>+u +S + & + + +
+ +
* 7 E + N Z +f +p y
+H Ualu} """""!!!! % */ 0. *) %5 +#C "P#\$g%q&y'(())**+++,,,,, + + + + ' , +4 +4 +5 +5 5 5 5 5
5
6
6
6
6
6
- +- +*)'&% $ +# +# +# + + + + + + + + + +
#0> + +7 +7 +7 7 7 7 7 6 6 6 6 . +BCBMBVB^BfCmCtCzCCCCCCCBBBBBBBB4 + +[?XFUM TS$}RZ&{R`(yQg*wQo*uQw+tQ,rQ,pQ-oQ-mQ.kQ/iP/iQ+iQ)iQ'iQ&iQ&iQ&E + +6J
4S2\1g0s
0 / . +, +*) +( ' ' ' + + + + + + + + + +! +"
. +< +8 +8 +8 8 7 7 7 7 7 7 * + +I@HIGQFXF_FeFlFsF{F}F|FzFyFwF uF tFsFrFrErErE9 +Yx@TvFPuKKsQ!GrW%Dr_'Bqi(Aqt'@r&?r$>r#=r!<r <r :p 9o 9n!9n!9n!g +- , + * )
)){ + +
+ + + +8 +8 +8 8 8 ~7 }7 }7 }7 }7 * +=J =R =Y =_
=f
=l
=s
=z===~=|={=y=w=v=u<u<t<t<3 +OqAKpGFoMCnT @n[ >me <mp <n| ;n :n9n8n7n6l5k4j4i4ig +- +,} +|
*{)z)zs +.` -l ,x+)('%%$## # { + + + + + + + + + + + + + +w8 +v8 t7 r7 q7 o7 o7 o6 o6 3 +zAD
xAKu@Rs@Xq@^p@en@mm@uk@~i@h@f@d@b@a@`@_@_?_?_?@ +tFApEGnDNkDTiDZhDafDieDqcD{aD`D^D\DZDYCXCXCXCXCXCE +ElCAkI>jP;jX9ja8jk7jw6j5j4j3j2j1h0g/f.e.ef +,q +o
*n)m)ml +1|U +/|^ +.|i +-|u ,|+{){({'z&y%x$v #u +#u +r +Z + + + + + +# +i7 +g7 f7 d7 b7 a6 a6 a6 a6 9 +p;M n;T l;Z j;` i;h g;p
f;y
d;
b;a;_;];[;Z;Z;Y:Y:Y:? +k@C h?I
f?Od?Vb?\a?d_?l^?v\?[?Y?W?U?T?S?S>S>S=S=D +<fE
9fL6eT4e]3eg2fs1f0f
/f .f -e +,e ++c *b)a)`e +1nR /n[ .ne +-nq ,n+n*n)n'm&m%k$i #h +#h +k + + + + + + + +R +Z6 +X6 V6 U6 T5 T5 T5 T4 ? +^9Q +]9X [:_ Z:g X:p W:{
U:
T;R;P:O:M:M9M9M8M8D + +Y>G W=M
U=TT=[R>dQ>mO>xN>L>K>I>G>F>F=F=F<G<I +-Z ,Z *X )W
(V(U_ +/aX +.ab +-bn ,b{+b)b(a'a&a%_$] #\ +#\ d +u +u +t +4 + +K6 +I5 H5 G5 G4 G4 G3 +D +N8W +M9_ K9h J9s H: G: E:
C:
B:
@9
@9
@8
@8
A7 H + +-O ,O*O)N (L (K (K
Y +^ +j +vS + + +v + + + +:3 +:3 G +=9k +;9w +9: +8: +7: +5: +4: 39 +38 48 47 K +9=U 7>^ 6>i 5>u 3? +2? +1? 0? .?.> -= +-< .< O +2C\ +1Dg +/Dt .D -E,E+E)E(D(C 'A +'A S + + + + +? +E + + +[f +c + + + + + +& + + + + + + + +~ + + + + +; + +H* + + + +U +_ + +0 +/ +6[ + + + + + + +D +& +*K +/ + + + + + + + + + + + + +3 +; + + = + +" +* + + + + +* +2 +^ + + + + +
!"$%&()*+-./02346789;<=>@ABDEFGIJKMNOPRSTUWXY[\]^`abcefgijklnopqstuwxyz|}~ +
!"$%&()*+-./02346789;<=>@ABDEFGIJKMNOPRSTUWXY[\]^`abcefgijklnopqstuwxyz|}~ +
!"$%&()*+-./02346789;<=>@ABDEFGIJKMNOPRSTUWXY[\]^`abcefgijklnopqstuwxyz|}~ +
!"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~mft1 +
!"#$%&'()**+,-./0123456789:;;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`abcdefghijklmnopqrstuvwxyz{|}~ +
!""#$$%&&'())*+,--./01223456789:;<=>?@BCDEFHIJLMOPRSUWXZ\^`bdfhjmoqtvy|~ +
!""#$$%&&'())*+,--./01223456789:;<=>?@BCDEFHIJLMOPRSUWXZ\^`bdfhjmoqtvy|~ozPMXэiJqѼËn?
vC + + + + + +0000000016 00000 n
+0000000258 00000 n
+0000028528 00000 n
+0000000000 00000 f
+0000040629 00000 n
+0000043762 00000 n
+0000028579 00000 n
+0000028828 00000 n
+0000043650 00000 n
+0000038845 00000 n
+0000040068 00000 n
+0000040116 00000 n
+0000041026 00000 n
+0000041388 00000 n
+0000698170 00000 n
+trailer
<</Size 16/Root 1 0 R/Info 15 0 R/ID[<88DFC0BCA67D4D94994A35B64BF9CDD4><87F5F3723D824C9DB4A10B89C64732F9>]>>
startxref
698439
%%EOF
\ No newline at end of file diff --git a/web/cobrands/fixmystreet/posters/fixmystreet-poster-a4.pdf b/web/cobrands/fixmystreet.com/posters/fixmystreet-poster-a4.pdf Binary files differindex ed6788cf0..ed6788cf0 100644 --- a/web/cobrands/fixmystreet/posters/fixmystreet-poster-a4.pdf +++ b/web/cobrands/fixmystreet.com/posters/fixmystreet-poster-a4.pdf diff --git a/web/cobrands/fixmystreet/posters/fixmystreet-advert-40x60.pdf b/web/cobrands/fixmystreet.com/posters/fixmystreet-promote-40x60.pdf Binary files differindex 9c1e4cd9b..9c1e4cd9b 100644 --- a/web/cobrands/fixmystreet/posters/fixmystreet-advert-40x60.pdf +++ b/web/cobrands/fixmystreet.com/posters/fixmystreet-promote-40x60.pdf diff --git a/web/cobrands/fixmystreet/posters/fixmystreet-advert-90x130.pdf b/web/cobrands/fixmystreet.com/posters/fixmystreet-promote-90x130.pdf Binary files differindex 13bff9f05..13bff9f05 100644 --- a/web/cobrands/fixmystreet/posters/fixmystreet-advert-90x130.pdf +++ b/web/cobrands/fixmystreet.com/posters/fixmystreet-promote-90x130.pdf diff --git a/web/cobrands/fixmystreet/posters/fixmystreet-advert-90x60.pdf b/web/cobrands/fixmystreet.com/posters/fixmystreet-promote-90x60.pdf Binary files differindex 7763ce4f7..7763ce4f7 100644 --- a/web/cobrands/fixmystreet/posters/fixmystreet-advert-90x60.pdf +++ b/web/cobrands/fixmystreet.com/posters/fixmystreet-promote-90x60.pdf diff --git a/web/cobrands/fixmystreet/posters/schools-clubs-pack.zip b/web/cobrands/fixmystreet.com/posters/schools-clubs-pack.zip Binary files differindex 53a2a5f41..53a2a5f41 100644 --- a/web/cobrands/fixmystreet/posters/schools-clubs-pack.zip +++ b/web/cobrands/fixmystreet.com/posters/schools-clubs-pack.zip diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index fdecee9db..f5e6a8926 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -42,7 +42,7 @@ function tabs(elem, indirect) { //toggle class on nav $('.tab-nav .active').removeClass('active'); elem.addClass('active'); - + //hide / show the right tab $('.tab.open').hide().removeClass('open'); $(target).show().addClass('open'); @@ -134,8 +134,8 @@ $(function(){ last_type = type; }).resize(); - /* - * Report a problem page + /* + * Report a problem page */ //desktop if ($('#report-a-problem-sidebar').is(':visible')) { @@ -178,10 +178,10 @@ $(function(){ //make initial tab active $('.tab-nav a').first().addClass('active'); $('.tab').first().addClass('open'); - + //hide other tabs $('.tab').not('.open').hide(); - + //set up click event $(".tab-nav").on('click', 'a', function(e){ e.preventDefault(); @@ -306,7 +306,7 @@ $.fn.drawer = function(id, ajax) { $('.spinner').remove(); }); } - + // Tall drawer - put after .content for scrolling to work okay. // position over the top of the main .content in precisely the right location d.insertAfter($content).addClass('content').css({ @@ -463,7 +463,8 @@ $.fn.drawer = function(id, ajax) { offset = -110; } if (cobrand == 'oxfordshire') { - offset = -13 * 16; + // Oxfordshire uses box-sizing:border-box and padding to work out height + offset = 0; } heightFix(window, '.content', offset, 1); // in case we have a map that isn't full screen @@ -485,4 +486,3 @@ $(window).load(function(){ }, 0); }); */ - diff --git a/web/cobrands/fixmystreet/images/advert-app-watercolour.jpg b/web/cobrands/fixmystreet/images/advert-app-watercolour.jpg Binary files differdeleted file mode 100644 index 9c372fed5..000000000 --- a/web/cobrands/fixmystreet/images/advert-app-watercolour.jpg +++ /dev/null diff --git a/web/cobrands/fixmystreet/images/menu-black.png b/web/cobrands/fixmystreet/images/menu-black.png Binary files differnew file mode 100644 index 000000000..72a4806c0 --- /dev/null +++ b/web/cobrands/fixmystreet/images/menu-black.png diff --git a/web/cobrands/fixmystreet/images/menu-black.svg b/web/cobrands/fixmystreet/images/menu-black.svg new file mode 100644 index 000000000..4bf0d5b07 --- /dev/null +++ b/web/cobrands/fixmystreet/images/menu-black.svg @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ width="22px" height="18px" viewBox="0 0 22 18" enable-background="new 0 0 22 18" xml:space="preserve">
+<g>
+ <g>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="#000000" d="M2.008,4.017h17.958c1.108,0,2.008-0.899,2.008-2.009
+ C21.974,0.899,21.074,0,19.966,0H2.008C0.899,0,0,0.899,0,2.008C0,3.117,0.899,4.017,2.008,4.017z M19.966,6.982H2.008
+ C0.899,6.982,0,7.881,0,8.99s0.899,2.009,2.008,2.009h17.958c1.108,0,2.008-0.9,2.008-2.009S21.074,6.982,19.966,6.982z
+ M19.966,13.964H2.008C0.899,13.964,0,14.862,0,15.972c0,1.108,0.899,2.009,2.008,2.009h17.958c1.108,0,2.008-0.9,2.008-2.009
+ C21.974,14.862,21.074,13.964,19.966,13.964z"/>
+ </g>
+</g>
+</svg>
diff --git a/web/cobrands/fixmystreet/images/menu-white.png b/web/cobrands/fixmystreet/images/menu-white.png Binary files differnew file mode 100644 index 000000000..d503ff7a6 --- /dev/null +++ b/web/cobrands/fixmystreet/images/menu-white.png diff --git a/web/cobrands/fixmystreet/images/menu-white.svg b/web/cobrands/fixmystreet/images/menu-white.svg new file mode 100644 index 000000000..69e09cef3 --- /dev/null +++ b/web/cobrands/fixmystreet/images/menu-white.svg @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+ width="22px" height="18px" viewBox="0 0 22 18" enable-background="new 0 0 22 18" xml:space="preserve">
+<g>
+ <g>
+ <path fill-rule="evenodd" clip-rule="evenodd" fill="#FFFFFF" d="M2.008,4.017h17.958c1.108,0,2.008-0.899,2.008-2.009
+ C21.974,0.899,21.074,0,19.966,0H2.008C0.899,0,0,0.899,0,2.008C0,3.117,0.899,4.017,2.008,4.017z M19.966,6.982H2.008
+ C0.899,6.982,0,7.881,0,8.99s0.899,2.009,2.008,2.009h17.958c1.108,0,2.008-0.9,2.008-2.009S21.074,6.982,19.966,6.982z
+ M19.966,13.964H2.008C0.899,13.964,0,14.862,0,15.972c0,1.108,0.899,2.009,2.008,2.009h17.958c1.108,0,2.008-0.9,2.008-2.009
+ C21.974,14.862,21.074,13.964,19.966,13.964z"/>
+ </g>
+</g>
+</svg>
diff --git a/web/cobrands/fixmystreet/images/sad-face-in-circle-100px.png b/web/cobrands/fixmystreet/images/sad-face-in-circle-100px.png Binary files differnew file mode 100644 index 000000000..093c3ea06 --- /dev/null +++ b/web/cobrands/fixmystreet/images/sad-face-in-circle-100px.png diff --git a/web/cobrands/fixmystreet/images/temp-map.jpg b/web/cobrands/fixmystreet/images/temp-map.jpg Binary files differdeleted file mode 100644 index 60ca79878..000000000 --- a/web/cobrands/fixmystreet/images/temp-map.jpg +++ /dev/null diff --git a/web/cobrands/fixmystreet/images/temp-map.png b/web/cobrands/fixmystreet/images/temp-map.png Binary files differdeleted file mode 100644 index 12b9f2ab4..000000000 --- a/web/cobrands/fixmystreet/images/temp-map.png +++ /dev/null diff --git a/web/cobrands/fixmystreet/images/tick-in-circle-100px.png b/web/cobrands/fixmystreet/images/tick-in-circle-100px.png Binary files differnew file mode 100644 index 000000000..54647a012 --- /dev/null +++ b/web/cobrands/fixmystreet/images/tick-in-circle-100px.png diff --git a/web/cobrands/greenwich/_colours.scss b/web/cobrands/greenwich/_colours.scss new file mode 100644 index 000000000..ff8ff2b40 --- /dev/null +++ b/web/cobrands/greenwich/_colours.scss @@ -0,0 +1,24 @@ +/* COLOURS */ + +$greenwich_red: #d42828; +$greenwich_dark_red: #a71930; +$greenwich_dark_grey: #4b5459; +$greenwich_med_grey: #d9e0e4; +$greenwich_light_grey: #e0e6e9; + +$primary: $greenwich_red; +$primary_b: #000000; +$primary_text: #222222; + +$base_bg: #fff; +$base_fg: #000; + +$map_nav_bg: #fff; +$nav_fg: #fff; +$nav_fg_hover: transparent; + +$col_click_map: $greenwich_red; +$col_click_map_dark: darken($col_click_map, 10%); + +$col_fixed_label: #00BD08; +$col_fixed_label_dark: #4B8304; diff --git a/web/cobrands/greenwich/_fonts.scss b/web/cobrands/greenwich/_fonts.scss new file mode 100644 index 000000000..b03804e44 --- /dev/null +++ b/web/cobrands/greenwich/_fonts.scss @@ -0,0 +1,3 @@ +$body-font: Verdana, Arial, Helvetica, sans-serif; +$meta-font: $body-font; +$heading-font: georgia, 'new century schoolbook', 'times new roman', times, serif; diff --git a/web/cobrands/greenwich/base.scss b/web/cobrands/greenwich/base.scss new file mode 100644 index 000000000..e4561e338 --- /dev/null +++ b/web/cobrands/greenwich/base.scss @@ -0,0 +1,89 @@ +@import "../sass/h5bp"; +@import "./_colours"; +@import "./_fonts"; +@import "../sass/mixins"; +@import "compass"; + +@import "../sass/base"; + +body.frontpage #site-logo, +.ie6 body.frontpage #site-logo, +#site-logo +{ + background: url("/cobrands/greenwich/logo.gif") 0 0 no-repeat; + background-size: contain; + width: 82px; + height: 40px; + top: 8px; + left: 4px; +} + +#nav-link { + background: url('/cobrands/greenwich/tab-red.png') 0 0 no-repeat; +} + + +#site-header { + background-color: $base_bg; + background: url("/cobrands/greenwich/mastWave.gif") 0 0 no-repeat; + background-size: cover; +} + + +#mysoc-menu { + display: none; +} + +.issue-list-a li, .list-a li, #user-meta p, #front-main #postcodeForm { + background: $greenwich_light_grey; +} + +label[for=pc] { + color: $greenwich_dark_red; +} + +ol.big-numbers > li:before { + color: $primary; +} + +#front-howto #front_stats { + color: $nav_fg; +} + +#greenwich-menu-desktop, #fms-menu-desktop, #greenwich-breadcrumb { + display: none; +} + +footer { + ul li { + list-style: none; + } + + hr { + padding: 0; + margin: 0 -16px; + height: 4px; + background-color: $greenwich_red; + border: none; + } +} + +h1, h2 { + font-style: italic; +} + +button, input[type=submit], .btn, .green-btn, button.green-btn, input.green-btn { + border: none; + border-radius: 0; + text-transform: none; + color: white; + background: $greenwich_dark_grey; + border-bottom: solid 4px $greenwich_red; + + &:hover { + border: none; + border-bottom: solid 4px lighten($greenwich_red, 5%); + text-decoration: underline; + background: lighten($greenwich_dark_grey, 2%); + } +} diff --git a/web/cobrands/greenwich/bcArrow.gif b/web/cobrands/greenwich/bcArrow.gif Binary files differnew file mode 100644 index 000000000..98e02417c --- /dev/null +++ b/web/cobrands/greenwich/bcArrow.gif diff --git a/web/cobrands/greenwich/config.rb b/web/cobrands/greenwich/config.rb new file mode 100644 index 000000000..cab97b18f --- /dev/null +++ b/web/cobrands/greenwich/config.rb @@ -0,0 +1,25 @@ +# Require any additional compass plugins here. + +# Set this to the root of your project when deployed: +http_path = "/" +css_dir = "" +sass_dir = "" +images_dir = "" +javascripts_dir = "" + +# You can select your preferred output style here (can be overridden via the command line): +# output_style = :expanded or :nested or :compact or :compressed + +# To enable relative paths to assets via compass helper functions. Uncomment: +# relative_assets = true + +# To disable debugging comments that display the original location of your selectors. Uncomment: +# line_comments = false + +# If you prefer the indented syntax, you might want to regenerate this +# project again passing --syntax sass, or you can uncomment this: +# preferred_syntax = :sass +# and then run: +# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass + +line_comments = false # by Compass.app diff --git a/web/cobrands/greenwich/layout.scss b/web/cobrands/greenwich/layout.scss new file mode 100644 index 000000000..bde0eded5 --- /dev/null +++ b/web/cobrands/greenwich/layout.scss @@ -0,0 +1,296 @@ +@import "_colours"; +@import "_fonts"; +@import "../sass/layout"; +@import "../sass/report_list"; + +$fixed_page_width: 990px; + +/* from http://nicolasgallagher.com/micro-clearfix-hack/ */ +.clearfix:before, .clearfix:after { content: " "; display: table; } +.clearfix:after { clear: both; } +/* For IE 6/7 only */ +.clearfix { *zoom: 1; } + + +#site-logo, +.ie6 #site-logo, +body.frontpage #site-logo, +.ie6 body.frontpage #site-logo, +body.authpage #site-logo, +.ie6 body.authpage #site-logo, +body.twothirdswidthpage #site-logo, +.ie6 body.twothirdswidthpage #site-logo +{ + position: relative; + top: 14px; + left: 14px; + margin: 0; + padding: 0; + background: url("/cobrands/greenwich/logo.gif") 0 0 no-repeat; + width: 170px; + height: 83px; +} + +.container, #main-nav { + width: $fixed_page_width; +} + +#front-main { + background-color: $base_bg; + padding-top: 0.5em; + text-align: left; + + #front-main-container { + max-width: $fixed_page_width; + background-color: transparent; + padding: 1em 0; + } + + #postcodeForm div { + margin: 0; + } + + h1 { + color: $greenwich_dark_red; + padding-bottom: 3em; + } +} + +body.frontpage #site-header, #site-header { + height: auto; + + .container { + min-height: 0; + } + + .container:first-child { + background: url("/cobrands/greenwich/mastWave.gif") 0 0 no-repeat; + min-height: 110px; + } +} + +body.frontpage { + #user-meta p { + top: -9em; + } + + .issue-list-a li { + border-left: solid 4px $primary; + } + + #fms-menu-desktop { + position: absolute; + width: 990px; + top: 262px; + } +} + +body.twothirdswidthpage #user-meta p { + padding-bottom: 0; + z-index: 2; +} + +.nav-wrapper .nav-wrapper-2 { + border-top: none; +} + +#main-menu { + display: none; +} + +#greenwich-menu-desktop, #fms-menu-desktop, #greenwich-breadcrumb { + display: block; + font-size: 15px; + list-style: none; + margin: 0; + padding: 0; + + li { + display: inline-block; + list-style: none; + margin: 0; + padding: 0.25em 0.5em; + + span, a { + padding: 0.5em; + } + + span, a:hover { + text-decoration: underline; + } + } +} + +#greenwich-menu-desktop { + background: $greenwich_dark_grey; + font-family: $heading-font; + font-style: italic; + border-top: solid 4px $primary; + border-bottom: solid 4px $greenwich_med_grey; + text-align: right; + padding-right: 1em; + + li { + span, a { + color: $nav_fg; + } + } +} + +#greenwich-breadcrumb { + background: transparent; + margin-top: 0.25em; + + li { + padding: 0; + margin: 0; + font-size: 11px; + + span, a { + color: black; + + &.bc_arrow { + background: url('/cobrands/greenwich/bcArrow.gif') no-repeat right 0.4em; + padding: 0 15px 0 0; + } + } + } +} + +#fms-menu-desktop { + background: $greenwich_light_grey; + margin-top: 0.5em; + + li { + a { + color: $greenwich_dark_grey; + } + span { + color: $greenwich_red; + } + } +} + +body.mappage { + #site-header .container { + min-height: 68px; + } + + .main-menu-container { + display: none; + } + + #main-menu { + display: block; + } + + #site-logo { + top: 5px; + left: 6px; + background: url("/cobrands/greenwich/logo.gif") 0 0 no-repeat; + background-size: 111px 54px; + width: 111px; + height: 54px; + } + + .nav-wrapper .nav-wrapper-2 { + background: url("/cobrands/greenwich/mastWave.gif") 100% 0 no-repeat; + background-color: $base_bg; + background-size: contain; + border-bottom: solid 4px $primary; + } + + #main-nav { + ul#main-menu { + li a.report-a-problem-btn { + color: $nav_fg; + } + } + + ul li { + a, span { + color: $primary_text; + } + a:hover { + text-decoration: underline; + } + } + } +} + +body.twothirdswidthpage .content .sticky-sidebar { + z-index: 0; + left: 43em; + + aside { + top: 14em; + } +} + +body.fullwidthpage, body.twothirdswidthpage { + .container .content footer { + a.platform-logo { + background-color: $greenwich_dark_grey; + background-position: center center; + background-size: 13em 1.5em; + width: 14em; + height: 3em; + border-radius: 1.5em; + } + + .tablewrapper { + padding: 0; + margin: 1em 0; + + div { + text-align: center; + + p { + margin: 0; + padding: 0; + line-height: 3em; + } + } + } + + .footer-nav { + padding: 0; + margin: 1em 0; + + ul { + margin: 0; + padding: 0; + text-align: center; + + li { + display: inline; + padding: 0 4px 0 7px; + font-size: 0.8em; + border-left: solid 1px $greenwich_dark_grey; + + &:first-child { + border-left: none; + } + + a, a:link, a:visited { + color: $primary_text; + } + } + } + } + + hr { + padding: 0; + margin: 0 -24px; + border-bottom: solid 8px $greenwich_red; + border-top: solid 48px $greenwich_dark_grey; + height: 0; + } + } +} + +// Override the default issue (report) list styling on the /my page, so that +// reports don't pop out the side of the sidebar +.issue-list-a.full-width { + margin-left: -1em; +} diff --git a/web/cobrands/greenwich/logo-mobile.gif b/web/cobrands/greenwich/logo-mobile.gif Binary files differnew file mode 100644 index 000000000..70fb1c692 --- /dev/null +++ b/web/cobrands/greenwich/logo-mobile.gif diff --git a/web/cobrands/greenwich/logo.gif b/web/cobrands/greenwich/logo.gif Binary files differnew file mode 100644 index 000000000..dc46d2bf1 --- /dev/null +++ b/web/cobrands/greenwich/logo.gif diff --git a/web/cobrands/greenwich/mastWave.gif b/web/cobrands/greenwich/mastWave.gif Binary files differnew file mode 100644 index 000000000..19984c94d --- /dev/null +++ b/web/cobrands/greenwich/mastWave.gif diff --git a/web/cobrands/greenwich/tab-red.png b/web/cobrands/greenwich/tab-red.png Binary files differnew file mode 100644 index 000000000..f3ef9d084 --- /dev/null +++ b/web/cobrands/greenwich/tab-red.png diff --git a/web/cobrands/harrogate/base.scss b/web/cobrands/harrogate/base.scss index eccb1a84f..f0bb1daa1 100644 --- a/web/cobrands/harrogate/base.scss +++ b/web/cobrands/harrogate/base.scss @@ -5,7 +5,6 @@ @import "../sass/base"; - body.frontpage #site-logo, .ie6 body.frontpage #site-logo, #site-logo @@ -20,6 +19,20 @@ body.frontpage #site-logo, height: 37px; } +#nav-link { + background-image: url(/cobrands/fixmystreet/images/menu-black.png); + background-image: url(/cobrands/fixmystreet/images/menu-black.svg), none; +} + +#report-cta { + border-color: #ddd; + color: #000; + + &:hover, &:focus { + background-color: #eee; + } +} + #main-nav ul#main-menu li { // blue button background, darker if selected @@ -63,3 +76,15 @@ label[for=form_INFO_TEXT] { padding: 0.5em; font-size: 0.8em; } + +.nycc-notice { + border: solid 1px black; + background: #00539F; + color: white; + padding: 0.5em; + margin-top: 1em; + a { + color: white; + text-decoration: underline; + } +} diff --git a/web/cobrands/makemyisland/_colours.scss b/web/cobrands/makemyisland/_colours.scss deleted file mode 100644 index 56816bb77..000000000 --- a/web/cobrands/makemyisland/_colours.scss +++ /dev/null @@ -1,25 +0,0 @@ -/* COLOURS */ - - -// colours specified by MakeMyIsland team -// from http://www.w3schools.com/cssref/css_colorsfull.asp - -$blue: #4169E1; // "RoyalBlue" -$green: #40E0D0; // "Turquoise" - -$primary: $green; -$primary_b: #000000; -$primary_text: #222222; - -$base_bg: $blue; -$base_fg: $primary_text; - -$map_nav_bg: $blue; -$nav_fg: #fff; -$nav_fg_hover: $primary; - -$col_click_map: $blue; -$col_click_map_dark: darken($blue, 10%); - -$col_fixed_label: #00BD08; -$col_fixed_label_dark: #4B8304; diff --git a/web/cobrands/makemyisland/base.scss b/web/cobrands/makemyisland/base.scss deleted file mode 100644 index 234a9783f..000000000 --- a/web/cobrands/makemyisland/base.scss +++ /dev/null @@ -1,42 +0,0 @@ -@import "../sass/h5bp"; -@import "./_colours"; -@import "../sass/mixins"; -@import "compass"; - -@import "../sass/base"; - -#site-logo { - background: url(/cobrands/makemyisland/make-my-island-logo.gif) 0px 0px no-repeat; - background-size: contain; - background-color: $blue; -} - -#united-nations-dp-logo { - display: none; -} - -#site-header, -body.frontpage #site-header, -body.mappage #site-header, -{ - min-height: 3em; - @include background(none); - background-color: $blue; -} - -div#location-buttons { - margin: 1.333em auto; - .island-button { - margin:0 auto 1.5em auto; - } - a.front-page-button { - // @include button-reset(#FFD000, #cc9000, #aa7000, #300, #FFD000, #cc9000, #aa7000, #300); - @include button-reset($blue, darken($blue, 10%), darken($blue, 30%), white, $blue, darken($blue, 20%), darken($blue, 30%), white); - #front-main & { - text-decoration: none; - } - &:visited, &:hover { - color:white; - } - } -} diff --git a/web/cobrands/makemyisland/layout.scss b/web/cobrands/makemyisland/layout.scss deleted file mode 100644 index 28b265240..000000000 --- a/web/cobrands/makemyisland/layout.scss +++ /dev/null @@ -1,39 +0,0 @@ -@import "_colours"; - -@import "../sass/layout"; - -#site-logo, -body.frontpage #site-logo { - margin-top: -8px; - margin-left: 10px; - height: 100px; - background: url(make-my-island-logo.gif) 0px 0px no-repeat; -} - -body.mappage #site-logo { - height: 60px; - background-size: contain; -} - -body.frontpage #site-logo { - margin-top: -35px; - width: 100px; -} - -body.frontpage #united-nations-dp-logo { - display: block; - float:right; - position: relative; - background: url(undp-logo-2013.png) top right no-repeat; - background-size: contain; - background-color: transparent; - text-indent: -999999px; - height: 100px; - width: 51px; - margin: 10px 10px 0 0; - z-index:3; // clear of the nav container -} - -ul#main-menu { - margin-right: 70px; // to clear the UNDP logo -}
\ No newline at end of file diff --git a/web/cobrands/makemyisland/make-my-island-logo.gif b/web/cobrands/makemyisland/make-my-island-logo.gif Binary files differdeleted file mode 100755 index f7b6b8d5a..000000000 --- a/web/cobrands/makemyisland/make-my-island-logo.gif +++ /dev/null diff --git a/web/cobrands/makemyisland/undp-logo-2013.png b/web/cobrands/makemyisland/undp-logo-2013.png Binary files differdeleted file mode 100644 index ed537e6cf..000000000 --- a/web/cobrands/makemyisland/undp-logo-2013.png +++ /dev/null diff --git a/web/cobrands/oxfordshire/_colours.scss b/web/cobrands/oxfordshire/_colours.scss index 900f96d3d..ed494674a 100644 --- a/web/cobrands/oxfordshire/_colours.scss +++ b/web/cobrands/oxfordshire/_colours.scss @@ -2,6 +2,8 @@ $oxfordshire_dk_green: #114500; $oxfordshire_lt_green: #339E00; +$oxfordshire_very_light_green: #f6fcf0; +$oxfordshire_mid_grey_green: #e0e5da; $primary: $oxfordshire_lt_green; $primary_b: $oxfordshire_dk_green; @@ -10,6 +12,9 @@ $primary_text: #fff; $base_bg: #fff; $base_fg: #000; +// Taken from the OCC website +$oxfordshire_link_colour: #0c62ba; + /* Unused here */ $map_nav_bg: #222; $nav_fg: #fff; @@ -19,7 +24,7 @@ $col_click_map: $oxfordshire_lt_green; $col_click_map_dark: $primary_text; $col_fixed_label: $oxfordshire_lt_green; -$col_fixed_label_dark: $primary_text; +$col_fixed_label_dark: mix(#000, $oxfordshire_lt_green, 50%); // Oxfordshire have toasty orange buttons diff --git a/web/cobrands/oxfordshire/base.scss b/web/cobrands/oxfordshire/base.scss index cf20374da..2f297582c 100644 --- a/web/cobrands/oxfordshire/base.scss +++ b/web/cobrands/oxfordshire/base.scss @@ -5,14 +5,6 @@ @import "../sass/base"; - -// Colour tab to match colour scheme -#nav-link { - width: 50px; - height: 48px; - background: url('/cobrands/oxfordshire/images/tab-green.png') 0 0 no-repeat; -} - #site-header { background: none; background-color: $oxfordshire_dk_green; @@ -29,6 +21,10 @@ height: 38px; } +#nav-link { + height: 60px; // to match #site-header +} + #main-nav ul#mysoc-menu li a#mysoc-logo { background-image: none; text-indent: 0; @@ -49,3 +45,29 @@ dd, p { line-height: 1.4em; } +// TODO: Should this be applied to the base base stylesheet, to prevent possible similar issues in other cobrands? +#sub_map_links { + line-height: 1em; +} + +.council_info_box { + border-top: 1px solid #ccc; + padding: 1em; + margin: 0 -1em -1em -1em; // counteract 1em padding on sidebar without using .full-width which sets an explicit width + + h3 { + font-weight: bold; + font-size: 1em; + margin: 0 0 0.5em 0; + } + + p { + color: #666; + margin: 0 0 0.5em 0; + font-size: 0.9em; + } + + & > :last-child { + margin-bottom: 0; + } +} diff --git a/web/cobrands/oxfordshire/images/click-map-chevron-small.gif b/web/cobrands/oxfordshire/images/click-map-chevron-small.gif Binary files differnew file mode 100644 index 000000000..fdc871c41 --- /dev/null +++ b/web/cobrands/oxfordshire/images/click-map-chevron-small.gif diff --git a/web/cobrands/oxfordshire/images/logo-light-green.gif b/web/cobrands/oxfordshire/images/logo-light-green.gif Binary files differnew file mode 100644 index 000000000..6bf7b6940 --- /dev/null +++ b/web/cobrands/oxfordshire/images/logo-light-green.gif diff --git a/web/cobrands/oxfordshire/layout.scss b/web/cobrands/oxfordshire/layout.scss index 9b6308e09..195c5342f 100644 --- a/web/cobrands/oxfordshire/layout.scss +++ b/web/cobrands/oxfordshire/layout.scss @@ -1,8 +1,9 @@ @import "_colours"; @import "../sass/layout"; +@import "../sass/report_list"; body, body a { - font-family:"Trebuchet MS",Arial, Helvetica, sans-serif; + font-family:"Trebuchet MS",Arial, Helvetica, sans-serif; } #front-main { @@ -65,23 +66,6 @@ body.twothirdswidthpage { } } -//------------------------------------------------- -// following declarations concern the map display: -//------------------------------------------------- -// So that map appears underneath the header -.wrapper { - position: relative; - .table-cell { - padding-left: 13px; // added 13px to match Oxfordshire's normal look - padding-right: 13px; - } -} -.ie6, .ie7 { - .wrapper { - padding-top: 1em; - } -} - // To prevent font size larger interfering with the fixed Oxfordshire layout .container { width: auto; } .full-width { width: 464px; } @@ -110,59 +94,233 @@ body.twothirdswidthpage .content { } body.mappage { - .content { - width: 345px; - padding: 1em; - position: relative; - z-index: 1; + $mappage-header-height: 60px; + + #oxford-wrapper { + width: auto; + padding: 0; + background: transparent; + } + + #oxford-header { + position: fixed; + top: 0; + left: 0; + right: 0; + z-index: 2; // 1 more than `body.mappage .content` + width: auto; + min-height: $mappage-header-height; + padding: 0; + background-color: #069b01; // picked from header.jpg + background-position: 100% 40%; + overflow: auto; + box-shadow: 0 0 5px rgba(0,0,0,0.3); + + & > * { + display: none; + } + + a.logo { + display: block; + float: left; + height: $mappage-header-height; + width: 200px; + margin: 0; + background: transparent url("/cobrands/oxfordshire/images/logo-light-green.gif") no-repeat 50% 50%; + text-indent: -999px; + + * { + display: none; + } + } + + #navigation { + display: block; + position: static; + float: right; + } + + .menubar { + display: block; + width: auto; + border-top: none; + padding: 0; + + // override super-specific "#navigation .menubar .menu-inner .menu>li>a" + // selector from OCC header styles in oxfordshire.scss + .menu-inner .menu { + li { + margin-bottom: 0; + } + + a, span { + line-height: 20px; + padding-top: ($mappage-header-height - 20px) / 2; + padding-bottom: ($mappage-header-height - 20px) / 2; + } + } + } + + .oxford-user { + display: block; + font-size: 13px; + margin: 0; + color: mix(#ddd, #069b01, 80%); + + p { + margin: 0; + padding-top: ($mappage-header-height - 20px) / 2; + padding-bottom: ($mappage-header-height - 20px) / 2; + line-height: 20px; + } + + a { + padding: 0 10px; + text-decoration: none; + } + } + } + + .wrapper .table-cell { + padding-left: 0; + padding-right: 0; + } + + .container { + width: auto; + } + + .content { + padding: 1em; + padding-top: $mappage-header-height + 10px; + position: relative; + z-index: 1; + box-shadow: 0 0 5px rgba(0,0,0,0.3); + background-color: $oxfordshire_very_light_green; + + // fixmystreet.js gives this element a min-height equal to the window height. + // Set border-box sizing, so that our padding doesn't get added onto height. + box-sizing: border-box; + + .extra-text { + padding: 1em; + margin: 0 -1em; + border-bottom: 1px solid $oxfordshire_mid_grey_green; + + p:last-child { + margin-bottom: 0; + } + } + + .full-width { + width: auto; + margin: 0 -1em; } - .container { - width: auto; - min-height: 635px; - z-index: auto; + input[type="file"] { + background-color: transparent; } - .full-width { width: 377px; } - .shadow-wrap { width: 377px; } + } + + // Space between green header and sidebar content + #report-a-problem-main, + .problem-header { + padding-top: 1em; + } + + // The "Fixed" / "Unknown" tabs on Oxford report pages are "folded" + // round right edge of the sidebar, rather than over the top of it. + .banner { + margin: 0 -1em; // line tab up with right edge of 1em padded sidebar + + // Float the tab, rather than absolute positioning, to benefit + // from text wrapping and stop content being hidden behind it. + p { + position: relative; // still required for :before positioning + top: auto; + right: auto; + float: right; + margin: 1em -0.75em 0.5em 1em; - #report-a-problem-sidebar { - top: 1em; - left: 23.5em; + // Swap "fold" triangle to bottom right corner of box, rather than top left. + &:before { + left: auto; + right: 0; + top: auto; + bottom: -0.75em; + border-left: none; + border-bottom: none !important; // override default id selectors + border-top: 0.75em solid #888; + border-right: 0.75em solid transparent; + } + + &#fixed:before { + border-top-color: #1D4D05; // dark green + border-top-color: $col_fixed_label_dark; + } } + } + + #oxford-footer { + display: none; + } } -.ie6, .ie7 { - body.mappage .container { - width: 464px; - margin-left: 0; +.report-list, .issue-list-a { + li:after { + background-color: $oxfordshire_mid_grey_green; + } + + h3 { + color: $oxfordshire_link_colour; } } -// As map can scroll and isn't at the top, give it an edge -#map_box { - border: solid 1px #999; - top: 1em; - right: 0; - left: 0; - margin: 0 1em; +h4.static-with-rule { + margin-top: 1em; // down from default 2em, avoid extra space between heading and .council_info_box + margin-bottom: 0; // no space between this and the .issue-list items + background: transparent; // rather than light grey + padding: 0.75em 1em * (1/0.875); // compensate for 0.875 font-size +} + +.issue-list li { + background: transparent; + margin-top: 0; // no space between list items + + // Replicate .report-list styling, a bit + border-top: 1px solid $oxfordshire_mid_grey_green; + padding: 1em 1em 1em 0; + margin-left: 1em; + + .update-wrap .update-text > :last-child { + margin-bottom: 0; + } + + .meta-2 { + font-style: normal; + } } -// Perhaps fix map location (should be in central?) -.ie6 #map_box, .ie7 #map_box { - right: -480px; +.form-box { + background-color: darken($oxfordshire_very_light_green, 5%); } -// So as not to interfere with the Oxfordshire footer, make the fixed nav ("get updates" etc) static. .shadow-wrap { - position: static; - padding-top: 0; - margin-bottom: 1em; + width: 432px; + ul#key-tools { - border-top: none; - border-bottom: 1px solid $primary; + -webkit-box-shadow: 0em 0px 1em 1em $oxfordshire_very_light_green; + -moz-box-shadow: 0em 0px 1em 1em $oxfordshire_very_light_green; + box-shadow: 0em 0px 1em 1em $oxfordshire_very_light_green; + border-top-width: 2px; } } +// Stop bottom of update form disappearing behind the #key-tools shadow +#update_form { + padding-bottom: 4em; +} + #oxford-wrapper #front-main #postcodeForm div { border: 1px solid #fff; // because orange "Go" button (see below) abuts this border, looks a tiny bit better if it's not dark green @@ -195,21 +353,48 @@ input.green-btn{ cursor: pointer; } -.big-green-banner { - text-align: left; - text-transform: inherit; - font-family: inherit; - font-size: 1.5em; - padding: 0.5em 2em 0.5em 0.5em; - line-height: 1.3; - background: #339e00 url("/cobrands/fixmystreet/images/sprite.png") right -2177px no-repeat; +.click-the-map { + border-bottom-color: $oxfordshire_mid_grey_green; - .ie6 &, .ie7 & { - zoom: 1; - position: relative; + p { + color: $oxfordshire_lt_green; + background-image: url(/cobrands/oxfordshire/images/click-map-chevron-small.gif); } } +#skip-this-step { + display: block; + color: inherit; + margin: 0 -15px; + padding: 16px; + font-size: 18px; + line-height: 20px; + border-bottom: 1px solid #E7E1C0; + background: #FDF4C5; + + em { + font-style: normal; + text-decoration: underline; + color: $primary; + } + + &:hover { + text-decoration: none; + } + + html.js & { + // If javascript is enabled, hide the skip link off-screen, + // but keep it visible for screen readers. + position: absolute; + top: -999px; + + &:focus { + // And show it again if it receives focus (eg: via tab key) + position: static; + } + } +} + .extra-text__image { float: left; margin-right: 1em; diff --git a/web/cobrands/oxfordshire/oxfordshire.scss b/web/cobrands/oxfordshire/oxfordshire.scss index d6b31586c..46de1f22b 100644 --- a/web/cobrands/oxfordshire/oxfordshire.scss +++ b/web/cobrands/oxfordshire/oxfordshire.scss @@ -7,9 +7,9 @@ body { - font-family:"Trebuchet MS",Arial, Helvetica, sans-serif; - line-height:18px; - a {text-decoration:none; color:#0c62ba} + font-family:"Trebuchet MS",Arial, Helvetica, sans-serif; + line-height:18px; + a, a:visited {text-decoration:none; color:$oxfordshire_link_colour} a { font-size: 1em; } // mySociety a:hover {text-decoration:underline} margin:0; @@ -27,15 +27,15 @@ body { } #oxford-header { - padding:0 16px 7px 16px; - clear:both; - overflow:hidden; - position:relative; + padding:0 16px 7px 16px; + clear:both; + overflow:hidden; + position:relative; width:958px; /* note================= */ height: 133px; - height:auto !important; + height:auto !important; min-height:133px; /* note================= */ @@ -47,7 +47,7 @@ body { a.logo, a.logo span {width:173px; height:38px; background: url("/cobrands/oxfordshire/images/logo.jpg") no-repeat 0 0;} h1 { - float:left; padding:8px 0 0 10px; margin:0; font-size:1.25em; line-height:normal; + float:left; padding:8px 0 0 10px; margin:0; font-size:1.25em; line-height:normal; font-weight:bold; color:#ffffff; white-space:nowrap;font-family:"Trebuchet MS",Tahoma,Arial,sans-serif; } span.header { @@ -76,73 +76,71 @@ body { } } - - #oxford-main-menu { clear: both; margin: 0; padding: 0; font-size: 1em; position: relative; - ul { + ul { margin: 0 0 0 330px; position: relative; li { margin: 0; - list-style-type: none; - float:left; + list-style-type: none; + float:left; width:126px; text-align:center; background: #e0e0e0; padding: 8px 0; - margin: 0 0 0 2px; + margin: 0 0 0 2px; } } // from occ.css (client site): #main .view-features-for-homepage ul.tabs ul.tabs { - float:left; - position:relative; - padding:0; + float:left; + position:relative; + padding:0; margin:0.5em 0 0 0; - z-index:10; + z-index:10; width: 990px; - //width:635px; - min-height:32px; - overflow:hidden; - clear:both; + //width:635px; + min-height:32px; + overflow:hidden; + clear:both; background: #939393 url("/cobrands/oxfordshire/images/tabs-featured.png") repeat 0 0; li { - float:left; - padding:0 0 0px 1px; - margin:0; - font:0.813em/27px "Trebuchet MS"; - color:#ffffff; - height:32px; + float:left; + padding:0 0 0px 1px; + margin:0; + font:0.813em/27px "Trebuchet MS"; + color:#ffffff; + height:32px; background: #666 url("/cobrands/oxfordshire/images/divider1x32.png") no-repeat 0 0; } li.first {padding:0; background:none} span, // mySociety a { - display:block; - position:relative; - padding:8px 0 0 0; - font:bold 1em "Trebuchet MS"; - height:24px; - color:#ffffff; - text-align:center; - background: #939393 url("/cobrands/oxfordshire/images/tabs-featured.png") repeat-x 0 0; + display:block; + position:relative; + padding:8px 0 0 0; + font:bold 1em "Trebuchet MS"; + height:24px; + color:#ffffff; + text-align:center; + background: #939393 url("/cobrands/oxfordshire/images/tabs-featured.png") repeat-x 0 0; white-space:nowrap; } a:hover, a:focus { - background: none #EA6C18; - background:-moz-linear-gradient(100% 100% 90deg, #ff4401, #EA6C18); - background:-webkit-gradient(linear, 0% 0%, 0% 100%, from(#EA6C18), to(#ff4401)); + background: none #EA6C18; + background:-moz-linear-gradient(100% 100% 90deg, #ff4401, #EA6C18); + background:-webkit-gradient(linear, 0% 0%, 0% 100%, from(#EA6C18), to(#ff4401)); color: #ffffff; } li span, // mySociety li.active a { - text-decoration:none; + text-decoration:none; background: #4c4c4c url("/cobrands/oxfordshire/images/tabs-featured-on.png") repeat-x 0 0; } li.active a:hover, @@ -154,13 +152,13 @@ body { } #oxford-footer { - float:left; - display:inline; - margin:0 -8px 0 -8px; - padding:10px 25px 30px 21px; - clear:both; - overflow:hidden; - width:960px; + float:left; + display:inline; + margin:0 -8px 0 -8px; + padding:10px 25px 30px 21px; + clear:both; + overflow:hidden; + width:960px; background:#000000 url(/cobrands/oxfordshire/images/footer.jpg) no-repeat bottom left; address {float:left; padding:11px 0 0 0; margin:0; color:#989898; font:0.813em arial} a {font:1em arial; color:#ffffff; margin:0px 5px 0px 5px} @@ -190,7 +188,7 @@ body { } /* --------------------------------------------------------------------------------- - oxfordshire nav menubar from e.g., + oxfordshire nav menubar from e.g., http://fisd.oxfordshire.gov.uk/kb5/oxfordshire/fsd/includes/css/wireframe/navbar.css ---------------------------------------------------------------------------------*/ diff --git a/web/cobrands/oxfordshire/position_map.js b/web/cobrands/oxfordshire/position_map.js index 9e299ea72..bcd0e0c12 100644 --- a/web/cobrands/oxfordshire/position_map.js +++ b/web/cobrands/oxfordshire/position_map.js @@ -1,28 +1,22 @@ -/** - * Position the map box correctly on window resize. - * - * Called from fixmystreet.js when the window 'resize' event is fired - * and the page is transitioning to a desktop version. - */ function position_map_box() { var $html = $('html'); - var oxfordshire_right; - if ($html.hasClass('ie6') || $html.hasClass('ie7')) { - oxfordshire_right = '-480px'; + if ($html.hasClass('ie6')) { + $('#map_box').prependTo('body').css({ + zIndex: 0, position: 'absolute', + top: 0, left: 0, right: 0, bottom: 0, + width: '100%', height: $(window).height(), + margin: 0 + }); } else { - oxfordshire_right = '0em'; + $('#map_box').prependTo('body').css({ + zIndex: 0, position: 'fixed', + top: 0, left: 0, right: 0, bottom: 0, + width: '100%', height: '100%', + margin: 0 + }); } - - var map_box_width = "956px"; - var map_box_height = "600px"; - // Do the same as CSS (in case resized from mobile). - $('#map_box').prependTo('.wrapper').css({ - zIndex: 1, position: 'absolute', - top: '1em', left: '', right: oxfordshire_right, bottom: '', - width: map_box_width, height: map_box_height, - margin: "0 1em" - }); } function map_fix() {} -var slide_wards_down = 1; +var slide_wards_down = 0; + diff --git a/web/cobrands/sass/_admin.scss b/web/cobrands/sass/_admin.scss index 741c058a2..a668712ae 100644 --- a/web/cobrands/sass/_admin.scss +++ b/web/cobrands/sass/_admin.scss @@ -70,83 +70,75 @@ $button_bg_col: #a1a1a1; // also search bar (tables) margin-top: 0; } } - .fms-admin-warning, .fms-admin-info, .admin-hint, .admin-offsite-link { - display: none; // don't display admin-notes unless .show-admin-notes class is present + .admin-offsite-link { + display: inline; } - &.show-admin-notes { - .fms-admin-warning, .fms-admin-info, .admin-hint { - display: block; - } - .admin-offsite-link { - display: inline; + .fms-admin-warning, .fms-admin-info { + padding: 1em; + font-size: 90%; + border-style: solid; + border-width: 1px; + border-left-width: 1em; + margin-bottom: 1em; + } + .fms-admin-warning { + border-color: #f99; + background-color: #ffe1e1; + } + .fms-admin-info { + border-color: #9f9; + background-color: #e1ffe1; + } + .admin-open311-only { + border:1px solid #666; + padding:1em; + margin: 1em 0; + } + .admin-hint { + font-size: 80%; // little question marks are small + cursor: pointer; + display: block; + float:left; + overflow: hidden; + padding: 0.2em; + margin-right: 0.666em; + text-align: center; + color: #fff; + font-weight: bold; + background-color: #f93; + -moz-border-radius: 0.333em; + -webkit-border-radius: 0.333em; + border-radius: 0.333em; + p { + display:none; } - .fms-admin-warning, .fms-admin-info { - padding: 1em; + &:before { content: "?" } + &.admin-hint-show { font-size: 90%; - border-style: solid; - border-width: 1px; - border-left-width: 1em; - margin-bottom: 1em; - } - .fms-admin-warning { - border-color: #f99; - background-color: #ffe1e1; - } - .fms-admin-info { - border-color: #9f9; - background-color: #e1ffe1; - } - .admin-open311-only { - border:1px solid #666; - padding:1em; - margin: 1em 0; - } - .admin-hint { - font-size: 80%; // little question marks are small - cursor: pointer; + text-align: left; display: block; - float:left; - overflow: hidden; - padding: 0.2em; - margin-right: 0.666em; - text-align: center; - color: #fff; - font-weight: bold; - background-color: #f93; - -moz-border-radius: 0.333em; - -webkit-border-radius: 0.333em; - border-radius: 0.333em; + float:none; + margin:1em 0; + &:before { content: "" } + background-color: inherit !important; p { - display:none; - } - &:before { content: "?" } - &.admin-hint-show { - font-size: 90%; - text-align: left; + font-weight: normal; display: block; - float:none; - margin:1em 0; - &:before { content: "" } - background-color: inherit !important; - p { - font-weight: normal; - display: block; - background-color: #ff9; - color: #000; - border-style: solid; - border-width: 1px; - border-left-width: 1em; - border-color: #f93; - padding:1em; - margin: 0; - } + background-color: #ff9; + color: #000; + border-style: solid; + border-width: 1px; + border-left-width: 1em; + border-color: #f93; + padding:1em; + margin: 0; } } - .admin-offsite-link { - padding-right: 12px; - background-image: url(../../i/external-link.png); - background-position: right top; - background-repeat: no-repeat; - } + } + .admin-offsite-link { + padding-right: 12px; + background-image: url(../../i/external-link.png); + background-position: right top; + background-repeat: no-repeat; } } diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss index 5bc1105cf..8f6efe51e 100644 --- a/web/cobrands/sass/_base.scss +++ b/web/cobrands/sass/_base.scss @@ -64,13 +64,13 @@ h3 { h4 { font-size: 1em; font-weight: normal; - margin-bottom: 1em; + margin-bottom: 1em; } // default list styles ul, ol { font-size: 1em; - margin-bottom: 2em; + margin-bottom: 2em; margin-left: 2em; padding:0; } @@ -163,15 +163,18 @@ select { width: 100%; } -// links -a, -a:visited { - text-decoration:none; - color:#0BA7D1; +a { + text-decoration: none; + color: #0BA7D1; + + &:visited { + color: #0BA7D1; + } + &:hover, &:active { - text-decoration:underline; - color:#0D7CCE; + text-decoration: underline; + color: #0D7CCE; } } @@ -439,6 +442,7 @@ p.label-valid { width: 175px; height: 40px; top: 0.4em; + left: 0.5em; background: url($image-sprite) -3px -3px no-repeat; text-indent: -999999px; position: absolute; @@ -450,16 +454,36 @@ p.label-valid { // this is a skip to nav for mobile users only #nav-link { - width: 50px; - height: 48px; - background: url($image-sprite) -5px -916px no-repeat; + width: 3em; + height: 3em; // same height as #site-header + background: transparent url(/cobrands/fixmystreet/images/menu-white.png) center center no-repeat; + background-image: url(/cobrands/fixmystreet/images/menu-white.svg), none; + background-size: 22px 18px; display: block; text-indent: -999999px; position: absolute; - right:2em; - top:-2px; - &:hover { - top:2px; + right: 0; + top: 0.25em; // same as border-top on #site-header +} + +// A shortcut to the Reporting page, in the mobile header +#report-cta { + display: block; + position: absolute; + top: (3em / 2); // half the height of #site-header + right: 3.5em; + margin-top: -0.5em; + + font-size: 0.9em; + line-height: 1em; + border: 1px solid #666; + color: #fff; + padding: 0.4em; + border-radius: 0.3em; + + &:hover, &:focus { + text-decoration: none; + background-color: #444; } } @@ -711,7 +735,7 @@ a.button-left { font-size: 1em; line-height: 1; margin:0; - border:1px solid #999; + border:1px solid #999; color:#333; background: #eee; @include border-radius(4px); @@ -719,7 +743,7 @@ a.button-left { color:#fff; background:#777; text-decoration: none; - border:1px solid #666; + border:1px solid #666; } } .button-right, @@ -822,35 +846,14 @@ a:hover.button-left { padding: 0.5em 1em; display:block; .update-wrap { - display:table; - width:100%; - .update-text, - .update-img { - display:table-cell; - vertical-align:top; - p { - margin-bottom: 0.5em; - } - } - .update-img { - text-align:right; - img { - margin:-0.5em -1em 0 0.5em; - height:auto; - } - } + @include clearfix; } - } -} -//display:table fixes -.ie7, .ie7 { - .issue-list li .update-wrap { - .update-text { - float:left; - width:19em; + .update-text p { + margin-bottom: 0.5em; } .update-img { - float:right; + float: right; + margin: 0.5em 0 0.5em 1em; // gutter between text and floated image } } } @@ -966,12 +969,6 @@ a:hover.button-left { } } } -//bit of a hack - as we can't use em's, push the span out to the right -//by how much it would be if the user did not resize the text -.issue-list li .update-wrap .update-img a span { - right:-16px; - top:-8px; -} .problem-header { margin-bottom:1em; @@ -982,6 +979,19 @@ a:hover.button-left { margin-bottom: 0.5em; } +.report_meta_info, +.council_sent_info { + font-size: 0.9em; +} + +.council_sent_info { + color: #666; + + p + & { + margin-top: -0.6em; // partly counteract margin-bottom on previous paragraph + } +} + // map stuff #map_box{ @extend .full-width; @@ -1577,4 +1587,48 @@ table.nicetable { } } +.confirmation-header { + padding: 140px 0 2em; + text-align: center; + + background: transparent url(/cobrands/fixmystreet/images/tick-in-circle-100px.png) center 1em no-repeat; + &.confirmation-header--failure { + background-image: url(/cobrands/fixmystreet/images/sad-face-in-circle-100px.png); + } + + h1, h2 { + margin: 0; + line-height: 1.2em; + } + + h1 { + a { + text-decoration: underline; + color: inherit; + + &:hover, + &:focus { + text-decoration: none; + color: #0BA7D1; // default link colour + } + } + } + + h1 + h2, + h1 ~ p { + margin-top: 12px; + } + + p { + color: #666666; + font-size: 1.2em; + margin-bottom: 0.5em; + } + + & > :last-child { + margin-bottom: 0; + } +} + @import "_admin"; +@import "_fixedthead"; diff --git a/web/cobrands/sass/_fixedthead.scss b/web/cobrands/sass/_fixedthead.scss new file mode 100644 index 000000000..c1896e5d8 --- /dev/null +++ b/web/cobrands/sass/_fixedthead.scss @@ -0,0 +1,4 @@ +.js-fixed-thead__clone { + position: fixed; + background: #fff; +}
\ No newline at end of file diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss index d1cfb6be7..67756ca5b 100644 --- a/web/cobrands/sass/_layout.scss +++ b/web/cobrands/sass/_layout.scss @@ -100,6 +100,7 @@ h1 { } #site-logo { top: 0.9em; + left: auto; position: absolute; z-index: 3; } @@ -117,8 +118,10 @@ h1 { top:-3.25em; } } -#nav-link { - left:-999999px; +#nav-link, +#report-cta { + right: auto; + left: -999999px; } #main-nav{ margin: 0 auto; @@ -1080,6 +1083,14 @@ body.frontpage { } } +.confirmation-header { + width: 25em; + margin: 0 auto 1em; + text-align: left; + padding: 3em 0 3em 132px; // for tick icon + background-position: 0 2em; +} + /* Admin interface */ .fms-admin-floated { diff --git a/web/cobrands/sass/_report_list.scss b/web/cobrands/sass/_report_list.scss new file mode 100644 index 000000000..b4e150d03 --- /dev/null +++ b/web/cobrands/sass/_report_list.scss @@ -0,0 +1,155 @@ +// You should @import this file in a cobrand's layout.scss if it's using +// the new-style combined report list with category/status filters. + +.report-list-filters { + padding: 1em 1em 0 1em; + margin-bottom: 0.5em; + color: #666; + font-size: 0.85em; + + label, select { + display: inline-block; + width: auto; + } + + label { + font-weight: normal; + margin: 0; + + & + label { + margin-left: 0.2em; + } + } + + select { + color: inherit; + font-family: inherit; + font-size: 1em; + + border: 1px solid #ced7c4; + box-shadow: 0 1px 0 #fff; + height: 2em; + margin-left: 0.2em; + max-width: 13em; + } +} + +.report-list, .issue-list-a { + margin-left: 0; + + li { + list-style: none; + position: relative; + margin: 0; + background: none; + + a { + display: block; + padding: 1em; + padding-left: 4em; + background: transparent url(/i/pin-yellow-small.png) no-repeat 1em center; + + &:hover, &:focus { + background-color: #fff; + background-repeat: no-repeat; + background-position: 1em center; + background: transparent url(/i/pin-yellow-small.png) no-repeat 1em center; + text-decoration: none; + } + } + + &.yellow a { + background-image: url(/i/pin-yellow-small.png); + } + &.green a { + background-image: url(/i/pin-green-small.png); + } + &.red a { + background-image: url(/i/pin-red-small.png); + } + &.grey a { + background-image: url(/i/pin-grey-small.png); + } + + &.empty p { + display: block; + padding: 1em; + font-size: 1em; + text-align: center; + } + + &:after { + content: ""; + display: block; + height: 1px; + position: absolute; + left: 4em; + right: 0; + bottom: 0; + background-color: #e5e5e5; + } + + &.empty:after { + left: 0; + } + } + + h3, p { + margin: 0; + } + + h3 { + color: $primary; + margin-bottom: 0.2em; + } + + p { + font-size: 0.8em; + color: #777; + } +} + +.big-green-banner { + display: none; // hide the empty banner by default + + &.mobile-map-banner { + display: block; // show it again once the mobile javascript adds this class + } +} + +.click-the-map { + color: #000; + margin: -10px -1em 0 -1em; // overlap padding on parents + padding: 18px; + border-bottom: 1px solid #e5e5e5; + background: #fff url('/i/click-map-chevron-big.gif') 90% 12px no-repeat; + + h2 { + font-family: inherit; + margin: 0 0 5px 0; + } + + p { + margin: 0; + font-size: 18px; + line-height: 20px; + color: $primary; + padding-right: 20px; + background: transparent url('/i/click-map-chevron-small.gif') 100% center no-repeat; + display: inline-block; + } + + img { + // the little chevron icon + vertical-align: -1px; + margin-left: 0.2em; + } +} + +body.frontpage { + .issue-list-a, .list-a { + li .text { + padding-left: 3em; + } + } +} diff --git a/web/cobrands/trinidadtobago/base.scss b/web/cobrands/trinidadtobago/base.scss index 9fccf92db..c8cb3c80e 100644 --- a/web/cobrands/trinidadtobago/base.scss +++ b/web/cobrands/trinidadtobago/base.scss @@ -5,3 +5,23 @@ @import "../sass/base"; +#site-header { + background: #fff; +} + + +#site-logo { + display: block; + width: 175px; + height: 40px; + top: 0.4em; + background: url("/cobrands/trinidadtobago/images/sprite.png") -3px -3px no-repeat; + text-indent: -999999px; + position: absolute; + z-index: 2 +} + +#nav-link { + background-image: url(/cobrands/fixmystreet/images/menu-black.png); + background-image: url(/cobrands/fixmystreet/images/menu-black.svg), none; +} diff --git a/web/cobrands/trinidadtobago/fixmystreett.png b/web/cobrands/trinidadtobago/fixmystreett.png Binary files differnew file mode 100644 index 000000000..4d0388f19 --- /dev/null +++ b/web/cobrands/trinidadtobago/fixmystreett.png diff --git a/web/cobrands/trinidadtobago/images/sprite.png b/web/cobrands/trinidadtobago/images/sprite.png Binary files differnew file mode 100644 index 000000000..6094712f1 --- /dev/null +++ b/web/cobrands/trinidadtobago/images/sprite.png diff --git a/web/cobrands/trinidadtobago/layout.scss b/web/cobrands/trinidadtobago/layout.scss index 67cc7307f..43783b58b 100644 --- a/web/cobrands/trinidadtobago/layout.scss +++ b/web/cobrands/trinidadtobago/layout.scss @@ -4,3 +4,15 @@ .big-green-banner { background-color: $trinidad_primary; } + +#site-logo, +body.frontpage #site-logo { + margin-top: -10px; + margin-left: 10px; + height: 100px; + background: url(fixmystreett.png) 0px 0px no-repeat; + background-size: contain; +} +body.frontpage #site-logo { + margin-top: -20px; +}
\ No newline at end of file diff --git a/web/cobrands/zurich/base.scss b/web/cobrands/zurich/base.scss index cdbdcbfbd..559d97a27 100644 --- a/web/cobrands/zurich/base.scss +++ b/web/cobrands/zurich/base.scss @@ -52,7 +52,7 @@ } #site-header { - background: $mobile_header_blue; + background: $mobile_header_blue; border-top: 4px solid $mobile_menu_tab_bg_col; height: 48px; } @@ -60,15 +60,9 @@ background: url(logo_portal.jpg) 0px -24px no-repeat; width: 200px; height: 48px; - left:0; + left:0; top:4px; } -// Colour tab to match colour scheme -#nav-link { - width: 50px; - height: 48px; - background: url('/cobrands/zurich/tab-white.png') 0 0 no-repeat; -} #front-howto #front_stats, #front-main #postcodeForm { background-color: $mobile_header_blue; diff --git a/web/css/core.scss b/web/css/core.scss index ed47cb01a..897b2d095 100644 --- a/web/css/core.scss +++ b/web/css/core.scss @@ -65,19 +65,6 @@ $map_width: 500px; clear: both; } - // Site-wide layout - - #advert_thin { - width: 50%; - margin: 1em auto; - text-align: center; - border-top: dotted 1px #999999; - } - #advert_hfymp { - border-top: dotted 1px #999999; - text-align: center; - } - // Front page p#expl { diff --git a/web/i/click-map-chevron-big.gif b/web/i/click-map-chevron-big.gif Binary files differnew file mode 100644 index 000000000..3610c50c8 --- /dev/null +++ b/web/i/click-map-chevron-big.gif diff --git a/web/i/click-map-chevron-small.gif b/web/i/click-map-chevron-small.gif Binary files differnew file mode 100644 index 000000000..4ffd2a95f --- /dev/null +++ b/web/i/click-map-chevron-small.gif diff --git a/web/i/pin-green-big.png b/web/i/pin-green-big.png Binary files differindex 16d73230a..69815463e 100644 --- a/web/i/pin-green-big.png +++ b/web/i/pin-green-big.png diff --git a/web/i/pin-green-mini.png b/web/i/pin-green-mini.png Binary files differnew file mode 100644 index 000000000..32d57a807 --- /dev/null +++ b/web/i/pin-green-mini.png diff --git a/web/i/pin-green-small.png b/web/i/pin-green-small.png Binary files differnew file mode 100644 index 000000000..4813ceb58 --- /dev/null +++ b/web/i/pin-green-small.png diff --git a/web/i/pin-green.png b/web/i/pin-green.png Binary files differindex 47a0a6cc1..597bfc6b7 100644 --- a/web/i/pin-green.png +++ b/web/i/pin-green.png diff --git a/web/i/pin-grey-big.png b/web/i/pin-grey-big.png Binary files differnew file mode 100644 index 000000000..02117aa5e --- /dev/null +++ b/web/i/pin-grey-big.png diff --git a/web/i/pin-grey-mini.png b/web/i/pin-grey-mini.png Binary files differnew file mode 100644 index 000000000..152b0a60f --- /dev/null +++ b/web/i/pin-grey-mini.png diff --git a/web/i/pin-grey-small.png b/web/i/pin-grey-small.png Binary files differnew file mode 100644 index 000000000..14b1f9b03 --- /dev/null +++ b/web/i/pin-grey-small.png diff --git a/web/i/pin-grey.png b/web/i/pin-grey.png Binary files differnew file mode 100644 index 000000000..866e6ebe7 --- /dev/null +++ b/web/i/pin-grey.png diff --git a/web/i/pin-red-big.png b/web/i/pin-red-big.png Binary files differindex 2d970b9e2..fb51b6c78 100644 --- a/web/i/pin-red-big.png +++ b/web/i/pin-red-big.png diff --git a/web/i/pin-red-mini.png b/web/i/pin-red-mini.png Binary files differnew file mode 100644 index 000000000..d91aac979 --- /dev/null +++ b/web/i/pin-red-mini.png diff --git a/web/i/pin-red-small.png b/web/i/pin-red-small.png Binary files differnew file mode 100644 index 000000000..a0e8fb0d2 --- /dev/null +++ b/web/i/pin-red-small.png diff --git a/web/i/pin-red.png b/web/i/pin-red.png Binary files differindex 298f4d3f6..882446a22 100644 --- a/web/i/pin-red.png +++ b/web/i/pin-red.png diff --git a/web/i/pin-shadow-small.png b/web/i/pin-shadow-small.png Binary files differnew file mode 100644 index 000000000..911e3a66c --- /dev/null +++ b/web/i/pin-shadow-small.png diff --git a/web/i/pin-yellow-big.png b/web/i/pin-yellow-big.png Binary files differindex d1642d644..cfae00afc 100644 --- a/web/i/pin-yellow-big.png +++ b/web/i/pin-yellow-big.png diff --git a/web/i/pin-yellow-mini.png b/web/i/pin-yellow-mini.png Binary files differnew file mode 100644 index 000000000..8181bce96 --- /dev/null +++ b/web/i/pin-yellow-mini.png diff --git a/web/i/pin-yellow-small.png b/web/i/pin-yellow-small.png Binary files differnew file mode 100644 index 000000000..53cfb654a --- /dev/null +++ b/web/i/pin-yellow-small.png diff --git a/web/i/pin-yellow.png b/web/i/pin-yellow.png Binary files differindex 196cb0f5f..67ccc546a 100644 --- a/web/i/pin-yellow.png +++ b/web/i/pin-yellow.png diff --git a/web/js/fixmystreet-admin.js b/web/js/fixmystreet-admin.js index 1663dda7b..5e0d873c5 100644 --- a/web/js/fixmystreet-admin.js +++ b/web/js/fixmystreet-admin.js @@ -3,13 +3,13 @@ $(function(){ // hide the open311_only section and reveal it only when send_method is relevant var $open311_only = $('.admin-open311-only'); - + function hide_or_show_open311(hide_fast) { var send_method = $('#send_method').val(); var show_open311 = false; if ($('#endpoint').val()) { show_open311 = true; // always show the form if there is an endpoint value - } else if (send_method && send_method.toLowerCase() != 'email') { + } else if (send_method && !send_method.match(/^(email|emptyhomes|noop|refused)$/i)) { show_open311 = true; } if (show_open311) { @@ -28,34 +28,32 @@ $(function(){ hide_or_show_open311(true); } - if ($('body').hasClass("show-admin-notes")) { - // admin hints: maybe better implemented as tooltips? - $(".admin-hint").on('click', function(){ - if ($(this).hasClass('admin-hint-show')) { - $(this).removeClass('admin-hint-show'); + // admin hints: maybe better implemented as tooltips? + $(".admin-hint").on('click', function(){ + if ($(this).hasClass('admin-hint-show')) { + $(this).removeClass('admin-hint-show'); + } else { + $(this).addClass('admin-hint-show'); + } + }); + + // on a body's page, hide/show deleted contact categories + var $table_with_deleted_contacts = $('table tr.is-deleted td.contact-category').closest('table'); + if ($table_with_deleted_contacts.length == 1) { + var $toggle_deleted_btn = $("<input type='submit' class='btn' value='Hide deleted contacts' id='toggle-deleted-contacts-btn' style='margin:1em 0;'/>"); + $table_with_deleted_contacts.before($toggle_deleted_btn); + $toggle_deleted_btn.on('click', function(e){ + e.preventDefault(); + var $cols = $table_with_deleted_contacts.find('tr.is-deleted'); + if ($cols.first().is(':visible')) { + $cols.hide(); + $(this).prop("value", 'Show deleted contacts'); } else { - $(this).addClass('admin-hint-show'); + $cols.show(); + $(this).prop("value", 'Hide deleted contacts'); } }); - - // on a body's page, hide/show deleted contact categories - var $table_with_deleted_contacts = $('table tr.is-deleted td.contact-category').closest('table'); - if ($table_with_deleted_contacts.length == 1) { - var $toggle_deleted_btn = $("<input type='submit' class='btn' value='Hide deleted contacts' id='toggle-deleted-contacts-btn' style='margin:1em 0;'/>"); - $table_with_deleted_contacts.before($toggle_deleted_btn); - $toggle_deleted_btn.on('click', function(e){ - e.preventDefault(); - var $cols = $table_with_deleted_contacts.find('tr.is-deleted'); - if ($cols.first().is(':visible')) { - $cols.hide(); - $(this).prop("value", 'Show deleted contacts'); - } else { - $cols.show(); - $(this).prop("value", 'Hide deleted contacts'); - } - }); - } } $( "#start_date" ).datepicker({ diff --git a/web/js/fixmystreet.js b/web/js/fixmystreet.js index c8f1fe697..78372d68c 100644 --- a/web/js/fixmystreet.js +++ b/web/js/fixmystreet.js @@ -49,10 +49,6 @@ $(function(){ jQuery.validator.addMethod('validCategory', function(value, element) { return this.optional(element) || value != '-- Pick a category --'; }, translation_strings.category ); - jQuery.validator.addMethod('validName', function(value, element) { - var validNamePat = /\ba\s*n+on+((y|o)mo?u?s)?(ly)?\b/i; - return this.optional(element) || value.length > 5 && value.match( /\S/ ) && value.match( /\s/ ) && !value.match( validNamePat ); }, translation_strings.category ); - var form_submitted = 0; var submitted = false; diff --git a/web/js/jquery.fixedthead.js b/web/js/jquery.fixedthead.js new file mode 100644 index 000000000..33e60f721 --- /dev/null +++ b/web/js/jquery.fixedthead.js @@ -0,0 +1,81 @@ +/* + * jQuery.fixedThead.js + * By Zarino at mySociety + */ + +(function ($) { + + // Call this on a <thead> element and it'll be given a class + // of '.js-fixed-thead__clone' when you scroll down. eg: + // $('#my-table thead').fixedThead() + // + // You'll probably want to specify some CSS styles like: + // .js-fixed-thead__clone { position: fixed; background: #fff; } + + $.fn.fixedThead = function() { + + var calculateCloneDimensions = function calculateCloneDimensions($originalThead, $cloneThead){ + $cloneThead.css({ + width: $originalThead.width() + }); + + $('tr', $originalThead).each(function(tr_index, tr){ + $('th', tr).each(function(th_index, th){ + $cloneThead.find('tr:eq(' + tr_index + ') th:eq(' + th_index + ')').css({ + width: $(th).width() + }); + }); + }); + } + + var showOrHideClone = function showOrHideClone($table, $originalThead, $cloneThead){ + var bounds = $table[0].getBoundingClientRect(); + + // First we detect whether *any* of the table is visible, + // then, if it is, we position the fixed thead so that it + // never extends outside of the table bounds even when the + // visible portion of the table is shorter than the thead. + + if(bounds.top <= 0 && bounds.bottom >= 0){ + $cloneThead.css('display', $originalThead.css('display')); + + var rowHeight = $cloneThead.outerHeight(); + if(bounds.bottom < rowHeight){ + $cloneThead.css({ + top: (rowHeight - bounds.bottom) * -1 + }); + } else { + $cloneThead.css({ + top: 0 + }); + } + + } else { + $cloneThead.css('display', 'none'); + } + } + + return this.each(function() { + var $originalThead = $(this); + var $table = $originalThead.parent('table'); + var $cloneThead = $originalThead.clone().addClass('js-fixed-thead__clone'); + + $cloneThead.insertAfter($originalThead); + $cloneThead.css('display', 'none'); + + calculateCloneDimensions($originalThead, $cloneThead); + showOrHideClone($table, $originalThead, $cloneThead); + + $(window).resize(function(){ + calculateCloneDimensions($originalThead, $cloneThead); + showOrHideClone($table, $originalThead, $cloneThead); + }); + + $(window).scroll(function(){ + showOrHideClone($table, $originalThead, $cloneThead); + }); + }); + + }; + +}(jQuery)); diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index baa8d7810..7b7bee7e8 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -9,8 +9,8 @@ function fixmystreet_update_pin(lonlat) { document.getElementById('fixmystreet.longitude').value = lonlat.lon || lonlat.x; $.getJSON('/report/new/ajax', { - latitude: $('#fixmystreet\\.latitude').val(), - longitude: $('#fixmystreet\\.longitude').val() + latitude: $('#fixmystreet\\.latitude').val(), + longitude: $('#fixmystreet\\.longitude').val() }, function(data) { if (data.error) { if (!$('#side-form-error').length) { @@ -29,6 +29,19 @@ function fixmystreet_update_pin(lonlat) { if ( lb.length === 0 ) { lb = $('#form_name').prev(); } lb.before(data.extra_name_info); } + + // If the category filter appears on the map and the user has selected + // something from it, then pre-fill the category field in the report, + // if it's a value already present in the drop-down. + var category = $("#filter_categories").val(); + if (category !== undefined && $("#form_category option[value="+category+"]").length) { + $("#form_category").val(category); + } + + var category_select = $("select#form_category"); + if (category_select.val() != '-- Pick a category --') { + category_select.change(); + } }); if (!$('#side-form-error').is(':visible')) { @@ -69,6 +82,7 @@ function fixmystreet_zoomToBounds(bounds) { function fms_markers_list(pins, transform) { var markers = []; + var size = fms_marker_size_for_zoom(fixmystreet.map.getZoom() + fixmystreet.zoomOffset); for (var i=0; i<pins.length; i++) { var pin = pins[i]; var loc = new OpenLayers.Geometry.Point(pin[1], pin[0]); @@ -81,7 +95,7 @@ function fms_markers_list(pins, transform) { } var marker = new OpenLayers.Feature.Vector(loc, { colour: pin[2], - size: pin[5] || 'normal', + size: pin[5] || size, id: pin[3], title: pin[4] || '' }); @@ -90,6 +104,29 @@ function fms_markers_list(pins, transform) { return markers; } +function fms_marker_size_for_zoom(zoom) { + if (zoom >= 15) { + return 'normal'; + } else if (zoom >= 13) { + return 'small'; + } else { + return 'mini'; + } +} + +function fms_markers_resize() { + var size = fms_marker_size_for_zoom(fixmystreet.map.getZoom() + fixmystreet.zoomOffset); + for (var i = 0; i < fixmystreet.markers.features.length; i++) { + fixmystreet.markers.features[i].attributes.size = size; + } + fixmystreet.markers.redraw(); +} + +function fms_categories_or_status_changed() { + // If the category or status has changed we need to re-fetch map markers + fixmystreet.markers.refresh({force: true}); +} + function fixmystreet_onload() { if ( fixmystreet.area.length ) { for (var i=0; i<fixmystreet.area.length; i++) { @@ -131,7 +168,8 @@ function fixmystreet_onload() { backgroundWidth: 60, backgroundHeight: 30, backgroundXOffset: -7, - backgroundYOffset: -30 + backgroundYOffset: -30, + popupYOffset: -40 }, 'big': { externalGraphic: fixmystreet.pin_prefix + "pin-${colour}-big.png", @@ -144,6 +182,27 @@ function fixmystreet_onload() { backgroundHeight: 40, backgroundXOffset: -10, backgroundYOffset: -35 + }, + 'small': { + externalGraphic: fixmystreet.pin_prefix + "pin-${colour}-small.png", + graphicWidth: 24, + graphicHeight: 32, + graphicXOffset: -12, + graphicYOffset: -32, + backgroundGraphic: fixmystreet.pin_prefix + "pin-shadow-small.png", + backgroundWidth: 30, + backgroundHeight: 15, + backgroundXOffset: -4, + backgroundYOffset: -15, + popupYOffset: -20 + }, + 'mini': { + externalGraphic: fixmystreet.pin_prefix + "pin-${colour}-mini.png", + graphicWidth: 16, + graphicHeight: 20, + graphicXOffset: -8, + graphicYOffset: -20, + popupYOffset: -10 } }); var pin_layer_options = { @@ -155,7 +214,7 @@ function fixmystreet_onload() { if (fixmystreet.page == 'around') { fixmystreet.bbox_strategy = fixmystreet.bbox_strategy || new OpenLayers.Strategy.BBOX({ ratio: 1 }); pin_layer_options.strategies = [ fixmystreet.bbox_strategy ]; - pin_layer_options.protocol = new OpenLayers.Protocol.HTTP({ + pin_layer_options.protocol = new OpenLayers.Protocol.FixMyStreet({ url: '/ajax', params: fixmystreet.all_pins ? { all_pins: 1 } : { }, format: new OpenLayers.Format.FixMyStreet() @@ -186,17 +245,29 @@ function fixmystreet_onload() { fixmystreet.markers.events.register( 'featureselected', fixmystreet.markers, function(evt) { var feature = evt.feature; selectedFeature = feature; + var popupYOffset = feature.layer.styleMap.createSymbolizer(feature).popupYOffset || -40; var popup = new OpenLayers.Popup.FramedCloud("popup", feature.geometry.getBounds().getCenterLonLat(), null, feature.attributes.title + "<br><a href=/report/" + feature.attributes.id + ">" + translation_strings.more_details + "</a>", - { size: new OpenLayers.Size(0,0), offset: new OpenLayers.Pixel(0,-40) }, + { size: new OpenLayers.Size(0, 0), offset: new OpenLayers.Pixel(0, popupYOffset) }, true, onPopupClose); feature.popup = popup; fixmystreet.map.addPopup(popup); }); fixmystreet.map.addControl( fixmystreet.select_feature ); fixmystreet.select_feature.activate(); + fixmystreet.map.events.register( 'zoomend', null, fms_markers_resize ); + + // If the category filter dropdown exists on the page set up the + // event handlers to populate it and react to it changing + if ($("select#filter_categories").length) { + $("body").on("change", "#filter_categories", fms_categories_or_status_changed); + } + // Do the same for the status dropdown + if ($("select#statuses").length) { + $("body").on("change", "#statuses", fms_categories_or_status_changed); + } } else if (fixmystreet.page == 'new') { fixmystreet_activate_drag(); } @@ -288,6 +359,9 @@ $(function(){ if (!fixmystreet.layer_options) { fixmystreet.layer_options = [ {} ]; } + if (!fixmystreet.layer_name) { + fixmystreet.layer_name = ""; + } for (var i=0; i<fixmystreet.layer_options.length; i++) { fixmystreet.layer_options[i] = OpenLayers.Util.extend({ // This option is used by XYZ-based layers @@ -300,7 +374,7 @@ $(function(){ if (fixmystreet.layer_options[i].matrixIds) { layer = new fixmystreet.map_type(fixmystreet.layer_options[i]); } else { - layer = new fixmystreet.map_type("", fixmystreet.layer_options[i]); + layer = new fixmystreet.map_type(fixmystreet.layer_name, fixmystreet.layer_options[i]); } fixmystreet.map.addLayer(layer); } @@ -351,6 +425,16 @@ $(function(){ fixmystreet.page = 'around'; }); + // Hide the pin filter submit button. Not needed because we'll use JS + // to refresh the map when the filter inputs are changed. + $(".report-list-filters [type=submit]").hide(); + + if (fixmystreet.page == "my" || fixmystreet.page == "reports") { + $(".report-list-filters select").change(function() { + $(this).closest("form").submit(); + }); + } + // Vector layers must be added onload as IE sucks if ($.browser.msie) { $(window).load(fixmystreet_onload); @@ -444,6 +528,30 @@ OpenLayers.Control.PermalinkFMSz = OpenLayers.Class(OpenLayers.Control.Permalink } }); +/* Pan data request handler */ +// This class is used to get a JSON object from /ajax that contains +// pins for the map and HTML for the sidebar. It does a fetch whenever the map +// is dragged (modulo a buffer extending outside the viewport). +// This subclass is required so we can pass the 'filter_category' and 'status' query +// params to /ajax if the user has filtered the map. +OpenLayers.Protocol.FixMyStreet = OpenLayers.Class(OpenLayers.Protocol.HTTP, { + read: function(options) { + // Pass the values of the category and status fields as query params + var filter_category = $("#filter_categories").val(); + if (filter_category !== undefined) { + options.params = options.params || {}; + options.params.filter_category = filter_category; + } + var status = $("#statuses").val(); + if (status !== undefined) { + options.params = options.params || {}; + options.params.status = status; + } + return OpenLayers.Protocol.HTTP.prototype.read.apply(this, [options]); + }, + CLASS_NAME: "OpenLayers.Protocol.FixMyStreet" +}); + /* Pan data handler */ OpenLayers.Format.FixMyStreet = OpenLayers.Class(OpenLayers.Format.JSON, { read: function(json, filter) { @@ -459,8 +567,7 @@ OpenLayers.Format.FixMyStreet = OpenLayers.Class(OpenLayers.Format.JSON, { if (typeof(obj.current_near) != 'undefined' && (current_near = document.getElementById('current_near'))) { current_near.innerHTML = obj.current_near; } - var markers = fms_markers_list( obj.pins, false ); - return markers; + return fms_markers_list( obj.pins, false ); }, CLASS_NAME: "OpenLayers.Format.FixMyStreet" }); diff --git a/web/js/map-OpenStreetMap.js b/web/js/map-OpenStreetMap.js index 7ef222da7..5dcf3cab3 100644 --- a/web/js/map-OpenStreetMap.js +++ b/web/js/map-OpenStreetMap.js @@ -8,7 +8,6 @@ function set_map_config(perm) { //new OpenLayers.Control.LayerSwitcher(), new OpenLayers.Control.Navigation(), new OpenLayers.Control.PermalinkFMS(permalink_id), - new OpenLayers.Control.PermalinkFMSz('osm_link', 'https://www.openstreetmap.org/'), new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' }) ]; } diff --git a/web/js/map-bing-ol.js b/web/js/map-bing-ol.js index 059a5e67e..9b0a73fb8 100644 --- a/web/js/map-bing-ol.js +++ b/web/js/map-bing-ol.js @@ -1,6 +1,4 @@ -var tile_base = [ [ '', 'a-', 'b-', 'c-' ], '//{S}tilma.mysociety.org/sv' ]; - -function set_map_config(perm) { +function _set_map_config() { var permalink_id; if ($('#map_permalink').length) { permalink_id = 'map_permalink'; @@ -23,52 +21,22 @@ function set_map_config(perm) { if ( fixmystreet.page == 'report' ) { fixmystreet.controls.push( new OpenLayers.Control.PermalinkFMS('key-tool-problems-nearby', '/around') ); } +} - if (fixmystreet.map_type) { - tile_base = fixmystreet.map_type; - } - fixmystreet.map_type = OpenLayers.Layer.BingUK; +function set_map_config(perm) { + _set_map_config(); + fixmystreet.map_type = OpenLayers.Layer.Bing; } -OpenLayers.Layer.BingUK = OpenLayers.Class(OpenLayers.Layer.XYZ, { +OpenLayers.Layer.Bing = OpenLayers.Class(OpenLayers.Layer.XYZ, { attributionTemplate: '${logo}${copyrights}', - uk_bounds: [ - new OpenLayers.Bounds(-6.6, 49.8, 1.102680, 51), - new OpenLayers.Bounds(-5.4, 51, 2.28, 54.94), - new OpenLayers.Bounds(-5.85, 54.94, -1.15, 55.33), - new OpenLayers.Bounds(-9.35, 55.33, -0.7, 60.98) - ], - in_uk: function(c) { - c = c.clone(); - c.transform( - fixmystreet.map.getProjectionObject(), - new OpenLayers.Projection("EPSG:4326") - ); - if ( this.uk_bounds[0].contains(c.lon, c.lat) || this.uk_bounds[1].contains(c.lon, c.lat) || this.uk_bounds[2].contains(c.lon, c.lat) || this.uk_bounds[3].contains(c.lon, c.lat) ) { - return true; - } - return false; - }, - setMap: function() { OpenLayers.Layer.XYZ.prototype.setMap.apply(this, arguments); this.updateAttribution(); - this.map.events.register("moveend", this, this.updateAttribution); }, - updateAttribution: function() { - var z = this.map.getZoom() + this.zoomOffset; - var copyrights; - var logo = ''; - var c = this.map.getCenter(); - var in_uk = c ? this.in_uk(c) : true; - if (z >= 16 && in_uk) { - copyrights = 'Contains Ordnance Survey data © Crown copyright and database right 2010'; - } else { - logo = '<a href="https://www.bing.com/maps/"><img border=0 src="//dev.virtualearth.net/Branding/logo_powered_by.png"></a>'; - copyrights = '© 2011 <a href="https://www.bing.com/maps/">Microsoft</a>. © AND, Navteq, Ordnance Survey'; - } + _updateAttribution: function(copyrights, logo) { this.attribution = OpenLayers.String.format(this.attributionTemplate, { logo: logo, copyrights: copyrights @@ -81,6 +49,12 @@ OpenLayers.Layer.BingUK = OpenLayers.Class(OpenLayers.Layer.XYZ, { } }, + updateAttribution: function() { + var copyrights = '© 2011 <a href="https://www.bing.com/maps/">Microsoft</a>. © AND, Navteq'; + var logo = '<a href="https://www.bing.com/maps/"><img border=0 src="//dev.virtualearth.net/Branding/logo_powered_by.png"></a>'; + this._updateAttribution(copyrights, logo); + }, + initialize: function(name, options) { var url = []; options = OpenLayers.Util.extend({ @@ -89,7 +63,6 @@ OpenLayers.Layer.BingUK = OpenLayers.Class(OpenLayers.Layer.XYZ, { numZoomLevels: 19, sphericalMercator: true, buffer: 0 - //attribution: "© Microsoft / OS 2010" }, options); var newArguments = [name, url, options]; OpenLayers.Layer.XYZ.prototype.initialize.apply(this, newArguments); @@ -121,23 +94,7 @@ OpenLayers.Layer.BingUK = OpenLayers.Class(OpenLayers.Layer.XYZ, { OpenLayers.Util.indexOf(this.serverResolutions, res) : this.map.getZoom() + this.zoomOffset; - var url; - var in_uk = this.in_uk(bounds.getCenterLonLat()); - if (z >= 16 && in_uk) { - url = []; - for (var i=0; i< tile_base[0].length; i++) { - url.push( tile_base[1].replace('{S}', tile_base[0][i]) + "/${z}/${x}/${y}.png" ); - } - } else { - var type = ''; - if (z > 10 && in_uk) { type = '&productSet=mmOS'; } - url = [ - "//ecn.t0.tiles.virtualearth.net/tiles/r${id}.png?g=701" + type, - "//ecn.t1.tiles.virtualearth.net/tiles/r${id}.png?g=701" + type, - "//ecn.t2.tiles.virtualearth.net/tiles/r${id}.png?g=701" + type, - "//ecn.t3.tiles.virtualearth.net/tiles/r${id}.png?g=701" + type - ]; - } + var url = this.get_urls(bounds, z); var s = '' + x + y + z; url = this.selectUrl(s, url); @@ -146,5 +103,14 @@ OpenLayers.Layer.BingUK = OpenLayers.Class(OpenLayers.Layer.XYZ, { return path; }, - CLASS_NAME: "OpenLayers.Layer.BingUK" + get_urls: function(bounds, z) { + return [ + "//ecn.t0.tiles.virtualearth.net/tiles/r${id}.png?g=3467", + "//ecn.t1.tiles.virtualearth.net/tiles/r${id}.png?g=3467", + "//ecn.t2.tiles.virtualearth.net/tiles/r${id}.png?g=3467", + "//ecn.t3.tiles.virtualearth.net/tiles/r${id}.png?g=3467" + ]; + }, + + CLASS_NAME: "OpenLayers.Layer.Bing" }); diff --git a/web/js/map-fms.js b/web/js/map-fms.js new file mode 100644 index 000000000..6ef4265d0 --- /dev/null +++ b/web/js/map-fms.js @@ -0,0 +1,76 @@ +var fms_tile_base = [ [ '', 'a-', 'b-', 'c-' ], '//{S}tilma.mysociety.org/sv' ]; + +function set_map_config(perm) { + _set_map_config(); + + if (fixmystreet.map_type) { + fms_tile_base = fixmystreet.map_type; + } + fixmystreet.map_type = OpenLayers.Layer.BingUK; +} + +OpenLayers.Layer.BingUK = OpenLayers.Class(OpenLayers.Layer.Bing, { + uk_bounds: [ + new OpenLayers.Bounds(-6.6, 49.8, 1.102680, 51), + new OpenLayers.Bounds(-5.4, 51, 2.28, 54.94), + new OpenLayers.Bounds(-5.85, 54.94, -1.15, 55.33), + new OpenLayers.Bounds(-9.35, 55.33, -0.7, 60.98) + ], + + in_uk: function(c) { + c = c.clone(); + c.transform( + fixmystreet.map.getProjectionObject(), + new OpenLayers.Projection("EPSG:4326") + ); + if ( this.uk_bounds[0].contains(c.lon, c.lat) || this.uk_bounds[1].contains(c.lon, c.lat) || this.uk_bounds[2].contains(c.lon, c.lat) || this.uk_bounds[3].contains(c.lon, c.lat) ) { + return true; + } + return false; + }, + + setMap: function() { + OpenLayers.Layer.Bing.prototype.setMap.apply(this, arguments); + this.map.events.register("moveend", this, this.updateAttribution); + }, + + updateAttribution: function() { + var z = this.map.getZoom() + this.zoomOffset; + var copyrights; + var logo = ''; + var c = this.map.getCenter(); + var in_uk = c ? this.in_uk(c) : true; + if (z >= 16 && in_uk) { + copyrights = 'Contains Ordnance Survey data © Crown copyright and database right 2014'; + } else { + logo = '<a href="https://www.bing.com/maps/"><img border=0 src="//dev.virtualearth.net/Branding/logo_powered_by.png"></a>'; + copyrights = '© 2011 <a href="https://www.bing.com/maps/">Microsoft</a>. © AND, Navteq, Ordnance Survey'; + } + this._updateAttribution(copyrights, logo); + }, + + get_urls: function(bounds, z) { + var urls; + var in_uk = this.in_uk(bounds.getCenterLonLat()); + if (z >= 16 && in_uk) { + urls = []; + for (var i=0; i< fms_tile_base[0].length; i++) { + urls.push( fms_tile_base[1].replace('{S}', fms_tile_base[0][i]) + "/${z}/${x}/${y}.png" ); + } + } else { + var type = ''; + if (z > 10 && in_uk) { + type = '&productSet=mmOS&key=' + fixmystreet.key; + } + urls = [ + "//ecn.t0.tiles.virtualearth.net/tiles/r${id}.png?g=3467" + type, + "//ecn.t1.tiles.virtualearth.net/tiles/r${id}.png?g=3467" + type, + "//ecn.t2.tiles.virtualearth.net/tiles/r${id}.png?g=3467" + type, + "//ecn.t3.tiles.virtualearth.net/tiles/r${id}.png?g=3467" + type + ]; + } + return urls; + }, + + CLASS_NAME: "OpenLayers.Layer.BingUK" +}); diff --git a/web/js/map-google-ol.js b/web/js/map-google-ol.js index 5d128a7bd..a0e58cdc2 100644 --- a/web/js/map-google-ol.js +++ b/web/js/map-google-ol.js @@ -1,9 +1,9 @@ $(function(){ $('#map_layer_toggle').toggle(function(){ - $(this).text(translation_strings.map_map); + $(this).text(translation_strings.map_satellite); fixmystreet.map.setBaseLayer(fixmystreet.map.layers[1]); }, function(){ - $(this).text(translation_strings.map_satellite); + $(this).text(translation_strings.map_map); fixmystreet.map.setBaseLayer(fixmystreet.map.layers[0]); }); }); @@ -26,8 +26,8 @@ function set_map_config(perm) { zoomDuration: 10 }; fixmystreet.layer_options = [ - {}, - { type: google.maps.MapTypeId.HYBRID } + { type: google.maps.MapTypeId.HYBRID }, + {} ]; } diff --git a/web/js/map-streetview.js b/web/js/map-streetview.js index b81438a88..58d856781 100644 --- a/web/js/map-streetview.js +++ b/web/js/map-streetview.js @@ -1,7 +1,6 @@ function set_map_config(perm) { fixmystreet.controls = [ new OpenLayers.Control.ArgParser(), - //new OpenLayers.Control.LayerSwitcher(), new OpenLayers.Control.Navigation(), new OpenLayers.Control.Permalink(), new OpenLayers.Control.PanZoomFMS() @@ -38,8 +37,7 @@ OpenLayers.Layer.StreetView = OpenLayers.Class(OpenLayers.Layer.XYZ, { /* Below line added to OSM's file in order to allow minimum zoom level */ maxResolution: 156543.03390625/Math.pow(2, options.zoomOffset || 0), numZoomLevels: 19, - sphericalMercator: true, - attribution: "Contains Ordnance Survey data © Crown copyright and database right 2012" + sphericalMercator: true }, options); var newArguments = [name, url, options]; OpenLayers.Layer.XYZ.prototype.initialize.apply(this, newArguments); diff --git a/web/js/map-toner-lite.js b/web/js/map-toner-lite.js new file mode 100644 index 000000000..5291d0254 --- /dev/null +++ b/web/js/map-toner-lite.js @@ -0,0 +1,19 @@ +function set_map_config(perm) { + var permalink_id; + if ($('#map_permalink').length) { + permalink_id = 'map_permalink'; + } + fixmystreet.controls = [ + new OpenLayers.Control.ArgParser(), + new OpenLayers.Control.Navigation(), + new OpenLayers.Control.PermalinkFMS(permalink_id), + new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' }) + ]; + fixmystreet.layer_options = [ { + maxResolution: 156543.03390625/Math.pow(2, fixmystreet.zoomOffset) + } ]; + fixmystreet.layer_name = 'toner-lite'; + + // The Stamen JS returns HTTP urls, fix that + stamen.tile.getProvider('toner-lite').url = 'https://stamen-tiles-{S}a.ssl.fastly.net/toner-lite/{Z}/{X}/{Y}.png'; +} diff --git a/web/js/map-wmts-zurich.js b/web/js/map-wmts-zurich.js index cfff686e6..54b932168 100644 --- a/web/js/map-wmts-zurich.js +++ b/web/js/map-wmts-zurich.js @@ -63,7 +63,6 @@ $(function(){ fixmystreet.nav_control = new OpenLayers.Control.Navigation(nav_opts); fixmystreet.controls = [ - new OpenLayers.Control.Attribution(), new OpenLayers.Control.ArgParser(), fixmystreet.nav_control ]; |
